Build shared libraries by using pkglibtool (bump version to "...p1" to

indicate change), skip "make depend", add a Kerberos switch, and add a few
backends.

5 files changed, 89 insertions, 40 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 9e0b02244a1..884476bdb9c 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.7 1999/04/01 15:25:01 hwr Exp $
+# $NetBSD: Makefile,v 1.8 1999/05/04 00:08:43 tv Exp $
+#
 
 DISTNAME=	openldap-1.2.1
+PKGNAME=	openldap-1.2.1p1
 WRKSRC=		${WRKDIR}/ldap
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
@@ -9,10 +11,21 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.OpenLDAP.org/
 
-# for the moment without threads and thus without slurpd
+# for the moment without threads and thus without slurpd and ldapd
 #DEPENDS+=	../../devel/mit-pthreads
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+= --prefix=${PREFIX}
+USE_LIBTOOL=	yes
+
+# unfortunately, --enable-phonetic cannot be disabled by runtime configuration
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-dns --enable-cldap \
+		--enable-wrappers --enable-passwd --enable-shell
+
+.include "../../mk/bsd.prefs.mk"
+.if !defined(USE_KERBEROS4)
+CONFIGURE_ARGS+=--without-kerberos
+.else
+RESTRICTED=	uses Kerberos encryption code
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa
new file mode 100644
index 00000000000..633cc98fadc
--- /dev/null
+++ b/databases/openldap/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.1 1999/05/04 00:08:43 tv Exp $
+
+--- configure.orig	Mon May  3 18:51:06 1999
++++ configure	Mon May  3 18:51:24 1999
+@@ -2067,6 +2067,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -2112,7 +2113,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
++fi
+ 
+ # Extract the first word of "sendmail", so it can be a program name with args.
+ set dummy sendmail; ac_word=$2
diff --git a/databases/openldap/patches/patch-ab b/databases/openldap/patches/patch-ab
new file mode 100644
index 00000000000..53bec849992
--- /dev/null
+++ b/databases/openldap/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 1999/05/04 00:08:43 tv Exp $
+
+--- build/lib-shared.mk.orig	Mon May  3 19:21:39 1999
++++ build/lib-shared.mk	Mon May  3 19:24:56 1999
+@@ -18,9 +18,10 @@
+ 
+ $(LIBRARY):  version.lo
+ 	$(LINK) -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/databases/openldap/pkg/PLIST b/databases/openldap/pkg/PLIST
index 8a59defcddd..5ea9dfeda34 100644
--- a/databases/openldap/pkg/PLIST
+++ b/databases/openldap/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/03/29 14:35:53 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/05/04 00:08:44 tv Exp $
 bin/ldapsearch
 bin/ldapmodify
 bin/ldapdelete
@@ -6,10 +6,38 @@ bin/ldapmodrdn
 bin/ldapadd
 bin/ldappasswd
 bin/ud
-lib/liblber.la
+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
 lib/liblber.a
-lib/libldap.la
+lib/liblber.so.1.0
 lib/libldap.a
+lib/libldap.so.1.0
+libexec/in.xfingerd
+libexec/go500
+libexec/go500gw
+libexec/mail500
+libexec/rp500
+libexec/fax500
+libexec/xrpcomp
+libexec/rcpt500
+libexec/slapd
 man/man1/ldapdelete.1
 man/man1/ldapmodify.1
 man/man1/ldapadd.1
@@ -175,35 +203,6 @@ man/man8/fax500.8
 man/man8/rcpt500.8
 man/man8/slapd.8
 man/man8/slurpd.8
-etc/openldap/ldap.conf
-etc/openldap/ldap.conf.default
-etc/openldap/ldapfilter.conf
-etc/openldap/ldapfilter.conf.default
-etc/openldap/ldaptemplates.conf
-etc/openldap/ldaptemplates.conf.default
-etc/openldap/ldapsearchprefs.conf
-etc/openldap/ldapsearchprefs.conf.default
-etc/openldap/slapd.conf
-etc/openldap/slapd.conf.default
-etc/openldap/slapd.at.conf
-etc/openldap/slapd.at.conf.default
-etc/openldap/slapd.oc.conf
-etc/openldap/slapd.oc.conf.default
-@dirrm etc/openldap
-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/ldif2id2entry
@@ -215,4 +214,5 @@ sbin/ldbmtest
 share/openldap/ldapfriendly
 share/openldap/go500gw.help
 share/openldap/rcpt500.help
+@unexec rmdir etc/openldap 2>/dev/null || true
 @dirrm share/openldap
diff --git a/databases/openldap/scripts/post-configure b/databases/openldap/scripts/post-configure
deleted file mode 100644
index b58fc512de4..00000000000
--- a/databases/openldap/scripts/post-configure
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-cd ${WRKDIR}/ldap
-make depend