diff options
| author | jlam <jlam@pkgsrc.org> | 2002-01-31 05:06:54 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-01-31 05:06:54 +0000 |
| commit | 23f593e42e9eafd9a35a319774ad5ecaa79d98eb (patch) | |
| tree | c766bb4c83a85a59657af82787f8da2558c4f8f1 /databases | |
| parent | 565474eb82500a27c9c9f08073e974dd4c6c26e5 (diff) | |
| download | pkgsrc-23f593e42e9eafd9a35a319774ad5ecaa79d98eb.tar.gz | |
Update databases/openldap to 2.0.21nb1. Changes from version 2.0.21 are
building this package _without_ threads support if the threads are non-
native. While the package does build correctly using GNU pth, and the
clients run correctly, the slapd server isn't able to pass "make test".
When built without threads support, only the replication test fails, I
think because slurpd isn't built.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/openldap/Makefile | 15 | ||||
| -rw-r--r-- | databases/openldap/PLIST | 3 | ||||
| -rw-r--r-- | databases/openldap/PLIST.slurpd | 2 | ||||
| -rw-r--r-- | databases/openldap/buildlink.mk | 4 |
4 files changed, 17 insertions, 7 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index f370003e1a4..13ac3202495 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.37 2002/01/30 07:34:00 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2002/01/31 05:06:54 jlam Exp $ DISTNAME= openldap-2.0.21 SVR4_PKGNAME= oldap +PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ EXTRACT_SUFX= .tgz @@ -26,8 +27,11 @@ CONFIGURE_ARGS+= --enable-wrappers CONFIGURE_ARGS+= --with-tls=openssl CONFIGURE_ARGS+= --without-readline -USE_PTHREAD= native pth -CONFIGURE_ARGS+= --with-threads +# Apparently, only _native_ pthreads are good enough, since compiling +# OpenLDAP with a userland thread package like GNU pth results in a +# slapd that isn't capable of passing the regression tests. +# +USE_PTHREAD= native PKG_SYSCONFSUBDIR= openldap CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} @@ -35,6 +39,11 @@ CONFIGURE_ARGS+= --localstatedir=/var/openldap .include "../../mk/bsd.prefs.mk" +.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none") +CONFIGURE_ARGS+= --with-threads +PLIST_SRC= ${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST +.endif + .if ${OPSYS} == "SunOS" .include "../../databases/db/buildlink.mk" CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2 diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST index 85464911a53..63f53365f8e 100644 --- a/databases/openldap/PLIST +++ b/databases/openldap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2002/01/30 07:34:00 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2002/01/31 05:06:54 jlam Exp $ bin/ldapadd bin/ldapdelete bin/ldapmodify @@ -39,7 +39,6 @@ libexec/maildap libexec/rcpt500 libexec/rp500 libexec/slapd -libexec/slurpd libexec/xrpcomp man/man1/ldapadd.1 man/man1/ldapdelete.1 diff --git a/databases/openldap/PLIST.slurpd b/databases/openldap/PLIST.slurpd new file mode 100644 index 00000000000..cba962e6b09 --- /dev/null +++ b/databases/openldap/PLIST.slurpd @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST.slurpd,v 1.1 2002/01/31 05:06:55 jlam Exp $ +libexec/slurpd diff --git a/databases/openldap/buildlink.mk b/databases/openldap/buildlink.mk index 0c3f1e04bc6..c35d55de39f 100644 --- a/databases/openldap/buildlink.mk +++ b/databases/openldap/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2002/01/01 00:00:18 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.4 2002/01/31 05:06:55 jlam Exp $ # # This Makefile fragment is included by packages that use openldap. # @@ -33,7 +33,7 @@ BUILDLINK_FILES.openldap+= include/srchpref.h BUILDLINK_FILES.openldap+= lib/liblber.* BUILDLINK_FILES.openldap+= lib/libldap.* -USE_PTHREAD= native pth +USE_PTHREAD= native .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == SunOS |