Point dependencies on net/openldap2 to net/openldap20

21 files changed, 11 insertions, 541 deletions

diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index e18c0842755a..71b5e2897b07 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.96.0/sources/
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		bonobo-2.0:${PORTSDIR}/devel/libbonobo
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index e18c0842755a..71b5e2897b07 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.96.0/sources/
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		bonobo-2.0:${PORTSDIR}/devel/libbonobo
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index e18c0842755a..71b5e2897b07 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.gnomemeeting.org/downloads/0.96.0/sources/
 
 MAINTAINER=	roger@FreeBSD.org
 
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2 \
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20 \
 		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
 		bonobo-2.0:${PORTSDIR}/devel/libbonobo
 BUILD_DEPENDS=  ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 04899b6742ac..f887575ef84c 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 .if defined(WITH_OPENLDAP1)
 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(WITHOUT_JPEGPHOTO)
diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index 2cd4975ec5d5..c540e12ff626 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 .if defined(WITH_OPENLDAP1)
 LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .else
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
 .endif
 
 do-install:
diff --git a/net/nagios-plugins/scripts/configure b/net/nagios-plugins/scripts/configure
index 66a3aee9dca6..f0627b4cce9b 100644
--- a/net/nagios-plugins/scripts/configure
+++ b/net/nagios-plugins/scripts/configure
@@ -89,7 +89,7 @@ while [ "$1" ]; do
 			SUB_PGSQL=""
 			;;
 		\"OpenLDAP\")
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap2"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
 			echo "CONFIGURE_ARGS+=	--enable-ldap"
 			SUB_LDAP=""
 			;;
diff --git a/net/netsaint-plugins/scripts/configure b/net/netsaint-plugins/scripts/configure
index cb5b819b257d..c87ea1adc9f5 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/openldap2"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
 			echo "CONFIGURE_ARGS+=	--enable-ldap"
 			SUB_LDAP=""
 			;;
diff --git a/net/openldap2/Makefile b/net/openldap2/Makefile
deleted file mode 100644
index dcf79d4c8d3c..000000000000
--- a/net/openldap2/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 2.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	2.0.25
-PORTREVISION=	3
-CATEGORIES=	net databases
-MASTER_SITES=	ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.net.lut.ac.uk/openldap/%SUBDIR%/ \
-		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://mirror.aarnet.edu.au/pub/OpenLDAP/%SUBDIR%/ \
-		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-		http://www.unibase.cz/ldapcz/Programy/Free/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.loxinfo.co.th/pub/unix/LDAP/OpenLDAP/%SUBDIR%/ \
-		ftp://ftp.zcu.cz/pub/network/openldap/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Open source LDAP client and server software
-
-LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
-
-USE_AUTOCONF_VER=213
-USE_LIBTOOL=	yes
-USE_OPENSSL=	yes
-USE_REINPLACE=	yes
-
-LATEST_LINK=	openldap2
-
-CONFIGURE_ARGS=	--localstatedir=/var/db \
-		--with-threads \
-		--enable-shared \
-		--enable-dnssrv \
-		--with-tls=openssl
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-# math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both.
-CPPFLAGS+=	-D_REENTRANT ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/db3
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-.if defined(WITH_SASL)
-LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=	-I${LOCALBASE}/include/sasl1
-.endif
-
-.if defined(WITH_ODBC)
-LIB_DEPENDS+=	iodbc.3:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+=--enable-sql
-.endif
-
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-
-INSTALLS_SHLIB=	yes
-
-BINS=		bin/ldapadd \
-		bin/ldapdelete \
-		bin/ldapmodify \
-		bin/ldapmodrdn \
-		bin/ldappasswd \
-		bin/ldapsearch \
-		bin/ud \
-		libexec/fax500 \
-		libexec/go500 \
-		libexec/go500gw \
-		libexec/in.xfingerd \
-		libexec/mail500 \
-		libexec/maildap \
-		libexec/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's@%LOCALSTATEDIR%/slapd[.]pid@/var/run/slapd.pid@g; \
-		s@%LOCALSTATEDIR%/slapd[.]args@/var/run/slapd.args@g' ${WRKSRC}/servers/slapd/slapd.conf
-
-post-configure:
-	@cd ${WRKSRC} ; ${PATCH} < ${FILESDIR}/libtool.diff
-
-pre-build:
-	@cd ${WRKSRC} ; ${MAKE} depend
-
-post-build:
-	@${SED} 's,@@PREFIX@@,${PREFIX},g' ${FILESDIR}/slapd.sh >${WRKDIR}/slapd.sh
-
-post-install:
-.for f in ${BINS}
-	@strip ${PREFIX}/${f}
-.endfor
-	@${INSTALL_SCRIPT} ${WRKDIR}/slapd.sh ${PREFIX}/etc/rc.d/slapd.sh.sample
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap2/distinfo b/net/openldap2/distinfo
deleted file mode 100644
index f601d787d61f..000000000000
--- a/net/openldap2/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-2.0.25.tgz) = 57ed9ea3d872595076d6eab7b93337bd
diff --git a/net/openldap2/files/libtool.diff b/net/openldap2/files/libtool.diff
deleted file mode 100644
index 0cf57bbee7ea..000000000000
--- a/net/openldap2/files/libtool.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- libtool.orig	Tue Oct 31 01:43:06 2000
-+++ libtool	Tue Oct 31 01:44:42 2000
-@@ -448,6 +448,16 @@
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --only-shared)
-+    build_libtool_libs=yes
-+    build_old_libs=no
-+    ;;
-+
-+  --only-static)
-+    build_libtool_libs=no
-+    build_old_libs=yes
-+    ;;
-+
-   --quiet | --silent)
-     show=:
-     ;;
diff --git a/net/openldap2/files/manpages b/net/openldap2/files/manpages
deleted file mode 100644
index 1c39b81911fc..000000000000
--- a/net/openldap2/files/manpages
+++ /dev/null
@@ -1,219 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	lber-memory.3
-MAN3+=	lber-types.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_compare.3
-MAN3+=	ldap_delete.3
-MAN3+=	ldap_disptmpl.3
-MAN3+=	ldap_entry2text.3
-MAN3+=	ldap_error.3
-MAN3+=	ldap_first_attribute.3
-MAN3+=	ldap_first_entry.3
-MAN3+=	ldap_friendly.3
-MAN3+=	ldap_get_dn.3
-MAN3+=	ldap_get_values.3
-MAN3+=	ldap_getfilter.3
-MAN3+=	ldap_modify.3
-MAN3+=	ldap_modrdn.3
-MAN3+=	ldap_open.3
-MAN3+=	ldap_result.3
-MAN3+=	ldap_schema.3
-MAN3+=	ldap_search.3
-MAN3+=	ldap_searchprefs.3
-MAN3+=	ldap_sort.3
-MAN3+=	ldap_ufn.3
-MAN3+=	ldap_url.3
-MAN5+=	ldap.conf.5
-MAN5+=	ldapfilter.conf.5
-MAN5+=	ldapfriendly.5
-MAN5+=	ldapsearchprefs.conf.5
-MAN5+=	ldaptemplates.conf.5
-MAN5+=	ldif.5
-MAN5+=	slapd.conf.5
-MAN5+=	slapd.replog.5
-MAN5+=	ud.conf.5
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapadd.8
-MAN8+=	slapcat.8
-MAN8+=	slapd.8
-MAN8+=	slapindex.8
-MAN8+=	slappasswd.8
-MAN8+=	slurpd.8
-MLINKS+=	lber-decode.3 ber_first_element.3
-MLINKS+=	lber-decode.3 ber_get_bitstring.3
-MLINKS+=	lber-decode.3 ber_get_boolean.3
-MLINKS+=	lber-decode.3 ber_get_enum.3
-MLINKS+=	lber-decode.3 ber_get_int.3
-MLINKS+=	lber-decode.3 ber_get_next.3
-MLINKS+=	lber-decode.3 ber_get_null.3
-MLINKS+=	lber-decode.3 ber_get_stringa.3
-MLINKS+=	lber-decode.3 ber_get_stringb.3
-MLINKS+=	lber-decode.3 ber_next_element.3
-MLINKS+=	lber-decode.3 ber_peek_tag.3
-MLINKS+=	lber-decode.3 ber_scanf.3
-MLINKS+=	lber-decode.3 ber_skip_tag.3
-MLINKS+=	lber-encode.3 ber_alloc_t.3
-MLINKS+=	lber-encode.3 ber_flush.3
-MLINKS+=	lber-encode.3 ber_printf.3
-MLINKS+=	lber-encode.3 ber_put_enum.3
-MLINKS+=	lber-encode.3 ber_put_int.3
-MLINKS+=	lber-encode.3 ber_put_null.3
-MLINKS+=	lber-encode.3 ber_put_ostring.3
-MLINKS+=	lber-encode.3 ber_put_seq.3
-MLINKS+=	lber-encode.3 ber_put_set.3
-MLINKS+=	lber-encode.3 ber_put_string.3
-MLINKS+=	lber-decode.3 ber_start_set.3
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_s.3
-MLINKS+=	ldap_bind.3 ldap_abandon_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext.3
-MLINKS+=	ldap_bind.3 ldap_add_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind1_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind2_s.3
-MLINKS+=	ldap_bind.3 ldap_kerberos_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind.3
-MLINKS+=	ldap_bind.3 ldap_sasl_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_set_rebind_proc.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind.3
-MLINKS+=	ldap_bind.3 ldap_simple_bind_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext.3
-MLINKS+=	ldap_bind.3 ldap_unbind_ext_s.3
-MLINKS+=	ldap_bind.3 ldap_unbind_s.3
-MLINKS+=	ldap_cache.3 ldap_destroy_cache.3
-MLINKS+=	ldap_cache.3 ldap_disable_cache.3
-MLINKS+=	ldap_cache.3 ldap_enable_cache.3
-MLINKS+=	ldap_cache.3 ldap_flush_cache.3
-MLINKS+=	ldap_cache.3 ldap_set_cache_options.3
-MLINKS+=	ldap_cache.3 ldap_uncache_entry.3
-MLINKS+=	ldap_cache.3 ldap_uncache_request.3
-MLINKS+=	ldap_charset.3 ldap_8859_to_t61.3
-MLINKS+=	ldap_charset.3 ldap_enable_translation.3
-MLINKS+=	ldap_charset.3 ldap_set_string_translators.3
-MLINKS+=	ldap_charset.3 ldap_t61_to_8859.3
-MLINKS+=	ldap_charset.3 ldap_translate_from_t61.3
-MLINKS+=	ldap_charset.3 ldap_translate_to_t61.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext.3
-MLINKS+=	ldap_compare.3 ldap_compare_ext_s.3
-MLINKS+=	ldap_compare.3 ldap_compare_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext.3
-MLINKS+=	ldap_delete.3 ldap_delete_ext_s.3
-MLINKS+=	ldap_delete.3 ldap_delete_s.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_first_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_free_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates.3
-MLINKS+=	ldap_disptmpl.3 ldap_init_templates_buf.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_disptmpl.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplcol.3
-MLINKS+=	ldap_disptmpl.3 ldap_next_tmplrow.3
-MLINKS+=	ldap_disptmpl.3 ldap_oc2template.3
-MLINKS+=	ldap_disptmpl.3 ldap_tmplattrs.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2html_search.3
-MLINKS+=	ldap_entry2text.3 ldap_entry2text_search.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2html.3
-MLINKS+=	ldap_entry2text.3 ldap_vals2text.3
-MLINKS+=	ldap_error.3 ld_errno.3
-MLINKS+=	ldap_error.3 ldap_err2string.3
-MLINKS+=	ldap_error.3 ldap_errlist.3
-MLINKS+=	ldap_error.3 ldap_perror.3
-MLINKS+=	ldap_error.3 ldap_result2error.3
-MLINKS+=	ldap_first_attribute.3 ldap_next_attribute.3
-MLINKS+=	ldap_first_entry.3 ldap_count_entries.3
-MLINKS+=	ldap_first_entry.3 ldap_next_entry.3
-MLINKS+=	ldap_friendly.3 ldap_free_friendlymap.3
-MLINKS+=	ldap_friendly.3 ldap_friendly_name.3
-MLINKS+=	ldap_get_dn.3 ldap_dn2ufn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dn.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_dns.3
-MLINKS+=	ldap_get_dn.3 ldap_explode_rdn.3
-MLINKS+=	ldap_get_dn.3 ldap_is_dns_dn.3
-MLINKS+=	ldap_get_values.3 ldap_count_values.3
-MLINKS+=	ldap_get_values.3 ldap_count_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_get_values_len.3
-MLINKS+=	ldap_get_values.3 ldap_value_free.3
-MLINKS+=	ldap_get_values.3 ldap_value_free_len.3
-MLINKS+=	ldap_getfilter.3 ldap_build_filter.3
-MLINKS+=	ldap_getfilter.3 ldap_getfilter_free.3
-MLINKS+=	ldap_getfilter.3 ldap_getfirstfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_getnextfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter.3
-MLINKS+=	ldap_getfilter.3 ldap_init_getfilter_buf.3
-MLINKS+=	ldap_getfilter.3 ldap_setfilteraffixes.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext.3
-MLINKS+=	ldap_modify.3 ldap_modify_ext_s.3
-MLINKS+=	ldap_modify.3 ldap_modify_s.3
-MLINKS+=	ldap_modify.3 ldap_mods_free.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn2_s.3
-MLINKS+=	ldap_modrdn.3 ldap_modrdn_s.3
-MLINKS+=	ldap_open.3 ldap_init.3
-MLINKS+=	ldap_result.3 ldap_msgfree.3
-MLINKS+=	ldap_result.3 ldap_msgid.3
-MLINKS+=	ldap_result.3 ldap_msgtype.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2name.3
-MLINKS+=	ldap_schema.3 ldap_attributetype2str.3
-MLINKS+=	ldap_schema.3 ldap_attributetype_free.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2name.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule2str.3
-MLINKS+=	ldap_schema.3 ldap_matchingrule_free.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2name.3
-MLINKS+=	ldap_schema.3 ldap_objectclass2str.3
-MLINKS+=	ldap_schema.3 ldap_objectclass_free.3
-MLINKS+=	ldap_schema.3 ldap_scherr2str.3
-MLINKS+=	ldap_schema.3 ldap_str2attributetype.3
-MLINKS+=	ldap_schema.3 ldap_str2matchingrule.3
-MLINKS+=	ldap_schema.3 ldap_str2objectclass.3
-MLINKS+=	ldap_schema.3 ldap_str2syntax.3
-MLINKS+=	ldap_schema.3 ldap_syntax2name.3
-MLINKS+=	ldap_schema.3 ldap_syntax2str.3
-MLINKS+=	ldap_schema.3 ldap_syntax_free.3
-MLINKS+=	ldap_search.3 ldap_search_ext.3
-MLINKS+=	ldap_search.3 ldap_search_ext_s.3
-MLINKS+=	ldap_search.3 ldap_search_s.3
-MLINKS+=	ldap_search.3 ldap_search_st.3
-MLINKS+=	ldap_searchprefs.3 ldap_first_searchobj.3
-MLINKS+=	ldap_searchprefs.3 ldap_free_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs.3
-MLINKS+=	ldap_searchprefs.3 ldap_init_searchprefs_buf.3
-MLINKS+=	ldap_searchprefs.3 ldap_next_searchobj.3
-MLINKS+=	ldap_sort.3 ldap_sort_entries.3
-MLINKS+=	ldap_sort.3 ldap_sort_strcasecmp.3
-MLINKS+=	ldap_sort.3 ldap_sort_values.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_c.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_ct.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_search_s.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setfilter.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_setprefix.3
-MLINKS+=	ldap_ufn.3 ldap_ufn_timeout.3
-MLINKS+=	ldap_url.3 ldap_free_urldesc.3
-MLINKS+=	ldap_url.3 ldap_is_ldap_url.3
-MLINKS+=	ldap_url.3 ldap_url_parse.3
-MLINKS+=	ldap_url.3 ldap_url_search.3
-MLINKS+=	ldap_url.3 ldap_url_search_s.3
-MLINKS+=	ldap_url.3 ldap_url_search_st.3
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap2/files/patch-clients_ud_Makefile.in b/net/openldap2/files/patch-clients_ud_Makefile.in
deleted file mode 100644
index 18f342c29a53..000000000000
--- a/net/openldap2/files/patch-clients_ud_Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- clients/ud/Makefile.in.orig	Wed Jan 13 20:02:11 1999
-+++ clients/ud/Makefile.in	Wed Jul 26 14:24:14 2000
-@@ -26,4 +26,4 @@
- install-local: FORCE
- 	-$(MKDIR) $(bindir)
- 	-mv -f $(bindir)/ud $(bindir)/ud-
--	$(LTINSTALL) $(INSTALLFLAGS) -m 775 ud $(bindir)
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
diff --git a/net/openldap2/files/patch-servers_slapd_schema b/net/openldap2/files/patch-servers_slapd_schema
deleted file mode 100644
index 31969e8bb621..000000000000
--- a/net/openldap2/files/patch-servers_slapd_schema
+++ /dev/null
@@ -1,20 +0,0 @@
---- servers/slapd/schema/krb5-kdc.schema.orig	Tue Sep  5 13:28:34 2000
-+++ servers/slapd/schema/krb5-kdc.schema	Mon Oct 30 13:09:19 2000
-@@ -96,7 +96,7 @@
- attributetype ( 1.3.6.1.4.1.5322.10.1.10
- 	NAME 'krb5Key'
- 	DESC 'Encoded ASN1 Key as an octet string'
--	SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 )
-+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
- 
- attributetype ( 1.3.6.1.4.1.5322.10.1.11
- 	NAME 'krb5PrincipalRealm'
-@@ -112,7 +112,7 @@
- 
- objectclass ( 1.3.6.1.4.1.5322.10.2.1
- 	NAME 'krb5Principal'
--	SUP top
-+	SUP person
- 	AUXILIARY
- 	MUST ( krb5PrincipalName )
- 	MAY ( cn $ krb5PrincipalRealm ) )
diff --git a/net/openldap2/files/slapd.sh b/net/openldap2/files/slapd.sh
deleted file mode 100644
index e6305bb448fa..000000000000
--- a/net/openldap2/files/slapd.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd_program=@@PREFIX@@/libexec/slapd
-
-# Uncomment one of the following:
-#
-# IPv4 Only
-#slapd_args='-h ldap://0.0.0.0;'
-#
-# IPv6 and IPv4
-#slapd_ags='-h "ldap://[::] ldap://0.0.0.0";'
-#
-# IPv6 Only
-#slapd_args='-h ldap://[::];'
-#
-#
-slapd_args=
-
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	${slapd_program} ${slapd_args}
-
-    fi
-    ;;
-stop)
-    if [ -f $pidfile ]; then
-	kill `cat $pidfile`
-	telnet localhost ldap </dev/null >/dev/null 2>&1
-	echo -n ' slapd'
-	rm $pidfile
-    else
-	echo ' slapd: not running'
-    fi
-    ;;
-*)
-    echo "Usage: `basename $0` {start|stop}" >&2
-    exit 64
-    ;;
-esac
-
-exit 0
diff --git a/net/openldap2/pkg-descr b/net/openldap2/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap2/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (LDAP) servers,
-clients, utilities and development tools. LDAP is an Internet standard
-directory service protocol that can be used stand-alone, or as a front end
-to an X.500 directory. LDAP is defined by RFCs 1777 through 1779.
-
-OpenLDAP is derived from the University of Michigan LDAP release 3.3 and is
-distributed under an open source license.
-
-WWW: http://www.openldap.org/
-
-Lachlan O'Dea
-ulmo@earthling.net
diff --git a/net/openldap2/pkg-message b/net/openldap2/pkg-message
deleted file mode 100644
index 047bb0c9d5b4..000000000000
--- a/net/openldap2/pkg-message
+++ /dev/null
@@ -1,7 +0,0 @@
-************************************************************
-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/openldap2/pkg-plist b/net/openldap2/pkg-plist
deleted file mode 100644
index e94071bafa99..000000000000
--- a/net/openldap2/pkg-plist
+++ /dev/null
@@ -1,88 +0,0 @@
-bin/ldapadd
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ud
-@unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
-@exec [ -f %B/ldap.conf ] || cp %B/%f %B/ldap.conf
-@unexec if cmp -s %D/etc/openldap/ldapfilter.conf %D/etc/openldap/ldapfilter.conf.default; then rm -f %D/etc/openldap/ldapfilter.conf; fi
-etc/openldap/ldapfilter.conf.default
-@exec [ -f %B/ldapfilter.conf ] || cp %B/%f %B/ldapfilter.conf
-@unexec if cmp -s %D/etc/openldap/ldapsearchprefs.conf %D/etc/openldap/ldapsearchprefs.conf.default; then rm -f %D/etc/openldap/ldapsearchprefs.conf; fi
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ -f %B/ldapsearchprefs.conf ] || cp %B/%f %B/ldapsearchprefs.conf
-@unexec if cmp -s %D/etc/openldap/ldaptemplates.conf %D/etc/openldap/ldaptemplates.conf.default; then rm -f %D/etc/openldap/ldaptemplates.conf; fi
-etc/openldap/ldaptemplates.conf.default
-@exec [ -f %B/ldaptemplates.conf ] || cp %B/%f %B/ldaptemplates.conf
-@unexec if cmp -s %D/etc/openldap/schema/corba.schema %D/etc/openldap/schema/corba.schema.default; then rm -f %D/etc/openldap/schema/corba.schema; fi
-etc/openldap/schema/corba.schema.default
-@exec [ -f %B/corba.schema ] || cp %B/%f %B/corba.schema
-@unexec if cmp -s %D/etc/openldap/schema/core.schema %D/etc/openldap/schema/core.schema.default; then rm -f %D/etc/openldap/schema/core.schema; fi
-etc/openldap/schema/core.schema.default
-@exec [ -f %B/core.schema ] || cp %B/%f %B/core.schema
-@unexec if cmp -s %D/etc/openldap/schema/cosine.schema %D/etc/openldap/schema/cosine.schema.default; then rm -f %D/etc/openldap/schema/cosine.schema; fi
-etc/openldap/schema/cosine.schema.default
-@exec [ -f %B/cosine.schema ] || cp %B/%f %B/cosine.schema
-@unexec if cmp -s %D/etc/openldap/schema/inetorgperson.schema %D/etc/openldap/schema/inetorgperson.schema.default; then rm -f %D/etc/openldap/schema/inetorgperson.schema; fi
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ -f %B/inetorgperson.schema ] || cp %B/%f %B/inetorgperson.schema
-@unexec if cmp -s %D/etc/openldap/schema/java.schema %D/etc/openldap/schema/java.schema.default; then rm -f %D/etc/openldap/schema/java.schema; fi
-etc/openldap/schema/java.schema.default
-@exec [ -f %B/java.schema ] || cp %B/%f %B/java.schema
-@unexec if cmp -s %D/etc/openldap/schema/krb5-kdc.schema %D/etc/openldap/schema/krb5-kdc.schema.default; then rm -f %D/etc/openldap/schema/krb5-kdc.schema; fi
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ -f %B/krb5-kdc.schema ] || cp %B/%f %B/krb5-kdc.schema
-@unexec if cmp -s %D/etc/openldap/schema/misc.schema %D/etc/openldap/schema/misc.schema.default; then rm -f %D/etc/openldap/schema/misc.schema; fi
-etc/openldap/schema/misc.schema.default
-@exec [ -f %B/misc.schema ] || cp %B/%f %B/misc.schema
-@unexec if cmp -s %D/etc/openldap/schema/nis.schema %D/etc/openldap/schema/nis.schema.default; then rm -f %D/etc/openldap/schema/nis.schema; fi
-etc/openldap/schema/nis.schema.default
-@exec [ -f %B/nis.schema ] || cp %B/%f %B/nis.schema
-@unexec if cmp -s %D/etc/openldap/schema/openldap.schema %D/etc/openldap/schema/openldap.schema.default; then rm -f %D/etc/openldap/schema/openldap.schema; fi
-etc/openldap/schema/openldap.schema.default
-@exec [ -f %B/openldap.schema ] || cp %B/%f %B/openldap.schema
-@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
-@unexec /bin/rmdir %D/etc/openldap/schema 2>/dev/null || true
-@unexec /bin/rmdir %D/etc/openldap 2>/dev/null || true
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.so
-lib/libldap_r.so.2
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/maildap
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index c7a97e2bdb87..f5387eb55716 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	python-ldap-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An LDAP module for python, for OpenLDAP2
 
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index 50575632ec88..9dee3e88836d 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -21,7 +21,7 @@ WITH_LDAP?=	openldap2
 .if ${WITH_LDAP} == openldap1
 LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap12
 .elif ${WITH_LDAP} == openldap2
-LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap20
 .elif ${WITH_LDAP} == ldapsdk
 LIB_DEPENDS=	${LOCALBASE}/mozilla/directory/lib/libldap.so.1:${PORTSDIR}/net/ldapsdk
 .else
diff --git a/net/samba-tng/Makefile b/net/samba-tng/Makefile
index ee6b8aa0394b..a789351eddda 100644
--- a/net/samba-tng/Makefile
+++ b/net/samba-tng/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=	--with-msdfs
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=	--with-ldapsam
 CONFIGURE_ENV+=		CPPFLAGS=-I${LOCALBASE}/include \
 			LDFLAGS=-L${LOCALBASE}/lib
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 1cf4b8f92576..802f9e8a7e21 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -99,7 +99,7 @@ CONFIGURE_ARGS+=	--with-msdfs
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=  ldap.2:${PORTSDIR}/net/openldap2
+LIB_DEPENDS+=  ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=	--with-ldapsam
 CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib