Update to version 0.19.

(lots of bug fixes, plus the port's locking is fixed, and inc will honour
a mode 775 /var/mail).
Also pacify portlint.
Submitted by:	Scott Blachowicz (partially)

7 files changed, 106 insertions, 78 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index f85cf9fd5b0b..a46d9c2f7fc2 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	nmh
-# Version required:     0.18
+# Version required:     0.19
 # Date created:		26 July 1997
 # Whom:			Scott Blachowicz <Scott.Blachowicz@seaslug.org>
 #
-# $Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp $
+# $Id: Makefile,v 1.3 1997/12/28 12:37:37 markm Exp $
 #
 
-DISTNAME=	nmh-0.18
+DISTNAME=	nmh-0.19
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/nmh/
 
 MAINTAINER=     Scott.Blachowicz@seaslug.org
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --libexecdir=$(PREFIX)/libexec/nmh \
-		--sysconfdir=$(PREFIX)/etc/nmh --enable-nmh-pop
+CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/nmh \
+		--sysconfdir=${PREFIX}/etc/nmh --enable-nmh-pop
 
 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 \
@@ -30,9 +30,11 @@ MAN8= ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 mh-mts.8 post.8
 # Since we patch the autoconf files as well as their outputs, avoid attempt
 # to regenerate header input files with 'autoheader' by Makefile.
 post-patch:
-	${ECHO} > ${WRKSRC}/stamp-h.in
+	@${TOUCH} ${WRKSRC}/stamp-h.in
 
 post-install:
-	@PKG_PREFIX='${PREFIX}' ./pkg/INSTALL
+	@PKG_PREFIX='${PREFIX}' ${PKGDIR}/INSTALL
+	chgrp mail ${PREFIX}/bin/inc
+	chmod g+s ${PREFIX}/bin/inc
 
 .include <bsd.port.mk>
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index cab499a5d7e5..3a0f94ae2692 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1 +1 @@
-MD5 (nmh-0.18.tar.gz) = b989391b0a181bc2586525d09840512f
+MD5 (nmh-0.19.tar.gz) = ca5ffcd38c56b4311b56f04bf55fc18b
diff --git a/mail/nmh/files/patch-aa b/mail/nmh/files/patch-aa
index 10205d9ff33f..da4e1f9c101f 100644
--- a/mail/nmh/files/patch-aa
+++ b/mail/nmh/files/patch-aa
@@ -1,5 +1,5 @@
---- ../nmh-0.18.ORIG/acconfig.h	Mon Dec  1 07:52:31 1997
-+++ acconfig.h	Sun Dec 28 14:22:34 1997
+--- ../nmh-0.19.ORIG/acconfig.h	Mon Dec  1 07:52:31 1997
++++ acconfig.h	Mon Jan  5 20:03:43 1998
 @@ -36,9 +36,9 @@
   *  OpenBSD 2.x
   *  BSD/OS 2.x
@@ -7,12 +7,21 @@
 -/* #define BIND     1 */
 -/* #define BSD42    1 */
 -/* #define BSD44    1 */
-+#define BIND     1 /**/
-+#define BSD42    1 /**/
-+#define BSD44    1 /**/
++#define BIND     1
++#define BSD42    1
++#define BSD44    1
  
  /*
   *  SCO 4.x
+@@ -58,7 +58,7 @@
+  * group and add the setgid bit to `inc' manually after
+  * installation.
+  */
+-/* #define MAILGROUP  1 */
++#define MAILGROUP  1
+ 
+ /*
+  * Turn on locale (setlocale) support
 @@ -71,10 +71,10 @@
   * other programs which may modify your maildrops.
   * Currently you can only use one type.
diff --git a/mail/nmh/files/patch-ab b/mail/nmh/files/patch-ab
index 5ad654517abe..e88ff7a09465 100644
--- a/mail/nmh/files/patch-ab
+++ b/mail/nmh/files/patch-ab
@@ -1,61 +1,39 @@
-diff -udr ../nmh-0.18.ORIG/Makefile.in ./Makefile.in
---- ../nmh-0.18.ORIG/Makefile.in	Sat Jul 26 06:38:35 1997
-+++ ./Makefile.in	Sun Dec 28 12:23:55 1997
-@@ -66,6 +66,7 @@
+diff -udr ../nmh-0.19.ORIG/Makefile.in ./Makefile.in
+--- ../nmh-0.19.ORIG/Makefile.in	Sat Jul 26 06:38:35 1997
++++ ./Makefile.in	Mon Jan  5 20:29:42 1998
+@@ -26,7 +26,7 @@
+ bindir      = @bindir@
+ 
+ # location of support binaries and scripts
+-libdir      = @libdir@
++libexecdir  = @libexecdir@
+ 
+ # location of nmh configuration and formats files
+ etcdir      = @sysconfdir@
+@@ -59,12 +59,13 @@
+ MAKEDEFS = CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' \
+ CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
+ prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
+-etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \
++etcdir='$(etcdir)' libexecdir='$(libexecdir)' mandir='$(mandir)' \
+ mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \
+ default_editor='$(default_editor)' default_pager='$(default_pager)'
+ 
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
 +INSTALL_SCRIPT  = @INSTALL_SCRIPT@
+ INSTALL_DATA    = @INSTALL_DATA@
  
  .SUFFIXES:
- 
-diff -udr ../nmh-0.18.ORIG/configure ./configure
---- ../nmh-0.18.ORIG/configure	Thu Dec 18 03:31:57 1997
-+++ ./configure	Sun Dec 28 12:23:55 1997
-@@ -968,6 +968,8 @@
- test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 		# Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-@@ -3450,6 +3452,7 @@
- s%@SET_MAKE@%$SET_MAKE%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_DATA@%$INSTALL_DATA%g
-+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
- s%@RANLIB@%$RANLIB%g
- s%@AWK@%$AWK%g
- s%@LEX@%$LEX%g
-@@ -3692,7 +3695,7 @@
- 
- eval "nmhbin=${bindir}";         eval "nmhbin2=${nmhbin}"
- eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
--eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
-+eval "nmhlib=${libexecdir}";         eval "nmhlib2=${nmhlib}"
- eval "nmhman=${mandir}"
- 
- echo "
-@@ -3705,7 +3708,7 @@
- linker flags              : ${LDFLAGS}
- source code location      : ${srcdir}
- binary install path       : ${nmhbin2}
--libary install path       : ${nmhlib2}
-+libexec install path      : ${nmhlib2}
- config files install path : ${nmhsysconf2}
- man page install path     : ${nmhman}"
- echo ""
-diff -udr ../nmh-0.18.ORIG/configure.in ./configure.in
---- ../nmh-0.18.ORIG/configure.in	Wed Dec 17 01:18:12 1997
-+++ ./configure.in	Sun Dec 28 12:23:55 1997
+diff -udr ../nmh-0.19.ORIG/configure.in ./configure.in
+--- ../nmh-0.19.ORIG/configure.in	Wed Dec 17 01:18:12 1997
++++ ./configure.in	Mon Jan  5 20:20:08 1998
 @@ -400,7 +400,7 @@
  
  eval "nmhbin=${bindir}";         eval "nmhbin2=${nmhbin}"
  eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
 -eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
-+eval "nmhlib=${libexecdir}";         eval "nmhlib2=${nmhlib}"
++eval "nmhlib=${libexecdir}";     eval "nmhlib2=${nmhlib}"
  eval "nmhman=${mandir}"
  
  echo "
@@ -68,24 +46,24 @@ diff -udr ../nmh-0.18.ORIG/configure.in ./configure.in
  config files install path : ${nmhsysconf2}
  man page install path     : ${nmhman}"
  echo ""
-diff -udr ../nmh-0.18.ORIG/support/general/Makefile.in ./support/general/Makefile.in
---- ../nmh-0.18.ORIG/support/general/Makefile.in	Sat Jul 26 06:40:55 1997
-+++ ./support/general/Makefile.in	Sun Dec 28 12:23:55 1997
-@@ -14,11 +14,13 @@
+diff -udr ../nmh-0.19.ORIG/support/general/Makefile.in ./support/general/Makefile.in
+--- ../nmh-0.19.ORIG/support/general/Makefile.in	Tue Dec 23 14:05:49 1997
++++ ./support/general/Makefile.in	Mon Jan  5 20:22:42 1998
+@@ -13,11 +13,12 @@
+ prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
- libdir      = @libdir@
+-libdir      = @libdir@
 +libexecdir  = @libexecdir@
  etcdir      = @sysconfdir@
  
  INSTALL         = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
 +INSTALL_SCRIPT  = @INSTALL_SCRIPT@
+ INSTALL_DATA    = @INSTALL_DATA@
  
  # Path to search for programs to display content
- # for mhn.  Used to create mhn.defaults
-@@ -77,9 +79,9 @@
+@@ -77,9 +78,9 @@
  	done
  
  install-scripts:
@@ -97,7 +75,7 @@ diff -udr ../nmh-0.18.ORIG/support/general/Makefile.in ./support/general/Makefil
  	done
  
  uninstall: uninstall-files uninstall-scripts
-@@ -91,7 +93,7 @@
+@@ -91,7 +92,7 @@
  
  uninstall-scripts:
  	for script in $(SCRIPTS); do \
@@ -106,18 +84,19 @@ diff -udr ../nmh-0.18.ORIG/support/general/Makefile.in ./support/general/Makefil
  	done
  
  # ========== DEPENDENCIES FOR CLEANUP ==========
-diff -udr ../nmh-0.18.ORIG/uip/Makefile.in ./uip/Makefile.in
---- ../nmh-0.18.ORIG/uip/Makefile.in	Thu Dec  4 02:16:04 1997
-+++ ./uip/Makefile.in	Sun Dec 28 12:29:13 1997
-@@ -14,6 +14,7 @@
+diff -udr ../nmh-0.19.ORIG/uip/Makefile.in ./uip/Makefile.in
+--- ../nmh-0.19.ORIG/uip/Makefile.in	Thu Dec  4 02:16:04 1997
++++ ./uip/Makefile.in	Mon Jan  5 20:29:16 1998
+@@ -13,7 +13,7 @@
+ prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
- libdir      = @libdir@
+-libdir      = @libdir@
 +libexecdir  = @libexecdir@
  etcdir      = @sysconfdir@
  
  CC       = @CC@
-@@ -235,9 +236,9 @@
+@@ -235,9 +235,9 @@
  
  # install misc support binaries
  install-misc:
@@ -129,7 +108,7 @@ diff -udr ../nmh-0.18.ORIG/uip/Makefile.in ./uip/Makefile.in
  	done
  
  uninstall:
-@@ -248,7 +249,7 @@
+@@ -248,7 +248,7 @@
  	  rm -f $(bindir)/$$lcmd; \
  	done
  	for misc in $(MISC); do \
diff --git a/mail/nmh/files/patch-ac b/mail/nmh/files/patch-ac
new file mode 100644
index 000000000000..cddb57397fe4
--- /dev/null
+++ b/mail/nmh/files/patch-ac
@@ -0,0 +1,37 @@
+--- ../nmh-0.19.ORIG/configure	Sun Dec 28 12:19:27 1997
++++ configure	Mon Jan  5 20:34:08 1998
+@@ -967,6 +967,8 @@
+ # It thinks the first close brace ends the variable substitution.
+ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+ 
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
++
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 		# Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+@@ -3449,6 +3451,7 @@
+ s%@CC@%$CC%g
+ s%@SET_MAKE@%$SET_MAKE%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
+ s%@RANLIB@%$RANLIB%g
+ s%@AWK@%$AWK%g
+@@ -3692,7 +3695,7 @@
+ 
+ eval "nmhbin=${bindir}";         eval "nmhbin2=${nmhbin}"
+ eval "nmhsysconf=${sysconfdir}"; eval "nmhsysconf2=${nmhsysconf}"
+-eval "nmhlib=${libdir}";         eval "nmhlib2=${nmhlib}"
++eval "nmhlib=${libexecdir}";     eval "nmhlib2=${nmhlib}"
+ eval "nmhman=${mandir}"
+ 
+ echo "
+@@ -3705,7 +3708,7 @@
+ linker flags              : ${LDFLAGS}
+ source code location      : ${srcdir}
+ binary install path       : ${nmhbin2}
+-libary install path       : ${nmhlib2}
++libexec install path      : ${nmhlib2}
+ config files install path : ${nmhsysconf2}
+ man page install path     : ${nmhman}"
+ echo ""
diff --git a/mail/nmh/pkg-install b/mail/nmh/pkg-install
index b691411eeaff..f03793f1d2a5 100644
--- a/mail/nmh/pkg-install
+++ b/mail/nmh/pkg-install
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
 
 case "$2" in
   ""|POST-INSTALL) cat <<EOF
diff --git a/mail/nmh/pkg-plist b/mail/nmh/pkg-plist
index 24d9e261a736..2dbea3e42511 100644
--- a/mail/nmh/pkg-plist
+++ b/mail/nmh/pkg-plist
@@ -41,6 +41,7 @@ etc/nmh/mhl.digest
 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/rcvdistcomps