Remove openldap1, which is very old and no longer maintained;

kleink@ agrees.

11 files changed, 3 insertions, 349 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 986fdf7e828..35f3dfa0dd1 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.138 2004/07/24 22:52:42 recht Exp $
+# $NetBSD: Makefile,v 1.139 2004/07/29 09:34:57 xtraeme Exp $
 #
 
 COMMENT=	Databases
@@ -48,7 +48,6 @@ SUBDIR+=	mysqlcc
 SUBDIR+=	mytop
 SUBDIR+=	odbc-postgresql
 SUBDIR+=	openldap
-SUBDIR+=	openldap1
 SUBDIR+=	oraedit
 SUBDIR+=	p5-AddressBook
 SUBDIR+=	p5-Apache-DBI
diff --git a/databases/openldap1/DEINSTALL b/databases/openldap1/DEINSTALL
deleted file mode 100644
index 46736026aa4..00000000000
--- a/databases/openldap1/DEINSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:11:58 zuntum Exp $
-#
-
-case $2 in
-        DEINSTALL) cat << EOF
-===========================================================================
-If you don't want to use openldap anymore, remove ${PKG_PREFIX}/etc/openldap.
-===========================================================================
-
-EOF
-        ;;
-esac
diff --git a/databases/openldap1/DESCR b/databases/openldap1/DESCR
deleted file mode 100644
index 7a3715e09ac..00000000000
--- a/databases/openldap1/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-A open source implementation of the lighthweight directory access protocol
-(LDAP) server and client. OpenLDAP is derived from the U. Mich release 3.3
diff --git a/databases/openldap1/Makefile b/databases/openldap1/Makefile
deleted file mode 100644
index e6707ac7d9e..00000000000
--- a/databases/openldap1/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2004/05/09 17:46:01 snj Exp $
-#
-
-DISTNAME=	openldap-1.2.13
-SVR4_PKGNAME=	olda1
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	kleink@NetBSD.org
-HOMEPAGE=	http://www.OpenLDAP.org/
-COMMENT=	Lightweight directory access protocol server and client package
-
-# for the moment without threads and thus without slurpd and ldapd
-#DEPENDS+=	../../devel/mit-pthreads
-
-CONFLICTS+=	ldapsdk-[0-9]*
-
-USE_BUILDLINK3=		YES
-USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
-
-# unfortunately, --enable-phonetic cannot be disabled by runtime configuration
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-dns
-CONFIGURE_ARGS+=	--enable-cldap
-CONFIGURE_ARGS+=	--enable-passwd
-CONFIGURE_ARGS+=	--enable-shell
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
-
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-.include "../../databases/db/buildlink3.mk"
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
-LIBS=		-ldb2 -lpthread -lrt
-.endif
-
-post-configure:
-	${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
-
-.if defined(KERBEROS)
-PKG_USE_KERBEROS=	yes
-CONFIGURE_ARGS+=--with-kerberos
-.else
-CONFIGURE_ARGS+=--without-kerberos
-.endif
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap1/PLIST.Linux b/databases/openldap1/PLIST.Linux
deleted file mode 100644
index 7999b9da583..00000000000
--- a/databases/openldap1/PLIST.Linux
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2002/12/25 12:37:48 grant Exp $
-libexec/slurpd
diff --git a/databases/openldap1/PLIST.SunOS b/databases/openldap1/PLIST.SunOS
deleted file mode 100644
index fdaf8181cb8..00000000000
--- a/databases/openldap1/PLIST.SunOS
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2002/12/25 12:37:48 grant Exp $
-libexec/slurpd
diff --git a/databases/openldap1/PLIST.common b/databases/openldap1/PLIST.common
deleted file mode 100644
index a2270cfbd59..00000000000
--- a/databases/openldap1/PLIST.common
+++ /dev/null
@@ -1,225 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.3 2002/12/09 16:01:16 tron Exp $
-bin/ud
-bin/ldapsearch
-bin/ldapmodify
-bin/ldapdelete
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapadd
-lib/liblber.a
-lib/liblber.la
-lib/liblber.so
-lib/liblber.so.1
-lib/liblber.so.1.0
-lib/libldap.a
-lib/libldap.la
-lib/libldap.so
-lib/libldap.so.1
-lib/libldap.so.1.0
-man/man1/ldapadd.1
-man/man1/ldapdelete.1
-man/man1/ldapmodify.1
-man/man1/ldapmodrdn.1
-man/man1/ldappasswd.1
-man/man1/ldapsearch.1
-man/man1/ud.1
-man/man3/ldap.3
-man/man3/cldap.3
-man/man3/cldap_close.3
-man/man3/cldap_open.3
-man/man3/cldap_search_s.3
-man/man3/cldap_setretryinfo.3
-man/man3/lber-decode.3
-man/man3/lber-encode.3
-man/man3/ldap_abandon.3
-man/man3/ldap_add.3
-man/man3/ldap_add_s.3
-man/man3/ldap_bind.3
-man/man3/ldap_bind_s.3
-man/man3/ldap_simple_bind.3
-man/man3/ldap_simple_bind_s.3
-man/man3/ldap_kerberos_bind_s.3
-man/man3/ldap_unbind.3
-man/man3/ldap_kerberos_bind1.3
-man/man3/ldap_kerberos_bind1_s.3
-man/man3/ldap_kerberos_bind2.3
-man/man3/ldap_kerberos_bind2_s.3
-man/man3/ldap_unbind_s.3
-man/man3/ldap_set_rebind_proc.3
-man/man3/ldap_cache.3
-man/man3/ldap_enable_cache.3
-man/man3/ldap_disable_cache.3
-man/man3/ldap_destroy_cache.3
-man/man3/ldap_flush_cache.3
-man/man3/ldap_uncache_entry.3
-man/man3/ldap_uncache_request.3
-man/man3/ldap_set_cache_options.3
-man/man3/ldap_charset.3
-man/man3/ldap_set_string_translators.3
-man/man3/ld_errno.3
-man/man3/ldap_enable_translation.3
-man/man3/ldap_translate_from_t61.3
-man/man3/ldap_translate_to_t61.3
-man/man3/ldap_t61_to_8859.3
-man/man3/ldap_8859_to_t61.3
-man/man3/ldap_compare.3
-man/man3/ldap_compare_s.3
-man/man3/ldap_delete.3
-man/man3/ldap_delete_s.3
-man/man3/ldap_disptmpl.3
-man/man3/ldap_init_templates.3
-man/man3/ldap_init_templates_buf.3
-man/man3/ldap_free_templates.3
-man/man3/ldap_first_disptmpl.3
-man/man3/ldap_next_disptmpl.3
-man/man3/ldap_oc2template.3
-man/man3/ldap_tmplattrs.3
-man/man3/ldap_first_tmplrow.3
-man/man3/ldap_next_tmplrow.3
-man/man3/ldap_first_tmplcol.3
-man/man3/ldap_next_tmplcol.3
-man/man3/ldap_entry2text.3
-man/man3/ldap_entry2text_search.3
-man/man3/ldap_vals2text.3
-man/man3/ldap_entry2html.3
-man/man3/ldap_entry2html_search.3
-man/man3/ldap_vals2html.3
-man/man3/ldap_error.3
-man/man3/ldap_perror.3
-man/man3/ldap_result2error.3
-man/man3/ldap_errlist.3
-man/man3/ldap_err2string.3
-man/man3/ldap_first_attribute.3
-man/man3/ldap_next_attribute.3
-man/man3/ldap_first_entry.3
-man/man3/ldap_next_entry.3
-man/man3/ldap_count_entries.3
-man/man3/ldap_friendly.3
-man/man3/ldap_friendly_name.3
-man/man3/ldap_free_friendlymap.3
-man/man3/ldap_get_dn.3
-man/man3/ldap_explode_dn.3
-man/man3/ldap_explode_dns.3
-man/man3/ldap_dn2ufn.3
-man/man3/ldap_is_dns_dn.3
-man/man3/ldap_get_values.3
-man/man3/ldap_get_values_len.3
-man/man3/ldap_value_free.3
-man/man3/ldap_value_free_len.3
-man/man3/ldap_count_values.3
-man/man3/ldap_count_values_len.3
-man/man3/ldap_modify.3
-man/man3/ldap_getfilter.3
-man/man3/ldap_init_getfilter.3
-man/man3/ldap_init_getfilter_buf.3
-man/man3/ldap_getfilter_free.3
-man/man3/ldap_getfirstfilter.3
-man/man3/ldap_getnextfilter.3
-man/man3/ldap_setfilteraffixes.3
-man/man3/ldap_build_filter.3
-man/man3/ldap_modify_s.3
-man/man3/ldap_mods_free.3
-man/man3/ldap_modrdn.3
-man/man3/ldap_modrdn_s.3
-man/man3/ldap_modrdn2.3
-man/man3/ldap_modrdn2_s.3
-man/man3/ldap_open.3
-man/man3/ldap_init.3
-man/man3/ldap_result.3
-man/man3/ldap_msgfree.3
-man/man3/ldap_sort.3
-man/man3/ldap_search.3
-man/man3/ldap_search_s.3
-man/man3/ldap_search_st.3
-man/man3/ldap_searchprefs.3
-man/man3/ldap_init_searchprefs.3
-man/man3/ldap_init_searchprefs_buf.3
-man/man3/ldap_free_searchprefs.3
-man/man3/ldap_first_searchobj.3
-man/man3/ldap_next_searchobj.3
-man/man3/ldap_sort_entries.3
-man/man3/ldap_sort_values.3
-man/man3/ldap_sort_strcasecmp.3
-man/man3/ldap_ufn.3
-man/man3/ldap_ufn_search_s.3
-man/man3/ldap_ufn_search_c.3
-man/man3/ldap_ufn_search_ct.3
-man/man3/ldap_ufn_setprefix.3
-man/man3/ldap_ufn_setfilter.3
-man/man3/ldap_ufn_timeout.3
-man/man3/ldap_url.3
-man/man3/ldap_is_ldap_url.3
-man/man3/ldap_url_parse.3
-man/man3/ldap_free_urldesc.3
-man/man3/ldap_url_search.3
-man/man3/ldap_url_search_s.3
-man/man3/ldap_url_search_st.3
-man/man5/ldap.conf.5
-man/man5/ldapfilter.conf.5
-man/man5/ldapfriendly.5
-man/man5/ldapsearchprefs.conf.5
-man/man5/ldaptemplates.conf.5
-man/man5/ldif.5
-man/man5/slapd.conf.5
-man/man5/slapd.replog.5
-man/man5/ud.conf.5
-man/man8/centipede.8
-man/man8/chlog2replog.8
-man/man8/edb2ldif.8
-man/man8/go500.8
-man/man8/go500gw.8
-man/man8/in.xfingerd.8
-man/man8/ldapd.8
-man/man8/ldbmcat.8
-man/man8/ldif.8
-man/man8/ldif2ldbm.8
-man/man8/ldif2index.8
-man/man8/ldif2id2entry.8
-man/man8/ldif2id2children.8
-man/man8/mail500.8
-man/man8/fax500.8
-man/man8/rcpt500.8
-man/man8/slapd.8
-man/man8/slurpd.8
-etc/openldap/ldap.conf.default
-@exec [ -f %B/ldap.conf ] || cp %D/%F %B/ldap.conf
-etc/openldap/ldapfilter.conf.default
-@exec [ -f %B/ldapfilter.conf ] || cp %D/%F %B/ldapfilter.conf
-etc/openldap/ldaptemplates.conf.default
-@exec [ -f %B/ldaptemplates.conf ] || cp %D/%F %B/ldaptemplates.conf
-etc/openldap/ldapsearchprefs.conf.default
-@exec [ -f %B/ldapsearchprefs.conf ] || cp %D/%F %B/ldapsearchprefs.conf
-etc/openldap/slapd.conf.default
-@exec [ -f %B/slapd.conf ] || cp %D/%F %B/slapd.conf
-etc/openldap/slapd.at.conf.default
-@exec [ -f %B/slapd.at.conf ] || cp %D/%F %B/slapd.at.conf
-etc/openldap/slapd.oc.conf.default
-@exec [ -f %B/slapd.oc.conf ] || cp %D/%F %B/slapd.oc.conf
-include/ldap.h
-include/lber.h
-include/ldap_cdefs.h
-include/disptmpl.h
-include/srchpref.h
-libexec/in.xfingerd
-libexec/go500
-libexec/go500gw
-libexec/mail500
-libexec/rp500
-libexec/fax500
-libexec/xrpcomp
-libexec/rcpt500
-libexec/slapd
-sbin/ldif2ldbm
-sbin/ldif2index
-sbin/ldbmcat
-sbin/ldif2id2entry
-sbin/ldif2id2children
-sbin/ldif
-sbin/centipede
-sbin/ldbmtest
-share/openldap/ldapfriendly
-share/openldap/go500gw.help
-share/openldap/rcpt500.help
-@unexec ${RMDIR} %D/etc/openldap 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} -p %D/var/openldap-ldbm 2>/dev/null || ${TRUE}
-@dirrm share/openldap
diff --git a/databases/openldap1/buildlink3.mk b/databases/openldap1/buildlink3.mk
deleted file mode 100644
index ac139407cb8..00000000000
--- a/databases/openldap1/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/05/09 17:46:01 snj Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	openldap
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenldap}
-BUILDLINK_PACKAGES+=	openldap
-
-.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.openldap+=	openldap>=1.2.0
-BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap1
-.endif	# OPENLDAP_BUILDLINK3_MK
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == SunOS
-.  include "../../databases/db/buildlink3.mk"
-.endif
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/openldap1/distinfo b/databases/openldap1/distinfo
deleted file mode 100644
index d40e99bcbb5..00000000000
--- a/databases/openldap1/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/10/25 18:38:12 kleink Exp $
-
-SHA1 (openldap-1.2.13.tgz) = 61b2d199754db08e9bef5a3dace443acfc9d3ce2
-Size (openldap-1.2.13.tgz) = 1034063 bytes
-SHA1 (patch-ab) = 74043106a6d933ff627eff5c079f50b9bfc9eef5
diff --git a/databases/openldap1/patches/patch-ab b/databases/openldap1/patches/patch-ab
deleted file mode 100644
index 2d9017a206f..00000000000
--- a/databases/openldap1/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/10/25 18:38:13 kleink Exp $
-
---- build/lib-shared.mk.orig	Fri Jul 23 17:31:32 1999
-+++ build/lib-shared.mk	Fri Sep 10 12:19:58 1999
-@@ -16,9 +16,11 @@
- 
- $(LIBRARY):  version.lo
- 	$(LTLIBLINK) -rpath $(libdir) -o $@ $(OBJS) version.lo
--	$(RM) ../$@;	\
--	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
--	$(RM) ../`$(BASENAME) $@ .la`.a;	\
--	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.a; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t)
-+	@$(RM) ../$@
-+	@for ext in a so so.1.0; do \
-+	$(RM) ../`$(BASENAME) $@ .la`.$$ext;    \
-+	(d=`$(PWD)`; t=`$(BASENAME) $@ .la`.$$ext; $(LN_S) `$(BASENAME) $$d`/.libs/$$t ../$$t); \
-+       done
-+
- 
- Makefile: $(top_srcdir)/build/lib-shared.mk
diff --git a/doc/CHANGES b/doc/CHANGES
index f9a9674cb04..83ced3a2cc7 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6722 2004/07/29 07:42:12 agc Exp $
+$NetBSD: CHANGES,v 1.6723 2004/07/29 09:34:57 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3641,3 +3641,4 @@ Changes to the packages collection and infrastructure in 2004:
 	Added xorg-docs-6.7.0 [xtraeme 2004-07-29]
 	Added xorg-dirs-1.0 [xtraeme 2004-07-29]
 	Removed jdk12 [agc 2004-07-29]
+	Removed openldap1 [xtraeme 2004-07-29]