Update to 1.2

Correct a plist-related packaging problem.

PR:		93549
Submitted by:	maintainer

6 files changed, 67 insertions, 139 deletions

diff --git a/mail/nmh/files/patch-aa b/mail/nmh/files/patch-aa
deleted file mode 100644
index a62497eeee13..000000000000
--- a/mail/nmh/files/patch-aa
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ur ../../../nmh-1.0.3-DIST/acconfig.h ./acconfig.h
---- ../../../nmh-1.0.3-DIST/acconfig.h	Mon Jan 24 22:13:38 2000
-+++ ./acconfig.h	Mon Feb 28 10:20:34 2000
-@@ -22,10 +22,13 @@
-  * other programs which may modify your maildrops.
-  * Currently you can only use one type.
-  */
-+#if 0
-+/* Patched to be specified in CFLAGS by FreeBSD port. */
- #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
-@@ -104,7 +107,7 @@
-  * The prefix which is prepended to the name of messages when they
-  * are "removed" by rmm.  This should typically be `,' or `#'
-  */
--#define BACKUP_PREFIX ","
-+#define BACKUP_PREFIX "#"
- 
- /*
-  * Name of link to file to which you are replying.
-@@ -128,11 +131,11 @@
- /* Defined for Solaris 2.x, Irix, OSF/1, HP-UX, AIX */
- #undef SVR4
- /* Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody */
--#undef BSD44
-+#define BSD44
- 
- /* Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody 
-  * -- does PicoBSD have uname? :) */
--#undef BSD42
-+#define BSD42
- 
- /* Defined for SCO5 */
- #undef SCO_5_STDIO
-@@ -231,7 +234,7 @@
-  * not world writable.  There are no guarantees as to the safety of doing this,
-  * but this #define will add some extra security checks.
-  */
--#undef MAILGROUP
-+#define MAILGROUP
- 
- /* Define ruserpass as _ruserpass if your libraries have a bug *
-  * such that it can't find ruserpass, but can find _ruserpass. */
diff --git a/mail/nmh/files/patch-ab b/mail/nmh/files/patch-ab
deleted file mode 100644
index 3f54feabd3af..000000000000
--- a/mail/nmh/files/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -ur ../../nmh-1.0.4-DIST/Makefile.in ./Makefile.in
---- ../../nmh-1.0.2-DIST/Makefile.in	Sun Sep 26 12:43:15 1999
-+++ ./Makefile.in	Sat Dec 11 11:54:28 1999
-@@ -65,6 +65,7 @@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
- 
- .SUFFIXES:
-diff -ur ../../../nmh-1.0.3-DIST/etc/Makefile.in ./etc/Makefile.in
---- ../../../etc/Makefile.in.orig	Tue Mar 14 22:40:47 2000
-+++ ./etc/Makefile.in	Tue Jun 19 13:47:33 2001
-@@ -22,6 +22,7 @@
- 
- INSTALL         = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
- 
- # Path to search for programs to handle MIME
-@@ -78,29 +79,23 @@
- install-files:
- 	$(top_srcdir)/mkinstalldirs $(etcdir)
- 	for file in $(DIST_FILES); do \
--	  if [ -f $(etcdir)/$$file ]; then \
--	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
--	  fi; \
--	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-+	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file.default; \
- 	done
- 	for file in $(GEN_FILES); do \
--	  if [ -f $(etcdir)/$$file ]; then \
--	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
--	  fi; \
--	  $(INSTALL_DATA) $$file $(etcdir)/$$file; \
-+	  $(INSTALL_DATA) $$file $(etcdir)/$$file.default; \
- 	done
- 
- install-scripts:
- 	$(top_srcdir)/mkinstalldirs $(bindir)
- 	for script in $(SCRIPTS); do \
--	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
-+	  $(INSTALL_SCRIPT) $(srcdir)/$$script $(bindir)/$$script; \
- 	done
- 
- uninstall: uninstall-files uninstall-scripts
- 
- uninstall-files:
- 	for file in $(FILES); do \
--	  rm -f $(etcdir)/$$file; \
-+	  rm -f $(etcdir)/$$file.default; \
- 	done
- 
- uninstall-scripts:
diff --git a/mail/nmh/files/patch-ac b/mail/nmh/files/patch-ac
deleted file mode 100644
index c9ffcc5168f4..000000000000
--- a/mail/nmh/files/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
---- ../../../nmh-1.0.4/configure.in	Wed Mar 15 15:37:30 2000
-+++ ./configure.in	Sun Mar 31 18:55:06 2002
-@@ -193,6 +193,11 @@
- dnl ------------------
- AC_PROG_MAKE_SET	dnl Does make define $MAKE
- AC_PROG_INSTALL		dnl Check for BSD compatible `install'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
-+
-+AC_SUBST(INSTALL_SCRIPT)
-+
- AC_PROG_RANLIB		dnl Check for `ranlib'
- AC_PROG_AWK             dnl Check for mawk,gawk,nawk, then awk
- AC_PROG_LEX             dnl Check for lex/flex
-@@ -389,7 +394,7 @@
- AC_FUNC_VFORK
- AC_CHECK_LIB(mkstemp,mkstemp)
- AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
--               sighold sigrelse writev lstat uname tzset killpg mkstemp \
-+               sighold sigrelse writev lstat tzset killpg mkstemp \
-                sethostent)
- 
- dnl solaris screws this up
diff --git a/mail/nmh/files/patch-ad b/mail/nmh/files/patch-ad
deleted file mode 100644
index 79b3ee52e0cc..000000000000
--- a/mail/nmh/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- uip/sortm.c--	Thu Mar 18 00:12:19 2004
-+++ uip/sortm.c	Thu Mar 18 00:26:50 2004
-@@ -439,8 +439,6 @@
- 			if(uprf(cp, "re:"))
- 			    cp += 2;
- 			else {
--			    if (isalnum(c))
--				*cp2++ = isupper(c) ? tolower(c) : c;
- 			    break;
- 			}
- 		    }
diff --git a/mail/nmh/files/patch-configure b/mail/nmh/files/patch-configure
new file mode 100644
index 000000000000..48bc5491669b
--- /dev/null
+++ b/mail/nmh/files/patch-configure
@@ -0,0 +1,39 @@
+--- configure.orig      2005-12-20 15:37:46.000000000 +1100
++++ configure   2005-12-24 00:38:23.000000000 +1100
+@@ -8036,7 +8036,7 @@
+ 
+ 
+ 
+-for ac_header in db1/ndbm.h gdbm/ndbm.h db.h
++for ac_header in db1/ndbm.h ndbm.h gdbm/ndbm.h db.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -8188,7 +8188,7 @@
+ 
+ 
+ 
+-if test "x" == "x"; then
++if test "x" = "x"; then
+    nmh_libs=
+       nmh_testname=libc
+ else
+@@ -8213,6 +8213,9 @@
+ #ifdef HAVE_DB1_NDBM_H
+ #include <db1/ndbm.h>
+ #else
++#ifdef HAVE_NDBM_H
++#include <ndbm.h>
++#else
+ #ifdef HAVE_GDBM_NDBM_H
+ #include <gdbm/ndbm.h>
+ #else
+@@ -8224,6 +8227,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ int
+ main ()
+
diff --git a/mail/nmh/files/patch-etc_Makefile_in b/mail/nmh/files/patch-etc_Makefile_in
new file mode 100644
index 000000000000..dabf42aea7f5
--- /dev/null
+++ b/mail/nmh/files/patch-etc_Makefile_in
@@ -0,0 +1,28 @@
+--- etc/Makefile.in	Tue Nov  8 08:58:08 2005
++++ ../../work-save2/nmh-1.2/etc/Makefile.in	Sat Feb 18 21:24:51 2006
+@@ -23,6 +23,7 @@
+ 
+ INSTALL         = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT  = @INSTALL_SCRIPT@
+ INSTALL_DATA    = @INSTALL_DATA@
+ 
+ # Path to search for programs to handle MIME
+@@ -85,7 +86,7 @@
+ install-bin-files:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	for script in $(GENERATED_BIN_FILES); do \
+-	  $(INSTALL_PROGRAM) $$script $(DESTDIR)$(bindir)/$$script; \
++	  $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
+ 	done
+ 
+ install-etc-files:
+@@ -113,7 +115,8 @@
+ 	  else \
+ 	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+ 	  fi; \
++	  $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file-dist; \
+ 	done
+ 
+ uninstall: uninstall-bin-files uninstall-etc-files
+