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, 32 insertions, 44 deletions

diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index 3efc5335ebd..afc1ef5e38c 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -1,55 +1,37 @@
-# $NetBSD: Makefile,v 1.21 2011/03/18 09:44:37 tron Exp $
-
-DISTNAME=		openldap-2.4.24
-PKGNAME=		${DISTNAME:S/-/-doc-/}
-CATEGORIES=		databases
-MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
-MASTER_SITES+=		http://ftp.openldap.org/pub/OpenLDAP/openldap-release/
-MASTER_SITES+=		http://www.PlanetMirror.com/pub/openldap/openldap-release/
-MASTER_SITES+=		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/
-MASTER_SITES+=		ftp://ftp.ucr.ac.cr/pub/Unix/openldap/openldap-release/
-MASTER_SITES+=		ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
-MASTER_SITES+=		ftp://it.openldap.org/pub/OpenLDAP/openldap-release/
-MASTER_SITES+=		ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
-MASTER_SITES+=		ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
-MASTER_SITES+=		ftp://ftp.holywar.net/pub/OpenLDAP/openldap-release/
-MASTER_SITES+=		ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
-MASTER_SITES+=		ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
-MASTER_SITES+=		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
-MASTER_SITES+=		ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		ghen@NetBSD.org
-HOMEPAGE=		http://www.openldap.org/
-COMMENT=		Lightweight Directory Access Protocol documentation
+# $NetBSD: Makefile,v 1.22 2012/03/13 19:57:11 adam Exp $
+
+DISTNAME=	openldap-2.4.30
+PKGNAME=	${DISTNAME:S/-/-doc-/}
+CATEGORIES=	databases
+MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
+		http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
+		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
+		ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \
+		ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \
+		ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \
+		ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
+		ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	ghen@NetBSD.org
+HOMEPAGE=	http://www.openldap.org/
+COMMENT=	Lightweight Directory Access Protocol documentation
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DISTINFO_FILE=		${.CURDIR}/../../databases/openldap/distinfo
-
 NO_CONFIGURE=		yes
 NO_BUILD=		yes
 
 DOCDIR=			${PREFIX}/share/doc/openldap
-IMAGES=			allmail-en.png allusersgroup-en.png config_dit.png
-IMAGES+=		config_local.png config_ref.png config_repl.png
-IMAGES+=		dual_dc.png intro_dctree.png intro_tree.png
-IMAGES+=		push-based-complete.png push-based-standalone.png
-IMAGES+=		refint.png set-following-references.png
-IMAGES+=		set-memberUid.png set-recursivegroup.png
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/admin
 	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/images
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/COPYRIGHT ${DESTDIR}${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/LICENSE ${DESTDIR}${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/README ${DESTDIR}${DOCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPlogo.gif ${DESTDIR}${DOCDIR}/images/
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/images/LDAPwww.gif ${DESTDIR}${DOCDIR}/images/
 	${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/guide.html ${DESTDIR}${DOCDIR}/admin/
-.for file in ${IMAGES}
-	${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/${file} ${DESTDIR}${DOCDIR}/admin/
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/admin/*.png ${DESTDIR}${DOCDIR}/admin/
+	${INSTALL_DATA} ${WRKSRC}/doc/guide/images/*.gif ${DESTDIR}${DOCDIR}/images/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap-doc/PLIST b/databases/openldap-doc/PLIST
index f6d671ed281..c3bcddb5e14 100644
--- a/databases/openldap-doc/PLIST
+++ b/databases/openldap-doc/PLIST
@@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:43:19 joerg Exp $
-share/doc/openldap/COPYRIGHT
-share/doc/openldap/LICENSE
-share/doc/openldap/README
+@comment $NetBSD: PLIST,v 1.6 2012/03/13 19:57:11 adam Exp $
 share/doc/openldap/admin/allmail-en.png
 share/doc/openldap/admin/allusersgroup-en.png
 share/doc/openldap/admin/config_dit.png
 share/doc/openldap/admin/config_local.png
 share/doc/openldap/admin/config_ref.png
 share/doc/openldap/admin/config_repl.png
+share/doc/openldap/admin/delta-syncrepl.png
 share/doc/openldap/admin/dual_dc.png
 share/doc/openldap/admin/guide.html
 share/doc/openldap/admin/intro_dctree.png
 share/doc/openldap/admin/intro_tree.png
+share/doc/openldap/admin/ldap-sync-refreshandpersist.png
+share/doc/openldap/admin/ldap-sync-refreshonly.png
+share/doc/openldap/admin/n-way-multi-master.png
 share/doc/openldap/admin/push-based-complete.png
 share/doc/openldap/admin/push-based-standalone.png
 share/doc/openldap/admin/refint.png
diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo
new file mode 100644
index 00000000000..20c38a6d7da
--- /dev/null
+++ b/databases/openldap-doc/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2012/03/13 19:57:11 adam Exp $
+
+SHA1 (openldap-2.4.30.tgz) = 7447e89b9a5199f9bb2231bda42c308a1b6513d9
+RMD160 (openldap-2.4.30.tgz) = 071a3c2a183293999b2627be05ccb4fb1b271b16
+Size (openldap-2.4.30.tgz) = 5440261 bytes