nss_ldap and pam-ldap now share the same configuration files

4 files changed, 20 insertions, 26 deletions

diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 7d997662c6c..b2c3c69c0ac 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/10/28 08:06:19 adam Exp $
+# $NetBSD: Makefile,v 1.34 2010/11/03 11:39:08 adam Exp $
 
 DISTNAME=	pam_ldap-185
 PKGNAME=	${DISTNAME:S/_/-/}
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.padl.com/pub/ \
 		http://www.padl.com/download/
@@ -16,11 +17,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-ldap-lib=openldap
 CONFIGURE_ARGS+=	--with-ldap-dir=${BUILDLINK_PREFIX.openldap-client}
-CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/pam_ldap.conf
-CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/pam_ldap.secret
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-ldap-conf-file=${PKG_SYSCONFDIR}/ldap.conf
+CONFIGURE_ARGS+=	--with-ldap-secret-file=${PKG_SYSCONFDIR}/ldap.secret
 
 # Fix (workaround?) a bug with openpam/NetBSD
 # The bug is described in PR security/39313.
@@ -31,23 +32,17 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CFLAGS+=		-DNO_STATIC_MODULES
 .endif
 
+# shared with databases/nss_ldap
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES=		${EGDIR}/ldap.conf ${PKG_SYSCONFDIR}/ldap.conf
+
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
 INSTALL_TARGET=		install install-data
 
-DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
-EGDIR=		${PREFIX}/share/examples/${PKGBASE}
-
-INSTALLATION_DIRS=	${DOCDIR}
-
-CONF_FILES=	${EGDIR}/pam_ldap.conf ${PKG_SYSCONFDIR}/pam_ldap.conf
-
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 
 post-install:
-.for file in COPYING COPYING.LIB
-	cd ${WRKSRC} && ${INSTALL_DATA} ${file} ${DESTDIR}${DOCDIR}
-.endfor
 .for file in ldapns.schema ns-pwd-policy.schema
 	cd ${WRKSRC} && ${INSTALL_DATA} ${file} ${DESTDIR}${EGDIR}
 .endfor
diff --git a/security/pam-ldap/PLIST b/security/pam-ldap/PLIST
index d1d7cdae00e..ad8a1835d0b 100644
--- a/security/pam-ldap/PLIST
+++ b/security/pam-ldap/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:13:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/11/03 11:39:08 adam Exp $
 lib/security/pam_ldap.la
 man/man5/pam_ldap.5
-share/doc/pam-ldap/COPYING
-share/doc/pam-ldap/COPYING.LIB
+share/examples/pam-ldap/ldap.conf
 share/examples/pam-ldap/ldapns.schema
 share/examples/pam-ldap/ns-pwd-policy.schema
-share/examples/pam-ldap/pam_ldap.conf
diff --git a/security/pam-ldap/distinfo b/security/pam-ldap/distinfo
index 825df86b1cd..17788eb70c6 100644
--- a/security/pam-ldap/distinfo
+++ b/security/pam-ldap/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2010/10/28 08:06:19 adam Exp $
+$NetBSD: distinfo,v 1.12 2010/11/03 11:39:08 adam Exp $
 
 SHA1 (pam_ldap-185.tar.gz) = 56dc89b38697ee50295dde3af52a3785f4a5442f
 RMD160 (pam_ldap-185.tar.gz) = bb8263aff8e9d9c7e6ffb8a1d2c449e488037a7e
 Size (pam_ldap-185.tar.gz) = 163467 bytes
-SHA1 (patch-aa) = d97777c44be0f845e68cbdcfe0294043b9895487
+SHA1 (patch-aa) = 7bfec8025280db30de244c4f5d5b40d8ff30a485
 SHA1 (patch-ab) = fe711cc64cc6e7eb520a3c5a34514fa7e7da9c55
diff --git a/security/pam-ldap/patches/patch-aa b/security/pam-ldap/patches/patch-aa
index f958f0550c2..02f0bf23dbd 100644
--- a/security/pam-ldap/patches/patch-aa
+++ b/security/pam-ldap/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2010/10/28 08:06:19 adam Exp $
+$NetBSD: patch-aa,v 1.6 2010/11/03 11:39:08 adam Exp $
 
 --- Makefile.in.orig	2009-11-06 10:29:34.000000000 +0000
 +++ Makefile.in
@@ -71,15 +71,16 @@ $NetBSD: patch-aa,v 1.5 2010/10/28 08:06:19 adam Exp $
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
  @EXTENSION_SO_TRUE@	$(INSTALL_PROGRAM) -o root -g root pam_ldap.so $(DESTDIR)$(libdir)/security/pam_ldap.so
-@@ -602,9 +610,9 @@ install-exec-local: pam_ldap.so
+@@ -602,10 +610,8 @@ install-exec-local: pam_ldap.so
  
  install-data-local:
  	@$(NORMAL_INSTALL)
 -	@if test ! -f $(DESTDIR)$(sysconfdir)/ldap.conf; then \
-+	@if test ! -f $(DESTDIR)$(sysconfdir)/pam_ldap.conf; then \
- 		$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
+-		$(mkinstalldirs) $(DESTDIR)$(sysconfdir); \
 -		$(INSTALL_DATA) -o root -g root $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
-+		$(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/pam_ldap.conf; \
- 	fi
+-	fi
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(INSTALL_DATA) $(srcdir)/ldap.conf $(DESTDIR)$(sysconfdir)/ldap.conf; \
  
  uninstall-local:
+ 	@$(NORMAL_UNINSTALL)