net/openldap21 to 2.1.16

PR:		ports/50406
Submitted by:	Christian Kratzer <ck@cksoft.de>

18 files changed, 90 insertions, 54 deletions

diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index 0c12e7e8ee5d..89db892a196b 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -15,7 +15,7 @@
 #
 
 PORTNAME=	openldap21
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.16
 PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/		\
@@ -38,23 +38,22 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ck@cksoft.de
 COMMENT=	Open source LDAP client and server software
 
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS+=	db41:${PORTSDIR}/databases/db41
 
-CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
-CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
+CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
-LATEST_LINK=	openldap21
 
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--enable-bdb
-			
+CONFIGURE_ARGS+=--prefix=${PREFIX} 	\
+		--enable-bdb		\
+		--enable-crypt
 
 # ------------------------------------------------------------------------------
 # common configure
diff --git a/net/openldap21-server/distinfo b/net/openldap21-server/distinfo
index cf56207acf86..341239892452 100644
--- a/net/openldap21-server/distinfo
+++ b/net/openldap21-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-2.1.12.tgz) = 23a38674ed6067a92b2f2c977f92a485
+MD5 (openldap-2.1.16.tgz) = 3f8e481dd25b19569f2b1cf2bce55e63
diff --git a/net/openldap21-server/pkg-message b/net/openldap21-server/pkg-message
index 047bb0c9d5b4..6775d6ae6b95 100644
--- a/net/openldap21-server/pkg-message
+++ b/net/openldap21-server/pkg-message
@@ -5,3 +5,10 @@ convert the *.dbb files, e.g:
 	mv file.dbb file.old
 	db_dump185 file.old | db_load file.dbb
 ************************************************************
+************************************************************
+If you are upgrading an older (1.85) database, be sure to
+convert the *.dbb files, e.g:
+
+	mv file.dbb file.old
+	db_dump185 file.old | db_load file.dbb
+************************************************************
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index 0c12e7e8ee5d..89db892a196b 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -15,7 +15,7 @@
 #
 
 PORTNAME=	openldap21
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.16
 PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/		\
@@ -38,23 +38,22 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ck@cksoft.de
 COMMENT=	Open source LDAP client and server software
 
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS+=	db41:${PORTSDIR}/databases/db41
 
-CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
-CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
+CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
-LATEST_LINK=	openldap21
 
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--enable-bdb
-			
+CONFIGURE_ARGS+=--prefix=${PREFIX} 	\
+		--enable-bdb		\
+		--enable-crypt
 
 # ------------------------------------------------------------------------------
 # common configure
diff --git a/net/openldap21/distinfo b/net/openldap21/distinfo
index cf56207acf86..341239892452 100644
--- a/net/openldap21/distinfo
+++ b/net/openldap21/distinfo
@@ -1 +1 @@
-MD5 (openldap-2.1.12.tgz) = 23a38674ed6067a92b2f2c977f92a485
+MD5 (openldap-2.1.16.tgz) = 3f8e481dd25b19569f2b1cf2bce55e63
diff --git a/net/openldap21/pkg-message b/net/openldap21/pkg-message
index 047bb0c9d5b4..6775d6ae6b95 100644
--- a/net/openldap21/pkg-message
+++ b/net/openldap21/pkg-message
@@ -5,3 +5,10 @@ convert the *.dbb files, e.g:
 	mv file.dbb file.old
 	db_dump185 file.old | db_load file.dbb
 ************************************************************
+************************************************************
+If you are upgrading an older (1.85) database, be sure to
+convert the *.dbb files, e.g:
+
+	mv file.dbb file.old
+	db_dump185 file.old | db_load file.dbb
+************************************************************
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 0c12e7e8ee5d..89db892a196b 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -15,7 +15,7 @@
 #
 
 PORTNAME=	openldap21
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.16
 PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/		\
@@ -38,23 +38,22 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ck@cksoft.de
 COMMENT=	Open source LDAP client and server software
 
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS+=	db41:${PORTSDIR}/databases/db41
 
-CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
-CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
+CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
-LATEST_LINK=	openldap21
 
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--enable-bdb
-			
+CONFIGURE_ARGS+=--prefix=${PREFIX} 	\
+		--enable-bdb		\
+		--enable-crypt
 
 # ------------------------------------------------------------------------------
 # common configure
diff --git a/net/openldap22-server/distinfo b/net/openldap22-server/distinfo
index cf56207acf86..341239892452 100644
--- a/net/openldap22-server/distinfo
+++ b/net/openldap22-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-2.1.12.tgz) = 23a38674ed6067a92b2f2c977f92a485
+MD5 (openldap-2.1.16.tgz) = 3f8e481dd25b19569f2b1cf2bce55e63
diff --git a/net/openldap22-server/pkg-message b/net/openldap22-server/pkg-message
index 047bb0c9d5b4..6775d6ae6b95 100644
--- a/net/openldap22-server/pkg-message
+++ b/net/openldap22-server/pkg-message
@@ -5,3 +5,10 @@ convert the *.dbb files, e.g:
 	mv file.dbb file.old
 	db_dump185 file.old | db_load file.dbb
 ************************************************************
+************************************************************
+If you are upgrading an older (1.85) database, be sure to
+convert the *.dbb files, e.g:
+
+	mv file.dbb file.old
+	db_dump185 file.old | db_load file.dbb
+************************************************************
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index 0c12e7e8ee5d..89db892a196b 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -15,7 +15,7 @@
 #
 
 PORTNAME=	openldap21
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.16
 PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/		\
@@ -38,23 +38,22 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ck@cksoft.de
 COMMENT=	Open source LDAP client and server software
 
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS+=	db41:${PORTSDIR}/databases/db41
 
-CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
-CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
+CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
-LATEST_LINK=	openldap21
 
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--enable-bdb
-			
+CONFIGURE_ARGS+=--prefix=${PREFIX} 	\
+		--enable-bdb		\
+		--enable-crypt
 
 # ------------------------------------------------------------------------------
 # common configure
diff --git a/net/openldap22/distinfo b/net/openldap22/distinfo
index cf56207acf86..341239892452 100644
--- a/net/openldap22/distinfo
+++ b/net/openldap22/distinfo
@@ -1 +1 @@
-MD5 (openldap-2.1.12.tgz) = 23a38674ed6067a92b2f2c977f92a485
+MD5 (openldap-2.1.16.tgz) = 3f8e481dd25b19569f2b1cf2bce55e63
diff --git a/net/openldap22/pkg-message b/net/openldap22/pkg-message
index 047bb0c9d5b4..6775d6ae6b95 100644
--- a/net/openldap22/pkg-message
+++ b/net/openldap22/pkg-message
@@ -5,3 +5,10 @@ convert the *.dbb files, e.g:
 	mv file.dbb file.old
 	db_dump185 file.old | db_load file.dbb
 ************************************************************
+************************************************************
+If you are upgrading an older (1.85) database, be sure to
+convert the *.dbb files, e.g:
+
+	mv file.dbb file.old
+	db_dump185 file.old | db_load file.dbb
+************************************************************
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 0c12e7e8ee5d..89db892a196b 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -15,7 +15,7 @@
 #
 
 PORTNAME=	openldap21
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.16
 PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/		\
@@ -38,23 +38,22 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ck@cksoft.de
 COMMENT=	Open source LDAP client and server software
 
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS+=	db41:${PORTSDIR}/databases/db41
 
-CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
-CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
+CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
-LATEST_LINK=	openldap21
 
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--enable-bdb
-			
+CONFIGURE_ARGS+=--prefix=${PREFIX} 	\
+		--enable-bdb		\
+		--enable-crypt
 
 # ------------------------------------------------------------------------------
 # common configure
diff --git a/net/openldap23-server/distinfo b/net/openldap23-server/distinfo
index cf56207acf86..341239892452 100644
--- a/net/openldap23-server/distinfo
+++ b/net/openldap23-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-2.1.12.tgz) = 23a38674ed6067a92b2f2c977f92a485
+MD5 (openldap-2.1.16.tgz) = 3f8e481dd25b19569f2b1cf2bce55e63
diff --git a/net/openldap23-server/pkg-message b/net/openldap23-server/pkg-message
index 047bb0c9d5b4..6775d6ae6b95 100644
--- a/net/openldap23-server/pkg-message
+++ b/net/openldap23-server/pkg-message
@@ -5,3 +5,10 @@ convert the *.dbb files, e.g:
 	mv file.dbb file.old
 	db_dump185 file.old | db_load file.dbb
 ************************************************************
+************************************************************
+If you are upgrading an older (1.85) database, be sure to
+convert the *.dbb files, e.g:
+
+	mv file.dbb file.old
+	db_dump185 file.old | db_load file.dbb
+************************************************************
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 0c12e7e8ee5d..89db892a196b 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -15,7 +15,7 @@
 #
 
 PORTNAME=	openldap21
-PORTVERSION=	2.1.12
+PORTVERSION=	2.1.16
 PORTREVISION=	0
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/		\
@@ -38,23 +38,22 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ck@cksoft.de
 COMMENT=	Open source LDAP client and server software
 
-LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
+LIB_DEPENDS+=	db41:${PORTSDIR}/databases/db41
 
-CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
-CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db4
+CXXFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
+CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} -I${LOCALBASE}/include/db41
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 USE_OPENSSL=	yes
 HAS_CONFIGURE=	yes
-LATEST_LINK=	openldap21
 
 CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-CONFIGURE_ARGS+=--prefix=${PREFIX} \
-		--enable-bdb
-			
+CONFIGURE_ARGS+=--prefix=${PREFIX} 	\
+		--enable-bdb		\
+		--enable-crypt
 
 # ------------------------------------------------------------------------------
 # common configure
diff --git a/net/openldap24-server/distinfo b/net/openldap24-server/distinfo
index cf56207acf86..341239892452 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1 +1 @@
-MD5 (openldap-2.1.12.tgz) = 23a38674ed6067a92b2f2c977f92a485
+MD5 (openldap-2.1.16.tgz) = 3f8e481dd25b19569f2b1cf2bce55e63
diff --git a/net/openldap24-server/pkg-message b/net/openldap24-server/pkg-message
index 047bb0c9d5b4..6775d6ae6b95 100644
--- a/net/openldap24-server/pkg-message
+++ b/net/openldap24-server/pkg-message
@@ -5,3 +5,10 @@ convert the *.dbb files, e.g:
 	mv file.dbb file.old
 	db_dump185 file.old | db_load file.dbb
 ************************************************************
+************************************************************
+If you are upgrading an older (1.85) database, be sure to
+convert the *.dbb files, e.g:
+
+	mv file.dbb file.old
+	db_dump185 file.old | db_load file.dbb
+************************************************************