- build with IMAP and POP support when PACKAGE_BUILDING (because that was

  default before adding the WITH_MUTT_IMAP and WITH_MUTT_POP knobs).

- fix pkg-plist if not build with WITH_MUTT_IMAP or WITH_MUTT_POP.

- rename internal variable to less confusing name

Submitted by:	Udo Schweigert <ust@cert.siemens.de>

2 files changed, 563 insertions, 18 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index aa53d2cc9571..cf1fb68f5ed8 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -47,6 +47,8 @@ PATCH_VERSION=	${PORTVERSION}
 
 .if defined(PACKAGE_BUILDING)
 WITH_MUTT_SLANG=	yes
+WITH_MUTT_IMAP=		yes
+WITH_MUTT_POP=		yes
 BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
 		urlview:${PORTSDIR}/textproc/urlview
@@ -127,8 +129,12 @@ post-build:
 		ed -s ${WRKSRC}/doc/mutt.man
 .if defined(WITH_MUTT_HTML)
 PLIST_SUB+=	SUB_HTML=""
+.if defined(WITH_MUTT_IMAP) || defined(WITH_MUTT_POP)
+IMAP_OR_POP_SET:=	yes
+.endif
 .if defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_G=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -136,8 +142,16 @@ 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_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_F=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -145,8 +159,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_G=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -154,8 +176,16 @@ 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_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_F=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -163,8 +193,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_C=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -172,8 +210,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_B=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -181,8 +227,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_C=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -190,8 +244,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_B=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -199,8 +261,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_E=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -208,8 +278,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_D=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -217,8 +295,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_E=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -226,8 +312,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_D=""
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -235,8 +329,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_A=""
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -244,8 +346,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -253,8 +363,16 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && defined(WITH_MUTT_QUOTE_PATCH) && \
+	defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_A=""
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -262,8 +380,288 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@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_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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@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_N=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_M="@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_M=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_N=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_M="@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_M=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_J=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_I=""
+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_ADD_H="@comment "
+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_N="@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_J=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_I=""
+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_ADD_H="@comment "
+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_N="@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_L=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_K=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_L=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_K="@comment "
+PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_K=""
+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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+PLIST_SUB+=	SUB_ADD_J="@comment "
+PLIST_SUB+=	SUB_ADD_L="@comment "
+PLIST_SUB+=	SUB_ADD_M="@comment "
+PLIST_SUB+=	SUB_ADD_N="@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_H=""
+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_ADD_I="@comment "
+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_N="@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_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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@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_H=""
+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_ADD_I="@comment "
+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_N="@comment "
 .elif !defined(WITH_MUTT_COMPRESSED_FOLDERS) && !defined(WITH_MUTT_NNTP) && \
-	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH)
+	!defined(WITH_MUTT_RU_PATCH) && !defined(WITH_MUTT_QUOTE_PATCH) && \
+	!defined(IMAP_OR_POP_SET)
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
 PLIST_SUB+=	SUB_ADD_C="@comment "
@@ -271,6 +669,13 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .else # patches
 PLIST_SUB+=	SUB_ADD_A="@comment "
 PLIST_SUB+=	SUB_ADD_B="@comment "
@@ -279,6 +684,13 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .endif
 .else # HTML
 PLIST_SUB+=	SUB_HTML="@comment "
@@ -289,6 +701,13 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 .endif
 .else 	# NOPORTDOCS
 PLIST_SUB+=	SUB_DOCS="@comment "
@@ -300,6 +719,13 @@ 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_ADD_H="@comment "
+PLIST_SUB+=	SUB_ADD_I="@comment "
+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_N="@comment "
 post-patch:
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index cedd17383f0c..4c8e59b601f0 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -261,8 +261,8 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%SUB_HTML%%share/doc/mutt/html/manual255.html
 %%SUB_HTML%%share/doc/mutt/html/manual256.html
 %%SUB_HTML%%share/doc/mutt/html/manual257.html
-%%SUB_HTML%%share/doc/mutt/html/manual258.html
-%%SUB_HTML%%share/doc/mutt/html/manual259.html
+%%SUB_HTML%%share/doc/mutt/html/manual258.html             
+%%SUB_HTML%%share/doc/mutt/html/manual259.html             
 %%SUB_HTML%%share/doc/mutt/html/manual26.html
 %%SUB_HTML%%share/doc/mutt/html/manual260.html
 %%SUB_HTML%%share/doc/mutt/html/manual261.html
@@ -412,11 +412,13 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%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_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
@@ -424,6 +426,7 @@ share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%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
@@ -526,5 +529,121 @@ 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_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_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_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
+%%SUB_ADD_K%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual334.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual335.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual336.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual338.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual339.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual340.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_K%%share/doc/mutt/html/manual343.html
+%%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_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
+%%SUB_ADD_L%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual334.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual335.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual336.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual338.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual339.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual340.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_L%%share/doc/mutt/html/manual345.html
+%%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_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
+%%SUB_ADD_M%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual334.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual335.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual336.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual338.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual339.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual340.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual345.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual346.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual347.html
+%%SUB_ADD_M%%share/doc/mutt/html/manual348.html
+%%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_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
+%%SUB_ADD_N%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual334.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual335.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual336.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual337.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual338.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual339.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual340.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual345.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual346.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual347.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual348.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual349.html
+%%SUB_ADD_N%%share/doc/mutt/html/manual350.html
+%%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_HTML%%@dirrm share/doc/mutt/html
 %%SUB_DOCS%%@dirrm share/doc/mutt