diff options
| author | tv <tv@pkgsrc.org> | 2004-11-08 18:42:08 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-11-08 18:42:08 +0000 |
| commit | ecb9bd7425f018e24145babe8c7883e4c986820f (patch) | |
| tree | da627988e37ba4407c0a4cfda7a76ba016090f56 | |
| parent | 1a0b604db5fa1aa9117cc5710fe2b115350d10e0 (diff) | |
| download | pkgsrc-ecb9bd7425f018e24145babe8c7883e4c986820f.tar.gz | |
Allow bdb backend support to be optional via PKG_OPTIONS.openldap. For now,
it is still on by default to preserve compatibility (use option "-bdb" to
disable).
While here, fix typo in CONFIGURE_ARGS that had caused the dnssrv backend
not to build; bump PKGREVISION.
| -rw-r--r-- | databases/openldap/Makefile | 7 | ||||
| -rw-r--r-- | databases/openldap/PLIST | 3 | ||||
| -rw-r--r-- | databases/openldap/options.mk | 20 |
3 files changed, 23 insertions, 7 deletions
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 33cb20ef740..a675117dce4 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.84 2004/10/15 11:54:10 tv Exp $ +# $NetBSD: Makefile,v 1.85 2004/11/08 18:42:08 tv Exp $ DISTNAME= openldap-2.2.13 SVR4_PKGNAME= oldap -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= databases MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ EXTRACT_SUFX= .tgz @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --enable-spasswd .endif CONFIGURE_ARGS+= --enable-wrappers -SLAPD_BACKEND_MODULES= bdb:static dnnsrv hdb ldap ldbm meta \ +SLAPD_BACKEND_MODULES= dnssrv ldap ldbm meta \ monitor:static null passwd shell .for _mod_ in ${SLAPD_BACKEND_MODULES} . if !empty(PKG_OPTIONS:Mdynamic) @@ -96,7 +96,6 @@ OPENLDAP_PTHREAD_OPTS?= native OPENLDAP_PTHREAD_OPTS?= require PTHREAD_OPTS+= ${OPENLDAP_PTHREAD_OPTS} -.include "../../databases/db4/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../security/tcp_wrappers/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST index 0a2d3c9740b..65aebbf2e46 100644 --- a/databases/openldap/PLIST +++ b/databases/openldap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2004/09/22 08:09:23 jlam Exp $ +@comment $NetBSD: PLIST,v 1.19 2004/11/08 18:42:09 tv Exp $ bin/ldapadd bin/ldapcompare bin/ldapdelete @@ -18,6 +18,7 @@ include/slapi-plugin.h lib/liblber.la lib/libldap.la lib/libldap_r.la +${DYNAMIC_MOD}lib/openldap/back_dnssrv.la ${DYNAMIC_MOD}lib/openldap/back_hdb.la ${DYNAMIC_MOD}lib/openldap/back_ldap.la ${DYNAMIC_MOD}lib/openldap/back_ldbm.la diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk index 6911a13f571..10a9201e9ae 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -1,10 +1,26 @@ -# $NetBSD: options.mk,v 1.4 2004/10/15 11:54:10 tv Exp $ +# $NetBSD: options.mk,v 1.5 2004/11/08 18:42:09 tv Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap -PKG_SUPPORTED_OPTIONS= dynamic kerberos sasl slp +PKG_SUPPORTED_OPTIONS= bdb dynamic kerberos sasl slp +PKG_DEFAULT_OPTIONS+= bdb + .include "../../mk/bsd.options.mk" ### +### Whether to build with the Berkeley DB based slapd backends. +### +.if !empty(PKG_OPTIONS:Mbdb) +BDB_ACCEPTED= db4 # db3? +. include "../../mk/bdb.buildlink3.mk" +CONFIGURE_ARGS+= --enable-bdb --enable-hdb +. if !empty(PKG_OPTIONS:Mdynamic) +CONFIGURE_ARGS+= --enable-hdb=mod +. endif +.else +CONFIGURE_ARGS+= --disable-bdb --disable-hdb +.endif + +### ### Whether to build with dynamically-loadable backend modules. If not ### specified, then link the backend modules statically into slapd. ### |