summaryrefslogtreecommitdiff
path: root/mail/nmh/patches/patch-ca
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2000-01-18 15:50:32 +0000
committeragc <agc@pkgsrc.org>2000-01-18 15:50:32 +0000
commit860ec07e79036c4c9ef9be0218f56e64aa3e2c51 (patch)
tree532b07c74b40da8d3b07c399971f11a04628bdd7 /mail/nmh/patches/patch-ca
parentba99a88128dfc639bb05669d80fc41aaa83c0544 (diff)
downloadpkgsrc-860ec07e79036c4c9ef9be0218f56e64aa3e2c51.tar.gz
Modify the Makefile to install mts.conf as mts.conf.dist, and mhn.defaults
as mhn.defaults.dist, so that an existing configuration is not lost by a new installation. Fixes PR 7819 from Matthew Green.
Diffstat (limited to 'mail/nmh/patches/patch-ca')
-rw-r--r--mail/nmh/patches/patch-ca19
1 files changed, 17 insertions, 2 deletions
diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca
index 8b033797e4b..85a9e203f72 100644
--- a/mail/nmh/patches/patch-ca
+++ b/mail/nmh/patches/patch-ca
@@ -1,4 +1,7 @@
-$NetBSD: patch-ca,v 1.1 1999/03/04 09:12:42 kim Exp $
+$NetBSD: patch-ca,v 1.2 2000/01/18 15:50:33 agc Exp $
+
+Use ${INSTALL_SCRIPT} to install scripts
+Install configuration files as <conf-file>.dist
--- etc/Makefile.in.orig Fri Oct 2 23:38:38 1998
+++ etc/Makefile.in Thu Mar 4 01:41:05 1999
@@ -10,7 +13,19 @@ $NetBSD: patch-ca,v 1.1 1999/03/04 09:12:42 kim Exp $
# Path to search for programs to handle MIME
# content. Used to create mhn.defaults
-@@ -88,7 +89,7 @@
+@@ -79,16 +80,16 @@
+ $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
+ done
+ for file in $(GEN_FILES); do \
+- if [ -f $(etcdir)/$$file ]; then \
+- mv $(etcdir)/$$file $(etcdir)/$$file.old; \
++ if [ -f $(etcdir)/$$file.dist ]; then \
++ mv $(etcdir)/$$file.dist $(etcdir)/$$file.dist.old; \
+ fi; \
+- $(INSTALL_DATA) $$file $(etcdir)/$$file; \
++ $(INSTALL_DATA) $$file $(etcdir)/$$file.dist; \
+ done
+
install-scripts:
$(top_srcdir)/mkinstalldirs $(libdir)
for script in $(SCRIPTS); do \