22 files changed, 2 insertions, 1061 deletions

diff --git a/MOVED b/MOVED
index b9ccab6c406d..57ae0c78e1ff 100644
--- a/MOVED
+++ b/MOVED
@@ -1055,3 +1055,5 @@ print/pfaedit|print/fontforge|2004-05-01|renamed by upgrading
 converters/cvs2svn|devel/cvs2svn|2004-05-01|corrected category
 net/py-shadow-bittorrent|net/py-bittornado|2004-05-01|project renamed
 net/py-shadow-bittorrent-core|net/py-bittornado-core|2004-05-01|project renamed
+net/openldap20-client||2004-05-03|removed EOL version of OpenLDAP
+net/openldap20-server||2004-05-03|removed EOL version of OpenLDAP
diff --git a/net/Makefile b/net/Makefile
index a96f69c9df2a..6affea9b4954 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -380,8 +380,6 @@
     SUBDIR += opendchub
     SUBDIR += opengk
     SUBDIR += openh323
-    SUBDIR += openldap20-client
-    SUBDIR += openldap20-server
     SUBDIR += openldap21-client
     SUBDIR += openldap21-sasl-client
     SUBDIR += openldap21-sasl-server
diff --git a/net/openldap20-client/Makefile b/net/openldap20-client/Makefile
deleted file mode 100644
index 14efa20a204c..000000000000
--- a/net/openldap20-client/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# New ports collection makefile for:	openldap20-client
-# Date created:				10 Jul 2003
-# Whom:					Oliver Eikemeier <eikemeier@fillmore-labs.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=		openldap
-
-COMMENT=		Open source LDAP client implementation
-
-CLIENT_ONLY=		yes
-
-MASTERDIR=		${.CURDIR}/../openldap20-server
-
-.include "${MASTERDIR}/Makefile"
diff --git a/net/openldap20-server/Makefile b/net/openldap20-server/Makefile
deleted file mode 100644
index 02bacb7d5cdf..000000000000
--- a/net/openldap20-server/Makefile
+++ /dev/null
@@ -1,280 +0,0 @@
-# New ports collection makefile for:	openldap20-server
-# Date created:				10 Jul 2003
-# Whom:					Oliver Eikemeier
-#
-# $FreeBSD$
-#
-
-PORTNAME=		openldap
-PORTVERSION=		2.0.27
-PORTREVISION=		${OPENLDAP_PORTVERSION}
-CATEGORIES=		net databases
-MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
-			http://public.planetmirror.com/pub/openldap/%SUBDIR%/ \
-			ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.matrix.com.br/pub/openldap/%SUBDIR%/ \
-			ftp://ftp.ucr.ac.cr/pub/Unix/openldap/%SUBDIR%/ \
-			ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \
-			ftp://ftp.holywar.net/pub/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \
-			ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.rediris.es/mirror/OpenLDAP/%SUBDIR%/ \
-			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \
-			http://openldap.cdpa.nsysu.edu.tw/OpenLDAP/%SUBDIR%/ \
-			ftp://ftp.plig.org/pub/OpenLDAP/%SUBDIR%/
-MASTER_SITE_SUBDIR=	openldap-release
-PKGNAMESUFFIX=		${OPENLDAP_PKGNAMESUFFIX}
-EXTRACT_SUFX=		.tgz
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT?=		Open source LDAP server implementation
-
-LATEST_LINK=		${PKGNAMEPREFIX}openldap20${PKGNAMESUFFIX}
-CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.[1-9].*
-
-WANT_OPENLDAP_VER?=	20
-.if ${WANT_OPENLDAP_VER} != 20
-BROKEN=			"incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}"
-.endif
-
-DEPRECATED=		"OpenLDAP 2.0 is no longer actively maintained." \
-			"Please upgrade to OpenLDAP 2.2"
-EXPIRATION_DATE=	2004-05-01
-
-.if defined(CLIENT_ONLY)
-OPENLDAP_PORTVERSION=	1
-OPENLDAP_PKGNAMESUFFIX?=-client
-OPENLDAP_PKGFILESUFX?=	.client
-
-.if !defined(NOPORTDOCS)
-PORTDOCS=		drafts rfc
-.endif
-
-.if defined(USE_OPENLDAP)
-.error You have `USE_OPENLDAP' defined either in your environment or in make(1) arguments.
-.endif
-.else
-OPENLDAP_PORTVERSION=	4
-OPENLDAP_PKGNAMESUFFIX?=-server
-OPENLDAP_PKGFILESUFX?=
-
-RUN_DEPENDS=		${LOCALBASE}/lib/libldap.so.2:${PORTSDIR}/net/openldap20-client
-CONFLICTS+=		${PKGNAMEPREFIX}${PORTNAME}-server-2.[1-9].*
-.endif
-
-USE_OPENSSL=		yes
-USE_REINPLACE=		yes
-USE_LIBTOOL_VER=	13
-
-DESCR=			${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
-PLIST=			${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
-PKGINSTALL=		${WRKDIR}/pkg-install
-PKGMESSAGE=		${WRKDIR}/pkg-message
-PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
-
-SCHEMATA=		corba core cosine \
-			inetorgperson java krb5-kdc \
-			misc nis openldap
-
-LDAP_RUN_DIR?=		${DESTDIR}/var/run/openldap
-LOCALSTATEDIR?=		${DESTDIR}/var/db
-DATABASEDIR?=		${LOCALSTATEDIR}/openldap-ldbm
-SLURPDIR?=		${LOCALSTATEDIR}/openldap-slurp
-
-PLIST_SUB+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
-			DATABASEDIR=${DATABASEDIR} \
-			SLURPDIR=${SLURPDIR} \
-
-SED_SCRIPT=		-e 's,%%PREFIX%%,${PREFIX},g' \
-			-e 's,%%LDAP_RUN_DIR%%,${LDAP_RUN_DIR},g' \
-			-e 's,%%DATABASEDIR%%,${DATABASEDIR},g' \
-			-e 's,%%SLURPDIR%%,${SLURPDIR},g'
-
-CONFIGURE_ARGS=		--with-threads \
-			--with-tls=openssl \
-			--enable-dynamic
-
-.if defined(WITH_SASL)
-LIB_DEPENDS+=		sasl.8:${PORTSDIR}/security/cyrus-sasl
-CPPFLAGS+=		-I${LOCALBASE}/include/sasl1
-CONFIGURE_ARGS+=	--with-cyrus-sasl
-.else
-CONFIGURE_ARGS+=	--without-cyrus-sasl
-.endif
-
-.if defined(CLIENT_ONLY)
-# client specific configuration
-
-CONFIGURE_ARGS+=	--disable-slapd
-
-INSTALLS_SHLIB=		yes
-
-.else
-# server specific configuration
-
-EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
-
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR} \
-			--enable-ldbm \
-			--with-ldbm-api=berkeley \
-			--enable-ldap
-
-WITH_BDB_VER?=		3
-
-.if ${WITH_BDB_VER} == 41 || ${WITH_BDB_VER} == 42
-BROKEN=			"OpenLDAP 2.0 doesn't support Berkeley DB 4.1 or 4.2"
-.elif ${WITH_BDB_VER} == 4
-LIB_DEPENDS+=		db4.0:${PORTSDIR}/databases/db4
-.elif ${WITH_BDB_VER} == 3
-LIB_DEPENDS+=		db3.3:${PORTSDIR}/databases/db3
-.else
-.error WITH_BDB_VER must be 3 or 4
-.endif
-LIBS+=			-ldb${WITH_BDB_VER}
-CPPFLAGS+=		-I${LOCALBASE}/include/db${WITH_BDB_VER}
-
-.if defined(WITH_SHELL)
-CONFIGURE_ARGS+=	--enable-shell
-.endif
-
-.if defined(WITH_SASL)
-CONFIGURE_ARGS+=	--enable-spasswd
-.endif
-
-.if defined(WITH_ODBC)
-WITH_ODBC_TYPE?=	iODBC
-.endif
-.if defined(WITH_ODBC_TYPE)
-.if ${WITH_ODBC_TYPE:L} == iodbc
-LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+=	--enable-sql
-.elif ${WITH_ODBC_TYPE:L} == unixodbc
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--enable-sql
-.else
-.error WITH_ODBC_TYPE must be iODBC or unixODBC
-.endif
-.endif
-
-# Include tcp-wrapper support
-.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-# end of client/server specific configuration
-.endif
-
-CPPFLAGS+=		${PTHREAD_CFLAGS} \
-			-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
-			LDFLAGS="${LDFLAGS}" \
-			LIBS="${LIBS}"
-
-.include <bsd.port.pre.mk>
-
-.if defined(CLIENT_ONLY)
-.include "${FILESDIR}/manpages"
-.else
-.if ${OSVERSION} >= 500038
-RC_SUBR?=	${DESTDIR}/etc/rc.subr
-RC_DIR=		${DESTDIR}/etc/rc.d
-RC_SUFX=
-.else
-USE_RC_SUBR=	yes
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-.endif
-
-SED_SCRIPT+=	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		-e 's,%%RC_DIR%%,${RC_DIR},g' \
-		-e 's,%%RC_SUFX%%,${RC_SUFX},g'
-PLIST_SUB+=	RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX}
-.endif
-
-pre-everything::
-	@${ECHO} "============================================================="
-	@${ECHO}
-	@${ECHO} "You can build ${PKGNAME} with the following options:"
-	@${ECHO}
-.if defined(CLIENT_ONLY)
-	@${ECHO} "WITH_SASL             with (Cyrus) SASL1 support"
-.else
-	@${ECHO} "WITH_BDB_VER          select BerkeleyDB version (default 3)"
-	@${ECHO} "WITH_SASL             with (Cyrus) SASL1 password verification"
-	@${ECHO} "WITH_SHELL            with Shell backend"
-	@${ECHO} "WITH_ODBC             with SQL backend"
-	@${ECHO} "WITH_ODBC_TYPE        select ODBC interface (iODBC or unixODBC)"
-	@${ECHO} "WITHOUT_TCP_WRAPPERS  without tcp wrapper support"
-.endif
-	@${ECHO}
-	@${ECHO} "============================================================="
-	@${ECHO}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/slapd\.,${LDAP_RUN_DIR}/slapd.,g' \
-		${WRKSRC}/servers/slapd/slapd.conf
-
-pre-configure:
-	@${REINPLACE_CMD} -e '/^LIBTOOL=/s,\$$(top_builddir)/libtool,${LIBTOOL},g' \
-		${WRKSRC}/configure
-
-post-build:
-.for script in slapd slurpd
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/${script}.sh >${WRKDIR}/${script}.sh
-.endfor
-.for text in pkg-install pkg-message pkg-deinstall
-	@if [ -f ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} ]; then \
-		${SED} ${SED_SCRIPT} ${PKGDIR}/${text}${OPENLDAP_PKGFILESUFX} \
-		>${WRKDIR}/${text}; \
-	fi
-.endfor
-
-.if !defined(CLIENT_ONLY)
-test: build
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
-.endif
-
-pre-install:
-	@if [ -f ${PKGINSTALL} ]; then \
-		${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \
-	fi
-
-post-install:
-.if defined(CLIENT_ONLY)
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@for dir in drafts rfc; do \
-		${MKDIR} ${DOCSDIR}/$${dir}; \
-		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \
-	done
-.endif
-.else
-	@for schema in ${SCHEMATA}; do \
-		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \
-			"%D/etc/openldap/schema/$${schema}.schema.default; then" \
-			"rm -f %D/etc/openldap/schema/$${schema}.schema; fi" >>${TMPPLIST}; \
-		${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default" >>${TMPPLIST}; \
-		${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || cp %B/%f %B/$${schema}.schema" >>${TMPPLIST}; \
-	done
-	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
-#	currently the only way to participate in rcorder(8)
-	@if [ "${RC_DIR}" != "${PREFIX}" ]; then \
-		${ECHO_CMD} "@cwd ${RC_DIR}" >>${TMPPLIST}; \
-	fi
-.for script in slapd slurpd
-	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${RC_DIR}/${script}${RC_SUFX}
-	@${ECHO_CMD} "${script}${RC_SUFX}" >>${TMPPLIST}
-.endfor
-	@${MKDIR} ${LDAP_RUN_DIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/net/openldap20-server/distinfo b/net/openldap20-server/distinfo
deleted file mode 100644
index a501cdd409f6..000000000000
--- a/net/openldap20-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (openldap-2.0.27.tgz) = a1e6508c471dd47205a3492cf57110a6
-SHA1 (openldap-2.0.27.tgz) = 6867890ed0a0a07d022290fa4b3429de50e1d0f3
-SIZE (openldap-2.0.27.tgz) = 1305050
diff --git a/net/openldap20-server/files/extrapatch-Makefile.in b/net/openldap20-server/files/extrapatch-Makefile.in
deleted file mode 100644
index d4515b2c462e..000000000000
--- a/net/openldap20-server/files/extrapatch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Fri Jan  4 21:29:47 2002
-+++ Makefile.in	Thu Jul 10 23:45:33 2003
-@@ -10,9 +10,11 @@
- ## in file LICENSE in the top-level directory of the distribution.
- ##
- 
--SUBDIRS= include libraries clients servers tests doc
--CLEANDIRS= contrib
--INSTALLDIRS= 
-+SUBDIRS=
-+ALLDIRS= include libraries clients servers tests doc
-+CLEANDIRS= include libraries clients servers tests doc contrib
-+DEPENDDIRS= include libraries clients servers tests doc
-+INSTALLDIRS=  servers
- 
- makefiles:	FORCE
- 	./config.status
diff --git a/net/openldap20-server/files/manpages b/net/openldap20-server/files/manpages
deleted file mode 100644
index cb2bd8764417..000000000000
--- a/net/openldap20-server/files/manpages
+++ /dev/null
@@ -1,216 +0,0 @@
-#
-# $FreeBSD$
-#
-
-MAN1+=	ldapdelete.1 \
-	ldapmodify.1 \
-	ldapmodrdn.1 \
-	ldappasswd.1 \
-	ldapsearch.1 \
-	ud.1
-MLINKS+= \
-	ldapmodify.1 ldapadd.1
-
-MAN3+=	lber-decode.3 \
-	lber-encode.3 \
-	lber-memory.3 \
-	lber-types.3 \
-	ldap.3 \
-	ldap_abandon.3 \
-	ldap_add.3 \
-	ldap_bind.3 \
-	ldap_cache.3 \
-	ldap_compare.3 \
-	ldap_delete.3 \
-	ldap_disptmpl.3 \
-	ldap_entry2text.3 \
-	ldap_error.3 \
-	ldap_first_attribute.3 \
-	ldap_first_entry.3 \
-	ldap_friendly.3 \
-	ldap_get_dn.3 \
-	ldap_get_values.3 \
-	ldap_getfilter.3 \
-	ldap_modify.3 \
-	ldap_modrdn.3 \
-	ldap_open.3 \
-	ldap_result.3 \
-	ldap_schema.3 \
-	ldap_search.3 \
-	ldap_searchprefs.3 \
-	ldap_sort.3 \
-	ldap_ufn.3 \
-	ldap_url.3
-MLINKS+= \
-	lber-decode.3 ber_first_element.3 \
-	lber-decode.3 ber_get_bitstring.3 \
-	lber-decode.3 ber_get_boolean.3 \
-	lber-decode.3 ber_get_enum.3 \
-	lber-decode.3 ber_get_int.3 \
-	lber-decode.3 ber_get_next.3 \
-	lber-decode.3 ber_get_null.3 \
-	lber-decode.3 ber_get_stringa.3 \
-	lber-decode.3 ber_get_stringb.3 \
-	lber-decode.3 ber_next_element.3 \
-	lber-decode.3 ber_peek_tag.3 \
-	lber-decode.3 ber_scanf.3 \
-	lber-decode.3 ber_skip_tag.3 \
-	lber-encode.3 ber_alloc_t.3 \
-	lber-encode.3 ber_flush.3 \
-	lber-encode.3 ber_printf.3 \
-	lber-encode.3 ber_put_enum.3 \
-	lber-encode.3 ber_put_int.3 \
-	lber-encode.3 ber_put_null.3 \
-	lber-encode.3 ber_put_ostring.3 \
-	lber-encode.3 ber_put_seq.3 \
-	lber-encode.3 ber_put_set.3 \
-	lber-encode.3 ber_put_string.3 \
-	lber-encode.3 ber_start_set.3 \
-	ldap_abandon.3 ldap_abandon_ext.3 \
-	ldap_add.3 ldap_add_ext.3 \
-	ldap_add.3 ldap_add_ext_s.3 \
-	ldap_add.3 ldap_add_s.3 \
-	ldap_bind.3 ldap_bind_s.3 \
-	ldap_bind.3 ldap_kerberos_bind1.3 \
-	ldap_bind.3 ldap_kerberos_bind1_s.3 \
-	ldap_bind.3 ldap_kerberos_bind2.3 \
-	ldap_bind.3 ldap_kerberos_bind2_s.3 \
-	ldap_bind.3 ldap_kerberos_bind_s.3 \
-	ldap_bind.3 ldap_sasl_bind.3 \
-	ldap_bind.3 ldap_sasl_bind_s.3 \
-	ldap_bind.3 ldap_simple_bind.3 \
-	ldap_bind.3 ldap_simple_bind_s.3 \
-	ldap_bind.3 ldap_unbind.3 \
-	ldap_bind.3 ldap_unbind_ext.3 \
-	ldap_bind.3 ldap_unbind_ext_s.3 \
-	ldap_bind.3 ldap_unbind_s.3 \
-	ldap_cache.3 ldap_destroy_cache.3 \
-	ldap_cache.3 ldap_disable_cache.3 \
-	ldap_cache.3 ldap_enable_cache.3 \
-	ldap_cache.3 ldap_flush_cache.3 \
-	ldap_cache.3 ldap_set_cache_options.3 \
-	ldap_cache.3 ldap_uncache_entry.3 \
-	ldap_cache.3 ldap_uncache_request.3 \
-	ldap_compare.3 ldap_compare_ext.3 \
-	ldap_compare.3 ldap_compare_ext_s.3 \
-	ldap_compare.3 ldap_compare_s.3 \
-	ldap_delete.3 ldap_delete_ext.3 \
-	ldap_delete.3 ldap_delete_ext_s.3 \
-	ldap_delete.3 ldap_delete_s.3 \
-	ldap_disptmpl.3 ldap_first_disptmpl.3 \
-	ldap_disptmpl.3 ldap_first_tmplcol.3 \
-	ldap_disptmpl.3 ldap_first_tmplrow.3 \
-	ldap_disptmpl.3 ldap_free_templates.3 \
-	ldap_disptmpl.3 ldap_init_templates.3 \
-	ldap_disptmpl.3 ldap_init_templates_buf.3 \
-	ldap_disptmpl.3 ldap_next_disptmpl.3 \
-	ldap_disptmpl.3 ldap_next_tmplcol.3 \
-	ldap_disptmpl.3 ldap_next_tmplrow.3 \
-	ldap_disptmpl.3 ldap_oc2template.3 \
-	ldap_disptmpl.3 ldap_tmplattrs.3 \
-	ldap_entry2text.3 ldap_entry2html.3 \
-	ldap_entry2text.3 ldap_entry2html_search.3 \
-	ldap_entry2text.3 ldap_entry2text_search.3 \
-	ldap_entry2text.3 ldap_vals2html.3 \
-	ldap_entry2text.3 ldap_vals2text.3 \
-	ldap_error.3 ld_errno.3 \
-	ldap_error.3 ldap_err2string.3 \
-	ldap_error.3 ldap_errlist.3 \
-	ldap_error.3 ldap_perror.3 \
-	ldap_error.3 ldap_result2error.3 \
-	ldap_first_attribute.3 ldap_next_attribute.3 \
-	ldap_first_entry.3 ldap_count_entries.3 \
-	ldap_first_entry.3 ldap_next_entry.3 \
-	ldap_friendly.3 ldap_free_friendlymap.3 \
-	ldap_friendly.3 ldap_friendly_name.3 \
-	ldap_get_dn.3 ldap_dn2ufn.3 \
-	ldap_get_dn.3 ldap_explode_dn.3 \
-	ldap_get_dn.3 ldap_explode_rdn.3 \
-	ldap_get_values.3 ldap_count_values.3 \
-	ldap_get_values.3 ldap_count_values_len.3 \
-	ldap_get_values.3 ldap_get_values_len.3 \
-	ldap_get_values.3 ldap_value_free.3 \
-	ldap_get_values.3 ldap_value_free_len.3 \
-	ldap_getfilter.3 ldap_build_filter.3 \
-	ldap_getfilter.3 ldap_getfilter_free.3 \
-	ldap_getfilter.3 ldap_getfirstfilter.3 \
-	ldap_getfilter.3 ldap_getnextfilter.3 \
-	ldap_getfilter.3 ldap_init_getfilter.3 \
-	ldap_getfilter.3 ldap_init_getfilter_buf.3 \
-	ldap_getfilter.3 ldap_setfilteraffixes.3 \
-	ldap_modify.3 ldap_modify_ext.3 \
-	ldap_modify.3 ldap_modify_ext_s.3 \
-	ldap_modify.3 ldap_modify_s.3 \
-	ldap_modify.3 ldap_mods_free.3 \
-	ldap_modrdn.3 ldap_modrdn2.3 \
-	ldap_modrdn.3 ldap_modrdn2_s.3 \
-	ldap_modrdn.3 ldap_modrdn_s.3 \
-	ldap_open.3 ldap_init.3 \
-	ldap_result.3 ldap_msgfree.3 \
-	ldap_result.3 ldap_msgid.3 \
-	ldap_result.3 ldap_msgtype.3 \
-	ldap_schema.3 ldap_attributetype2name.3 \
-	ldap_schema.3 ldap_attributetype2str.3 \
-	ldap_schema.3 ldap_attributetype_free.3 \
-	ldap_schema.3 ldap_matchingrule2name.3 \
-	ldap_schema.3 ldap_matchingrule2str.3 \
-	ldap_schema.3 ldap_matchingrule_free.3 \
-	ldap_schema.3 ldap_objectclass2name.3 \
-	ldap_schema.3 ldap_objectclass2str.3 \
-	ldap_schema.3 ldap_objectclass_free.3 \
-	ldap_schema.3 ldap_scherr2str.3 \
-	ldap_schema.3 ldap_str2attributetype.3 \
-	ldap_schema.3 ldap_str2matchingrule.3 \
-	ldap_schema.3 ldap_str2objectclass.3 \
-	ldap_schema.3 ldap_str2syntax.3 \
-	ldap_schema.3 ldap_syntax2name.3 \
-	ldap_schema.3 ldap_syntax2str.3 \
-	ldap_schema.3 ldap_syntax_free.3 \
-	ldap_search.3 ldap_search_ext.3 \
-	ldap_search.3 ldap_search_ext_s.3 \
-	ldap_search.3 ldap_search_s.3 \
-	ldap_search.3 ldap_search_st.3 \
-	ldap_searchprefs.3 ldap_first_searchobj.3 \
-	ldap_searchprefs.3 ldap_free_searchprefs.3 \
-	ldap_searchprefs.3 ldap_init_searchprefs.3 \
-	ldap_searchprefs.3 ldap_init_searchprefs_buf.3 \
-	ldap_searchprefs.3 ldap_next_searchobj.3 \
-	ldap_sort.3 ldap_sort_entries.3 \
-	ldap_sort.3 ldap_sort_strcasecmp.3 \
-	ldap_sort.3 ldap_sort_values.3 \
-	ldap_ufn.3 ldap_ufn_search_c.3 \
-	ldap_ufn.3 ldap_ufn_search_ct.3 \
-	ldap_ufn.3 ldap_ufn_search_s.3 \
-	ldap_ufn.3 ldap_ufn_setfilter.3 \
-	ldap_ufn.3 ldap_ufn_setprefix.3 \
-	ldap_ufn.3 ldap_ufn_timeout.3 \
-	ldap_url.3 ldap_free_urldesc.3 \
-	ldap_url.3 ldap_is_ldap_url.3 \
-	ldap_url.3 ldap_url_parse.3 \
-	ldap_url.3 ldap_url_search.3 \
-	ldap_url.3 ldap_url_search_s.3 \
-	ldap_url.3 ldap_url_search_st.3
-
-MAN5+=	ldap.conf.5 \
-	ldapfilter.conf.5 \
-	ldapfriendly.5 \
-	ldapsearchprefs.conf.5 \
-	ldaptemplates.conf.5 \
-	ldif.5 \
-	slapd.conf.5 \
-	slapd.replog.5 \
-	ud.conf.5
-
-MAN8+=	go500.8 \
-	go500gw.8 \
-	in.xfingerd.8 \
-	mail500.8 \
-	rcpt500.8 \
-	slapadd.8 \
-	slapcat.8 \
-	slapd.8 \
-	slapindex.8 \
-	slappasswd.8 \
-	slurpd.8
-MLINKS+= \
-	mail500.8 fax500.8
diff --git a/net/openldap20-server/files/patch-build::mod.mk b/net/openldap20-server/files/patch-build::mod.mk
deleted file mode 100644
index 05911c2f8c36..000000000000
--- a/net/openldap20-server/files/patch-build::mod.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/mod.mk.orig	Fri Jan  4 21:38:06 2002
-+++ build/mod.mk	Sat Jul 12 19:30:28 2003
-@@ -10,7 +10,7 @@
- LIBRARY = $(LIBBASE).la
- LIBSTAT = lib$(LIBBASE).a
- 
--LTFLAGS = --only-$(LINKAGE)
-+LTFLAGS = # --only-$(LINKAGE)
- 
- COMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CFLAGS) $(MODDEFS) -c
- LTLIBLINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -rpath $(moduledir) \
diff --git a/net/openldap20-server/files/patch-clients::ud::Makefile.in b/net/openldap20-server/files/patch-clients::ud::Makefile.in
deleted file mode 100644
index 9cf81be04cdd..000000000000
--- a/net/openldap20-server/files/patch-clients::ud::Makefile.in
+++ /dev/null
@@ -1,10 +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) $(DESTDIR)$(bindir)
--	-mv -f $(DESTDIR)$(bindir)/ud $(DESTDIR)$(bindir)/ud-
-+	$(LTINSTALL) $(INSTALLFLAGS) -m 755 ud $(bindir)
- 	@(								\
- 	    for prg in $(PROGRAMS); do					\
- 		$(LTINSTALL) $(INSTALLFLAGS) -s -m 755 $$prg$(EXEEXT)	\
diff --git a/net/openldap20-server/files/patch-servers::slapd::back-ldbm::idl.c b/net/openldap20-server/files/patch-servers::slapd::back-ldbm::idl.c
deleted file mode 100644
index b41a8d9c95fb..000000000000
--- a/net/openldap20-server/files/patch-servers::slapd::back-ldbm::idl.c
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# ITS#2348: Index corruption and crash in back-ldbm
-#
---- servers/slapd/back-ldbm/idl.c.orig	Fri Aug 23 20:09:40 2002
-+++ servers/slapd/back-ldbm/idl.c	Wed Mar 12 12:42:29 2003
-@@ -478,9 +478,9 @@
- 	 */
- 
- 	/* select the block to try inserting into *//* XXX linear search XXX */
--	for ( i = 0; !ID_BLOCK_NOID(idl, i) && id > ID_BLOCK_ID(idl, i); i++ )
-+	for ( i = 0; !ID_BLOCK_NOID(idl, i) && id >= ID_BLOCK_ID(idl, i); i++ )
- 		;	/* NULL */
--
-+	
- 	if ( i != 0 ) {
- 		i--;
- 		first = 0;
-@@ -488,6 +488,11 @@
- 		first = 1;
- 	}
- 
-+	/* At this point the following condition must be true:
-+	 * ID_BLOCK_ID(idl, i) <= id && id < ID_BLOCK_ID(idl, i+1)
-+	 * except when i is the first or the last block.
-+	 */
-+
- 	/* get the block */
- 	cont_alloc( &k2, &key );
- 	cont_id( &k2, ID_BLOCK_ID(idl, i) );
-@@ -533,15 +538,16 @@
- 
- 		/* is there a next block? */
- 		if ( !first && !ID_BLOCK_NOID(idl, i + 1) ) {
-+			Datum k3;
- 			/* read it in */
--			cont_alloc( &k2, &key );
--			cont_id( &k2, ID_BLOCK_ID(idl, i + 1) );
--			if ( (tmp2 = idl_fetch_one( be, db, k2 )) == NULL ) {
-+			cont_alloc( &k3, &key );
-+			cont_id( &k3, ID_BLOCK_ID(idl, i + 1) );
-+			if ( (tmp2 = idl_fetch_one( be, db, k3 )) == NULL ) {
- 				Debug( LDAP_DEBUG_ANY,
- 				    "idl_insert_key: idl_fetch_one returned NULL\n",
- 				    0, 0, 0 );
- 				/* split the original block */
--				cont_free( &k2 );
-+				cont_free( &k3 );
- 				goto split;
- 			}
- 
-@@ -552,9 +558,6 @@
- 			 */
- 			if (id < ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp) - 1)) {
- 			    ID id2 = ID_BLOCK_ID(tmp, ID_BLOCK_NIDS(tmp) - 1);
--			    Datum k3;
--
--			    ldbm_datum_init( k3 );
- 
- 			    --ID_BLOCK_NIDS(tmp);
- 			    /* This must succeed since we just popped one
-@@ -562,16 +565,11 @@
- 			     */
- 			    rc = idl_insert( &tmp, id, db->dbc_maxids );
- 
--				k3.dptr = ch_malloc(k2.dsize);
--				k3.dsize = k2.dsize;
--				AC_MEMCPY(k3.dptr, k2.dptr, k3.dsize);
--			    if ( (rc = idl_store( be, db, k3, tmp )) != 0 ) {
-+			    if ( (rc = idl_store( be, db, k2, tmp )) != 0 ) {
- 				Debug( LDAP_DEBUG_ANY,
- 			    "idl_insert_key: idl_store returned %d\n", rc, 0, 0 );
- 			    }
- 
--				free( k3.dptr );
--
- 			    id = id2;
- 			    /* This new id will necessarily be inserted
- 			     * as the first id of the next block by the
-@@ -583,7 +581,7 @@
- 			    db->dbc_maxids )) ) {
- 			case 1:		/* id inserted first in block */
- 				rc = idl_change_first( be, db, key, idl,
--				    i + 1, k2, tmp2 );
-+				    i + 1, k3, tmp2 );
- 				/* FALL */
- 
- 			case 2:		/* id already there - how? */
-@@ -598,8 +596,10 @@
- 					    id, 0, 0 );
- 				}
- 
-+				cont_free( &k3 );
- 				idl_free( tmp );
- 				idl_free( tmp2 );
-+				cont_free( &k2 );
- 				idl_free( idl );
- 				return( 0 );
- 
-@@ -607,6 +607,7 @@
- 				break;
- 			}
- 
-+			cont_free( &k3 );
- 			idl_free( tmp2 );
- 		}
- 
diff --git a/net/openldap20-server/files/patch-servers::slapd::daemon.c b/net/openldap20-server/files/patch-servers::slapd::daemon.c
deleted file mode 100644
index efa32eaf6c79..000000000000
--- a/net/openldap20-server/files/patch-servers::slapd::daemon.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# ITS#1918: slapd panics with real ipv6 addresses
-#
---- servers/slapd/daemon.c.orig	Tue Sep 23 17:21:54 2003
-+++ servers/slapd/daemon.c	Tue Sep 23 17:25:02 2003
-@@ -996,10 +996,12 @@
- 					 (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
- 			} else {
- 				char addr[INET6_ADDRSTRLEN];
-+
-+				peeraddr = (char *) inet_ntop( AF_INET6,
-+						      &from.sa_in6_addr.sin6_addr,
-+						      addr, sizeof addr );
- 				sprintf( peername, "IP=%s %d",
--					 inet_ntop( AF_INET6,
--						    &from.sa_in6_addr.sin6_addr,
--						    addr, sizeof addr) ? addr : "unknown",
-+					 peeraddr != NULL ? peeraddr : "unknown",
- 					 (unsigned) ntohs( from.sa_in6_addr.sin6_port ) );
- 			}
- 			break;
diff --git a/net/openldap20-server/files/patch-servers::slapd::main.c b/net/openldap20-server/files/patch-servers::slapd::main.c
deleted file mode 100644
index 1903a4a5d5bb..000000000000
--- a/net/openldap20-server/files/patch-servers::slapd::main.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- servers/slapd/main.c.orig	Fri Jan  4 21:38:28 2002
-+++ servers/slapd/main.c	Fri Aug 22 14:25:23 2003
-@@ -480,6 +480,13 @@
- #endif
- 	slapd_daemon_destroy();
-
-+	if ( slapd_pid_file != NULL ) {
-+		unlink( slapd_pid_file );
-+	}
-+	if ( slapd_args_file != NULL ) {
-+		unlink( slapd_args_file );
-+	}
-+
- #ifdef CSRIMALLOC
- 	mal_dumpleaktrace( leakfile );
- #endif
diff --git a/net/openldap20-server/files/slapd.sh b/net/openldap20-server/files/slapd.sh
deleted file mode 100644
index fb77d4374fd0..000000000000
--- a/net/openldap20-server/files/slapd.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slapd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable slapd:
-#
-#slapd_enable="YES"
-#slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
-#slapd_sockets="/var/run/openldap/ldapi"
-#
-# See slapd(8) for more flags
-#
-# The `-u' and `-g' flags are automatically extracted from slapd_owner,
-# by default slapd runs under the non-privileged user id `ldap'. If you
-# want to run slapd as root, override this in /etc/rc.conf with
-#
-#slapd_owner="DEFAULT"
-#
-
-. %%RC_SUBR%%
-
-name=slapd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/libexec/slapd
-pidfile=%%LDAP_RUN_DIR%%/slapd.pid
-required_dirs=%%LDAP_RUN_DIR%%
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
-
-start_precmd=start_precmd
-start_postcmd=start_postcmd
-
-# extract user and group, adjust ownership of directories and database
-
-start_precmd()
-{
-  case x"$slapd_owner" in
-  x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-    ;;
-  x*)
-    chown "$slapd_owner" "%%LDAP_RUN_DIR%%"
-    chown -RL "$slapd_owner" "%%DATABASEDIR%%"
-    chown "$slapd_owner" "%%PREFIX%%/etc/openldap/slapd.conf"
-
-    slapd_ownername=`expr //"$slapd_owner" : //'\([^:]*\)'`
-    slapd_groupname=`expr //"$slapd_owner" : //'.*:\([^:]*\)'`
-
-    if [ -n "$slapd_ownername" ]; then
-      rc_flags="$rc_flags -u $slapd_ownername"
-    fi
-    if [ -n "$slapd_groupname" ]; then
-      rc_flags="$rc_flags -g $slapd_groupname"
-    fi
-    ;;
-  esac
-}
-
-# adjust ownership of created unix sockets
-
-start_postcmd()
-{
-  for socket in $slapd_sockets; do
-    for seconds in 1 2 3 4 5; do
-      [ -e "$socket" ] && break
-      sleep 1
-    done
-    if [ -S "$socket" ]; then
-      case x"$slapd_owner" in
-      x|x[Nn][Oo][Nn][Ee]|x[Dd][Ee][Ff][Aa][Uu][Ll][Tt])
-        ;;
-      x*)
-        chown "$slapd_owner" "$socket"
-        ;;
-      esac
-      chmod "$slapd_sockets_mode" "$socket"
-    fi
-  done
-}
-
-# set defaults
-
-[ -z "$slapd_enable" ]       && slapd_enable=NO
-[ -z "$slapd_flags" ]        && slapd_flags=
-
-[ -z "$slapd_owner" ]        && slapd_owner=ldap:ldap
-[ -z "$slapd_sockets" ]      && slapd_sockets=
-[ -z "$slapd_sockets_mode" ] && slapd_sockets_mode=666
-
-load_rc_config $name
-
-if [ -n "$slapd_args" ]; then
-  warn "slapd_args is deprecated, use slapd_flags"
-  slapd_flags="$slapd_args"
-fi
-
-run_rc_command "$1"
diff --git a/net/openldap20-server/files/slurpd.sh b/net/openldap20-server/files/slurpd.sh
deleted file mode 100644
index 558f58c1f592..000000000000
--- a/net/openldap20-server/files/slurpd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slurpd
-# REQUIRE: slapd
-# BEFORE:
-# KEYWORD: FreeBSD shutdown
-
-# Add the following line to /etc/rc.conf to enable slurpd:
-#
-#slurpd_enable="YES"
-#
-# See slurpd(8) for more flags
-#
-
-. %%RC_SUBR%%
-
-name=slurpd
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/libexec/slurpd
-required_files=%%PREFIX%%/etc/openldap/slapd.conf
-
-[ -z "$slurpd_enable" ] && slurpd_enable="NO"
-[ -z "$slurpd_flags" ]  && slurpd_flags=
-
-load_rc_config $name
-
-if [ -n "$slurpd_args" ]; then
-  warn "slurpd_args is deprecated, use slurpd_flags"
-  slurpd_flags="$slurpd_args"
-fi
-
-run_rc_command "$1"
diff --git a/net/openldap20-server/pkg-deinstall b/net/openldap20-server/pkg-deinstall
deleted file mode 100644
index 2a5ec1ef8f65..000000000000
--- a/net/openldap20-server/pkg-deinstall
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-ECHO_CMD=echo
-
-case $2 in
-POST-DEINSTALL)
-  ${ECHO_CMD}
-  ${ECHO_CMD} "The OpenLDAP server package has been deleted."
-  ${ECHO_CMD} "If you're *not* upgrading and won't be using"
-  ${ECHO_CMD} "it any longer, you may want to issue the"
-  ${ECHO_CMD} "following commands:"
-  ${ECHO_CMD}
-  if [ -d %%DATABASEDIR%% ]; then
-    ${ECHO_CMD} "- to delete the OpenLDAP database permanently (losing all data):"
-    ${ECHO_CMD} "  rm -Rf %%DATABASEDIR%%"
-    ${ECHO_CMD}
-  fi
-  if [ -d %%SLURPDIR%% ]; then
-    ${ECHO_CMD} "- to remove the OpenLDAP replication directory:"
-    ${ECHO_CMD} "  rm -Rf %%SLURPDIR%%"
-    ${ECHO_CMD}
-  fi
-  ${ECHO_CMD} "- to remove the OpenLDAP user:"
-  ${ECHO_CMD} "  pw userdel ldap"
-  ${ECHO_CMD}
-  ${ECHO_CMD} "If you are upgrading, don't forget to restart"
-  ${ECHO_CMD} "slapd and slurpd."
-  ${ECHO_CMD}
-  ;;
-esac
diff --git a/net/openldap20-server/pkg-descr b/net/openldap20-server/pkg-descr
deleted file mode 100644
index 29205df6e1fa..000000000000
--- a/net/openldap20-server/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
-clients, utilities and development tools.
-
-This package includes the following major components:
-
- * slapd - a stand-alone LDAP directory server
- * slurpd - a stand-alone LDAP replication server
- * LDIF tools - data conversion tools for use with slapd
-
-This version is no longer actively maintained, please upgrade.
-
-WWW: http://www.OpenLDAP.org/
-
-- Oliver Eikemeier
-eikemeier@fillmore-labs.com
diff --git a/net/openldap20-server/pkg-descr.client b/net/openldap20-server/pkg-descr.client
deleted file mode 100644
index e87ff606c6b3..000000000000
--- a/net/openldap20-server/pkg-descr.client
+++ /dev/null
@@ -1,16 +0,0 @@
-OpenLDAP is a suite of Lightweight Directory Access Protocol (v3) servers,
-clients, utilities and development tools.
-
-This package includes the following major components:
-
- * -lldap - a LDAP client library
- * -llber - a lightweight BER/DER encoding/decoding library
- * LDAP tools - A collection of command line LDAP utilities
- * documentation - man pages for all components
-
-This version is no longer actively maintained, please upgrade.
-
-WWW: http://www.OpenLDAP.org/
-
-- Oliver Eikemeier
-eikemeier@fillmore-labs.com
diff --git a/net/openldap20-server/pkg-install b/net/openldap20-server/pkg-install
deleted file mode 100644
index ee0a9e8588bd..000000000000
--- a/net/openldap20-server/pkg-install
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-CHOWN=/usr/sbin/chown
-ECHO_CMD=echo
-GREP=/usr/bin/grep
-PW=/usr/sbin/pw
-
-FTPUSERS=/etc/ftpusers
-
-case $2 in
-PRE-INSTALL)
-  if ! ${PW} usershow -n ldap >/dev/null 2>&1; then
-    ${ECHO_CMD}
-    if ! ${PW} groupshow -n ldap >/dev/null 2>&1; then
-      if ! ${PW} groupadd -n ldap -g 389; then
-        ${ECHO_CMD} "*** Failed to add a group ldap with id 389."
-        ${ECHO_CMD}
-        ${ECHO_CMD} "Please add the ldap user manually with"
-        ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-        ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-        ${ECHO_CMD} "and retry installing this package."
-        exit 1
-      fi
-      ${ECHO_CMD} "===>  Group 'ldap' created."
-    fi
-    if ! ${PW} useradd -n ldap -u 389 -g ldap -c 'OpenLDAP Server' \
-        -d /nonexistent -s /sbin/nologin -h -; then
-      ${ECHO_CMD} "*** Failed to add an user ldap with id 389."
-      ${ECHO_CMD}
-      ${ECHO_CMD} "Please add the ldap user manually with"
-      ${ECHO_CMD} "  ${PW} useradd -n ldap -g ldap -c 'OpenLDAP server' \\"
-      ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-      ${ECHO_CMD} "and retry installing this package."
-      exit 1
-    fi
-    ${GREP} -qs '^ldap$' ${FTPUSERS} || ${ECHO_CMD} ldap >> ${FTPUSERS}
-    ${ECHO_CMD} "===>  Account 'ldap' created."
-  fi
-  ;;
-esac
diff --git a/net/openldap20-server/pkg-message b/net/openldap20-server/pkg-message
deleted file mode 100644
index 1dcc33abe8cc..000000000000
--- a/net/openldap20-server/pkg-message
+++ /dev/null
@@ -1,30 +0,0 @@
-************************************************************
-
-The OpenLDAP server package has been successfully installed.
-
-CAUTION: This version is no longer actively maintained, please upgrade.
-
-In order to run the LDAP server, you need to edit
-  %%PREFIX%%/etc/openldap/slapd.conf
-to suit your needs and add the following lines to /etc/rc.conf:
-  slapd_enable="YES"
-  slapd_flags='-h "ldapi://%2fvar%2frun%2fopenldap%2fldapi/ ldap://0.0.0.0/"'
-  slapd_sockets="/var/run/openldap/ldapi"
-
-Then start the server with
-  %%RC_DIR%%/slapd%%RC_SUFX%% start
-or reboot.
-
-Try `man slapd' and the online manual at
-  http://www.OpenLDAP.org/doc/admin20/
-for more information.
-  
-NOTE: Some variable names have been changed to conform with rc.subr(8)
-
-If you are upgrading, you may want to check your configuration with
-  grep ^slapd_ /etc/rc.conf
-
-slapd runs under a non-privileged user id (by default `ldap'),
-see %%RC_DIR%%/slapd%%RC_SUFX%% for more information.
-
-************************************************************
diff --git a/net/openldap20-server/pkg-message.client b/net/openldap20-server/pkg-message.client
deleted file mode 100644
index f48e8f43bda4..000000000000
--- a/net/openldap20-server/pkg-message.client
+++ /dev/null
@@ -1,15 +0,0 @@
-************************************************************
-
-The OpenLDAP client package has been successfully installed.
-
-CAUTION: This version is no longer actively maintained, please upgrade.
-
-Edit
-  %%PREFIX%%/etc/openldap/ldap.conf
-to change the system-wide client defaults.
-
-Try `man ldap.conf' and visit the OpenLDAP FAQ-O-Matic at
-  http://www.OpenLDAP.org/faq/index.cgi?file=3
-for more information.
-
-************************************************************
diff --git a/net/openldap20-server/pkg-plist b/net/openldap20-server/pkg-plist
deleted file mode 100644
index e7a7ae71f58b..000000000000
--- a/net/openldap20-server/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $FreeBSD$
-@unexec %%RC_DIR%%/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true
-@unexec %%RC_DIR%%/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true
-@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
-libexec/slapd
-libexec/slurpd
-sbin/slapadd
-sbin/slapcat
-sbin/slapindex
-sbin/slappasswd
-@exec mkdir -p %%LDAP_RUN_DIR%%
-@exec mkdir -p %%DATABASEDIR%%
-@exec mkdir -p %%SLURPDIR%%
-@unexec rmdir %%LDAP_RUN_DIR%% 2>/dev/null || true
-@unexec rmdir %%DATABASEDIR%% 2>/dev/null || true
-@unexec rmdir %%SLURPDIR%% 2>/dev/null || true
diff --git a/net/openldap20-server/pkg-plist.client b/net/openldap20-server/pkg-plist.client
deleted file mode 100644
index 74128f59c27d..000000000000
--- a/net/openldap20-server/pkg-plist.client
+++ /dev/null
@@ -1,54 +0,0 @@
-@comment $FreeBSD$
-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 rmdir %D/etc/openldap 2>/dev/null || true
-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.la
-lib/liblber.so
-lib/liblber.so.2
-lib/libldap.a
-lib/libldap.la
-lib/libldap.so
-lib/libldap.so.2
-lib/libldap_r.a
-lib/libldap_r.la
-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/xrpcomp
-share/openldap/go500gw.help
-share/openldap/ldapfriendly
-share/openldap/rcpt500.help
-@dirrm share/openldap