Update 1.6 --> 1.7

4 files changed, 24 insertions, 36 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 53cb935d0f60..10b09f6b1876 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nmh
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	mail
 MASTER_SITES=	SAVANNAH
 
@@ -12,12 +11,13 @@ COMMENT=	Cleaned up MH mailer suite
 
 LICENSE=	BSD3CLAUSE
 
-USES=		cpe gmake iconv ncurses shebangfix
+USES=		cpe gmake iconv ncurses readline 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 \
+		--sysconfdir=${PREFIX}/etc \
 		--docdir=${DOCSDIR}
+LIB_DEPENDS=	libcurl.so:ftp/curl
 
 OPTIONS_DEFINE=	DOCS HASH_BKP SASL2 TLS REPLYFILTER
 OPTIONS_SINGLE=	MTS LOCKING
@@ -62,6 +62,8 @@ OPTIONS_DEFAULT=	SMTP FLOCK
 .if ${PORT_OPTIONS:MTLS}
 CONFIGURE_ARGS+=	--with-tls
 USES+=			ssl
+.else
+CONFIGURE_ARGS+=	--without-tls
 .endif
 
 .if defined(WITH_DEBUG)
@@ -73,4 +75,7 @@ DEBUG_FLAGS+=	-O0 -Wall -Wextra -g
 CONFLICTS=	ja-mh-[0-9]*
 CONFLICTS_INSTALL=	pixie-* p5-Dist-Joseki-*
 
+post-install:
+	@${FIND} ${STAGEDIR}${ETCDIR} -type f -exec ${MV} {} {}-dist \;
+
 .include <bsd.port.mk>
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index e30426f4cab0..250396f7e492 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1,2 +1,3 @@
-SHA256 (nmh-1.6.tar.gz) = 29338ae2bc8722fe8a5904b7b601a63943b72b07b6fcda53f3a354edb6a64bc3
-SIZE (nmh-1.6.tar.gz) = 1197272
+TIMESTAMP = 1511027149
+SHA256 (nmh-1.7.tar.gz) = cd05c7ca2cae524ae99f6ba673463a5cdeff62df93e85913aa9277ae8304ce44
+SIZE (nmh-1.7.tar.gz) = 1391594
diff --git a/mail/nmh/files/patch-Makefile.in b/mail/nmh/files/patch-Makefile.in
deleted file mode 100644
index f429dc9aade0..000000000000
--- a/mail/nmh/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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; \
--	  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; \
--	  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/pkg-plist b/mail/nmh/pkg-plist
index ebb321e87099..c8a136313ae1 100644
--- a/mail/nmh/pkg-plist
+++ b/mail/nmh/pkg-plist
@@ -21,6 +21,8 @@ bin/mark
 bin/mhbuild
 bin/mhfixmsg
 bin/mhlist
+bin/mhical
+bin/mhlogin
 bin/mhmail
 bin/mhn
 bin/mhparam
@@ -28,7 +30,6 @@ bin/mhpath
 bin/mhshow
 bin/mhstore
 bin/msgchk
-bin/msh
 bin/new
 bin/next
 bin/packf
@@ -48,6 +49,11 @@ bin/unseen
 bin/whatnow
 bin/whom
 @sample etc/nmh/MailAliases-dist etc/nmh/MailAliases
+@sample etc/nmh/bash_completion_nmh-dist etc/nmh/bash_completion_nmh
+@sample etc/nmh/mhical.12hour-dist etc/nmh/mhical.12hour
+@sample etc/nmh/mhical.24hour-dist etc/nmh/mhical.24hour
+@sample etc/nmh/mhl.replywithoutbody-dist etc/nmh/mhl.replywithoutbody
+@sample etc/nmh/rmmproc.messageid-dist etc/nmh/rmmproc.messageid
 @sample etc/nmh/components-dist etc/nmh/components
 @sample etc/nmh/digestcomps-dist etc/nmh/digestcomps
 @sample etc/nmh/distcomps-dist etc/nmh/distcomps
@@ -77,11 +83,9 @@ bin/whom
 @sample etc/nmh/scan.timely-dist etc/nmh/scan.timely
 @sample etc/nmh/scan.unseen-dist etc/nmh/scan.unseen
 libexec/nmh/ap
-libexec/nmh/conflict
 libexec/nmh/dp
 libexec/nmh/fmtdump
 libexec/nmh/mhl
-libexec/nmh/mhtest
 libexec/nmh/mkstemp
 libexec/nmh/post
 libexec/nmh/rcvdist
@@ -110,8 +114,10 @@ man/man1/mark.1.gz
 man/man1/mh-mkstemp.1.gz
 man/man1/mhbuild.1.gz
 man/man1/mhfixmsg.1.gz
+man/man1/mhical.1.gz
 man/man1/mhl.1.gz
 man/man1/mhlist.1.gz
+man/man1/mhlogin.1.gz
 man/man1/mhmail.1.gz
 man/man1/mhn.1.gz
 man/man1/mhparam.1.gz
@@ -119,7 +125,6 @@ man/man1/mhpath.1.gz
 man/man1/mhshow.1.gz
 man/man1/mhstore.1.gz
 man/man1/msgchk.1.gz
-man/man1/msh.1.gz
 man/man1/new.1.gz
 man/man1/next.1.gz
 man/man1/packf.1.gz
@@ -153,15 +158,14 @@ 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.7.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%%/COMPLETION-BASH
 %%PORTDOCS%%%%DOCSDIR%%/COMPLETION-TCSH
 %%PORTDOCS%%%%DOCSDIR%%/COMPLETION-ZSH
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
@@ -175,14 +179,14 @@ man/man8/post.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-ATTACHMENTS
 %%PORTDOCS%%%%DOCSDIR%%/README-HOOKS
 %%PORTDOCS%%%%DOCSDIR%%/README-components
-%%PORTDOCS%%%%DOCSDIR%%/README-iCalendar
 %%PORTDOCS%%%%DOCSDIR%%/README.SASL
 %%PORTDOCS%%%%DOCSDIR%%/README.about
 %%PORTDOCS%%%%DOCSDIR%%/README.developers
 %%PORTDOCS%%%%DOCSDIR%%/README.manpages
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/VERSION
-%%PORTDOCS%%%%DOCSDIR%%/contrib/build_nmh
+%%PORTDOCS%%%%DOCSDIR%%/contrib/localpostproc
 %%PORTDOCS%%%%DOCSDIR%%/contrib/ml
+%%PORTDOCS%%%%DOCSDIR%%/contrib/replaliases
 %%PORTDOCS%%%%DOCSDIR%%/contrib/replyfilter
 %%PORTDOCS%%%%DOCSDIR%%/contrib/vpick