Fix build on both 5.x and 6.x

Submitted by:	maintainer

3 files changed, 24 insertions, 39 deletions

diff --git a/mail/nmh/files/patch-aclocal_m4 b/mail/nmh/files/patch-aclocal_m4
new file mode 100644
index 000000000000..2cc0ccf16b2d
--- /dev/null
+++ b/mail/nmh/files/patch-aclocal_m4
@@ -0,0 +1,12 @@
+diff -ru ./aclocal.m4 ../../work-save/nmh-1.2/aclocal.m4
+--- ./aclocal.m4	Wed Dec 14 16:45:36 2005
++++ ../../work-save/nmh-1.2/aclocal.m4	Wed Feb 22 15:37:56 2006
+@@ -44,7 +44,7 @@
+ dnl the right header files.)
+ AC_DEFUN(NMH_CHECK_DBM,
+ [
+-if test "x$1" == "x"; then
++if test "x$1" = "x"; then
+    nmh_libs=
+    dnl this is just for the benefit of AC_CACHE_CHECK's message
+    nmh_testname=libc
diff --git a/mail/nmh/files/patch-configure b/mail/nmh/files/patch-configure
deleted file mode 100644
index 48bc5491669b..000000000000
--- a/mail/nmh/files/patch-configure
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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-configure_in b/mail/nmh/files/patch-configure_in
new file mode 100644
index 000000000000..0cc3a5a3abe5
--- /dev/null
+++ b/mail/nmh/files/patch-configure_in
@@ -0,0 +1,12 @@
+diff -ru ./configure.in ../../work-save/nmh-1.2/configure.in
+--- ./configure.in	Wed Dec 14 16:45:36 2005
++++ ../../work-save/nmh-1.2/configure.in	Wed Feb 22 15:37:20 2006
+@@ -603,7 +603,7 @@
+ dnl CHECK FOR NDBM.H
+ dnl ----------------
+ 
+-AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h db.h, break, )
++AC_CHECK_HEADERS(db1/ndbm.h ndbm.h gdbm/ndbm.h db.h, break, )
+ 
+ dnl --------------
+ dnl CHECK FOR NDBM