Updated neomutt to 20170714.

2017-07-14  Richard Russon  <rich@flatcap.org>
* Translations
  - Update German translation
* Docs
  - compile-time output: use two lists
  - doxygen: add config file
  - doxygen: tidy existing comments
* Build
  - fix hcachever.sh script
* Upstream
  - Fix crash when $postponed is on another server.

2017-07-07  Richard Russon  <rich@flatcap.org>
* Features
  - Support Gmail's X-GM-RAW server-side search
  - Include pattern for broken threads
  - Allow sourcing of multiple files
* Contrib
  - vombatidae colorscheme
  - zenburn colorscheme
  - black 256 solarized colorscheme
  - neonwolf colorscheme
  - Mutt logos
* Bug Fixes
  - flags: update the hdr message last
  - gpgme S/MIME non-detached signature handling
  - menu: the thread tree color
  - Uses CurrentFolder to populate LastDir with IMAP
  - stabilise sidebar sort order
  - colour emails with a '+' in them
  - the padding expando '%>'
  - Do not set old flag if mark_old is false
  - maildir creation
  - Decode CRLF line endings to LF when copying headers
  - score address pattern do not match personal name
  - open attachments in read-only mode
  - Add Cc, In-Reply-To, and References to default mailto_allow
  - Improve search for mime.types
* Translations
  - Update Chinese (Simplified) translation
* Coverity defects
  - dodgy buffers
  - leaks in lua get/set options
  - some resource leaks
* Docs
  - update credits
  - limitations of new-mail %f expando
  - escape <>'s in nested conditions
  - add code of conduct
  - fix ifdef examples
  - update mailmap
  - Update modify-labels-then-hide
  - fix mailmap
  - drop UPDATING files
* Website
  - Changes pages (diff)
  - Update Arch distro page
  - Update NixOS distro page
  - Add new Exherbo distro page
  - Update translation hi-score table
  - Update code of conduct
  - Update Newbies page
  - Add page about Rebuilding the Documentation
  - Add page of hard problems
* Build
  - remove unnecessary steps
  - drop instdoc script
  - move smime_keys into contrib
  - fixes for Solaris
  - don't delete non-existent files
  - remove another reference to devel-notes.txt
  - Handle native Solaris GSSAPI.
  - drop configure options --enable-exact-address
  - drop configure option --with-exec-shell
  - drop configure option --enable-nfs-fix
  - drop configure option --disable-warnings
  - Completely remove dotlock
  - More sophisticated check for BDB version + support for DB6 (non default)
* Tidy
  - drop VirtIncoming
  - split mutt_parse_mailboxes into mutt_parse_unmailboxes
  - tidy some buffy code
  - tidy the version strings
* Upstream
  - Add ~<() and ~>() immediate parent/children patterns
  - Add L10N comments to the GNUTLS certificate prompt
  - Add more description for the %S and %Z $index_format characters
  - Add config vars for forwarded message attribution intro/trailer
  - Block SIGWINCH during connect()
  - Improve the L10N comment about Sign as
  - Auto-pad translation for the GPGME key selection "verify key" headers
  - Enable all header fields in the compose menu to be translated
  - Force hard redraw after $sendmail instead of calling mutt_endwin
  - Make GPGME key selection behavior the same as classic-PGP
  - Rename 'sign as' to 'Sign as'; makes compose menu more consistent
  - Change the compose menu fields to be dynamically padded

8 files changed, 22 insertions, 79 deletions

diff --git a/mail/neomutt/Makefile b/mail/neomutt/Makefile
index 27e73cd09b5..990d1b0d71a 100644
--- a/mail/neomutt/Makefile
+++ b/mail/neomutt/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2017/06/21 07:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2017/07/18 18:39:37 wiz Exp $
 
-DISTNAME=		neomutt-20170609
+DISTNAME=		neomutt-20170714
 CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_GITHUB:=neomutt/}
 GITHUB_TAG=		${DISTNAME}
@@ -15,6 +15,7 @@ USE_TOOLS+=		autoconf automake autoreconf msgfmt gmake
 BUILD_DEPENDS+=		gettext-tools-[0-9]*:../../devel/gettext-tools
 
 GNU_CONFIGURE=		yes
+EXTRACT_USING=		bsdtar
 CONFIGURE_ARGS+=	--enable-notmuch
 #CONFIGURE_ARGS+=	CFLAGS="-g -O0"
 
diff --git a/mail/neomutt/PLIST b/mail/neomutt/PLIST
index 66181ef33c2..d20a0049a58 100644
--- a/mail/neomutt/PLIST
+++ b/mail/neomutt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2017/06/24 21:17:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/07/18 18:39:37 wiz Exp $
 bin/mutt
 bin/pgpewrap
 bin/pgpring
@@ -10,14 +10,18 @@ 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
-share/doc/mutt/ChangeLog.neomutt
+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
@@ -32,6 +36,11 @@ 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
diff --git a/mail/neomutt/distinfo b/mail/neomutt/distinfo
index f1ef0a9a8be..7b16c6f4833 100644
--- a/mail/neomutt/distinfo
+++ b/mail/neomutt/distinfo
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.24 2017/06/30 11:07:26 jperkin Exp $
+$NetBSD: distinfo,v 1.25 2017/07/18 18:39:37 wiz Exp $
 
-SHA1 (neomutt-20170609.tar.gz) = fd0e07e95c4a5dc6b21df02ea1c0355acf1fcc17
-RMD160 (neomutt-20170609.tar.gz) = 3b2b696bd48e6a0b846c20b6621fe92dd996d6b3
-SHA512 (neomutt-20170609.tar.gz) = e5ced8e2d5890e828a1603a0c1c8072bbb84499e87b45b55029b4644e6b70efb0ece00f600d9a942cb033a7b62d6b60a91ef17523fb34e8ef3d3abbe35905c9e
-Size (neomutt-20170609.tar.gz) = 2637349 bytes
-SHA1 (patch-configure.ac) = e11fc46e1baad716022954e08556c213544201f5
-SHA1 (patch-m4_gssapi.m4) = 9198e221e8dbed2633fcd45a53167cd19547ad65
-SHA1 (patch-mutt__sasl.h) = e41ebdd0e2f64811da61ef4530dd44d67bc836f2
-SHA1 (patch-resize.c) = d8cf215e23b20ba46361b1edd3fbcc316abb1516
+SHA1 (neomutt-20170714.tar.gz) = d2495ac056f2c17b5848316672a94348711e3f8f
+RMD160 (neomutt-20170714.tar.gz) = 246d2efea56cbe27e6246afe7f0428a748012c69
+SHA512 (neomutt-20170714.tar.gz) = eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0
+Size (neomutt-20170714.tar.gz) = 2509160 bytes
diff --git a/mail/neomutt/options.mk b/mail/neomutt/options.mk
index 72a21df43fa..5fdd5ccca8e 100644
--- a/mail/neomutt/options.mk
+++ b/mail/neomutt/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2017/06/30 10:53:22 jperkin Exp $
+# $NetBSD: options.mk,v 1.9 2017/07/18 18:39:37 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.neomutt
 PKG_OPTIONS_REQUIRED_GROUPS=	display
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--without-ssl
 PLIST_VARS+=		smime
 .if !empty(PKG_OPTIONS:Msmime)
 USE_TOOLS+=		perl:run
-REPLACE_PERL+=		*.pl */*.pl
+REPLACE_PERL+=		*.pl */*.pl contrib/smime_keys
 .  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-smime
 PLIST.smime=		yes
diff --git a/mail/neomutt/patches/patch-configure.ac b/mail/neomutt/patches/patch-configure.ac
deleted file mode 100644
index 1e3b0961ec8..00000000000
--- a/mail/neomutt/patches/patch-configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2017/06/30 10:58:18 wiz Exp $
-
-Handle native Solaris GSSAPI.
-https://github.com/neomutt/neomutt/pull/660
-
---- configure.ac.orig	2017-06-09 10:52:07.000000000 +0000
-+++ configure.ac
-@@ -494,7 +494,7 @@ if test "$gss_prefix" != "no"; then
- 		AC_CACHE_SAVE
- 		AC_MSG_RESULT([GSSAPI libraries not found])
- 	fi
--	if test "$GSSAPI_IMPL" = "Heimdal"; then
-+	if test "$GSSAPI_IMPL" = "Heimdal" || test "$GSSAPI_IMPL" = "Solaris"; then
- 		AC_DEFINE(HAVE_HEIMDAL,1,[ Define if your GSSAPI implementation is Heimdal ])
- 	fi
- 	CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
diff --git a/mail/neomutt/patches/patch-m4_gssapi.m4 b/mail/neomutt/patches/patch-m4_gssapi.m4
deleted file mode 100644
index 8aad38000fa..00000000000
--- a/mail/neomutt/patches/patch-m4_gssapi.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-m4_gssapi.m4,v 1.2 2017/06/30 10:58:18 wiz Exp $
-
-Handle native Solaris GSSAPI.
-https://github.com/neomutt/neomutt/pull/660
-
---- m4/gssapi.m4.orig	2017-06-09 10:52:07.000000000 +0000
-+++ m4/gssapi.m4
-@@ -28,6 +28,7 @@ AC_DEFUN([MUTT_AM_PATH_GSSAPI],
-     case "`$KRB5CFGPATH --version`" in
-       "Kerberos 5 "*)	GSSAPI_IMPL="MIT";;
-       ?eimdal*)		GSSAPI_IMPL="Heimdal";;
-+      Solaris*)		GSSAPI_IMPL="Solaris";;
-       *)		GSSAPI_IMPL="Unknown";;
-    esac
-   else
diff --git a/mail/neomutt/patches/patch-mutt__sasl.h b/mail/neomutt/patches/patch-mutt__sasl.h
deleted file mode 100644
index adb9b2545e7..00000000000
--- a/mail/neomutt/patches/patch-mutt__sasl.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-mutt__sasl.h,v 1.1 2017/06/30 11:07:26 jperkin Exp $
-
-Handle include-what-you-use breakage.
-
---- mutt_sasl.h.orig	2017-06-09 10:52:07.000000000 +0000
-+++ mutt_sasl.h
-@@ -23,9 +23,11 @@
- #include <stddef.h>
- #include <sasl/sasl.h>
- 
-+#ifdef HOW_ON_EARTH_IS_THIS_SUPPOSED_TO_WORK_AT_ALL
- typedef struct sasl_conn sasl_conn_t;
- typedef struct sasl_interact  sasl_interact_t;
- typedef unsigned sasl_ssf_t;
-+#endif
- struct Connection;
- 
- int mutt_sasl_client_new(struct Connection *conn, sasl_conn_t **saslconn);
diff --git a/mail/neomutt/patches/patch-resize.c b/mail/neomutt/patches/patch-resize.c
deleted file mode 100644
index 263c4aa3382..00000000000
--- a/mail/neomutt/patches/patch-resize.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-resize.c,v 1.1 2017/06/30 11:07:26 jperkin Exp $
-
-Handle include-what-you-use breakage.
-
---- resize.c.orig	2017-06-09 10:52:07.000000000 +0000
-+++ resize.c
-@@ -19,6 +19,7 @@
- #include <fcntl.h>
- #include <stdbool.h>
- #include <stdlib.h>
-+#include <termios.h>
- #include <unistd.h>
- #include "lib.h"
- #include "mutt_curses.h"