pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/freeradius - Update options.mk because of mySQL bu...
details: https://anonhg.NetBSD.org/pkgsrc/rev/997c279fbfe1
branches: trunk
changeset: 483347:997c279fbfe1
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Wed Nov 10 22:27:32 2004 +0000
description:
- Update options.mk because of mySQL buildlink changes
- Add a fix for crashes when processing EAP-PEAP requests
PR 28095 Konstantin.Kabassanov (at) lip6.fr
- Fix pthreads enabled builds on NetBSD systems < 2.0
- Replace patch-ai, patch-aj and patch-ak with SUBST_* (suggested by juan@)
diffstat:
net/freeradius/Makefile | 21 +++++++++++++++++++--
net/freeradius/distinfo | 5 +----
net/freeradius/options.mk | 10 +---------
net/freeradius/patches/patch-ai | 13 -------------
net/freeradius/patches/patch-aj | 13 -------------
net/freeradius/patches/patch-ak | 12 ------------
6 files changed, 21 insertions(+), 53 deletions(-)
diffs (130 lines):
diff -r 970324ef4799 -r 997c279fbfe1 net/freeradius/Makefile
--- a/net/freeradius/Makefile Wed Nov 10 21:36:22 2004 +0000
+++ b/net/freeradius/Makefile Wed Nov 10 22:27:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/10/15 12:03:53 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/10 22:27:32 adrianp Exp $
DISTNAME= freeradius-1.0.1
PKGREVISION= 3
@@ -18,7 +18,6 @@
USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
USE_PERL5= YES
-PTHREAD_OPTS+= native
LIBTOOLIZE_PLIST= NO
PLIST_SRC= ${WRKDIR}/.PLIST_SRC
@@ -46,6 +45,24 @@
CONFIGURE_ARGS+= --without-rlm_sql_unixodbc
CONFIGURE_ARGS+= --without-snmp
+SUBST_CLASSES= make
+SUBST_STAGE.make= post-patch
+SUBST_FILES.make= src/modules/rlm_counter/Makefile.in \
+ src/modules/rlm_ldap/Makefile.in \
+ src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in \
+ src/modules/rlm_mschap/Makefile
+SUBST_SED.make= -e "s|@counter_ldflags@|@counter_ldflags@ \
+ -L${PREFIX}/lib \
+ ${COMPILER_RPATH_FLAG}${PREFIX}/lib|g" \
+ -e "s|@ldap_ldflags@|@ldap_ldflags@ -L${PREFIX}/lib \
+ ${COMPILER_RPATH_FLAG}${PREFIX}/lib|g" \
+ -e "s|@postgresql_ldflags@|@postgresql_ldflags@ \
+ -L${PREFIX}/lib \
+ ${COMPILER_RPATH_FLAG}${PREFIX}/lib|g" \
+ -e "s|RLM_LDFLAGS =|RLM_LDFLAGS = \
+ -L../../../src/lib/.libs/ -lradius|g"
+SUBST_MESSAGE.make= "Fixing Makefiles."
+
.include "options.mk"
RCD_SCRIPTS= radiusd
diff -r 970324ef4799 -r 997c279fbfe1 net/freeradius/distinfo
--- a/net/freeradius/distinfo Wed Nov 10 21:36:22 2004 +0000
+++ b/net/freeradius/distinfo Wed Nov 10 22:27:32 2004 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.8 2004/10/02 12:06:03 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2004/11/10 22:27:32 adrianp Exp $
SHA1 (freeradius-1.0.1.tar.gz) = 54de3bf96a2eb7992408573002d458edba1b47b5
Size (freeradius-1.0.1.tar.gz) = 2237745 bytes
SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773
SHA1 (patch-ah) = 49a5afd67ffea3bf871f57a3d8c2888baf765558
-SHA1 (patch-ai) = 4671a9cca166436f1563f322fc3d232780cfa0e3
-SHA1 (patch-aj) = 9c4e28033c8d05ca39e31055f828c7251cd0483d
-SHA1 (patch-ak) = 453f99d83d6a92bba08904e1510c23cd8d5448a1
diff -r 970324ef4799 -r 997c279fbfe1 net/freeradius/options.mk
--- a/net/freeradius/options.mk Wed Nov 10 21:36:22 2004 +0000
+++ b/net/freeradius/options.mk Wed Nov 10 22:27:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/10/29 07:07:44 xtraeme Exp $
+# $NetBSD: options.mk,v 1.3 2004/11/10 22:27:32 adrianp Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeradius
PKG_SUPPORTED_OPTIONS= ldap postgresql73 postgresql74 mysql snmp
@@ -14,14 +14,6 @@
.endif
###
-### Can't support both versions of mySQL
-###
-.if !empty(PKG_OPTIONS:Mmysql3) && !empty(PKG_OPTIONS:Mmysql4)
-PKG_FAIL_REASON+= "mySQL 3 and 4 cannot both be compiled in." \
- "Please change ${PKG_OPTIONS_VAR} to one or the other."
-.endif
-
-###
### Use OpenLDAP for storing user details
###
.if !empty(PKG_OPTIONS:Mldap)
diff -r 970324ef4799 -r 997c279fbfe1 net/freeradius/patches/patch-ai
--- a/net/freeradius/patches/patch-ai Wed Nov 10 21:36:22 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2004/09/23 19:51:22 adrianp Exp $
-
---- src/modules/rlm_counter/Makefile.in.orig 2004-09-23 19:27:35.000000000 +0100
-+++ src/modules/rlm_counter/Makefile.in 2004-09-23 19:29:22.000000000 +0100
-@@ -2,7 +2,7 @@
- SRCS = rlm_counter.c
- HEADERS =
- RLM_CFLAGS = @counter_cflags@
--RLM_LIBS = @counter_ldflags@
-+RLM_LIBS = @counter_ldflags@ -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
- RLM_INSTALL =
-
- include ../rules.mak
diff -r 970324ef4799 -r 997c279fbfe1 net/freeradius/patches/patch-aj
--- a/net/freeradius/patches/patch-aj Wed Nov 10 21:36:22 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2004/10/02 12:06:03 adrianp Exp $
-
---- src/modules/rlm_ldap/Makefile.in.orig 2004-09-29 15:44:13.000000000 +0100
-+++ src/modules/rlm_ldap/Makefile.in 2004-09-29 15:45:55.000000000 +0100
-@@ -2,7 +2,7 @@
- SRCS = rlm_ldap.c
- HEADERS =
- RLM_CFLAGS = @ldap_cflags@
--RLM_LIBS = @ldap_ldflags@
-+RLM_LIBS = @ldap_ldflags@ -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
-
- include ../rules.mak
-
diff -r 970324ef4799 -r 997c279fbfe1 net/freeradius/patches/patch-ak
--- a/net/freeradius/patches/patch-ak Wed Nov 10 21:36:22 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2004/10/02 12:06:03 adrianp Exp $
-
---- src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in.orig 2004-09-29 16:33:07.000000000 +0100
-+++ src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in 2004-09-29 16:33:38.000000000 +0100
-@@ -3,6 +3,6 @@
- TARGET = @targetname@
- SRCS = sql_postgresql.c
- RLM_SQL_CFLAGS = @postgresql_cflags@ $(INCLTDL)
--RLM_SQL_LIBS = @postgresql_ldflags@
-+RLM_SQL_LIBS = @postgresql_ldflags@ -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
-
- include ../rules.mak
Home |
Main Index |
Thread Index |
Old Index