Updated neomutt to 20160916.

Important Note

An upstream Mutt change has removed the $locale config variable.
It didnât quite do what the user might expect. This change also
introduces a new variable $attribution_locale which controls the
translation of the âOn {date}, {user} wroteâ reply string.

Bug Fixes

    Avoid segfault when listing mailboxes on startup John Swinbank (@jdswinbank)
    Fix buffer overrun in search for attach keyword James McCoy (@jamessan)
    Fix off-by-one in error message Antonio Radici (@aradici)
    fix AC_INIT tarname parameter
    fix crash when exiting the pager
    fix another crash in the pager
    nntp: close message handles
    fix: make the pager more robust
    fix sidebar sort order
    fix notmuch tag completion

Docs

    doc: Removes bug entry in new-mail docs Santiago Torres (@SantiagoTorres)
    fix some translations in crypt-gpgme.c Antonio Radici (@aradici)
    docs: mass tidy up

Upstream

    Fix sidebar documentation a bit
    Add unsidebar_whitelist command
    Remove the $locale configuration variable
    Add $attribution_locale configuration variable
    Add missing include to send.c and edit.c
    Filter out zero width no-break space (U+FEFF)
    Update a confusing and obsolete comment
    Moves mutt_copy_list to muttlib.c, where it belongs
    Redraw screen after an SSL cert prompt
    Preserve message-id and mft headers for recalled messages
    Fix openssl 1.1 compilation issues

3 files changed, 143 insertions, 122 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 69651f03360..ac9e9d0bd60 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2016/09/10 20:32:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/09/18 21:47:27 wiz Exp $
 
-DISTNAME=		neomutt-20160910
+DISTNAME=		neomutt-20160916
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${DISTNAME}
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--enable-imap
 CONFIGURE_ARGS+=	--enable-notmuch
 CONFIGURE_ARGS+=	--enable-pop
 
-EGDIR=			${PREFIX}/share/examples/neomutt
+EGDIR=			${PREFIX}/share/examples/mutt
 CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
 CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
 INSTALLATION_DIRS+=     ${DOCDIR} ${EGDIR}
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
index 7eee26de2b8..cfe5566eb2e 100644
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/09/10 20:32:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/09/18 21:47:27 wiz Exp $
 bin/mutt
 bin/mutt_dotlock
 bin/pgpewrap
@@ -12,116 +12,137 @@ man/man1/smime_keys.1
 man/man5/mbox.5
 man/man5/mmdf.5
 man/man5/muttrc.5
-share/doc/neomutt/COPYRIGHT
-share/doc/neomutt/ChangeLog
-share/doc/neomutt/ChangeLog.neomutt
-share/doc/neomutt/GPL
-share/doc/neomutt/INSTALL
-share/doc/neomutt/NEWS
-share/doc/neomutt/PGP-Notes.txt
-share/doc/neomutt/README
-share/doc/neomutt/README.SECURITY
-share/doc/neomutt/README.SSL
-share/doc/neomutt/README.neomutt
-share/doc/neomutt/README.notmuch
-share/doc/neomutt/TODO
-share/doc/neomutt/advancedusage.html
-share/doc/neomutt/applying-patches.txt
-share/doc/neomutt/configuration.html
-share/doc/neomutt/devel-notes.txt
-share/doc/neomutt/gettingstarted.html
-share/doc/neomutt/index.html
-share/doc/neomutt/intro.html
-share/doc/neomutt/keybase/LICENSE
-share/doc/neomutt/keybase/README.md
-share/doc/neomutt/keybase/attachmentView.png
-share/doc/neomutt/keybase/decrypt.sh
-share/doc/neomutt/keybase/install.sh
-share/doc/neomutt/keybase/keybase.py
-share/doc/neomutt/keybase/muttrc
-share/doc/neomutt/keybase/pagerMode.png
-share/doc/neomutt/keybase/pgpdecrypt.sh
-share/doc/neomutt/keybase/pgpverify.sh
-share/doc/neomutt/keybase/verify.sh
-share/doc/neomutt/manual.html
-share/doc/neomutt/manual.txt
-share/doc/neomutt/mimesupport.html
-share/doc/neomutt/miscellany.html
-share/doc/neomutt/optionalfeatures.html
-share/doc/neomutt/patch-notes.txt
-share/doc/neomutt/reference.html
-share/doc/neomutt/samples/Mush.rc
-share/doc/neomutt/samples/Pine.rc
-share/doc/neomutt/samples/Tin.rc
-share/doc/neomutt/samples/ca-bundle.crt
-share/doc/neomutt/samples/colors.default
-share/doc/neomutt/samples/colors.linux
-share/doc/neomutt/samples/gpg.rc
-share/doc/neomutt/samples/iconv/iconv.aix-3.2.5.rc
-share/doc/neomutt/samples/iconv/iconv.aix-4.1.5.rc
-share/doc/neomutt/samples/iconv/iconv.aix-4.2.0.rc
-share/doc/neomutt/samples/iconv/iconv.aix-4.3.2.rc
-share/doc/neomutt/samples/iconv/iconv.freebsd-3.3.rc
-share/doc/neomutt/samples/iconv/iconv.glibc-2.1.3.rc
-share/doc/neomutt/samples/iconv/iconv.glibc-2.1.90.rc
-share/doc/neomutt/samples/iconv/iconv.hpux-10.01.rc
-share/doc/neomutt/samples/iconv/iconv.hpux-10.20.rc
-share/doc/neomutt/samples/iconv/iconv.hpux-11.00.rc
-share/doc/neomutt/samples/iconv/iconv.irix-6.5.rc
-share/doc/neomutt/samples/iconv/iconv.osf1-4.0a.rc
-share/doc/neomutt/samples/iconv/iconv.osf1-4.0d.rc
-share/doc/neomutt/samples/iconv/iconv.solaris-2.4.rc
-share/doc/neomutt/samples/iconv/iconv.solaris-2.5.1.rc
-share/doc/neomutt/samples/iconv/iconv.solaris-2.6-cjk.rc
-share/doc/neomutt/samples/iconv/iconv.solaris-2.6.rc
-share/doc/neomutt/samples/iconv/iconv.solaris-2.7.rc
-share/doc/neomutt/samples/mutt_xtitle
-share/doc/neomutt/samples/pgp2.rc
-share/doc/neomutt/samples/pgp5.rc
-share/doc/neomutt/samples/pgp6.rc
-share/doc/neomutt/samples/sample.colors.attach_headers
-share/doc/neomutt/samples/sample.mailcap
-share/doc/neomutt/samples/sample.muttrc
-share/doc/neomutt/samples/sample.muttrc-sidebar
-share/doc/neomutt/samples/sample.muttrc-tlr
-share/doc/neomutt/samples/sample.vimrc-sidebar
-share/doc/neomutt/samples/smime.rc
-share/doc/neomutt/samples/smime_keys_test.pl
-share/doc/neomutt/security.html
-share/doc/neomutt/smime-notes.txt
-share/doc/neomutt/tuning.html
-share/doc/neomutt/vim-keybindings/README.md
-share/doc/neomutt/vim-keybindings/vim-keybindings.rc
-share/examples/neomutt/Muttrc
-share/examples/neomutt/Muttrc.dist
-share/examples/neomutt/mime.types
-share/examples/neomutt/mime.types.dist
-share/locale/bg/LC_MESSAGES/neomutt.mo
-share/locale/ca/LC_MESSAGES/neomutt.mo
-share/locale/cs/LC_MESSAGES/neomutt.mo
-share/locale/da/LC_MESSAGES/neomutt.mo
-share/locale/de/LC_MESSAGES/neomutt.mo
-share/locale/el/LC_MESSAGES/neomutt.mo
-share/locale/eo/LC_MESSAGES/neomutt.mo
-share/locale/es/LC_MESSAGES/neomutt.mo
-share/locale/et/LC_MESSAGES/neomutt.mo
-share/locale/eu/LC_MESSAGES/neomutt.mo
-share/locale/fr/LC_MESSAGES/neomutt.mo
-share/locale/ga/LC_MESSAGES/neomutt.mo
-share/locale/gl/LC_MESSAGES/neomutt.mo
-share/locale/hu/LC_MESSAGES/neomutt.mo
-share/locale/id/LC_MESSAGES/neomutt.mo
-share/locale/it/LC_MESSAGES/neomutt.mo
-share/locale/ja/LC_MESSAGES/neomutt.mo
-share/locale/ko/LC_MESSAGES/neomutt.mo
-share/locale/lt/LC_MESSAGES/neomutt.mo
-share/locale/nl/LC_MESSAGES/neomutt.mo
-share/locale/pl/LC_MESSAGES/neomutt.mo
-share/locale/pt_BR/LC_MESSAGES/neomutt.mo
-share/locale/ru/LC_MESSAGES/neomutt.mo
-share/locale/sk/LC_MESSAGES/neomutt.mo
-share/locale/sv/LC_MESSAGES/neomutt.mo
-share/locale/tr/LC_MESSAGES/neomutt.mo
-share/locale/uk/LC_MESSAGES/neomutt.mo
-share/locale/zh_CN/LC_MESSAGES/neomutt.mo
-share/locale/zh_TW/LC_MESSAGES/neomutt.mo
+share/doc/mutt/COPYRIGHT
+share/doc/mutt/ChangeLog
+share/doc/mutt/ChangeLog.neomutt
+share/doc/mutt/GPL
+share/doc/mutt/INSTALL
+share/doc/mutt/NEWS
+share/doc/mutt/PGP-Notes.txt
+share/doc/mutt/README
+share/doc/mutt/README.SECURITY
+share/doc/mutt/README.SSL
+share/doc/mutt/README.neomutt
+share/doc/mutt/README.notmuch
+share/doc/mutt/TODO
+share/doc/mutt/advancedusage.html
+share/doc/mutt/applying-patches.txt
+share/doc/mutt/configuration.html
+share/doc/mutt/devel-notes.txt
+share/doc/mutt/gettingstarted.html
+share/doc/mutt/index.html
+share/doc/mutt/intro.html
+share/doc/mutt/keybase/LICENSE
+share/doc/mutt/keybase/README.md
+share/doc/mutt/keybase/attachmentView.png
+share/doc/mutt/keybase/decrypt.sh
+share/doc/mutt/keybase/install.sh
+share/doc/mutt/keybase/keybase.py
+share/doc/mutt/keybase/muttrc
+share/doc/mutt/keybase/pagerMode.png
+share/doc/mutt/keybase/pgpdecrypt.sh
+share/doc/mutt/keybase/pgpverify.sh
+share/doc/mutt/keybase/verify.sh
+share/doc/mutt/manual.html
+share/doc/mutt/manual.txt
+share/doc/mutt/mimesupport.html
+share/doc/mutt/miscellany.html
+share/doc/mutt/muttrc.attach-headers-color
+share/doc/mutt/muttrc.compress
+share/doc/mutt/muttrc.cond-date
+share/doc/mutt/muttrc.encrypt-to-self
+share/doc/mutt/muttrc.forgotten-attachment
+share/doc/mutt/muttrc.ifdef
+share/doc/mutt/muttrc.index-color
+share/doc/mutt/muttrc.initials
+share/doc/mutt/muttrc.keywords
+share/doc/mutt/muttrc.limit-current-thread
+share/doc/mutt/muttrc.nested-if
+share/doc/mutt/muttrc.new-mail
+share/doc/mutt/muttrc.nntp
+share/doc/mutt/muttrc.notmuch
+share/doc/mutt/muttrc.progress
+share/doc/mutt/muttrc.quasi-delete
+share/doc/mutt/muttrc.reply-with-xorig
+share/doc/mutt/muttrc.sidebar
+share/doc/mutt/muttrc.skip-quoted
+share/doc/mutt/muttrc.status-color
+share/doc/mutt/muttrc.timeout
+share/doc/mutt/neomutt-syntax.vim
+share/doc/mutt/optionalfeatures.html
+share/doc/mutt/patch-notes.txt
+share/doc/mutt/reference.html
+share/doc/mutt/samples/Mush.rc
+share/doc/mutt/samples/Pine.rc
+share/doc/mutt/samples/Tin.rc
+share/doc/mutt/samples/ca-bundle.crt
+share/doc/mutt/samples/colors.default
+share/doc/mutt/samples/colors.linux
+share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
+share/doc/mutt/samples/mutt_xtitle
+share/doc/mutt/samples/pgp2.rc
+share/doc/mutt/samples/pgp5.rc
+share/doc/mutt/samples/pgp6.rc
+share/doc/mutt/samples/sample.mailcap
+share/doc/mutt/samples/sample.muttrc
+share/doc/mutt/samples/sample.muttrc-sidebar
+share/doc/mutt/samples/sample.muttrc-tlr
+share/doc/mutt/samples/sample.vimrc-sidebar
+share/doc/mutt/samples/smime.rc
+share/doc/mutt/samples/smime_keys_test.pl
+share/doc/mutt/security.html
+share/doc/mutt/smime-notes.txt
+share/doc/mutt/tuning.html
+share/doc/mutt/vim-keybindings/README.md
+share/doc/mutt/vim-keybindings/vim-keybindings.rc
+share/examples/mutt/Muttrc
+share/examples/mutt/Muttrc.dist
+share/examples/mutt/mime.types
+share/examples/mutt/mime.types.dist
+share/locale/bg/LC_MESSAGES/mutt.mo
+share/locale/ca/LC_MESSAGES/mutt.mo
+share/locale/cs/LC_MESSAGES/mutt.mo
+share/locale/da/LC_MESSAGES/mutt.mo
+share/locale/de/LC_MESSAGES/mutt.mo
+share/locale/el/LC_MESSAGES/mutt.mo
+share/locale/eo/LC_MESSAGES/mutt.mo
+share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/et/LC_MESSAGES/mutt.mo
+share/locale/eu/LC_MESSAGES/mutt.mo
+share/locale/fr/LC_MESSAGES/mutt.mo
+share/locale/ga/LC_MESSAGES/mutt.mo
+share/locale/gl/LC_MESSAGES/mutt.mo
+share/locale/hu/LC_MESSAGES/mutt.mo
+share/locale/id/LC_MESSAGES/mutt.mo
+share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/ja/LC_MESSAGES/mutt.mo
+share/locale/ko/LC_MESSAGES/mutt.mo
+share/locale/lt/LC_MESSAGES/mutt.mo
+share/locale/nl/LC_MESSAGES/mutt.mo
+share/locale/pl/LC_MESSAGES/mutt.mo
+share/locale/pt_BR/LC_MESSAGES/mutt.mo
+share/locale/ru/LC_MESSAGES/mutt.mo
+share/locale/sk/LC_MESSAGES/mutt.mo
+share/locale/sv/LC_MESSAGES/mutt.mo
+share/locale/tr/LC_MESSAGES/mutt.mo
+share/locale/uk/LC_MESSAGES/mutt.mo
+share/locale/zh_CN/LC_MESSAGES/mutt.mo
+share/locale/zh_TW/LC_MESSAGES/mutt.mo
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index ed1a89669df..0692475c71d 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2016/09/10 20:32:01 wiz Exp $
+$NetBSD: distinfo,v 1.8 2016/09/18 21:47:27 wiz Exp $
 
-SHA1 (neomutt-20160910.tar.gz) = a7aa7f8c01daa0cdd02a35d96fad83c77aecf4bf
-RMD160 (neomutt-20160910.tar.gz) = f5a7d0c3d224ae9eeaa29a4bb9aa9b88d224258b
-SHA512 (neomutt-20160910.tar.gz) = 93eacf7737a9a9b5614a605057b8d1160518feb55fa66240fcbeb4ef7bb380c127fe3780694e50900b72483efdd4982094b1a90bdfe765352b113d6eb152c480
-Size (neomutt-20160910.tar.gz) = 2638853 bytes
+SHA1 (neomutt-20160916.tar.gz) = 3222d7873ad2545427471930ec053b331ae8e6fc
+RMD160 (neomutt-20160916.tar.gz) = 62936218dc4c24643553e4f5dc9a714d90d46aee
+SHA512 (neomutt-20160916.tar.gz) = a152be0bffa623b9a56ef2bbfd7b95f9a12df89030323cc77dce4c7f9cd5a7fb29a831e928859d0c7bd1e6d61df33c1b0e6ed53d38808bec7000ea61b88c2cf6
+Size (neomutt-20160916.tar.gz) = 2652099 bytes