Update to 20171013

Note that this version does not conflict anymore with mutt!
Note the main binary is now named neomutt and not mutt!

4 files changed, 83 insertions, 78 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 8955f131ce88..61cc7fa4ca3a 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	neomutt
-PORTVERSION=	20170912
+PORTVERSION=	20171013
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	mail
 
@@ -14,11 +14,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.md
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support \
 		urlview:textproc/urlview
 
-USES=		autoreconf iconv:translit localbase shebangfix ssl
+USES=		iconv:translit localbase shebangfix ssl
 
 USE_GITHUB=	yes
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	configure.autosetup
 
 OPTIONS_SUB=	yes
 SHEBANG_FILES=	contrib/smime_keys
@@ -40,25 +41,24 @@ QDBM_DESC=		Quick DataBase Manager support
 TOKYOCABINET_DESC=	Tokyo Cabinet support
 SCREEN_DESC=	Screen options
 
-CONFIGURE_ARGS=	--disable-dependency-tracking \
-		--with-docdir="${DOCSDIR}" \
-		--with-ssl="${OPENSSLBASE}" \
+CONFIGURE_ARGS=	--with-ssl="${OPENSSLBASE}" \
 		--disable-fcntl \
-		--enable-locales-fix \
+		--locales-fix \
+		--mandir=${PREFIX}/man \
 		${ICONV_CONFIGURE_ARGS}
 
 # Header cache
-BDB_CONFIGURE_WITH=		bdb
+BDB_CONFIGURE_ON=		--bdb
 BDB_USES=			bdb
-GDBM_CONFIGURE_WITH=		gdbm
+GDBM_CONFIGURE_ON=		--gdbm
 GDBM_LIB_DEPENDS=		libgdbm.so:databases/gdbm
-KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet
+KYOTOCABINET_CONFIGURE_ON=	kyotocabinet
 KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
-LMDB_CONFIGURE_WITH=		lmdb
+LMDB_CONFIGURE_ON=		--lmdb
 LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb
-QDBM_CONFIGURE_WITH=		qdbm
+QDBM_CONFIGURE_ON=		--qdbm
 QDBM_LIB_DEPENDS=		libqdbm.so:databases/qdbm
-TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
+TOKYOCABINET_CONFIGURE_ON=	--tokyocabinet
 TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 NLS_CONFIGURE_ENABLE=	nls
@@ -66,12 +66,12 @@ NLS_USES=		gettext
 NLS_USES_OFF=		gettext-runtime:build gettext-tools:build
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
-IDN_CONFIGURE_WITH=	idn
+IDN_CONFIGURE_ENABLE=	idn
 
 FLOCK_CONFIGURE_ENABLE=	flock
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASL_CONFIGURE_ON=	--with-sasl
+SASL_CONFIGURE_ON=	--sasl
 
 GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme \
 			libassuan.so:security/libassuan \
@@ -81,20 +81,23 @@ GPGME_CONFIGURE_ENABLE=	gpgme
 NOTMUCH_LIB_DEPENDS=	libnotmuch.so:mail/notmuch
 NOTMUCH_CONFIGURE_ENABLE=	notmuch
 
-SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
+SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE} --with-ui=slang
+SLANG_CONFIGURE_OFF=	--with-ui=ncurses
 SLANG_LIB_DEPENDS=	libslang.so:devel/libslang2
 SLANG_VARS=	PKGMESSAGE=${FILESDIR}/pkg-message.slang
 
 NCURSES_USES=	ncurses
 
+DOCS_CONFIGURE_ENABLE=	doc
 DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 			${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
 			lynx:www/lynx
 
-post-patch:
-	@${REINPLACE_CMD} '/LIBS=$$/d' ${WRKSRC}/configure.ac
-
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/etc/mime*
+	${MV} ${STAGEDIR}${PREFIX}/etc/neomuttrc ${STAGEDIR}${PREFIX}/etc/neomuttrc.dist
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/neomutt \
+		${STAGEDIR}${PREFIX}/lib/neomutt/pgpring \
+		${STAGEDIR}${PREFIX}/lib/neomutt/pgpewrap
 
 .include <bsd.port.mk>
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index ec320c9c9518..fbace28b187d 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505232644
-SHA256 (neomutt-neomutt-neomutt-20170912_GH0.tar.gz) = 9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657
-SIZE (neomutt-neomutt-neomutt-20170912_GH0.tar.gz) = 2533245
+TIMESTAMP = 1507974985
+SHA256 (neomutt-neomutt-neomutt-20171013_GH0.tar.gz) = 5a7c6302d623b620db03d923a7cd7cf967123a67fc42c117a0dd4b45612e9a55
+SIZE (neomutt-neomutt-neomutt-20171013_GH0.tar.gz) = 2706753
diff --git a/mail/neomutt/pkg-message b/mail/neomutt/pkg-message
new file mode 100644
index 000000000000..7a38134d4431
--- /dev/null
+++ b/mail/neomutt/pkg-message
@@ -0,0 +1 @@
+/!\ Neomutt no longer install binaries named "mutt" but "neomutt" /!\
diff --git a/mail/neomutt/pkg-plist b/mail/neomutt/pkg-plist
index 4c3497f1b02c..839270359c61 100644
--- a/mail/neomutt/pkg-plist
+++ b/mail/neomutt/pkg-plist
@@ -1,45 +1,45 @@
-bin/mutt
-bin/pgpewrap
-bin/pgpring
-bin/smime_keys
-man/man1/mutt.1.gz
-man/man1/pgpewrap.1.gz
-man/man1/pgpring.1.gz
-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
-%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
-%%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
+bin/neomutt
+lib/neomutt/pgpewrap
+lib/neomutt/pgpring
+lib/neomutt/smime_keys
+man/man1/neomutt.1.gz
+man/man1/pgpewrap_neomutt.1.gz
+man/man1/pgpring_neomutt.1.gz
+man/man1/smime_keys_neomutt.1.gz
+man/man5/mbox_neomutt.5.gz
+man/man5/mmdf_neomutt.5.gz
+man/man5/neomuttrc.5.gz
+@sample etc/neomuttrc.dist etc/neomuttrc
+%%NLS%%share/locale/bg/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/da/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/de/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/el/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/es/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/et/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/id/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/it/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/neomutt.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/neomutt.mo
 %%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
@@ -49,14 +49,14 @@ man/man5/muttrc.5.gz
 %%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%%/colorschemes/neonwolf-256.neomuttrc
+%%PORTDOCS%%%%DOCSDIR%%/colorschemes/solarized-dark-256.neomuttrc
+%%PORTDOCS%%%%DOCSDIR%%/colorschemes/vombatidae.neomuttrc
+%%PORTDOCS%%%%DOCSDIR%%/colorschemes/zenburn.neomuttrc
 %%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
 %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/README.md
-%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/muttrc
+%%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomuttrc
 %%PORTDOCS%%%%DOCSDIR%%/hcache-bench/neomutt-hcache-bench.sh
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
@@ -66,21 +66,22 @@ man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/keybase/decrypt.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/install.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/keybase.py
-%%PORTDOCS%%%%DOCSDIR%%/keybase/muttrc
+%%PORTDOCS%%%%DOCSDIR%%/keybase/neomuttrc
 %%PORTDOCS%%%%DOCSDIR%%/keybase/pagerMode.png
 %%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%%/logo/neomutt-128.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-256.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-32.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt-64.png
+%%PORTDOCS%%%%DOCSDIR%%/logo/neomutt.svg
+%%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_runner.neomuttrc
 %%PORTDOCS%%%%DOCSDIR%%/lua/test_lua-api_spec.lua
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
+%%PORTDOCS%%%%DOCSDIR%%/mime.types
 %%PORTDOCS%%%%DOCSDIR%%/miscellany.html
 %%PORTDOCS%%%%DOCSDIR%%/neomutt-syntax.vim
 %%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
@@ -95,8 +96,8 @@ man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap
-%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc
-%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tlr
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.neomuttrc-tlr
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl
 %%PORTDOCS%%%%DOCSDIR%%/security.html