[pkgsrc/trunk]: pkgsrc/databases/openldap Allow bdb backend support to be opt...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/56a2e90f242d
branches:  trunk
changeset: 483166:56a2e90f242d
user:      tv <tv%pkgsrc.org@localhost>
date:      Mon Nov 08 18:42:08 2004 +0000

description:
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.

diffstat:

 databases/openldap/Makefile   |   7 +++----
 databases/openldap/PLIST      |   3 ++-
 databases/openldap/options.mk |  20 ++++++++++++++++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diffs (80 lines):

diff -r c5f4191773e5 -r 56a2e90f242d databases/openldap/Makefile
--- a/databases/openldap/Makefile       Mon Nov 08 18:27:26 2004 +0000
+++ b/databases/openldap/Makefile       Mon Nov 08 18:42:08 2004 +0000
@@ -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 @@
 .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?=        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 -r c5f4191773e5 -r 56a2e90f242d databases/openldap/PLIST
--- a/databases/openldap/PLIST  Mon Nov 08 18:27:26 2004 +0000
+++ b/databases/openldap/PLIST  Mon Nov 08 18:42:08 2004 +0000
@@ -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 @@
 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 -r c5f4191773e5 -r 56a2e90f242d databases/openldap/options.mk
--- a/databases/openldap/options.mk     Mon Nov 08 18:27:26 2004 +0000
+++ b/databases/openldap/options.mk     Mon Nov 08 18:42:08 2004 +0000
@@ -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.
 ###