16 files changed, 6 insertions, 427 deletions

diff --git a/net/eudc-emacs20/Makefile b/net/eudc-emacs20/Makefile
index 81d2f22ca3fe..cbc90f273187 100644
--- a/net/eudc-emacs20/Makefile
+++ b/net/eudc-emacs20/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Emacs client to directory servers
 
-RUN_DEPENDS=	ldapsearch:${PORTSDIR}/net/openldap
+RUN_DEPENDS=	ldapsearch:${PORTSDIR}/net/openldap12
 
 EMACS_PORT_NAME?=emacs20
 
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 94f3ff782aaf..04899b6742ac 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -17,7 +17,7 @@ COMMENT=	GTK-based LDAP client
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 .if defined(WITH_OPENLDAP1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .else
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
 .endif
diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index 6653a428b487..2cd4975ec5d5 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-iconv-dir=${PREFIX}
 
 .if defined(WITH_OPENLDAP1)
-LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
 .else
 LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap2
 .endif
diff --git a/net/openldap/Makefile b/net/openldap/Makefile
deleted file mode 100644
index a8d0083a7496..000000000000
--- a/net/openldap/Makefile
+++ /dev/null
@@ -1,88 +0,0 @@
-# New ports collection makefile for:    OpenLDAP 1.x
-# Date created:		20 Sep 1998
-# Whom:			Lachlan O'Dea
-#
-# $FreeBSD$
-#
-
-PORTNAME=	openldap
-PORTVERSION=	1.2.13
-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=	lodea@vet.com.au
-COMMENT=	Open source LDAP client and server software
-
-USE_LIBTOOL=	yes
-
-CONFIGURE_ARGS=	--localstatedir=/var/db \
-		--enable-shared \
-		--enable-dns
-
-# Include tcp-wrapper support
-.if exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-.if defined(WITH_DB2)
-BUILD_DEPENDS=	${LOCALBASE}/lib/libdb2.a:${PORTSDIR}/databases/db2
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/db2 ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--enable-ldbm \
-			--with-ldbm-api=db2
-.endif
-
-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/rcpt500 \
-		libexec/rp500 \
-		libexec/slapd \
-		libexec/slurpd \
-		sbin/centipede \
-		sbin/ldbmcat \
-		sbin/ldbmtest \
-		sbin/ldif \
-		sbin/ldif2id2children \
-		sbin/ldif2id2entry \
-		sbin/ldif2index \
-		sbin/ldif2ldbm
-
-.include <bsd.port.pre.mk>
-.include "${FILESDIR}/manpages"
-
-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
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap/distinfo b/net/openldap/distinfo
deleted file mode 100644
index 8fc44c2472a6..000000000000
--- a/net/openldap/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (openldap-1.2.13.tgz) = 9613c1f8211c058e0b13788355b0e580
diff --git a/net/openldap/files/manpages b/net/openldap/files/manpages
deleted file mode 100644
index f36399dbc70a..000000000000
--- a/net/openldap/files/manpages
+++ /dev/null
@@ -1,165 +0,0 @@
-MAN1+=	ldapdelete.1
-MAN1+=	ldapmodify.1
-MAN1+=	ldapmodrdn.1
-MAN1+=	ldappasswd.1
-MAN1+=	ldapsearch.1
-MAN1+=	ud.1
-MAN3+=	cldap_close.3
-MAN3+=	cldap_open.3
-MAN3+=	cldap_search_s.3
-MAN3+=	cldap_setretryinfo.3
-MAN3+=	lber-decode.3
-MAN3+=	lber-encode.3
-MAN3+=	ldap.3
-MAN3+=	ldap_abandon.3
-MAN3+=	ldap_add.3
-MAN3+=	ldap_bind.3
-MAN3+=	ldap_cache.3
-MAN3+=	ldap_charset.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_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+=	centipede.8
-MAN8+=	chlog2replog.8
-MAN8+=	edb2ldif.8
-MAN8+=	go500.8
-MAN8+=	go500gw.8
-MAN8+=	in.xfingerd.8
-MAN8+=	ldapd.8
-MAN8+=	ldbmcat.8
-MAN8+=	ldif.8
-MAN8+=	ldif2ldbm.8
-MAN8+=	mail500.8
-MAN8+=	rcpt500.8
-MAN8+=	slapd.8
-MAN8+=	slurpd.8
-MLINKS+=	ldapmodify.1 ldapadd.1
-MLINKS+=	ldap.3 cldap.3
-MLINKS+=	ldap_add.3 ldap_add_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_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_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_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_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_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_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+=	ldif2ldbm.8 ldif2id2children.8
-MLINKS+=	ldif2ldbm.8 ldif2id2entry.8
-MLINKS+=	ldif2ldbm.8 ldif2index.8
-MLINKS+=	mail500.8 fax500.8
diff --git a/net/openldap/files/patch-aa b/net/openldap/files/patch-aa
deleted file mode 100644
index 22b7d8d94a70..000000000000
--- a/net/openldap/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/lib-shared.mk~	Thu May 25 22:46:57 2000
-+++ build/lib-shared.mk	Thu May 25 22:50:24 2000
-@@ -20,5 +20,9 @@
- 	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
- 	$(RM) ../`$(BASENAME) $@ .la`.a;	\
- 	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
-+	# If we want our binaries to link dynamically with libldap{,_r} liblber...
-+	# We also symlink the .so.# so we can run the tests without installing
-+	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.so; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
-+	(d=`$(PWD)`; b=`$(BASENAME) $@ .la`; t=`ls $$d/.libs/$$b.so.?`; $(LN_S) `$(BASENAME) $$d`/.libs/`$(BASENAME) $$t` ../`$(BASENAME) $$t`)
- 
- Makefile: $(top_srcdir)/build/lib-shared.mk
diff --git a/net/openldap/files/patch-ab b/net/openldap/files/patch-ab
deleted file mode 100644
index 0e6d89b746e0..000000000000
--- a/net/openldap/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- tests/scripts/defines.sh~	Wed May 26 02:06:42 1999
-+++ tests/scripts/defines.sh	Thu May 25 22:53:23 2000
-@@ -53,3 +53,5 @@
- ACLOUTMASTER=$DATADIR/acl.out.master
- REPLOUTMASTER=$DATADIR/repl.out.master
- MODSRCHFILTERS=$DATADIR/modify.search.filters
-+# Just in case we linked the binaries dynamically
-+export LD_LIBRARY_PATH=`pwd`/../libraries
diff --git a/net/openldap/files/patch-ac b/net/openldap/files/patch-ac
deleted file mode 100644
index e491cbc8c38d..000000000000
--- a/net/openldap/files/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
---- build/lib.mk~	Thu Jan  7 18:36:30 1999
-+++ build/lib.mk	Thu May 25 22:58:26 2000
-@@ -27,7 +27,8 @@
- clean-common: 	FORCE
- 	$(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
- 		$(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \
--		*.o *.lo a.out core version.c .libs/*
-+		*.o *.lo a.out core version.c .libs/* \
-+		../`$(BASENAME) $(LIBRARY) .la`.so*
- 
- depend-common: FORCE
- 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
diff --git a/net/openldap/files/patch-db b/net/openldap/files/patch-db
deleted file mode 100644
index 09902df2cd31..000000000000
--- a/net/openldap/files/patch-db
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Wed Dec 12 09:55:07 2001
-+++ configure	Wed Dec 12 10:00:07 2001
-@@ -6194,14 +6194,14 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   	ol_LIBS="$LIBS"
--	echo $ac_n "checking for db_open in -ldb""... $ac_c" 1>&6
--echo "configure:6199: checking for db_open in -ldb" >&5
-+	echo $ac_n "checking for db_open in -ldb2""... $ac_c" 1>&6
-+echo "configure:6199: checking for db_open in -ldb2" >&5
- ac_lib_var=`echo db'_'db_open | sed 'y%./+-:%__p__%'`
- if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb2  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6207 "configure"
- #include "confdefs.h"
-@@ -6229,7 +6229,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  ol_cv_lib_db2=-ldb
-+  ol_cv_lib_db2=-ldb2
- else
-   echo "$ac_t""no" 1>&6
- ol_cv_lib_db2=no
diff --git a/net/openldap/files/slapd.sh b/net/openldap/files/slapd.sh
deleted file mode 100644
index 1704074b7968..000000000000
--- a/net/openldap/files/slapd.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-slapd=@@PREFIX@@/libexec/slapd
-pidfile=/var/run/slapd.pid
-
-case "$1" in
-start)
-    if [ -x $slapd ]; then
-	echo -n ' slapd'
-	$slapd
-    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/openldap/pkg-descr b/net/openldap/pkg-descr
deleted file mode 100644
index aec3ae0f7cf4..000000000000
--- a/net/openldap/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/openldap/pkg-plist b/net/openldap/pkg-plist
deleted file mode 100644
index 692835f547df..000000000000
--- a/net/openldap/pkg-plist
+++ /dev/null
@@ -1,63 +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/slapd.at.conf %D/etc/openldap/slapd.at.conf.default; then rm -f %D/etc/openldap/slapd.at.conf; fi
-etc/openldap/slapd.at.conf.default
-@exec [ ! -f %B/slapd.at.conf ] && cp %B/%f %B/slapd.at.conf
-@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 if cmp -s %D/etc/openldap/slapd.oc.conf %D/etc/openldap/slapd.oc.conf.default; then rm -f %D/etc/openldap/slapd.oc.conf; fi
-etc/openldap/slapd.oc.conf.default
-@exec [ ! -f %B/slapd.oc.conf ] && cp %B/%f %B/slapd.oc.conf
-@dirrm etc/openldap
-etc/rc.d/slapd.sh.sample
-include/disptmpl.h
-include/lber.h
-include/ldap.h
-include/ldap_cdefs.h
-include/srchpref.h
-lib/liblber.a
-lib/liblber.so
-lib/liblber.so.1
-lib/libldap.a
-lib/libldap.so
-lib/libldap.so.1
-libexec/fax500
-libexec/go500
-libexec/go500gw
-libexec/in.xfingerd
-libexec/mail500
-libexec/rcpt500
-libexec/rp500
-libexec/slapd
-libexec/slurpd
-libexec/xrpcomp
-sbin/centipede
-sbin/ldbmcat
-sbin/ldbmtest
-sbin/ldif
-sbin/ldif2id2children
-sbin/ldif2id2entry
-sbin/ldif2index
-sbin/ldif2ldbm
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index cd18cb35563c..5068f40160cc 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --enable-rfc1579
 #
 .if defined(WITH_LDAP)
 CONFIGURE_ARGS+=	--with-libldap
-LIB_DEPENDS+=		ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS+=		ldap.1:${PORTSDIR}/net/openldap12
 .else
 CONFIGURE_ARGS+=	--without-libldap
 .endif
diff --git a/net/py-ldap1/Makefile b/net/py-ldap1/Makefile
index efb7ccfb7ea7..b0b12bd1befd 100644
--- a/net/py-ldap1/Makefile
+++ b/net/py-ldap1/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	python-ldap-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An LDAP module for python
 
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap12
 
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index f3d8eb900e1b..50575632ec88 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Ruby interface to LDAP API based on RFC1823
 WITH_LDAP?=	openldap2
 
 .if ${WITH_LDAP} == openldap1
-LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
+LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap12
 .elif ${WITH_LDAP} == openldap2
 LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2
 .elif ${WITH_LDAP} == ldapsdk