Honour PKG_SYSCONFDIR, but leave configuration files in the examples directory

as it seems they are not used by the libraries.  Bump PKGREVISION to 1.

5 files changed, 37 insertions, 12 deletions

diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index bdc7e9383c4..7d6b093c291 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:40:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/05/01 09:39:59 jmmv Exp $
 
 DISTNAME=       ldapsdk_12311998
 PKGNAME=        ldapsdk-12311998
+PKGREVISION=	1
 WRKSRC=         ${WRKDIR}/mozilla
 CATEGORIES=	devel databases
 MASTER_SITES=   ftp://ftp.mozilla.org/pub/directory/c-sdk/ldap/
@@ -16,9 +17,17 @@ USE_GMAKE=	yes
 USE_PERL5=	build
 USE_BUILDLINK2=	yes
 
+PKG_SYSCONFSUBDIR=	ldapsdk
+EGDIR=			${PREFIX}/share/examples/ldapsdk
+
+SCRIPTS_ENV+=	EGDIR=${EGDIR}
 SCRIPTS_ENV+=	GMAKE=${GMAKE}
 SCRIPTS_ENV+=	LN=${LN}
 
+do-configure:
+	${ECHO} "PKG_SYSCONFDIR=${PKG_SYSCONFDIR}" >> ${WRKSRC}/config/rules.mk
+	${ECHO} "EGDIR=${EGDIR}" >> ${WRKSRC}/config/rules.mk
+
 do-build:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-build
 
diff --git a/devel/ldapsdk/PLIST b/devel/ldapsdk/PLIST
index 4d7635f0e28..8da36d7f202 100644
--- a/devel/ldapsdk/PLIST
+++ b/devel/ldapsdk/PLIST
@@ -1,8 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:24:26 zuntum Exp $
-etc/ldapfilter.conf
-etc/ldapsearchprefs.conf
-etc/ldapfriendly
-etc/ldaptemplates.conf
+@comment $NetBSD: PLIST,v 1.2 2003/05/01 09:39:59 jmmv Exp $
 include/disptmpl.h
 include/lber.h
 include/ldap.h
@@ -15,3 +11,8 @@ lib/libldap.so.1.0
 lib/liblber.so
 lib/liblber.so.1
 lib/liblber.so.1.0
+share/examples/ldapsdk/ldapfilter.conf
+share/examples/ldapsdk/ldapsearchprefs.conf
+share/examples/ldapsdk/ldapfriendly
+share/examples/ldapsdk/ldaptemplates.conf
+@dirrm share/examples/ldapsdk
diff --git a/devel/ldapsdk/distinfo b/devel/ldapsdk/distinfo
index 91086b0e8fd..b2b6e2ffbda 100644
--- a/devel/ldapsdk/distinfo
+++ b/devel/ldapsdk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:26 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/05/01 09:40:00 jmmv Exp $
 
 SHA1 (ldapsdk_12311998.tar.gz) = fc132cf2d7bef6f3b93486fabd73c1f7f202d04e
 Size (ldapsdk_12311998.tar.gz) = 1375703 bytes
 SHA1 (patch-aa) = 19be7abc39dabd593766a0f0f8131f394afd0a67
+SHA1 (patch-ab) = 270317f69022e63a9fca314b39c31297d381e8de
diff --git a/devel/ldapsdk/patches/patch-ab b/devel/ldapsdk/patches/patch-ab
new file mode 100644
index 00000000000..b8c0b5419ff
--- /dev/null
+++ b/devel/ldapsdk/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2003/05/01 09:40:01 jmmv Exp $
+
+--- directory/c-sdk/ldap/libraries/libldap/Makefile.client.orig	1998-12-31 12:28:21.000000000 +0100
++++ directory/c-sdk/ldap/libraries/libldap/Makefile.client
+@@ -112,7 +112,7 @@ ETCDIR		= $(DIST)/etc
+ # are installed, set this accordingly (this path gets compiled into a
+ # few binaries). otherwise, leave it alone.
+ #
+-RUNTIMEETCDIR	= $(ETCDIR)
++RUNTIMEETCDIR	= $(PKG_SYSCONFDIR)
+ 
+ #
+ # To build slapd (the stand-alone ldap daemon), uncomment the MAKESLAPD
diff --git a/devel/ldapsdk/scripts/pre-install b/devel/ldapsdk/scripts/pre-install
index 2796ae2ca4d..5117f91fd66 100755
--- a/devel/ldapsdk/scripts/pre-install
+++ b/devel/ldapsdk/scripts/pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-install,v 1.4 2002/10/20 21:48:18 seb Exp $
+# $NetBSD: pre-install,v 1.5 2003/05/01 09:40:01 jmmv Exp $
 
 cd ${WRKSRC}
 cd dist
@@ -19,7 +19,8 @@ ${LN} -sf libldap.so.1.0 ${PREFIX}/lib/libldap.so
 ${BSD_INSTALL_DATA} bin/liblber.so.1.0 ${PREFIX}/lib/liblber.so.1.0
 ${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so.1
 ${LN} -sf liblber.so.1.0 ${PREFIX}/lib/liblber.so
-${BSD_INSTALL_DATA} etc/ldapfilter.conf      ${PREFIX}/etc/ldapfilter.conf
-${BSD_INSTALL_DATA} etc/ldapsearchprefs.conf ${PREFIX}/etc/ldapsearchprefs.conf
-${BSD_INSTALL_DATA} etc/ldapfriendly         ${PREFIX}/etc/ldapfriendly
-${BSD_INSTALL_DATA} etc/ldaptemplates.conf   ${PREFIX}/etc/ldaptemplates.conf
+${BSD_INSTALL_DATA_DIR} ${EGDIR}
+${BSD_INSTALL_DATA} etc/ldapfilter.conf      ${EGDIR}/ldapfilter.conf
+${BSD_INSTALL_DATA} etc/ldapsearchprefs.conf ${EGDIR}/ldapsearchprefs.conf
+${BSD_INSTALL_DATA} etc/ldapfriendly         ${EGDIR}/ldapfriendly
+${BSD_INSTALL_DATA} etc/ldaptemplates.conf   ${EGDIR}/ldaptemplates.conf