Improve toward multithreading:

	- Use Sleepycat Berkeley DB 3.2 that OpenLDAP2's README
	recommends.  It is known to be multithread friendlier than
	Berkeley DB 1.85 included in our libc or GDBM.

	- Add -D_REENTRANT and -D_THREAD_SAFE to CPPFLAGS

Submitted by:	Yarema <yds@dppl.com>

9 files changed, 81 insertions, 90 deletions

diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap2/Makefile
+++ b/net/openldap2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap20-server/Makefile
+++ b/net/openldap20-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap20/Makefile b/net/openldap20/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap20/Makefile
+++ b/net/openldap20/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap21-server/Makefile b/net/openldap21-server/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap21-server/Makefile
+++ b/net/openldap21-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap21/Makefile b/net/openldap21/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap21/Makefile
+++ b/net/openldap21/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap22-server/Makefile b/net/openldap22-server/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap22-server/Makefile
+++ b/net/openldap22-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap22/Makefile b/net/openldap22/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap22/Makefile
+++ b/net/openldap22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap23-server/Makefile
+++ b/net/openldap23-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 070e623d7112..89fb38e000f5 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	openldap
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	net databases
 MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
 		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
@@ -22,6 +23,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	knu@FreeBSD.org
 
+LIB_DEPENDS=	db3.2:${PORTSDIR}/databases/db3
+
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
@@ -37,18 +40,14 @@ CONFIGURE_ARGS=	--localstatedir=/var/run \
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
+CPPFLAGS+=	-D_REENTRANT -D_THREAD_SAFE \
+		-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/db3
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db
-CPPFLAGS+=	-I${LOCALBASE}/include/db2 -D_THREAD_SAFE
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
 .if defined(WITH_SASL)
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 CPPFLAGS+=	-I${LOCALBASE}/include/sasl
 .endif
 
@@ -56,7 +55,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 INSTALLS_SHLIB=	yes
- 
+
 BINS=		bin/ldapadd \
 		bin/ldapdelete \
 		bin/ldapmodify \