11 files changed, 167 insertions, 237 deletions
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index f10856bac142..ad97e615f9fa 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -52,18 +52,19 @@
 #
 
 PORTNAME=	nmh
-PORTVERSION=	1.0.4
-PORTREVISION=	4
+PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.mhost.com/pub/nmh/ \
+MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jkoshy
 
 MAINTAINER=	scott+ports@sabami.seaslug.org
 COMMENT=	A cleaned up MH mailer suite
 
+GNU_CONFIGURE=  yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	autoconf:213
+USE_AUTOCONF_VER=259
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec/nmh \
 		--sysconfdir=${PREFIX}/etc/nmh
 .ifdef NMH_EDITOR
@@ -96,19 +97,21 @@ CONFIGURE_ARGS+= ${NMH_EXTRA_CONFIGURE_ARGS}
 
 CFLAGS+= -D${NMH_LOCKING}
 
-MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 folder.1 forw.1 \
-	inc.1 mark.1 mh-chart.1 mhbuild.1 mhl.1 mhlist.1 mhmail.1 \
-	mhn.1 mhparam.1 mhpath.1 mhshow.1 mhstore.1 msgchk.1 msh.1 \
+MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 flists.1 \
+	folder.1 folders.1 forw.1 inc.1 install-mh.1 mark.1 \
+	mh-chart.1 mhbuild.1 mhl.1 mhlist.1 mhmail.1 mhn.1 \
+	mhparam.1 mhpath.1 mhshow.1 mhstore.1 msgchk.1 msh.1 \
 	next.1 nmh.1 packf.1 pick.1 prev.1 prompter.1 rcvdist.1 \
 	rcvpack.1 rcvstore.1 rcvtty.1 refile.1 repl.1 rmf.1 rmm.1 \
-	scan.1 send.1 sendfiles.1 show.1 slocal.1 sortm.1 \
-	vmh.1 whatnow.1 whom.1
+	scan.1 send.1 sendfiles.1 show.1 slocal.1 \
+	sortm.1 whatnow.1 whom.1
 
 MAN5=	mh-alias.5 mh-draft.5 mh-format.5 mh-mail.5 mh-profile.5 \
-	mh-sequence.5 mh-tailor.5
+	mh-sequence.5 mh-tailor.5 mts.conf.5
+
 MLINKS=	mh-profile.5 mh_profile.5
 
-MAN8=	ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 mh-mts.8 post.8
+MAN8=	ap.8 conflict.8 dp.8 fmtdump.8 mh-mts.8 post.8
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|autoconf|${AUTOCONF}|;\
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index c434b1915889..b7c2855c533f 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1,3 +1,3 @@
-MD5 (nmh-1.0.4.tar.gz) = fd0dc5c84f67cfbcdfdc1196a5298e47
-SHA256 (nmh-1.0.4.tar.gz) = 828de9461f5fc6dd70eab2db20f95761f66351ea91425c0d3fd4e96cbda3a350
-SIZE (nmh-1.0.4.tar.gz) = 683215
+MD5 (nmh-1.2.tar.gz) = aeebb9bef9ede7232f52c3a3b693eccc
+SHA256 (nmh-1.2.tar.gz) = 26000ed09bc9a937d9190a62db9bc85db4d756887986df8bd2b8fcc3eabc3b38
+SIZE (nmh-1.2.tar.gz) = 851247
diff --git a/mail/nmh/files/patch-aa b/mail/nmh/files/patch-aa
deleted file mode 100644
index a62497eeee13..000000000000
--- a/mail/nmh/files/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur ../../../nmh-1.0.3-DIST/acconfig.h ./acconfig.h
---- ../../../nmh-1.0.3-DIST/acconfig.h	Mon Jan 24 22:13:38 2000
-+++ ./acconfig.h	Mon Feb 28 10:20:34 2000
-@@ -22,10 +22,13 @@
-  * other programs which may modify your maildrops.
-  * Currently you can only use one type.
-  */
-+#if 0
-+/* Patched to be specified in CFLAGS by FreeBSD port. */
- #define DOT_LOCKING   1
- /* #define FCNTL_LOCKING 1 */
- /* #define LOCKF_LOCKING 1 */
- /* #define FLOCK_LOCKING 1 */
-+#endif
- 
- /*
-  * If you have defined DOT_LOCKING, then the default is to
-@@ -104,7 +107,7 @@
-  * The prefix which is prepended to the name of messages when they
-  * are "removed" by rmm.  This should typically be `,' or `#'
-  */
--#define BACKUP_PREFIX ","
-+#define BACKUP_PREFIX "#"
- 
- /*
-  * Name of link to file to which you are replying.
-@@ -128,11 +131,11 @@
- /* Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX */
- #undef SVR4
- /* Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody */
--#undef BSD44
-+#define BSD44
- 
- /* Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody 
-  * -- does PicoBSD have uname? :) */
--#undef BSD42
-+#define BSD42
- 
- /* Defined for SCO5 */
- #undef SCO_5_STDIO
-@@ -231,7 +234,7 @@
-  * not world writable.  There are no guarantees as to the safety of doing this,
-  * but this #define will add some extra security checks.
-  */
--#undef MAILGROUP
-+#define MAILGROUP
- 
- /* Define ruserpass as _ruserpass if your libraries have a bug *
-  * such that it can't find ruserpass, but can find _ruserpass. */
diff --git a/mail/nmh/files/patch-ab b/mail/nmh/files/patch-ab
deleted file mode 100644
index 3f54feabd3af..000000000000
--- a/mail/nmh/files/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur ../../nmh-1.0.4-DIST/Makefile.in ./Makefile.in
---- ../../nmh-1.0.2-DIST/Makefile.in	Sun Sep 26 12:43:15 1999
-+++ ./Makefile.in	Sat Dec 11 11:54:28 1999
-@@ -65,6 +65,7 @@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
- 
- .SUFFIXES:
-diff -ur ../../../nmh-1.0.3-DIST/etc/Makefile.in ./etc/Makefile.in
---- ../../../etc/Makefile.in.orig	Tue Mar 14 22:40:47 2000
-+++ ./etc/Makefile.in	Tue Jun 19 13:47:33 2001
-@@ -22,6 +22,7 @@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
- 
- # Path to search for programs to handle MIME
-@@ -78,29 +79,23 @@
- install-files:
- 	$(top_srcdir)/mkinstalldirs $(etcdir)
- 	for file in $(DIST_FILES); do \
--	  if [ -f $(etcdir)/$$file ]; then \
--	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
--	  fi; \
--	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-+	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file.default; \
- 	done
- 	for file in $(GEN_FILES); do \
--	  if [ -f $(etcdir)/$$file ]; then \
--	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
--	  fi; \
--	  $(INSTALL_DATA) $$file $(etcdir)/$$file; \
-+	  $(INSTALL_DATA) $$file $(etcdir)/$$file.default; \
- 	done
- 
- install-scripts:
- 	$(top_srcdir)/mkinstalldirs $(bindir)
- 	for script in $(SCRIPTS); do \
--	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
-+	  $(INSTALL_SCRIPT) $(srcdir)/$$script $(bindir)/$$script; \
- 	done
- 
- uninstall: uninstall-files uninstall-scripts
- 
- uninstall-files:
- 	for file in $(FILES); do \
--	  rm -f $(etcdir)/$$file; \
-+	  rm -f $(etcdir)/$$file.default; \
- 	done
- 
- uninstall-scripts:
diff --git a/mail/nmh/files/patch-ac b/mail/nmh/files/patch-ac
deleted file mode 100644
index c9ffcc5168f4..000000000000
--- a/mail/nmh/files/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../../../nmh-1.0.4/configure.in	Wed Mar 15 15:37:30 2000
-+++ ./configure.in	Sun Mar 31 18:55:06 2002
-@@ -193,6 +193,11 @@
- dnl ------------------
- AC_PROG_MAKE_SET	dnl Does make define $MAKE
- AC_PROG_INSTALL		dnl Check for BSD compatible `install'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
-+
-+AC_SUBST(INSTALL_SCRIPT)
-+
- AC_PROG_RANLIB		dnl Check for `ranlib'
- AC_PROG_AWK             dnl Check for mawk,gawk,nawk, then awk
- AC_PROG_LEX             dnl Check for lex/flex
-@@ -389,7 +394,7 @@
- AC_FUNC_VFORK
- AC_CHECK_LIB(mkstemp,mkstemp)
- AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
--               sighold sigrelse writev lstat uname tzset killpg mkstemp \
-+               sighold sigrelse writev lstat tzset killpg mkstemp \
-                sethostent)
- 
- dnl solaris screws this up
diff --git a/mail/nmh/files/patch-ad b/mail/nmh/files/patch-ad
deleted file mode 100644
index 79b3ee52e0cc..000000000000
--- a/mail/nmh/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- uip/sortm.c--	Thu Mar 18 00:12:19 2004
-+++ uip/sortm.c	Thu Mar 18 00:26:50 2004
-@@ -439,8 +439,6 @@
- 			if(uprf(cp, "re:"))
- 			    cp += 2;
- 			else {
--			    if (isalnum(c))
--				*cp2++ = isupper(c) ? tolower(c) : c;
- 			    break;
- 			}
- 		    }
diff --git a/mail/nmh/files/patch-configure b/mail/nmh/files/patch-configure
new file mode 100644
index 000000000000..48bc5491669b
--- /dev/null
+++ b/mail/nmh/files/patch-configure
@@ -0,0 +1,39 @@
+--- configure.orig      2005-12-20 15:37:46.000000000 +1100
++++ configure   2005-12-24 00:38:23.000000000 +1100
+@@ -8036,7 +8036,7 @@
+ 
+ 
+ 
+-for ac_header in db1/ndbm.h gdbm/ndbm.h db.h
++for ac_header in db1/ndbm.h ndbm.h gdbm/ndbm.h db.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -8188,7 +8188,7 @@
+ 
+ 
+ 
+-if test "x" == "x"; then
++if test "x" = "x"; then
+    nmh_libs=
+       nmh_testname=libc
+ else
+@@ -8213,6 +8213,9 @@
+ #ifdef HAVE_DB1_NDBM_H
+ #include <db1/ndbm.h>
+ #else
++#ifdef HAVE_NDBM_H
++#include <ndbm.h>
++#else
+ #ifdef HAVE_GDBM_NDBM_H
+ #include <gdbm/ndbm.h>
+ #else
+@@ -8224,6 +8227,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ int
+ main ()
+
diff --git a/mail/nmh/files/patch-etc_Makefile_in b/mail/nmh/files/patch-etc_Makefile_in
new file mode 100644
index 000000000000..dabf42aea7f5
--- /dev/null
+++ b/mail/nmh/files/patch-etc_Makefile_in
@@ -0,0 +1,28 @@
+--- etc/Makefile.in	Tue Nov  8 08:58:08 2005
++++ ../../work-save2/nmh-1.2/etc/Makefile.in	Sat Feb 18 21:24:51 2006
+@@ -23,6 +23,7 @@
+ 
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT  = @INSTALL_SCRIPT@
+ INSTALL_DATA    = @INSTALL_DATA@
+ 
+ # Path to search for programs to handle MIME
+@@ -85,7 +86,7 @@
+ install-bin-files:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for script in $(GENERATED_BIN_FILES); do \
+-	  $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
++	  $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
+ 	done
+ 
+ install-etc-files:
+@@ -113,7 +115,8 @@
+ 	  else \
+ 	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+ 	  fi; \
++	  $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file-dist; \
+ 	done
+ 
+ uninstall: uninstall-bin-files uninstall-etc-files
+ 
diff --git a/mail/nmh/pkg-descr b/mail/nmh/pkg-descr
index 85161adafdaf..5c35362c3213 100644
--- a/mail/nmh/pkg-descr
+++ b/mail/nmh/pkg-descr
@@ -12,4 +12,4 @@ nmh is not a single comprehensive program, you may freely intersperse
 nmh commands with other shells commands, or write custom scripts which
 utilize these commands in flexible ways.
 
-WWW: http://www.mhost.com/nmh/
+WWW: http://savannah.nongnu.org/projects/nmh/
diff --git a/mail/nmh/pkg-install b/mail/nmh/pkg-install
index bdfd8232f752..408daf8ca3d7 100644
--- a/mail/nmh/pkg-install
+++ b/mail/nmh/pkg-install
@@ -8,8 +8,8 @@ case "$2" in
     echo "Enabling setgid for ${PKG_PREFIX}/bin/inc"
     chmod g+s ${PKG_PREFIX}/bin/inc
 
-    for file in ${PKG_PREFIX}/etc/nmh/*.default ; do
-      b=`basename $file .default`
+    for file in ${PKG_PREFIX}/etc/nmh/*-dist ; do
+      b=`basename $file -dist`
       if [ \! -f ${PKG_PREFIX}/etc/nmh/$b ] ; then
 	cp $file ${PKG_PREFIX}/etc/nmh/$b
 	chmod u+w ${PKG_PREFIX}/etc/nmh/$b
diff --git a/mail/nmh/pkg-plist b/mail/nmh/pkg-plist
index c9942ce23a47..5a6265852cca 100644
--- a/mail/nmh/pkg-plist
+++ b/mail/nmh/pkg-plist
@@ -9,6 +9,7 @@ bin/folder
 bin/folders
 bin/forw
 bin/inc
+bin/install-mh
 bin/mark
 bin/mhbuild
 bin/mhlist
@@ -34,93 +35,90 @@ bin/send
 bin/sendfiles
 bin/show
 bin/sortm
-bin/viamail
 bin/whatnow
 bin/whom
-@unexec if cmp -s %D/etc/nmh/MailAliases %D/etc/nmh/MailAliases.default; then rm -f %D/etc/nmh/MailAliases; else echo 'Local changes: %D/etc/nmh/MailAliases (not removed)' >&2; fi
-etc/nmh/MailAliases.default
-@exec [ -f %D/etc/nmh/MailAliases ] || cp %D/etc/nmh/MailAliases.default %D/etc/nmh/MailAliases
-@unexec if cmp -s %D/etc/nmh/components %D/etc/nmh/components.default; then rm -f %D/etc/nmh/components; else echo 'Local changes: %D/etc/nmh/components (not removed)' >&2; fi
-etc/nmh/components.default
-@exec [ -f %D/etc/nmh/components ] || cp %D/etc/nmh/components.default %D/etc/nmh/components
-@unexec if cmp -s %D/etc/nmh/digestcomps %D/etc/nmh/digestcomps.default; then rm -f %D/etc/nmh/digestcomps; else echo 'Local changes: %D/etc/nmh/digestcomps (not removed)' >&2; fi
-etc/nmh/digestcomps.default
-@exec [ -f %D/etc/nmh/digestcomps ] || cp %D/etc/nmh/digestcomps.default %D/etc/nmh/digestcomps
-@unexec if cmp -s %D/etc/nmh/distcomps %D/etc/nmh/distcomps.default; then rm -f %D/etc/nmh/distcomps; else echo 'Local changes: %D/etc/nmh/distcomps (not removed)' >&2; fi
-etc/nmh/distcomps.default
-@exec [ -f %D/etc/nmh/distcomps ] || cp %D/etc/nmh/distcomps.default %D/etc/nmh/distcomps
-@unexec if cmp -s %D/etc/nmh/forwcomps %D/etc/nmh/forwcomps.default; then rm -f %D/etc/nmh/forwcomps; else echo 'Local changes: %D/etc/nmh/forwcomps (not removed)' >&2; fi
-etc/nmh/forwcomps.default
-@exec [ -f %D/etc/nmh/forwcomps ] || cp %D/etc/nmh/forwcomps.default %D/etc/nmh/forwcomps
-@unexec if cmp -s %D/etc/nmh/mhl.body %D/etc/nmh/mhl.body.default; then rm -f %D/etc/nmh/mhl.body; else echo 'Local changes: %D/etc/nmh/mhl.body (not removed)' >&2; fi
-etc/nmh/mhl.body.default
-@exec [ -f %D/etc/nmh/mhl.body ] || cp %D/etc/nmh/mhl.body.default %D/etc/nmh/mhl.body
-@unexec if cmp -s %D/etc/nmh/mhl.digest %D/etc/nmh/mhl.digest.default; then rm -f %D/etc/nmh/mhl.digest; else echo 'Local changes: %D/etc/nmh/mhl.digest (not removed)' >&2; fi
-etc/nmh/mhl.digest.default
-@exec [ -f %D/etc/nmh/mhl.digest ] || cp %D/etc/nmh/mhl.digest.default %D/etc/nmh/mhl.digest
-@unexec if cmp -s %D/etc/nmh/mhl.format %D/etc/nmh/mhl.format.default; then rm -f %D/etc/nmh/mhl.format; else echo 'Local changes: %D/etc/nmh/mhl.format (not removed)' >&2; fi
-etc/nmh/mhl.format.default
-@exec [ -f %D/etc/nmh/mhl.format ] || cp %D/etc/nmh/mhl.format.default %D/etc/nmh/mhl.format
-@unexec if cmp -s %D/etc/nmh/mhl.forward %D/etc/nmh/mhl.forward.default; then rm -f %D/etc/nmh/mhl.forward; else echo 'Local changes: %D/etc/nmh/mhl.forward (not removed)' >&2; fi
-etc/nmh/mhl.forward.default
-@exec [ -f %D/etc/nmh/mhl.forward ] || cp %D/etc/nmh/mhl.forward.default %D/etc/nmh/mhl.forward
-@unexec if cmp -s %D/etc/nmh/mhl.headers %D/etc/nmh/mhl.headers.default; then rm -f %D/etc/nmh/mhl.headers; else echo 'Local changes: %D/etc/nmh/mhl.headers (not removed)' >&2; fi
-etc/nmh/mhl.headers.default
-@exec [ -f %D/etc/nmh/mhl.headers ] || cp %D/etc/nmh/mhl.headers.default %D/etc/nmh/mhl.headers
-@unexec if cmp -s %D/etc/nmh/mhl.reply %D/etc/nmh/mhl.reply.default; then rm -f %D/etc/nmh/mhl.reply; else echo 'Local changes: %D/etc/nmh/mhl.reply (not removed)' >&2; fi
-etc/nmh/mhl.reply.default
-@exec [ -f %D/etc/nmh/mhl.reply ] || cp %D/etc/nmh/mhl.reply.default %D/etc/nmh/mhl.reply
-@unexec if cmp -s %D/etc/nmh/mhn.defaults %D/etc/nmh/mhn.defaults.default; then rm -f %D/etc/nmh/mhn.defaults; else echo 'Local changes: %D/etc/nmh/mhn.defaults (not removed)' >&2; fi
-etc/nmh/mhn.defaults.default
-@exec [ -f %D/etc/nmh/mhn.defaults ] || cp %D/etc/nmh/mhn.defaults.default %D/etc/nmh/mhn.defaults
-@unexec if cmp -s %D/etc/nmh/mts.conf %D/etc/nmh/mts.conf.default; then rm -f %D/etc/nmh/mts.conf; else echo 'Local changes: %D/etc/nmh/mts.conf (not removed)' >&2; fi
-etc/nmh/mts.conf.default
-@exec [ -f %D/etc/nmh/mts.conf ] || cp %D/etc/nmh/mts.conf.default %D/etc/nmh/mts.conf
-@unexec if cmp -s %D/etc/nmh/rcvdistcomps %D/etc/nmh/rcvdistcomps.default; then rm -f %D/etc/nmh/rcvdistcomps; else echo 'Local changes: %D/etc/nmh/rcvdistcomps (not removed)' >&2; fi
-etc/nmh/rcvdistcomps.default
-@exec [ -f %D/etc/nmh/rcvdistcomps ] || cp %D/etc/nmh/rcvdistcomps.default %D/etc/nmh/rcvdistcomps
-@unexec if cmp -s %D/etc/nmh/rcvdistcomps.outbox %D/etc/nmh/rcvdistcomps.outbox.default; then rm -f %D/etc/nmh/rcvdistcomps.outbox; else echo 'Local changes: %D/etc/nmh/rcvdistcomps.outbox (not removed)' >&2; fi
-etc/nmh/rcvdistcomps.outbox.default
-@exec [ -f %D/etc/nmh/rcvdistcomps.outbox ] || cp %D/etc/nmh/rcvdistcomps.outbox.default %D/etc/nmh/rcvdistcomps.outbox
-@unexec if cmp -s %D/etc/nmh/replcomps %D/etc/nmh/replcomps.default; then rm -f %D/etc/nmh/replcomps; else echo 'Local changes: %D/etc/nmh/replcomps (not removed)' >&2; fi
-etc/nmh/replcomps.default
-@exec [ -f %D/etc/nmh/replcomps ] || cp %D/etc/nmh/replcomps.default %D/etc/nmh/replcomps
-@unexec if cmp -s %D/etc/nmh/replgroupcomps %D/etc/nmh/replgroupcomps.default; then rm -f %D/etc/nmh/replgroupcomps; else echo 'Local changes: %D/etc/nmh/replgroupcomps (not removed)' >&2; fi
-etc/nmh/replgroupcomps.default
-@exec [ -f %D/etc/nmh/replgroupcomps ] || cp %D/etc/nmh/replgroupcomps.default %D/etc/nmh/replgroupcomps
-@unexec if cmp -s %D/etc/nmh/scan.MMDDYY %D/etc/nmh/scan.MMDDYY.default; then rm -f %D/etc/nmh/scan.MMDDYY; else echo 'Local changes: %D/etc/nmh/scan.MMDDYY (not removed)' >&2; fi
-etc/nmh/scan.MMDDYY.default
-@exec [ -f %D/etc/nmh/scan.MMDDYY ] || cp %D/etc/nmh/scan.MMDDYY.default %D/etc/nmh/scan.MMDDYY
-@unexec if cmp -s %D/etc/nmh/scan.YYYYMMDD %D/etc/nmh/scan.YYYYMMDD.default; then rm -f %D/etc/nmh/scan.YYYYMMDD; else echo 'Local changes: %D/etc/nmh/scan.YYYYMMDD (not removed)' >&2; fi
-etc/nmh/scan.YYYYMMDD.default
-@exec [ -f %D/etc/nmh/scan.YYYYMMDD ] || cp %D/etc/nmh/scan.YYYYMMDD.default %D/etc/nmh/scan.YYYYMMDD
-@unexec if cmp -s %D/etc/nmh/scan.default %D/etc/nmh/scan.default.default; then rm -f %D/etc/nmh/scan.default; else echo 'Local changes: %D/etc/nmh/scan.default (not removed)' >&2; fi
-etc/nmh/scan.default.default
-@exec [ -f %D/etc/nmh/scan.default ] || cp %D/etc/nmh/scan.default.default %D/etc/nmh/scan.default
-@unexec if cmp -s %D/etc/nmh/scan.mailx %D/etc/nmh/scan.mailx.default; then rm -f %D/etc/nmh/scan.mailx; else echo 'Local changes: %D/etc/nmh/scan.mailx (not removed)' >&2; fi
-etc/nmh/scan.mailx.default
-@exec [ -f %D/etc/nmh/scan.mailx ] || cp %D/etc/nmh/scan.mailx.default %D/etc/nmh/scan.mailx
-@unexec if cmp -s %D/etc/nmh/scan.nomime %D/etc/nmh/scan.nomime.default; then rm -f %D/etc/nmh/scan.nomime; else echo 'Local changes: %D/etc/nmh/scan.nomime (not removed)' >&2; fi
-etc/nmh/scan.nomime.default
-@exec [ -f %D/etc/nmh/scan.nomime ] || cp %D/etc/nmh/scan.nomime.default %D/etc/nmh/scan.nomime
-@unexec if cmp -s %D/etc/nmh/scan.size %D/etc/nmh/scan.size.default; then rm -f %D/etc/nmh/scan.size; else echo 'Local changes: %D/etc/nmh/scan.size (not removed)' >&2; fi
-etc/nmh/scan.size.default
-@exec [ -f %D/etc/nmh/scan.size ] || cp %D/etc/nmh/scan.size.default %D/etc/nmh/scan.size
-@unexec if cmp -s %D/etc/nmh/scan.time %D/etc/nmh/scan.time.default; then rm -f %D/etc/nmh/scan.time; else echo 'Local changes: %D/etc/nmh/scan.time (not removed)' >&2; fi
-etc/nmh/scan.time.default
-@exec [ -f %D/etc/nmh/scan.time ] || cp %D/etc/nmh/scan.time.default %D/etc/nmh/scan.time
-@unexec if cmp -s %D/etc/nmh/scan.timely %D/etc/nmh/scan.timely.default; then rm -f %D/etc/nmh/scan.timely; else echo 'Local changes: %D/etc/nmh/scan.timely (not removed)' >&2; fi
-etc/nmh/scan.timely.default
-@exec [ -f %D/etc/nmh/scan.timely ] || cp %D/etc/nmh/scan.timely.default %D/etc/nmh/scan.timely
-@unexec if cmp -s %D/etc/nmh/scan.unseen %D/etc/nmh/scan.unseen.default; then rm -f %D/etc/nmh/scan.unseen; else echo 'Local changes: %D/etc/nmh/scan.unseen (not removed)' >&2; fi
-etc/nmh/scan.unseen.default
-@exec [ -f %D/etc/nmh/scan.unseen ] || cp %D/etc/nmh/scan.unseen.default %D/etc/nmh/scan.unseen
-etc/nmh/tmac.h
+@unexec if cmp -s %D/etc/nmh/MailAliases %D/etc/nmh/MailAliases-dist; then rm -f %D/etc/nmh/MailAliases; else echo 'Local changes: %D/etc/nmh/MailAliases (not removed)' >&2; fi
+etc/nmh/MailAliases-dist
+@exec [ -f %D/etc/nmh/MailAliases ] || cp %D/etc/nmh/MailAliases-dist %D/etc/nmh/MailAliases
+@unexec if cmp -s %D/etc/nmh/components %D/etc/nmh/components-dist; then rm -f %D/etc/nmh/components; else echo 'Local changes: %D/etc/nmh/components (not removed)' >&2; fi
+etc/nmh/components-dist
+@exec [ -f %D/etc/nmh/components ] || cp %D/etc/nmh/components-dist %D/etc/nmh/components
+@unexec if cmp -s %D/etc/nmh/digestcomps %D/etc/nmh/digestcomps-dist; then rm -f %D/etc/nmh/digestcomps; else echo 'Local changes: %D/etc/nmh/digestcomps (not removed)' >&2; fi
+etc/nmh/digestcomps-dist
+@exec [ -f %D/etc/nmh/digestcomps ] || cp %D/etc/nmh/digestcomps-dist %D/etc/nmh/digestcomps
+@unexec if cmp -s %D/etc/nmh/distcomps %D/etc/nmh/distcomps-dist; then rm -f %D/etc/nmh/distcomps; else echo 'Local changes: %D/etc/nmh/distcomps (not removed)' >&2; fi
+etc/nmh/distcomps-dist
+@exec [ -f %D/etc/nmh/distcomps ] || cp %D/etc/nmh/distcomps-dist %D/etc/nmh/distcomps
+@unexec if cmp -s %D/etc/nmh/forwcomps %D/etc/nmh/forwcomps-dist; then rm -f %D/etc/nmh/forwcomps; else echo 'Local changes: %D/etc/nmh/forwcomps (not removed)' >&2; fi
+etc/nmh/forwcomps-dist
+@exec [ -f %D/etc/nmh/forwcomps ] || cp %D/etc/nmh/forwcomps-dist %D/etc/nmh/forwcomps
+@unexec if cmp -s %D/etc/nmh/mhl.body %D/etc/nmh/mhl.body-dist; then rm -f %D/etc/nmh/mhl.body; else echo 'Local changes: %D/etc/nmh/mhl.body (not removed)' >&2; fi
+etc/nmh/mhl.body-dist
+@exec [ -f %D/etc/nmh/mhl.body ] || cp %D/etc/nmh/mhl.body-dist %D/etc/nmh/mhl.body
+@unexec if cmp -s %D/etc/nmh/mhl.digest %D/etc/nmh/mhl.digest-dist; then rm -f %D/etc/nmh/mhl.digest; else echo 'Local changes: %D/etc/nmh/mhl.digest (not removed)' >&2; fi
+etc/nmh/mhl.digest-dist
+@exec [ -f %D/etc/nmh/mhl.digest ] || cp %D/etc/nmh/mhl.digest-dist %D/etc/nmh/mhl.digest
+@unexec if cmp -s %D/etc/nmh/mhl.format %D/etc/nmh/mhl.format-dist; then rm -f %D/etc/nmh/mhl.format; else echo 'Local changes: %D/etc/nmh/mhl.format (not removed)' >&2; fi
+etc/nmh/mhl.format-dist
+@exec [ -f %D/etc/nmh/mhl.format ] || cp %D/etc/nmh/mhl.format-dist %D/etc/nmh/mhl.format
+@unexec if cmp -s %D/etc/nmh/mhl.forward %D/etc/nmh/mhl.forward-dist; then rm -f %D/etc/nmh/mhl.forward; else echo 'Local changes: %D/etc/nmh/mhl.forward (not removed)' >&2; fi
+etc/nmh/mhl.forward-dist
+@exec [ -f %D/etc/nmh/mhl.forward ] || cp %D/etc/nmh/mhl.forward-dist %D/etc/nmh/mhl.forward
+@unexec if cmp -s %D/etc/nmh/mhl.headers %D/etc/nmh/mhl.headers-dist; then rm -f %D/etc/nmh/mhl.headers; else echo 'Local changes: %D/etc/nmh/mhl.headers (not removed)' >&2; fi
+etc/nmh/mhl.headers-dist
+@exec [ -f %D/etc/nmh/mhl.headers ] || cp %D/etc/nmh/mhl.headers-dist %D/etc/nmh/mhl.headers
+@unexec if cmp -s %D/etc/nmh/mhl.reply %D/etc/nmh/mhl.reply-dist; then rm -f %D/etc/nmh/mhl.reply; else echo 'Local changes: %D/etc/nmh/mhl.reply (not removed)' >&2; fi
+etc/nmh/mhl.reply-dist
+@exec [ -f %D/etc/nmh/mhl.reply ] || cp %D/etc/nmh/mhl.reply-dist %D/etc/nmh/mhl.reply
+@unexec if cmp -s %D/etc/nmh/mhn.defaults %D/etc/nmh/mhn.defaults-dist; then rm -f %D/etc/nmh/mhn.defaults; else echo 'Local changes: %D/etc/nmh/mhn.defaults (not removed)' >&2; fi
+etc/nmh/mhn.defaults-dist
+@exec [ -f %D/etc/nmh/mhn.defaults ] || cp %D/etc/nmh/mhn.defaults-dist %D/etc/nmh/mhn.defaults
+@unexec if cmp -s %D/etc/nmh/mts.conf %D/etc/nmh/mts.conf-dist; then rm -f %D/etc/nmh/mts.conf; else echo 'Local changes: %D/etc/nmh/mts.conf (not removed)' >&2; fi
+etc/nmh/mts.conf-dist
+@exec [ -f %D/etc/nmh/mts.conf ] || cp %D/etc/nmh/mts.conf-dist %D/etc/nmh/mts.conf
+@unexec if cmp -s %D/etc/nmh/rcvdistcomps %D/etc/nmh/rcvdistcomps-dist; then rm -f %D/etc/nmh/rcvdistcomps; else echo 'Local changes: %D/etc/nmh/rcvdistcomps (not removed)' >&2; fi
+etc/nmh/rcvdistcomps-dist
+@exec [ -f %D/etc/nmh/rcvdistcomps ] || cp %D/etc/nmh/rcvdistcomps-dist %D/etc/nmh/rcvdistcomps
+@unexec if cmp -s %D/etc/nmh/rcvdistcomps.outbox %D/etc/nmh/rcvdistcomps.outbox-dist; then rm -f %D/etc/nmh/rcvdistcomps.outbox; else echo 'Local changes: %D/etc/nmh/rcvdistcomps.outbox (not removed)' >&2; fi
+etc/nmh/rcvdistcomps.outbox-dist
+@exec [ -f %D/etc/nmh/rcvdistcomps.outbox ] || cp %D/etc/nmh/rcvdistcomps.outbox-dist %D/etc/nmh/rcvdistcomps.outbox
+@unexec if cmp -s %D/etc/nmh/replcomps %D/etc/nmh/replcomps-dist; then rm -f %D/etc/nmh/replcomps; else echo 'Local changes: %D/etc/nmh/replcomps (not removed)' >&2; fi
+etc/nmh/replcomps-dist
+@exec [ -f %D/etc/nmh/replcomps ] || cp %D/etc/nmh/replcomps-dist %D/etc/nmh/replcomps
+@unexec if cmp -s %D/etc/nmh/replgroupcomps %D/etc/nmh/replgroupcomps-dist; then rm -f %D/etc/nmh/replgroupcomps; else echo 'Local changes: %D/etc/nmh/replgroupcomps (not removed)' >&2; fi
+etc/nmh/replgroupcomps-dist
+@exec [ -f %D/etc/nmh/replgroupcomps ] || cp %D/etc/nmh/replgroupcomps-dist %D/etc/nmh/replgroupcomps
+@unexec if cmp -s %D/etc/nmh/scan.MMDDYY %D/etc/nmh/scan.MMDDYY-dist; then rm -f %D/etc/nmh/scan.MMDDYY; else echo 'Local changes: %D/etc/nmh/scan.MMDDYY (not removed)' >&2; fi
+etc/nmh/scan.MMDDYY-dist
+@exec [ -f %D/etc/nmh/scan.MMDDYY ] || cp %D/etc/nmh/scan.MMDDYY-dist %D/etc/nmh/scan.MMDDYY
+@unexec if cmp -s %D/etc/nmh/scan.YYYYMMDD %D/etc/nmh/scan.YYYYMMDD-dist; then rm -f %D/etc/nmh/scan.YYYYMMDD; else echo 'Local changes: %D/etc/nmh/scan.YYYYMMDD (not removed)' >&2; fi
+etc/nmh/scan.YYYYMMDD-dist
+@exec [ -f %D/etc/nmh/scan.YYYYMMDD ] || cp %D/etc/nmh/scan.YYYYMMDD-dist %D/etc/nmh/scan.YYYYMMDD
+@unexec if cmp -s %D/etc/nmh/scan.default %D/etc/nmh/scan.default-dist; then rm -f %D/etc/nmh/scan.default; else echo 'Local changes: %D/etc/nmh/scan.default (not removed)' >&2; fi
+etc/nmh/scan.default-dist
+@exec [ -f %D/etc/nmh/scan.default ] || cp %D/etc/nmh/scan.default-dist %D/etc/nmh/scan.default
+@unexec if cmp -s %D/etc/nmh/scan.mailx %D/etc/nmh/scan.mailx-dist; then rm -f %D/etc/nmh/scan.mailx; else echo 'Local changes: %D/etc/nmh/scan.mailx (not removed)' >&2; fi
+etc/nmh/scan.mailx-dist
+@exec [ -f %D/etc/nmh/scan.mailx ] || cp %D/etc/nmh/scan.mailx-dist %D/etc/nmh/scan.mailx
+@unexec if cmp -s %D/etc/nmh/scan.nomime %D/etc/nmh/scan.nomime-dist; then rm -f %D/etc/nmh/scan.nomime; else echo 'Local changes: %D/etc/nmh/scan.nomime (not removed)' >&2; fi
+etc/nmh/scan.nomime-dist
+@exec [ -f %D/etc/nmh/scan.nomime ] || cp %D/etc/nmh/scan.nomime-dist %D/etc/nmh/scan.nomime
+@unexec if cmp -s %D/etc/nmh/scan.size %D/etc/nmh/scan.size-dist; then rm -f %D/etc/nmh/scan.size; else echo 'Local changes: %D/etc/nmh/scan.size (not removed)' >&2; fi
+etc/nmh/scan.size-dist
+@exec [ -f %D/etc/nmh/scan.size ] || cp %D/etc/nmh/scan.size-dist %D/etc/nmh/scan.size
+@unexec if cmp -s %D/etc/nmh/scan.time %D/etc/nmh/scan.time-dist; then rm -f %D/etc/nmh/scan.time; else echo 'Local changes: %D/etc/nmh/scan.time (not removed)' >&2; fi
+etc/nmh/scan.time-dist
+@exec [ -f %D/etc/nmh/scan.time ] || cp %D/etc/nmh/scan.time-dist %D/etc/nmh/scan.time
+@unexec if cmp -s %D/etc/nmh/scan.timely %D/etc/nmh/scan.timely-dist; then rm -f %D/etc/nmh/scan.timely; else echo 'Local changes: %D/etc/nmh/scan.timely (not removed)' >&2; fi
+etc/nmh/scan.timely-dist
+@exec [ -f %D/etc/nmh/scan.timely ] || cp %D/etc/nmh/scan.timely-dist %D/etc/nmh/scan.timely
+@unexec if cmp -s %D/etc/nmh/scan.unseen %D/etc/nmh/scan.unseen-dist; then rm -f %D/etc/nmh/scan.unseen; else echo 'Local changes: %D/etc/nmh/scan.unseen (not removed)' >&2; fi
+etc/nmh/scan.unseen-dist
+@exec [ -f %D/etc/nmh/scan.unseen ] || cp %D/etc/nmh/scan.unseen-dist %D/etc/nmh/scan.unseen
 libexec/nmh/ap
 libexec/nmh/conflict
 libexec/nmh/dp
 libexec/nmh/fmtdump
-libexec/nmh/install-mh
 libexec/nmh/mhl
 libexec/nmh/mhtest
 libexec/nmh/post
@@ -130,5 +128,6 @@ libexec/nmh/rcvstore
 libexec/nmh/rcvtty
 libexec/nmh/slocal
 libexec/nmh/spost
+libexec/nmh/viamail
 @dirrm etc/nmh
 @dirrm libexec/nmh