Split the databases/openldap package in -client and -server component packages

(and add a -doc component), which I'll import in a minute.  This package is now
nothing but a meta-package, depending on those three.  Take over MAINTAINERship
(ok with joerg).  Add an inet6 option to -client and -server (PR pkg/33524).
Bump PKGREVISION.

8 files changed, 141 insertions, 500 deletions

diff --git a/databases/openldap/DESCR b/databases/openldap/DESCR
index 7a3715e09ac..7dcd75c3d2f 100644
--- a/databases/openldap/DESCR
+++ b/databases/openldap/DESCR
@@ -1,2 +1,8 @@
-A open source implementation of the lighthweight directory access protocol
-(LDAP) server and client. OpenLDAP is derived from the U. Mich release 3.3
+OpenLDAP is an open source implementation of the Lightweight Directory Access
+Protocol.  This package includes:
+
+* slapd - stand-alone LDAP daemon (server)
+* slurpd - stand-alone LDAP update replication daemon
+* libraries implementing the LDAP protocol
+* utilities, tools, and sample clients
+* administration guide
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index f73eae81771..d1ca69f3f01 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,136 +1,26 @@
-# $NetBSD: Makefile,v 1.114 2006/05/22 11:57:50 dsainty Exp $
-
-DISTNAME=	openldap-2.3.23
-SVR4_PKGNAME=	oldap
-CATEGORIES=	databases
-MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-	http://www.openldap.org/software/download/OpenLDAP/openldap-release/
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	joerg@NetBSD.org
-HOMEPAGE=	http://www.OpenLDAP.org/
-COMMENT=	Lightweight Directory Access Protocol server and client
-
-CONFLICTS+=		ldapsdk-[0-9]*
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-TEST_TARGET=		test
-
-MAKE_ENV+=		LIBMODE=${LIBMODE:Q}
-OPENLDAP_ETCDIR=	${PKG_SYSCONFDIR}/openldap
-OPENLDAP_MODULEDIR=	${PREFIX}/lib/openldap
-OPENLDAP_VARDIR=	${VARBASE}/openldap
-FILES_SUBST+=		OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-# the internal avl_* prototypes conflict with those in <sys/avl.h> which
-# is included by another system header file on Solaris, so subst them.
-.if ${OPSYS} == "SunOS"
-SUBST_CLASSES+=		conflict
-SUBST_STAGE.conflict=	post-patch
-SUBST_FILES.conflict=	${WRKSRC}/*/*.h
-SUBST_FILES.conflict+=	${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
-SUBST_SED.conflict+=	-e 's,avl_free,openldap_avl_free,g'
-SUBST_SED.conflict+=	-e 's,avl_insert,openldap_avl_insert,g'
-SUBST_SED.conflict+=	-e 's,avl_delete,openldap_avl_delete,g'
-SUBST_SED.conflict+=	-e 's,avl_find,openldap_avl_find,g'
-SUBST_SED.conflict+=	-e 's,avl_find2,openldap_avl_find2,g'
-SUBST_MESSAGE.conflict=	Fixing conflicting function prototypes.
-.endif
-
-CPPFLAGS.Darwin+=	-DBIND_8_COMPAT
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--localstatedir=${OPENLDAP_VARDIR:Q}
-CONFIGURE_ARGS+=	--enable-dynamic   # link servers against shared libs
-CONFIGURE_ARGS+=	--with-tls=openssl
-
-# SLAPD options
-CONFIGURE_ARGS+=	--enable-crypt
-.if !empty(PKG_OPTIONS:Msasl)
-CONFIGURE_ARGS+=	--enable-spasswd
-.endif
-CONFIGURE_ARGS+=	--enable-wrappers
-
-# SLAPD backends
-CONFIGURE_ARGS+=	--enable-dnssrv
-CONFIGURE_ARGS+=	--enable-ldap
-CONFIGURE_ARGS+=	--enable-ldbm
-CONFIGURE_ARGS+=	--enable-meta
-CONFIGURE_ARGS+=	--enable-monitor
-CONFIGURE_ARGS+=	--enable-null
-CONFIGURE_ARGS+=	--enable-passwd
-CONFIGURE_ARGS+=	--enable-shell
-
-# SLAPD (stackable) overlays
-CONFIGURE_ARGS+=	--enable-overlays
-
-OPENLDAP_FILEPERMS=	${ROOT_USER} ${ROOT_GROUP} 0600
-OPENLDAP_DIRPERMS=	${ROOT_USER} ${ROOT_GROUP} 0700
-
-EGDIR=			${PREFIX}/share/examples/openldap
-MAKE_DIRS=		${OPENLDAP_ETCDIR} ${OPENLDAP_ETCDIR}/schema
-OWN_DIRS=		${OPENLDAP_VARDIR} ${OPENLDAP_VARDIR}/run
-OWN_DIRS_PERMS=		${OPENLDAP_VARDIR}/openldap-data ${OPENLDAP_DIRPERMS}
-OWN_DIRS_PERMS+=	${OPENLDAP_VARDIR}/openldap-slurp ${OPENLDAP_DIRPERMS}
-
-CNFS=			ldap.conf ${CNFS_SCHEMAS_cmd:sh}
-CNFS_SCHEMAS_cmd=	${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||"
-CNFS_PERMS=		slapd.conf
-
-CONF_FILES=		# empty
-CONF_FILES_PERMS=	# empty
-.for FILE in ${CNFS}
-CONF_FILES+=		${EGDIR}/${FILE} ${OPENLDAP_ETCDIR}/${FILE}
-.endfor
-.for FILE in ${CNFS_PERMS}
-CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${OPENLDAP_ETCDIR}/${FILE}	\
-			${OPENLDAP_FILEPERMS}
-.endfor
-CONF_FILES_PERMS+=	${EGDIR}/DB_CONFIG				\
-			${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG	\
-			${OPENLDAP_FILEPERMS}
-RCD_SCRIPTS=		slapd
-
-PTHREAD_OPTS+=		require
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if ${PTHREAD_TYPE} == "native"
-CONFIGURE_ARGS+=	--with-threads
-.elif ${PTHREAD_TYPE} == "pth"
-CONFIGURE_ARGS+=	--with-threads=pth
-#
-# Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from
-# pth.h header).
-#
-PTH_FDSETSIZE_cmd=	\
-	if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then	\
-		${AWK} '/if FD_SETSIZE >/ { print $$4 }'		\
-			${BUILDLINK_PREFIX.pth}/include/pth.h;		\
-	else								\
-		${ECHO} 0;						\
-	fi
-CPPFLAGS+=		-DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
-.endif
-RCD_SCRIPTS+=		slurpd
-
-MAKE_FLAGS+=		moduledir=${OPENLDAP_MODULEDIR:Q}
-INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
-
-# Set the correct file modes for the example config files.
-post-install:
-.for _file_ in ${CNFS} ${CNFS_PERMS}
-	${CHMOD} ${SHAREMODE} ${EGDIR}/${_file_}
-	${RM} -f ${EGDIR}/${_file_}.default
-.endfor
-	${CHMOD} ${SHAREMODE} ${EGDIR}/DB_CONFIG
+# $NetBSD: Makefile,v 1.115 2006/05/31 18:17:49 ghen Exp $
+
+DISTNAME=		openldap-${OPENLDAP_VERSION}
+OPENLDAP_VERSION=	2.3.23
+PKGREVISION=		1
+CATEGORIES=		databases
+MASTER_SITES=		# empty
+DISTFILES=		# empty
+
+MAINTAINER=		ghen@NetBSD.org
+HOMEPAGE=		http://www.openldap.org/
+COMMENT=		Lightweight Directory Access Protocol meta-package
+
+DEPENDS+=		openldap-client>=${OPENLDAP_VERSION}:../../databases/openldap-client
+DEPENDS+=		openldap-server>=${OPENLDAP_VERSION}:../../databases/openldap-server
+DEPENDS+=		openldap-doc>=${OPENLDAP_VERSION}:../../databases/openldap-doc
+
+EXTRACT_ONLY=		# yes
+NO_CHECKSUM=		yes
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+
+do-patch:		# empty
+do-install:		# empty
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
new file mode 100644
index 00000000000..7a8bb7be9be
--- /dev/null
+++ b/databases/openldap/Makefile.common
@@ -0,0 +1,104 @@
+# $NetBSD: Makefile.common,v 1.1 2006/05/31 18:17:49 ghen Exp $
+
+DISTNAME=		openldap-2.3.23
+CATEGORIES=		databases
+MASTER_SITES=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+MASTER_SITES+=		http://ftp.openldap.org/pub/OpenLDAP/openldap-release/
+EXTRACT_SUFX=		.tgz
+
+MAINTAINER=		ghen@NetBSD.org
+HOMEPAGE=		http://www.openldap.org/
+
+CONFLICTS+=		ldapsdk-[0-9]*
+
+DISTINFO_FILE=		${.CURDIR}/../../databases/openldap/distinfo
+PATCHDIR=		${.CURDIR}/../../databases/openldap/patches
+FILESDIR=		${.CURDIR}/../../databases/openldap/files
+
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+TEST_TARGET=		test
+
+MAKE_ENV+=		LIBMODE=${LIBMODE:Q}
+
+.include "../../mk/bsd.prefs.mk"
+
+OPENLDAP_ETCDIR?=	${PKG_SYSCONFDIR}/openldap
+OPENLDAP_MODULEDIR=	${PREFIX}/lib/openldap
+OPENLDAP_VARDIR?=	${VARBASE}/openldap
+
+SLAPD_USER?=		slapd
+SLURPD_USER?=		slurpd
+LDAP_GROUP?=		ldap
+
+.include "${.CURDIR}/options.mk"
+
+# the internal avl_* prototypes conflict with those in <sys/avl.h> which
+# is included by another system header file on Solaris, so subst them.
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+=		conflict
+SUBST_STAGE.conflict=	post-patch
+SUBST_FILES.conflict=	${WRKSRC}/*/*.h
+SUBST_FILES.conflict+=	${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
+SUBST_SED.conflict+=	-e 's,avl_free,openldap_avl_free,g'
+SUBST_SED.conflict+=	-e 's,avl_insert,openldap_avl_insert,g'
+SUBST_SED.conflict+=	-e 's,avl_delete,openldap_avl_delete,g'
+SUBST_SED.conflict+=	-e 's,avl_find,openldap_avl_find,g'
+SUBST_SED.conflict+=	-e 's,avl_find2,openldap_avl_find2,g'
+SUBST_MESSAGE.conflict=	Fixing conflicting function prototypes.
+.endif
+
+CPPFLAGS.Darwin+=	-DBIND_8_COMPAT
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${OPENLDAP_VARDIR:Q}
+CONFIGURE_ARGS+=	--enable-dynamic
+CONFIGURE_ARGS+=	--with-tls=openssl
+
+EGDIR=			${PREFIX}/share/examples/openldap
+
+CONF_FILES=		# empty
+CONF_FILES_PERMS=	# empty
+.for FILE in ${CNFS}
+CONF_FILES+=		${EGDIR}/${FILE:Q} ${OPENLDAP_ETCDIR}/${FILE:Q}
+.endfor
+.for FILE in ${CNFS_PERMS}
+CONF_FILES_PERMS+=	${EGDIR}/${FILE:Q} ${OPENLDAP_ETCDIR}/${FILE:Q} ${OPENLDAP_FILEPERMS}
+.endfor
+
+DB_CONFIG?=		# empty
+
+PTHREAD_OPTS+=		require
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+.if ${PTHREAD_TYPE} == "native"
+CONFIGURE_ARGS+=	--with-threads
+.elif ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+=	--with-threads=pth
+
+#
+# Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from
+# pth.h header).
+#
+PTH_FDSETSIZE_cmd=							\
+	if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then	\
+		${AWK} '/if FD_SETSIZE >/ { print $$4 }'		\
+			${BUILDLINK_PREFIX.pth}/include/pth.h;		\
+	else								\
+		${ECHO} 0;						\
+	fi
+CPPFLAGS+=	-DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
+.endif
+
+MAKE_FLAGS+=		moduledir=${OPENLDAP_MODULEDIR:Q}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR:Q}
+
+# Set the correct file modes for the example config files.
+post-install:
+.for file in ${CNFS} ${CNFS_PERMS} ${DB_CONFIG}
+	${CHMOD} ${SHAREMODE} ${EGDIR}/${file:Q}
+	${RM} -f ${EGDIR}/${file:Q}.default
+.endfor
diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index eda4675521f..c73fc75fe58 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -1,249 +1 @@
-@comment $NetBSD: PLIST,v 1.26 2006/05/15 19:01:23 ghen Exp $
-bin/ldapadd
-bin/ldapcompare
-bin/ldapdelete
-bin/ldapmodify
-bin/ldapmodrdn
-bin/ldappasswd
-bin/ldapsearch
-bin/ldapwhoami
-include/lber.h
-include/lber_types.h
-include/ldap.h
-include/ldap_cdefs.h
-include/ldap_features.h
-include/ldap_schema.h
-include/ldap_utf8.h
-include/slapi-plugin.h
-lib/liblber.la
-lib/libldap.la
-lib/libldap_r.la
-libexec/slapd
-libexec/slurpd
-man/man1/ldapadd.1
-man/man1/ldapcompare.1
-man/man1/ldapdelete.1
-man/man1/ldapmodify.1
-man/man1/ldapmodrdn.1
-man/man1/ldappasswd.1
-man/man1/ldapsearch.1
-man/man1/ldapwhoami.1
-man/man3/ber_alloc_t.3
-man/man3/ber_bvarray_add.3
-man/man3/ber_bvarray_free.3
-man/man3/ber_bvdup.3
-man/man3/ber_bvecadd.3
-man/man3/ber_bvecfree.3
-man/man3/ber_bvfree.3
-man/man3/ber_bvstr.3
-man/man3/ber_bvstrdup.3
-man/man3/ber_dupbv.3
-man/man3/ber_first_element.3
-man/man3/ber_flush.3
-man/man3/ber_free.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/ber_str2bv.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_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_messages.3
-man/man3/ldap_count_references.3
-man/man3/ldap_count_values.3
-man/man3/ldap_count_values_len.3
-man/man3/ldap_dcedn2dn.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_dn2ad_canonical.3
-man/man3/ldap_dn2dcedn.3
-man/man3/ldap_dn2str.3
-man/man3/ldap_dn2ufn.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_first_entry.3
-man/man3/ldap_first_message.3
-man/man3/ldap_first_reference.3
-man/man3/ldap_free_urldesc.3
-man/man3/ldap_get_dn.3
-man/man3/ldap_get_values.3
-man/man3/ldap_get_values_len.3
-man/man3/ldap_init.3
-man/man3/ldap_is_ldap_url.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_modrdn.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_entry.3
-man/man3/ldap_next_message.3
-man/man3/ldap_next_reference.3
-man/man3/ldap_objectclass2name.3
-man/man3/ldap_objectclass2str.3
-man/man3/ldap_objectclass_free.3
-man/man3/ldap_open.3
-man/man3/ldap_parse_extended_result.3
-man/man3/ldap_parse_reference.3
-man/man3/ldap_parse_result.3
-man/man3/ldap_parse_sasl_bind_result.3
-man/man3/ldap_perror.3
-man/man3/ldap_result.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_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_strcasecmp.3
-man/man3/ldap_sort_values.3
-man/man3/ldap_str2attributetype.3
-man/man3/ldap_str2dn.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_unbind.3
-man/man3/ldap_unbind_ext.3
-man/man3/ldap_unbind_ext_s.3
-man/man3/ldap_unbind_s.3
-man/man3/ldap_url.3
-man/man3/ldap_url_parse.3
-man/man3/ldap_value_free.3
-man/man3/ldap_value_free_len.3
-man/man5/ldap.conf.5
-man/man5/ldif.5
-man/man5/slapd-bdb.5
-man/man5/slapd-dnssrv.5
-man/man5/slapd-hdb.5
-man/man5/slapd-ldap.5
-man/man5/slapd-ldbm.5
-man/man5/slapd-ldif.5
-man/man5/slapd-meta.5
-man/man5/slapd-monitor.5
-man/man5/slapd-null.5
-man/man5/slapd-passwd.5
-man/man5/slapd-perl.5
-man/man5/slapd-relay.5
-man/man5/slapd-shell.5
-man/man5/slapd-sql.5
-man/man5/slapd-tcl.5
-man/man5/slapd.access.5
-man/man5/slapd.conf.5
-man/man5/slapd.plugin.5
-man/man5/slapd.replog.5
-man/man5/slapo-accesslog.5
-man/man5/slapo-auditlog.5
-man/man5/slapo-chain.5
-man/man5/slapo-dynlist.5
-man/man5/slapo-lastmod.5
-man/man5/slapo-pcache.5
-man/man5/slapo-ppolicy.5
-man/man5/slapo-refint.5
-man/man5/slapo-retcode.5
-man/man5/slapo-rwm.5
-man/man5/slapo-syncprov.5
-man/man5/slapo-translucent.5
-man/man5/slapo-unique.5
-man/man5/slapo-valsort.5
-man/man8/slapacl.8
-man/man8/slapadd.8
-man/man8/slapauth.8
-man/man8/slapcat.8
-man/man8/slapd.8
-man/man8/slapdn.8
-man/man8/slapindex.8
-man/man8/slappasswd.8
-man/man8/slaptest.8
-man/man8/slurpd.8
-sbin/slapacl
-sbin/slapadd
-sbin/slapauth
-sbin/slapcat
-sbin/slapdn
-sbin/slapindex
-sbin/slappasswd
-sbin/slaptest
-share/examples/openldap/DB_CONFIG
-share/examples/openldap/ldap.conf
-share/examples/openldap/schema/README
-share/examples/openldap/schema/corba.schema
-share/examples/openldap/schema/core.ldif
-share/examples/openldap/schema/core.schema
-share/examples/openldap/schema/cosine.schema
-share/examples/openldap/schema/dyngroup.schema
-share/examples/openldap/schema/inetorgperson.schema
-share/examples/openldap/schema/java.schema
-share/examples/openldap/schema/misc.schema
-share/examples/openldap/schema/nis.schema
-share/examples/openldap/schema/openldap.ldif
-share/examples/openldap/schema/openldap.schema
-share/examples/openldap/schema/ppolicy.schema
-share/examples/openldap/slapd.conf
-share/examples/rc.d/slapd
-share/examples/rc.d/slurpd
-@dirrm share/examples/openldap/schema
-@dirrm share/examples/openldap
+@comment $NetBSD: PLIST,v 1.27 2006/05/31 18:17:49 ghen Exp $
diff --git a/databases/openldap/buildlink3.mk b/databases/openldap/buildlink3.mk
deleted file mode 100644
index 5b44a936517..00000000000
--- a/databases/openldap/buildlink3.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.25 2006/04/13 21:45:13 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
-
-.include "../../mk/bsd.prefs.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_API_DEPENDS.openldap+=		openldap>=2.3.11nb2
-BUILDLINK_PKGSRCDIR.openldap?=		../../databases/openldap
-
-# Export the deprecated API from the openldap-2.2.x releases.
-BUILDLINK_CPPFLAGS.openldap+=		-DLDAP_DEPRECATED
-.endif	# OPENLDAP_BUILDLINK3_MK
-
-.if !defined(PKG_BUILD_OPTIONS.openldap)
-PKG_BUILD_OPTIONS.openldap!=						\
-	cd ${BUILDLINK_PKGSRCDIR.openldap} &&				\
-	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
-MAKEFLAGS+=	PKG_BUILD_OPTIONS.openldap=${PKG_BUILD_OPTIONS.openldap:Q}
-.endif
-MAKEVARS+=	PKG_BUILD_OPTIONS.openldap
-
-.if !empty(PKG_BUILD_OPTIONS.openldap:Mkerberos) || \
-    !empty(PKG_BUILD_OPTIONS.openldap:Msasl)
-.  include "../../security/cyrus-sasl/buildlink3.mk"
-.endif
-.include "../../security/openssl/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/openldap/files/slapd.sh b/databases/openldap/files/slapd.sh
index e30ec9a4473..02e19fcb2dd 100644
--- a/databases/openldap/files/slapd.sh
+++ b/databases/openldap/files/slapd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: slapd.sh,v 1.7 2005/10/26 15:08:13 jlam Exp $
+# $NetBSD: slapd.sh,v 1.8 2006/05/31 18:17:49 ghen Exp $
 #
 # OpenLDAP standalone LDAP daemon
 #
@@ -13,6 +13,7 @@ name="slapd"
 rcvar=${name}
 command="@PREFIX@/libexec/${name}"
 required_files="@OPENLDAP_ETCDIR@/${name}.conf"
+command_args="-u @SLAPD_USER@"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/databases/openldap/files/slurpd.sh b/databases/openldap/files/slurpd.sh
index 674d17e6848..bc658409861 100644
--- a/databases/openldap/files/slurpd.sh
+++ b/databases/openldap/files/slurpd.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: slurpd.sh,v 1.3 2005/10/26 15:08:13 jlam Exp $
+# $NetBSD: slurpd.sh,v 1.4 2006/05/31 18:17:49 ghen Exp $
 #
 # OpenLDAP LDAP database replication daemon
 #
@@ -14,6 +14,7 @@ rcvar=${name}
 command="@PREFIX@/libexec/${name}"
 required_files="@OPENLDAP_ETCDIR@/slapd.conf"
 required_vars="slapd"
+slurpd_user="@SLURPD_USER@"
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk
deleted file mode 100644
index ce9e2f25c7d..00000000000
--- a/databases/openldap/options.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-# $NetBSD: options.mk,v 1.17 2006/04/13 21:45:13 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.openldap
-PKG_SUPPORTED_OPTIONS=	bdb kerberos sasl slp
-PKG_OPTIONS_OPTIONAL_GROUPS+=	odbc
-PKG_OPTIONS_GROUP.odbc=	iodbc unixodbc
-PKG_SUGGESTED_OPTIONS=	bdb
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Whether to build with the Berkeley DB based slapd backends.
-###
-### NOTE: that option is enabled, because the openldap server needs
-### 	  to have local storage support to work as standalone.
-###
-
-.if !empty(PKG_OPTIONS:Mbdb)
-BDB_ACCEPTED=		db4 # db3?
-.  include "../../mk/bdb.buildlink3.mk"
-.endif
-BDB_TYPE?=		none
-.if ${BDB_TYPE} != "none"
-CONFIGURE_ARGS+=	--enable-bdb --enable-hdb
-.else
-CONFIGURE_ARGS+=	--disable-bdb --disable-hdb
-.endif
-
-###
-### Whether to build with iODBC to enable SQL based slapd backends
-###
-.if !empty(PKG_OPTIONS:Miodbc)
-.  include "../../databases/iodbc/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-sql
-.endif
-
-###
-### Whether to build with unixODBC to enable SQL based slapd backends
-###
-.if !empty(PKG_OPTIONS:Munixodbc)
-.  include "../../databases/unixodbc/buildlink3.mk"
-.  include "../../devel/libltdl/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-sql
-.endif
-
-.if empty(PKG_OPTIONS:Miodbc) && empty(PKG_OPTIONS:Munixodbc)
-CONFIGURE_ARGS+=	--disable-sql
-.endif
-
-###
-### Kerberos authentication is via SASL.
-###
-.if !empty(PKG_OPTIONS:Mkerberos)
-.  if empty(PKG_OPTIONS:Msasl)
-PKG_OPTIONS+=		sasl
-.  endif
-.endif
-
-###
-### SASL authentication (requires SASL2)
-###
-.if !empty(PKG_OPTIONS:Msasl)
-CONFIGURE_ARGS+=		--with-cyrus-sasl
-BUILDLINK_API_DEPENDS.cyrus-sasl+=  cyrus-sasl>=2.1.15
-.  include "../../security/cyrus-sasl/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=		--without-cyrus-sasl
-.endif
-
-###
-### SLP (Service Locator Protocol)
-###
-.if !empty(PKG_OPTIONS:Mslp)
-.  include "../../net/openslp/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-slp
-.endif