Upgraded to nmh-1.0

7 files changed, 38 insertions, 216 deletions

diff --git a/mail/nmh/patches/patch-aa b/mail/nmh/patches/patch-aa
deleted file mode 100644
index a9b7e5ec89a..00000000000
--- a/mail/nmh/patches/patch-aa
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:09:43 agc Exp $
-
-diff -ur nmh-0.14-dist/acconfig.h nmh-0.14/acconfig.h
---- acconfig.h-dist	Wed Apr 16 21:25:42 1997
-+++ acconfig.h	Tue May 20 18:59:52 1997
-@@ -1,3 +1,9 @@
-+/* 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 *****/
- 
-@@ -37,9 +40,11 @@
-  *  OpenBSD 2.x
-  *  BSD/OS 2.x
-  */
--/* #define BIND     1 */
--/* #define BSD42    1 */
--/* #define BSD44    1 */
-+#ifdef BSD4_4
-+#define BIND     1
-+#define BSD42    1
-+#define BSD44    1
-+#endif
- 
- /*
-  *  SCO 4.x
-@@ -72,10 +77,14 @@
-  * other programs which may modify your maildrops.
-  * Currently you can only use one type.
-  */
-+#if defined(BSD44)
-+#define FCNTL_LOCKING 1
-+#else
- #define DOT_LOCKING   1
- /* #define FCNTL_LOCKING 1 */
- /* #define LOCKF_LOCKING 1 */
- /* #define FLOCK_LOCKING 1 */
-+#endif
- 
- /*
-  * If you have defined DOT_LOCKING, then the default is to
diff --git a/mail/nmh/patches/patch-ab b/mail/nmh/patches/patch-ab
deleted file mode 100644
index edb9a31e5d9..00000000000
--- a/mail/nmh/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:09:43 agc Exp $
-
---- 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 "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
deleted file mode 100644
index b4d1d43370b..00000000000
--- a/mail/nmh/patches/patch-ac
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1998/08/07 11:09:43 agc Exp $
-
---- ./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 support binaries and scripts
--libdir      = @libdir@
-+libdir      = @libexecdir@
- 
- # 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@
--libdir      = @libdir@
-+libdir      = @libexecdir@
- etcdir      = @sysconfdir@
- 
- default_editor = @vipath@
---- 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@
--libdir      = @libdir@
-+libdir      = @libexecdir@
- 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@
--libdir      = @libdir@
-+libdir      = @libexecdir@
- etcdir      = @sysconfdir@
- 
- .SUFFIXES:
---- 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@
--libdir      = @libdir@
-+libdir      = @libexecdir@
- etcdir      = @sysconfdir@
- 
- CC       = @CC@
---- 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@
--libdir      = @libdir@
-+libdir      = @libexecdir@
- etcdir      = @sysconfdir@
- mandir      = @mandir@
- manext1     = 1
---- etc/Makefile.in	1998/06/01 12:43:22	1.1
-+++ etc/Makefile.in	1998/06/01 12:46:59
-@@ -13,7 +13,7 @@
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
- bindir      = @bindir@
--libdir      = @libdir@
-+libdir      = @libexecdir@
- etcdir      = @sysconfdir@
- 
- mailspool    = @mailspool@
-@@ -21,6 +21,7 @@
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_DATA    = @INSTALL_DATA@
-+INSTALL_SCRIPT=	${BSD_INSTALL_SCRIPT}
- 
- # Path to search for programs to display content
- # for mhn.  Used to create mhn.defaults
-@@ -88,7 +89,7 @@
- install-scripts:
- 	$(top_srcdir)/mkinstalldirs $(libdir)
- 	for script in $(SCRIPTS); do \
--	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \
-+	  $(INSTALL_SCRIPT) $(srcdir)/$$script $(libdir)/$$script; \
- 	done
- 
- uninstall: uninstall-files uninstall-scripts
diff --git a/mail/nmh/patches/patch-ad b/mail/nmh/patches/patch-ad
deleted file mode 100644
index ab759619bbd..00000000000
--- a/mail/nmh/patches/patch-ad
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:09:44 agc Exp $
-
-# Do this patch after acconfig.h to avoid having autoconf regenerate the
-# config.h.in file in case end user has autoconf...
-diff -ur config.h.in-dist config.h.in
---- config.h.in-dist	Fri May  2 12:33:46 1997
-+++ config.h.in	Thu May 15 22:46:22 1997
-@@ -1,5 +1,11 @@
- /* 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 *****/
- 
- /*
-@@ -38,9 +44,11 @@
-  *  OpenBSD 2.x
-  *  BSD/OS 2.x
-  */
--/* #define BIND     1 */
--/* #define BSD42    1 */
--/* #define BSD44    1 */
-+#if defined(BSD4_4)
-+#define BIND     1
-+#define BSD42    1
-+#define BSD44    1
-+#endif
- 
- /*
-  *  SCO 4.x
-@@ -73,10 +81,13 @@
-  * other programs which may modify your maildrops.
-  * Currently you can only use one type.
-  */
-+#if defined(BSD44)
-+#define FCNTL_LOCKING 1
-+#else
- #define DOT_LOCKING   1
--/* #define FCNTL_LOCKING 1 */
- /* #define LOCKF_LOCKING 1 */
- /* #define FLOCK_LOCKING 1 */
-+#endif
- 
- /*
-  * If you have defined DOT_LOCKING, then the default is to
diff --git a/mail/nmh/patches/patch-ba b/mail/nmh/patches/patch-ba
deleted file mode 100644
index 5808048796c..00000000000
--- a/mail/nmh/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.3 1998/08/07 11:09:44 agc Exp $
-
---- 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 "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-ca b/mail/nmh/patches/patch-ca
new file mode 100644
index 00000000000..8b033797e4b
--- /dev/null
+++ b/mail/nmh/patches/patch-ca
@@ -0,0 +1,21 @@
+$NetBSD: patch-ca,v 1.1 1999/03/04 09:12:42 kim Exp $
+
+--- etc/Makefile.in.orig	Fri Oct  2 23:38:38 1998
++++ etc/Makefile.in	Thu Mar  4 01:41:05 1999
+@@ -21,6 +21,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
+@@ -88,7 +89,7 @@
+ install-scripts:
+ 	$(top_srcdir)/mkinstalldirs $(libdir)
+ 	for script in $(SCRIPTS); do \
+-	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \
++	  $(INSTALL_SCRIPT) $(srcdir)/$$script $(libdir)/$$script; \
+ 	done
+ 
+ uninstall: uninstall-files uninstall-scripts
diff --git a/mail/nmh/patches/patch-cb b/mail/nmh/patches/patch-cb
new file mode 100644
index 00000000000..af48e7369f3
--- /dev/null
+++ b/mail/nmh/patches/patch-cb
@@ -0,0 +1,17 @@
+$NetBSD: patch-cb,v 1.1 1999/03/04 09:12:42 kim Exp $
+
+--- config.h.in.orig	Sat Jan 23 21:27:49 1999
++++ config.h.in	Thu Mar  4 02:02:07 1999
+@@ -37,9 +37,9 @@
+  *  OpenBSD 2.x
+  *  BSD/OS 2.x
+  */
+-/* #define BIND     1 */
+-/* #define BSD42    1 */
+-/* #define BSD44    1 */
++#define BIND     1
++#define BSD42    1
++#define BSD44    1
+ 
+ /*
+  *  SCO 4.x