Hi,
I've been digging further and found that there are some strange things
going on in the OpenLDAP upstream package.
1/ The 'configure' script does not seem to pick up
/usr/local/{include,lib} correctly, thereby missing out on db-4.6
and sasl. I expected these directories to be on the paths easily
enough. I fixed that, but see below.
2/ For all backends and overlays, empty 'install' targets are being
generated, resulting in no backend or overlay being installed into
the fake-<arch> tree, and a 'slapd' that won't start because of
missing backends.
Attached, you find the current state of the port, but with the
following properties:
* All PLIST*s are wrong (of course, see issue #2 above).
* The 'configure' file gets heavily patched to solve issue #1 above.
* The port is not self-contained, but a diff against CVS. So you should
be able to "patch < patchfile" your ports tree with it.
The latter might have been done better patching the autoconf stuff, but
I have no experience with this, and not enough time atm, so I didn't.
Help is much appreciated!
--
Kind regards,
--Toni++
? patches/patch-build_mkdep
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/openldap/Makefile,v
retrieving revision 1.85.6.1
diff -u -r1.85.6.1 Makefile
--- Makefile 10 Dec 2009 00:36:14 -0000 1.85.6.1
+++ Makefile 20 Feb 2010 21:06:30 -0000
@@ -3,16 +3,16 @@
COMMENT-main= Open source LDAP software (client)
COMMENT-server= Open source LDAP software (server)
-DISTNAME= openldap-2.3.43
-FULLPKGNAME-main= ${DISTNAME:S/-/-client-/}p0
-PKGNAME-server= ${DISTNAME:S/-/-server-/}p0
-
-SHARED_LIBS += lber 9.1 # .2.15
-SHARED_LIBS += ldap 9.1 # .2.15
-SHARED_LIBS += ldap_r 9.1 # .2.15
-SHARED_LIBS += lber-2.3 9.1 # .2.15
-SHARED_LIBS += ldap-2.3 9.1 # .2.15
-SHARED_LIBS += ldap_r-2.3 9.1 # .2.15
+DISTNAME= openldap-2.4.21
+FULLPKGNAME-main= ${DISTNAME:S/-/-client-/}
+PKGNAME-server= ${DISTNAME:S/-/-server-/}
+
+SHARED_LIBS += lber 10.0
+SHARED_LIBS += ldap 10.0
+SHARED_LIBS += ldap_r 10.0
+SHARED_LIBS += lber-2.4 10.0
+SHARED_LIBS += ldap-2.4 10.0
+SHARED_LIBS += ldap_r-2.4 10.0
CATEGORIES= databases net
HOMEPAGE= http://www.openldap.org/
@@ -21,7 +21,7 @@
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto ssl asn1 com_err gssapi krb5
@@ -37,9 +37,15 @@
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
+
+CFLAGS+= -I/usr/local/include
+LDLAGS+= -L/usr/local/lib
+
+
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--localstatedir="/var" \
- --enable-ipv6
+ --enable-ipv6 \
+ --with-tls
# slapd options
CONFIGURE_ARGS+= --enable-slapd \
@@ -53,39 +59,29 @@
# slapd modules
CONFIGURE_ARGS+= --enable-dnssrv \
--enable-ldap \
- --enable-ldbm \
+ --enable-bdb \
+ --enable-hdb \
--enable-meta \
--enable-monitor \
--enable-null \
--enable-passwd \
--enable-perl \
+ --enable-relay \
--enable-shell
-# slurpd modules
-CONFIGURE_ARGS+= --enable-slurpd
-
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/build
REGRESS_TARGET= test
-FLAVORS= bdb
-FLAVOR?=
-
MULTI_PACKAGES= -main -server
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
CPPFLAGS+= -I${LOCALBASE}/include/sasl
-.if ${FLAVOR:L:Mbdb}
-BROKEN= OpenLDAP 2.3 is incompatible with Berkeley DB 4.6
-CONFIGURE_ARGS+= --enable-bdb --enable-hdb
-LIB_DEPENDS+= lib/db4/db.>=4:db-4.*:databases/db/v4
+LIB_DEPENDS+= lib/db4/db.>=4:db-4.[4-8]:databases/db/v4
CPPFLAGS+= -I${LOCALBASE}/include/db4
LDFLAGS+= -L${LOCALBASE}/lib/db4
LIBS+= -ldb
-.else
-CONFIGURE_ARGS+= --disable-bdb --disable-hdb
-.endif
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
@@ -99,14 +95,6 @@
pre-build:
@cd ${WRKBUILD}; ${MAKE_PROGRAM} depend
-pre-configure:
- @perl -pi -e 's,KRB5_LIBS=,KRB5_LIBS="-lgssapi -lkrb5 -lasn1 \
- -lcom_err",g' ${WRKSRC}/configure
-.if ${FLAVOR} != "bdb"
- @perl -pi -e 's,database bdb,database ldbm,' \
- ${WRKSRC}/servers/slapd/slapd.conf
-.endif
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/openldap
${INSTALL_DATA} ${DESTDIR}${SYSCONFDIR}/openldap/*.conf \
@@ -117,6 +105,6 @@
${INSTALL_DATA} ${WRKSRC}/servers/slapd/DB_CONFIG \
${PREFIX}/share/examples/openldap
@rm -r ${DESTDIR}${SYSCONFDIR}/openldap
- @rm -r ${DESTDIR}/var/openldap-data ${DESTDIR}/var/openldap-slurp
+ @rm -r ${DESTDIR}/var/openldap-data
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/openldap/distinfo,v
retrieving revision 1.31
diff -u -r1.31 distinfo
--- distinfo 21 Jul 2008 06:07:10 -0000 1.31
+++ distinfo 20 Feb 2010 21:06:30 -0000
@@ -1,5 +1,5 @@
-MD5 (openldap-2.3.43.tgz) = GyUoEIbrFGuOEevTPeCG3A==
-RMD160 (openldap-2.3.43.tgz) = Pst4nl9NTJOTV+LnIg15PrBUAuc=
-SHA1 (openldap-2.3.43.tgz) = eWtds3rlJDuE97nBEhe77ETg2ow=
-SHA256 (openldap-2.3.43.tgz) = 19LeoFNiyKx+Ebt78dpM3rByJbqNwWl0v/n1Gp89N+E=
-SIZE (openldap-2.3.43.tgz) = 3803011
+MD5 (openldap-2.4.21.tgz) = 5xKMV7K6zZQOiQYFfJT/Jg==
+RMD160 (openldap-2.4.21.tgz) = lPZi6P4bAJ9YNsucGbCV8bFZsb0=
+SHA1 (openldap-2.4.21.tgz) = z8//PfeAS6uOsNlGTTcSo+MtZ3s=
+SHA256 (openldap-2.4.21.tgz) = IuyjVxN8E1tVYeL6DjM2soBwKs8uXE9AvHrtHR6OkyQ=
+SIZE (openldap-2.4.21.tgz) = 5477877
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/databases/openldap/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 7 Nov 2005 15:59:08 -0000 1.2
+++ patches/patch-Makefile_in 20 Feb 2010 21:06:30 -0000
@@ -1,13 +1,10 @@
$OpenBSD: patch-Makefile_in,v 1.2 2005/11/07 15:59:08 mbalmer Exp $
---- Makefile.in.orig Mon Aug 29 21:04:23 2005
-+++ Makefile.in Tue Oct 18 14:29:09 2005
-@@ -36,3 +36,9 @@ distclean: veryclean FORCE
+--- Makefile.in.orig Tue Feb 12 07:26:37 2008
++++ Makefile.in Tue May 13 16:31:14 2008
+@@ -36,3 +36,6 @@ distclean: veryclean FORCE
check: test
test: FORCE
cd tests; make test
-+
-+test-ldbm: FORCE
-+ cd tests; make ldbm
+
+test-bdb: FORCE
+ cd tests; make bdb
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/databases/openldap/patches/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- patches/patch-configure 14 Jan 2008 21:01:11 -0000 1.4
+++ patches/patch-configure 20 Feb 2010 21:06:30 -0000
@@ -1,26 +1,155 @@
-$OpenBSD: patch-configure,v 1.4 2008/01/14 21:01:11 mbalmer Exp $
---- configure.orig Mon Oct 8 18:38:57 2007
-+++ configure Mon Jan 14 11:56:10 2008
-@@ -9502,7 +9502,6 @@ openbsd*)
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
-@@ -35855,8 +35854,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+--- configure.orig Wed Sep 30 02:26:39 2009
++++ configure Sat Feb 20 00:54:20 2010
+@@ -28057,14 +28057,14 @@
+
+ cat >conftest.$ac_ext <<_ACEOF
+
+-#include <db.h>
++#include <db4/db.h>
+ #ifndef DB_VERSION_MAJOR
+ # define DB_VERSION_MAJOR 1
+ #endif
+ __db_version DB_VERSION_MAJOR
+
+ _ACEOF
+- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
++ set X `eval "$ac_cpp ${CFLAGS} conftest.$ac_ext" | $EGREP __db_version` none none
+ ol_cv_bdb_major=${3}
+
+ fi
+@@ -28084,14 +28084,14 @@
+
+ cat >conftest.$ac_ext <<_ACEOF
+
+-#include <db.h>
++#include <db4/db.h>
+ #ifndef DB_VERSION_MINOR
# define DB_VERSION_MINOR 0
#endif
+ __db_version DB_VERSION_MINOR
+
+ _ACEOF
+- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
++ set X `eval "$ac_cpp ${CFLAGS} conftest.$ac_ext" | $EGREP __db_version` none none
+ ol_cv_bdb_minor=${3}
+
+ fi
+@@ -28116,7 +28116,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-#include <db.h>
++#include <db4/db.h>
+
+ /* this check could be improved */
+ #ifndef DB_VERSION_MAJOR
+@@ -28134,14 +28134,13 @@
+ #endif
+
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++if (eval "$ac_cpp ${CFLAGS} conftest.$ac_ext") 2>&5 |
+ $EGREP "__db_version_compat" >/dev/null 2>&1; then
+ ol_cv_bdb_compat=yes
+ else
+ ol_cv_bdb_compat=no
+ fi
+ rm -f conftest*
+-
+ fi
+ { echo "$as_me:$LINENO: result: $ol_cv_bdb_compat" >&5
+ echo "${ECHO_T}$ol_cv_bdb_compat" >&6; }
+@@ -28177,7 +28176,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
+ #endif
--/* require 4.2-4.5 */
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR < 6)
-+/* require 4.2-4.6 */
-+#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 2) && (DB_VERSION_MINOR < 7)
- __db_version_compat
+ #ifndef DB_VERSION_MAJOR
+@@ -28265,7 +28264,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
#endif
-@@ -37236,6 +37235,7 @@ cat confdefs.h >>conftest.$ac_ext
+ #ifndef DB_VERSION_MAJOR
+@@ -28353,7 +28352,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
+ #endif
+
+ #ifndef DB_VERSION_MAJOR
+@@ -28441,7 +28440,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
+ #endif
+
+ #ifndef DB_VERSION_MAJOR
+@@ -28529,7 +28528,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
+ #endif
+
+ #ifndef DB_VERSION_MAJOR
+@@ -28617,7 +28616,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
+ #endif
+
+ #ifndef DB_VERSION_MAJOR
+@@ -28705,7 +28704,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
+ #endif
+
+ #ifndef DB_VERSION_MAJOR
+@@ -28794,7 +28793,7 @@
+ #ifdef HAVE_DB_185_H
+ # include <db_185.h>
+ #else
+-# include <db.h>
++# include <db4/db.h>
+ #endif
+
+ #ifndef DB_VERSION_MAJOR
+@@ -28889,7 +28888,7 @@
+ #ifdef HAVE_DB_185_H
+ choke me;
+ #else
+-#include <db.h>
++#include <db4/db.h>
+ #endif
+ #ifndef DB_VERSION_MAJOR
+ # define DB_VERSION_MAJOR 1
+@@ -28990,7 +28989,7 @@
+ #ifdef HAVE_DB_185_H
+ choke me;
+ #else
+-#include <db.h>
++#include <db4/db.h>
+ #endif
+ #ifndef NULL
+ #define NULL ((void *)0)
+@@ -29291,6 +29290,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -28,3 +157,12 @@
#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
+@@ -30650,7 +30650,7 @@
+ #endif
+
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++if (eval "$ac_cpp ${CFLAGS} conftest.$ac_ext") 2>&5 |
+ $EGREP "__sasl_compat" >/dev/null 2>&1; then
+ ol_cv_sasl_compat=yes
+ else
Index: pkg/DESCR-server
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/DESCR-server,v
retrieving revision 1.3
diff -u -r1.3 DESCR-server
--- pkg/DESCR-server 7 Nov 2005 15:59:08 -0000 1.3
+++ pkg/DESCR-server 20 Feb 2010 21:06:30 -0000
@@ -10,5 +10,6 @@
This is the server portion of OpenLDAP, it provides the server as well as
various administrative binaries.
-Flavors:
- bdb enable the bdb and hdb backends
+This port does not have any FLAVORs anymore since all available backends
+are provided in the base package.
+
Index: pkg/MESSAGE-server
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/MESSAGE-server,v
retrieving revision 1.1
diff -u -r1.1 MESSAGE-server
--- pkg/MESSAGE-server 13 Feb 2008 09:45:54 -0000 1.1
+++ pkg/MESSAGE-server 20 Feb 2010 21:06:30 -0000
@@ -1,3 +1,24 @@
+*** IMPORTANT UPGRADE NOTICE ***
+*** IMPORTANT UPGRADE NOTICE ***
+
+Please note that this package, as opposed to its predecessors,
+requires you to do real migration work, including a dump and
+reload of your whole directory, and possibly a new setup for
+your replication, too!
+
+This package does NOT support the ldbm backend anymore, and
+also no longer contains the slurpd (push) replication server.
+
+So you are now required to use any of the 'db' backends ('hdb'
+is recommended), and to migrate to the 'syncrepl' (pull)
+replication mechanism.
+
+*** IMPORTANT UPGRADE NOTICE ***
+*** IMPORTANT UPGRADE NOTICE ***
+
+
+*** For new users: ***
+
To start slapd, configure it in ${SYSCONFDIR}/openldap/slapd.conf then add
the following line to /etc/rc.conf.local:
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/PFRAG.shared-main,v
retrieving revision 1.1
diff -u -r1.1 PFRAG.shared-main
--- pkg/PFRAG.shared-main 25 Nov 2006 16:50:24 -0000 1.1
+++ pkg/PFRAG.shared-main 20 Feb 2010 21:06:30 -0000
@@ -1,7 +1,7 @@
-...@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/25 16:50:24 espie Exp $
-...@lib lib/liblber-2.3.so.${LIBlber-2.3_VERSION}
+...@comment $OpenBSD$
+...@lib lib/liblber-2.4.so.${LIBlber-2.4_VERSION}
@lib lib/liblber.so.${LIBlber_VERSION}
-...@lib lib/libldap-2.3.so.${LIBldap-2.3_VERSION}
+...@lib lib/libldap-2.4.so.${LIBldap-2.4_VERSION}
@lib lib/libldap.so.${LIBldap_VERSION}
-...@lib lib/libldap_r-2.3.so.${LIBldap_r-2.3_VERSION}
+...@lib lib/libldap_r-2.4.so.${LIBldap_r-2.4_VERSION}
@lib lib/libldap_r.so.${LIBldap_r_VERSION}
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main 15 Jul 2008 18:25:53 -0000 1.3
+++ pkg/PLIST-main 20 Feb 2010 21:06:30 -0000
@@ -1,12 +1,14 @@
-...@comment $OpenBSD: PLIST-main,v 1.3 2008/07/15 18:25:53 brad Exp $
-...@pkgpath ${BASE_PKGPATH}
+...@comment $OpenBSD$
+%%SHARED%%
bin/ldapadd
@bin bin/ldapcompare
@bin bin/ldapdelete
+...@bin bin/ldapexop
@bin bin/ldapmodify
@bin bin/ldapmodrdn
@bin bin/ldappasswd
@bin bin/ldapsearch
+...@bin bin/ldapurl
@bin bin/ldapwhoami
include/lber.h
include/lber_types.h
@@ -22,13 +24,16 @@
lib/libldap.la
lib/libldap_r.a
lib/libldap_r.la
+...@bin libexec/slapd
@man man/man1/ldapadd.1
@man man/man1/ldapcompare.1
@man man/man1/ldapdelete.1
+...@man man/man1/ldapexop.1
@man man/man1/ldapmodify.1
@man man/man1/ldapmodrdn.1
@man man/man1/ldappasswd.1
@man man/man1/ldapsearch.1
+...@man man/man1/ldapurl.1
@man man/man1/ldapwhoami.1
@man man/man3/ber_alloc_t.3
@man man/man3/ber_bvarray_add.3
@@ -68,6 +73,7 @@
@man man/man3/lber-decode.3
@man man/man3/lber-encode.3
@man man/man3/lber-memory.3
+...@man man/man3/lber-sockbuf.3
@man man/man3/lber-types.3
@man man/man3/ld_errno.3
@man man/man3/ldap.3
@@ -86,6 +92,13 @@
@man man/man3/ldap_compare_ext.3
@man man/man3/ldap_compare_ext_s.3
@man man/man3/ldap_compare_s.3
+...@man man/man3/ldap_control_create.3
+...@man man/man3/ldap_control_dup.3
+...@man man/man3/ldap_control_find.3
+...@man man/man3/ldap_control_free.3
+...@man man/man3/ldap_controls.3
+...@man man/man3/ldap_controls_dup.3
+...@man man/man3/ldap_controls_free.3
@man man/man3/ldap_count_entries.3
@man man/man3/ldap_count_messages.3
@man man/man3/ldap_count_references.3
@@ -105,19 +118,30 @@
@man man/man3/ldap_error.3
@man man/man3/ldap_explode_dn.3
@man man/man3/ldap_explode_rdn.3
+...@man man/man3/ldap_extended_operation.3
+...@man man/man3/ldap_extended_operation_s.3
@man man/man3/ldap_first_attribute.3
@man man/man3/ldap_first_entry.3
@man man/man3/ldap_first_message.3
@man man/man3/ldap_first_reference.3
@man man/man3/ldap_free_urldesc.3
@man man/man3/ldap_get_dn.3
+...@man man/man3/ldap_get_option.3
@man man/man3/ldap_get_values.3
@man man/man3/ldap_get_values_len.3
@man man/man3/ldap_init.3
+...@man man/man3/ldap_initialize.3
+...@man man/man3/ldap_install_tls.3
@man man/man3/ldap_is_ldap_url.3
@man man/man3/ldap_matchingrule2name.3
@man man/man3/ldap_matchingrule2str.3
@man man/man3/ldap_matchingrule_free.3
+...@man man/man3/ldap_memalloc.3
+...@man man/man3/ldap_memcalloc.3
+...@man man/man3/ldap_memfree.3
+...@man man/man3/ldap_memory.3
+...@man man/man3/ldap_memrealloc.3
+...@man man/man3/ldap_memvfree.3
@man man/man3/ldap_modify.3
@man man/man3/ldap_modify_ext.3
@man man/man3/ldap_modify_ext_s.3
@@ -142,7 +166,11 @@
@man man/man3/ldap_parse_reference.3
@man man/man3/ldap_parse_result.3
@man man/man3/ldap_parse_sasl_bind_result.3
+...@man man/man3/ldap_parse_sort_control.3
+...@man man/man3/ldap_parse_vlv_control.3
@man man/man3/ldap_perror.3
+...@man man/man3/ldap_rename.3
+...@man man/man3/ldap_rename_s.3
@man man/man3/ldap_result.3
@man man/man3/ldap_result2error.3
@man man/man3/ldap_sasl_bind.3
@@ -154,20 +182,28 @@
@man man/man3/ldap_search_ext_s.3
@man man/man3/ldap_search_s.3
@man man/man3/ldap_search_st.3
+...@man man/man3/ldap_set_option.3
+...@man man/man3/ldap_set_rebind_proc.3
@man man/man3/ldap_simple_bind.3
@man man/man3/ldap_simple_bind_s.3
@man man/man3/ldap_sort.3
@man man/man3/ldap_sort_entries.3
@man man/man3/ldap_sort_strcasecmp.3
@man man/man3/ldap_sort_values.3
+...@man man/man3/ldap_start_tls.3
+...@man man/man3/ldap_start_tls_s.3
@man man/man3/ldap_str2attributetype.3
@man man/man3/ldap_str2dn.3
@man man/man3/ldap_str2matchingrule.3
@man man/man3/ldap_str2objectclass.3
@man man/man3/ldap_str2syntax.3
+...@man man/man3/ldap_strdup.3
+...@man man/man3/ldap_sync.3
@man man/man3/ldap_syntax2name.3
@man man/man3/ldap_syntax2str.3
@man man/man3/ldap_syntax_free.3
+...@man man/man3/ldap_tls.3
+...@man man/man3/ldap_tls_inplace.3
@man man/man3/ldap_unbind.3
@man man/man3/ldap_unbind_ext.3
@man man/man3/ldap_unbind_ext_s.3
@@ -178,22 +214,81 @@
@man man/man3/ldap_value_free_len.3
@man man/man5/ldap.conf.5
@man man/man5/ldif.5
+...@man man/man5/slapd-bdb.5
+...@man man/man5/slapd-config.5
+...@man man/man5/slapd-dnssrv.5
+...@man man/man5/slapd-hdb.5
+...@man man/man5/slapd-ldap.5
+...@man man/man5/slapd-ldbm.5
+...@man man/man5/slapd-ldif.5
+...@man man/man5/slapd-meta.5
+...@man man/man5/slapd-monitor.5
+...@man man/man5/slapd-ndb.5
+...@man man/man5/slapd-null.5
+...@man man/man5/slapd-passwd.5
+...@man man/man5/slapd-perl.5
+...@man man/man5/slapd-relay.5
+...@man man/man5/slapd-shell.5
+...@man man/man5/slapd-sock.5
+...@man man/man5/slapd-sql.5
+...@man man/man5/slapd.access.5
+...@man man/man5/slapd.backends.5
+...@man man/man5/slapd.conf.5
+...@man man/man5/slapd.overlays.5
+...@man man/man5/slapd.plugin.5
@man man/man5/slapo-accesslog.5
@man man/man5/slapo-auditlog.5
@man man/man5/slapo-chain.5
+...@man man/man5/slapo-collect.5
+...@man man/man5/slapo-constraint.5
+...@man man/man5/slapo-dds.5
+...@man man/man5/slapo-dyngroup.5
@man man/man5/slapo-dynlist.5
-...@man man/man5/slapo-lastmod.5
+...@man man/man5/slapo-memberof.5
@man man/man5/slapo-pcache.5
@man man/man5/slapo-ppolicy.5
@man man/man5/slapo-refint.5
@man man/man5/slapo-retcode.5
@man man/man5/slapo-rwm.5
+...@man man/man5/slapo-sssvlv.5
@man man/man5/slapo-syncprov.5
@man man/man5/slapo-translucent.5
@man man/man5/slapo-unique.5
@man man/man5/slapo-valsort.5
+...@man man/man8/slapacl.8
+...@man man/man8/slapadd.8
+...@man man/man8/slapauth.8
+...@man man/man8/slapcat.8
+...@man man/man8/slapd.8
+...@man man/man8/slapdn.8
+...@man man/man8/slapindex.8
+...@man man/man8/slappasswd.8
+...@man man/man8/slapschema.8
+...@man man/man8/slaptest.8
+sbin/slapacl
+sbin/slapadd
+sbin/slapauth
+sbin/slapcat
+sbin/slapdn
+sbin/slapindex
+sbin/slappasswd
+sbin/slapschema
+sbin/slaptest
share/examples/openldap/
-...@sample ${SYSCONFDIR}/openldap/
+share/examples/openldap/DB_CONFIG
share/examples/openldap/ldap.conf
-...@sample ${SYSCONFDIR}/openldap/ldap.conf
-%%SHARED%%
+share/examples/openldap/schema/
+share/examples/openldap/schema/collective.schema
+share/examples/openldap/schema/corba.schema
+share/examples/openldap/schema/core.schema
+share/examples/openldap/schema/cosine.schema
+share/examples/openldap/schema/duaconf.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.schema
+share/examples/openldap/schema/pmi.schema
+share/examples/openldap/schema/ppolicy.schema
+share/examples/openldap/slapd.conf
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/openldap/pkg/PLIST-server,v
retrieving revision 1.17
diff -u -r1.17 PLIST-server
--- pkg/PLIST-server 15 Jul 2008 18:25:53 -0000 1.17
+++ pkg/PLIST-server 20 Feb 2010 21:06:30 -0000
@@ -1,74 +1 @@
-...@comment $OpenBSD: PLIST-server,v 1.17 2008/07/15 18:25:53 brad Exp $
-...@conflict openldap-client->=2.3.11,<=2.3.11p3
-...@newgroup _openldap:544
-...@newuser _openldap:544:_openldap:daemon:OpenLDAP Account:/nonexistent:/sbin/nologin
-...@bin libexec/slapd
-...@bin libexec/slurpd
-...@man man/man5/slapd-bdb.5
-...@man man/man5/slapd-dnssrv.5
-...@man man/man5/slapd-hdb.5
-...@man man/man5/slapd-ldap.5
-...@man man/man5/slapd-ldbm.5
-...@man man/man5/slapd-ldif.5
-...@man man/man5/slapd-meta.5
-...@man man/man5/slapd-monitor.5
-...@man man/man5/slapd-null.5
-...@man man/man5/slapd-passwd.5
-...@man man/man5/slapd-perl.5
-...@man man/man5/slapd-relay.5
-...@man man/man5/slapd-shell.5
-...@man man/man5/slapd-sql.5
-...@man man/man5/slapd-tcl.5
-...@man man/man5/slapd.access.5
-...@man man/man5/slapd.conf.5
-...@man man/man5/slapd.plugin.5
-...@man man/man5/slapd.replog.5
-...@man man/man8/slapacl.8
-...@man man/man8/slapadd.8
-...@man man/man8/slapauth.8
-...@man man/man8/slapcat.8
-...@man man/man8/slapd.8
-...@man man/man8/slapdn.8
-...@man man/man8/slapindex.8
-...@man man/man8/slappasswd.8
-...@man man/man8/slaptest.8
-...@man man/man8/slurpd.8
-sbin/slapacl
-sbin/slapadd
-sbin/slapauth
-sbin/slapcat
-sbin/slapdn
-sbin/slapindex
-sbin/slappasswd
-sbin/slaptest
-share/examples/openldap/schema/
-...@sample ${SYSCONFDIR}/openldap/schema/
-share/examples/openldap/schema/corba.schema
-...@sample ${SYSCONFDIR}/openldap/schema/corba.schema
-share/examples/openldap/schema/core.schema
-...@sample ${SYSCONFDIR}/openldap/schema/core.schema
-share/examples/openldap/schema/cosine.schema
-...@sample ${SYSCONFDIR}/openldap/schema/cosine.schema
-share/examples/openldap/schema/dyngroup.schema
-...@sample ${SYSCONFDIR}/openldap/schema/dyngroup.schema
-share/examples/openldap/schema/inetorgperson.schema
-...@sample ${SYSCONFDIR}/openldap/schema/inetorgperson.schema
-share/examples/openldap/schema/java.schema
-...@sample ${SYSCONFDIR}/openldap/schema/java.schema
-share/examples/openldap/schema/misc.schema
-...@sample ${SYSCONFDIR}/openldap/schema/misc.schema
-share/examples/openldap/schema/nis.schema
-...@sample ${SYSCONFDIR}/openldap/schema/nis.schema
-share/examples/openldap/schema/openldap.schema
-...@sample ${SYSCONFDIR}/openldap/schema/openldap.schema
-share/examples/openldap/schema/ppolicy.schema
-...@sample ${SYSCONFDIR}/openldap/schema/ppolicy.schema
-share/examples/openldap/slapd.conf
-...@sample ${SYSCONFDIR}/openldap/slapd.conf
-...@mode 700
-...@owner _openldap
-...@group _openldap
-...@sample /var/openldap-data/
-...@sample /var/openldap-slurp/
-share/examples/openldap/DB_CONFIG
-...@sample /var/openldap-data/DB_CONFIG
+...@comment $OpenBSD$
