nss_ldap and pam-ldap now share the same configuration files

4 files changed, 15 insertions, 11 deletions

diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile
index 00c840a2883..5e517d2e088 100644
--- a/databases/nss_ldap/Makefile
+++ b/databases/nss_ldap/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2010/10/29 13:47:11 adam Exp $
+# $NetBSD: Makefile,v 1.23 2010/11/03 11:39:07 adam Exp $
 
 DISTNAME=	nss_ldap-265
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.padl.com/download/
 
@@ -18,14 +19,17 @@ USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-schema-mapping
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/nss_ldap.conf
-CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/nss_ldap.secret
+CONFIGURE_ARGS+=	--with-ldap-lib=openldap
+CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
+CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
+CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret
 MAKE_FLAGS+=		INST_UID=${BINOWN} INST_GID=${BINGRP}
 
+# shared with security/pam-ldap
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
+CONF_FILES=		${EGDIR}/ldap.conf ${PKG_SYSCONFDIR}/ldap.conf
 
-CONF_FILES=	${EGDIR}/nss_ldap.conf ${PKG_SYSCONFDIR}/nss_ldap.conf
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 
 pre-build:
 	${CP} ${FILESDIR}/netbsd.c  ${FILESDIR}/netbsd.h ${WRKSRC}
diff --git a/databases/nss_ldap/PLIST b/databases/nss_ldap/PLIST
index 2d24b64126e..f199604b81b 100644
--- a/databases/nss_ldap/PLIST
+++ b/databases/nss_ldap/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/11/03 11:39:07 adam Exp $
 lib/nss_ldap.so
 lib/nss_ldap.so.1
 man/man5/nss_ldap.5
-share/examples/nss_ldap/nss_ldap.conf
+share/examples/nss_ldap/ldap.conf
 share/examples/nss_ldap/nsswitch.ldap
diff --git a/databases/nss_ldap/distinfo b/databases/nss_ldap/distinfo
index ef02970a9e8..dbdea44c1ba 100644
--- a/databases/nss_ldap/distinfo
+++ b/databases/nss_ldap/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2010/10/29 13:47:11 adam Exp $
+$NetBSD: distinfo,v 1.7 2010/11/03 11:39:07 adam Exp $
 
 SHA1 (nss_ldap-265.tar.gz) = 743581914fc8c9b4d33955c2cc7acd0c3c44a430
 RMD160 (nss_ldap-265.tar.gz) = 0513f1b62aface531145f739ec8e9867c77eb3ce
 Size (nss_ldap-265.tar.gz) = 280976 bytes
 SHA1 (patch-ab) = 418fca750b9b6f40dd3a904af84fababf8c55022
-SHA1 (patch-af) = 02deabc2a806a5cf82809b770bdc6122a2ff6a9d
+SHA1 (patch-af) = 27fa5ff0bbff4340ce92e109b35d900369e31a53
 SHA1 (patch-ag) = 880b8867b610b9602fc428beebdeb85dee215816
diff --git a/databases/nss_ldap/patches/patch-af b/databases/nss_ldap/patches/patch-af
index 55b653cba7d..e1e8488fa5d 100644
--- a/databases/nss_ldap/patches/patch-af
+++ b/databases/nss_ldap/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2010/10/29 13:47:11 adam Exp $
+$NetBSD: patch-af,v 1.6 2010/11/03 11:39:08 adam Exp $
 
 --- Makefile.in.orig	2009-11-06 10:28:08.000000000 +0000
 +++ Makefile.in
@@ -61,7 +61,7 @@ $NetBSD: patch-af,v 1.5 2010/10/29 13:47:11 adam Exp $
 -		$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(NSS_LDAP_PATH_CONF); \
 -	fi
 +	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+	$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/nss_ldap.conf
++	$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf
  	$(INSTALL_DATA) -o $(INST_UID) -g $(INST_GID) $(srcdir)/nsswitch.ldap $(DESTDIR)$(sysconfdir)/nsswitch.ldap; 
  
  uninstall-local: