Index: head/mail/neomutt/Makefile
===================================================================
--- head/mail/neomutt/Makefile	(revision 427275)
+++ head/mail/neomutt/Makefile	(revision 427276)
@@ -1,100 +1,99 @@
 # $FreeBSD$
 
 PORTNAME=	neomutt
-PORTVERSION=	20161104
+PORTVERSION=	20161126
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	3
 CATEGORIES=	mail
 
 MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	Bringing together all the Mutt Code
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support \
 		urlview:textproc/urlview
 
 USE_GITHUB=	yes
 
 USES=		autoreconf localbase ncurses shebangfix ssl
 GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
 SHEBANG_FILES=	smime_keys.pl
 
 OPTIONS_DEFINE=	NLS DOCS SASL ICONV IDN FLOCK GPGME NOTMUCH
-OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME
-OPTIONS_RADIO=	HCACHE
-OPTIONS_RADIO_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
+OPTIONS_DEFAULT=SASL TOKYOCABINET NOTMUCH GPGME LMDB
+OPTIONS_MULTI=	HCACHE
+OPTIONS_MULTI_HCACHE=	BDB GDBM KYOTOCABINET LMDB QDBM TOKYOCABINET
 
 FLOCK_DESC=	Use flock() to lock files
 GPGME_DESC=	Use gpgme to handle pgp
 NOTMUCH_DESC=	Use notmuch for tagging and searching
 HCACHE_DESC=	Header-cache backend
 KYOTOCABINET_DESC=	Kyoto Cabinet support
 LMDB_DESC=		Lightning Memory-Mapped Database support
 QDBM_DESC=		Quick DataBase Manager support
 TOKYOCABINET_DESC=	Tokyo Cabinet support
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--with-docdir="${DOCSDIR}" \
 		--with-ssl="${OPENSSLBASE}" \
 		--enable-imap \
 		--enable-smtp \
 		--enable-pop \
 		--enable-nntp \
 		--enable-compressed \
 		--enable-hcache \
 		--enable-sidebar \
 		--disable-fcntl \
 		--enable-external-dotlock
 
 # Header cache
 BDB_CONFIGURE_WITH=		bdb
 BDB_USES=			bdb
 GDBM_CONFIGURE_WITH=		gdbm
 GDBM_LIB_DEPENDS=		libgdbm.so:databases/gdbm
 KYOTOCABINET_CONFIGURE_WITH=	kyotocabinet
 KYOTOCABINET_LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 LMDB_CONFIGURE_WITH=		lmdb
 LMDB_LIB_DEPENDS=		liblmdb.so:databases/lmdb
 QDBM_CONFIGURE_WITH=		qdbm
 QDBM_LIB_DEPENDS=		libqdbm.so:databases/qdbm
 TOKYOCABINET_CONFIGURE_WITH=	tokyocabinet
 TOKYOCABINET_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 NLS_IMPLIES=	ICONV
 
 IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 IDN_IMPLIES=	ICONV
 IDN_CONFIGURE_WITH=	idn
 
 ICONV_USES=	iconv:translit
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARGS}
 ICONV_CONFIGURE_OFF=	--disable-iconv
 
 FLOCK_CONFIGURE_ENABLE=	flock
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl
 
 GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
 GPGME_CONFIGURE_ENABLE=	gpgme
 
 NOTMUCH_LIB_DEPENDS=	libnotmuch.so:mail/notmuch
 NOTMUCH_CONFIGURE_ENABLE=	notmuch
 
 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*
 
 .include <bsd.port.mk>
Index: head/mail/neomutt/distinfo
===================================================================
--- head/mail/neomutt/distinfo	(revision 427275)
+++ head/mail/neomutt/distinfo	(revision 427276)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478342528
-SHA256 (neomutt-neomutt-neomutt-20161104_GH0.tar.gz) = 198379db86b7d54238523f2664f3975fe7d71db2ac18ce55085c3ed40eec7356
-SIZE (neomutt-neomutt-neomutt-20161104_GH0.tar.gz) = 2663369
+TIMESTAMP = 1480285729
+SHA256 (neomutt-neomutt-neomutt-20161126_GH0.tar.gz) = c08ca66519b9b63acffcf37f5447905279e440bf44efbe0e9d5af4ee772456f1
+SIZE (neomutt-neomutt-neomutt-20161126_GH0.tar.gz) = 2738930
Index: head/mail/neomutt/files/patch-gpgme180
===================================================================
--- head/mail/neomutt/files/patch-gpgme180	(nonexistent)
+++ head/mail/neomutt/files/patch-gpgme180	(revision 427276)
@@ -0,0 +1,36 @@
+Use gpgme hg commit 84ad86e8b8ab to support gpgme 1.8.0.  This patch
+should be removed once mutt hg commit 84ad86e8b8ab is in an official
+release.
+
+--- crypt-gpgme.c.orig	2016-11-27 02:22:51 UTC
++++ crypt-gpgme.c
+@@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h
+   return verify_sender (h, GPGME_PROTOCOL_CMS);
+ }
+ 
+-void gpgme_set_sender (const char *sender)
++void mutt_gpgme_set_sender (const char *sender)
+ {
+   mutt_error ("[setting sender] mailbox: %s\n", sender);
+   FREE (&current_sender);
+--- crypt-gpgme.h.orig	2016-11-27 02:22:51 UTC
++++ crypt-gpgme.h
+@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, 
+ 
+ int smime_gpgme_verify_sender (HEADER *h);
+ 
+-void gpgme_set_sender (const char *sender);
++void mutt_gpgme_set_sender (const char *sender);
+ 
+ #endif
+--- crypt-mod-pgp-gpgme.c.orig	2016-11-27 02:22:51 UTC
++++ crypt-mod-pgp-gpgme.c
+@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta
+ 
+ static void crypt_mod_pgp_set_sender (const char *sender)
+ {
+-  gpgme_set_sender (sender);
++  mutt_gpgme_set_sender (sender);
+ }
+ 
+ struct crypt_module_specs crypt_mod_pgp_gpgme =

Property changes on: head/mail/neomutt/files/patch-gpgme180
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/neomutt/pkg-plist
===================================================================
--- head/mail/neomutt/pkg-plist	(revision 427275)
+++ head/mail/neomutt/pkg-plist	(revision 427276)
@@ -1,144 +1,145 @@
 bin/mutt
 bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
 bin/smime_keys
 @sample etc/Muttrc.dist etc/Muttrc
 man/man1/mutt.1.gz
 man/man1/mutt_dotlock.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
+%%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
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.neomutt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
 %%PORTDOCS%%%%DOCSDIR%%/README.SSL
 %%PORTDOCS%%%%DOCSDIR%%/README.neomutt
 %%PORTDOCS%%%%DOCSDIR%%/README.notmuch
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
 %%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
 %%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/keybase/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/keybase/README.md
 %%PORTDOCS%%%%DOCSDIR%%/keybase/attachmentView.png
 %%PORTDOCS%%%%DOCSDIR%%/keybase/decrypt.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/install.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/keybase.py
 %%PORTDOCS%%%%DOCSDIR%%/keybase/muttrc
 %%PORTDOCS%%%%DOCSDIR%%/keybase/pagerMode.png
 %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpdecrypt.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/pgpverify.sh
 %%PORTDOCS%%%%DOCSDIR%%/keybase/verify.sh
 %%PORTDOCS%%%%DOCSDIR%%/manual.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
 %%PORTDOCS%%%%DOCSDIR%%/miscellany.html
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.attach-headers-color
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.compress
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.cond-date
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.encrypt-to-self
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.forgotten-attachment
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.ifdef
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.index-color
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.initials
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.keywords
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.limit-current-thread
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.nested-if
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.new-mail
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.nntp
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.notmuch
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.progress
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.quasi-delete
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.reply-with-xorig
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.sidebar
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.skip-quoted
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.status-color
 %%PORTDOCS%%%%DOCSDIR%%/muttrc.timeout
 %%PORTDOCS%%%%DOCSDIR%%/neomutt-syntax.vim
 %%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
 %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/reference.html
 %%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/ca-bundle.crt
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux
 %%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-3.2.5.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.1.5.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.2.0.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.3.2.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.freebsd-3.3.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.3.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.90.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.01.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.20.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-11.00.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.irix-6.5.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0a.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0d.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.4.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.5.1.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/mutt_xtitle
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc
 %%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-sidebar
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tlr
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.vimrc-sidebar
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl
 %%PORTDOCS%%%%DOCSDIR%%/security.html
 %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning.html
-%%PORTDOCS%%%%DOCSDIR%%/vim-keybindings/README.md
-%%PORTDOCS%%%%DOCSDIR%%/vim-keybindings/vim-keybindings.rc
-%%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/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
+%%PORTDOCS%%%%DOCSDIR%%/vim-keys/README.md
+%%PORTDOCS%%%%DOCSDIR%%/vim-keys/vim-keys.rc