- Fix pthread issues on 1.6.x

- Fix builds with LDAP support
- Bump PKGREVISION

Thanks to Dave.Tyson (at) liverpool.ac.uk for testing a lot of these patches
on the 1.6 branch.

4 files changed, 43 insertions, 15 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 3c1912ebfef..2aa25258bab 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2004/11/10 23:06:14 adrianp Exp $
+# $NetBSD: Makefile,v 1.18 2004/11/16 13:51:45 adrianp Exp $
 
 DISTNAME=	freeradius-1.0.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -47,19 +47,9 @@ 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 \
+SUBST_FILES.make=	src/modules/rlm_ldap/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 	= \
+SUBST_SED.make= 	-e "s|RLM_LDFLAGS	=|RLM_LDFLAGS 	= \
 				-L../../../src/lib/.libs/ -lradius|g"
 SUBST_MESSAGE.make=	"Fixing Makefiles."
 
@@ -120,4 +110,15 @@ post-install:
 CONFIGURE_ARGS+=	--without-threads
 .endif
 
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
+.include "../../devel/pthread-sem/buildlink3.mk"
+SUBST_SED.make+= 	-e "s|@ldap_ldflags@|@ldap_ldflags@ \
+				-lpthread -lsemaphore|g" 
+.endif
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
+SUBST_SED.make+= 	-e "s|@ldap_ldflags@|@ldap_ldflags@ \
+				-lpthread|g" 
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 2fd7daa3787..25c62c1f7e8 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.9 2004/11/10 22:27:32 adrianp Exp $
+$NetBSD: distinfo,v 1.10 2004/11/16 13:51:45 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) = 7c9cbe277ca006f2277dcb16f38ffc4863ad8d27
+SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai
new file mode 100644
index 00000000000..ab21ffb3e99
--- /dev/null
+++ b/net/freeradius/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2004/11/16 13:51:45 adrianp Exp $
+
+--- configure.orig	Fri Nov 12 20:52:22 2004
++++ configure	Fri Nov 12 20:53:02 2004
+@@ -6272,7 +6272,7 @@
+   cat conftest.$ac_ext >&5
+ fi
+ rm -f conftest*
+-test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt; do
++test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt semaphore; do
+ LIBS="-l$i  $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 6279 "configure"
diff --git a/net/freeradius/patches/patch-aj b/net/freeradius/patches/patch-aj
new file mode 100644
index 00000000000..dee116efe4a
--- /dev/null
+++ b/net/freeradius/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.3 2004/11/16 13:51:45 adrianp Exp $
+
+--- Make.inc.in.orig	Fri Nov 12 23:23:02 2004
++++ Make.inc.in	Fri Nov 12 23:24:23 2004
+@@ -42,6 +42,7 @@
+ LCRYPT		= @CRYPTLIB@
+ LIBS		= @LIBS@ @LFS_LIBS@
+ LDFLAGS		= @LDFLAGS@ @LFS_LDFLAGS@
++RLM_LIBS	+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+ 
+ LOGDIR		= ${logdir}
+ RADDBDIR	= ${raddbdir}