pkg/50679: databases/openldap-server fails with bdb option

[triaxx%triaxx.org@localhost]

>Number:         50679
>Category:       pkg
>Synopsis:       databases/openldap-server fails with bdb option
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jan 19 15:00:01 +0000 2016
>Originator:     Frédéric Fauberteau
>Release:        pkgsrc-2015Q4
>Organization:
>Environment:
NetBSD trashware 7.0_STABLE NetBSD 7.0_STABLE (TRASHWARE) #1: Sat Dec  5 19:26:52 CET 2015  triaxx@hydralisk:/home/triaxx/dev/nbsd/netbsd-7/usr/objs/sys/arch/amd64/compile/TRASHWARE amd64
>Description:
/usr/pkgsrc/databases/openldap-server/work/.destdir/usr/pkg/share/examples/openldap/DB_CONFIG: no such file or directory when the option 'bdb' is disabled.
>How-To-Repeat:
PKG_OPTIONS.openldap-server += -bdb
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap-server/Makefile,v
retrieving revision 1.46
diff -u -u -r1.46 Makefile
--- Makefile  2 Dec 2015 17:04:57 -0000 1.46
+++ Makefile  19 Jan 2016 14:01:46 -0000
@@ -50,8 +50,6 @@
 
 CNFS_PERMS=    slapd.conf
 
-DB_CONFIG=   DB_CONFIG
-
 RCD_SCRIPTS=   slapd
 
 FILES_SUBST+=    OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
@@ -68,8 +66,6 @@
 
 .include "../../databases/openldap/Makefile.common"
 
-CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
-
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 .include "../../devel/libuuid/buildlink3.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap-server/PLIST,v
retrieving revision 1.12
diff -u -u -r1.12 PLIST
--- PLIST 11 Mar 2014 14:05:00 -0000  1.12
+++ PLIST 19 Jan 2016 14:01:46 -0000
@@ -10,7 +10,7 @@
 sbin/slappasswd
 sbin/slapschema
 sbin/slaptest
-share/examples/openldap/DB_CONFIG
+${PLIST.bdb}share/examples/openldap/DB_CONFIG
 share/examples/openldap/schema/README
 share/examples/openldap/schema/collective.ldif
 share/examples/openldap/schema/collective.schema
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/databases/openldap-server/options.mk,v
retrieving revision 1.19
diff -u -u -r1.19 options.mk
--- options.mk  7 Sep 2015 12:02:06 -0000 1.19
+++ options.mk  19 Jan 2016 14:01:46 -0000
@@ -8,7 +8,7 @@
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+= slapi
+PLIST_VARS+= bdb slapi
 
 ### 
 ### Whether to build with the Berkeley DB based slapd backends.
@@ -20,7 +20,10 @@
 BDB_ACCEPTED=    db4 db5 
 CONFIGURE_ARGS+= --enable-bdb --enable-hdb
 TEST_TARGET=   test
+DB_CONFIG=   DB_CONFIG
+CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
 .  include "../../mk/bdb.buildlink3.mk"
+PLIST.bdb=   yes
 .else
 CONFIGURE_ARGS+= --disable-bdb --disable-hdb
 .endif