Updated neomutt to 20160910.

2016-09-10  Richard Russon  <rich@flatcap.org>
* New Features
  - Colouring Attachments with Regexp
    Guillaume Brogi
  - PGP Encrypt to Self
    Guillaume Brogi
  - Sensible Browser
    Pierre-Elliott Bécue
  - Reply using X-Original-To: header
    Pierre-Elliott Bécue
  - Purge Thread
    Darshit Shah
  - Forgotten attachment
    Darshit Shah
  - Add sidebar_ordinary color
* Bug Fixes
  - align the nntp code with mutt
    Fabian Groffen
  - check for new mail while in pager when idle
    Stefan Assmann
  - Allow the user to interrupt slow IO operations
    Antonio Radici
  - keywords: check there are emails to tag
  - fix duplicate saved messages
  - flatten contrib/keybase dir to fix install
  - restore the pager keymapping 'i' to exit
  - proposed fix for clearing labels
  - notmuch: sync vfolder_format to folder_format
* Docs
  - Update List of Features and Authors
* Build
  - fix configure check for fmemopen
  - use fixed version strings
* Upstream
  - Increase date buffer size for $folder_format.
  - Disable ~X when message scoring.
  - Fix pgpring reporting of DSA and Elgamal key lengths.
  - Stub out getdnsdomainname() unless HAVE_GETADDRINFO.
  - Autoconf: always check for getaddrinfo().
  - Add missing sidebar contrib sample files to dist tarball.

5 files changed, 13 insertions, 112 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index e0762fe44da..69651f03360 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/09/09 06:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2016/09/10 20:32:01 wiz Exp $
 
-DISTNAME=		neomutt-20160827
-PKGREVISION=		1
+DISTNAME=		neomutt-20160910
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${DISTNAME}
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
index 12d9a5776e5..7eee26de2b8 100644
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/09/04 20:53:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/09/10 20:32:01 wiz Exp $
 bin/mutt
 bin/mutt_dotlock
 bin/pgpewrap
@@ -32,15 +32,14 @@ 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/KeybaseAndMutt.md
 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/images/attachmentView.png
-share/doc/neomutt/keybase/images/pagerMode.png
 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
@@ -80,9 +79,12 @@ 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
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index d3e4d0cfd06..ed1a89669df 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.6 2016/09/08 21:56:49 wiz Exp $
+$NetBSD: distinfo,v 1.7 2016/09/10 20:32:01 wiz Exp $
 
-SHA1 (neomutt-20160827.tar.gz) = 12964dc21b55ff84c0e4987a15d86c2f2c4c5b4a
-RMD160 (neomutt-20160827.tar.gz) = 62268ba46965a9684820d407d4ba15e76fbc31ca
-SHA512 (neomutt-20160827.tar.gz) = e7c654febe48c31441280ce28b121a9363869dd3dce966f47f1d9faa4557c86cfb350fa48d71b1a00eeab19d4c0f72d43e32b3008e25f863c9c1d795d8f7ec94
-Size (neomutt-20160827.tar.gz) = 2629013 bytes
-SHA1 (patch-handler.c) = 79ccd9cb11fa78a22091ca67d7e77e00f87730a1
-SHA1 (patch-pattern.c) = f3dd6591d24a5b7bc89aa9c045552d44013e0921
+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
diff --git a/mail/neomutt/patches/patch-handler.c b/mail/neomutt/patches/patch-handler.c
deleted file mode 100644
index e2e3faf6bb2..00000000000
--- a/mail/neomutt/patches/patch-handler.c
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-handler.c,v 1.1 2016/09/08 21:56:49 wiz Exp $
-
---- handler.c.orig	2016-08-27 00:03:28.000000000 +0000
-+++ handler.c
-@@ -1596,7 +1596,7 @@ static int run_decode_and_handler (BODY 
-   int origType;
-   char *savePrefix = NULL;
-   FILE *fp = NULL;
--#ifndef USE_FMEMOPEN
-+#ifndef HAVE_OPEN_MEMSTREAM
-   char tempfile[_POSIX_PATH_MAX];
- #endif
-   size_t tmplength = 0;
-@@ -1606,7 +1606,7 @@ static int run_decode_and_handler (BODY 
- 
-   fseeko (s->fpin, b->offset, 0);
- 
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-   char *temp;
-   size_t tempsize;
- #endif
-@@ -1626,7 +1626,7 @@ static int run_decode_and_handler (BODY 
-     {
-       /* decode to a tempfile, saving the original destination */
-       fp = s->fpout;
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-      s->fpout = open_memstream (&temp, &tempsize);
-      if (!s->fpout) {
-        mutt_error _("Unable to open memory stream!");
-@@ -1670,7 +1670,7 @@ static int run_decode_and_handler (BODY 
-       /* restore final destination and substitute the tempfile for input */
-       s->fpout = fp;
-       fp = s->fpin;
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-       if (tempsize) {
-         s->fpin = fmemopen (temp, tempsize, "r");
-       } else { /* fmemopen cannot handle zero-length buffers */
-@@ -1708,7 +1708,7 @@ static int run_decode_and_handler (BODY 
- 
-       /* restore the original source stream */
-       safe_fclose (&s->fpin);
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-       if (tempsize)
-         FREE(&temp);
- #endif
diff --git a/mail/neomutt/patches/patch-pattern.c b/mail/neomutt/patches/patch-pattern.c
deleted file mode 100644
index 032df64ead9..00000000000
--- a/mail/neomutt/patches/patch-pattern.c
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-pattern.c,v 1.1 2016/09/08 21:56:49 wiz Exp $
-
---- pattern.c.orig	2016-08-27 00:03:28.000000000 +0000
-+++ pattern.c
-@@ -162,7 +162,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
-   HEADER *h = ctx->hdrs[msgno];
-   char *buf;
-   size_t blen;
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-   char *temp;
-   size_t tempsize;
- #else
-@@ -178,7 +178,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
-       memset (&s, 0, sizeof (s));
-       s.fpin = msg->fp;
-       s.flags = MUTT_CHARCONV;
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-       s.fpout = open_memstream (&temp, &tempsize);
-       if (!s.fpout) {
- 	mutt_perror ("Error opening memstream");
-@@ -207,7 +207,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
- 	  if (s.fpout)
- 	  {
- 	    safe_fclose (&s.fpout);
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-             FREE(&temp);
- #else
- 	    unlink (tempfile);
-@@ -220,7 +220,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
- 	mutt_body_handler (h->content, &s);
-       }
- 
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-       fclose (s.fpout);
-       lng = tempsize;
- 
-@@ -290,7 +290,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
-     if (option (OPTTHOROUGHSRC))
-     {
-       safe_fclose (&fp);
--#ifdef USE_FMEMOPEN
-+#ifdef HAVE_OPEN_MEMSTREAM
-       if (tempsize)
-         FREE(&temp);
- #else