Sat May 4 18:16:38 2013 UTC ()
Added slapi support as an option


(adam)
diff -r1.35 -r1.36 pkgsrc/databases/openldap-server/Makefile
diff -r1.10 -r1.11 pkgsrc/databases/openldap-server/PLIST
diff -r1.16 -r1.17 pkgsrc/databases/openldap-server/options.mk
cvs diff -r1.35 -r1.36 pkgsrc/databases/openldap-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/Makefile 2013/03/16 12:49:55 1.35
+++ pkgsrc/databases/openldap-server/Makefile 2013/05/04 18:16:37 1.36
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.35 2013/03/16 12:49:55 adam Exp $ 1# $NetBSD: Makefile,v 1.36 2013/05/04 18:16:37 adam 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
10CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync 10CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
11 11
12# slapd options 12# slapd options
13CONFIGURE_ARGS+= --enable-slapd 13CONFIGURE_ARGS+= --enable-slapd
14CONFIGURE_ARGS+= --enable-crypt 14CONFIGURE_ARGS+= --enable-crypt
15CONFIGURE_ARGS+= --enable-wrappers 15CONFIGURE_ARGS+= --enable-wrappers
16 16
17# slapd backends 17# slapd backends
18CONFIGURE_ARGS+= --enable-dnssrv 18CONFIGURE_ARGS+= --enable-dnssrv
19CONFIGURE_ARGS+= --enable-ldap 19CONFIGURE_ARGS+= --enable-ldap
20CONFIGURE_ARGS+= --enable-ldbm 
21CONFIGURE_ARGS+= --enable-meta 20CONFIGURE_ARGS+= --enable-meta
22CONFIGURE_ARGS+= --enable-monitor 21CONFIGURE_ARGS+= --enable-monitor
23CONFIGURE_ARGS+= --enable-null 22CONFIGURE_ARGS+= --enable-null
24CONFIGURE_ARGS+= --enable-passwd 23CONFIGURE_ARGS+= --enable-passwd
25CONFIGURE_ARGS+= --enable-shell 24CONFIGURE_ARGS+= --enable-shell
26 25
27# slapd (stackable) overlays 26# slapd (stackable) overlays
28CONFIGURE_ARGS+= --enable-overlays 27CONFIGURE_ARGS+= --enable-overlays
29 28
30BUILD_DIRS= include libraries servers 29BUILD_DIRS= include libraries servers
31TEST_DIRS= tests 30TEST_DIRS= tests
32INSTALL_DIRS= servers 31INSTALL_DIRS= servers
33 32
cvs diff -r1.10 -r1.11 pkgsrc/databases/openldap-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/PLIST 2012/03/13 19:57:12 1.10
+++ pkgsrc/databases/openldap-server/PLIST 2013/05/04 18:16:37 1.11
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1@comment $NetBSD: PLIST,v 1.10 2012/03/13 19:57:12 adam Exp $ 1@comment $NetBSD: PLIST,v 1.11 2013/05/04 18:16:37 adam Exp $
 2${PLIST.slapi}lib/libslapi.la
2libexec/slapd 3libexec/slapd
3sbin/slapacl 4sbin/slapacl
4sbin/slapadd 5sbin/slapadd
5sbin/slapauth 6sbin/slapauth
6sbin/slapcat 7sbin/slapcat
7sbin/slapdn 8sbin/slapdn
8sbin/slapindex 9sbin/slapindex
9sbin/slappasswd 10sbin/slappasswd
10sbin/slapschema 11sbin/slapschema
11sbin/slaptest 12sbin/slaptest
12share/examples/openldap/DB_CONFIG 13share/examples/openldap/DB_CONFIG
13share/examples/openldap/schema/README 14share/examples/openldap/schema/README
14share/examples/openldap/schema/collective.ldif 15share/examples/openldap/schema/collective.ldif
cvs diff -r1.16 -r1.17 pkgsrc/databases/openldap-server/options.mk (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/options.mk 2012/06/12 15:45:55 1.16
+++ pkgsrc/databases/openldap-server/options.mk 2013/05/04 18:16:37 1.17
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: options.mk,v 1.16 2012/06/12 15:45:55 wiz Exp $ 1# $NetBSD: options.mk,v 1.17 2013/05/04 18:16:37 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server 3PKG_OPTIONS_VAR= PKG_OPTIONS.openldap-server
4PKG_SUPPORTED_OPTIONS= bdb sasl slp inet6 smbk5pwd dso 4PKG_SUPPORTED_OPTIONS= bdb dso inet6 sasl slapi slp smbk5pwd
5PKG_OPTIONS_OPTIONAL_GROUPS+= odbc 5PKG_OPTIONS_OPTIONAL_GROUPS+= odbc
6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc 6PKG_OPTIONS_GROUP.odbc= iodbc unixodbc
7PKG_SUGGESTED_OPTIONS= bdb inet6 7PKG_SUGGESTED_OPTIONS= bdb inet6
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
 11PLIST_VARS+= slapi
 12
11### 13###
12### Whether to build with the Berkeley DB based slapd backends. 14### Whether to build with the Berkeley DB based slapd backends.
13### 15###
14### NOTE: that option is enabled, because the openldap server needs 16### NOTE: that option is enabled, because the openldap server needs
15### to have local storage support to work as standalone. 17### to have local storage support to work as standalone.
16### 18###
17.if !empty(PKG_OPTIONS:Mbdb) 19.if !empty(PKG_OPTIONS:Mbdb)
18BDB_ACCEPTED= db4 db5 20BDB_ACCEPTED= db4 db5
19CONFIGURE_ARGS+= --enable-bdb --enable-hdb 21CONFIGURE_ARGS+= --enable-bdb --enable-hdb
20TEST_TARGET= test 22TEST_TARGET= test
21# Fix hard-coded support for db4. 23# Fix hard-coded support for db4.
22# Remove if fixed in future versions of OpenLDAP. 24# Remove if fixed in future versions of OpenLDAP.
23SUBST_CLASSES= bdb 25SUBST_CLASSES= bdb
@@ -91,13 +93,24 @@ PKG_FAIL_REASON+= "smbk5pwd option to op @@ -91,13 +93,24 @@ PKG_FAIL_REASON+= "smbk5pwd option to op
91 93
92### 94###
93### Enable dynamic module support 95### Enable dynamic module support
94### 96###
95.if !empty(PKG_OPTIONS:Mdso) 97.if !empty(PKG_OPTIONS:Mdso)
96CONFIGURE_ARGS+= --enable-modules 98CONFIGURE_ARGS+= --enable-modules
97# dynamic linking won't work on Darwin when slapd gets stripped 99# dynamic linking won't work on Darwin when slapd gets stripped
98.include "../../mk/bsd.prefs.mk" 100.include "../../mk/bsd.prefs.mk"
99. if ${OPSYS} == "Darwin" 101. if ${OPSYS} == "Darwin"
100INSTALL_UNSTRIPPED= yes 102INSTALL_UNSTRIPPED= yes
101. endif 103. endif
102.include "../../devel/libltdl/buildlink3.mk" 104.include "../../devel/libltdl/buildlink3.mk"
103.endif 105.endif
 106
 107###
 108### Enable SLAPI support
 109###
 110.if empty(PKG_OPTIONS:Mslapi)
 111CONFIGURE_ARGS+= --disable-slapi
 112.else
 113CONFIGURE_ARGS+= --enable-slapi
 114PLIST.slapi= yes
 115.include "../../devel/libltdl/buildlink3.mk"
 116.endif