27 files changed, 40 insertions, 40 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index fdc24d7afd33..9e14d13fe556 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://balsa.gnome.org/ \
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A mail reader for the GNOME desktop
 
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		aspell.15:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		esmtp.6:${PORTSDIR}/mail/libesmtp
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index f21bd45f791a..d9a7b6753872 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A mail reader for the GNOME 2 desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		aspell.15:${PORTSDIR}/textproc/aspell \
 		pcre.0:${PORTSDIR}/devel/pcre \
 		esmtp.6:${PORTSDIR}/mail/libesmtp \
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 613ac090ffd8..be57aa459d64 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/openldap2
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20
 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 9c8e57e390e9..a4c64ccac470 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -72,8 +72,8 @@ CONFIGURE_ARGS+= --with-authldap
 PLIST_SUB+=	LDAPFLAG=""
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .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 d7b017c4e5c7..cb033392761b 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.5 2003-02-24 02:26:51 edwin Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.6 2003-02-24 02:56:32 edwin 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/openldap2"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
 			CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
 			LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
 			WITH_LDAP="--with-authldap"
diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile
index d736bab2d462..d41620fc0753 100644
--- a/mail/evolution-devel/Makefile
+++ b/mail/evolution-devel/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
 		soup.6:${PORTSDIR}/devel/soup
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 .endif
 RUN_DEPENDS=	gnome-spell-component-0.5:${PORTSDIR}/textproc/gnomespell \
 		gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index d736bab2d462..d41620fc0753 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS=	bonobo_conf.0:${PORTSDIR}/devel/bonobo-conf \
 		soup.6:${PORTSDIR}/devel/soup
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 .endif
 RUN_DEPENDS=	gnome-spell-component-0.5:${PORTSDIR}/textproc/gnomespell \
 		gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 7e462f2a8d4b..fbe542309173 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -115,7 +115,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/openldap2
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 .else
 .error LDAP_LIB_TYPE must be either OPENLDAP1 or OPENLDAP2
 .endif
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 227ce98e5d2c..ec77fafbe8f9 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -153,7 +153,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/openldap2
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 .else
 .error LDAP_LIB_TYPE must be either OPENLDAP1 or OPENLDAP2
 .endif
diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile
index 09a61b02940f..ee1ae4a73b24 100644
--- a/mail/horde-imp/Makefile
+++ b/mail/horde-imp/Makefile
@@ -50,8 +50,8 @@ LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
 .if !defined(WITHOUT_LDAP)
 .if defined(WITH_LDAP2)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .else
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile
index f5488c3b90f1..df1f9d61dbb1 100644
--- a/mail/horde-turba/Makefile
+++ b/mail/horde-turba/Makefile
@@ -36,8 +36,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .endif
 .endif
 
diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile
index 09a61b02940f..ee1ae4a73b24 100644
--- a/mail/horde4-imp/Makefile
+++ b/mail/horde4-imp/Makefile
@@ -50,8 +50,8 @@ LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
 .if !defined(WITHOUT_LDAP)
 .if defined(WITH_LDAP2)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .else
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile
index f5488c3b90f1..df1f9d61dbb1 100644
--- a/mail/horde4-turba/Makefile
+++ b/mail/horde4-turba/Makefile
@@ -36,8 +36,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .endif
 .endif
 
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 09a61b02940f..ee1ae4a73b24 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -50,8 +50,8 @@ LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
 .if !defined(WITHOUT_LDAP)
 .if defined(WITH_LDAP2)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .else
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
diff --git a/mail/imp3/Makefile b/mail/imp3/Makefile
index e0051f3276cf..e9cf1639fa85 100644
--- a/mail/imp3/Makefile
+++ b/mail/imp3/Makefile
@@ -72,8 +72,8 @@ LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .endif
 .endif
 RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index 1ba0b14f0e87..7db0508bafbf 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/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 .endif
 
 .if defined(WITH_LDAP2)
diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile
index 51a063ad03ba..1960ed5394f2 100644
--- a/mail/sendmail-old/Makefile
+++ b/mail/sendmail-old/Makefile
@@ -38,8 +38,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/openldap2
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 .endif
 .if defined(SENDMAIL_WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 3c8a40f3a4a2..09b282a4bf8d 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -40,8 +40,8 @@ PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 .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 51a063ad03ba..1960ed5394f2 100644
--- a/mail/sendmail811/Makefile
+++ b/mail/sendmail811/Makefile
@@ -38,8 +38,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/openldap2
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 .endif
 .if defined(SENDMAIL_WITH_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 3c8a40f3a4a2..09b282a4bf8d 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -40,8 +40,8 @@ PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==}
 
 .if defined(SENDMAIL_WITH_LDAP)
 PKGNAMESUFFIX?=	-ldap
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
-LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	lber.2:${PORTSDIR}/net/openldap20
 .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 613ac090ffd8..be57aa459d64 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/openldap2
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=	--enable-ldap
 CONFIGURE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:S/"//g}
 .endif
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 1208bb31d087..bc28c71de898 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 1208bb31d087..bc28c71de898 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile
index 1208bb31d087..bc28c71de898 100644
--- a/mail/sylpheed2/Makefile
+++ b/mail/sylpheed2/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile
index 1208bb31d087..bc28c71de898 100644
--- a/mail/sylpheed3/Makefile
+++ b/mail/sylpheed3/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--enable-jpilot
 CONFIGURE_ARGS+=	--disable-jpilot
 .endif
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=--enable-ldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index 7ba6a04abb56..af8cc30f0685 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/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 .endif
 
 # perl authentication
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index f5488c3b90f1..df1f9d61dbb1 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -36,8 +36,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12 \
 		lber.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2 \
-		lber.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20 \
+		lber.2:${PORTSDIR}/net/openldap20
 .endif
 .endif