update 1.3 --> 1.5.

Assume maintainership.

PR:		174312
Submitted by:	cy
Approved by:	Maintainer timeout

3 files changed, 44 insertions, 88 deletions

diff --git a/mail/nmh/files/extra-patch-utmpx b/mail/nmh/files/extra-patch-utmpx
deleted file mode 100644
index 5f23dbe7f934..000000000000
--- a/mail/nmh/files/extra-patch-utmpx
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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-Makefile.in b/mail/nmh/files/patch-Makefile.in
new file mode 100644
index 000000000000..f652f934a21a
--- /dev/null
+++ b/mail/nmh/files/patch-Makefile.in
@@ -0,0 +1,44 @@
+--- Makefile.in.orig	2012-12-09 14:41:01.479883313 -0800
++++ Makefile.in	2012-12-09 14:48:13.430726025 -0800
+@@ -3573,16 +3573,16 @@
+ 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+-	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++	  echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
++	  $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
+ 	done
+ 
+ uninstall-dist_sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(dist_sysconf_DATA)'; for p in $$list; do \
+ 	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
++	  rm -f "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
+ 	done
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+@@ -3590,16 +3590,16 @@
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+-	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
++	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
+ 	done
+ 
+ uninstall-sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f-dist'"; \
++	  rm -f "$(DESTDIR)$(sysconfdir)/$$f-dist"; \
+ 	done
+ 
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
diff --git a/mail/nmh/files/patch-etc_Makefile_in b/mail/nmh/files/patch-etc_Makefile_in
deleted file mode 100644
index 795a5f176004..000000000000
--- a/mail/nmh/files/patch-etc_Makefile_in
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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