CVS commit: pkgsrc/databases/openldap-server

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Sep 27 07:14:02 UTC 2019

Modified Files:
        pkgsrc/databases/openldap-server: Makefile PLIST options.mk

Log Message:
openldap-server: fix PR pkg/50679

pkgsrc changes:
---------------
* Make the configuration file DB_CONFIG installed only if 'bdb' option is
  enabled


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/databases/openldap-server/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/openldap-server/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/databases/openldap-server/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/openldap-server/Makefile
diff -u pkgsrc/databases/openldap-server/Makefile:1.52 pkgsrc/databases/openldap-server/Makefile:1.53
--- pkgsrc/databases/openldap-server/Makefile:1.52      Wed Jun 28 09:11:39 2017
+++ pkgsrc/databases/openldap-server/Makefile   Fri Sep 27 07:14:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2017/06/28 09:11:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2019/09/27 07:14:02 triaxx Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       Lightweight Directory Access Protocol server suite
@@ -51,8 +51,6 @@ CNFS_SCHEMAS_cmd=     ${SED} -ne "/\.ldif$$/
 
 CNFS_PERMS=            slapd.conf
 
-DB_CONFIG=             DB_CONFIG
-
 RCD_SCRIPTS=           slapd
 
 FILES_SUBST+=          OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
@@ -71,7 +69,9 @@ MESSAGE_SUBST+=               CHMOD=${CHMOD:Q}
 
 .include "../../databases/openldap/Makefile.common"
 
+.if !empty(PKG_OPTIONS:Mbdb)
 CONF_FILES_PERMS+=     ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
+.endif
 
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"

Index: pkgsrc/databases/openldap-server/PLIST
diff -u pkgsrc/databases/openldap-server/PLIST:1.12 pkgsrc/databases/openldap-server/PLIST:1.13
--- pkgsrc/databases/openldap-server/PLIST:1.12 Tue Mar 11 14:05:00 2014
+++ pkgsrc/databases/openldap-server/PLIST      Fri Sep 27 07:14:02 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2014/03/11 14:05:00 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/09/27 07:14:02 triaxx Exp $
 ${PLIST.slapi}lib/libslapi.la
 libexec/slapd
 sbin/slapacl
@@ -10,7 +10,7 @@ sbin/slapindex
 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: pkgsrc/databases/openldap-server/options.mk
diff -u pkgsrc/databases/openldap-server/options.mk:1.20 pkgsrc/databases/openldap-server/options.mk:1.21
--- pkgsrc/databases/openldap-server/options.mk:1.20    Thu Dec 20 17:54:09 2018
+++ pkgsrc/databases/openldap-server/options.mk Fri Sep 27 07:14:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2018/12/20 17:54:09 adam Exp $
+# $NetBSD: options.mk,v 1.21 2019/09/27 07:14:02 triaxx Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd
@@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS=  bdb inet6
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   slapi
+PLIST_VARS+=   slapi bdb
 
 ###
 ### Whether to build with the Berkeley DB based slapd backends.
@@ -18,7 +18,9 @@ PLIST_VARS+=  slapi
 ###
 .if !empty(PKG_OPTIONS:Mbdb)
 BDB_ACCEPTED=          db4 db5
+DB_CONFIG=             DB_CONFIG
 CONFIGURE_ARGS+=       --enable-bdb --enable-hdb
+PLIST.bdb=             yes
 TEST_TARGET=           test
 .  include "../../mk/bdb.buildlink3.mk"
 .else