Sat Jul 2 21:03:08 2016 UTC ()
Expand more variables for SMF manifest.  Bump PKGREVISION.


(jperkin)
diff -r1.48 -r1.49 pkgsrc/databases/openldap-server/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/databases/openldap-server/Makefile (switch to unified diff)

--- pkgsrc/databases/openldap-server/Makefile 2016/06/17 14:01:58 1.48
+++ pkgsrc/databases/openldap-server/Makefile 2016/07/02 21:03:08 1.49
@@ -1,78 +1,80 @@ @@ -1,78 +1,80 @@
1# $NetBSD: Makefile,v 1.48 2016/06/17 14:01:58 jperkin Exp $ 1# $NetBSD: Makefile,v 1.49 2016/07/02 21:03:08 jperkin Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 2 4PKGREVISION= 3
5COMMENT= Lightweight Directory Access Protocol server suite 5COMMENT= Lightweight Directory Access Protocol server suite
6 6
7CONFLICTS+= openldap<2.3.23nb1 7CONFLICTS+= openldap<2.3.23nb1
8 8
9DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client 9DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client
10 10
11CFLAGS.FreeBSD+= -DMDB_DSYNC=O_SYNC 11CFLAGS.FreeBSD+= -DMDB_DSYNC=O_SYNC
12CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync 12CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
13 13
14# slapd options 14# slapd options
15CONFIGURE_ARGS+= --enable-slapd 15CONFIGURE_ARGS+= --enable-slapd
16CONFIGURE_ARGS+= --enable-crypt 16CONFIGURE_ARGS+= --enable-crypt
17CONFIGURE_ARGS+= --enable-wrappers 17CONFIGURE_ARGS+= --enable-wrappers
18 18
19# slapd backends 19# slapd backends
20CONFIGURE_ARGS+= --enable-dnssrv 20CONFIGURE_ARGS+= --enable-dnssrv
21CONFIGURE_ARGS+= --enable-ldap 21CONFIGURE_ARGS+= --enable-ldap
22CONFIGURE_ARGS+= --enable-meta 22CONFIGURE_ARGS+= --enable-meta
23CONFIGURE_ARGS+= --enable-monitor 23CONFIGURE_ARGS+= --enable-monitor
24CONFIGURE_ARGS+= --enable-null 24CONFIGURE_ARGS+= --enable-null
25CONFIGURE_ARGS+= --enable-passwd 25CONFIGURE_ARGS+= --enable-passwd
26CONFIGURE_ARGS+= --enable-shell 26CONFIGURE_ARGS+= --enable-shell
27 27
28# slapd (stackable) overlays 28# slapd (stackable) overlays
29CONFIGURE_ARGS+= --enable-overlays 29CONFIGURE_ARGS+= --enable-overlays
30 30
31BUILD_DIRS= include libraries servers 31BUILD_DIRS= include libraries servers
32TEST_DIRS= tests 32TEST_DIRS= tests
33INSTALL_DIRS= servers 33INSTALL_DIRS= servers
34 34
35BUILD_DEFS+= OPENLDAP_ETCDIR OPENLDAP_VARDIR 35BUILD_DEFS+= OPENLDAP_ETCDIR OPENLDAP_VARDIR
36 36
37PKG_GROUPS= ${LDAP_GROUP} 37PKG_GROUPS= ${LDAP_GROUP}
38PKG_USERS= ${SLAPD_USER}:${LDAP_GROUP} 38PKG_USERS= ${SLAPD_USER}:${LDAP_GROUP}
39 39
40OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0640 40OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0640
41SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700 41SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700
42RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775 42RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775
43 43
44MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema 44MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema
45OWN_DIRS+= ${OPENLDAP_VARDIR} 45OWN_DIRS+= ${OPENLDAP_VARDIR}
46OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS} 46OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS}
47OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS} 47OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS}
48 48
49CNFS= ${CNFS_SCHEMAS_cmd:sh} 49CNFS= ${CNFS_SCHEMAS_cmd:sh}
50CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||" 50CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||"
51 51
52CNFS_PERMS= slapd.conf 52CNFS_PERMS= slapd.conf
53 53
54DB_CONFIG= DB_CONFIG 54DB_CONFIG= DB_CONFIG
55 55
56RCD_SCRIPTS= slapd 56RCD_SCRIPTS= slapd
57 57
58FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR} 58FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
 59FILES_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR}
59FILES_SUBST+= SLAPD_USER=${SLAPD_USER} 60FILES_SUBST+= SLAPD_USER=${SLAPD_USER}
 61FILES_SUBST+= LDAP_GROUP=${LDAP_GROUP}
60 62
61MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER} 63MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER}
62MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP} 64MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP}
63MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR} 65MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR}
64MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR} 66MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
65MESSAGE_SUBST+= CHOWN=${CHOWN:Q} 67MESSAGE_SUBST+= CHOWN=${CHOWN:Q}
66MESSAGE_SUBST+= CHMOD=${CHMOD:Q} 68MESSAGE_SUBST+= CHMOD=${CHMOD:Q}
67 69
68.include "options.mk" 70.include "options.mk"
69 71
70.include "../../databases/openldap/Makefile.common" 72.include "../../databases/openldap/Makefile.common"
71 73
72CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS} 74CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
73 75
74.include "../../mk/bsd.prefs.mk" 76.include "../../mk/bsd.prefs.mk"
75.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 77.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
76.include "../../devel/libuuid/buildlink3.mk" 78.include "../../devel/libuuid/buildlink3.mk"
77.endif 79.endif
78.include "../../mk/bsd.pkg.mk" 80.include "../../mk/bsd.pkg.mk"