Update databases/openldap to 2.0.19nb1. Changes from version 2.0.19:

* Use pthread.buildlink.mk as OpenLDAP now builds correctly with GNU pth for
  a pthread implementation.  This allows slurpd to be built on all platforms.
* Use tcp_wrapper/buildlink.mk and always enable the use of TCP wrappers.
* Use the general INSTALL scripts to deal with the config files and
  directories needed by this package.  This now works correctly whether we
  build from source or if we install via a binary package.
* Honor PKG_SYSCONFDIR.

5 files changed, 233 insertions, 221 deletions

diff --git a/databases/openldap/DEINSTALL b/databases/openldap/DEINSTALL
deleted file mode 100644
index 38260c2f79a..00000000000
--- a/databases/openldap/DEINSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:11:57 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/openldap/Makefile b/databases/openldap/Makefile
index 5530d3d9700..c7f4b39608c 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2001/12/20 22:16:44 kleink Exp $
+# $NetBSD: Makefile,v 1.32 2001/12/31 08:36:10 jlam Exp $
 
 DISTNAME=	openldap-2.0.19
 SVR4_PKGNAME=	oldap
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 EXTRACT_SUFX=	.tgz
@@ -10,9 +11,6 @@ MAINTAINER=	packages@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_BUILDLINK_ONLY=	YES
@@ -21,17 +19,23 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
 
 # unfortunately, --enable-phonetic cannot be disabled by runtime configuration
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-dns
+CONFIGURE_ARGS+=	--enable-dnssrv
 CONFIGURE_ARGS+=	--enable-cldap
 CONFIGURE_ARGS+=	--enable-passwd
 CONFIGURE_ARGS+=	--enable-shell
+CONFIGURE_ARGS+=	--enable-wrappers
 CONFIGURE_ARGS+=	--with-tls=openssl
+CONFIGURE_ARGS+=	--without-readline
 
-.include "../../mk/bsd.prefs.mk"
+USE_PTHREAD=		native pth
+CONFIGURE_ARGS+=	--with-threads
 
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ARGS+=	--enable-wrappers
-.endif
+PKG_SYSCONFSUBDIR?=	openldap
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=/var/openldap
+MAKE_FLAGS+=		sysconfdir=${PKG_SYSCONFDIR}
+
+.include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
 .include "../../databases/db/buildlink.mk"
@@ -39,17 +43,56 @@ CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
 LIBS=		-ldb2 -lpthread -lrt
 .endif
 
-PLIST_SRC=	${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS}
-
-post-configure:
-	${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
-
 .if defined(KERBEROS)
-USE_KERBEROS=	yes
-CONFIGURE_ARGS+=--with-kerberos
+USE_KERBEROS=		YES
+CONFIGURE_ARGS+=	--with-kerberos
 .else
-CONFIGURE_ARGS+=--without-kerberos
+CONFIGURE_ARGS+=	--without-kerberos
 .endif
 
+EGDIR=		${PREFIX}/share/examples/openldap
+MAKE_DIRS=	${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/schema
+OWN_DIRS=	/var/openldap
+OWN_DIRS_PERMS=	/var/openldap/openldap-ldbm ${ROOT_USER} ${ROOT_GROUP} 0700
+OWN_DIRS_PERMS+=/var/openldap/openldap-slurp ${ROOT_USER} ${ROOT_GROUP} 0700
+
+CNFS=		ldap.conf ldapfilter.conf ldaptemplates.conf		\
+		ldapsearchprefs.conf
+CNFS_PERMS=	slapd.conf
+SUPPS=		schema/corba.schema schema/core.schema			\
+		schema/cosine.schema schema/inetorgperson.schema	\
+		schema/java.schema schema/krb5-kdc.schema		\
+		schema/misc.schema schema/nadf.schema			\
+		schema/nis.schema schema/openldap.schema
+
+CONF_FILES=		# empty
+CONF_FILES_PERMS=	# empty
+SUPPORT_FILES=		# empty
+.for FILE in ${CNFS}
+CONF_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+.endfor
+.for FILE in ${CNFS_PERMS}
+CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.endfor
+.for FILE in ${SUPPS}
+SUPPORT_FILES+=		${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}
+.endfor
+
+post-install:
+	${INSTALL_DATA_DIR} ${EGDIR}/schema
+	for file in ${CNFS} ${CNFS_PERMS} ${SUPPS}; do			\
+		if [ ! -e ${PKG_SYSCONFDIR}/$${file}.default ]; then	\
+			${CP} -p ${PKG_SYSCONFDIR}/$${file}		\
+				${PKG_SYSCONFDIR}/$${file}.default;	\
+		fi;							\
+		${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file}.default	\
+			${EGDIR}/$${file};				\
+		${RM} -f ${PKG_SYSCONFDIR}/$${file}.default;		\
+	done
+
 .include "../../security/openssl/buildlink.mk"
+.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../mk/pthread.buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap/PLIST.common b/databases/openldap/PLIST
index 767b5761b32..d72eb95c172 100644
--- a/databases/openldap/PLIST.common
+++ b/databases/openldap/PLIST
@@ -1,11 +1,19 @@
-@comment $NetBSD: PLIST.common,v 1.2 2001/12/20 22:16:44 kleink Exp $
-bin/ud
-bin/ldapsearch
-bin/ldapmodify
+@comment $NetBSD: PLIST,v 1.1 2001/12/31 08:36:10 jlam Exp $
+bin/ldapadd
 bin/ldapdelete
+bin/ldapmodify
 bin/ldapmodrdn
 bin/ldappasswd
-bin/ldapadd
+bin/ldapsearch
+bin/ud
+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
@@ -21,6 +29,17 @@ lib/libldap_r.la
 lib/libldap_r.so
 lib/libldap_r.so.2
 lib/libldap_r.so.2.13
+libexec/fax500
+libexec/go500
+libexec/go500gw
+libexec/in.xfingerd
+libexec/mail500
+libexec/maildap
+libexec/rcpt500
+libexec/rp500
+libexec/slapd
+libexec/slurpd
+libexec/xrpcomp
 man/man1/ldapadd.1
 man/man1/ldapdelete.1
 man/man1/ldapmodify.1
@@ -28,184 +47,184 @@ man/man1/ldapmodrdn.1
 man/man1/ldappasswd.1
 man/man1/ldapsearch.1
 man/man1/ud.1
-man/man3/ldap.3
+man/man3/ber_alloc_t.3
+man/man3/ber_first_element.3
+man/man3/ber_flush.3
+man/man3/ber_get_bitstring.3
+man/man3/ber_get_boolean.3
+man/man3/ber_get_enum.3
+man/man3/ber_get_int.3
+man/man3/ber_get_next.3
+man/man3/ber_get_null.3
+man/man3/ber_get_stringa.3
+man/man3/ber_get_stringb.3
+man/man3/ber_next_element.3
+man/man3/ber_peek_tag.3
+man/man3/ber_printf.3
+man/man3/ber_put_enum.3
+man/man3/ber_put_int.3
+man/man3/ber_put_null.3
+man/man3/ber_put_ostring.3
+man/man3/ber_put_seq.3
+man/man3/ber_put_set.3
+man/man3/ber_put_string.3
+man/man3/ber_scanf.3
+man/man3/ber_skip_tag.3
+man/man3/ber_start_set.3
 man/man3/lber-decode.3
 man/man3/lber-encode.3
+man/man3/lber-memory.3
+man/man3/lber-types.3
+man/man3/ld_errno.3
+man/man3/ldap.3
 man/man3/ldap_abandon.3
+man/man3/ldap_abandon_ext.3
 man/man3/ldap_add.3
+man/man3/ldap_add_ext.3
+man/man3/ldap_add_ext_s.3
 man/man3/ldap_add_s.3
+man/man3/ldap_attributetype2name.3
+man/man3/ldap_attributetype2str.3
+man/man3/ldap_attributetype_free.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_build_filter.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/ld_errno.3
 man/man3/ldap_compare.3
+man/man3/ldap_compare_ext.3
+man/man3/ldap_compare_ext_s.3
 man/man3/ldap_compare_s.3
+man/man3/ldap_count_entries.3
+man/man3/ldap_count_values.3
+man/man3/ldap_count_values_len.3
 man/man3/ldap_delete.3
+man/man3/ldap_delete_ext.3
+man/man3/ldap_delete_ext_s.3
 man/man3/ldap_delete_s.3
+man/man3/ldap_destroy_cache.3
+man/man3/ldap_disable_cache.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_dn2ufn.3
+man/man3/ldap_enable_cache.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_entry2text.3
+man/man3/ldap_entry2text_search.3
 man/man3/ldap_err2string.3
+man/man3/ldap_errlist.3
+man/man3/ldap_error.3
+man/man3/ldap_explode_dn.3
+man/man3/ldap_explode_rdn.3
 man/man3/ldap_first_attribute.3
-man/man3/ldap_next_attribute.3
+man/man3/ldap_first_disptmpl.3
 man/man3/ldap_first_entry.3
-man/man3/ldap_next_entry.3
-man/man3/ldap_count_entries.3
+man/man3/ldap_first_searchobj.3
+man/man3/ldap_first_tmplcol.3
+man/man3/ldap_first_tmplrow.3
+man/man3/ldap_flush_cache.3
+man/man3/ldap_free_friendlymap.3
+man/man3/ldap_free_searchprefs.3
+man/man3/ldap_free_templates.3
+man/man3/ldap_free_urldesc.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_dn2ufn.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_init.3
+man/man3/ldap_init_getfilter.3
+man/man3/ldap_init_getfilter_buf.3
+man/man3/ldap_init_searchprefs.3
+man/man3/ldap_init_searchprefs_buf.3
+man/man3/ldap_init_templates.3
+man/man3/ldap_init_templates_buf.3
+man/man3/ldap_is_ldap_url.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_kerberos_bind_s.3
+man/man3/ldap_matchingrule2name.3
+man/man3/ldap_matchingrule2str.3
+man/man3/ldap_matchingrule_free.3
+man/man3/ldap_modify.3
+man/man3/ldap_modify_ext.3
+man/man3/ldap_modify_ext_s.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_modrdn_s.3
+man/man3/ldap_mods_free.3
+man/man3/ldap_msgfree.3
+man/man3/ldap_msgid.3
+man/man3/ldap_msgtype.3
+man/man3/ldap_next_attribute.3
+man/man3/ldap_next_disptmpl.3
+man/man3/ldap_next_entry.3
+man/man3/ldap_next_searchobj.3
+man/man3/ldap_next_tmplcol.3
+man/man3/ldap_next_tmplrow.3
+man/man3/ldap_objectclass2name.3
+man/man3/ldap_objectclass2str.3
+man/man3/ldap_objectclass_free.3
+man/man3/ldap_oc2template.3
 man/man3/ldap_open.3
-man/man3/ldap_init.3
+man/man3/ldap_perror.3
 man/man3/ldap_result.3
-man/man3/ldap_msgfree.3
-man/man3/ldap_sort.3
+man/man3/ldap_result2error.3
+man/man3/ldap_sasl_bind.3
+man/man3/ldap_sasl_bind_s.3
+man/man3/ldap_schema.3
+man/man3/ldap_scherr2str.3
 man/man3/ldap_search.3
+man/man3/ldap_search_ext.3
+man/man3/ldap_search_ext_s.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_set_cache_options.3
+man/man3/ldap_setfilteraffixes.3
+man/man3/ldap_simple_bind.3
+man/man3/ldap_simple_bind_s.3
+man/man3/ldap_sort.3
 man/man3/ldap_sort_entries.3
-man/man3/ldap_sort_values.3
 man/man3/ldap_sort_strcasecmp.3
+man/man3/ldap_sort_values.3
+man/man3/ldap_str2attributetype.3
+man/man3/ldap_str2matchingrule.3
+man/man3/ldap_str2objectclass.3
+man/man3/ldap_str2syntax.3
+man/man3/ldap_syntax2name.3
+man/man3/ldap_syntax2str.3
+man/man3/ldap_syntax_free.3
+man/man3/ldap_tmplattrs.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_search_s.3
 man/man3/ldap_ufn_setfilter.3
+man/man3/ldap_ufn_setprefix.3
 man/man3/ldap_ufn_timeout.3
+man/man3/ldap_unbind.3
+man/man3/ldap_unbind_ext.3
+man/man3/ldap_unbind_ext_s.3
+man/man3/ldap_unbind_s.3
+man/man3/ldap_uncache_entry.3
+man/man3/ldap_uncache_request.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/man3/ber_scanf.3
-man/man3/ber_get_next.3
-man/man3/ber_flush.3
-man/man3/ber_skip_tag.3
-man/man3/ber_peek_tag.3
-man/man3/ber_get_int.3
-man/man3/ber_get_stringa.3
-man/man3/ber_get_stringb.3
-man/man3/ber_get_null.3
-man/man3/ber_get_enum.3
-man/man3/ber_get_boolean.3
-man/man3/ber_get_bitstring.3
-man/man3/ber_first_element.3
-man/man3/ber_next_element.3
-man/man3/ber_alloc_t.3
-man/man3/ber_printf.3
-man/man3/ber_put_int.3
-man/man3/ber_put_ostring.3
-man/man3/ber_put_string.3
-man/man3/ber_put_null.3
-man/man3/ber_put_enum.3
-man/man3/ber_start_set.3
-man/man3/ber_put_seq.3
-man/man3/ber_put_set.3
-man/man3/lber-memory.3
-man/man3/lber-types.3
-man/man3/ldap_abandon_ext.3
-man/man3/ldap_add_ext.3
-man/man3/ldap_add_ext_s.3
-man/man3/ldap_sasl_bind.3
-man/man3/ldap_sasl_bind_s.3
-man/man3/ldap_unbind_ext.3
-man/man3/ldap_unbind_ext_s.3
-man/man3/ldap_compare_ext.3
-man/man3/ldap_compare_ext_s.3
-man/man3/ldap_delete_ext.3
-man/man3/ldap_delete_ext_s.3
-man/man3/ldap_explode_rdn.3
-man/man3/ldap_modify_ext.3
-man/man3/ldap_modify_ext_s.3
-man/man3/ldap_msgtype.3
-man/man3/ldap_msgid.3
-man/man3/ldap_schema.3
-man/man3/ldap_str2syntax.3
-man/man3/ldap_syntax2str.3
-man/man3/ldap_syntax2name.3
-man/man3/ldap_syntax_free.3
-man/man3/ldap_str2matchingrule.3
-man/man3/ldap_matchingrule2str.3
-man/man3/ldap_matchingrule2name.3
-man/man3/ldap_matchingrule_free.3
-man/man3/ldap_str2attributetype.3
-man/man3/ldap_attributetype2str.3
-man/man3/ldap_attributetype2name.3
-man/man3/ldap_attributetype_free.3
-man/man3/ldap_str2objectclass.3
-man/man3/ldap_objectclass2str.3
-man/man3/ldap_objectclass2name.3
-man/man3/ldap_objectclass_free.3
-man/man3/ldap_scherr2str.3
-man/man3/ldap_search_ext.3
-man/man3/ldap_search_ext_s.3
+man/man3/ldap_vals2html.3
+man/man3/ldap_vals2text.3
+man/man3/ldap_value_free.3
+man/man3/ldap_value_free_len.3
 man/man5/ldap.conf.5
 man/man5/ldapfilter.conf.5
 man/man5/ldapfriendly.5
@@ -215,73 +234,40 @@ man/man5/ldif.5
 man/man5/slapd.conf.5
 man/man5/slapd.replog.5
 man/man5/ud.conf.5
+man/man8/fax500.8
 man/man8/go500.8
 man/man8/go500gw.8
-man/man8/slapd.8
 man/man8/in.xfingerd.8
 man/man8/mail500.8
-man/man8/fax500.8
 man/man8/rcpt500.8
 man/man8/slapadd.8
 man/man8/slapcat.8
+man/man8/slapd.8
 man/man8/slapindex.8
 man/man8/slappasswd.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/schema/corba.schema.default
-@exec [ -f %B/etc/openldap/schema/corba.schema ] || cp %D/%F %B/etc/openldap/schema/corba.schema
-etc/openldap/schema/core.schema.default
-@exec [ -f %B/etc/openldap/schema/core.schema ] || cp %D/%F %B/etc/openldap/schema/core.schema
-etc/openldap/schema/cosine.schema.default
-@exec [ -f %B/etc/openldap/schema/cosine.schema ] || cp %D/%F %B/etc/openldap/schema/cosine.schema
-etc/openldap/schema/inetorgperson.schema.default
-@exec [ -f %B/etc/openldap/schema/inetorgperson.schema ] || cp %D/%F %B/etc/openldap/schema/inetorgperson.schema
-etc/openldap/schema/java.schema.default
-@exec [ -f %B/etc/openldap/schema/java.schema ] || cp %D/%F %B/etc/openldap/schema/java.schema
-etc/openldap/schema/krb5-kdc.schema.default
-@exec [ -f %B/etc/openldap/schema/krb5-kdc.schema ] || cp %D/%F %B/etc/openldap/schema/krb5-kdc.schema
-etc/openldap/schema/misc.schema.default
-@exec [ -f %B/etc/openldap/schema/misc.schema ] || cp %D/%F %B/etc/openldap/schema/misc.schema
-etc/openldap/schema/nadf.schema.default
-@exec [ -f %B/etc/openldap/schema/nadf.schema ] || cp %D/%F %B/etc/openldap/schema/nadf.schema
-etc/openldap/schema/nis.schema.default
-@exec [ -f %B/etc/openldap/schema/nis.schema ] || cp %D/%F %B/etc/openldap/schema/nis.schema
-etc/openldap/schema/openldap.schema.default
-@exec [ -f %B/etc/openldap/schema/openldap.schema ] || cp %D/%F %B/etc/openldap/schema/openldap.schema
-include/ldap.h
-include/lber.h
-include/lber_types.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/disptmpl.h
-include/srchpref.h
-libexec/in.xfingerd
-libexec/go500
-libexec/go500gw
-libexec/mail500
-libexec/maildap
-libexec/rp500
-libexec/fax500
-libexec/xrpcomp
-libexec/rcpt500
-libexec/slapd
 sbin/slapadd
 sbin/slapcat
 sbin/slapindex
 sbin/slappasswd
-share/openldap/ldapfriendly
+share/examples/openldap/ldap.conf
+share/examples/openldap/ldapfilter.conf
+share/examples/openldap/ldapsearchprefs.conf
+share/examples/openldap/ldaptemplates.conf
+share/examples/openldap/schema/corba.schema
+share/examples/openldap/schema/core.schema
+share/examples/openldap/schema/cosine.schema
+share/examples/openldap/schema/inetorgperson.schema
+share/examples/openldap/schema/java.schema
+share/examples/openldap/schema/krb5-kdc.schema
+share/examples/openldap/schema/misc.schema
+share/examples/openldap/schema/nadf.schema
+share/examples/openldap/schema/nis.schema
+share/examples/openldap/schema/openldap.schema
+share/examples/openldap/slapd.conf
 share/openldap/go500gw.help
+share/openldap/ldapfriendly
 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
+@dirrm share/examples/openldap/schema
+@dirrm share/examples/openldap
diff --git a/databases/openldap/PLIST.netbsd b/databases/openldap/PLIST.netbsd
deleted file mode 100644
index 2b3db47239b..00000000000
--- a/databases/openldap/PLIST.netbsd
+++ /dev/null
@@ -1 +0,0 @@
-@comment $NetBSD: PLIST.netbsd,v 1.1 2001/11/01 00:20:42 zuntum Exp $
diff --git a/databases/openldap/PLIST.solaris b/databases/openldap/PLIST.solaris
deleted file mode 100644
index 19e65c75daa..00000000000
--- a/databases/openldap/PLIST.solaris
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.solaris,v 1.1 2001/11/01 00:20:42 zuntum Exp $
-libexec/slurpd