Upgrade nmh to 1.0.4. Fixes problems discussed in PR pkg/9695 (Eric sent

his problem report to the nmh people as well).

Adjust home page as per Eric's PR pkg/9695 as well.

Many changes since 1.0.3.  The most important ones are:

 + Eric's shell quoting problems displaying MIME content.
 + Fix coredump in packf.
 + Folder creation permissions bug (mentioned by Sean Matheis on
   netbsd-users@netbsd.org).
 + mmdf mailbox processing errors.

Full list if changes is in the ChangeLog file.

6 files changed, 22 insertions, 20 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index e7c1213f79a..f3e1a2ad45c 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.36 2000/03/16 13:44:53 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2000/04/15 07:56:15 simonb Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
-DISTNAME=	nmh-1.0.3
+DISTNAME=	nmh-1.0.4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.mhost.com/pub/nmh/ \
 		ftp://ftp.gw.com/pub/unix/mail/mh/nmh/
 
 MAINTAINER=	kim@tac.nyc.ny.us
-HOMEPAGE=	http://www.math.gatech.edu/nmh/
+HOMEPAGE=	http://www.mhost.com/nmh/
 
 CONFLICTS=	ja-mh-*
 
diff --git a/mail/nmh/files/md5 b/mail/nmh/files/md5
index 75fe6502916..b1775db9782 100644
--- a/mail/nmh/files/md5
+++ b/mail/nmh/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.13 2000/03/02 05:11:44 kim Exp $
+$NetBSD: md5,v 1.14 2000/04/15 07:56:16 simonb Exp $
 
-MD5 (nmh-1.0.3.tar.gz) = 02519bf8f7ff8590ecfbee9f9500ea07
+MD5 (nmh-1.0.4.tar.gz) = fd0dc5c84f67cfbcdfdc1196a5298e47
diff --git a/mail/nmh/files/patch-sum b/mail/nmh/files/patch-sum
index fcd02ccd53f..551e2349b48 100644
--- a/mail/nmh/files/patch-sum
+++ b/mail/nmh/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/03/02 05:11:45 kim Exp $
+$NetBSD: patch-sum,v 1.5 2000/04/15 07:56:16 simonb Exp $
 
-MD5 (patch-ca) = ba8bde6090ca48b315ac84f6a3c04f2d
-MD5 (patch-cb) = 9045625460e75f206c0f11ab0c4a74e6
+MD5 (patch-ca) = 299c57e2c3b0e834f960983683643049
+MD5 (patch-cb) = fc9191568dbc10ee6d1f079a317e7313
 MD5 (patch-cc) = 14aab99374bf88d3d661ca795fdd2af8
diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca
index d10d3bccd1a..2b4b2e8d2e9 100644
--- a/mail/nmh/patches/patch-ca
+++ b/mail/nmh/patches/patch-ca
@@ -1,11 +1,11 @@
-$NetBSD: patch-ca,v 1.3 2000/03/02 00:23:15 hubertf Exp $
+$NetBSD: patch-ca,v 1.4 2000/04/15 07:56:16 simonb Exp $
 
 Use ${INSTALL_SCRIPT} to install scripts
 Install configuration files as <conf-file>.dist
 
---- etc/Makefile.in.orig	Thu Jan  6 22:30:07 2000
-+++ etc/Makefile.in	Thu Mar  2 00:46:18 2000
-@@ -21,6 +21,7 @@
+--- etc/Makefile.in.orig	Wed Mar 15 07:40:47 2000
++++ etc/Makefile.in	Sat Apr 15 17:13:49 2000
+@@ -23,6 +23,7 @@
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DATA    = @INSTALL_DATA@
@@ -13,7 +13,7 @@ Install configuration files as <conf-file>.dist
  
  # Path to search for programs to handle MIME
  # content.  Used to create mhn.defaults
-@@ -80,16 +81,16 @@
+@@ -84,16 +85,16 @@
  	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
  	done
  	for file in $(GEN_FILES); do \
diff --git a/mail/nmh/patches/patch-cb b/mail/nmh/patches/patch-cb
index 2aff52725ff..7f8d5788779 100644
--- a/mail/nmh/patches/patch-cb
+++ b/mail/nmh/patches/patch-cb
@@ -1,7 +1,7 @@
-$NetBSD: patch-cb,v 1.6 2000/03/02 05:11:45 kim Exp $
+$NetBSD: patch-cb,v 1.7 2000/04/15 07:56:16 simonb Exp $
 
---- config.h.in.orig	Sun Feb  6 07:40:21 2000
-+++ config.h.in	Wed Mar  1 23:31:04 2000
+--- 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.  */
  
@@ -15,8 +15,8 @@ $NetBSD: patch-cb,v 1.6 2000/03/02 05:11:45 kim Exp $
  /****** BEGIN USER CONFIGURATION SECTION *****/
  
  /*
-@@ -58,6 +65,11 @@
- /* #define REALLYDUMB  1 */
+@@ -72,6 +79,11 @@
+ #define FIX_NON_Y2K_COMPLIANT_MUA_DATES 1
  
  /*
 + * Replace & in the GCOS field with the login name.
@@ -27,7 +27,7 @@ $NetBSD: patch-cb,v 1.6 2000/03/02 05:11:45 kim Exp $
   * 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
-@@ -405,9 +417,6 @@
+@@ -424,9 +436,6 @@
  
  /* Define if you have the <sys/ndir.h> header file.  */
  #undef HAVE_SYS_NDIR_H
diff --git a/mail/nmh/pkg/PLIST b/mail/nmh/pkg/PLIST
index d0f8f13451b..d0763af63b9 100644
--- a/mail/nmh/pkg/PLIST
+++ b/mail/nmh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2000/03/02 05:11:45 kim Exp $
+@comment $NetBSD: PLIST,v 1.15 2000/04/15 07:56:16 simonb Exp $
 bin/ali
 bin/anno
 bin/burst
@@ -55,6 +55,8 @@ etc/nmh/rcvdistcomps
 etc/nmh/rcvdistcomps.outbox
 etc/nmh/replcomps
 etc/nmh/replgroupcomps
+etc/nmh/scan.MMDDYY
+etc/nmh/scan.YYYYMMDD
 etc/nmh/scan.default
 etc/nmh/scan.mailx
 etc/nmh/scan.nomime