- Allow building with MDB option;

 - Fixup for plist;
 - Remove sites that no longer carries distfiles;
 - Use USERS/GROUPS to eliminate duplicated code in pkg-install
 - Update to 2.4.31[1]

PR:		ports/167102
Submitted by:	Hirohisa Yamaguchi <umq ueo co jp>, myself [1]

5 files changed, 37 insertions, 62 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 76fb128f8b87..3f17e9be86b2 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,22 +6,16 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.30
+DISTVERSION=		2.4.31
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 			ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.matrix.com.br/pub/openldap/%SUBDIR%/ \
-			ftp://ftp.ucr.ac.cr/pub/Unix/openldap/%SUBDIR%/ \
 			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \
-			ftp://ftp.holywar.net/pub/OpenLDAP/%SUBDIR%/ \
 			ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \
-			ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.rediris.es/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/
+			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/
 MASTER_SITE_SUBDIR=	openldap-release
 PKGNAMESUFFIX?=		-server
 EXTRACT_SUFX=		.tgz
@@ -39,6 +33,8 @@ LATEST_LINK?=		${UNIQUENAME}${PKGNAMESUFFIX}
 USE_OPENSSL=		yes
 MAKE_JOBS_SAFE=		yes
 USE_AUTOTOOLS=		libtool
+USERS=			ldap
+GROUPS=			ldap
 
 WANT_OPENLDAP_VER?=	24
 .if ${WANT_OPENLDAP_VER} != 24
@@ -57,6 +53,7 @@ OPTIONS+=	DYNACL "Run-time loadable ACL (experimental)" off \
 		ACI "Per-object ACI (experimental)" off \
 		BDB "With BerkeleyDB backend" on \
 		DNSSRV "With Dnssrv backend" off \
+		MDB "With Memory-Mapped DB backend" off \
 		PASSWD "With Passwd backend" off \
 		PERL "With Perl backend" off \
 		RELAY "With Relay backend" off \
@@ -140,7 +137,7 @@ PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
 
 SCHEMATA=		collective corba core cosine duaconf dyngroup \
 			inetorgperson java misc \
-			nis openldap ppolicy
+			nis openldap pmi ppolicy
 
 LDAP_RUN_DIR?=		/var/run/openldap
 LOCALSTATEDIR?=		/var/db
@@ -186,7 +183,7 @@ USE_LDCONFIG=		yes
 # server specific configuration
 
 USE_LDCONFIG=		${PREFIX}/libexec/openldap
-SUB_FILES+=		pkg-install pkg-message pkg-deinstall
+SUB_FILES+=		pkg-message pkg-deinstall
 USE_RC_SUBR=		slapd.sh
 
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
@@ -355,6 +352,13 @@ PLIST_SUB+=		BACK_DNSSRV=${BACKEND_PLIST}
 PLIST_SUB+=		BACK_DNSSRV="@comment "
 .endif
 
+.if defined(WITH_MDB)
+CONFIGURE_ARGS+=	--enable-mdb=${BACKEND_ENABLE}
+PLIST_SUB+=		BACK_MDB=${BACKEND_PLIST}
+.else
+PLIST_SUB+=		BACK_MDB="@comment "
+.endif
+
 .if defined(WITH_PASSWD)
 CONFIGURE_ARGS+=	--enable-passwd=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_PASSWD=${BACKEND_PLIST}
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index 1c6b2d053b38..cf37264b0a7a 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.30.tgz) = fc013e528616f8578d9f221409c48af9b8937a62005e0bec88f6f1c4c8ff3d81
-SIZE (openldap-2.4.30.tgz) = 5440261
+SHA256 (openldap-2.4.31.tgz) = bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6
+SIZE (openldap-2.4.31.tgz) = 5444236
diff --git a/net/openldap24-server/files/patch-shlib-version b/net/openldap24-server/files/patch-shlib-version
index 30007848c658..ed87502087ae 100644
--- a/net/openldap24-server/files/patch-shlib-version
+++ b/net/openldap24-server/files/patch-shlib-version
@@ -1,14 +1,14 @@
 # I have checked all headers and don't think the shared library
 # bump is a needed one.  We patch it back to prevent large
 # rebuild need.
---- build/version.var.orig	2012-02-29 09:37:09.000000000 -0800
-+++ build/version.var	2012-03-07 13:40:22.456547776 -0800
+--- build/version.var.orig	2012-04-22 13:25:08.000000000 -0700
++++ build/version.var	2012-04-23 10:51:05.079392065 -0700
 @@ -17,7 +17,7 @@
  ol_minor=4
- ol_patch=30
- ol_api_inc=20430
+ ol_patch=31
+ ol_api_inc=20431
 -ol_api_current=10
 +ol_api_current=8
  ol_api_revision=3
  ol_api_age=8
- ol_release_date="2012/02/29"
+ ol_release_date="2012/04/23"
diff --git a/net/openldap24-server/files/pkg-install.in b/net/openldap24-server/files/pkg-install.in
deleted file mode 100644
index aa9b0cf46da9..000000000000
--- a/net/openldap24-server/files/pkg-install.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-CHOWN=/usr/sbin/chown
-ECHO_CMD=echo
-GREP=/usr/bin/grep
-PKG_INFO=/usr/sbin/pkg_info
-PW=/usr/sbin/pw
-
-FTPUSERS=/etc/ftpusers
-
-case $2 in
-PRE-INSTALL)
-  if ! ${PW} usershow -n ldap >/dev/null 2>&1; then
-    ${ECHO_CMD}
-    if ! ${PW} groupshow -n ldap >/dev/null 2>&1; then
-      if ! ${PW} groupadd -n ldap -g 389; then
-        ${ECHO_CMD} "*** Failed to add a group ldap with id 389."
-        ${ECHO_CMD}
-        ${ECHO_CMD} "Please add the ldap user manually with"
-        ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-        ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-        ${ECHO_CMD} "and retry installing this package."
-        exit 1
-      fi
-      ${ECHO_CMD} "===>  Group 'ldap' created."
-    fi
-    if ! ${PW} useradd -n ldap -u 389 -g ldap -c 'OpenLDAP Server' \
-        -d /nonexistent -s /sbin/nologin -h -; then
-      ${ECHO_CMD} "*** Failed to add an user ldap with id 389."
-      ${ECHO_CMD}
-      ${ECHO_CMD} "Please add the ldap user manually with"
-      ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-      ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-      ${ECHO_CMD} "and retry installing this package."
-      exit 1
-    fi
-    ${GREP} -qs '^ldap$' ${FTPUSERS} || ${ECHO_CMD} ldap >> ${FTPUSERS}
-    ${ECHO_CMD} "===>  Account 'ldap' created."
-  fi
-  ;;
-esac
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index 442bf6015075..8eb93f0ad660 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -5,20 +5,31 @@ etc/openldap/slapd.ldif
 @unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
 etc/openldap/slapd.conf.default
 @exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf
+etc/openldap/schema/ppolicy.schema
 etc/openldap/schema/ppolicy.ldif
-etc/openldap/schema/pmi.schema.default
 etc/openldap/schema/pmi.schema
 etc/openldap/schema/pmi.ldif
+etc/openldap/schema/openldap.schema
 etc/openldap/schema/openldap.ldif
+etc/openldap/schema/nis.schema
 etc/openldap/schema/nis.ldif
+etc/openldap/schema/misc.schema
 etc/openldap/schema/misc.ldif
+etc/openldap/schema/java.schema
 etc/openldap/schema/java.ldif
+etc/openldap/schema/inetorgperson.schema
 etc/openldap/schema/inetorgperson.ldif
+etc/openldap/schema/dyngroup.schema
 etc/openldap/schema/dyngroup.ldif
+etc/openldap/schema/duaconf.schema
 etc/openldap/schema/duaconf.ldif
+etc/openldap/schema/cosine.schema
 etc/openldap/schema/cosine.ldif
+etc/openldap/schema/core.schema
 etc/openldap/schema/core.ldif
+etc/openldap/schema/corba.schema
 etc/openldap/schema/corba.ldif
+etc/openldap/schema/collective.schema
 etc/openldap/schema/collective.ldif
 etc/openldap/schema/README
 etc/openldap/DB_CONFIG.example
@@ -56,6 +67,10 @@ etc/openldap/DB_CONFIG.example
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.%%SHLIB_MAJOR%%
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so
+%%BACK_MDB%%libexec/openldap/back_mdb-2.4.so
+%%BACK_MDB%%libexec/openldap/back_mdb-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_MDB%%libexec/openldap/back_mdb.la
+%%BACK_MDB%%libexec/openldap/back_mdb.so
 %%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so
 %%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.%%SHLIB_MAJOR%%
 %%BACK_PASSWD%%libexec/openldap/back_passwd.la