mail/neomutt: upgrade to 20170714.

https://www.neomutt.org/2017/07/14/release
sorted pkg-plist.

5 files changed, 23 insertions, 43 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index f5d9caf6d926..d0308cc59258 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	neomutt
-PORTVERSION=	20170609
+PORTVERSION=	20170714
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	mail
 
@@ -20,7 +20,7 @@ USES=		autoreconf iconv:translit localbase shebangfix ssl
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
-SHEBANG_FILES=	smime_keys.pl
+SHEBANG_FILES=	contrib/smime_keys
 
 OPTIONS_DEFINE=	NLS DOCS SASL IDN FLOCK GPGME NOTMUCH
 OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB NCURSES
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 68119475376e..7439951e7a06 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497017152
-SHA256 (neomutt-neomutt-neomutt-20170609_GH0.tar.gz) = feaaf7ac230cbf397f028fac5498e38b5d662078083e0cf3329ba04d1bb4b0cd
-SIZE (neomutt-neomutt-neomutt-20170609_GH0.tar.gz) = 2637349
+TIMESTAMP = 1500055455
+SHA256 (neomutt-neomutt-neomutt-20170714_GH0.tar.gz) = 40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383
+SIZE (neomutt-neomutt-neomutt-20170714_GH0.tar.gz) = 2509160
diff --git a/mail/neomutt/files/patch-doc_Makefile.am b/mail/neomutt/files/patch-doc_Makefile.am
deleted file mode 100644
index bcf53b4d2de5..000000000000
--- a/mail/neomutt/files/patch-doc_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.am.orig	2017-06-04 15:16:18 UTC
-+++ doc/Makefile.am
-@@ -41,7 +41,7 @@ HTML_DOCFILES = manual.html index.html $(CHUNKED_DOCFI
- 
- BUILT_DISTFILES = manual.txt $(HTML_DOCFILES)
- 
--srcdir_DOCFILES = PGP-Notes.txt devel-notes.txt smime-notes.txt
-+srcdir_DOCFILES = PGP-Notes.txt smime-notes.txt
- 
- topsrcdir_DOCFILES = COPYRIGHT LICENSE.md INSTALL ChangeLog ChangeLog.neomutt	\
- 	README.SSL README.md
diff --git a/mail/neomutt/files/patch-staging-Makefile.am b/mail/neomutt/files/patch-staging-Makefile.am
deleted file mode 100644
index 2b1098171e35..000000000000
--- a/mail/neomutt/files/patch-staging-Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.am.orig	2016-10-02 15:13:51 UTC
-+++ Makefile.am
-@@ -176,15 +176,6 @@ patchlist.c: $(srcdir)/PATCHES $(srcdir)
- 	$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
- 
- install-exec-hook:
--	if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then	\
--		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
--		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
--	fi
--	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
--		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
--		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
--		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
--	fi
- 
- install-data-local:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
diff --git a/mail/neomutt/pkg-plist b/mail/neomutt/pkg-plist
index 471ac2475f8f..bd365c883e79 100644
--- a/mail/neomutt/pkg-plist
+++ b/mail/neomutt/pkg-plist
@@ -2,7 +2,6 @@ bin/mutt
 bin/pgpewrap
 bin/pgpring
 bin/smime_keys
-@sample etc/Muttrc.dist etc/Muttrc
 man/man1/mutt.1.gz
 man/man1/pgpewrap.1.gz
 man/man1/pgpring.1.gz
@@ -10,6 +9,7 @@ man/man1/smime_keys.1.gz
 man/man5/mbox.5.gz
 man/man5/mmdf.5.gz
 man/man5/muttrc.5.gz
+@sample etc/Muttrc.dist etc/Muttrc
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
@@ -40,22 +40,24 @@ man/man5/muttrc.5.gz
 %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md
-%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/muttrc
-%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomutt-hcache-bench.sh
-%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_runner.muttrc
-%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua
+%%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.neomutt
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
 %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
+%%PORTDOCS%%%%DOCSDIR%%/colorschemes/neonwolf-256.muttrc
+%%PORTDOCS%%%%DOCSDIR%%/colorschemes/solarized-dark-256.muttrc
+%%PORTDOCS%%%%DOCSDIR%%/colorschemes/vombatidae.mutt
+%%PORTDOCS%%%%DOCSDIR%%/colorschemes/zenburn.muttrc
 %%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md
+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/muttrc
+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomutt-hcache-bench.sh
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/keybase/LICENSE
@@ -69,6 +71,13 @@ man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpdecrypt.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpverify.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/verify.sh
+%%PORTDOCS%%%%DOCSDIR%%/logo/mutt-128.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/mutt-256.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/mutt-32.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/mutt-64.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/mutt.svg
+%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_runner.muttrc
+%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/mimesupport.html