Update to version 1.3.28.

PR:		35866
Submitted by:	maintainer

5 files changed, 56 insertions, 237 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 903b5667d633..e8d0fde018f9 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -31,10 +31,8 @@
 #  WITHOUT_MUTT_SGMLFORMAT
 #    (this can't be stated if WITH_MUTT_HTML is defined)
 #
-# If you want to read news with mutt define:
+# If you want to read and post news with mutt define:
 #  WITH_MUTT_NNTP
-#    (note that this implies building of the inn-stable port to be able to
-#     post new articles)
 #
 # WITH_MUTT_SSL can be enabled if your IMAP/POP server is SSL capable.
 #
@@ -48,15 +46,12 @@
 # If you want to enable extended quoting functions define:
 #  WITH_MUTT_QUOTE_PATCH
 #
-# If you want to enable extended functions for the ru locale define:
-#  WITH_MUTT_RU_PATCH
-#
 # If you want to enable the pgp_outlook_compat function for use with pgp define:
 #  WITH_MUTT_PGP_OUTLOOK_PATCH
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.3.27
-PORTREVISION?=	7
+PORTVERSION=	1.3.28
+#PORTREVISION?=	0
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -87,7 +82,7 @@ CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 USE_AUTOMAKE=	yes
 
 .if defined(WITH_MUTT_COMPRESSED_FOLDERS) || defined(WITH_MUTT_NNTP) || \
-		defined(WITH_MUTT_RU_PATCH) || defined(WITH_MUTT_QUOTE_PATCH)
+		defined(WITH_MUTT_QUOTE_PATCH)
 PATCH_SITES+=	http://www.mutt.org.ua/download/mutt-${PATCH_VERSION}/ \
 		http://www2.mutt.org.ua/download/mutt-${PATCH_VERSION}/ \
 		ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PATCH_VERSION}/ \
@@ -149,11 +144,6 @@ CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .if defined(WITH_MUTT_SSL)
 USE_OPENSSL=	yes
 .endif
-.if defined(WITH_MUTT_NNTP)
-BUILD_DEPENDS+=	${LOCALBASE}/news/bin/inews:${PORTSDIR}/news/inn-stable
-pre-configure::
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-inews
-.endif
 .if defined(WITH_MUTT_CYRUS_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 .endif
@@ -183,22 +173,19 @@ CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 PATCH_DIST_STRIP=	-p1
 
 .if defined(WITH_MUTT_COMPRESSED_FOLDERS)
-PATCHFILES+=	patch-${PATCH_VERSION}.rr.compressed.gz
+PATCHFILES+=	mutt-${PATCH_VERSION}.rr.compressed.gz
 CONFIGURE_ARGS+=	--enable-compressed
 .if !defined(WITHOUT_MUTT_SGMLFORMAT)
 SGML_USED=	yes
 .endif
 .endif
 .if defined(WITH_MUTT_NNTP)
-PATCHFILES+=	patch-${PATCH_VERSION}.vvv.nntp.gz
+PATCHFILES+=	mutt-${PATCH_VERSION}.vvv.nntp.gz
 CONFIGURE_ARGS+=	--enable-nntp
 .endif
 .if defined(WITH_MUTT_QUOTE_PATCH)
-PATCHFILES+=	patch-${PATCH_VERSION}.vvv.initials.gz \
-		patch-${PATCH_VERSION}.vvv.quote.gz
-.endif
-.if defined(WITH_MUTT_RU_PATCH)
-PATCHFILES+=	patch-${PATCH_VERSION}.vvv.ru.gz
+PATCHFILES+=	mutt-${PATCH_VERSION}.vvv.initials.gz \
+		mutt-${PATCH_VERSION}.vvv.quote.gz
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
@@ -229,27 +216,7 @@ PLIST_SUB+=	SUB_NNTP="@comment "
 SGML_USED=	yes
 PLIST_SUB+=	SUB_HTML=""
 .if defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_G=""
-PLIST_SUB+=	SUB_ADD_A="@comment "
-PLIST_SUB+=	SUB_ADD_B="@comment "
-PLIST_SUB+=	SUB_ADD_C="@comment "
-PLIST_SUB+=	SUB_ADD_D="@comment "
-PLIST_SUB+=	SUB_ADD_E="@comment "
-PLIST_SUB+=	SUB_ADD_F="@comment "
-PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_F=""
-PLIST_SUB+=	SUB_ADD_A="@comment "
-PLIST_SUB+=	SUB_ADD_B="@comment "
-PLIST_SUB+=	SUB_ADD_C="@comment "
-PLIST_SUB+=	SUB_ADD_D="@comment "
-PLIST_SUB+=	SUB_ADD_E="@comment "
-PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_G=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -259,7 +226,7 @@ PLIST_SUB+=	SUB_ADD_E="@comment "
 PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_F=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -269,7 +236,7 @@ PLIST_SUB+=	SUB_ADD_E="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_C=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -279,7 +246,7 @@ PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_B=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -288,48 +255,8 @@ PLIST_SUB+=	SUB_ADD_E="@comment "
 PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_C=""
-PLIST_SUB+=	SUB_ADD_A="@comment "
-PLIST_SUB+=	SUB_ADD_B="@comment "
-PLIST_SUB+=	SUB_ADD_D="@comment "
-PLIST_SUB+=	SUB_ADD_E="@comment "
-PLIST_SUB+=	SUB_ADD_F="@comment "
-PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_B=""
-PLIST_SUB+=	SUB_ADD_A="@comment "
-PLIST_SUB+=	SUB_ADD_C="@comment "
-PLIST_SUB+=	SUB_ADD_D="@comment "
-PLIST_SUB+=	SUB_ADD_E="@comment "
-PLIST_SUB+=	SUB_ADD_F="@comment "
-PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_E=""
-PLIST_SUB+=	SUB_ADD_A="@comment "
-PLIST_SUB+=	SUB_ADD_B="@comment "
-PLIST_SUB+=	SUB_ADD_C="@comment "
-PLIST_SUB+=	SUB_ADD_D="@comment "
-PLIST_SUB+=	SUB_ADD_F="@comment "
-PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_D=""
-PLIST_SUB+=	SUB_ADD_A="@comment "
-PLIST_SUB+=	SUB_ADD_B="@comment "
-PLIST_SUB+=	SUB_ADD_C="@comment "
-PLIST_SUB+=	SUB_ADD_E="@comment "
-PLIST_SUB+=	SUB_ADD_F="@comment "
-PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_E=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -339,7 +266,7 @@ PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_D=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -349,7 +276,7 @@ PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_A=""
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -359,7 +286,7 @@ PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_QUOTE_PATCH)
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -368,26 +295,6 @@ PLIST_SUB+=	SUB_ADD_E="@comment "
 PLIST_SUB+=	SUB_ADD_F="@comment "
 PLIST_SUB+=	SUB_ADD_G="@comment "
 PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_A=""
-PLIST_SUB+=	SUB_ADD_B="@comment "
-PLIST_SUB+=	SUB_ADD_C="@comment "
-PLIST_SUB+=	SUB_ADD_D="@comment "
-PLIST_SUB+=	SUB_ADD_E="@comment "
-PLIST_SUB+=	SUB_ADD_F="@comment "
-PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A="@comment "
-.elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
-PLIST_SUB+=	SUB_ADD_A="@comment "
-PLIST_SUB+=	SUB_ADD_B="@comment "
-PLIST_SUB+=	SUB_ADD_C="@comment "
-PLIST_SUB+=	SUB_ADD_D="@comment "
-PLIST_SUB+=	SUB_ADD_E="@comment "
-PLIST_SUB+=	SUB_ADD_F="@comment "
-PLIST_SUB+=	SUB_ADD_G="@comment "
-PLIST_SUB+=	SUB_PGP_A=""
 .else # patches
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -460,14 +367,5 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
 .endif
 .endif
-.if defined(WITH_MUTT_NNTP)
-	@${ECHO}
-	@${ECHO} "------------------------------------------------"
-	@${ECHO} "Be sure to define NNTPSERVER in your environment"
-	@${ECHO} "and to be part of the group news in /etc/group"
-	@${ECHO} "if you want to post news with mutt"
-	@${ECHO} "------------------------------------------------"
-	@${ECHO}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index a7b43d4a928a..a57743ef5276 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,6 +1,5 @@
-MD5 (mutt/mutt-1.3.27i.tar.gz) = 88e7e61686b0959733ae3f7cadb07bce
-MD5 (mutt/patch-1.3.27.rr.compressed.gz) = a821153bf644a9bb98552177c66f9201
-MD5 (mutt/patch-1.3.27.vvv.nntp.gz) = ab347aa1c1455e4321a64d68c35afe61
-MD5 (mutt/patch-1.3.27.vvv.initials.gz) = 774d654d99a5e113c34dcd325eae65b8
-MD5 (mutt/patch-1.3.27.vvv.quote.gz) = 413dcc9493823146f1cf7fdbd2a4f68d
-MD5 (mutt/patch-1.3.27.vvv.ru.gz) = e8b01d6783fcf2737067d8c4534ad246
+MD5 (mutt/mutt-1.3.28i.tar.gz) = eba9bd09853ff7e441712e2d10d8632b
+MD5 (mutt/mutt-1.3.28.rr.compressed.gz) = 68a8eb3e60bae472af4c258693b4f079
+MD5 (mutt/mutt-1.3.28.vvv.nntp.gz) = 52dc8d4c6d1908c52aa898843b26308b
+MD5 (mutt/mutt-1.3.28.vvv.initials.gz) = 5eb42631d43dd93072e595d12575afeb
+MD5 (mutt/mutt-1.3.28.vvv.quote.gz) = c351c5cfd66396dd3c53fc6bbd361f15
diff --git a/mail/mutt-devel/files/extra-patch-inews b/mail/mutt-devel/files/extra-patch-inews
deleted file mode 100644
index cce61d6018b9..000000000000
--- a/mail/mutt-devel/files/extra-patch-inews
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig2	Tue Jan  1 23:00:00 2002
-+++ configure.in	Tue Jan  1 23:01:04 2002
-@@ -457,7 +457,7 @@
- AC_ARG_ENABLE(nntp, [  --enable-nntp              Enable NNTP support],
- [	if test x$enableval = xyes ; then
- 		AC_DEFINE(USE_NNTP)
--		AC_PATH_PROG(INEWS, inews, no, $PATH:/usr/sbin:/usr/lib)
-+		AC_PATH_PROG(INEWS, inews, no, $PATH:/usr/local/news/bin:/usr/sbin:/usr/lib)
- 		AC_DEFINE_UNQUOTED(INEWS, "$ac_cv_path_INEWS -hS")
- 		MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS nntp.o newsrc.o"
- 		need_socket="yes"
diff --git a/mail/mutt-devel/files/patch-14 b/mail/mutt-devel/files/patch-14
deleted file mode 100644
index 47000abaf14f..000000000000
--- a/mail/mutt-devel/files/patch-14
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -durp mutt-1.3.27.orig/imap/message.c mutt-1.3.27/imap/message.c
---- imap/message.c	Sun Jan 13 16:15:43 2002
-+++ imap/message.c	Wed Feb 27 15:01:07 2002
-@@ -350,14 +350,10 @@ int imap_fetch_message (MESSAGE *msg, CO
-    * envelope into the old one. Also messy and lowlevel. */
-   if (ctx->id_hash && h->env->message_id)
-     hash_delete (ctx->id_hash, h->env->message_id, h, NULL);
--  if (ctx->subj_hash && h->env->real_subj)
--    hash_delete (ctx->subj_hash, h->env->real_subj, h, NULL);
-   mutt_free_envelope (&h->env);
-   h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
-   if (ctx->id_hash && h->env->message_id)
-     hash_insert (ctx->id_hash, h->env->message_id, h, 0);
--  if (ctx->subj_hash && h->env->real_subj)
--    hash_insert (ctx->subj_hash, h->env->real_subj, h, 1);
- 
-   /* see above. We want the new status in h->read, so we unset it manually
-    * and let mutt_set_flag set it correctly, updating context. */
-diff -durp mutt-1.3.27.orig/mbox.c mutt-1.3.27/mbox.c
---- mbox.c	Wed Oct 31 04:40:05 2001
-+++ mbox.c	Wed Feb 27 14:58:27 2002
-@@ -1082,8 +1082,6 @@ int mutt_reopen_mailbox (CONTEXT *ctx, i
-   /* simulate a close */
-   if (ctx->id_hash)
-     hash_destroy (&ctx->id_hash, NULL);
--  if (ctx->subj_hash)
--    hash_destroy (&ctx->subj_hash, NULL);
-   mutt_clear_threads (ctx);
-   safe_free ((void **) &ctx->v2r);
-   if (ctx->readonly)
-@@ -1110,7 +1108,6 @@ int mutt_reopen_mailbox (CONTEXT *ctx, i
-   ctx->flagged = 0;
-   ctx->changed = 0;
-   ctx->id_hash = NULL;
--  ctx->subj_hash = NULL;
- 
-   switch (ctx->magic)
-   {
-diff -durp mutt-1.3.27.orig/mx.c mutt-1.3.27/mx.c
---- mx.c.orig2	Thu Feb 28 08:56:55 2002
-+++ mx.c	Thu Feb 28 09:01:24 2002
-@@ -804,2 +803,0 @@
--  if (ctx->subj_hash)
--    hash_destroy (&ctx->subj_hash, NULL);
-@@ -1180,2 +1177,0 @@
--      if (ctx->subj_hash && ctx->hdrs[i]->env->real_subj)
--	hash_delete (ctx->subj_hash, ctx->hdrs[i]->env->real_subj, ctx->hdrs[i], NULL);
-@@ -1716,2 +1711,0 @@
--    if (ctx->subj_hash && h->env->real_subj)
--      hash_insert (ctx->subj_hash, h->env->real_subj, h, 1);
-diff -durp mutt-1.3.27.orig/thread.c mutt-1.3.27/thread.c
---- thread.c	Wed Jan 16 15:43:59 2002
-+++ thread.c	Wed Feb 27 15:04:43 2002
-@@ -435,8 +435,9 @@ static void pseudo_threads (CONTEXT *ctx
-   THREAD *tree = ctx->tree, *top = tree;
-   THREAD *tmp, *cur, *parent, *curchild, *nextchild;
- 
--  if (!ctx->subj_hash)
--    ctx->subj_hash = mutt_make_subj_hash (ctx);
-+  if (ctx->subj_hash)
-+    hash_destroy (&ctx->subj_hash, NULL);
-+  ctx->subj_hash = mutt_make_subj_hash (ctx);
- 
-   while (tree)
-   {
-@@ -504,6 +505,8 @@ void mutt_clear_threads (CONTEXT *ctx)
- 
-   if (ctx->thread_hash)
-     hash_destroy (&ctx->thread_hash, *free);
-+  if (ctx->subj_hash)
-+    hash_destroy (&ctx->subj_hash, NULL);
- }
- 
- int compare_threads (const void *a, const void *b)
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 456c8af0a434..6fea339710a5 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -418,27 +418,27 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual332.html
 %%SUB_HTML%%share/doc/mutt/html/manual333.html
 %%SUB_HTML%%share/doc/mutt/html/manual334.html
-%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_PGP%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual336.html
-%%SUB_ADD_A%%%%SUB_PGP%%share/doc/mutt/html/manual337.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual336.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual337.html
+%%SUB_HTML%%share/doc/mutt/html/manual335.html
+%%SUB_HTML%%share/doc/mutt/html/manual336.html
+%%SUB_HTML%%share/doc/mutt/html/manual337.html
+%%SUB_HTML%%%%SUB_PGP_A%%%%SUB_PGP%%share/doc/mutt/html/manual338.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual338.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual339.html
+%%SUB_ADD_A%%%%SUB_PGP%%share/doc/mutt/html/manual340.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual339.html
-%%SUB_ADD_B%%%%SUB_PGP%%share/doc/mutt/html/manual340.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual336.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual340.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_B%%%%SUB_PGP%%share/doc/mutt/html/manual343.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual339.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual340.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual341.html
-%%SUB_ADD_C%%%%SUB_PGP%%share/doc/mutt/html/manual342.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual336.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_C%%%%SUB_PGP%%share/doc/mutt/html/manual345.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual339.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual340.html
@@ -457,10 +457,11 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_D%%share/doc/mutt/html/manual353.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual354.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual355.html
-%%SUB_ADD_D%%%%SUB_PGP%%share/doc/mutt/html/manual356.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual336.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual356.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual357.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual358.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual359.html
+%%SUB_ADD_D%%%%SUB_PGP%%share/doc/mutt/html/manual360.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual339.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual340.html
@@ -481,10 +482,11 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_E%%share/doc/mutt/html/manual355.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual356.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual357.html
-%%SUB_ADD_E%%%%SUB_PGP%%share/doc/mutt/html/manual358.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual336.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual358.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual359.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual360.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual361.html
+%%SUB_ADD_E%%%%SUB_PGP%%share/doc/mutt/html/manual362.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual339.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual340.html
@@ -508,10 +510,11 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_F%%share/doc/mutt/html/manual358.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual359.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual360.html
-%%SUB_ADD_F%%%%SUB_PGP%%share/doc/mutt/html/manual361.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual335.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual336.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual361.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual362.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual364.html
+%%SUB_ADD_F%%%%SUB_PGP%%share/doc/mutt/html/manual365.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual338.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual339.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual340.html
@@ -537,6 +540,10 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_G%%share/doc/mutt/html/manual360.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual361.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual362.html
-%%SUB_ADD_G%%%%SUB_PGP%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual363.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual364.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual365.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual366.html
+%%SUB_ADD_G%%%%SUB_PGP%%share/doc/mutt/html/manual367.html
 %%SUB_HTML%%@dirrm share/doc/mutt/html
 %%PORTDOCS%%@dirrm share/doc/mutt