Thu Oct 29 15:50:17 2009 UTC ()
Fix new config file path.


(ghen)
diff -r1.21 -r1.22 pkgsrc/databases/openldap-server/Makefile
diff -r1.7 -r1.8 pkgsrc/databases/openldap-server/PLIST
cvs diff -r1.21 -r1.22 pkgsrc/databases/openldap-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/Makefile 2009/10/29 06:56:11 1.21
+++ pkgsrc/databases/openldap-server/Makefile 2009/10/29 15:50:17 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.21 2009/10/29 06:56:11 ghen Exp $ 1# $NetBSD: Makefile,v 1.22 2009/10/29 15:50:17 ghen Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4COMMENT= Lightweight Directory Access Protocol server suite 4COMMENT= Lightweight Directory Access Protocol server suite
5 5
6CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
7 7
8DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client 8DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12# slapd options 12# slapd options
13CONFIGURE_ARGS+= --enable-slapd 13CONFIGURE_ARGS+= --enable-slapd
14CONFIGURE_ARGS+= --enable-crypt 14CONFIGURE_ARGS+= --enable-crypt
@@ -40,34 +40,34 @@ OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${ @@ -40,34 +40,34 @@ OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${
40SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700 40SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700
41RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775 41RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775
42 42
43MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema 43MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema
44OWN_DIRS+= ${OPENLDAP_VARDIR} 44OWN_DIRS+= ${OPENLDAP_VARDIR}
45OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS} 45OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS}
46OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS} 46OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS}
47 47
48CNFS= ${CNFS_SCHEMAS_cmd:sh} 48CNFS= ${CNFS_SCHEMAS_cmd:sh}
49CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||" 49CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||"
50 50
51CNFS_PERMS= slapd.conf 51CNFS_PERMS= slapd.conf
52 52
53DB_CONFIG= DB_CONFIG.example 53DB_CONFIG= DB_CONFIG
54 54
55RCD_SCRIPTS= slapd 55RCD_SCRIPTS= slapd
56 56
57FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} 57FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
58FILES_SUBST+= SLAPD_USER=${SLAPD_USER} 58FILES_SUBST+= SLAPD_USER=${SLAPD_USER}
59 59
60MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER:Q} 60MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER:Q}
61MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP:Q} 61MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP:Q}
62MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR:Q} 62MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR:Q}
63MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} 63MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
64MESSAGE_SUBST+= CHOWN=${CHOWN} 64MESSAGE_SUBST+= CHOWN=${CHOWN}
65MESSAGE_SUBST+= CHMOD=${CHMOD} 65MESSAGE_SUBST+= CHMOD=${CHMOD}
66 66
67.include "options.mk" 67.include "options.mk"
68 68
69.include "../../databases/openldap/Makefile.common" 69.include "../../databases/openldap/Makefile.common"
70 70
71CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG.example ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS} 71CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
72 72
73.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/databases/openldap-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/PLIST 2009/10/29 06:56:11 1.7
+++ pkgsrc/databases/openldap-server/PLIST 2009/10/29 15:50:17 1.8
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1@comment $NetBSD: PLIST,v 1.7 2009/10/29 06:56:11 ghen Exp $ 1@comment $NetBSD: PLIST,v 1.8 2009/10/29 15:50:17 ghen Exp $
2libexec/slapd 2libexec/slapd
3sbin/slapacl 3sbin/slapacl
4sbin/slapadd 4sbin/slapadd
5sbin/slapauth 5sbin/slapauth
6sbin/slapcat 6sbin/slapcat
7sbin/slapdn 7sbin/slapdn
8sbin/slapindex 8sbin/slapindex
9sbin/slappasswd 9sbin/slappasswd
10sbin/slapschema 10sbin/slapschema
11sbin/slaptest 11sbin/slaptest
12share/examples/openldap/DB_CONFIG.example 12share/examples/openldap/DB_CONFIG
13share/examples/openldap/schema/README 13share/examples/openldap/schema/README
14share/examples/openldap/schema/collective.schema 14share/examples/openldap/schema/collective.schema
15share/examples/openldap/schema/corba.schema 15share/examples/openldap/schema/corba.schema
16share/examples/openldap/schema/core.ldif 16share/examples/openldap/schema/core.ldif
17share/examples/openldap/schema/core.schema 17share/examples/openldap/schema/core.schema
18share/examples/openldap/schema/cosine.ldif 18share/examples/openldap/schema/cosine.ldif
19share/examples/openldap/schema/cosine.schema 19share/examples/openldap/schema/cosine.schema
20share/examples/openldap/schema/duaconf.schema 20share/examples/openldap/schema/duaconf.schema
21share/examples/openldap/schema/dyngroup.schema 21share/examples/openldap/schema/dyngroup.schema
22share/examples/openldap/schema/inetorgperson.ldif 22share/examples/openldap/schema/inetorgperson.ldif
23share/examples/openldap/schema/inetorgperson.schema 23share/examples/openldap/schema/inetorgperson.schema
24share/examples/openldap/schema/java.schema 24share/examples/openldap/schema/java.schema
25share/examples/openldap/schema/misc.schema 25share/examples/openldap/schema/misc.schema