Updated neomutt to 20170113.

2017-01-13  Richard Russon  <rich@flatcap.org>
* Features
  - Allow custom status flags in index_format
  - $from_chars highlights differences in authorship
  - notmuch: make 'Folder' and 'Tags' respect (un)ignore
  - notmuch: add "virtual-unmailboxes" command
* Bug Fixes
  - pick smarter default for $sidebar_divider_char
  - status color breaks "mutt -D"
  - Enable reconstruct-thread in the pager
  - manually touch 'atime' when reading a mbox file
  - allow $to_chars to contain Unicode characters
  - increase the max lmdb database size
  - restore limit current thread
  - don't reset the alarm unless we set it
  - some more places that may get NULL pointers
  - rework initials to allow unicode characters
* Translations
  - Spanish translation
  - German translation
* Docs
  - Improve whitespace and grammar on the NNTP feature page
  - make $to_chars docs more legible
  - de-tab the DocBook
  - fix 301 redirects
* Build
  - New configure option --enable-everything
  - add a constant for an aborted question
  - enhance mutt_to_base64() (and callers)
  - Fix configure.ac to require md5 if hcache is enabled
  - Bail if a selected hcache backend cannot be found
  - refactor mutt_matches_ignore
  - fix hcache + make dist
  - add unicode string helper function
  - Re-indent configure.ac
  - generate devel version suffix
  - fix check_sec.sh warnings
  - remove unnecessary #ifdef's
  - add missing #ifdef for nntp
  - ignore some configure temp files
  - fix "make dist" target
  - fix function prototypes
  - fix coverity warnings
  - notmuch: drop strndup, replace with mutt_substrdup
* Upstream
  - Fix failure with GPGME 1.8: do not steal the gpgme_ prefix.
  - search muttrc file according to XDG Base Specification (closes #3207)
  - Improve openssl interactive_check_cert. (closes #3899)
  - Add mutt_array_size macro, change interactive_check_cert() to use it. (see #3899)
  - Return to pager upon aborting a jump operation. (closes #3901)
  - Change sidebar_spoolfile coloring to be lower precedence.
  - Move '@' pattern modifier documentation to the right section.
  - Add setenv/unsetenv commands.
  - Rework OpenSSL certificate verification to support alternative chains. (closes #3903)
  - Add option to control whether threads uncollapse when new mail arrives.
  - In the manual, replaced 2 para by example (similar to the first example).
  - Create mbchar_table type for multibyte character arrays. (see #3024)
  - Make to_chars and status_chars accept mulitibyte characters. (closes #3024)

3 files changed, 9 insertions, 10 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index a56a3f28ed7..90ec392d509 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2016/11/28 12:26:03 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/01/17 12:32:42 wiz Exp $
 
-DISTNAME=		neomutt-20161126
+DISTNAME=		neomutt-20170113
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${DISTNAME}
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index 77bf5fe56ea..4c36520586b 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2016/11/28 12:26:03 wiz Exp $
+$NetBSD: distinfo,v 1.16 2017/01/17 12:32:42 wiz Exp $
 
-SHA1 (neomutt-20161126.tar.gz) = 3776d4c64464daa4aec78f1cec549ff11b41ae9c
-RMD160 (neomutt-20161126.tar.gz) = 8da644045621fdcde19cd1277ac6e9501797339b
-SHA512 (neomutt-20161126.tar.gz) = 362e66739c07e9f3677fffe6150cc4254ee47dd1dceb95efb96caa40aab6339c48c2ffc3ef251d0e999ad298b61dff794d5c2aee4c6811df8f2f66f85f49dc0e
-Size (neomutt-20161126.tar.gz) = 2738930 bytes
+SHA1 (neomutt-20170113.tar.gz) = 18072b12683e6932471abe1a06b66d6fb32dc988
+RMD160 (neomutt-20170113.tar.gz) = b46b5be6101b59f9f1d4e713fa4d5c9094e6fc21
+SHA512 (neomutt-20170113.tar.gz) = bd2fc79f441f044acca011155f0bfaa7d26630261a16711193a2ad6c85262220c625216e39eb98983485459541c8af24ebf023a3589eae863dd154475e976824
+Size (neomutt-20170113.tar.gz) = 2751855 bytes
diff --git a/mail/neomutt/options.mk b/mail/neomutt/options.mk
index 7ac9e7c5f6f..2b3bb9b30f9 100644
--- a/mail/neomutt/options.mk
+++ b/mail/neomutt/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/10/04 21:52:36 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2017/01/17 12:32:42 wiz Exp $
 
 # Global and legacy options
 
@@ -96,7 +96,6 @@ CONFIGURE_ARGS+=	--disable-smime
 .if !empty(PKG_OPTIONS:Mmutt-hcache)
 .  if !empty(PKG_OPTIONS:Mtokyocabinet)
 .  include "../../databases/tokyocabinet/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-hcache
 CONFIGURE_ARGS+=	--with-tokyocabinet
 CONFIGURE_ARGS+=	--without-gdbm
 CONFIGURE_ARGS+=	--without-bdb
@@ -104,7 +103,7 @@ CONFIGURE_ARGS+=	--without-bdb
 BDB_ACCEPTED=		db4 db5
 BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 .  include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-hcache
+CONFIGURE_ARGS+=	--with-bdb
 CONFIGURE_ARGS+=	--without-gdbm
 # BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate
 # since the real -I and -L flags are added by buildlink already.