Changes 2.4.30:

Fixed libldap socket polling for writes
Fixed liblutil string modifications
Fixed slapd crash when attrsOnly is true
Fixed slapd syncrepl delete handling
Fixed slapd-mdb slapadd with -q
Fixed slapd-mdb slapadd with -w
Fixed slapd-mdb slapindex with -q and -t
Fixed slapo-pcache time-to-refesh handling
Fixed slapo-syncprov loop detection
Build Environment
	Fixed POSIX make support
	Fixed slapd-mdb build on POSIX
Documentation
	Added option "-o" to ldap*(1) pages
	Fixed ldap*(1) page cleanup
	Fixed ldap_modify(3) prototypes

3 files changed, 25 insertions, 18 deletions

diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index 68e8ceefb03..a7af1fde92d 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.30 2011/12/02 08:53:08 sbd Exp $
+# $NetBSD: Makefile,v 1.31 2012/03/13 19:57:12 adam Exp $
 
-PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		2
-COMMENT=		Lightweight Directory Access Protocol server suite
+PKGNAME=	${DISTNAME:S/-/-server-/}
+COMMENT=	Lightweight Directory Access Protocol server suite
 
-CONFLICTS+=		openldap<2.3.23nb1
+CONFLICTS+=	openldap<2.3.23nb1
 
-DEPENDS+=		openldap-client>=2.3.27nb1:../../databases/openldap-client
+DEPENDS+=	openldap-client>=2.3.27nb1:../../databases/openldap-client
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -55,15 +54,15 @@ DB_CONFIG=		DB_CONFIG
 
 RCD_SCRIPTS=		slapd
 
-FILES_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
+FILES_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
 FILES_SUBST+=		SLAPD_USER=${SLAPD_USER}
 
-MESSAGE_SUBST+=		SLAPD_USER=${SLAPD_USER:Q}
-MESSAGE_SUBST+=		LDAP_GROUP=${LDAP_GROUP:Q}
-MESSAGE_SUBST+=		OPENLDAP_VARDIR=${OPENLDAP_VARDIR:Q}
-MESSAGE_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
-MESSAGE_SUBST+=		CHOWN=${CHOWN}
-MESSAGE_SUBST+=		CHMOD=${CHMOD}
+MESSAGE_SUBST+=		SLAPD_USER=${SLAPD_USER}
+MESSAGE_SUBST+=		LDAP_GROUP=${LDAP_GROUP}
+MESSAGE_SUBST+=		OPENLDAP_VARDIR=${OPENLDAP_VARDIR}
+MESSAGE_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR}
+MESSAGE_SUBST+=		CHOWN=${CHOWN:Q}
+MESSAGE_SUBST+=		CHMOD=${CHMOD:Q}
 
 .include "options.mk"
 
diff --git a/databases/openldap-server/PLIST b/databases/openldap-server/PLIST
index 7dd30582561..d6b6c834e81 100644
--- a/databases/openldap-server/PLIST
+++ b/databases/openldap-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/03/17 14:09:21 drochner Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/03/13 19:57:12 adam Exp $
 libexec/slapd
 sbin/slapacl
 sbin/slapadd
@@ -11,24 +11,32 @@ sbin/slapschema
 sbin/slaptest
 share/examples/openldap/DB_CONFIG
 share/examples/openldap/schema/README
+share/examples/openldap/schema/collective.ldif
 share/examples/openldap/schema/collective.schema
+share/examples/openldap/schema/corba.ldif
 share/examples/openldap/schema/corba.schema
 share/examples/openldap/schema/core.ldif
 share/examples/openldap/schema/core.schema
 share/examples/openldap/schema/cosine.ldif
 share/examples/openldap/schema/cosine.schema
+share/examples/openldap/schema/duaconf.ldif
 share/examples/openldap/schema/duaconf.schema
 share/examples/openldap/schema/dyngroup.ldif
 share/examples/openldap/schema/dyngroup.schema
 share/examples/openldap/schema/inetorgperson.ldif
 share/examples/openldap/schema/inetorgperson.schema
+share/examples/openldap/schema/java.ldif
 share/examples/openldap/schema/java.schema
+share/examples/openldap/schema/misc.ldif
 share/examples/openldap/schema/misc.schema
 share/examples/openldap/schema/nis.ldif
 share/examples/openldap/schema/nis.schema
 share/examples/openldap/schema/openldap.ldif
 share/examples/openldap/schema/openldap.schema
+share/examples/openldap/schema/pmi.ldif
 share/examples/openldap/schema/pmi.schema
+share/examples/openldap/schema/ppolicy.ldif
 share/examples/openldap/schema/ppolicy.schema
 share/examples/openldap/slapd.conf
+share/examples/openldap/slapd.ldif
 share/examples/rc.d/slapd
diff --git a/databases/openldap-server/options.mk b/databases/openldap-server/options.mk
index 5d8d4e32891..655688b5f5e 100644
--- a/databases/openldap-server/options.mk
+++ b/databases/openldap-server/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2010/12/17 14:13:02 adam Exp $
+# $NetBSD: options.mk,v 1.15 2012/03/13 19:57:12 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap-server
 PKG_SUPPORTED_OPTIONS=	bdb sasl slp inet6 smbk5pwd dso
@@ -96,8 +96,8 @@ PKG_FAIL_REASON+=	"smbk5pwd option to openldap-server is now " \
 CONFIGURE_ARGS+=	--enable-modules
 # dynamic linking won't work on Darwin when slapd gets stripped
 .include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "Darwin"
 INSTALL_UNSTRIPPED=	yes
-.endif
-. include "../../devel/libltdl/buildlink3.mk"
+.  endif
+.include "../../devel/libltdl/buildlink3.mk"
 .endif