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.

4 files changed, 32 insertions, 8 deletions

diff --git a/mail/nmh/files/patch-sum b/mail/nmh/files/patch-sum
index 3f41ffb3ec2..ca417aa4d09 100644
--- a/mail/nmh/files/patch-sum
+++ b/mail/nmh/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:06 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/01/18 15:50:32 agc Exp $
 
-MD5 (patch-ca) = 85b0988cc019ef752cf1c712dcf5c9e8
+MD5 (patch-ca) = f428195be1c2e6ea9dece64b9468c2a2
 MD5 (patch-cb) = a5e72cabb0581833781d838ba7a8f363
 MD5 (patch-cc) = 5b2aabb2f9324fa1f84916a5b6c700ea
 MD5 (patch-cd) = cdd8cf36c8a4c32f9b95a46385eff29f
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 \
diff --git a/mail/nmh/pkg/INSTALL b/mail/nmh/pkg/INSTALL
index 20b82583e77..1ba727b996d 100644
--- a/mail/nmh/pkg/INSTALL
+++ b/mail/nmh/pkg/INSTALL
@@ -1,12 +1,21 @@
 #! /bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 1999/04/05 05:09:53 hubertf Exp $
+# $NetBSD: INSTALL,v 1.4 2000/01/18 15:50:33 agc Exp $
 #
 
 case "$2" in
   ""|POST-INSTALL) cat <<EOF
 =============================================================
 
+You will need to copy the files:
+
+	${PKG_PREFIX}/etc/nmh/*.dist
+
+to be 
+
+	${PKG_PREFIX}/etc/nmh/*
+
+(i.e. "delete the .dist" suffix)
 Some files you might need to customize include the following:
 
     ${PKG_PREFIX}/etc/nmh/mhn.defaults
diff --git a/mail/nmh/pkg/PLIST b/mail/nmh/pkg/PLIST
index 45070f3ba35..7e616a6af44 100644
--- a/mail/nmh/pkg/PLIST
+++ b/mail/nmh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 1999/03/04 09:12:42 kim Exp $
+@comment $NetBSD: PLIST,v 1.11 2000/01/18 15:50:33 agc Exp $
 bin/ali
 bin/anno
 bin/burst
@@ -49,8 +49,8 @@ etc/nmh/mhl.format
 etc/nmh/mhl.forward
 etc/nmh/mhl.headers
 etc/nmh/mhl.reply
-etc/nmh/mhn.defaults
-etc/nmh/mts.conf
+etc/nmh/mhn.defaults.dist
+etc/nmh/mts.conf.dist
 etc/nmh/rcvdistcomps
 etc/nmh/replcomps
 etc/nmh/replgroupcomps