3 files changed, 89 insertions, 51 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 52e4d9e3c8ad..81dd2d9af00a 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.3.22.1
-PORTREVISION=	1
+PORTVERSION=	1.3.23
 CATEGORIES+=	mail
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -119,7 +118,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 MAN1=		flea.1 mutt.1 mutt_dotlock.1 muttbug.1
 MAN5=		muttrc.5 mbox.5
 
-post-patch:
+post-patch::
 	 @${PERL} -pi.fbsd -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
 
@@ -154,6 +153,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -171,6 +171,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -188,6 +189,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -205,6 +207,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -222,6 +225,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -239,6 +243,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -256,6 +261,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -273,6 +279,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -290,6 +297,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -307,6 +315,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -324,6 +333,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -341,6 +351,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
@@ -358,9 +369,11 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
+PLIST_SUB+=	SUB_ADD_O=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -392,9 +405,11 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	defined(IMAP_OR_POP_SET)
+PLIST_SUB+=	SUB_ADD_O=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -426,6 +441,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -443,6 +459,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -460,6 +477,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -477,6 +495,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -494,6 +513,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -511,6 +531,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -528,6 +549,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -545,6 +567,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -562,6 +585,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -579,6 +603,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -596,6 +621,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -613,6 +639,7 @@ PLIST_SUB+=	SUB_ADD_J="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -630,6 +657,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -647,6 +675,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -664,6 +693,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
 	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
 	!defined(IMAP_OR_POP_SET)
@@ -681,6 +711,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .else # patches
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -696,6 +727,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .endif
 .else # HTML
 PLIST_SUB+=	SUB_HTML="@comment "
@@ -713,6 +745,7 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
+PLIST_SUB+=	SUB_ADD_O="@comment "
 .endif
 .else 	# NOPORTDOCS
 PLIST_SUB+=	SUB_HTML="@comment "
@@ -730,7 +763,8 @@ PLIST_SUB+=	SUB_ADD_K="@comment "
 PLIST_SUB+=	SUB_ADD_L="@comment "
 PLIST_SUB+=	SUB_ADD_M="@comment "
 PLIST_SUB+=	SUB_ADD_N="@comment "
-post-patch:
+PLIST_SUB+=	SUB_ADD_O="@comment "
+post-patch::
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
 .endif
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index bbab126c6a7c..2f409b7257c1 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (mutt/mutt-1.3.22.1i.tar.gz) = cef70b45444ddff0a1128d89f9fc7086
-MD5 (mutt/patch-1.3.22.1.rr.compressed.gz) = 48664a452fe0b202ebb6c1dcf4e86e70
-MD5 (mutt/patch-1.3.22.1.vvv.nntp.gz) = e8d75799330a1824d2638078b86320df
-MD5 (mutt/patch-1.3.22.1.vvv.initials.gz) = 927a087886b866d48aa19d1f2e6043fc
-MD5 (mutt/patch-1.3.22.1.vvv.quote.gz) = 3173c88ca5a6871298113a76f0e44f90
-MD5 (mutt/patch-1.3.22.1.vvv.ru.gz) = b338e1b6993bbab930d0df2d38deb909
+MD5 (mutt/mutt-1.3.23i.tar.gz) = 0de890dca66042bcfcb01023c691bb5a
+MD5 (mutt/patch-1.3.23.rr.compressed.gz) = 384f31f3ed9b4e4dec9b1958c10243ab
+MD5 (mutt/patch-1.3.23.vvv.nntp.gz) = cc00c8fee6c8d0223ad6e1bce54ec1d3
+MD5 (mutt/patch-1.3.23.vvv.initials.gz) = 2ce0d25369dc64ed07239a7fbfe34a29
+MD5 (mutt/patch-1.3.23.vvv.quote.gz) = adbd067d1acb8426624e719791269789
+MD5 (mutt/patch-1.3.23.vvv.ru.gz) = 4b9d34b244124f1d92a1e8f676d5a2c7
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index 035dc57ca29b..45fae142d9fe 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -333,6 +333,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual322.html
 %%SUB_HTML%%share/doc/mutt/html/manual323.html
 %%SUB_HTML%%share/doc/mutt/html/manual324.html
+%%SUB_HTML%%share/doc/mutt/html/manual325.html
+%%SUB_HTML%%share/doc/mutt/html/manual326.html
+%%SUB_HTML%%share/doc/mutt/html/manual327.html
 %%SUB_HTML%%share/doc/mutt/html/manual31.html
 %%SUB_HTML%%share/doc/mutt/html/manual32.html
 %%SUB_HTML%%share/doc/mutt/html/manual33.html
@@ -409,26 +412,23 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual98.html
 %%SUB_HTML%%share/doc/mutt/html/manual99.html
 %%SUB_HTML%%share/doc/mutt/html/manual_toc.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_A%%share/doc/mutt/html/manual327.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_B%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual328.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual329.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual330.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_B%%share/doc/mutt/html/manual330.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_C%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual333.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual330.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual331.html
 %%SUB_ADD_C%%share/doc/mutt/html/manual332.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_D%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual334.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual335.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual330.html
@@ -448,9 +448,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_D%%share/doc/mutt/html/manual344.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual345.html
 %%SUB_ADD_D%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_E%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual347.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual348.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual349.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual330.html
@@ -472,9 +472,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_E%%share/doc/mutt/html/manual346.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual347.html
 %%SUB_ADD_E%%share/doc/mutt/html/manual348.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_F%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual349.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual350.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual351.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual330.html
@@ -499,9 +499,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_F%%share/doc/mutt/html/manual349.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual350.html
 %%SUB_ADD_F%%share/doc/mutt/html/manual351.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_G%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual352.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual353.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual354.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual330.html
@@ -528,23 +528,23 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_G%%share/doc/mutt/html/manual351.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual352.html
 %%SUB_ADD_G%%share/doc/mutt/html/manual353.html
-%%SUB_ADD_H%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_H%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_I%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_I%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_I%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual354.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual355.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual356.html
+%%SUB_ADD_H%%share/doc/mutt/html/manual328.html
+%%SUB_ADD_H%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_I%%share/doc/mutt/html/manual329.html
-%%SUB_ADD_J%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_J%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_J%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_I%%share/doc/mutt/html/manual330.html
+%%SUB_ADD_I%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_I%%share/doc/mutt/html/manual332.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual330.html
 %%SUB_ADD_J%%share/doc/mutt/html/manual331.html
-%%SUB_ADD_K%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_K%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_K%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_J%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_J%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_J%%share/doc/mutt/html/manual334.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual330.html
@@ -564,9 +564,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_K%%share/doc/mutt/html/manual344.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual345.html
 %%SUB_ADD_K%%share/doc/mutt/html/manual346.html
-%%SUB_ADD_L%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_L%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_L%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual347.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual348.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual349.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual330.html
@@ -588,9 +588,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_L%%share/doc/mutt/html/manual346.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual347.html
 %%SUB_ADD_L%%share/doc/mutt/html/manual348.html
-%%SUB_ADD_M%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_M%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_M%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual349.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual350.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual351.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual330.html
@@ -615,9 +615,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_M%%share/doc/mutt/html/manual349.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual350.html
 %%SUB_ADD_M%%share/doc/mutt/html/manual351.html
-%%SUB_ADD_N%%share/doc/mutt/html/manual325.html
-%%SUB_ADD_N%%share/doc/mutt/html/manual326.html
-%%SUB_ADD_N%%share/doc/mutt/html/manual327.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual352.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual353.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual354.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual328.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual329.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual330.html
@@ -644,5 +644,9 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_ADD_N%%share/doc/mutt/html/manual351.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual352.html
 %%SUB_ADD_N%%share/doc/mutt/html/manual353.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual354.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual355.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual356.html
+%%SUB_ADD_O%%share/doc/mutt/html/manual328.html
 %%SUB_HTML%%@dirrm share/doc/mutt/html
 %%PORTDOCS%%@dirrm share/doc/mutt