We don't actually want everything to be built with pthreads -- only

libldap_r and slurpd.  Patch those Makefiles (patch-aj, patch-ak) to
pass $(PTHREAD_CFLAGS) and $(PTHREAD_LDFLAGS) to the build.  The
configure process correctly adds any necessary libraries, so adding
$(PTHREAD_LIBS) isn't needed.  Bump the PKGREVISION since the LDAP
libraries are no longer linked against libpthread.

This fixes PR pkg/28259.

5 files changed, 41 insertions, 4 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 8435e07a119..8ea2eeb3303 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2004/11/17 07:23:41 jlam Exp $
+# $NetBSD: Makefile,v 1.87 2004/11/18 19:07:04 jlam Exp $
 
 DISTNAME=		openldap-2.2.18
 SVR4_PKGNAME=		oldap
+PKGREVISION=		1
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=		.tgz
@@ -95,6 +96,11 @@ OPENLDAP_PTHREAD_OPTS?=	native
 OPENLDAP_PTHREAD_OPTS?=	require
 PTHREAD_OPTS+=		${OPENLDAP_PTHREAD_OPTS}
 
+# We don't actually want everything to be built with pthreads -- only
+# libldap_r and slurpd.
+#
+PTHREAD_AUTO_VARS=	no
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
index 53f9fcab4be..cac7616c3e7 100644
--- a/databases/openldap/buildlink3.mk
+++ b/databases/openldap/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/11/08 12:17:50 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/11/18 19:07:04 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	openldap
 
 .if !empty(OPENLDAP_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.openldap+=		openldap>=2.1.22
-BUILDLINK_RECOMMENDED.openldap+=	openldap>=2.2.13nb2
+BUILDLINK_RECOMMENDED.openldap+=	openldap>=2.2.18nb1
 BUILDLINK_PKGSRCDIR.openldap?=		../../databases/openldap
 .endif	# OPENLDAP_BUILDLINK3_MK
 
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 4b1459dcdf4..3d2987c5a40 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2004/11/17 07:23:41 jlam Exp $
+$NetBSD: distinfo,v 1.29 2004/11/18 19:07:04 jlam Exp $
 
 SHA1 (openldap-2.2.18.tgz) = df7b681c2480aea39560b22e8b0c7d118915a8f1
 Size (openldap-2.2.18.tgz) = 2574691 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ad) = c49ccf52a60110a6fe16afaff0d327e112216c50
 SHA1 (patch-af) = cd7c9527272dadf4509c4df1388d353378cdba13
 SHA1 (patch-ag) = b2d9b54b9692f0f102b01fcf94a9933a5920523b
 SHA1 (patch-ah) = e421d148537c936d76d3bb3cc3cd8f7dfb504c20
+SHA1 (patch-aj) = cb425a00e480ce625332d9e3c56fd9305075fd01
+SHA1 (patch-ak) = 1fd396ea0591fc61a97038bb754a2fd3c9436a48
diff --git a/databases/openldap/patches/patch-aj b/databases/openldap/patches/patch-aj
new file mode 100644
index 00000000000..a4eb7c083c6
--- /dev/null
+++ b/databases/openldap/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1 2004/11/18 19:07:04 jlam Exp $
+
+--- libraries/libldap_r/Makefile.in.orig	2004-01-01 13:16:30.000000000 -0500
++++ libraries/libldap_r/Makefile.in
+@@ -56,6 +56,10 @@ XXXLIBS = $(LTHREAD_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ 
++AC_CFLAGS += $(PTHREAD_CFLAGS)
++AC_LDFLAGS += $(PTHREAD_LDFLAGS)
++LINK_LIBS += $(LTHREAD_LIBS)
++
+ .links : Makefile
+ 	@for i in $(XXSRCS); do \
+ 		$(RM) $$i ; \
diff --git a/databases/openldap/patches/patch-ak b/databases/openldap/patches/patch-ak
new file mode 100644
index 00000000000..4b208f9f57f
--- /dev/null
+++ b/databases/openldap/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2004/11/18 19:07:04 jlam Exp $
+
+--- servers/slurpd/Makefile.in.orig	2004-01-01 13:16:42.000000000 -0500
++++ servers/slurpd/Makefile.in
+@@ -43,6 +43,9 @@ XLIBS = $(SLURPD_L)
+ XXLIBS = $(SLURPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+ XXXLIBS = $(LTHREAD_LIBS)
+ 
++AC_CFLAGS += $(PTHREAD_CFLAGS)
++AC_LDFLAGS += $(PTHREAD_LDFLAGS)
++
+ slurpd:	version.o
+ 	$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
+