[pkgsrc/trunk]: pkgsrc/databases/openldap Fix the dynamic PLIST generated whe...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60dc6e747637
branches:  trunk
changeset: 465987:60dc6e747637
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jan 09 22:48:16 2004 +0000

description:
Fix the dynamic PLIST generated when building this package with pkgviews
by delaying installation of config files until INSTALL script time.

diffstat:

 databases/openldap/Makefile         |  18 +++++++-----------
 databases/openldap/PLIST            |   3 ++-
 databases/openldap/distinfo         |   4 +++-
 databases/openldap/patches/patch-af |  27 +++++++++++++++++++++++++++
 databases/openldap/patches/patch-ag |  33 +++++++++++++++++++++++++++++++++
 5 files changed, 72 insertions(+), 13 deletions(-)

diffs (139 lines):

diff -r b01717b2bbdd -r 60dc6e747637 databases/openldap/Makefile
--- a/databases/openldap/Makefile       Fri Jan 09 20:43:02 2004 +0000
+++ b/databases/openldap/Makefile       Fri Jan 09 22:48:16 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2004/01/09 20:43:02 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2004/01/09 22:48:16 jlam Exp $
 #
 
 DISTNAME=              openldap-2.1.22
@@ -65,6 +65,7 @@
 EGDIR=                 ${PREFIX}/share/examples/openldap
 MAKE_DIRS=             ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/schema
 OWN_DIRS=              /var/openldap
+OWN_DIRS_PERMS=                /var/openldap/openldap-data ${ROOT_USER} ${ROOT_GROUP} 0700
 OWN_DIRS_PERMS=                /var/openldap/openldap-ldbm ${ROOT_USER} ${ROOT_GROUP} 0700
 OWN_DIRS_PERMS+=       /var/openldap/openldap-slurp ${ROOT_USER} ${ROOT_GROUP} 0700
 
@@ -91,16 +92,11 @@
 RCD_SCRIPTS=           slapd
 
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}/schema
-       for f in ${CNFS} ${CNFS_PERMS} ${SUPPS}; do                     \
-               if [ ! -r ${PKG_SYSCONFDIR}/$${f}.default ]; then       \
-                       ${CP} -p ${PKG_SYSCONFDIR}/$${f}                \
-                               ${PKG_SYSCONFDIR}/$${f}.default;        \
-               fi;                                                     \
-               ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${f}.default \
-                       ${EGDIR}/$${f};                         \
-               ${RM} -f ${PKG_SYSCONFDIR}/$${f}.default;               \
-       done
+       ${_ULIMIT_CMD}cd ${WRKSRC}/libraries/libldap;                   \
+       ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-conf sysconfdir=${EGDIR}
+       ${_ULIMIT_CMD}cd ${WRKSRC}/servers/slapd;                       \
+       ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-conf sysconfdir=${EGDIR}; \
+       ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install-schema sysconfdir=${EGDIR}
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff -r b01717b2bbdd -r 60dc6e747637 databases/openldap/PLIST
--- a/databases/openldap/PLIST  Fri Jan 09 20:43:02 2004 +0000
+++ b/databases/openldap/PLIST  Fri Jan 09 22:48:16 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/09/18 05:37:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/01/09 22:48:16 jlam Exp $
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -206,6 +206,7 @@
 sbin/slapindex
 sbin/slappasswd
 share/examples/openldap/ldap.conf
+share/examples/openldap/schema/README
 share/examples/openldap/schema/corba.schema
 share/examples/openldap/schema/core.schema
 share/examples/openldap/schema/cosine.schema
diff -r b01717b2bbdd -r 60dc6e747637 databases/openldap/distinfo
--- a/databases/openldap/distinfo       Fri Jan 09 20:43:02 2004 +0000
+++ b/databases/openldap/distinfo       Fri Jan 09 22:48:16 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2003/12/04 14:48:17 agc Exp $
+$NetBSD: distinfo,v 1.21 2004/01/09 22:48:16 jlam Exp $
 
 SHA1 (openldap-2.1.22.tgz) = 6cb4b3fc7e513b718eececb55212019791efe63e
 Size (openldap-2.1.22.tgz) = 2033763 bytes
@@ -6,3 +6,5 @@
 SHA1 (patch-ac) = 56ee06d724a2de895fc373cc57bf3de17058e30b
 SHA1 (patch-ad) = 24734ea7dbfc85c0f1a5ebc7ad9209cfe64ef546
 SHA1 (patch-ae) = 89c22ffe19651cacdf7a25b492dab46c7637da4d
+SHA1 (patch-af) = 74edff185f7d5222416023801084c069d08ec057
+SHA1 (patch-ag) = 822efbcc01dfd4b6181c25390761f534aaeb4315
diff -r b01717b2bbdd -r 60dc6e747637 databases/openldap/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-af       Fri Jan 09 22:48:16 2004 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-af,v 1.1 2004/01/09 22:48:16 jlam Exp $
+
+--- libraries/libldap/Makefile.in.orig Sun Mar 30 09:47:09 2003
++++ libraries/libldap/Makefile.in
+@@ -50,17 +50,18 @@ CFFILES=ldap.conf
+ 
+ install-local: $(CFFILES) FORCE
+       -$(MKDIR) $(DESTDIR)$(libdir)
+-      $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
++      $(LTINSTALL) $(INSTALLFLAGS) -m 444 $(LIBRARY) $(DESTDIR)$(libdir)
+       $(LTFINISH) $(DESTDIR)$(libdir)
++
++install-conf: $(CFFILES) FORCE
+       -$(MKDIR) $(DESTDIR)$(sysconfdir)
+       @for i in $(CFFILES); do \
+               if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+                       echo "installing $$i in $(sysconfdir)"; \
+-                      echo "$(INSTALL) $(INSTALLFLAGS) -m 644  $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
+-                      $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
++                      echo "$(INSTALL) $(INSTALLFLAGS) -m 444  $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
++                      $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
+               else \
+                       echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
+               fi; \
+-              $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.default; \
+       done
+ 
diff -r b01717b2bbdd -r 60dc6e747637 databases/openldap/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/openldap/patches/patch-ag       Fri Jan 09 22:48:16 2004 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-ag,v 1.1 2004/01/09 22:48:16 jlam Exp $
+
+--- servers/slapd/Makefile.in.orig     Mon Mar 31 11:48:17 2003
++++ servers/slapd/Makefile.in
+@@ -312,7 +312,7 @@ veryclean-local-srv: FORCE
+               fi; \
+       done
+ 
+-install-local-srv: install-slapd install-conf install-schema install-tools
++install-local-srv: install-slapd install-tools
+ 
+ install-slapd: FORCE
+       -$(MKDIR) $(DESTDIR)$(libexecdir)
+@@ -363,17 +363,14 @@ install-schema: FORCE
+               else \
+                       echo "PRESERVING EXISTING SCHEMA FILE $$SD" ; \
+               fi ; \
+-              $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD.default ; \
+       done
+ 
+ install-conf: FORCE
+       @-$(MKDIR) $(DESTDIR)$(sysconfdir)
+-      @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+-      $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
+       if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
+               echo "installing slapd.conf in $(sysconfdir)"; \
+-              echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf"; \
+-              $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf; \
++              echo "$(INSTALL) $(INSTALLFLAGS) -m 444 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf"; \
++              $(INSTALL) $(INSTALLFLAGS) -m 444 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf; \
+       else \
+               echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \
+       fi