neomutt: update to 20171027.

neomutt is now called 'neomutt' instead of 'mutt'. Remove conflict
with mutt.

2017-10-27  Richard Russon  <rich@flatcap.org>
* Bug Fixes
  - variable type when using fread
  - prevent timezone overflow
  - tags: Show fake header for all backends
  - notmuch: virtual-mailboxes should accept a limit
  - Issue 888: Fix imap mailbox flag logging
  - fix actions on tagged messages
  - call the folder-hook before saving to $record
  - Fix smart wrap in pager without breaking header
  - Add polling for the IDLE command
* Docs
  - imap/notmuch tags: Add some documentation
  - English and other cleanups
  - compressed and nntp features are now always built
* Website
  - Update Arch instructions
* Build
  - Fix update-po
  - Fix neomutt.pot location, remove from git
  - Allow to specify --docdir at configure time
  - Generate neomuttrc even if configured with --disable-doc
  - Let autosetup define PWD, do not unnecessarily try to create hcache dir
  - Use bundled wcscasecmp if an implementation is not found in libc
  - Use host compiler to build the documentation
  - Update autosetup to latest master branch
  - autosetup: delete makedoc on 'make clean'
  - Fixes for endianness detection
  - Update autosetup to latest master branch
  - Do not use CPPFLAGS / CFLAGS together with CC_FOR_BUILD
  - --enable-everything includes lua
  - autosetup: check for sys_siglist[]
* Code
  - move functions to library
  - lib: move MIN/MAX macros
  - simplify null checks
  - kill preproc expansion laziness
  - reduce scope of variables
  - merge: minor code cleanups
  - split up 'if' statements that assign and test
  - Refactor: Remove unused return type
  - Bool: change functions in mx.h
  - bool: convert function parameters in nntp.h
  - add extra checks to mutt_pattern_exec()
  - Use safe_calloc to initialize memory, simplify size_t overflow check
  - Move mutt_rename_file to lib/file.[hc]
  - doxygen: fix a few warnings
  - minor code fixes
  - use mutt_array_size()
  - refactor out O_NOFOLLOW
  - initialise variables
  - lib: move List and Queue into library
  - url: make notmuch query string parser generic
  - Wrap dirname(3) inside a mutt_dirname() function

2017-10-13  Richard Russon  <rich@flatcap.org>
* Bug Fixes
  - crash using uncolor
  - Sort the folders list when browsing an IMAP server
  - Prefer a helpful error message over a BEEP
* Build
  - Do not fail if deflate is not in libz
  - Support EXTRA_CFLAGS and EXTRA_LDFLAGS, kill unused variable

2017-10-06  Richard Russon  <rich@flatcap.org>
* Features
  - Add IMAP keywords support
* Bug Fixes
  - set mbox_type
  - %{fmt} date format
  - Fix off-by-one buffer overflow in add_index_color
  - crash in mbox_to_udomain
  - crash in mutt_substrdup
  - crash looking up mime body type
  - digest_collapse was broken
  - crash using notmuch expando with imap
  - imap: Fix mx.mbox leak in imap_get_parent_path
  - overflow in mutt_mktime()
  - add more range-checking on dates/times
  - Remove spurious error message
  - Unsubscribe after deleting an imap folder
  - Do not pop from MuttrcStack what wasn't pushed
* Docs
  - replace mutt refs with neomutt
  - drop old vim syntax file
* Code
  - convert functions to use 'bool'
  - convert structs to use STAILQ
* Build
  - Autosetup-based configuration
  - drop upstream mutt references
  - rename everything 'mutt' to 'neomutt'
  - move helper programs to lib dir
  - rename regexp to regex
  - expand buffers to avoid gcc7 warnings
* Upstream
  - Remove \Seen flag setting for imap trash
  - Change imap copy/save and trash to sync flags, excluding deleted
  - Improve imap fetch handler to accept an initial UID
  - Display an error message when delete mailbox fails
  - Updated French translation
  - Fix imap sync segfault due to inactive headers during an expunge
  - Close the imap socket for the selected mailbox on error
  - Add missing IMAP_CMD_POLL flag in imap buffy check
  - Change maildir and mh check_mailbox to use dynamic sized hash
  - Fix uses of context->changed as a counter
  - Make cmd_parse_fetch() more precise about setting reopen/check flags
  - Enable $reply_self for group-reply, even with $metoo unset

3 files changed, 107 insertions, 113 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index e0dbde680f7..93b30519ddf 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2017/10/10 08:19:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2017/11/13 11:57:11 wiz Exp $
 
-DISTNAME=		neomutt-20170912
-PKGREVISION=		1
+DISTNAME=		neomutt-20171027
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${DISTNAME}
@@ -11,8 +10,6 @@ HOMEPAGE=		https://www.neomutt.org/
 COMMENT=		Fork of mutt with integrated community patches
 LICENSE=		gnu-gpl-v2 OR gnu-gpl-v3 # or newer
 
-CONFLICTS+=		mutt-[0-9]*
-
 USE_TOOLS+=		autoconf automake autoreconf msgfmt gmake
 
 BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
@@ -22,11 +19,10 @@ EXTRACT_USING=		bsdtar
 CONFIGURE_ARGS+=	--enable-notmuch
 #CONFIGURE_ARGS+=	CFLAGS="-g -O0"
 
-EGDIR=			${PREFIX}/share/examples/mutt
-CONF_FILES=		${EGDIR}/Muttrc ${PKG_SYSCONFDIR}/Muttrc
-CONF_FILES+=		${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types
-INSTALLATION_DIRS+=     ${EGDIR}
-INSTALL_MAKE_FLAGS=     ${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR}
+EGDIR=			${PREFIX}/share/examples/neomutt
+CONF_FILES=		${EGDIR}/neomuttrc ${PKG_SYSCONFDIR}/neomuttrc
+INSTALLATION_DIRS+=	${EGDIR}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} DOTLOCK_GROUP= sysconfdir=${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
index 236e1191536..be2ab8bb171 100644
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@@ -1,98 +1,96 @@
-@comment $NetBSD: PLIST,v 1.13 2017/09/07 14:10:01 wiz Exp $
-bin/mutt
-bin/pgpewrap
-bin/pgpring
-bin/smime_keys
-man/man1/mutt.1
-man/man1/pgpewrap.1
-man/man1/pgpring.1
-man/man1/smime_keys.1
-man/man5/mbox.5
-man/man5/mmdf.5
-man/man5/muttrc.5
-share/doc/mutt/CODE_OF_CONDUCT.md
-share/doc/mutt/COPYRIGHT
-share/doc/mutt/ChangeLog.md
-share/doc/mutt/INSTALL
-share/doc/mutt/LICENSE.md
-share/doc/mutt/PGP-Notes.txt
-share/doc/mutt/README.SSL
-share/doc/mutt/README.md
-share/doc/mutt/colorschemes/neonwolf-256.muttrc
-share/doc/mutt/colorschemes/solarized-dark-256.muttrc
-share/doc/mutt/colorschemes/vombatidae.mutt
-share/doc/mutt/colorschemes/zenburn.muttrc
-share/doc/mutt/hcache-bench/README.md
-share/doc/mutt/hcache-bench/muttrc
-share/doc/mutt/hcache-bench/neomutt-hcache-bench.sh
-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/logo/mutt-128.png
-share/doc/mutt/logo/mutt-256.png
-share/doc/mutt/logo/mutt-32.png
-share/doc/mutt/logo/mutt-64.png
-share/doc/mutt/logo/mutt.svg
-share/doc/mutt/lua/test_lua-api_runner.muttrc
-share/doc/mutt/lua/test_lua-api_spec.lua
-share/doc/mutt/manual.txt
-share/doc/mutt/neomutt-syntax.vim
-share/doc/mutt/samples/Mush.rc
-share/doc/mutt/samples/Pine.rc
-share/doc/mutt/samples/Tin.rc
-share/doc/mutt/samples/colors.default
-share/doc/mutt/samples/colors.linux
-share/doc/mutt/samples/gpg.rc
-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-tlr
-share/doc/mutt/samples/smime.rc
-share/doc/mutt/samples/smime_keys_test.pl
-share/doc/mutt/smime-notes.txt
-share/doc/mutt/vim-keys/README.md
-share/doc/mutt/vim-keys/vim-keys.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/en_GB/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
+@comment $NetBSD: PLIST,v 1.14 2017/11/13 11:57:11 wiz Exp $
+bin/neomutt
+lib/neomutt/pgpewrap
+lib/neomutt/pgpring
+lib/neomutt/smime_keys
+man/man1/neomutt.1
+man/man1/pgpewrap_neomutt.1
+man/man1/pgpring_neomutt.1
+man/man1/smime_keys_neomutt.1
+man/man5/mbox_neomutt.5
+man/man5/mmdf_neomutt.5
+man/man5/neomuttrc.5
+share/doc/neomutt/CODE_OF_CONDUCT.md
+share/doc/neomutt/COPYRIGHT
+share/doc/neomutt/ChangeLog.md
+share/doc/neomutt/INSTALL
+share/doc/neomutt/LICENSE.md
+share/doc/neomutt/PGP-Notes.txt
+share/doc/neomutt/README.SSL
+share/doc/neomutt/README.md
+share/doc/neomutt/colorschemes/neonwolf-256.neomuttrc
+share/doc/neomutt/colorschemes/solarized-dark-256.neomuttrc
+share/doc/neomutt/colorschemes/vombatidae.neomuttrc
+share/doc/neomutt/colorschemes/zenburn.neomuttrc
+share/doc/neomutt/hcache-bench/README.md
+share/doc/neomutt/hcache-bench/neomutt-hcache-bench.sh
+share/doc/neomutt/hcache-bench/neomuttrc
+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/neomuttrc
+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/logo/neomutt-128.png
+share/doc/neomutt/logo/neomutt-256.png
+share/doc/neomutt/logo/neomutt-32.png
+share/doc/neomutt/logo/neomutt-64.png
+share/doc/neomutt/logo/neomutt.svg
+share/doc/neomutt/lua/test_lua-api_runner.neomuttrc
+share/doc/neomutt/lua/test_lua-api_spec.lua
+share/doc/neomutt/manual.txt
+share/doc/neomutt/mime.types
+share/doc/neomutt/neomutt-syntax.vim
+share/doc/neomutt/samples/Mush.rc
+share/doc/neomutt/samples/Pine.rc
+share/doc/neomutt/samples/Tin.rc
+share/doc/neomutt/samples/colors.default
+share/doc/neomutt/samples/colors.linux
+share/doc/neomutt/samples/gpg.rc
+share/doc/neomutt/samples/pgp2.rc
+share/doc/neomutt/samples/pgp5.rc
+share/doc/neomutt/samples/pgp6.rc
+share/doc/neomutt/samples/sample.mailcap
+share/doc/neomutt/samples/sample.neomuttrc
+share/doc/neomutt/samples/sample.neomuttrc-tlr
+share/doc/neomutt/samples/smime.rc
+share/doc/neomutt/samples/smime_keys_test.pl
+share/doc/neomutt/smime-notes.txt
+share/doc/neomutt/vim-keys/README.md
+share/doc/neomutt/vim-keys/vim-keys.rc
+share/examples/neomutt/neomuttrc
+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/en_GB/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
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 01b1c57e386..9ac3c41ab45 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.27 2017/09/13 14:56:14 wiz Exp $
+$NetBSD: distinfo,v 1.28 2017/11/13 11:57:11 wiz Exp $
 
-SHA1 (neomutt-20170912.tar.gz) = acbb1debcb70a74a67d04654bd8379cb9728bb3f
-RMD160 (neomutt-20170912.tar.gz) = 77e4035991503f9fe33e6bf54b7843cfc98edecc
-SHA512 (neomutt-20170912.tar.gz) = 7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6
-Size (neomutt-20170912.tar.gz) = 2533245 bytes
+SHA1 (neomutt-20171027.tar.gz) = f9c38564709038e1ad17d1e8f01c9e110ddc8619
+RMD160 (neomutt-20171027.tar.gz) = 63cfb70f4bf5e82643dd509d73c9d4591fb8e363
+SHA512 (neomutt-20171027.tar.gz) = e2df0d20c0729abb32d1614c94c08cca0cecad1cb36a380f8210e2df3e353ffc08f66abf1e5e3a1cf4a746437d59c15262ce05ab1a820561466bf7e3a5d6b894
+Size (neomutt-20171027.tar.gz) = 2682699 bytes