5 files changed, 75 insertions, 113 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index d9e44b769179..44101a484706 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nmh
-PORTVERSION=	1.5
-PORTREVISION=	1
+PORTVERSION=	1.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	nmh
@@ -13,50 +12,39 @@ COMMENT=	A cleaned up MH mailer suite
 
 LICENSE=	BSD3CLAUSE
 
-USES=		gmake
+USES=		gmake iconv shebangfix
+SHEBANG_FILES=	docs/contrib/ml docs/contrib/replyfilter docs/contrib/vpick
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec/nmh \
 		--sysconfdir=${PREFIX}/etc/nmh \
 		--docdir=${DOCSDIR}
 
-.ifdef NMH_EDITOR
-CONFIGURE_ARGS+=	--with-editor=${NMH_EDITOR}
-.endif
-.ifdef NMH_MASQUERADE
-CONFIGURE_ARGS+=	--enable-masquerade="${NMH_MASQUERADE}"
-.endif
-.ifdef NMH_PAGER
-CONFIGURE_ARGS+=	--with-pager=${NMH_PAGER}
-.endif
-.ifdef NMH_SMTPSERVERS
-CONFIGURE_ARGS+=	--with-smtpservers="${NMH_SMTPSERVERS}"
-.endif
-
-.ifdef NMH_EXTRA_CONFIGURE_ARGS
-CONFIGURE_ARGS+=	${NMH_EXTRA_CONFIGURE_ARGS}
-.endif
-MAKE_JOBS_UNSAFE=	yes
-
 OPTIONS_DEFINE=	DOCS HASH_BKP SASL2 TLS REPLYFILTER
 OPTIONS_SINGLE=	MTS LOCKING
-OPTIONS_SINGLE_MTS=	SMTP SENDMAIL
+OPTIONS_SINGLE_MTS=	SMTP SENDMAIL_SMTP SENDMAIL_PIPE
 OPTIONS_SINGLE_LOCKING=	DOT FCNTL FLOCK LOCKF
 
 SASL2_DESC=	SASL2 support
-SASL2_CONFIGURE_ON=	--with-cyrus-sasl
+SASL2_CONFIGURE_WITH=	cyrus-sasl
 SASL2_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 SASL2_LDFLAGS=-L${LOCALBASE}/lib
 SASL2_CPPFLAGS=-I${LOCALBASE}/include
+
 HASH_BKP_DESC=	Use hash as backup prefix (default is a comma)
-HASH_BKP_CONFIGURE_ON=	--with-hash-backup
+HASH_BKP_CONFIGURE_WITH=	hash-backup
+
 REPLYFILTER_DESC=	Install dependencies for contrib/replyfilter
 REPLYFILTER_RUN_DEPENDS=	p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
-				p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+				p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
+				w3m>=0:${PORTSDIR}/www/w3m \
+				par>=0:${PORTSDIR}/textproc/par
 
 SMTP_DESC=	Use remote SMTP
 SMTP_CONFIGURE_ON=	--with-mts=smtp
-SENDMAIL_DESC=	Use local sendmail
-SENDMAIL_CONFIGURE_ON=	--with-mts=sendmail
+SENDMAIL_SMTP_DESC=	Use local sendmail (connect through socket)
+SENDMAIL_SMTP_CONFIGURE_ON=	--with-mts=sendmail/smtp
+SENDMAIL_PIPE_DESC=	Use local sendmail (connect through pipe)
+SENDMAIL_PIPE_CONFIGURE_ON=	--with-mts=sendmail/pipe
 
 DOT_DESC=	Dot file locking
 DOT_CONFIGURE_ON=	--with-locking=dot
@@ -67,7 +55,7 @@ FLOCK_CONFIGURE_ON=	--with-locking=flock
 LOCKF_DESC=	lockf file locking
 LOCKF_CONFIGURE_ON=	--with-locking=lockf
 
-OPTIONS_DEFAULT=	SMTP DOT
+OPTIONS_DEFAULT=	SMTP FLOCK
 
 .include <bsd.port.options.mk>
 
@@ -84,8 +72,4 @@ DEBUG_FLAGS+=	-O0 -Wall -Wextra -g
 
 CONFLICTS=	ja-mh-[0-9]*
 
-post-patch:
-	@${REINPLACE_CMD} -e "s|autoconf|${AUTOCONF}|;\
-		s|autoheader|${AUTOHEADER}|" ${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index 6f724b1bfaff..e30426f4cab0 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nmh-1.5.tar.gz) = af5342de8fe9fba5d615caccc9fbcb43cac60b6eb71432f7e112d43850d31c39
-SIZE (nmh-1.5.tar.gz) = 935919
+SHA256 (nmh-1.6.tar.gz) = 29338ae2bc8722fe8a5904b7b601a63943b72b07b6fcda53f3a354edb6a64bc3
+SIZE (nmh-1.6.tar.gz) = 1197272
diff --git a/mail/nmh/files/patch-Makefile.in b/mail/nmh/files/patch-Makefile.in
index f652f934a21a..f429dc9aade0 100644
--- a/mail/nmh/files/patch-Makefile.in
+++ b/mail/nmh/files/patch-Makefile.in
@@ -1,44 +1,22 @@
---- 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 \
+--- Makefile.in.orig	2014-06-16 00:34:16.000000000 +0400
++++ Makefile.in	2014-06-17 00:50:44.000000000 +0400
+@@ -4037,7 +4037,8 @@
+ 	fi; \
+ 	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 \
+-	  echo "$$d$$p"; \
++	  cp "$$p" "$$p-dist"; \
++	  echo "$$d$$p-dist"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+@@ -4058,7 +4059,8 @@
+ 	fi; \
+ 	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)
+-	  echo "$$d$$p"; \
++	  cp "$$p" "$$p-dist"; \
++	  echo "$$d$$p-dist"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+ 	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
diff --git a/mail/nmh/files/patch-etc_mhn.defaults.sh b/mail/nmh/files/patch-etc_mhn.defaults.sh
deleted file mode 100644
index 06e13c0c1b26..000000000000
--- a/mail/nmh/files/patch-etc_mhn.defaults.sh
+++ /dev/null
@@ -1,19 +0,0 @@
---- etc/mhn.defaults.sh.orig	Tue Apr 11 18:25:23 2000
-+++ etc/mhn.defaults.sh	Tue Nov 28 13:44:27 2006
-@@ -111,16 +111,6 @@
- 	echo "mhshow-show-video/mpeg: %p$PGM '%f'" >> $TMP
- fi
- 
--PGM="`$SEARCHPROG $SEARCHPATH lpr`"
--if [ ! -z "$PGM" ]; then
--	echo "mhshow-show-application/PostScript: %plpr -Pps" >> $TMP
--else
--    PGM="`$SEARCHPROG $SEARCHPATH lp`"
--    if [ ! -z "$PGM" ]; then    
--	echo "mhshow-show-application/PostScript: %plp -dps" >> $TMP
--    fi
--fi
--
- PGM="`$SEARCHPROG $SEARCHPATH ivs_replay`"
- if [ ! -z "$PGM" ]; then
- 	echo "mhshow-show-application/x-ivs: %p$PGM -o '%F'" >> $TMP
diff --git a/mail/nmh/pkg-plist b/mail/nmh/pkg-plist
index 75cae609b415..015ac4e1ef94 100644
--- a/mail/nmh/pkg-plist
+++ b/mail/nmh/pkg-plist
@@ -5,6 +5,7 @@ bin/comp
 bin/dist
 bin/flist
 bin/flists
+bin/fmttest
 bin/fnext
 bin/folder
 bin/folders
@@ -18,6 +19,7 @@ bin/inc
 bin/install-mh
 bin/mark
 bin/mhbuild
+bin/mhfixmsg
 bin/mhlist
 bin/mhmail
 bin/mhn
@@ -27,8 +29,8 @@ bin/mhshow
 bin/mhstore
 bin/msgchk
 bin/msh
-bin/next
 bin/new
+bin/next
 bin/packf
 bin/pick
 bin/prev
@@ -81,6 +83,9 @@ etc/nmh/mhl.reply-dist
 @unexec if cmp -s %D/etc/nmh/mhn.defaults %D/etc/nmh/mhn.defaults-dist; then rm -f %D/etc/nmh/mhn.defaults; else echo 'Local changes: %D/etc/nmh/mhn.defaults (not removed)' >&2; fi
 etc/nmh/mhn.defaults-dist
 @exec [ -f %D/etc/nmh/mhn.defaults ] || cp %D/etc/nmh/mhn.defaults-dist %D/etc/nmh/mhn.defaults
+@unexec if cmp -s %D/etc/nmh/mhshow.marker %D/etc/nmh/mhshow.marker-dist; then rm -f %D/etc/nmh/mhshow.marker; else echo 'Local changes: %D/etc/nmh/mhshow.marker (not removed)' >&2; fi
+etc/nmh/mhshow.marker-dist
+@exec [ -f %D/etc/nmh/mhshow.marker ] || cp %D/etc/nmh/mhshow.marker-dist %D/etc/nmh/mhshow.marker
 @unexec if cmp -s %D/etc/nmh/mts.conf %D/etc/nmh/mts.conf-dist; then rm -f %D/etc/nmh/mts.conf; else echo 'Local changes: %D/etc/nmh/mts.conf (not removed)' >&2; fi
 etc/nmh/mts.conf-dist
 @exec [ -f %D/etc/nmh/mts.conf ] || cp %D/etc/nmh/mts.conf-dist %D/etc/nmh/mts.conf
@@ -102,9 +107,15 @@ etc/nmh/scan.MMDDYY-dist
 @unexec if cmp -s %D/etc/nmh/scan.YYYYMMDD %D/etc/nmh/scan.YYYYMMDD-dist; then rm -f %D/etc/nmh/scan.YYYYMMDD; else echo 'Local changes: %D/etc/nmh/scan.YYYYMMDD (not removed)' >&2; fi
 etc/nmh/scan.YYYYMMDD-dist
 @exec [ -f %D/etc/nmh/scan.YYYYMMDD ] || cp %D/etc/nmh/scan.YYYYMMDD-dist %D/etc/nmh/scan.YYYYMMDD
+@unexec if cmp -s %D/etc/nmh/scan.curses %D/etc/nmh/scan.curses-dist; then rm -f %D/etc/nmh/scan.curses; else echo 'Local changes: %D/etc/nmh/scan.curses (not removed)' >&2; fi
+etc/nmh/scan.curses-dist
+@exec [ -f %D/etc/nmh/scan.curses ] || cp %D/etc/nmh/scan.curses-dist %D/etc/nmh/scan.curses
 @unexec if cmp -s %D/etc/nmh/scan.default %D/etc/nmh/scan.default-dist; then rm -f %D/etc/nmh/scan.default; else echo 'Local changes: %D/etc/nmh/scan.default (not removed)' >&2; fi
 etc/nmh/scan.default-dist
 @exec [ -f %D/etc/nmh/scan.default ] || cp %D/etc/nmh/scan.default-dist %D/etc/nmh/scan.default
+@unexec if cmp -s %D/etc/nmh/scan.highlighted %D/etc/nmh/scan.highlighted-dist; then rm -f %D/etc/nmh/scan.highlighted; else echo 'Local changes: %D/etc/nmh/scan.highlighted (not removed)' >&2; fi
+etc/nmh/scan.highlighted-dist
+@exec [ -f %D/etc/nmh/scan.highlighted ] || cp %D/etc/nmh/scan.highlighted-dist %D/etc/nmh/scan.highlighted
 @unexec if cmp -s %D/etc/nmh/scan.mailx %D/etc/nmh/scan.mailx-dist; then rm -f %D/etc/nmh/scan.mailx; else echo 'Local changes: %D/etc/nmh/scan.mailx (not removed)' >&2; fi
 etc/nmh/scan.mailx-dist
 @exec [ -f %D/etc/nmh/scan.mailx ] || cp %D/etc/nmh/scan.mailx-dist %D/etc/nmh/scan.mailx
@@ -129,6 +140,7 @@ libexec/nmh/dp
 libexec/nmh/fmtdump
 libexec/nmh/mhl
 libexec/nmh/mhtest
+libexec/nmh/mkstemp
 libexec/nmh/post
 libexec/nmh/rcvdist
 libexec/nmh/rcvpack
@@ -144,6 +156,7 @@ man/man1/comp.1.gz
 man/man1/dist.1.gz
 man/man1/flist.1.gz
 man/man1/flists.1.gz
+man/man1/fmttest.1.gz
 man/man1/fnext.1.gz
 man/man1/folder.1.gz
 man/man1/folders.1.gz
@@ -152,8 +165,9 @@ man/man1/fprev.1.gz
 man/man1/inc.1.gz
 man/man1/install-mh.1.gz
 man/man1/mark.1.gz
-man/man1/mh-chart.1.gz
+man/man1/mh-mkstemp.1.gz
 man/man1/mhbuild.1.gz
+man/man1/mhfixmsg.1.gz
 man/man1/mhl.1.gz
 man/man1/mhlist.1.gz
 man/man1/mhmail.1.gz
@@ -166,7 +180,6 @@ man/man1/msgchk.1.gz
 man/man1/msh.1.gz
 man/man1/new.1.gz
 man/man1/next.1.gz
-man/man1/nmh.1.gz
 man/man1/packf.1.gz
 man/man1/pick.1.gz
 man/man1/prev.1.gz
@@ -190,6 +203,7 @@ man/man1/whatnow.1.gz
 man/man1/whom.1.gz
 man/man5/mh-alias.5.gz
 man/man5/mh-draft.5.gz
+man/man5/mh-folders.5.gz
 man/man5/mh-format.5.gz
 man/man5/mh-mail.5.gz
 man/man5/mh-profile.5.gz
@@ -197,34 +211,39 @@ man/man5/mh-sequence.5.gz
 man/man5/mh-tailor.5.gz
 man/man5/mh_profile.5.gz
 man/man5/mts.conf.5.gz
+man/man7/mh-chart.7.gz
+man/man7/mh-mime.7.gz
+man/man7/nmh.7.gz
 man/man8/ap.8.gz
 man/man8/conflict.8.gz
 man/man8/dp.8.gz
 man/man8/fmtdump.8.gz
 man/man8/post.8.gz
-%%PORTDOCS%%%%DOCSDIR%%/README.about
-%%PORTDOCS%%%%DOCSDIR%%/MAILING-LISTS
-%%PORTDOCS%%%%DOCSDIR%%/README.SASL
+%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-BASH
+%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-TCSH
+%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-ZSH
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README.manpages
+%%PORTDOCS%%%%DOCSDIR%%/DIFFERENCES
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/MAIL.FILTERING
+%%PORTDOCS%%%%DOCSDIR%%/MAILING-LISTS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README-components
-%%PORTDOCS%%%%DOCSDIR%%/README-ATTACHMENTS
-%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-ZSH
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README-ATTACHMENTS
 %%PORTDOCS%%%%DOCSDIR%%/README-HOOKS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/contrib/build_nmh
-%%PORTDOCS%%%%DOCSDIR%%/contrib/nmh.spec
-%%PORTDOCS%%%%DOCSDIR%%/contrib/replyfilter
-%%PORTDOCS%%%%DOCSDIR%%/DIFFERENCES
-%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-BASH
+%%PORTDOCS%%%%DOCSDIR%%/README-components
+%%PORTDOCS%%%%DOCSDIR%%/README-iCalendar
+%%PORTDOCS%%%%DOCSDIR%%/README.SASL
+%%PORTDOCS%%%%DOCSDIR%%/README.about
 %%PORTDOCS%%%%DOCSDIR%%/README.developers
-%%PORTDOCS%%%%DOCSDIR%%/COMPLETION-TCSH
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README.manpages
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/VERSION
+%%PORTDOCS%%%%DOCSDIR%%/contrib/build_nmh
+%%PORTDOCS%%%%DOCSDIR%%/contrib/ml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/replyfilter
+%%PORTDOCS%%%%DOCSDIR%%/contrib/vpick
 @dirrmtry etc/nmh
 @dirrm libexec/nmh
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib