60 files changed, 95 insertions, 95 deletions

diff --git a/devel/tcl-neo/Makefile b/devel/tcl-neo/Makefile
index c683ad30fde9..4b4ca83f80d5 100644
--- a/devel/tcl-neo/Makefile
+++ b/devel/tcl-neo/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	tclx83:${PORTSDIR}/lang/tclX \
 		db2:${PORTSDIR}/databases/db2
 
 # Not yet -- openldap used db3, neo used db2 :(
-#		ldap.2:${PORTSDIR}/net/openldap20
+#		ldap.2:${PORTSDIR}/net/openldap20-client
 
 SUBDIR=		neowebscript-3.3/neotcl8.3.0-lite/neo${PORTVERSION}
 WRKSRC=		${WRKDIR}/${SUBDIR}/generic
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index 5686f3260821..ce0742ddc593 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -86,8 +86,8 @@ describe:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_MODULES+=	"ldap"
 
 post-patch:
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 5686f3260821..ce0742ddc593 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -86,8 +86,8 @@ describe:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_MODULES+=	"ldap"
 
 post-patch:
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index 845520afb390..179492eaa49f 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -24,9 +24,9 @@ MAINTAINER=	j@pureftpd.org
 COMMENT=	A small, easy to set up, fast and very secure FTP server
 
 .if defined(WITH_LDAP) && !defined(WITH_LDAP21)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap20-client
 .elif defined(WITH_LDAP21) && !defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 .elif defined(WITH_LDAP21) && defined(WITH_LDAP)
 BROKEN=		"You may only specify WITH_LDAP xor WITH_LDAP21, but not both together"
 .endif
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 85a5b1700d90..7c2981fcbe96 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -113,7 +113,7 @@ CONFIGURE_ARGS+=	--with-msdfs
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=  ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=  ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=	--with-ldapsam
 CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index e907ce48f1f4..9959dca7a3c9 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -437,12 +437,12 @@ CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .elif exists(${LOCALBASE}/lib/libldap.la)
 .if exists(${LOCALBASE}/bin/ldapwhoami)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 .endif
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap22
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap22-client
 .endif
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 9dd2b76acffa..e2b3ee2aad2d 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -424,7 +424,7 @@ CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
 .if exists(${LOCALBASE}/lib/libldap.so.1)
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 .endif
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 9dd2b76acffa..e2b3ee2aad2d 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -424,7 +424,7 @@ CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE}
 .if exists(${LOCALBASE}/lib/libldap.so.1)
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 .endif
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 894e3d9f632d..a590680fb2b5 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -69,7 +69,7 @@ RUN_DEPENDS+=		jpilot:${PORTSDIR}/palm/jpilot
 CONFIGURE_ARGS+=	--enable-jpilot
 .endif
 .if defined(WITH_LDAP) || defined(WITH_ALL)
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=	--enable-ldap
 CONFIGURE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g}
 .endif
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index b3fa3cc0f2ad..6505ed476a0a 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -89,11 +89,11 @@ CONFIGURE_ARGS+=--with-authldap
 PLIST_SUB+=	LDAPFLAG=""
 
 .if defined(WITH_LDAP21)
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap21 \
-		lber.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap21-client \
+		lber.2:${PORTSDIR}/net/openldap21-client
 .elseif defined(WITH_LDAP20)
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
-		lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20-client \
+		lber.2:${PORTSDIR}/net/openldap20-client
 .else
 LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
diff --git a/mail/courier/scripts/configure.courier b/mail/courier/scripts/configure.courier
index 2d1b2b398cb4..c1c571b6d672 100644
--- a/mail/courier/scripts/configure.courier
+++ b/mail/courier/scripts/configure.courier
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.7 2003-08-09 22:40:32 oliver Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.8 2003-08-15 00:49:28 kuriyama Exp $
 
 [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ] && exit
 
@@ -210,7 +210,7 @@ while [ "$1" ]; do
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap21"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap21-client"
 			CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
 			LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
 			WITH_LDAP="--with-authldap"
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index 1504751a4dd3..59029b397a36 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=	--with-vpopmail
 # user database.
 #
 .if WITH_LDAP2
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+=	--with-ldap
 .endif
 
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 1504751a4dd3..59029b397a36 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=	--with-vpopmail
 # user database.
 #
 .if WITH_LDAP2
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+=	--with-ldap
 .endif
 
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index aaebf4e7dcfa..c9ac41a379c2 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -118,7 +118,7 @@ SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,,'
 .if (${LDAP_LIB_TYPE} == OPENLDAP1) || (${LDAP_LIB_TYPE} == UMICHIGAN)
 LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap12
 .elif ${LDAP_LIB_TYPE} == OPENLDAP2
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20-client
 .else
 .error LDAP_LIB_TYPE must be either OPENLDAP1 or OPENLDAP2
 .endif
diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index 4eb0de71aa50..5dbd238a81f6 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -68,7 +68,7 @@ LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 .if exists(${LOCALBASE}/lib/libldap.so.1)
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 .endif
 .endif
 RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index c98fc90580f0..7a12d2f3314a 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -174,13 +174,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix
index e4253b8579f2..681ec7971c25 100644
--- a/mail/postfix/scripts/configure.postfix
+++ b/mail/postfix/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix
index c23a1a0979f1..11f6afdf9b2b 100644
--- a/mail/postfix20/scripts/configure.postfix
+++ b/mail/postfix20/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix
index f6241a2095d1..0a3fa16de528 100644
--- a/mail/postfix21/scripts/configure.postfix
+++ b/mail/postfix21/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix
index 6689a0bde1b3..d2939fd2c957 100644
--- a/mail/postfix22/scripts/configure.postfix
+++ b/mail/postfix22/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix
index 90644950aaa8..658da9bd85b3 100644
--- a/mail/postfix23/scripts/configure.postfix
+++ b/mail/postfix23/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix
index 2b8f58e41499..a61d6ddedb6d 100644
--- a/mail/postfix24/scripts/configure.postfix
+++ b/mail/postfix24/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix
index 984d0b311587..7d2780d34605 100644
--- a/mail/postfix25/scripts/configure.postfix
+++ b/mail/postfix25/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix
index ed9bcf6f7915..4c8b62e5e757 100644
--- a/mail/postfix26/scripts/configure.postfix
+++ b/mail/postfix26/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix
index 368765b6ec24..9890daca701b 100644
--- a/mail/postfix27/scripts/configure.postfix
+++ b/mail/postfix27/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix
index 4eaa800e11e8..7da993a4e29c 100644
--- a/mail/postfix28/scripts/configure.postfix
+++ b/mail/postfix28/scripts/configure.postfix
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.37 2003-07-07 08:28:33 osa Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.38 2003-08-15 00:49:26 kuriyama Exp $
 
 if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
 	exit
@@ -180,13 +180,13 @@ while [ "$1" ]; do
 			echo "OPENLDAP_SUFFIX=	+openldap12"
 			;;
 		OpenLDAP20)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client"
 			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
 			echo "OPENLDAP_SUFFIX=	+openldap20"
 			;;
 		OpenLDAP21)
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21"
+			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client"
  			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
  			echo "POSTFIX_AUXLIBS+=	-lldap -llber"
  			echo "OPENLDAP_SUFFIX=	+openldap21"
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index 90ce24eb221a..1bd282a4f9b6 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -22,7 +22,7 @@ COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
 .if !defined(WITH_LDAP2)
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 .endif
 
 .if defined(WITH_LDAP2)
diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile
index ff0ba8ac9a42..90b3b62b1e82 100644
--- a/mail/sendmail-old/Makefile
+++ b/mail/sendmail-old/Makefile
@@ -37,8 +37,8 @@ MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20-client
 .endif
 .if defined(SENDMAIL_WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile
index ff0ba8ac9a42..90b3b62b1e82 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -37,8 +37,8 @@ MAN8=		sendmail.8 mailstats.8 makemap.8 praliases.8 smrsh.8 \
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20-client
 .endif
 .if defined(SENDMAIL_WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 894e3d9f632d..a590680fb2b5 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -69,7 +69,7 @@ RUN_DEPENDS+=		jpilot:${PORTSDIR}/palm/jpilot
 CONFIGURE_ARGS+=	--enable-jpilot
 .endif
 .if defined(WITH_LDAP) || defined(WITH_ALL)
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=	--enable-ldap
 CONFIGURE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g}
 .endif
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index d6e33c4a27a7..a64985b019a3 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index d6e33c4a27a7..a64985b019a3 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index d6e33c4a27a7..a64985b019a3 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index d6e33c4a27a7..a64985b019a3 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index af8cc30f0685..c68f33d8b6f8 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Virtual-domain capable POP3 server supporting MySQL auth
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 .endif
 
 # perl authentication
diff --git a/net-mgmt/nagios-plugins/scripts/configure b/net-mgmt/nagios-plugins/scripts/configure
index f755fd34ec53..00bc6d2674b4 100644
--- a/net-mgmt/nagios-plugins/scripts/configure
+++ b/net-mgmt/nagios-plugins/scripts/configure
@@ -97,7 +97,7 @@ while [ "$1" ]; do
 			SUB_PGSQL=""
 			;;
 		\"OpenLDAP\")
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20-client"
 			echo "CONFIGURE_ARGS+=	--enable-ldap"
 			SUB_LDAP=""
 			;;
diff --git a/net-mgmt/netsaint-plugins/scripts/configure b/net-mgmt/netsaint-plugins/scripts/configure
index c87ea1adc9f5..a58e799c2c38 100644
--- a/net-mgmt/netsaint-plugins/scripts/configure
+++ b/net-mgmt/netsaint-plugins/scripts/configure
@@ -87,7 +87,7 @@ while [ "$1" ]; do
 			SUB_PGSQL=""
 			;;
 		\"OpenLDAP\")
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20-client"
 			echo "CONFIGURE_ARGS+=	--enable-ldap"
 			SUB_LDAP=""
 			;;
diff --git a/net/nagios-plugins/scripts/configure b/net/nagios-plugins/scripts/configure
index f755fd34ec53..00bc6d2674b4 100644
--- a/net/nagios-plugins/scripts/configure
+++ b/net/nagios-plugins/scripts/configure
@@ -97,7 +97,7 @@ while [ "$1" ]; do
 			SUB_PGSQL=""
 			;;
 		\"OpenLDAP\")
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20-client"
 			echo "CONFIGURE_ARGS+=	--enable-ldap"
 			SUB_LDAP=""
 			;;
diff --git a/net/netsaint-plugins/scripts/configure b/net/netsaint-plugins/scripts/configure
index c87ea1adc9f5..a58e799c2c38 100644
--- a/net/netsaint-plugins/scripts/configure
+++ b/net/netsaint-plugins/scripts/configure
@@ -87,7 +87,7 @@ while [ "$1" ]; do
 			SUB_PGSQL=""
 			;;
 		\"OpenLDAP\")
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20-client"
 			echo "CONFIGURE_ARGS+=	--enable-ldap"
 			SUB_LDAP=""
 			;;
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 5686f3260821..ce0742ddc593 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -86,8 +86,8 @@ describe:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500043 && defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_MODULES+=	"ldap"
 
 post-patch:
diff --git a/net/samba/Makefile b/net/samba/Makefile
index beb240705c7f..62aa1c5af457 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=	--with-msdfs
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=  ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=  ldap.2:${PORTSDIR}/net/openldap20-client
 CONFIGURE_ARGS+=	--with-ldapsam
 CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index dfdf9a6388fb..98156c7f2295 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -25,8 +25,8 @@ LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap12
 .endif
 .if defined(WITH_LDAP2)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20-client
 .endif
 
 # This may be set interactively at install-time.  NNTPCache will
diff --git a/security/cyrus-sasl/scripts/configure.sasl b/security/cyrus-sasl/scripts/configure.sasl
index 33253768b3d2..33a794543eb5 100644
--- a/security/cyrus-sasl/scripts/configure.sasl
+++ b/security/cyrus-sasl/scripts/configure.sasl
@@ -155,8 +155,8 @@ while [ "$1" ]; do
 				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
-			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20-client"
+			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20-client"
 			echo "CONFIGURE_ARGS+=	--with-ldap=\${PREFIX}"
 			LDAP_REQ=ldap
 			OPENLDAP=1
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 3e17876d483b..1bc9b0163056 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--with-included-gettext=no
 # OpenLDAP 2.1.* if they want.
 
 .if defined(WITH_LDAP21)
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap21-client
 .else
 LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20-client
 .endif
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 822959d80695..440dd8d192e1 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -37,7 +37,7 @@ MAN7=		gnupg.7
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 .endif
 .if defined(WITH_LDAP) || exists(${PREFIX}/lib/libldap.so.2)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 PLIST_SUB+=	WITH_LDAP=""
 .else
 PLIST_SUB+=	WITH_LDAP="@comment "
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 822959d80695..440dd8d192e1 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -37,7 +37,7 @@ MAN7=		gnupg.7
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
 .endif
 .if defined(WITH_LDAP) || exists(${PREFIX}/lib/libldap.so.2)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 PLIST_SUB+=	WITH_LDAP=""
 .else
 PLIST_SUB+=	WITH_LDAP="@comment "
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 4ec1420bfc00..4e634682e9a4 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=		nectar@FreeBSD.ORG
 COMMENT=		A re-implementation of Kerberos V
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20-client
 .endif
 .if defined(WITH_CRACKLIB)
 BUILD_DEPENDS+= ${LOCALBASE}/lib/libcrack.a:${PORTSDIR}/security/cracklib
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 43add6bbf111..b774e1a0e7b5 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -75,7 +75,7 @@ PLIST_SUB+=	SUEXEC="@comment "
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+= --with-ldap \
 		--enable-ldap --enable-auth-ldap \
 		--with-ldap-lib="${LOCALBASE}/lib" \
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 43add6bbf111..b774e1a0e7b5 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -75,7 +75,7 @@ PLIST_SUB+=	SUEXEC="@comment "
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+= --with-ldap \
 		--enable-ldap --enable-auth-ldap \
 		--with-ldap-lib="${LOCALBASE}/lib" \
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 43add6bbf111..b774e1a0e7b5 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -75,7 +75,7 @@ PLIST_SUB+=	SUEXEC="@comment "
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+= --with-ldap \
 		--enable-ldap --enable-auth-ldap \
 		--with-ldap-lib="${LOCALBASE}/lib" \
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 43add6bbf111..b774e1a0e7b5 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -75,7 +75,7 @@ PLIST_SUB+=	SUEXEC="@comment "
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap21-client
 CONFIGURE_ARGS+= --with-ldap \
 		--enable-ldap --enable-auth-ldap \
 		--with-ldap-lib="${LOCALBASE}/lib" \
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 8581d602bd18..c2820dd38b0a 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--without-java			\
 
 # This enables kio_ldap (needed by kaddresbook).
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 8581d602bd18..c2820dd38b0a 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--without-java			\
 
 # This enables kio_ldap (needed by kaddresbook).
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 8581d602bd18..c2820dd38b0a 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--without-java			\
 
 # This enables kio_ldap (needed by kaddresbook).
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 8581d602bd18..c2820dd38b0a 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--without-java			\
 
 # This enables kio_ldap (needed by kaddresbook).
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 8581d602bd18..c2820dd38b0a 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--without-java			\
 
 # This enables kio_ldap (needed by kaddresbook).
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 8581d602bd18..c2820dd38b0a 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--without-java			\
 
 # This enables kio_ldap (needed by kaddresbook).
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 8581d602bd18..c2820dd38b0a 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--without-java			\
 
 # This enables kio_ldap (needed by kaddresbook).
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index f25be3225cf9..ed18dcd3e29a 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -65,7 +65,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 
 # kabc (the addressbook backend) can use ldap if it's available
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif
 
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index f25be3225cf9..ed18dcd3e29a 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -65,7 +65,7 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 
 # kabc (the addressbook backend) can use ldap if it's available
 .if defined(WITH_LDAP) || exists($(LOCALBASE)/lib/libldap.so)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21-client
 PLIST_APPEND+=	plist.ldap
 .endif