- Update to 1.3

- Unbreak on 9.x

PR:		ports/157514
Submitted by:	Ryan Steinmetz <rpsfa@rit.edu>
Approved by:	maintainer timeout (>18days)

6 files changed, 89 insertions, 55 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 82a102cfb868..58459269939a 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -52,8 +52,7 @@
 #
 
 PORTNAME=	nmh
-PORTVERSION=	1.2
-PORTREVISION=	3
+PORTVERSION=	1.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	nmh
@@ -101,7 +100,7 @@ OPTIONS=	SASL2 "Cyrus SASL2" OFF
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 900007
-BROKEN=		does not build
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-utmpx
 .endif
 
 .if defined(WITH_SASL2)
@@ -123,7 +122,7 @@ MAN5=	mh-alias.5 mh-draft.5 mh-format.5 mh-mail.5 mh-profile.5 \
 
 MLINKS=	mh-profile.5 mh_profile.5
 
-MAN8=	ap.8 conflict.8 dp.8 fmtdump.8 mh-mts.8 post.8
+MAN8=	ap.8 conflict.8 dp.8 fmtdump.8 post.8
 CONFLICTS=	ja-mh-[0-9]*
 
 post-patch:
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index b7c2855c533f..174474e0944a 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1,3 +1,2 @@
-MD5 (nmh-1.2.tar.gz) = aeebb9bef9ede7232f52c3a3b693eccc
-SHA256 (nmh-1.2.tar.gz) = 26000ed09bc9a937d9190a62db9bc85db4d756887986df8bd2b8fcc3eabc3b38
-SIZE (nmh-1.2.tar.gz) = 851247
+SHA256 (nmh-1.3.tar.gz) = 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
+SIZE (nmh-1.3.tar.gz) = 847614
diff --git a/mail/nmh/files/extra-patch-utmpx b/mail/nmh/files/extra-patch-utmpx
new file mode 100644
index 000000000000..5f23dbe7f934
--- /dev/null
+++ b/mail/nmh/files/extra-patch-utmpx
@@ -0,0 +1,62 @@
+--- uip/rcvtty.c.orig	2011-06-01 20:53:01.000000000 -0400
++++ uip/rcvtty.c	2011-06-01 20:54:30.000000000 -0400
+@@ -23,7 +23,7 @@
+ #include <signal.h>
+ #include <fcntl.h>
+ 
+-#include <utmp.h>
++#include <utmpx.h>
+ 
+ #ifndef HAVE_GETUTENT
+ # ifndef UTMP_FILE
+@@ -95,7 +95,7 @@
+ #ifdef HAVE_GETUTENT
+     struct utmp * utp;
+ #else
+-    struct utmp ut;
++    struct utmpx ut;
+     register FILE *uf;
+ #endif
+ 
+@@ -193,8 +193,8 @@
+     if ((uf = fopen (UTMP_FILE, "r")) == NULL)
+ 	exit (RCV_MBX);
+     while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1)
+-	if (ut.ut_name[0] != 0
+-		&& strncmp (user, ut.ut_name, sizeof(ut.ut_name)) == 0) {
++	if (ut.ut_user[0] != 0
++		&& strncmp (user, ut.ut_user, sizeof(ut.ut_user)) == 0) {
+ 	    strncpy (tty, ut.ut_line, sizeof(ut.ut_line));
+ 	    alert (tty, md);
+ 	}
+--- uip/slocal.c.orig	2011-06-01 20:54:37.000000000 -0400
++++ uip/slocal.c	2011-06-01 20:55:56.000000000 -0400
+@@ -56,7 +56,7 @@
+ #include NDBM_HEADER
+ #endif
+ 
+-#include <utmp.h>
++#include <utmpx.h>
+ 
+ #ifndef HAVE_GETUTENT
+ # ifndef UTMP_FILE
+@@ -979,7 +979,7 @@
+ static int
+ logged_in (void)
+ {
+-    struct utmp ut;
++    struct utmpx ut;
+     FILE *uf;
+ 
+     if (utmped)
+@@ -989,8 +989,8 @@
+ 	return NOTOK;
+ 
+     while (fread ((char *) &ut, sizeof(ut), 1, uf) == 1) {
+-	if (ut.ut_name[0] != 0
+-	    && strncmp (user, ut.ut_name, sizeof(ut.ut_name)) == 0) {
++	if (ut.ut_user[0] != 0
++	    && strncmp (user, ut.ut_user, sizeof(ut.ut_user)) == 0) {
+ 	    if (debug)
+ 		continue;
+ 	    fclose (uf);
diff --git a/mail/nmh/files/patch-aclocal_m4 b/mail/nmh/files/patch-aclocal_m4
deleted file mode 100644
index 2cc0ccf16b2d..000000000000
--- a/mail/nmh/files/patch-aclocal_m4
+++ /dev/null
@@ -1,12 +0,0 @@
-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_in b/mail/nmh/files/patch-configure_in
deleted file mode 100644
index 0cc3a5a3abe5..000000000000
--- a/mail/nmh/files/patch-configure_in
+++ /dev/null
@@ -1,12 +0,0 @@
-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
diff --git a/mail/nmh/files/patch-etc_Makefile_in b/mail/nmh/files/patch-etc_Makefile_in
index dabf42aea7f5..795a5f176004 100644
--- a/mail/nmh/files/patch-etc_Makefile_in
+++ b/mail/nmh/files/patch-etc_Makefile_in
@@ -1,28 +1,26 @@
---- 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; \
+--- etc/Makefile.in.orig	2006-03-04 17:14:18.000000000 -0500
++++ etc/Makefile.in	2011-06-01 20:41:11.000000000 -0400
+@@ -100,22 +100,7 @@
+ 	for path in $$INSTALL_FILES; do \
+ 	  file=`basename $$path`; \
+ 	  echo "Installing $$file..."; \
+-	  if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \
+-	    mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \
+-	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+-	    if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \
+-	      rm $(DESTDIR)$(etcdir)/$$file.prev; \
+-	    else \
+-	      echo; \
+-	      echo "  Previous version of $$file saved as $$file.prev due\c";\
+-	      echo   " to diffs."; \
+-	      echo "  Please merge any local config changes into the new\c"; \
+-	      echo   " $$file."; \
+-	      echo; \
+-	    fi; \
+-	  else \
+-	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+-	  fi; \
 +	  $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file-dist; \
  	done
  
  uninstall: uninstall-bin-files uninstall-etc-files
-