MFH: r530651 r534246 r535833 r536629 r538859 r540343

This updates mail/mutt to 1.14.5

This merges all changes to mail/mutt that have been done to FreeBSD ports
head branch during the 2020Q2 period.  This is needed in order to update
mail/mutt to 1.14.5 in order to fix security issues.

mail/mutt: upgrade 1.13.4 -> 1.13.5

- Bring back vvv quote/initials patches
- Remove NNTP option (XML as well)
- Update default option patches context

PR:		245175
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes:	https://marc.info/?l=mutt-users&m=158542977114051&w=2

mail/mutt: update 1.13.5 -> 1.14.0

- Default DEBUG option
  (very small performance impact and ~4% binary size increase)

PR:		246270
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes:	http://www.mutt.org/relnotes/1.14/

mail/mutt: update 1.14.0 -> 1.14.1

- Rename DEBUG option to DEBUG_LOGS
- Add lang/perl5 deps that triggers a Muttrc rebuild
- Make smime patch optional due to perl build deps.
- Remove unnecessary doc patches and REINPLACE_CMD
- Move build changing patches to make targets
- ASPELL updates the (pre)built Muttrc to not require a rebuild

PR:		246559
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes:	https://marc.info/?l=mutt-users&m=158965668315387&w=2

mail/mutt: Update to 1.14.2

ChangeLog: http://www.mutt.org/

PR:	246731
Submitted by:	dereks@lifeofadishwasher.com (maintainer)

mail/mutt: Update to 1.14.3

- Update to 1.14.3
- Muttrc removed from dist. making perl a BUILD_DEPENDS
- manual.txt removed from dist. making lynx a DOCS_BUILD_DEPENDS
- Remove MASTER_SITES not updated or can't connect

PR:		247266
Submitted by:	Derek Schrock <dereks@lifeofadishwasher.com> (maintainer)
Relnotes:	https://marc.info/?l=mutt-users&m=159217236324614&w=2

mail/mutt: Update to 1.14.5

Update mail/mutt to 1.14.5, this is a security fix release, with fixes for
CVE-2020-14093 and CVE-2020-14954

PR:		247400
Submitted by:	Derek Schrock
Security:	5b397852-b1d0-11ea-a11c-4437e6ad11c4
		29b13a34-b1d2-11ea-a11c-4437e6ad11c4

Approved by:	ports-secteam (joenum)

21 files changed, 109 insertions, 347 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 207c958516bf..46dc166a12b3 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	mutt
-DISTVERSION=	1.13.4
+DISTVERSION=	1.14.5
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \
 		http://www.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv \
 		http://www2.mutt.org.ua/download/mutt-${VVV_PATCH_VERSION}/:vvv
 DIST_SUBDIR=	mutt
@@ -25,7 +23,8 @@ LICENSE=	GPLv2+
 
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:misc/mime-support
 
-USES=		cpe shebangfix ssl
+USES=		cpe perl5 shebangfix ssl
+USE_PERL5=	build
 
 CONFLICTS=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-1.4* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]*
 
@@ -46,10 +45,10 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_SUB=	yes
 
-OPTIONS_DEFINE=	AUTOCRYPT DEBUG DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
+OPTIONS_DEFINE=	AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK FORCEBASE64 GPGME \
 		GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \
-		MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH NNTP \
-		REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
+		MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \
+		REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
 
 OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
 OPTIONS_RADIO=	SPELL
@@ -59,7 +58,7 @@ OPTIONS_SINGLE_HCACHE=	HCACHE_BDB HCACHE_TOKYOCABINET HCACHE_KYOTOCABINET HCACHE
 OPTIONS_SINGLE_SCREEN=	NCURSES SLANG
 
 AUTOCRYPT_DESC=	Convenient End-to-End Encryption
-DEBUG_DESC=	Debugging capabilities
+DEBUG_LOGS_DESC=	Debugging capabilities
 FLOCK_DESC=	flock() usage
 FORCEBASE64_DESC=	Option to force base64 encoding for compose
 GPGME_DESC=	Gpgme interface
@@ -80,15 +79,15 @@ NLS_DESC=	Native language support (implies ICONV)
 QUOTE_PATCH_DESC=	Extended quoting
 REVERSE_REPLY_PATCH_DESC=	Reverse_reply
 SASL_DESC=	SASL authentication
+SMIME_DESC=	SMIME email check option patch
 SLANG_DESC=	SLANG support
 SMART_DATE_DESC=	Dynamic date formatting with "%@"
 SMTP_DESC=	SMTP relay support
 URLVIEW_DESC=	Use urlview for the URL selector menu
-XML_DESC=	Use XML tools for rebuilding documentation
 
-OPTIONS_DEFAULT=	AUTOCRYPT GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
+OPTIONS_DEFAULT=	AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_BDB HTML ICONV IDN \
 		IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NCURSES \
-		NLS REVERSE_REPLY_PATCH SASL SMART_DATE SMTP URLVIEW XML
+		NLS QUOTE_PATCH REVERSE_REPLY_PATCH SASL SMIME SMART_DATE SMTP URLVIEW
 
 .ifmake makesum # for optional distfiles patchfiles
 OPTIONS_OVERRIDE=	${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
@@ -110,7 +109,9 @@ ISPELL_BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 ISPELL_RUN_DEPENDS=	ispell:textproc/aspell-ispell
 URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 
-DEBUG_CONFIGURE_ON=	--enable-debug
+DEBUG_LOGS_CONFIGURE_ON=	--enable-debug
+
+DOCS_BUILD_DEPENDS=	lynx:www/lynx
 
 # Handle ncurses/ncurses-port/slang
 SLANG_CONFIGURE_ON=	--with-slang=${LOCALBASE}
@@ -153,6 +154,8 @@ REVERSE_REPLY_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-reverse_reply
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
 
+SMIME_EXTRA_PATCHES=	${PATCHDIR}/extra-smime-sender
+
 SMART_DATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-smartdate
 
 FLOCK_CONFIGURE_ENABLE=	flock
@@ -173,98 +176,50 @@ GPGME_CONFIGURE_ENABLE=	gpgme
 
 SMTP_CONFIGURE_ENABLE=	smtp
 
+FORCEBASE64_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-forcebase64
+
+MAILDIR_MTIME_PATCH_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-maildir-mtime
+
 GREETING_PATCH_PATCHFILES=	mutt-${GREETING_PATCH_VERSION}.vc.greeting:vc
 
-QUOTE_PATCH_BROKEN=	QUOTE_PATCH broken on 1.13.0
 QUOTE_PATCH_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \
 	patch-${VVV_PATCH_VERSION}.vvv.quote.xz:vvv
 
-NNTP_BROKEN=	NNTP_PATCH broken on 1.13.0
-NNTP_PATCHFILES=	patch-${VVV_PATCH_VERSION}.vvv.nntp.xz:-p1:vvv
-NNTP_EXTRA_PATCHES=	${PATCHDIR}/extra-nntp-depfiles
-NNTP_CONFIGURE_ON=	--enable-nntp
-NNTP_VARS=	XML_NEEDED=yes
-NNTP_CATEGORIES=	news
-NNTP_USES=	perl5
-
-DOCS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-doc-ref
-
 .include <bsd.port.options.mk>
 
 # un/comment as each VERSION is created for PORTVERSION
-VVV_PATCH_VERSION=	1.12.1
-GREETING_PATCH_VERSION=	1.13.2
-
-post-patch-NNTP-on:
-# Restore timestamps for autotools sources
-	@${TOUCH} -r ${WRKSRC}/configure.ac.orig ${WRKSRC}/configure.ac
-	@${TOUCH} -r ${WRKSRC}/Makefile.am.orig ${WRKSRC}/Makefile.am
-.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
-.if 	defined(${PATCH_DEBUG})
-		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime-nntp"
-.endif
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime-nntp
-.endif
-.if ${PORT_OPTIONS:MFORCEBASE64}
-.if 	defined(PATCH_DEBUG)
-		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64-nntp"
-.endif
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64-nntp
-.endif
-
-post-patch-NNTP-off:
-.if ${PORT_OPTIONS:MMAILDIR_MTIME_PATCH}
-.if 	defined(PATCH_DEBUG)
-		@${ECHO} "===>  Applying ${.TARGET} extra-patch-maildir-mtime"
-.endif
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-maildir-mtime
-.endif
-.if ${PORT_OPTIONS:MFORCEBASE64}
-.if 	defined(PATCH_DEBUG)
-		@${ECHO} "===>  Applying ${.TARGET} extra-patch-forcebase64"
-.endif
-	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-forcebase64
-.endif
+VVV_PATCH_VERSION=	1.13.0
+GREETING_PATCH_VERSION=	1.14.3
 
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
-post-install-NNTP-on:
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
-
 pre-configure::
+	# Stop make from setgid mutt_dotlock
+	@${REINPLACE_CMD} \
+		-e '/if test.*mutt_dotlock.*DOTLOCK_GROUP/s/if/if ${FALSE} \&\&/' \
+		${WRKSRC}/Makefile.in
+	# Base FreeBSD krb5-config --version returns "FreeBSD heimdal"
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
-		${WRKSRC}/contrib/pgp6.rc
-	@${REINPLACE_CMD} -E -e 's#(/samples|samples/)#share/examples/mutt#g' \
-		${WRKSRC}/doc/reference.html \
-		${WRKSRC}/doc/manual.html \
-		${WRKSRC}/doc/manual.txt \
-		${WRKSRC}/doc/Muttrc \
-		${WRKSRC}/INSTALL \
-		${WRKSRC}/init.h
+	# Install contrib samples to ${EXAMPLESDIR}
 	@${REINPLACE_CMD} -e 's#$$(docdir)/samples#${EXAMPLESDIR}#g' \
 		${WRKSRC}/contrib/Makefile.in
 
-pre-configure-ASPELL-on:
-	@${REINPLACE_CMD} -e '/^# append-hook/p' \
-		-e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
-	${WRKSRC}/doc/Muttrc.head
-
 pre-configure-HCACHE_BDB-on:
 	@${REINPLACE_CMD} -E -e 's/BDB_VERSIONS="/&${BDB_LIB_NAME} db${BDB_VER} /' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
-.if defined (XML_NEEDED) && ${PORT_OPTIONS:MXML}
-BUILD_DEPENDS+=	xsltproc:textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl \
-		lynx:www/lynx
-.else
-pre-build::
-	@${REINPLACE_CMD} \
-		-e '/^BUILD_DOC_TARGETS/s/=.*/=/' \
-		${WRKSRC}/doc/Makefile
-.endif
+# Undo some dist. installed files
+post-stage::
+	@${MV} ${STAGEDIR}/${LOCALBASE}/etc/Muttrc.dist \
+	    	${STAGEDIR}/${LOCALBASE}/etc/Muttrc.sample
+	@${RM} ${STAGEDIR}/${LOCALBASE}/etc/mime.types*
+
+# Change default ispell
+post-build-ASPELL-on:
+	@${REINPLACE_CMD} -e '/^# append-hook/p' \
+		-e 's/^# append-hook.*$$/set ispell="aspell --mode=email check"/' \
+		${WRKSRC}/doc/Muttrc
 
 .include <bsd.port.mk>
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index c2e0ed86e65f..6b5327483f8a 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1581806451
-SHA256 (mutt/mutt-1.13.4.tar.gz) = b57d3f1040d8018114cf1033dab229f36e4becbcdf59c2edeb294fc044ffcd04
-SIZE (mutt/mutt-1.13.4.tar.gz) = 4901222
-SHA256 (mutt/mutt-1.13.2.vc.greeting) = b11fcfad1f53f16f89a8ecc334fba615698f5bcaa9373fd487a6c9d95c3872ad
-SIZE (mutt/mutt-1.13.2.vc.greeting) = 4573
-SHA256 (mutt/patch-1.12.1.vvv.nntp.xz) = 9c420584d549ac0bb49c52ddfd2ab5bee0f89e59cb938673444ec27ad7c782ad
-SIZE (mutt/patch-1.12.1.vvv.nntp.xz) = 49672
-SHA256 (mutt/patch-1.12.1.vvv.initials.xz) = 6c66fe6c23362b0f4970a5028a75a33454e1e53ba178e5801113939f1bc22920
-SIZE (mutt/patch-1.12.1.vvv.initials.xz) = 724
-SHA256 (mutt/patch-1.12.1.vvv.quote.xz) = 365200817a203a892094062445865b7b8f9ab37e8214ec526082876ffd0d8ab4
-SIZE (mutt/patch-1.12.1.vvv.quote.xz) = 1332
+TIMESTAMP = 1592947493
+SHA256 (mutt/mutt-1.14.5.tar.gz) = 316b11cabd41a21c1d981f11d93e000337a628800d50127df19fe2593f8e3d5c
+SIZE (mutt/mutt-1.14.5.tar.gz) = 5008208
+SHA256 (mutt/mutt-1.14.3.vc.greeting) = c6067f19e51e99e3c981c0c45a29fb442626d8bb3f0df56736ce4ee0eb0bfa83
+SIZE (mutt/mutt-1.14.3.vc.greeting) = 4472
+SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02
+SIZE (mutt/patch-1.13.0.vvv.initials.xz) = 720
+SHA256 (mutt/patch-1.13.0.vvv.quote.xz) = 788d25d1439d86d6c5007d141d1c219496e77940b5ce37819471c941f78f03e4
+SIZE (mutt/patch-1.13.0.vvv.quote.xz) = 1340
diff --git a/mail/mutt/files/extra-nntp-depfiles b/mail/mutt/files/extra-nntp-depfiles
deleted file mode 100644
index 23ffd293f01b..000000000000
--- a/mail/mutt/files/extra-nntp-depfiles
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	2018-12-22 21:21:33 UTC
-+++ Makefile.in
-@@ -240,7 +240,8 @@ am__depfiles_remade = $(DEPDIR)/mkdtemp.Po $(DEPDIR)/r
- 	./$(DEPDIR)/mutt_sasl.Po ./$(DEPDIR)/mutt_socket.Po \
- 	./$(DEPDIR)/mutt_ssl.Po ./$(DEPDIR)/mutt_ssl_gnutls.Po \
- 	./$(DEPDIR)/mutt_tunnel.Po ./$(DEPDIR)/muttlib.Po \
--	./$(DEPDIR)/mx.Po ./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
-+	./$(DEPDIR)/mx.Po ./$(DEPDIR)/newsrc.Po ./$(DEPDIR)/nntp.Po \
-+	./$(DEPDIR)/pager.Po ./$(DEPDIR)/parse.Po \
- 	./$(DEPDIR)/patchlist.Po ./$(DEPDIR)/pattern.Po \
- 	./$(DEPDIR)/pgp.Po ./$(DEPDIR)/pgpewrap.Po \
- 	./$(DEPDIR)/pgpinvoke.Po ./$(DEPDIR)/pgpkey.Po \
diff --git a/mail/mutt/files/extra-patch-doc-ref b/mail/mutt/files/extra-patch-doc-ref
deleted file mode 100644
index d8e7bdb22686..000000000000
--- a/mail/mutt/files/extra-patch-doc-ref
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/mutt.man.orig	2019-05-25 16:22:39 UTC
-+++ doc/mutt.man
-@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent
- .PP
- Mutt is a small but very powerful text based program for reading and sending electronic
- mail under unix operating systems, including support for color terminals, MIME,
--OpenPGP, and a threaded sorting mode.
-+OpenPGP, and a threaded sorting mode. Details of how to use all of this is
-+available in @docdir@.
- .PP
- .I Note:
- .IR
diff --git a/mail/mutt/files/extra-patch-forcebase64-nntp b/mail/mutt/files/extra-patch-forcebase64-nntp
deleted file mode 100644
index b4b699d845cb..000000000000
--- a/mail/mutt/files/extra-patch-forcebase64-nntp
+++ /dev/null
@@ -1,37 +0,0 @@
---- init.h.orig	2017-09-10 22:12:31 UTC
-+++ init.h
-@@ -911,6 +911,11 @@ struct option_t MuttVars[] = {
-   ** message via mail.
-   */
- #endif
-+   { "force_base64",   DT_BOOL, R_NONE, OPTFORCEBASE64, 0 },
-+   /*
-+   ** .pp
-+   ** If you need to encode all text parts to base64, set this option.
-+   */
-   { "force_name",	DT_BOOL, R_NONE, OPTFORCENAME, 0 },
-   /*
-   ** .pp
---- mutt.h.orig	2017-09-10 22:12:31 UTC
-+++ mutt.h
-@@ -379,6 +379,7 @@ enum
-   OPTFCCCLEAR,
-   OPTFLAGSAFE,
-   OPTFOLLOWUPTO,
-+  OPTFORCEBASE64,
-   OPTFORCENAME,
-   OPTFORWDECODE,
-   OPTFORWQUOTE,
---- sendlib.c.orig	2017-09-10 22:12:31 UTC
-+++ sendlib.c
-@@ -1180,7 +1180,9 @@ static void mutt_set_encoding (BODY *b, 
-   if (b->type == TYPETEXT)
-   {
-     char *chsname = mutt_get_body_charset (send_charset, sizeof (send_charset), b);
--    if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
-+    if (option (OPTFORCEBASE64))
-+      b->encoding = ENCBASE64;
-+    else if ((info->lobin && ascii_strncasecmp (chsname, "iso-2022", 8)) || info->linemax > 990 || (info->from && option (OPTENCODEFROM)))
-       b->encoding = ENCQUOTEDPRINTABLE;
-     else if (info->hibin)
-       b->encoding = option (OPTALLOW8BIT) ? ENC8BIT : ENCQUOTEDPRINTABLE;
diff --git a/mail/mutt/files/extra-patch-ifdef b/mail/mutt/files/extra-patch-ifdef
index 542ee19ab108..5e4be3a5e9b4 100644
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@@ -1,10 +1,10 @@
---- PATCHES.orig	2019-12-14 21:57:56 UTC
+--- PATCHES.orig	2020-05-05 02:09:32 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.4.cd.ifdef.1
---- init.c.orig	2019-11-30 21:59:38 UTC
+--- init.c.orig	2020-05-02 21:08:56 UTC
 +++ init.c
-@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
+@@ -643,6 +643,52 @@ static mbchar_table *parse_mbchar_table (const char *s
    return t;
  }
  
@@ -20,7 +20,7 @@
 +  if (!(res = (mutt_option_index (tmp->data) != -1)))
 +    for (i = 0; !res && i < MENU_MAX; i++)
 +    {
-+      struct binding_t *b = km_get_table (Menus[i].value);
++      const struct binding_t *b = km_get_table (Menus[i].value);
 +
 +      if (!b)
 +	continue;
@@ -43,7 +43,7 @@
 +
 +  if (res)
 +  {
-+    if (mutt_parse_rc_line (tmp->data, &token, err) == -1)
++    if (mutt_parse_rc_buffer (tmp, &token, err) == -1)
 +    {
 +      mutt_error ("Erreur: %s", err->data);
 +      FREE (&token.data);
@@ -57,9 +57,9 @@
  static int parse_unignore (BUFFER *buf, BUFFER *s, union pointer_long_t udata, BUFFER *err)
  {
    do
---- init.h.orig	2019-12-14 19:24:06 UTC
+--- init.h.orig	2020-05-05 02:09:32 UTC
 +++ init.h
-@@ -4503,6 +4503,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
+@@ -4594,6 +4594,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
  static int parse_unlists (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_alias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_unalias (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
@@ -67,7 +67,7 @@
  static int parse_echo (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_ignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
  static int parse_unignore (BUFFER *, BUFFER *, union pointer_long_t, BUFFER *);
-@@ -4567,6 +4568,7 @@ const struct command_t Commands[] = {
+@@ -4658,6 +4659,7 @@ const struct command_t Commands[] = {
    { "hdr_order",	parse_list,		{.p=&HeaderOrderList} },
  #ifdef HAVE_ICONV
    { "iconv-hook",	mutt_parse_hook,	{.l=MUTT_ICONVHOOK} },
diff --git a/mail/mutt/files/extra-patch-maildir-mtime b/mail/mutt/files/extra-patch-maildir-mtime
index 7185fd1720a9..0b8f5506bfe8 100644
--- a/mail/mutt/files/extra-patch-maildir-mtime
+++ b/mail/mutt/files/extra-patch-maildir-mtime
@@ -1,8 +1,8 @@
---- PATCHES.orig	2019-12-06 03:42:13 UTC
+--- PATCHES.orig	2020-05-05 02:09:32 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig	2019-12-06 03:42:13 UTC
+--- browser.c.orig	2020-05-02 21:08:56 UTC
 +++ browser.c
 @@ -32,6 +32,7 @@
  #ifdef USE_IMAP
@@ -12,7 +12,7 @@
  
  #include <stdlib.h>
  #include <dirent.h>
-@@ -448,6 +449,21 @@ static void init_state (struct browser_state *state, M
+@@ -430,6 +431,21 @@ static void init_state (struct browser_state *state, M
      menu->data = state->entry;
  }
  
@@ -34,15 +34,15 @@
  static int examine_directory (MUTTMENU *menu, struct browser_state *state,
  			      const char *d, const char *prefix)
  {
-@@ -514,6 +530,7 @@ static int examine_directory (MUTTMENU *menu, struct b
+@@ -496,6 +512,7 @@ static int examine_directory (MUTTMENU *menu, struct b
      tmp = Incoming;
      while (tmp && mutt_strcmp (mutt_b2s (full_path), mutt_b2s (tmp->pathbuf)))
        tmp = tmp->next;
 +    check_maildir_times (tmp, &s);
-     if (tmp && Context &&
+     if (tmp && Context && !tmp->nopoll &&
          !mutt_strcmp (tmp->realpath, Context->realpath))
      {
-@@ -592,6 +609,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
+@@ -579,6 +596,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
  	s.st_mtime = st2.st_mtime;
      }
  
diff --git a/mail/mutt/files/extra-patch-maildir-mtime-nntp b/mail/mutt/files/extra-patch-maildir-mtime-nntp
deleted file mode 100644
index 812fac5daf30..000000000000
--- a/mail/mutt/files/extra-patch-maildir-mtime-nntp
+++ /dev/null
@@ -1,52 +0,0 @@
---- PATCHES.orig	2019-08-15 02:24:43 UTC
-+++ PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig	2019-08-15 02:24:39 UTC
-+++ browser.c
-@@ -35,6 +35,7 @@
- #ifdef USE_NNTP
- #include "nntp.h"
- #endif
-+#include "mx.h"
- 
- #include <stdlib.h>
- #include <dirent.h>
-@@ -592,6 +593,21 @@ static void init_state (struct browser_state *state, M
-     menu->data = state->entry;
- }
- 
-+static void check_maildir_times (BUFFY *buf, struct stat *st)
-+{
-+  char buffer[_POSIX_PATH_MAX + SHORT_STRING];
-+  struct stat s;
-+
-+  if(!buf || buf->magic != MUTT_MAILDIR)
-+    return;
-+
-+  snprintf (buffer, sizeof (buffer), "%s/tmp", mutt_b2s(buf->pathbuf));
-+  if (lstat (buffer, &s) != 0)
-+    return;
-+
-+  st->st_mtime = s.st_mtime;
-+}
-+
- /* get list of all files/newsgroups with mask */
- static int examine_directory (MUTTMENU *menu, struct browser_state *state,
- 			      const char *d, const char *prefix)
-@@ -684,6 +700,7 @@ static int examine_directory (MUTTMENU *menu, struct b
-     tmp = Incoming;
-     while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
-       tmp = tmp->next;
-+    check_maildir_times (tmp, &s);
-     if (tmp && Context &&
-         !mutt_strcmp (tmp->realpath, Context->realpath))
-     {
-@@ -792,6 +809,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
- 	s.st_mtime = st2.st_mtime;
-     }
- 
-+    check_maildir_times (tmp, &s);
-     add_folder (menu, state, mutt_b2s (mailbox), &s, tmp, NULL);
-   }
-   while ((tmp = tmp->next));
diff --git a/mail/mutt/files/extra-patch-reverse_reply b/mail/mutt/files/extra-patch-reverse_reply
index 058f61ca0e95..a543a7776d30 100644
--- a/mail/mutt/files/extra-patch-reverse_reply
+++ b/mail/mutt/files/extra-patch-reverse_reply
@@ -1,10 +1,10 @@
---- PATCHES.orig	2019-12-06 03:41:41 UTC
+--- PATCHES.orig	2020-05-05 02:09:33 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.6.cb.reverse_reply.2
---- init.h.orig	2019-12-06 03:41:41 UTC
+--- init.h.orig	2020-05-05 02:09:32 UTC
 +++ init.h
-@@ -3021,6 +3021,13 @@ struct option_t MuttVars[] = {
+@@ -3111,6 +3111,13 @@ struct option_t MuttVars[] = {
    ** In either case, a missing real name will be filled in afterwards
    ** using the value of $$realname.
    */
@@ -18,9 +18,9 @@
    { "rfc2047_parameters", DT_BOOL, R_NONE, {.l=OPTRFC2047PARAMS}, {.l=0} },
    /*
    ** .pp
---- mutt.h.orig	2019-11-20 20:16:28 UTC
+--- mutt.h.orig	2020-05-05 02:09:32 UTC
 +++ mutt.h
-@@ -505,6 +505,7 @@ enum
+@@ -513,6 +513,7 @@ enum
    OPTREVALIAS,
    OPTREVNAME,
    OPTREVREAL,
@@ -28,19 +28,19 @@
    OPTRFC2047PARAMS,
    OPTSAVEADDRESS,
    OPTSAVEEMPTY,
---- protos.h.orig	2019-11-01 06:34:06 UTC
+--- protos.h.orig	2020-05-02 21:08:56 UTC
 +++ protos.h
-@@ -88,6 +88,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
+@@ -85,6 +85,7 @@ char* mutt_extract_message_id (const char *, const cha
+ ADDRESS *mutt_get_address (ENVELOPE *, char **);
  ADDRESS *mutt_lookup_alias (const char *s);
  ADDRESS *mutt_remove_duplicates (ADDRESS *);
- ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
 +ADDRESS *mutt_reverse_address (ADDRESS *);
  ADDRESS *mutt_expand_aliases (ADDRESS *);
  ADDRESS *mutt_parse_adrlist (ADDRESS *, const char *);
  
---- send.c.orig	2019-11-19 02:15:41 UTC
+--- send.c.orig	2020-05-02 21:08:56 UTC
 +++ send.c
-@@ -723,6 +723,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
+@@ -725,6 +725,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
    /* the CC field can get cluttered, especially with lists */
    env->to = mutt_remove_duplicates (env->to);
    env->cc = mutt_remove_duplicates (env->cc);
@@ -51,9 +51,9 @@
    env->cc = mutt_remove_xrefs (env->to, env->cc);
  
    if (env->cc && !env->to)
---- sendlib.c.orig	2019-11-08 03:35:30 UTC
+--- sendlib.c.orig	2020-05-02 21:08:56 UTC
 +++ sendlib.c
-@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
+@@ -2981,6 +2981,35 @@ static void set_noconv_flags (BODY *b, short flag)
    }
  }
  
@@ -86,6 +86,6 @@
 +  return addr;
 +}
 +
- int mutt_write_fcc (const char *path, HEADER *hdr, const char *msgid, int post, const char *fcc)
+ int mutt_write_fcc (const char *path, SEND_CONTEXT *sctx, const char *msgid, int post, const char *fcc)
  {
-   CONTEXT f;
+   HEADER *hdr;
diff --git a/mail/mutt/files/extra-patch-smartdate b/mail/mutt/files/extra-patch-smartdate
index 09e2db1af99d..2dd079b79f2e 100644
--- a/mail/mutt/files/extra-patch-smartdate
+++ b/mail/mutt/files/extra-patch-smartdate
@@ -1,6 +1,6 @@
---- hdrline.c.orig	2019-11-11 04:00:36 UTC
+--- hdrline.c.orig	2020-05-05 02:09:32 UTC
 +++ hdrline.c
-@@ -248,6 +248,89 @@ static char *apply_subject_mods (ENVELOPE *env)
+@@ -249,6 +249,89 @@ static char *apply_subject_mods (ENVELOPE *env)
   * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
   * %Z = status flags	*/
  
@@ -90,7 +90,7 @@
  static const char *
  hdr_format_str (char *dest,
  		size_t destlen,
-@@ -421,7 +504,13 @@ hdr_format_str (char *dest,
+@@ -422,7 +505,13 @@ hdr_format_str (char *dest,
  
        if (!do_locales)
          setlocale (LC_TIME, "C");
@@ -105,7 +105,7 @@
        if (!do_locales)
          setlocale (LC_TIME, "");
  
---- mutt.h.orig	2019-12-06 03:41:43 UTC
+--- mutt.h.orig	2020-05-05 02:09:33 UTC
 +++ mutt.h
 @@ -165,6 +165,16 @@ typedef enum
    MUTT_WRITE_HEADER_MIME
diff --git a/mail/mutt/files/patch-smime-sender b/mail/mutt/files/extra-smime-sender
index f4d9fd56571f..351bba964cc6 100644
--- a/mail/mutt/files/patch-smime-sender
+++ b/mail/mutt/files/extra-smime-sender
@@ -1,6 +1,6 @@
---- commands.c.orig	2019-11-30 21:59:38 UTC
+--- commands.c.orig	2020-05-02 21:08:56 UTC
 +++ commands.c
-@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)
+@@ -302,7 +302,7 @@ int mutt_display_message (HEADER *cur)
      {
        if (cur->security & GOODSIGN)
        {
@@ -9,9 +9,9 @@
  	  mutt_message ( _("S/MIME signature successfully verified."));
  	else
  	  mutt_error ( _("S/MIME certificate owner does not match sender."));
---- init.h.orig	2019-12-14 21:58:25 UTC
+--- init.h.orig	2020-05-05 02:09:33 UTC
 +++ init.h
-@@ -3518,6 +3518,15 @@ struct option_t MuttVars[] = {
+@@ -3608,6 +3608,15 @@ struct option_t MuttVars[] = {
    ** to determine the key to use. It will ask you to supply a key, if it can't find one.
    ** (S/MIME only)
    */
@@ -27,9 +27,9 @@
    { "smime_self_encrypt_as",	DT_SYN,  R_NONE, {.p="smime_default_key"}, {.p=0} },
    { "smime_default_key",		DT_STR,	 R_NONE, {.p=&SmimeDefaultKey}, {.p=0} },
    /*
---- mutt.h.orig	2019-12-14 21:58:25 UTC
+--- mutt.h.orig	2020-05-05 02:09:33 UTC
 +++ mutt.h
-@@ -587,6 +587,7 @@ enum
+@@ -596,6 +596,7 @@ enum
    OPTSMIMEISDEFAULT,
    OPTSMIMESELFENCRYPT,
    OPTASKCERTLABEL,
diff --git a/mail/mutt/files/patch-Makefile.in b/mail/mutt/files/patch-Makefile.in
deleted file mode 100644
index d4889d4f9583..000000000000
--- a/mail/mutt/files/patch-Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile.in.orig	2019-11-30 18:14:23 UTC
-+++ Makefile.in
-@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
- @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
- @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_SUBDIR = autocrypt
- @BUILD_AUTOCRYPT_TRUE@AUTOCRYPT_INCLUDES = -I$(top_srcdir)/autocrypt
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) $(AUTOCRYPT_SUBDIR) . doc
- bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET)
- @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c version.h $(HCVERSION)
-@@ -1690,18 +1690,9 @@ install-exec-hook:
- 		rm -f $(DESTDIR)$(bindir)/mutt.dotlock ;		\
- 		ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
- 	fi
--	if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
--		chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
--		chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
--		{ echo "Can't fix mutt_dotlock's permissions!  This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
--	fi
- 
- install-data-local:
- 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
--	$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist
--	-if [ ! -f $(DESTDIR)$(sysconfdir)/mime.types ]; then \
--		$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir); \
--	fi
- 
- uninstall-local:
- 	for i in mime.types ; do \
diff --git a/mail/mutt/files/patch-browser.c b/mail/mutt/files/patch-browser.c
index 40c0fd019566..9fe71577c5fe 100644
--- a/mail/mutt/files/patch-browser.c
+++ b/mail/mutt/files/patch-browser.c
@@ -1,6 +1,6 @@
---- browser.c.orig	2019-11-11 04:00:36 UTC
+--- browser.c.orig	2020-05-05 02:09:32 UTC
 +++ browser.c
-@@ -86,6 +86,12 @@ static int browser_compare_subject (const void *a, con
+@@ -87,6 +87,12 @@ static int browser_compare_subject (const void *a, con
    struct folder_file *pa = (struct folder_file *) a;
    struct folder_file *pb = (struct folder_file *) b;
  
@@ -13,7 +13,7 @@
    int r = mutt_strcoll (pa->display_name, pb->display_name);
  
    return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -96,6 +102,12 @@ static int browser_compare_date (const void *a, const 
+@@ -97,6 +103,12 @@ static int browser_compare_date (const void *a, const 
    struct folder_file *pa = (struct folder_file *) a;
    struct folder_file *pb = (struct folder_file *) b;
  
@@ -26,7 +26,7 @@
    int r = pa->mtime - pb->mtime;
  
    return ((BrowserSort & SORT_REVERSE) ? -r : r);
-@@ -105,6 +117,12 @@ static int browser_compare_size (const void *a, const 
+@@ -106,6 +118,12 @@ static int browser_compare_size (const void *a, const 
  {
    struct folder_file *pa = (struct folder_file *) a;
    struct folder_file *pb = (struct folder_file *) b;
diff --git a/mail/mutt/files/patch-contrib_Makefile.in b/mail/mutt/files/patch-contrib_Makefile.in
deleted file mode 100644
index c7fbe76a8eeb..000000000000
--- a/mail/mutt/files/patch-contrib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	2019-11-30 18:14:24 UTC
-+++ contrib/Makefile.in
-@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- subdir = contrib
--SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
-+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \
- 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
- 	sample.muttrc-compress sample.muttrc-starter \
- 	sample.vimrc-sidebar colors.default colors.linux smime.rc \
diff --git a/mail/mutt/files/patch-date-conditional b/mail/mutt/files/patch-date-conditional
index d2add078f656..8bbad9b84ef1 100644
--- a/mail/mutt/files/patch-date-conditional
+++ b/mail/mutt/files/patch-date-conditional
@@ -1,10 +1,10 @@
---- PATCHES.orig	2019-12-06 03:41:54 UTC
+--- PATCHES.orig	2020-05-05 02:09:34 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.0.ats.date_conditional.1
---- hdrline.c.orig	2019-12-06 03:41:54 UTC
+--- hdrline.c.orig	2020-05-05 02:09:33 UTC
 +++ hdrline.c
-@@ -427,6 +427,53 @@ hdr_format_str (char *dest,
+@@ -428,6 +428,53 @@ hdr_format_str (char *dest,
        const char *cp;
        struct tm *tm;
        time_t T;
@@ -58,9 +58,9 @@
  
        p = dest;
  
---- muttlib.c.orig	2019-10-17 08:01:01 UTC
+--- muttlib.c.orig	2020-05-02 21:08:56 UTC
 +++ muttlib.c
-@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1667,7 +1667,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
        if (*src == '?')
        {
  	flags |= MUTT_FORMAT_OPTIONAL;
@@ -78,7 +78,7 @@
        }
        else
        {
-@@ -1579,12 +1588,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1683,12 +1692,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
  	  count++;
  	}
  	*cp = 0;
diff --git a/mail/mutt/files/patch-dgc-deepif b/mail/mutt/files/patch-dgc-deepif
index 94aa781974a1..6ca74d71f4a3 100644
--- a/mail/mutt/files/patch-dgc-deepif
+++ b/mail/mutt/files/patch-dgc-deepif
@@ -1,6 +1,6 @@
---- muttlib.c.orig	2019-12-06 03:41:57 UTC
+--- muttlib.c.orig	2020-05-05 02:09:34 UTC
 +++ muttlib.c
-@@ -1606,6 +1606,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1710,6 +1710,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
  	count = 0;
          while (count < sizeof (ifstring) && *src && *src != '?' && *src != '&')
  	{
@@ -13,7 +13,7 @@
            *cp++ = *src++;
  	  count++;
  	}
-@@ -1618,7 +1624,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
+@@ -1722,7 +1728,13 @@ void mutt_FormatString (char *dest,		/* output buffer 
  	count = 0;
  	while (count < sizeof (elsestring) && *src && *src != '?')
  	{
diff --git a/mail/mutt/files/patch-doc_Makefile.in b/mail/mutt/files/patch-doc_Makefile.in
deleted file mode 100644
index 6fa68f2b692f..000000000000
--- a/mail/mutt/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- doc/Makefile.in.orig	2019-11-30 18:14:24 UTC
-+++ doc/Makefile.in
-@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc
- 	    $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
- 	  fi \
- 	done
--	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
--	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
--		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
--	elif [ -f $(DESTDIR)$(pkgdatadir)/../Muttrc ] ; then \
--	 	mv $(DESTDIR)$(pkgdatadir)/../Muttrc* $(DESTDIR)$(sysconfdir) ; \
--	elif [ ! -f $(DESTDIR)$(sysconfdir)/Muttrc ] ; then \
--		$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir) ; \
--	fi
-+	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.sample
- 	-if [ -f mutt.info ] ; then \
- 	  $(MKDIR_P) $(DESTDIR)$(infodir) ; \
- 	  $(INSTALL) -m 644 mutt.info $(DESTDIR)$(infodir) ; \
-@@ -734,9 +727,7 @@ uninstall-local:
- 
- check:
- manual.txt: manual.html
--	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
--	LC_ALL=C w3m -dump manual.html > $@ || \
--	LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
-+	-LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@
- 
- Muttrc: stamp-doc-rc
- 
diff --git a/mail/mutt/files/patch-doc_manual.xml.head b/mail/mutt/files/patch-doc_manual.xml.head
deleted file mode 100644
index a2c4e29c6126..000000000000
--- a/mail/mutt/files/patch-doc_manual.xml.head
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/manual.xml.head.orig	2019-11-24 03:39:46 UTC
-+++ doc/manual.xml.head
-@@ -1,6 +1,6 @@
- <?xml version="1.0" standalone="no"?>
- <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
--  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-+  "/usr/local/share/xml/docbook/4.2/docbookx.dtd">
- <book>
- 
- <bookinfo>
diff --git a/mail/mutt/files/patch-muttlib.c b/mail/mutt/files/patch-muttlib.c
index 569032e441a0..15e36d47262a 100644
--- a/mail/mutt/files/patch-muttlib.c
+++ b/mail/mutt/files/patch-muttlib.c
@@ -1,6 +1,6 @@
---- muttlib.c.orig	2019-12-06 03:42:05 UTC
+--- muttlib.c.orig	2020-05-05 02:09:34 UTC
 +++ muttlib.c
-@@ -877,16 +877,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
+@@ -930,16 +930,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
  void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
                     const char *src, int line)
  {
diff --git a/mail/mutt/files/patch-threadcomplete b/mail/mutt/files/patch-threadcomplete
index 33af01acfabe..f4fc9b74e2d6 100644
--- a/mail/mutt/files/patch-threadcomplete
+++ b/mail/mutt/files/patch-threadcomplete
@@ -1,6 +1,6 @@
---- mutt.h.orig	2019-12-06 03:42:11 UTC
+--- mutt.h.orig	2020-05-25 22:13:51 UTC
 +++ mutt.h
-@@ -243,6 +243,7 @@ enum
+@@ -242,6 +242,7 @@ enum
    MUTT_EXPIRED,
    MUTT_SUPERSEDED,
    MUTT_TRASH,
@@ -8,7 +8,7 @@
  
    /* actions for mutt_pattern_comp/mutt_pattern_exec */
    MUTT_AND,
---- pattern.c.orig	2019-11-16 21:07:54 UTC
+--- pattern.c.orig	2020-05-25 20:41:30 UTC
 +++ pattern.c
 @@ -57,6 +57,7 @@ static const struct pattern_flags
  }
@@ -16,9 +16,9 @@
  {
 +  { 'a', MUTT_THREADCOMPLETE,	0,		NULL },
    { 'A', MUTT_ALL,			0,		NULL },
-   { 'b', MUTT_BODY,		MUTT_FULL_MSG,	eat_regexp },
-   { 'B', MUTT_WHOLE_MSG,		MUTT_FULL_MSG,	eat_regexp },
-@@ -1342,6 +1343,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
+   { 'b', MUTT_BODY,  MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
+   { 'B', MUTT_WHOLE_MSG,  MUTT_FULL_MSG|MUTT_SEND_MODE_SEARCH, eat_regexp },
+@@ -1499,6 +1500,16 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec
        else
          result = mutt_is_list_cc (pat->alladdr, h->env->to, h->env->cc);
        return (pat->not ^ result);
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index b29788d5c9fe..a59a2131d438 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -30,7 +30,6 @@ man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
-%%NNTP%%%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.nntp
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
@@ -47,6 +46,8 @@ man/man5/muttrc.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ca-bundle.crt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-detectgui.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bgedit-screen-tmux.sh
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.default
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/colors.linux
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
@@ -71,6 +72,7 @@ man/man5/muttrc.5.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/markdown2html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mutt_xtitle
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp5.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc