- Update from 1.0.4 (Apr 2000) to 1.3 (Jun 2008) (whew!).

  - many bug fixes
  - MM_CHARSET no longer needed; now uses iconv to decode RFC2047-encoded
    headers and convert to current locale.
  - various MIME improvements

- Take maintainership (ok'd by kim@).

- Replace DESCR with text from web site.

- Support user-destdir.

- Use --with-hash-backup instead of hacking config.h post-configure.

- Drop IRIX-specific part of fmt_scan.c patch-cd, and therefore drop patch-ck
  and IRIX bits in Makefile.

- A tmac.h conf file (wtf?) is no longer installed.

- Update what's installed to share/doc/nmh.

- Update PLIST for added/removed/renamed files.

- Patches:
  - Update patch-ca and patch-cd.

  - Remove errno patches, upstream since XXX: patch-aa, patch-ab, patch-ad,
    patch-ae, patch-ag, patch-ah, patch-ai, patch-aj, patch-ak, patch-al,
    patch-am, patch-an patch-ao, patch-ap, patch-aq, patch-ar, patch-as,
    patch-at, patch-au, patch-av, patch-aw, patch-ax, patch-az, patch-ba,
    patch-bb, patch-bc, patch-bd, patch-be, patch-bf, patch-bg, patch-bh,
    patch-bi

  - patch-aa also had a patch for some fgetstr problem on NetBSD which no
    longer seems to happen.

  - Remove patch-cb; GCOS_HACK is referenced nowhere in nmh code (only
    apparently outdated docs) or in any other pkgsrc patch; HAVE_SYS_PARAM_H
    is already elsewhere in config.h, and sys/param.h is included in nmh.h.

  - Remove patch-ce (http://savannah.nongnu.org/bugs/?1393 fixed in
    uip/sortm.c r1.7).

  - Remove patch-ci (fixed in uip/show.c r1.6).

  - Remove patch-cj; $(etcdir)/tmac.h is gone and the folders/flists problems
    were fixed (differently) in 2000.

  - Remove patch-ck (CPPFLAGS support for the IRIX-specific part of patch-cd.

44 files changed, 91 insertions, 796 deletions

diff --git a/mail/nmh/DESCR b/mail/nmh/DESCR
index 800b19e2a9d..9bb225a9896 100644
--- a/mail/nmh/DESCR
+++ b/mail/nmh/DESCR
@@ -1,11 +1,10 @@
-nmh (new MH) is an electronic mail handling system.  It was originally
-based on the package MH-6.8.3, and is intended to be a (mostly)
-compatible drop-in replacement for MH.
+nmh (new MH) is a powerful electronic mail handling system. It was
+originally based on version 6.8.3 of the MH message system developed by
+the RAND Corporation and the University of California. It is intended
+to be a (mostly) compatible drop-in replacement for MH.
 
-Although development of nmh is ongoing, it appears to be generally
-stable and is in current use.  But it is possible that I may break
-things as changes are made.
-
-nmh is currently being developed and maintained by Richard Coleman
-<coleman@math.gatech.edu>.  Please send bug reports and suggestions to
-the nmh development mailing list at nmh-workers@math.gatech.edu.
+nmh consists of a collection of fairly simple single-purpose programs
+to send, receive, save, retrieve, and manipulate e-mail messages. Since
+nmh is a suite rather than a single monolithic program, you may freely
+intersperse nmh commands with other commands at your shell prompt,
+or write custom scripts which use these commands in flexible ways.
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 20ddd8a3ebf..65137a089fb 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.67 2008/03/11 18:47:40 tnn Exp $
+# $NetBSD: Makefile,v 1.68 2008/08/08 23:41:22 epg Exp $
 
-DISTNAME=		nmh-1.0.4
-PKGREVISION=		7
+DISTNAME=		nmh-1.3
 CATEGORIES=		mail
-MASTER_SITES=		ftp://ftp.mhost.com/pub/nmh/ \
-			ftp://ftp.gw.com/pub/unix/mail/mh/nmh/
+MASTER_SITES=		http://savannah.nongnu.org/download/nmh/
 
-MAINTAINER=		kim@tac.nyc.ny.us
+MAINTAINER=		epg@NetBSD.org
 HOMEPAGE=		http://www.nongnu.org/nmh/
 COMMENT=		Cleaned up MH mailer suite
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=		ja-mh-[0-9]*
 CONFLICTS+=		ja-mh6-[0-9]*
 
@@ -27,10 +27,6 @@ USE_TOOLS+=		lex
 CFLAGS+=		-O1
 .endif
 
-.if !empty(MACHINE_PLATFORM:MIRIX-5*)
-CPPFLAGS+=		-DIRIX5 # for a patch with extra typedefs
-.endif
-
 .include "options.mk"
 
 # Mail Transport Agent - either "smtp" or "sendmail"
@@ -62,7 +58,7 @@ CONFIGURE_ARGS+=	--without-krb4
 .endif
 
 DOCDIR=			share/doc/nmh
-EGDIR=		${PREFIX}/share/examples/nmh
+EGDIR=			${PREFIX}/share/examples/nmh
 
 BUILD_DEFS+=		NMH_MTA NMH_EDITOR NMH_PAGER NMH_HASH_BACKUP
 
@@ -93,20 +89,21 @@ CONF_FILES=		# empty
 			scan.size		\
 			scan.time		\
 			scan.timely		\
-			scan.unseen		\
-			tmac.h
+			scan.unseen
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 # This hopefully makes sure the permissions and ownership are right.
 pre-install:
-	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${DOCDIR}
 	for f in `${GREP} '^${DOCDIR}/' ${PKGDIR}/PLIST`; do \
-	    ${INSTALL_DATA} ${WRKSRC}/`${BASENAME} $$f` ${PREFIX}/${DOCDIR}; \
+	    ${INSTALL_DATA} ${WRKSRC}/docs/`${BASENAME} $$f` \
+		${DESTDIR}${PREFIX}/${DOCDIR}; \
 	done
-	${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist ${EGDIR}/mhn.defaults
+	${INSTALL_DATA} ${FILESDIR}/mhn.defaults.dist \
+	    ${DESTDIR}${EGDIR}/mhn.defaults
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/nmh/PLIST b/mail/nmh/PLIST
index de6feed3288..ce5b37908c3 100644
--- a/mail/nmh/PLIST
+++ b/mail/nmh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/01/16 19:19:46 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/08/08 23:41:22 epg Exp $
 bin/ali
 bin/anno
 bin/burst
@@ -10,6 +10,7 @@ bin/folder
 bin/folders
 bin/forw
 bin/inc
+bin/install-mh
 bin/mark
 bin/mhbuild
 bin/mhlist
@@ -35,14 +36,12 @@ bin/send
 bin/sendfiles
 bin/show
 bin/sortm
-bin/viamail
 bin/whatnow
 bin/whom
 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
@@ -52,6 +51,7 @@ libexec/nmh/rcvstore
 libexec/nmh/rcvtty
 libexec/nmh/slocal
 libexec/nmh/spost
+libexec/nmh/viamail
 man/man1/ali.1
 man/man1/anno.1
 man/man1/burst.1
@@ -63,6 +63,7 @@ man/man1/folder.1
 man/man1/folders.1
 man/man1/forw.1
 man/man1/inc.1
+man/man1/install-mh.1
 man/man1/mark.1
 man/man1/mh-chart.1
 man/man1/mhbuild.1
@@ -96,7 +97,6 @@ man/man1/sendfiles.1
 man/man1/show.1
 man/man1/slocal.1
 man/man1/sortm.1
-man/man1/vmh.1
 man/man1/whatnow.1
 man/man1/whom.1
 man/man5/mh-alias.5
@@ -107,20 +107,21 @@ man/man5/mh-profile.5
 man/man5/mh-sequence.5
 man/man5/mh-tailor.5
 man/man5/mh_profile.5
+man/man5/mts.conf.5
 man/man8/ap.8
 man/man8/conflict.8
 man/man8/dp.8
 man/man8/fmtdump.8
-man/man8/install-mh.8
-man/man8/mh-mts.8
 man/man8/post.8
+share/doc/nmh/COMPLETION-BASH
+share/doc/nmh/COMPLETION-TCSH
 share/doc/nmh/COMPLETION-ZSH
-share/doc/nmh/COPYRIGHT
 share/doc/nmh/DIFFERENCES
 share/doc/nmh/FAQ
 share/doc/nmh/MAIL.FILTERING
-share/doc/nmh/README
-share/doc/nmh/TODO
+share/doc/nmh/README-ATTACHMENTS
+share/doc/nmh/README-HOOKS
+share/doc/nmh/README.about
 share/examples/nmh/MailAliases
 share/examples/nmh/components
 share/examples/nmh/digestcomps
@@ -147,7 +148,6 @@ share/examples/nmh/scan.size
 share/examples/nmh/scan.time
 share/examples/nmh/scan.timely
 share/examples/nmh/scan.unseen
-share/examples/nmh/tmac.h
 @dirrm share/examples/nmh
 @dirrm share/doc/nmh
 @dirrm libexec/nmh
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index d93d8fcb6e4..f23ed19f092 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1,47 +1,10 @@
-$NetBSD: distinfo,v 1.12 2006/12/16 13:18:54 schwarz Exp $
+$NetBSD: distinfo,v 1.13 2008/08/08 23:41:22 epg Exp $
 
-SHA1 (nmh-1.0.4.tar.gz) = 71441a884d898db2fd9184a92e663682536425f5
-RMD160 (nmh-1.0.4.tar.gz) = 32f0a0cb7aa76f7d7efc59d99b6e5aeeea519037
-Size (nmh-1.0.4.tar.gz) = 683215 bytes
-SHA1 (patch-aa) = 9bb5d1f8344751fc5414751cddfecaacd044c925
-SHA1 (patch-ab) = e6d0ef2fbd549bacd160972f45e66067f443e6fb
+SHA1 (nmh-1.3.tar.gz) = 65b52b7db727c391cae7af60ee0b888cbdc2718a
+RMD160 (nmh-1.3.tar.gz) = a862789cc8edb28c0fc3295bd12787440797da92
+Size (nmh-1.3.tar.gz) = 847614 bytes
 SHA1 (patch-ac) = 110189a119fcdbfd78a1becd1d3b83482d156192
-SHA1 (patch-ad) = f1dcbd4ef8ffdff07d12dc1fa6036a7a7164af34
-SHA1 (patch-ae) = e8faef23ca86c5a838e1d0deef1696cb5aace084
 SHA1 (patch-af) = 90464f24d1b0b4887ee91dcd0d5be0fd82e714e2
-SHA1 (patch-ag) = c40467987ed6ae34bc59729003b2561541552117
-SHA1 (patch-ah) = 00c12fcc73ce630879688bd3628208755efc0a85
-SHA1 (patch-ai) = bb6ce79960d022b13bf3060d6dd4121dc0ce9a18
-SHA1 (patch-aj) = 32c6e81b02bc6888f719c8b9cfdca13838dd8130
-SHA1 (patch-ak) = 82d517241594920a21e514cfa7ae646f44c89d87
-SHA1 (patch-al) = 31407afcb1687fb5c29cecda3d9c078890ae3157
-SHA1 (patch-am) = 27e6c13ee80a5b907696c87ea261675661a176da
-SHA1 (patch-an) = e76f9a32b98e4e33325b04afff5209fa5e452f43
-SHA1 (patch-ao) = f9072835d2f2faac018803784a8deac56a694f93
-SHA1 (patch-ap) = 6ce802de091a1fa5d8fd2086d20597334bd39db9
-SHA1 (patch-aq) = eac9f24e310a64cb2a9e471f813e099acaab624a
-SHA1 (patch-ar) = 5e684c49b99e5ab3ef651bad35b966d1ebb2ad9e
-SHA1 (patch-as) = 017aa17dfee30429e11ade6486ca11a7cb01a971
-SHA1 (patch-at) = a6ecaa1ea5b03958fa02aebd1477d33be9b659e9
-SHA1 (patch-au) = e6e9604422cc7e17c1a543ce93265ed79359d379
-SHA1 (patch-av) = 265b73b22d62c34031b0554bcd5aed3372a89daf
-SHA1 (patch-aw) = b89b413b9c48050986dd278834a2839e957cfc82
-SHA1 (patch-ax) = d63d97b1bc0f8ba73061da09256d4f728b1066ef
 SHA1 (patch-ay) = 70da99e2192917180376f78e5452342df9440213
-SHA1 (patch-az) = 04704392993194936c300220f8b13bd5143f0b59
-SHA1 (patch-ba) = cf2098d7124bd6bbd1da09acf467196570dee044
-SHA1 (patch-bb) = 75bce49233ced39551f5b145ff44d4a04b996589
-SHA1 (patch-bc) = 86d8906800e4a0621366b3a19736b90bcb99a270
-SHA1 (patch-bd) = 994b773c80508891d744b39784094108fdb5ca51
-SHA1 (patch-be) = 1e244675d7a6b4279924599f55e89d78f765c144
-SHA1 (patch-bf) = f30740c6ec201c66493f26f9e0cbf88023323a4a
-SHA1 (patch-bg) = 0bdf466cf238d431b49d3b16aad55e988c13f646
-SHA1 (patch-bh) = f6d5371d0366e9fd7b432208beec399c05ade010
-SHA1 (patch-bi) = 3ad7237c2331bf957aa1736cf2182f6a14d45ed1
-SHA1 (patch-ca) = 126d53b3af216754c40b828d7c444a6ee077073f
-SHA1 (patch-cb) = 6e498988c08e393fdd4e8e27f2ff6ce457e2c803
-SHA1 (patch-cd) = 501fe014d4eca0b2f66d0213bd2f002ba12b9ee0
-SHA1 (patch-ce) = b93b07c3ee82e6ab8599f362e14ad2dbe1955325
-SHA1 (patch-ci) = 98f1c80281656d05c460bdb237de3efbf80b9e32
-SHA1 (patch-cj) = cb6a8ca83a7a94651668a70c697c4ec5fa402b48
-SHA1 (patch-ck) = 8577047243b5538b2bab5878c11782b2499df46a
+SHA1 (patch-ca) = b37804e0701ca8c144754a7aa6226f30df98c597
+SHA1 (patch-cd) = 058fdb8530ce8bdbd08779c90e675c071c7f834e
diff --git a/mail/nmh/options.mk b/mail/nmh/options.mk
index 9a39eb5b8a8..7d4c8de00d7 100644
--- a/mail/nmh/options.mk
+++ b/mail/nmh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:51 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2008/08/08 23:41:22 epg Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.nmh
 PKG_SUPPORTED_OPTIONS=		nmh-backup-hash
@@ -10,11 +10,5 @@ PKG_SUPPORTED_OPTIONS=		nmh-backup-hash
 ### "removed" by rmm.
 ###
 .if !empty(PKG_OPTIONS:Mnmh-backup-hash)
-post-configure: nmh-hash-backup
-
-nmh-hash-backup:
-	cd ${WRKSRC}; file=config.h;					\
-	${SED} -e 's/^\(#define  *BACKUP_PREFIX\)  *.*/\1 "#"/'		\
-		$$file > $$file.new;					\
-	${MV} -f $$file.new $$file
+CONFIGURE_ARGS+=	--with-hash-backup
 .endif
diff --git a/mail/nmh/patches/patch-aa b/mail/nmh/patches/patch-aa
deleted file mode 100644
index fff8b1b283a..00000000000
--- a/mail/nmh/patches/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhbuildsbr.c.orig	1999-09-12 13:50:12.000000000 +0000
-+++ uip/mhbuildsbr.c
-@@ -40,8 +40,6 @@
- #endif
- 
- 
--extern int errno;
--
- extern int debugsw;
- extern int verbosw;
- 
-@@ -174,7 +172,7 @@ static int InitFTP (CT);
- static int openFTP (CT, char **);
- static int InitMail (CT);
- static int openMail (CT, char **);
--static char *fgetstr (char *, int, FILE *);
-+static char *mh_fgetstr (char *, int, FILE *);
- static int user_content (FILE *, char *, char *, CT *);
- static void set_id (CT, int);
- static int compose_content (CT);
-@@ -374,7 +372,7 @@ finish_field:
-      * read and parse the composition file
-      * and the directives it contains.
-      */
--    while (fgetstr (buf, sizeof(buf) - 1, in)) {
-+    while (mh_fgetstr (buf, sizeof(buf) - 1, in)) {
- 	struct part *part;
- 	CT p;
- 
-@@ -2829,7 +2827,7 @@ openMail (CT ct, char **file)
- 
- 
- static char *
--fgetstr (char *s, int n, FILE *stream)
-+mh_fgetstr (char *s, int n, FILE *stream)
- {
-     char *cp, *ep;
- 
-@@ -2931,7 +2929,7 @@ user_content (FILE *in, char *file, char
- 
- again_descr:
- 		ct->c_descr = add (buffer + i + 1, ct->c_descr);
--		if (!fgetstr (buffer, sizeof(buffer) - 1, in))
-+		if (!mh_fgetstr (buffer, sizeof(buffer) - 1, in))
- 		    adios (NULL, "end-of-file after %s: field in plaintext", DESCR_FIELD);
- 		switch (buffer[0]) {
- 		case ' ':
-@@ -2954,7 +2952,7 @@ again_descr:
- rock_and_roll:
- 	    headers = -1;
- 	    pos = ftell (in);
--	    if ((cp = fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
-+	    if ((cp = mh_fgetstr (buffer, sizeof(buffer) - 1, in)) == NULL)
- 		break;
- 	    if (buffer[0] == '#') {
- 		char *bp;
-@@ -3297,7 +3295,7 @@ use_forw:
- 	ct->c_ctparams = (void *) m;
- 
- 	pp = &m->mp_parts;
--	while (fgetstr (buffer, sizeof(buffer) - 1, in)) {
-+	while (mh_fgetstr (buffer, sizeof(buffer) - 1, in)) {
- 	    struct part *part;
- 	    CT p;
- 
diff --git a/mail/nmh/patches/patch-ab b/mail/nmh/patches/patch-ab
deleted file mode 100644
index 57534ebccac..00000000000
--- a/mail/nmh/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/context_read.c.orig	2006-03-02 16:47:03.000000000 +0000
-+++ sbr/context_read.c
-@@ -9,8 +9,6 @@
- #include <errno.h>
- #include <pwd.h>
- 
--extern int errno;
--
- void
- context_read (void)
- {
diff --git a/mail/nmh/patches/patch-ad b/mail/nmh/patches/patch-ad
deleted file mode 100644
index f20c31ed59f..00000000000
--- a/mail/nmh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/lock_file.c.orig	2006-03-02 20:27:38.000000000 +0000
-+++ sbr/lock_file.c
-@@ -40,8 +40,6 @@
- 
- #include <signal.h>
- 
--extern int errno;
--
- #ifdef LOCKDIR
- char *lockdir = LOCKDIR;
- #endif
diff --git a/mail/nmh/patches/patch-ae b/mail/nmh/patches/patch-ae
deleted file mode 100644
index 8129c05aa49..00000000000
--- a/mail/nmh/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/m_draft.c.orig	2006-03-02 20:28:13.000000000 +0000
-+++ sbr/m_draft.c
-@@ -8,9 +8,6 @@
- #include <h/mh.h>
- #include <errno.h>
- 
--extern int errno;
--
--
- char *
- m_draft (char *folder, char *msg, int use, int *isdf)
- {
diff --git a/mail/nmh/patches/patch-ag b/mail/nmh/patches/patch-ag
deleted file mode 100644
index 6f1e62d0964..00000000000
--- a/mail/nmh/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/makedir.c.orig	2006-03-02 20:51:25.000000000 +0000
-+++ sbr/makedir.c
-@@ -14,8 +14,6 @@
- #include <sys/param.h>
- #include <sys/file.h>
- 
--extern int errno;
--	
- int
- makedir (char *dir)
- {
diff --git a/mail/nmh/patches/patch-ah b/mail/nmh/patches/patch-ah
deleted file mode 100644
index 44beb1533b0..00000000000
--- a/mail/nmh/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- sbr/ruserpass.c.orig	2006-03-02 20:52:29.000000000 +0000
-+++ sbr/ruserpass.c
-@@ -65,7 +65,6 @@ ruserpass(char *host, char **aname, char
-     char *hdir, buf[BUFSIZ];
-     int t, usedefault = 0;
-     struct stat stb;
--    extern int errno;
- 
-     hdir = getenv("HOME");
-     if (hdir == NULL)
diff --git a/mail/nmh/patches/patch-ai b/mail/nmh/patches/patch-ai
deleted file mode 100644
index 08280f0269e..00000000000
--- a/mail/nmh/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/annosbr.c.orig	2006-03-02 20:53:09.000000000 +0000
-+++ uip/annosbr.c
-@@ -10,8 +10,6 @@
- #include <fcntl.h>
- #include <errno.h>
- 
--extern int  errno;
--
- /*
-  * static prototypes
-  */
diff --git a/mail/nmh/patches/patch-aj b/mail/nmh/patches/patch-aj
deleted file mode 100644
index 2b25c0445f9..00000000000
--- a/mail/nmh/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/folder.c.orig	2006-03-02 20:53:46.000000000 +0000
-+++ uip/folder.c
-@@ -62,8 +62,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
--
- static int fshort   = 0;	/* output only folder names                 */
- static int fcreat   = 0;	/* should we ask to create new folders?     */
- static int fpack    = 0;	/* are we packing the folder?               */
diff --git a/mail/nmh/patches/patch-ak b/mail/nmh/patches/patch-ak
deleted file mode 100644
index d121f9f559f..00000000000
--- a/mail/nmh/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhbuild.c.orig	2006-03-02 20:54:32.000000000 +0000
-+++ uip/mhbuild.c
-@@ -64,8 +64,6 @@ static struct swit switches[] = {
- };
- 
- 
--extern int errno;
--
- /* mhbuildsbr.c */
- extern int checksw;
- extern char *tmp;	/* directory to place temp files */
diff --git a/mail/nmh/patches/patch-al b/mail/nmh/patches/patch-al
deleted file mode 100644
index d2bc143fb90..00000000000
--- a/mail/nmh/patches/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhcachesbr.c.orig	2006-03-02 20:55:34.000000000 +0000
-+++ uip/mhcachesbr.c
-@@ -34,7 +34,6 @@
- #endif
- 
- 
--extern int errno;
- extern int debugsw;
- 
- extern pid_t xpid;	/* mhshowsbr.c or mhbuildsbr.c */
diff --git a/mail/nmh/patches/patch-am b/mail/nmh/patches/patch-am
deleted file mode 100644
index f912118c653..00000000000
--- a/mail/nmh/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhlistsbr.c.orig	2006-03-02 20:57:04.000000000 +0000
-+++ uip/mhlistsbr.c
-@@ -16,8 +16,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
- 
--extern int errno;
--
- /* mhmisc.c */
- int part_ok (CT, int);
- int type_ok (CT, int);
diff --git a/mail/nmh/patches/patch-an b/mail/nmh/patches/patch-an
deleted file mode 100644
index 9536ba168b7..00000000000
--- a/mail/nmh/patches/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-an,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhoutsbr.c.orig	2006-03-02 20:57:31.000000000 +0000
-+++ uip/mhoutsbr.c
-@@ -22,7 +22,6 @@
- #endif
- 
- 
--extern int errno;
- extern int ebcdicsw;
- 
- static char ebcdicsafe[0x100] = {
diff --git a/mail/nmh/patches/patch-ao b/mail/nmh/patches/patch-ao
deleted file mode 100644
index 6822e0c2839..00000000000
--- a/mail/nmh/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhmisc.c.orig	2006-03-02 20:57:53.000000000 +0000
-+++ uip/mhmisc.c
-@@ -10,7 +10,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
- 
--extern int errno;
- extern int debugsw;
- 
- /*
diff --git a/mail/nmh/patches/patch-ap b/mail/nmh/patches/patch-ap
deleted file mode 100644
index cc671bfba2f..00000000000
--- a/mail/nmh/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhfree.c.orig	2006-03-02 20:58:16.000000000 +0000
-+++ uip/mhfree.c
-@@ -11,8 +11,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
- 
--extern int errno;
--
- /*
-  * prototypes
-  */
diff --git a/mail/nmh/patches/patch-aq b/mail/nmh/patches/patch-aq
deleted file mode 100644
index 34fb7a658fe..00000000000
--- a/mail/nmh/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhlist.c.orig	2006-03-02 20:58:40.000000000 +0000
-+++ uip/mhlist.c
-@@ -69,8 +69,6 @@ static struct swit switches[] = {
- };
- 
- 
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp;	/* directory to place temp files */
diff --git a/mail/nmh/patches/patch-ar b/mail/nmh/patches/patch-ar
deleted file mode 100644
index 6a2d64fec28..00000000000
--- a/mail/nmh/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhparse.c.orig	2006-03-02 20:59:04.000000000 +0000
-+++ uip/mhparse.c
-@@ -22,7 +22,6 @@
- #endif
- 
- 
--extern int errno;
- extern int debugsw;
- 
- extern int endian;	/* mhmisc.c     */
diff --git a/mail/nmh/patches/patch-as b/mail/nmh/patches/patch-as
deleted file mode 100644
index 7b805c61c2e..00000000000
--- a/mail/nmh/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhn.c.orig	2006-03-02 20:59:32.000000000 +0000
-+++ uip/mhn.c
-@@ -127,8 +127,6 @@ static struct swit switches[] = {
- };
- 
- 
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp;	/* directory to place temp files */
diff --git a/mail/nmh/patches/patch-at b/mail/nmh/patches/patch-at
deleted file mode 100644
index f3cf514eb7e..00000000000
--- a/mail/nmh/patches/patch-at
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhshowsbr.c.orig	2006-03-02 20:59:58.000000000 +0000
-+++ uip/mhshowsbr.c
-@@ -31,7 +31,6 @@
- # define siglongjmp(env,val) longjmp(env,val)
- #endif
- 
--extern int errno;
- extern int debugsw;
- 
- int pausesw  = 1;
diff --git a/mail/nmh/patches/patch-au b/mail/nmh/patches/patch-au
deleted file mode 100644
index 56f3a4a3d5f..00000000000
--- a/mail/nmh/patches/patch-au
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-au,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhstoresbr.c.orig	2006-03-02 21:00:24.000000000 +0000
-+++ uip/mhstoresbr.c
-@@ -17,8 +17,6 @@
- #include <h/mime.h>
- #include <h/mhparse.h>
- 
--extern int errno;
--
- /*
-  * The list of top-level contents to display
-  */
diff --git a/mail/nmh/patches/patch-av b/mail/nmh/patches/patch-av
deleted file mode 100644
index d855a011f63..00000000000
--- a/mail/nmh/patches/patch-av
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-av,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhshow.c.orig	2006-03-02 21:00:48.000000000 +0000
-+++ uip/mhshow.c
-@@ -83,8 +83,6 @@ static struct swit switches[] = {
- };
- 
- 
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp;	/* directory to place temp files */
diff --git a/mail/nmh/patches/patch-aw b/mail/nmh/patches/patch-aw
deleted file mode 100644
index 8db06e56df4..00000000000
--- a/mail/nmh/patches/patch-aw
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhstore.c.orig	2006-03-02 21:01:09.000000000 +0000
-+++ uip/mhstore.c
-@@ -65,8 +65,6 @@ static struct swit switches[] = {
- };
- 
- 
--extern int errno;
--
- /* mhparse.c */
- extern int checksw;
- extern char *tmp;	/* directory to place temp files */
diff --git a/mail/nmh/patches/patch-ax b/mail/nmh/patches/patch-ax
deleted file mode 100644
index 99e56cbf0f8..00000000000
--- a/mail/nmh/patches/patch-ax
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mshcmds.c.orig	2006-03-02 21:02:23.000000000 +0000
-+++ uip/mshcmds.c
-@@ -18,8 +18,6 @@
- #include <h/msh.h>
- #include <h/picksbr.h>
- 
--extern int errno;
--
- static char delim3[] = "-------";	/* from burst.c */
- 
- static int mhlnum;
-@@ -3006,7 +3004,6 @@ process (int msgnum, char *proc, int vec
-     strncpy (tmpfil, m_scratch ("", invo_name), sizeof(tmpfil));
-     if ((out = fopen (tmpfil, "w")) == NULL) {
- 	int olderr;
--	extern int errno;
- 	char newfil[80];
- 
- 	olderr = errno;
diff --git a/mail/nmh/patches/patch-az b/mail/nmh/patches/patch-az
deleted file mode 100644
index 137b96921fa..00000000000
--- a/mail/nmh/patches/patch-az
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-az,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/dropsbr.c.orig	2006-03-02 21:07:50.000000000 +0000
-+++ uip/dropsbr.c
-@@ -31,8 +31,6 @@
- 
- #include <fcntl.h>
- 
--extern int errno;
--
- /*
-  * static prototypes
-  */
diff --git a/mail/nmh/patches/patch-ba b/mail/nmh/patches/patch-ba
deleted file mode 100644
index 16cb135c526..00000000000
--- a/mail/nmh/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.5 2006/03/02 21:28:23 joerg Exp $
-
---- uip/packf.c.orig	2006-03-02 21:08:22.000000000 +0000
-+++ uip/packf.c
-@@ -31,8 +31,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
--
- static int md = NOTOK;
- static int mbx_style = MBOX_FORMAT;
- static int mapping = 0;
diff --git a/mail/nmh/patches/patch-bb b/mail/nmh/patches/patch-bb
deleted file mode 100644
index b43f2662b55..00000000000
--- a/mail/nmh/patches/patch-bb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/prompter.c.orig	2006-03-02 21:09:23.000000000 +0000
-+++ uip/prompter.c
-@@ -60,8 +60,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
--
- #ifdef HAVE_TERMIOS_H
- static struct termios tio;
- # define ERASE tio.c_cc[VERASE]
diff --git a/mail/nmh/patches/patch-bc b/mail/nmh/patches/patch-bc
deleted file mode 100644
index 7f1f2ac5e54..00000000000
--- a/mail/nmh/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/refile.c.orig	2006-03-02 21:09:49.000000000 +0000
-+++ uip/refile.c
-@@ -47,8 +47,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
--
- static char maildir[BUFSIZ];
- 
- struct st_fold {
diff --git a/mail/nmh/patches/patch-bd b/mail/nmh/patches/patch-bd
deleted file mode 100644
index 59dbb37f844..00000000000
--- a/mail/nmh/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/scan.c.orig	2006-03-02 21:11:26.000000000 +0000
-+++ uip/scan.c
-@@ -47,8 +47,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
--
- /*
-  * global for sbr/formatsbr.c - yech!
-  */
diff --git a/mail/nmh/patches/patch-be b/mail/nmh/patches/patch-be
deleted file mode 100644
index 59ab75d4c50..00000000000
--- a/mail/nmh/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/send.c.orig	2006-03-02 21:11:50.000000000 +0000
-+++ uip/send.c
-@@ -111,8 +111,6 @@ extern char *altmsg;		/*  .. */
- extern char *annotext;
- extern char *distfile;
- 
--extern int   errno;
--
- int
- main (int argc, char **argv)
- {
diff --git a/mail/nmh/patches/patch-bf b/mail/nmh/patches/patch-bf
deleted file mode 100644
index 18d861ab358..00000000000
--- a/mail/nmh/patches/patch-bf
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/viamail.c.orig	2006-03-02 21:12:25.000000000 +0000
-+++ uip/viamail.c
-@@ -48,7 +48,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
- extern int debugsw;
- extern int splitsw;
- extern int verbsw;
diff --git a/mail/nmh/patches/patch-bg b/mail/nmh/patches/patch-bg
deleted file mode 100644
index 585ddf80803..00000000000
--- a/mail/nmh/patches/patch-bg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/rcvstore.c.orig	2006-03-02 21:12:52.000000000 +0000
-+++ uip/rcvstore.c
-@@ -38,8 +38,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
--
- /*
-  * name of temporary file to store incoming message
-  */
diff --git a/mail/nmh/patches/patch-bh b/mail/nmh/patches/patch-bh
deleted file mode 100644
index b1a627e16be..00000000000
--- a/mail/nmh/patches/patch-bh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bh,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/mhtest.c.orig	2006-03-02 21:13:22.000000000 +0000
-+++ uip/mhtest.c
-@@ -63,8 +63,6 @@ static struct swit switches[] = {
- };
- 
- 
--extern int errno;
--
- int ebcdicsw = 0;	/* hack for linking purposes */
- 
- /* mhparse.c */
diff --git a/mail/nmh/patches/patch-bi b/mail/nmh/patches/patch-bi
deleted file mode 100644
index f4984aa8f57..00000000000
--- a/mail/nmh/patches/patch-bi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2006/03/02 21:28:23 joerg Exp $
-
---- uip/inc.c.orig	2006-03-02 21:13:52.000000000 +0000
-+++ uip/inc.c
-@@ -113,8 +113,6 @@ static struct swit switches[] = {
-     { NULL, 0 }
- };
- 
--extern int errno;
--
- /*
-  * flags for the mail source
-  */
diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca
index 3165fa77a55..0e60b460fab 100644
--- a/mail/nmh/patches/patch-ca
+++ b/mail/nmh/patches/patch-ca
@@ -1,64 +1,59 @@
-$NetBSD: patch-ca,v 1.5 2005/01/16 19:19:46 jmmv Exp $
+$NetBSD: patch-ca,v 1.6 2008/08/08 23:41:22 epg Exp $
 
 Use ${INSTALL_SCRIPT} to install scripts
 Install configuration files as <conf-file>.dist
 
---- etc/Makefile.in.orig	Wed Mar 15 07:40:47 2000
-+++ etc/Makefile.in	Sat Apr 15 17:13:49 2000
+--- 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@
- masquerade  = @masquerade@
-@@ -23,6 +24,7 @@
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
-+INSTALL_SCRIPT	= ${BSD_INSTALL_SCRIPT}
- 
- # Path to search for programs to handle MIME
- # content.  Used to create mhn.defaults
-@@ -76,31 +78,31 @@
- install: install-files install-scripts
- 
- install-files:
--	$(top_srcdir)/mkinstalldirs $(etcdir)
-+	$(top_srcdir)/mkinstalldirs $(egdir)
- 	for file in $(DIST_FILES); do \
--	  if [ -f $(etcdir)/$$file ]; then \
--	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
-+	  if [ -f $(egdir)/$$file ]; then \
-+	    mv $(egdir)/$$file $(egdir)/$$file.old; \
- 	  fi; \
--	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-+	  $(INSTALL_DATA) $(srcdir)/$$file $(egdir)/$$file; \
- 	done
- 	for file in $(GEN_FILES); do \
--	  if [ -f $(etcdir)/$$file ]; then \
--	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
-+	  if [ -f $(egdir)/$$file ]; then \
-+	    mv $(egdir)/$$file $(egdir)/$$file.old; \
- 	  fi; \
--	  $(INSTALL_DATA) $$file $(etcdir)/$$file; \
-+	  $(INSTALL_DATA) $$file $(egdir)/$$file; \
+@@ -92,7 +93,7 @@
  	done
  
- install-scripts:
- 	$(top_srcdir)/mkinstalldirs $(bindir)
- 	for script in $(SCRIPTS); do \
--	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
-+	  $(INSTALL_SCRIPT) $(srcdir)/$$script $(bindir)/$$script; \
+ 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; \
  	done
  
- uninstall: uninstall-files uninstall-scripts
+@@ -127,7 +128,7 @@
  
- uninstall-files:
- 	for file in $(FILES); do \
--	  rm -f $(etcdir)/$$file; \
-+	  rm -f $(egdir)/$$file; \
+ uninstall-etc-files:
+ 	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
+-	  rm -f $(DESTDIR)$(etcdir)/$$file; \
++	  rm -f $(DESTDIR)$(egdir)/$$file; \
  	done
  
- uninstall-scripts:
+ # ========== DEPENDENCIES FOR CLEANUP ==========
diff --git a/mail/nmh/patches/patch-cb b/mail/nmh/patches/patch-cb
deleted file mode 100644
index 7f8d5788779..00000000000
--- a/mail/nmh/patches/patch-cb
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-cb,v 1.7 2000/04/15 07:56:16 simonb Exp $
-
---- config.h.in.orig	Sat Mar 18 07:19:43 2000
-+++ config.h.in	Sat Apr 15 17:13:49 2000
-@@ -1,5 +1,12 @@
- /* config.h.in.  Generated automatically from configure.in by autoheader.  */
- 
-+/* Define if you have the <sys/param.h> header file.  */
-+#undef HAVE_SYS_PARAM_H
-+
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-+
- /****** BEGIN USER CONFIGURATION SECTION *****/
- 
- /*
-@@ -72,6 +79,11 @@
- #define FIX_NON_Y2K_COMPLIANT_MUA_DATES 1
- 
- /*
-+ * Replace & in the GCOS field with the login name.
-+ */
-+#define GCOS_HACK 1
-+
-+/*
-  * Directs inc/slocal to extract the envelope sender from "From "
-  * line.  If inc/slocal is saving message to folder, then this
-  * sender information is then used to create a Return-Path
-@@ -424,9 +436,6 @@
- 
- /* Define if you have the <sys/ndir.h> header file.  */
- #undef HAVE_SYS_NDIR_H
--
--/* Define if you have the <sys/param.h> header file.  */
--#undef HAVE_SYS_PARAM_H
- 
- /* Define if you have the <sys/time.h> header file.  */
- #undef HAVE_SYS_TIME_H
diff --git a/mail/nmh/patches/patch-cd b/mail/nmh/patches/patch-cd
index 3062f2ae1e6..8a0eaebfe66 100644
--- a/mail/nmh/patches/patch-cd
+++ b/mail/nmh/patches/patch-cd
@@ -1,25 +1,15 @@
-$NetBSD: patch-cd,v 1.4 2006/12/16 13:18:54 schwarz Exp $
+$NetBSD: patch-cd,v 1.5 2008/08/08 23:41:22 epg Exp $
 
---- sbr/fmt_scan.c.orig	1999-09-26 19:45:56.000000000 +0200
-+++ sbr/fmt_scan.c	2006-12-10 22:42:29.000000000 +0100
-@@ -24,6 +24,9 @@
- 
- #define	NFMTS MAXARGS
- 
-+#ifdef IRIX5
-+typedef signed long long int	int64_t;
-+#endif
- extern char *formataddr ();	/* hook for custom address formatting */
- 
- #ifdef LBL
-@@ -282,8 +285,8 @@
-     char *cp, *ep, *sp;
-     char *savestr, *str = NULL;
+--- sbr/fmt_scan.c.orig	2008-04-05 18:41:37.000000000 +0000
++++ sbr/fmt_scan.c	2008-08-08 21:24:12.000000000 +0000
+@@ -300,8 +300,8 @@
+     char *savestr;
+     unsigned char *str = NULL;
      char buffer[BUFSIZ], buffer2[BUFSIZ];
--    int i, c, ljust;
+-    int i, c, ljust, n;
 -    int value = 0;
-+    int i, ljust;
-+    int64_t c, value = 0;
++    int i, ljust, n;
++    long long c, value = 0;
      time_t t;
      struct format *fmt;
      struct comp *comp;
diff --git a/mail/nmh/patches/patch-ce b/mail/nmh/patches/patch-ce
deleted file mode 100644
index fd92e91af6c..00000000000
--- a/mail/nmh/patches/patch-ce
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ce,v 1.3 2002/10/15 10:47:00 agc Exp $
-
-Robert Elz's PR 18664 contains the rationale for this patch:
-
-        A bug report (from Scott Lipcon) was submitted elsewhere:
-http://savannah.nongnu.org/bugs/?func=detailbug&bug_id=1393&group_id=2166
-        and then today copied to the nmh-workers list.
-
-        Basically, using "sortm -textfield subject" where a message
-        in the folder contains "Subject:N" where "N" is alphanumeric
-        will cause sortm to dump core (the "korean spam" aspect of the
-        mail that caused the original bug report is irrelevant).
-
->How-To-Repeat:
-        Use nmh.   Put a message in a folder that contains "Subject:1234"
-        and then run
-                sortm +whatever-folder -textfield subject
-        and watch for the core dump.
-
-        Or, examine the code and be amazed ...
-
---- uip/sortm.c	2000/02/04 20:28:24	1.3
-+++ uip/sortm.c	2002/10/15 10:38:32
-@@ -439,9 +439,12 @@
- 			if(uprf(cp, "re:"))
- 			    cp += 2;
- 			else {
-+#if 0
- 			    if (isalnum(c))
- 				*cp2++ = isupper(c) ? tolower(c) : c;
-+#else
- 			    break;
-+#endif
- 			}
- 		    }
- 		    cp++;
diff --git a/mail/nmh/patches/patch-ci b/mail/nmh/patches/patch-ci
deleted file mode 100644
index 8bc3288bbd2..00000000000
--- a/mail/nmh/patches/patch-ci
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2002/10/30 16:57:03 kim Exp $
-
-Fix detection of non-mime messages when the charset is not enclosed
-in double quotes.
-
---- uip/show.c.orig	Sun Sep 12 09:50:12 1999
-+++ uip/show.c	Wed Oct 30 11:42:42 2002
-@@ -470,7 +470,7 @@
- 				*bp = '\0';
- 			} else {
- 			    for (bp = dp; *bp; bp++)
--				if (isspace (*bp)) {
-+				if (!istoken (*bp)) {
- 				    *bp = '\0';
- 				    break;
- 				}
diff --git a/mail/nmh/patches/patch-cj b/mail/nmh/patches/patch-cj
deleted file mode 100644
index a1a93026e59..00000000000
--- a/mail/nmh/patches/patch-cj
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-cj,v 1.2 2005/01/16 19:19:46 jmmv Exp $
-
-Add manual links for folders and flists (PR#23466).
-
---- man/Makefile.in.orig	2000-01-27 20:14:58.000000000 +0000
-+++ man/Makefile.in	2004-01-02 20:38:09.000000000 +0000
-@@ -17,6 +17,7 @@
- bindir      = @bindir@
- libdir      = @libdir@
- etcdir      = @sysconfdir@
-+egdir       = @prefix@/share/examples/nmh
- mandir      = @mandir@
- manext1     = 1
- manext5     = 5
-@@ -78,6 +79,9 @@
-        fmtdump.$(manext8) install-mh.$(manext8) mh-mts.$(manext8) \
-        post.$(manext8)
- 
-+LINK1 = flist.$(manext1) flists.$(manext1)	\
-+	folder.$(manext1) folders.$(manext1)
-+
- # source for man pages
- DIST_MAN = ali.man anno.man ap.man burst.man comp.man conflict.man \
-            dist.man dp.man flist.man fmtdump.man folder.man forw.man \
-@@ -129,8 +133,8 @@
- 
- # install the include file for man pages
- install-hdr:
--	$(top_srcdir)/mkinstalldirs $(etcdir)
--	$(INSTALL_DATA) tmac.h $(etcdir)/tmac.h
-+	$(top_srcdir)/mkinstalldirs $(egdir)
-+	$(INSTALL_DATA) tmac.h $(egdir)/tmac.h
- 
- # install the man pages in man1
- install-man1:
-@@ -138,6 +142,14 @@
- 	for file in $(MAN1); do \
- 	  $(INSTALL_DATA) $$file $(mandir)/man$(manext1) ; \
- 	done
-+	set $(LINK1);	\
-+	while test $$# -ge 2; do \
-+		name=$$1; shift; \
-+		link=$$1; shift; \
-+		ln -sf $(mandir)/man$(manext1)/$${name} \
-+			$(mandir)/man$(manext1)/$${link};\
-+	done
-+
- 
- # install the man pages in man5
- install-man5:
-@@ -163,7 +175,7 @@
- 
- # uninstall the include file for man pages
- uninstall-hdr:
--	rm -f $(etcdir)/tmac.h
-+	rm -f $(egdir)/tmac.h
- 
- # uninstall the man pages in man1
- uninstall-man1:
diff --git a/mail/nmh/patches/patch-ck b/mail/nmh/patches/patch-ck
deleted file mode 100644
index beddc85248d..00000000000
--- a/mail/nmh/patches/patch-ck
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2006/12/16 13:18:54 schwarz Exp $
-
---- sbr/Makefile.in.orig	2006-12-10 23:23:02.000000000 +0100
-+++ sbr/Makefile.in	2006-12-10 23:23:42.000000000 +0100
-@@ -12,6 +12,7 @@
- 
- CC       = @CC@
- CFLAGS   = @CFLAGS@
-+CPPFLAGS = @CPPFLAGS@
- DEFS     = @DEFS@
- INCLUDES = -I.. -I. -I$(top_srcdir)
- 
-@@ -24,7 +25,7 @@
- 
- LIBOBJS = @LIBOBJS@
- 
--COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-+COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) $(CFLAGS)
- 
- .SUFFIXES:
- .SUFFIXES: .c .o