USE_PKGLIBTOOL -> USE_LIBTOOL.

LTCONFIG_OVERRIDE -> one less patch.
Add DEINSTALL script with note about etc/openldap.

5 files changed, 27 insertions, 29 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 2f35a0356d5..8759ac1cfe3 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/07/17 09:19:43 veego Exp $
+# $NetBSD: Makefile,v 1.18 2000/08/14 16:35:31 wiz Exp $
 #
 
 DISTNAME=	openldap-1.2.11
@@ -14,7 +14,9 @@ HOMEPAGE=	http://www.OpenLDAP.org/
 
 CONFLICTS+=	ldapsdk*
 
-USE_PKGLIBTOOL=	yes
+USE_LIBTOOL=	yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
+DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -35,6 +37,7 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
 post-build:
 	${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} > ${PLIST_SRC}
+	${SED} "s,@PREFIX@,${PREFIX}," ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
 
 post-configure:
 	${ECHO} "SLAPD_LIBS = " >> ${WRKSRC}/servers/slapd/tools/Makefile
diff --git a/databases/openldap/files/patch-sum b/databases/openldap/files/patch-sum
index dbcbd7ee0ca..26086b97738 100644
--- a/databases/openldap/files/patch-sum
+++ b/databases/openldap/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.6 2000/07/28 07:18:48 kleink Exp $
+$NetBSD: patch-sum,v 1.7 2000/08/14 16:35:32 wiz Exp $
 
-MD5 (patch-aa) = 5bd8aa6c7d04fe193431a707bdf428ca
 MD5 (patch-ab) = 92550b6ef0e556cba008d38079e8f1e9
 MD5 (patch-ac) = 0d622238f73f2f78adc65e2e08f2fa5a
diff --git a/databases/openldap/patches/patch-aa b/databases/openldap/patches/patch-aa
deleted file mode 100644
index b0aa7dba3a4..00000000000
--- a/databases/openldap/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2000/06/15 12:54:12 kleink Exp $
-
---- configure.orig	Thu Aug 26 04:39:37 1999
-+++ configure	Wed Sep 15 11:47:45 1999
-@@ -2318,6 +2318,7 @@
- # Save cache, so that ltconfig can load it
- 
- 
-+if false; then
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-@@ -2336,6 +2337,8 @@
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-+fi
-+
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
- exec 5>>./config.log
diff --git a/databases/openldap/pkg/DEINSTALL b/databases/openldap/pkg/DEINSTALL
new file mode 100644
index 00000000000..acea5a0e59c
--- /dev/null
+++ b/databases/openldap/pkg/DEINSTALL
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2000/08/14 16:35:32 wiz Exp $
+#
+
+case $2 in
+        DEINSTALL) cat << EOF
+===========================================================================
+If you don't want to use openldap anymore, remove @PREFIX@/etc/openldap.
+===========================================================================
+
+EOF
+        ;;
+esac
diff --git a/databases/openldap/pkg/PLIST.common b/databases/openldap/pkg/PLIST.common
index 93066cdad22..9477c953175 100644
--- a/databases/openldap/pkg/PLIST.common
+++ b/databases/openldap/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2000/07/17 09:19:44 veego Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2000/08/14 16:35:32 wiz Exp $
 bin/ud
 bin/ldapsearch
 bin/ldapmodify
@@ -6,10 +6,12 @@ bin/ldapdelete
 bin/ldapmodrdn
 bin/ldappasswd
 bin/ldapadd
-lib/liblber.so.1.0
 lib/liblber.a
-lib/libldap.so.1.0
+lib/liblber.la
+lib/liblber.so.1.0
 lib/libldap.a
+lib/libldap.la
+lib/libldap.so.1.0
 man/man1/ldapadd.1
 man/man1/ldapdelete.1
 man/man1/ldapmodify.1
@@ -214,5 +216,6 @@ sbin/ldbmtest
 share/openldap/ldapfriendly
 share/openldap/go500gw.help
 share/openldap/rcpt500.help
-@unexec rmdir etc/openldap 2>/dev/null || true
+@unexec rmdir %D/etc/openldap 2>/dev/null || true
+@unexec rmdir -p %D/var/openldap-ldbm 2>/dev/null || true
 @dirrm share/openldap