CVS commit: pkgsrc/databases/openldap-server

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Sep 28 08:07:51 UTC 2019

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

Log Message:
openldap-server: put DB_CONFIG where is should be


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/databases/openldap-server/Makefile
cvs rdiff -u -r1.21 -r1.22 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.53 pkgsrc/databases/openldap-server/Makefile:1.54
--- pkgsrc/databases/openldap-server/Makefile:1.53      Fri Sep 27 07:14:02 2019
+++ pkgsrc/databases/openldap-server/Makefile   Sat Sep 28 08:07:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/09/27 07:14:02 triaxx Exp $
+# $NetBSD: Makefile,v 1.54 2019/09/28 08:07:51 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
 COMMENT=       Lightweight Directory Access Protocol server suite
@@ -71,6 +71,7 @@ MESSAGE_SUBST+=               CHMOD=${CHMOD:Q}
 
 .if !empty(PKG_OPTIONS:Mbdb)
 CONF_FILES_PERMS+=     ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
+DB_CONFIG=             DB_CONFIG
 .endif
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/databases/openldap-server/options.mk
diff -u pkgsrc/databases/openldap-server/options.mk:1.21 pkgsrc/databases/openldap-server/options.mk:1.22
--- pkgsrc/databases/openldap-server/options.mk:1.21    Fri Sep 27 07:14:02 2019
+++ pkgsrc/databases/openldap-server/options.mk Sat Sep 28 08:07:51 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2019/09/27 07:14:02 triaxx Exp $
+# $NetBSD: options.mk,v 1.22 2019/09/28 08:07:51 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd
@@ -18,7 +18,6 @@ PLIST_VARS+=  slapi bdb
 ###
 .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