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
svn path=/head/; revision=530651
2024-11-20 00:21:35 +00:00 · 2020-04-04 12:26:00 +00:00 · 2020-04-04 12:26:00 +00:00 · 9a60fecc13 · 2021-03-31 03:12:20 +00:00
commit 9a60fecc13
parent 98462c6f6a
21 changed files with 66 additions and 218 deletions
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	mutt
-DISTVERSION=	1.13.4
+DISTVERSION=	1.13.5
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@ -48,8 +48,8 @@ OPTIONS_SUB=	yes

 OPTIONS_DEFINE=	AUTOCRYPT DEBUG 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 SMART_DATE SMTP URLVIEW

 OPTIONS_SINGLE=	GSSAPI HCACHE SCREEN
 OPTIONS_RADIO=	SPELL
@ -84,11 +84,10 @@ 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 \
 		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 SMART_DATE SMTP URLVIEW

 .ifmake makesum # for optional distfiles patchfiles
 OPTIONS_OVERRIDE=	${OPTIONS_DEFINE} ${OPTIONS_DEFAULT}
@ -173,65 +172,26 @@ 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.13.4

 post-install:
 	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5

-post-install-NNTP-on:
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog.nntp ${STAGEDIR}${DOCSDIR}
-
 pre-configure::
 	@${REINPLACE_CMD} -e 's,?eimdal\*),?eimdal*|\"FreeBSD heimdal\"*),' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@ -256,15 +216,7 @@ 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
+	@${REINPLACE_CMD} -e '/^BUILD_DOC_TARGETS/s/=.*/=/' ${WRKSRC}/doc/Makefile

 .include <bsd.port.mk>
--- 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 = 1585430449
+SHA256 (mutt/mutt-1.13.5.tar.gz) = 6cd71b5b3e6b255afef6bed3b5e1e8ee9819b3d7c9839fd95e798045882aa653
+SIZE (mutt/mutt-1.13.5.tar.gz) = 4902500
+SHA256 (mutt/mutt-1.13.4.vc.greeting) = 572427c1ab8bd81ac11bf74feeab8e71f11c5732f274f445b9976527716dc80b
+SIZE (mutt/mutt-1.13.4.vc.greeting) = 4573
+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
--- a/mail/mutt/files/extra-nntp-depfiles
+++ b/mail/mutt/files/extra-nntp-depfiles
@ -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 \
--- a/mail/mutt/files/extra-patch-doc-ref
+++ b/mail/mutt/files/extra-patch-doc-ref
@ -1,4 +1,4 @@
--- doc/mutt.man.orig	2019-05-25 16:22:39 UTC
+--- doc/mutt.man.orig	2020-01-28 23:08:03 UTC
 +++ doc/mutt.man
@@ -67,7 +67,8 @@ mutt \- The Mutt Mail User Agent
 .PP
--- a/mail/mutt/files/extra-patch-forcebase64-nntp
+++ b/mail/mutt/files/extra-patch-forcebase64-nntp
@ -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;
--- a/mail/mutt/files/extra-patch-ifdef
+++ b/mail/mutt/files/extra-patch-ifdef
@ -1,8 +1,8 @@
--- PATCHES.orig	2019-12-14 21:57:56 UTC
+--- PATCHES.orig	2020-03-29 21:24:30 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-03-28 18:17:53 UTC
 +++ init.c
@@ -651,6 +651,52 @@ static mbchar_table *parse_mbchar_table (const char *s
   return t;
@ -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-03-29 21:24:30 UTC
 +++ init.h
-@@ -4503,6 +4503,7 @@ static int parse_lists (BUFFER *, BUFFER *, union poin
+@@ -4516,6 +4516,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[] = {
+@@ -4580,6 +4581,7 @@ const struct command_t Commands[] = {
   { "hdr_order",	parse_list,		{.p=&HeaderOrderList} },
 #ifdef HAVE_ICONV
   { "iconv-hook",	mutt_parse_hook,	{.l=MUTT_ICONVHOOK} },
--- 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-03-29 21:24:30 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-03-28 18:17:53 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,7 +34,7 @@
 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;
@ -42,7 +42,7 @@
     if (tmp && Context &&
         !mutt_strcmp (tmp->realpath, Context->realpath))
     {
-@@ -592,6 +609,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
+@@ -574,6 +591,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
 	s.st_mtime = st2.st_mtime;
     }
 
--- a/mail/mutt/files/extra-patch-maildir-mtime-nntp
+++ b/mail/mutt/files/extra-patch-maildir-mtime-nntp
@ -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));
--- 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-03-29 21:24:31 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-03-29 21:24:30 UTC
 +++ init.h
-@@ -3021,6 +3021,13 @@ struct option_t MuttVars[] = {
+@@ -3034,6 +3034,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-03-29 21:24:30 UTC
 +++ mutt.h
-@@ -505,6 +505,7 @@ enum
+@@ -506,6 +506,7 @@ enum
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
@ -28,9 +28,9 @@
   OPTRFC2047PARAMS,
   OPTSAVEADDRESS,
   OPTSAVEEMPTY,
--- protos.h.orig	2019-11-01 06:34:06 UTC
+--- protos.h.orig	2020-03-28 18:17:53 UTC
 +++ protos.h
-@@ -88,6 +88,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
+@@ -87,6 +87,7 @@ ADDRESS *mutt_get_address (ENVELOPE *, char **);
 ADDRESS *mutt_lookup_alias (const char *s);
 ADDRESS *mutt_remove_duplicates (ADDRESS *);
 ADDRESS *mutt_remove_xrefs (ADDRESS *, ADDRESS *);
@ -38,7 +38,7 @@
 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-03-28 18:17:53 UTC
 +++ send.c
@@ -723,6 +723,10 @@ void mutt_fix_reply_recipients (ENVELOPE *env)
   /* the CC field can get cluttered, especially with lists */
@ -51,7 +51,7 @@
   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-03-28 18:17:53 UTC
 +++ sendlib.c
@@ -2974,6 +2974,35 @@ static void set_noconv_flags (BODY *b, short flag)
   }
--- 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-03-29 21:24:30 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-03-29 21:24:31 UTC
 +++ mutt.h
@@ -165,6 +165,16 @@ typedef enum
   MUTT_WRITE_HEADER_MIME
--- a/mail/mutt/files/patch-Makefile.in
+++ b/mail/mutt/files/patch-Makefile.in
@ -1,4 +1,4 @@
--- Makefile.in.orig	2019-11-30 18:14:23 UTC
+--- Makefile.in.orig	2020-03-28 18:22:01 UTC
 +++ Makefile.in
@@ -540,7 +540,7 @@ AUTOMAKE_OPTIONS = 1.6 foreign
 @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
--- 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-03-29 21:24:30 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;
--- a/mail/mutt/files/patch-contrib_Makefile.in
+++ b/mail/mutt/files/patch-contrib_Makefile.in
@ -1,4 +1,4 @@
--- contrib/Makefile.in.orig	2019-11-30 18:14:24 UTC
+--- contrib/Makefile.in.orig	2020-03-28 18:22:01 UTC
 +++ contrib/Makefile.in
@@ -280,7 +280,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
--- 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-03-29 21:24:32 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-03-29 21:24:31 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,7 +58,7 @@
 
       p = dest;
 
--- muttlib.c.orig	2019-10-17 08:01:01 UTC
+--- muttlib.c.orig	2020-03-28 18:17:53 UTC
 +++ muttlib.c
@@ -1563,7 +1563,16 @@ void mutt_FormatString (char *dest,		/* output buffer 
       if (*src == '?')
--- a/mail/mutt/files/patch-dgc-deepif
+++ b/mail/mutt/files/patch-dgc-deepif
@ -1,4 +1,4 @@
--- muttlib.c.orig	2019-12-06 03:41:57 UTC
+--- muttlib.c.orig	2020-03-29 21:24:32 UTC
 +++ muttlib.c
@@ -1606,6 +1606,12 @@ void mutt_FormatString (char *dest,		/* output buffer 
 	count = 0;
--- a/mail/mutt/files/patch-doc_Makefile.in
+++ b/mail/mutt/files/patch-doc_Makefile.in
@ -1,4 +1,4 @@
--- doc/Makefile.in.orig	2019-11-30 18:14:24 UTC
+--- doc/Makefile.in.orig	2020-03-28 18:22:01 UTC
 +++ doc/Makefile.in
@@ -691,14 +691,7 @@ install-data-local: makedoc-all instdoc
 	    $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
--- a/mail/mutt/files/patch-doc_manual.xml.head
+++ b/mail/mutt/files/patch-doc_manual.xml.head
@ -1,4 +1,4 @@
--- doc/manual.xml.head.orig	2019-11-24 03:39:46 UTC
+--- doc/manual.xml.head.orig	2020-03-28 18:17:53 UTC
 +++ doc/manual.xml.head
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
--- a/mail/mutt/files/patch-muttlib.c
+++ b/mail/mutt/files/patch-muttlib.c
@ -1,4 +1,4 @@
--- muttlib.c.orig	2019-12-06 03:42:05 UTC
+--- muttlib.c.orig	2020-03-29 21:24:32 UTC
 +++ muttlib.c
@@ -877,16 +877,15 @@ void _mutt_buffer_mktemp (BUFFER *buf, const char *pre
 void _mutt_mktemp (char *s, size_t slen, const char *prefix, const char *suffix,
--- a/mail/mutt/files/patch-smime-sender
+++ b/mail/mutt/files/patch-smime-sender
@ -1,4 +1,4 @@
--- commands.c.orig	2019-11-30 21:59:38 UTC
+--- commands.c.orig	2020-02-21 20:17:47 UTC
 +++ commands.c
@@ -285,7 +285,7 @@ int mutt_display_message (HEADER *cur)
     {
@ -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-03-29 21:24:31 UTC
 +++ init.h
-@@ -3518,6 +3518,15 @@ struct option_t MuttVars[] = {
+@@ -3531,6 +3531,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-03-29 21:24:31 UTC
 +++ mutt.h
-@@ -587,6 +587,7 @@ enum
+@@ -588,6 +588,7 @@ enum
   OPTSMIMEISDEFAULT,
   OPTSMIMESELFENCRYPT,
   OPTASKCERTLABEL,
--- 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-03-29 21:24:33 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-03-28 18:17:53 UTC
 +++ pattern.c
@@ -57,6 +57,7 @@ static const struct pattern_flags
 }
--- 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