diff options
Diffstat (limited to 'mail/nmh/patches/patch-ca')
| -rw-r--r-- | mail/nmh/patches/patch-ca | 91 |
1 files changed, 39 insertions, 52 deletions
diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca index 0e60b460fab..f11bb4f4735 100644 --- a/mail/nmh/patches/patch-ca +++ b/mail/nmh/patches/patch-ca @@ -1,59 +1,46 @@ -$NetBSD: patch-ca,v 1.6 2008/08/08 23:41:22 epg Exp $ +$NetBSD: patch-ca,v 1.7 2012/07/27 19:29:02 drochner Exp $ -Use ${INSTALL_SCRIPT} to install scripts -Install configuration files as <conf-file>.dist +install config files into share/examples ---- etc/Makefile.in.orig 2006-03-04 22:14:18.000000000 +0000 -+++ etc/Makefile.in 2008-08-08 21:22:09.000000000 +0000 -@@ -15,6 +15,7 @@ - bindir = @bindir@ - libdir = @libdir@ - etcdir = @sysconfdir@ -+egdir = @prefix@/share/examples/nmh - - MTS = @MTS@ - mailspool = @mailspool@ -@@ -92,7 +93,7 @@ +--- Makefile.in.orig 2012-06-11 04:14:07.000000000 +0000 ++++ Makefile.in +@@ -644,6 +644,7 @@ sharedstatedir = @sharedstatedir@ + smtpservers = @smtpservers@ + srcdir = @srcdir@ + sysconfdir = @sysconfdir@ ++egdir = @prefix@/share/examples/nmh + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +@@ -3569,12 +3570,12 @@ uninstall-dist_docDATA: done - - install-etc-files: -- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir) -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(egdir) - INSTALL_FILES="$(GENERATED_ETC_FILES)"; \ - for file in $(STATIC_FILES); do \ - INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \ -@@ -100,11 +101,11 @@ - for path in $$INSTALL_FILES; do \ - file=`basename $$path`; \ - echo "Installing $$file..."; \ -- if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \ -- mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \ -- $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \ -- if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \ -- rm $(DESTDIR)$(etcdir)/$$file.prev; \ -+ if [ -f $(DESTDIR)$(egdir)/$$file ]; then \ -+ mv $(DESTDIR)$(egdir)/$$file $(DESTDIR)$(egdir)/$$file.prev; \ -+ $(INSTALL_DATA) $$path $(DESTDIR)$(egdir)/$$file; \ -+ if diff $(DESTDIR)$(egdir)/$$file.prev $(DESTDIR)$(egdir)/$$file; then \ -+ rm $(DESTDIR)$(egdir)/$$file.prev; \ - else \ - echo; \ - echo " Previous version of $$file saved as $$file.prev due\c";\ -@@ -114,7 +115,7 @@ - echo; \ - fi; \ - else \ -- $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \ -+ $(INSTALL_DATA) $$path $(DESTDIR)$(egdir)/$$file; \ - fi; \ + install-dist_sysconfDATA: $(dist_sysconf_DATA) + @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ++ test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)" + @list='$(dist_sysconf_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egdir)/$$f'"; \ ++ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egdir)/$$f"; \ done -@@ -127,7 +128,7 @@ - - uninstall-etc-files: - for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \ -- rm -f $(DESTDIR)$(etcdir)/$$file; \ -+ rm -f $(DESTDIR)$(egdir)/$$file; \ + uninstall-dist_sysconfDATA: +@@ -3586,12 +3587,12 @@ uninstall-dist_sysconfDATA: + done + install-sysconfDATA: $(sysconf_DATA) + @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ++ test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)" + @list='$(sysconf_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ +- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ ++ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egdir)/$$f'"; \ ++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egdir)/$$f"; \ done - # ========== DEPENDENCIES FOR CLEANUP ========== + uninstall-sysconfDATA: |