summaryrefslogtreecommitdiff
path: root/databases/openldap
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-08-01 05:48:00 +0000
committerjlam <jlam@pkgsrc.org>2002-08-01 05:48:00 +0000
commit75e61cb884ee8ba12235cd6a05a62b1c25c5fba7 (patch)
treeddb090c3c0b454f9c8402f5b1724832e17cddad6 /databases/openldap
parent74efb51f8c38659285bc7369ad4bc06ca807eb44 (diff)
downloadpkgsrc-75e61cb884ee8ba12235cd6a05a62b1c25c5fba7.tar.gz
Adjust to new pthread.buildlink.mk: remove USE_PTHREAD and replace with
appropriate PTHREAD_OPTS incantation, and move the checks for the value of PTHREAD_TYPE below the inclusion of pthread.buildlink.mk.
Diffstat (limited to 'databases/openldap')
-rw-r--r--databases/openldap/Makefile23
1 files changed, 11 insertions, 12 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 52ae7d74082..2e1a72aae51 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2002/06/15 21:19:59 cjep Exp $
+# $NetBSD: Makefile,v 1.44 2002/08/01 05:48:07 jlam Exp $
DISTNAME= openldap-2.0.23
SVR4_PKGNAME= oldap
@@ -28,23 +28,12 @@ CONFIGURE_ARGS+= --enable-wrappers
CONFIGURE_ARGS+= --with-tls=openssl
CONFIGURE_ARGS+= --without-readline
-# 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}
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
@@ -116,8 +105,18 @@ post-install:
${RM} -f ${PKG_SYSCONFDIR}/$${file}.default; \
done
+test:
+ -@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
+ ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
+
.include "../../security/openssl/buildlink.mk"
.include "../../security/tcp_wrappers/buildlink.mk"
.include "../../mk/pthread.buildlink.mk"
+
+.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
+CONFIGURE_ARGS+= --with-threads
+PLIST_SRC= ${.CURDIR}/PLIST.slurpd ${.CURDIR}/PLIST
+.endif
+
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"