diff options
| author | jlam <jlam@pkgsrc.org> | 2004-01-09 22:48:16 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-01-09 22:48:16 +0000 |
| commit | adc4a993da9cb7feeb26c36b4046ef11a2c047ce (patch) | |
| tree | c154335ce0244c00f4f07ae7c12a72e8eb64ed7e /databases/openldap/patches | |
| parent | 2319155e15b8e94feab42bffa87bde687fed6b2b (diff) | |
| download | pkgsrc-adc4a993da9cb7feeb26c36b4046ef11a2c047ce.tar.gz | |
Fix the dynamic PLIST generated when building this package with pkgviews
by delaying installation of config files until INSTALL script time.
Diffstat (limited to 'databases/openldap/patches')
| -rw-r--r-- | databases/openldap/patches/patch-af | 27 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-ag | 33 |
2 files changed, 60 insertions, 0 deletions
diff --git a/databases/openldap/patches/patch-af b/databases/openldap/patches/patch-af new file mode 100644 index 00000000000..2c38e751ab1 --- /dev/null +++ b/databases/openldap/patches/patch-af @@ -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 --git a/databases/openldap/patches/patch-ag b/databases/openldap/patches/patch-ag new file mode 100644 index 00000000000..cabb8157f8c --- /dev/null +++ b/databases/openldap/patches/patch-ag @@ -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 |