Disable --regex for stable

Rename WITH_* to WITH_MUTT_* to make unique in /etc/make.conf
Split VVV_PATCHES into three parts
Portlint compliance

Submitted by:	maintainer

2 files changed, 317 insertions, 90 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index cc548516ffa5..d77662ea5b62 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -8,102 +8,94 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	1.3.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/ \
 		ftp://ftp.parodius.com/pub/mutt/devel/
 DISTNAME=	mutt-${PORTVERSION}i
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+#DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
+MAINTAINER=	ust@cert.siemens.de
+
 DIST_SUBDIR=    mutt
 GNU_CONFIGURE=  yes
-CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
-                --with-sharedir=${PREFIX}/share/mutt \
-                --with-docdir=${PREFIX}/share/doc/mutt \
-                --sysconfdir=${PREFIX}/etc \
-                --with-iconv=${PREFIX}
-
-MAINTAINER=	ust@cert.siemens.de
+CONFIGURE_ARGS=	--enable-pop --enable-imap --enable-flock --disable-fcntl \
+		--with-sharedir=${PREFIX}/share/mutt \
+		--with-docdir=${PREFIX}/share/doc/mutt \
+		--sysconfdir=${PREFIX}/etc \
+		--with-iconv=${PREFIX}
 
 .include <bsd.port.pre.mk>
 
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 
-.if defined(WITH_VVV_PATCHES) && defined(WITH_COMPRESSED_FOLDERS)
-.error WITH_VVV_PATCHES and WITH_COMPRESSED_FOLDERS cannot be used together
-.endif
-
-.if defined(WITH_VVV_PATCHES)
+.if defined(WITH_MUTT_COMPRESSED_FOLDERS) || defined(WITH_MUTT_NNTP) || \
+		defined(WITH_MUTT_RU_PATCH) || defined(WITH_MUTT_QUOTE_PATCH)
 PATCH_SITES+=	http://mutt.org.ua/download/mutt-${PATCH_VERSION}/ \
 		ftp://mutt.org.ua/mutt/mutt-${PATCH_VERSION}/
 .endif
 
-.if defined(WITH_COMPRESSED_FOLDERS)
-PATCH_SITES+=	http://www.spinnaker.de/mutt/compressed/
-.endif
-
 .if !defined(PATCH_VERSION)
 PATCH_VERSION=	${PORTVERSION}
 .endif
 
 .if defined(PACKAGE_BUILDING)
-WITH_SLANG=	yes
+WITH_MUTT_SLANG=	yes
 BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
 		urlview:${PORTSDIR}/textproc/urlview
 .if ${MACHINE_ARCH} != "alpha"
 #  coredump in sgmls
-WITH_HTML=	yes
+WITH_MUTT_HTML=	yes
 .endif
 .endif
 
 LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
 		giconv.2:${PORTSDIR}/converters/libiconv
 
-.if defined(WITH_SLANG)
+.if defined(WITH_MUTT_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
-.elif defined(WITH_NCURSES_PORT)
+.elif defined(WITH_MUTT_NCURSES_PORT)
 LIB_DEPENDS+=	ncurses.5:${PORTSDIR}/devel/ncurses
 CFLAGS+=	-I${PREFIX}/include/ncurses -I${PREFIX}/include
 .endif
-.if defined(WITH_SSL)
+.if defined(WITH_MUTT_SSL)
 USE_OPENSSL=	yes
 .endif
-.if defined(WITH_HTML)
+.if defined(WITH_MUTT_HTML)
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
 
-.if defined(WITH_LOCALES_FIX)
+.if defined(WITH_MUTT_LOCALES_FIX)
 CONFIGURE_ARGS+=	--enable-locales-fix
 .endif
-.if defined(WITH_SLANG)
+.if defined(WITH_MUTT_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
+.elif defined(WITH_MUTT_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
-.if defined(WITH_SSL)
+.if defined(WITH_MUTT_SSL)
 CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
 .endif
 
-.if defined(WITH_COMPRESSED_FOLDERS)
-PATCHFILES+=	patch-${PATCH_VERSION}.rr.compressed.1.gz
 PATCH_DIST_STRIP=	-p1
-CONFIGURE_ARGS+=	--enable-compressed
-.endif
 
-.if defined(WITH_VVV_PATCHES)
-PATCHFILES+=	patch-${PATCH_VERSION}.rr.compressed.gz \
-		patch-${PATCH_VERSION}.vvv.nntp.gz \
-		patch-${PATCH_VERSION}.vvv.initials.gz \
-		patch-${PATCH_VERSION}.vvv.quote.gz \
-		patch-${PATCH_VERSION}.vvv.ru.gz
-PATCH_DIST_STRIP=	-p1
-CONFIGURE_ARGS+=	--enable-nntp --enable-compressed
-.if ${OSVERSION} < 500000 # --with-regex broken under -current
+.if defined(WITH_MUTT_COMPRESSED_FOLDERS)
+PATCHFILES+=	patch-${PATCH_VERSION}.rr.compressed.gz
 CONFIGURE_ARGS+=	--enable-compressed
 .endif
+.if defined(WITH_MUTT_NNTP)
+PATCHFILES+=	patch-${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
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
@@ -120,28 +112,181 @@ post-build:
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref
 	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
 		ed -s ${WRKSRC}/doc/mutt.man
-.if defined(WITH_HTML)
+.if defined(WITH_MUTT_HTML)
 PLIST_SUB+=	SUB_HTML=""
-.if defined(WITH_COMPRESSED_FOLDERS)
-PLIST_SUB+=	SUB_COMPRESSED=""
-.else
-PLIST_SUB+=	SUB_COMPRESSED="@comment "
-.endif
-.if defined(WITH_VVV_PATCHES)
-PLIST_SUB+=	SUB_VVV=""
+.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 "
+.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 "
+.elif 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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
+.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 "
 .else
-PLIST_SUB+=	SUB_VVV="@comment "
+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 "
 .endif
-.else
+.else # HTML
 PLIST_SUB+=	SUB_HTML="@comment "
-PLIST_SUB+=	SUB_COMPRESSED="@comment "
-PLIST_SUB+=	SUB_VVV="@comment "
+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 "
 .endif
 .else 	# NOPORTDOCS
 PLIST_SUB+=	SUB_DOCS="@comment "
 PLIST_SUB+=	SUB_HTML="@comment "
-PLIST_SUB+=	SUB_COMPRESSED="@comment "
-PLIST_SUB+=	SUB_VVV="@comment "
+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 "
 post-patch:
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
@@ -155,7 +300,7 @@ post-install:
 		${CHMOD} a+rx ${PREFIX}/share/doc/mutt
 	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
 		${PREFIX}/share/doc/mutt
-.if defined(WITH_HTML)
+.if defined(WITH_MUTT_HTML)
 	@${MKDIR} ${PREFIX}/share/doc/mutt/html && \
 		${CHMOD} a+rx ${PREFIX}/share/doc/mutt/html
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
diff --git a/mail/mutt-devel/pkg-plist b/mail/mutt-devel/pkg-plist
index ba0e1fdb3cf1..cbcfec976491 100644
--- a/mail/mutt-devel/pkg-plist
+++ b/mail/mutt-devel/pkg-plist
@@ -406,39 +406,121 @@ share/locale/zh_TW.Big5/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_COMPRESSED%%share/doc/mutt/html/manual321.html
-%%SUB_COMPRESSED%%share/doc/mutt/html/manual322.html
-%%SUB_COMPRESSED%%share/doc/mutt/html/manual323.html
-%%SUB_COMPRESSED%%share/doc/mutt/html/manual324.html
-%%SUB_COMPRESSED%%share/doc/mutt/html/manual325.html
-%%SUB_VVV%%share/doc/mutt/html/manual321.html
-%%SUB_VVV%%share/doc/mutt/html/manual322.html
-%%SUB_VVV%%share/doc/mutt/html/manual323.html
-%%SUB_VVV%%share/doc/mutt/html/manual324.html
-%%SUB_VVV%%share/doc/mutt/html/manual325.html
-%%SUB_VVV%%share/doc/mutt/html/manual326.html
-%%SUB_VVV%%share/doc/mutt/html/manual327.html
-%%SUB_VVV%%share/doc/mutt/html/manual328.html
-%%SUB_VVV%%share/doc/mutt/html/manual329.html
-%%SUB_VVV%%share/doc/mutt/html/manual330.html
-%%SUB_VVV%%share/doc/mutt/html/manual331.html
-%%SUB_VVV%%share/doc/mutt/html/manual332.html
-%%SUB_VVV%%share/doc/mutt/html/manual333.html
-%%SUB_VVV%%share/doc/mutt/html/manual334.html
-%%SUB_VVV%%share/doc/mutt/html/manual335.html
-%%SUB_VVV%%share/doc/mutt/html/manual336.html
-%%SUB_VVV%%share/doc/mutt/html/manual337.html
-%%SUB_VVV%%share/doc/mutt/html/manual338.html
-%%SUB_VVV%%share/doc/mutt/html/manual339.html
-%%SUB_VVV%%share/doc/mutt/html/manual340.html
-%%SUB_VVV%%share/doc/mutt/html/manual341.html
-%%SUB_VVV%%share/doc/mutt/html/manual342.html
-%%SUB_VVV%%share/doc/mutt/html/manual343.html
-%%SUB_VVV%%share/doc/mutt/html/manual344.html
-%%SUB_VVV%%share/doc/mutt/html/manual345.html
-%%SUB_VVV%%share/doc/mutt/html/manual346.html
-%%SUB_VVV%%share/doc/mutt/html/manual347.html
-%%SUB_VVV%%share/doc/mutt/html/manual348.html
-%%SUB_VVV%%share/doc/mutt/html/manual349.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual321.html
+%%SUB_ADD_A%%share/doc/mutt/html/manual322.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual321.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual322.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual323.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual324.html
+%%SUB_ADD_B%%share/doc/mutt/html/manual325.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual321.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual322.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual323.html
+%%SUB_ADD_C%%share/doc/mutt/html/manual324.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_D%%share/doc/mutt/html/manual321.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual322.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual323.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual324.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_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
+%%SUB_ADD_D%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual334.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_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
+%%SUB_ADD_D%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_D%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual321.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual322.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual323.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual324.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_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
+%%SUB_ADD_E%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual334.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_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
+%%SUB_ADD_E%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_E%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual321.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual322.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual323.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual324.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_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
+%%SUB_ADD_F%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual334.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_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
+%%SUB_ADD_F%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual345.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual346.html
+%%SUB_ADD_F%%share/doc/mutt/html/manual347.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual321.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual322.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual323.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual324.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_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
+%%SUB_ADD_G%%share/doc/mutt/html/manual331.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual332.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual333.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual334.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_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
+%%SUB_ADD_G%%share/doc/mutt/html/manual341.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual342.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual343.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual344.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual345.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual346.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual347.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual348.html
+%%SUB_ADD_G%%share/doc/mutt/html/manual349.html
 %%SUB_HTML%%@dirrm share/doc/mutt/html
 %%SUB_DOCS%%@dirrm share/doc/mutt