Upgrade to version 0.21 of nmh. Add a manual page to MAN1, and

clean up the way that the $PREFIX/etc/nmh directory is deleted
when deleting the package - if there are any *.old files in there,
they relate to a previous configuration, and should be kept.

3 files changed, 16 insertions, 12 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index bc744bb86ba..6ab29d36f87 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	nmh
-# Version required:     		0.20
+# Version required:     		0.21
 # Date created:				26 July 1997
 # Whom:					Scott Blachowicz <Scott.Blachowicz@seaslug.org>
 #
-# $NetBSD: Makefile,v 1.10 1998/02/09 00:00:57 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 1998/02/10 17:38:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
-DISTNAME=	nmh-0.20
+DISTNAME=	nmh-0.21
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/nmh/
 
@@ -22,13 +22,14 @@ CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nmh \
 		--with-mts=${NMH_MTA}
 
 MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 folder.1 forw.1 inc.1 \
-      mark.1 mh-chart.1 mhl.1 mhmail.1 mhn.1 mhparam.1 mhpath.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 show.1 \
-      slocal.1 sortm.1 vmh.1 whatnow.1 whom.1
+	mark.1 mh-chart.1 mhbuild.1 mhl.1 mhmail.1 mhn.1 mhparam.1 \
+	mhpath.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 show.1 slocal.1 sortm.1 \
+	vmh.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
 
 MAN8= ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 mh-mts.8 post.8
 
diff --git a/mail/nmh/files/md5 b/mail/nmh/files/md5
index c749053b173..8dcb406bceb 100644
--- a/mail/nmh/files/md5
+++ b/mail/nmh/files/md5
@@ -1 +1 @@
-MD5 (nmh-0.20.tar.gz) = 8c8fff41d9697d80f022c4eb844c8fb7
+MD5 (nmh-0.21.tar.gz) = afd9fd6ffe2ddd5c33a6c98916373f61
diff --git a/mail/nmh/pkg/PLIST b/mail/nmh/pkg/PLIST
index 6a2ebc45cd3..54bc25fa6df 100644
--- a/mail/nmh/pkg/PLIST
+++ b/mail/nmh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 1998/01/12 14:43:25 agc Exp $
+@comment $NetBSD: PLIST,v 1.6 1998/02/10 17:38:36 agc Exp $
 bin/ali
 bin/anno
 bin/burst
@@ -11,6 +11,7 @@ bin/folders
 bin/forw
 bin/inc
 bin/mark
+bin/mhbuild
 bin/mhmail
 bin/mhn
 bin/mhparam
@@ -50,6 +51,7 @@ etc/nmh/replcomps
 etc/nmh/replgroupcomps
 etc/nmh/scan.default
 etc/nmh/scan.mailx
+etc/nmh/scan.nomime
 etc/nmh/scan.size
 etc/nmh/scan.time
 etc/nmh/scan.timely
@@ -80,6 +82,7 @@ man/man1/forw.1.gz
 man/man1/inc.1.gz
 man/man1/mark.1.gz
 man/man1/mh-chart.1.gz
+man/man1/mhbuild.1.gz
 man/man1/mhl.1.gz
 man/man1/mhmail.1.gz
 man/man1/mhn.1.gz
@@ -123,6 +126,6 @@ man/man8/fmtdump.8.gz
 man/man8/install-mh.8.gz
 man/man8/mh-mts.8.gz
 man/man8/post.8.gz
-@unexec rm -rf %D/etc/nmh/*.old
-@dirrm etc/nmh
+@unexec for ent in %D/etc/nmh/*.old; do mv $ent %D/etc/nmh/`basename $ent .old`; done
+@unexec rmdir %D/etc/nmh || /usr/bin/true
 @dirrm libexec/nmh