Update to version 0.18.

The new version has picked up the autoconf patches from @etcdir@ to
@sysconfdir@, but not the ones from @libdir@ to @libexecdir@, so bring
these forward.

5 files changed, 49 insertions, 87 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index af3b1475e3b..5466f0a22d9 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	nmh
-# Version required:     0.17
-# Date created:		26 July 1997
-# Whom:			Scott Blachowicz <Scott.Blachowicz@seaslug.org>
+# Version required:     		0.18
+# Date created:				26 July 1997
+# Whom:					Scott Blachowicz <Scott.Blachowicz@seaslug.org>
 #
-# $NetBSD: Makefile,v 1.2 1997/11/19 13:58:35 agc Exp $
+# $NetBSD: Makefile,v 1.3 1997/12/19 13:43:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
-DISTNAME=	nmh-0.17
+DISTNAME=	nmh-0.18
 CATEGORIES=	mail
 MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/nmh/
 
diff --git a/mail/nmh/files/md5 b/mail/nmh/files/md5
index 1e666050d75..cab499a5d7e 100644
--- a/mail/nmh/files/md5
+++ b/mail/nmh/files/md5
@@ -1 +1 @@
-MD5 (nmh-0.17.tar.gz) = c18643f3bc43c6d0b8fa2e0dd75406d0
+MD5 (nmh-0.18.tar.gz) = b989391b0a181bc2586525d09840512f
diff --git a/mail/nmh/patches/patch-ab b/mail/nmh/patches/patch-ab
index 96a2e2d662f..a1247bdef9c 100644
--- a/mail/nmh/patches/patch-ab
+++ b/mail/nmh/patches/patch-ab
@@ -1,13 +1,11 @@
---- configure.in-dist	Wed Jun  4 19:39:43 1997
-+++ configure.in	Sat Jun 21 10:13:11 1997
-@@ -424,8 +424,8 @@
-           [test -z "$CONFIG_HEADERS" || echo > stamp-h])
+--- configure.in.orig	Tue Dec 16 23:18:12 1997
++++ configure.in	Fri Dec 19 12:37:22 1997
+@@ -400,7 +400,7 @@
  
- eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}"
--eval "nmhetc=${etcdir}"; eval "nmhetc2=${nmhetc}"
--eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}"
-+eval "nmhetc=${sysconfdir}"; eval "nmhetc2=${nmhetc}"
-+eval "nmhlib=${libexecdir}"; eval "nmhlib2=${nmhlib}"
+ 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 "
diff --git a/mail/nmh/patches/patch-ac b/mail/nmh/patches/patch-ac
index ec4cf7e830e..73d6fadf934 100644
--- a/mail/nmh/patches/patch-ac
+++ b/mail/nmh/patches/patch-ac
@@ -1,82 +1,67 @@
-diff -ur Makefile.in-dist Makefile.in
---- Makefile.in-dist	Mon Apr 21 12:02:36 1997
-+++ Makefile.in	Mon May 12 20:54:23 1997
-@@ -26,10 +26,10 @@
+--- ./Makefile.in	1997/12/19 13:00:53	1.1
++++ ./Makefile.in	1997/12/19 13:03:28
+@@ -26,7 +26,7 @@
  bindir      = @bindir@
  
- # location of nmh configuration and formats files
--etcdir      = @etcdir@
-+etcdir      = @sysconfdir@
- 
  # location of support binaries and scripts
 -libdir      = @libdir@
 +libdir      = @libexecdir@
  
- # location of man pages
- mandir      = @mandir@
-diff -ur config/Makefile.in-dist config/Makefile.in
---- config/Makefile.in-dist	Mon Jan  6 00:44:54 1997
-+++ config/Makefile.in	Fri May 16 07:05:23 1997
+ # location of nmh configuration and formats files
+ etcdir      = @sysconfdir@
+--- config/Makefile.in	1997/12/19 13:00:55	1.1
++++ config/Makefile.in	1997/12/19 13:03:59
 @@ -16,7 +16,7 @@
  prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
--etcdir      = @etcdir@
 -libdir      = @libdir@
-+etcdir      = @sysconfdir@
 +libdir      = @libexecdir@
+ etcdir      = @sysconfdir@
  
  default_editor = @vipath@
-diff -ur man/Makefile.in-dist man/Makefile.in
---- man/Makefile.in-dist	Sun Apr 27 18:48:11 1997
-+++ man/Makefile.in	Fri May 16 07:05:24 1997
-@@ -15,7 +15,7 @@
+--- mts/sendmail/Makefile.in	1997/12/19 13:00:59	1.1
++++ mts/sendmail/Makefile.in	1997/12/19 13:07:13
+@@ -13,7 +13,7 @@
  prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
--etcdir      = @etcdir@
 -libdir      = @libdir@
-+etcdir      = @sysconfdir@
 +libdir      = @libexecdir@
- mandir      = @mandir@
- manext1     = 1
-diff -ur mts/mmdf/Makefile.in-dist mts/mmdf/Makefile.in
---- mts/mmdf/Makefile.in-dist	Thu Jan  2 15:00:35 1997
-+++ mts/mmdf/Makefile.in	Fri May 16 07:05:23 1997
+ etcdir      = @sysconfdir@
+ 
+ CC       = @CC@
+--- mts/mmdf/Makefile.in	1997/12/19 13:01:00	1.1
++++ mts/mmdf/Makefile.in	1997/12/19 13:07:54
 @@ -12,7 +12,7 @@
  prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
--etcdir      = @etcdir@
 -libdir      = @libdir@
-+etcdir      = @sysconfdir@
 +libdir      = @libexecdir@
+ etcdir      = @sysconfdir@
  
  .SUFFIXES:
-diff -ur mts/sendmail/Makefile.in-dist mts/sendmail/Makefile.in
---- mts/sendmail/Makefile.in-dist	Tue Apr 15 15:59:41 1997
-+++ mts/sendmail/Makefile.in	Fri May 16 07:05:23 1997
+--- uip/Makefile.in	1997/12/19 13:01:01	1.1
++++ uip/Makefile.in	1997/12/19 13:08:19
 @@ -13,7 +13,7 @@
  prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
--etcdir      = @etcdir@
 -libdir      = @libdir@
-+etcdir      = @sysconfdir@
 +libdir      = @libexecdir@
+ etcdir      = @sysconfdir@
  
  CC       = @CC@
-diff -ur support/general/Makefile.in-dist support/general/Makefile.in
---- support/general/Makefile.in-dist	Sat Mar  8 00:44:27 1997
-+++ support/general/Makefile.in	Fri May 16 07:05:24 1997
+--- support/general/Makefile.in	1997/12/19 13:01:03	1.1
++++ support/general/Makefile.in	1997/12/19 13:02:49
 @@ -13,7 +13,7 @@
  prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
--etcdir      = @etcdir@
 -libdir      = @libdir@
-+etcdir      = @sysconfdir@
 +libdir      = @libexecdir@
+ etcdir      = @sysconfdir@
  
  INSTALL         = @INSTALL@
 @@ -79,7 +79,7 @@
@@ -88,29 +73,14 @@ diff -ur support/general/Makefile.in-dist support/general/Makefile.in
  	done
  
  uninstall: uninstall-files uninstall-scripts
-diff -ur uip/Makefile.in-dist uip/Makefile.in
---- uip/Makefile.in-dist	Wed Feb  5 22:28:41 1997
-+++ uip/Makefile.in	Fri May 16 07:05:24 1997
-@@ -13,7 +13,7 @@
+--- man/Makefile.in	1997/12/19 13:01:04	1.1
++++ man/Makefile.in	1997/12/19 13:01:28
+@@ -15,7 +15,7 @@
  prefix      = @prefix@
  exec_prefix = @exec_prefix@
  bindir      = @bindir@
--etcdir      = @etcdir@
 -libdir      = @libdir@
-+etcdir      = @sysconfdir@
 +libdir      = @libexecdir@
- 
- CC       = @CC@
-diff -ur zotnet/mts/Makefile.in-dist zotnet/mts/Makefile.in
---- zotnet/mts/Makefile.in-dist	Sat Mar  8 00:48:14 1997
-+++ zotnet/mts/Makefile.in	Fri May 16 07:05:23 1997
-@@ -13,7 +13,7 @@
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
- bindir      = @bindir@
--etcdir      = @etcdir@
--libdir      = @libdir@
-+etcdir      = @sysconfdir@
-+libdir      = @libdir@
- 
- mailspool    = @mailspool@
+ etcdir      = @sysconfdir@
+ mandir      = @mandir@
+ manext1     = 1
diff --git a/mail/nmh/patches/patch-ba b/mail/nmh/patches/patch-ba
index 6411b0cbb1b..8547559479d 100644
--- a/mail/nmh/patches/patch-ba
+++ b/mail/nmh/patches/patch-ba
@@ -1,17 +1,11 @@
-# Make sure this patch (of 'configure') is run after the patch of
-# 'configure.in' to avoid triggering any 'configure: configure.in' make
-# rules for people with autoconf.
-#
---- configure-dist	Wed Jun  4 22:21:48 1997
-+++ configure	Sat Jun 21 10:16:23 1997
-@@ -3738,8 +3738,8 @@
+--- configure.orig	Thu Dec 18 01:31:57 1997
++++ configure	Fri Dec 19 12:47:03 1997
+@@ -3692,7 +3692,7 @@
  
- 
- eval "nmhbin=${bindir}"; eval "nmhbin2=${nmhbin}"
--eval "nmhetc=${etcdir}"; eval "nmhetc2=${nmhetc}"
--eval "nmhlib=${libdir}"; eval "nmhlib2=${nmhlib}"
-+eval "nmhetc=${sysconfdir}"; eval "nmhetc2=${nmhetc}"
-+eval "nmhlib=${libexecdir}"; eval "nmhlib2=${nmhlib}"
+ 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 "