- Update to 1.5.21 [1]

- Make use of grouping rules for DISTFILES and MASTER_SITES
- Use PKGNAMESUFFIX to make portlint happier
- Add OPTIONS

PR:		ports/153234 [1]
Submitted by:	SHIOZAKI Takehiko <st_AT_be_DOT_to> [1]

9 files changed, 130 insertions, 100 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 4f4b6ee46226..f3339e36cf30 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -4,21 +4,25 @@
 #
 # $FreeBSD$
 #
-# WITH_MUTT_CYRUS_SASL:	if defined, 'Cyrus sasl' support.
+# WITH_MUTT_CYRUS_SASL2:	if defined, 'Cyrus sasl' support.
 #
 
-PORTNAME=	mutt-devel
+PORTNAME=	mutt
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	11
 CATEGORIES=	japanese mail
-MASTER_SITES=	http://www.emaillab.org/mutt/${VERSION}/ \
-		http://www.emaillab.org/mutt/1.5/doc/:ja_doc \
-		http://133.16.174.22/mutt/ \
-		http://mutt-j.sourceforge.jp/ \
-		ftp://ftp.mutt.org/mutt/devel/
+MASTER_SITES=	ftp://ftp.mutt.org/mutt/devel/:body \
+		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/devel/:body \
+		ftp://ftp.demon.co.uk/pub/mirrors/mutt/devel/:body \
+		ftp://ftp.parodius.com/pub/mutt/devel/:body \
+		http://www.emaillab.org/mutt/${MANUALVERSION}/:ja_man1 \
+		http://mutt-j.sourceforge.jp/:ja_man2 \
+		http://www.emaillab.org/mutt/1.5/doc/:ja_doc
 PKGNAMEPREFIX=	ja-
+PKGNAMESUFFIX=	-devel
 DISTNAME=	mutt-${VERSION}
-DISTFILES=	${EXTRACT_ONLY} \
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:body \
+		manual_ja-${MANUALVERSION}i-1${EXTRACT_SUFX}:ja_man1 \
+		manual.ja-${MANJADATE}${EXTRACT_SUFX}:ja_man2 \
 		README.JA-PATCH.ja.html:ja_doc \
 		README.JA-PATCH.ja:ja_doc \
 		INSTALL.JA-PATCH.ja.html:ja_doc \
@@ -33,7 +37,10 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		manual.ja-${MANJADATE}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://www.emaillab.org/mutt/${VERSION}/:ja_patch
-PATCHFILES=	patch-${VERSION}.mutt-j.ja.${JP_VERSION}.gz:ja_patch
+PATCHFILES=	patch-${VERSION}.tt.wcwidth.${JP_VERSION}.gz:ja_patch \
+		patch-${VERSION}.tt.create_rfc2047_params.${JP_VERSION}.gz:ja_patch \
+		patch-${VERSION}.tt+yy.delete_prefix.${JP_VERSION}.gz:ja_patch \
+		patch-${VERSION}.tt.sanitize_ja_char.${JP_VERSION}.gz:ja_patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	st@be.to
@@ -43,24 +50,9 @@ LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview \
 		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-.endif
-.if defined(WITH_MUTT_CYRUS_SASL)
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-.endif
-.if defined(WITH_MUTT_IDN)
-LIB_DEPENDS+=	idn.16:${PORTSDIR}/dns/libidn
-.endif
-
-.if defined(WITH_MUTT_HEADER_CACHE)
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--enable-hcache
-.endif
-
-CONFLICTS=	mutt-* ja-mutt-1.[024]*
+CONFLICTS=	mutt-[0-9]* ja-mutt-1.[0-4]*
 
-VERSION=	1.5.14
+VERSION=	1.5.21
 JP_VERSION=	1
 MANUALVERSION=	1.4
 MANJADATE=	20050813
@@ -81,39 +73,70 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--without-wc-funcs \
 		--enable-flock --disable-fcntl \
 		--with-ssl \
-		--sysconfdir=${PREFIX}/etc --mandir=${PREFIX}/man \
+		--sysconfdir=${PREFIX}/etc \
 		--with-docdir=${DOCSDIR} \
 		--enable-pop --enable-imap \
-		--enable-default-japanese
+		--enable-smtp
 .if defined(MUTT_CONFIGURE_ARGS)
 CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
 .endif
+
+OPTIONS=	MUTT_CYRUS_SASL2		"Enable SASL2 authentication"	off \
+		MUTT_IMAP_HEADER_CACHE		"Enable imap header cache"	off \
+		MUTT_IDN			"Enable idn support"		off \
+		MUTT_MAILDIR_HEADER_CACHE	"Enable maildir header cache"	off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+.endif
+.if defined(WITH_MUTT_CYRUS_SASL2)
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+.endif
+.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
+WITH_MUTT_IMAP_HEADER_CACHE=	yes
+.endif
+.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
+USE_BDB=	42+
+.endif
+.if exists(${LOCALBASE}/lib/libidn.so) && !defined(WITHOUT_MUTT_IDN)
+WITH_MUTT_IDN=	yes
+.endif
+.if defined(WITH_MUTT_IDN)
+LIB_DEPENDS+=	idn:${PORTSDIR}/dns/libidn
+.endif
+
+.if defined(WITH_MUTT_CYRUS_SASL2)
+CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
+.endif
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB=	NLS="@comment "
+PLIST_SUB+=	NLS="@comment "
 .else
 PLIST_SUB+=	NLS=""
 .endif
-.if defined(WITH_MUTT_CYRUS_SASL)
-CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
-.endif
-.if defined(WITH_MUTT_HEADER_CACHE)
-CONFIGURE_ARGS+=	--enable-hcache
-.endif
 .if defined(WITH_MUTT_IDN)
-CONFIGURE_ARGS+=	--with-idn=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-idn
 .else
 CONFIGURE_ARGS+=	--without-idn
 .endif
+.if defined(WITH_MUTT_IMAP_HEADER_CACHE)
+CONFIGURE_ARGS+=	--enable-hcache --without-gdbm --with-bdb
+.else
+CONFIGURE_ARGS+=	--disable-hcache
+.endif
+.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE)
+CONFIGURE_ARGS+=	--without-qdbm
+.endif
 
 NOMANCOMPRESS=	yes
-MAN1=		flea.1 mutt.1 muttbug.1 mutt_dotlock.1
+MAN1=		flea.1 mutt.1 muttbug.1 mutt_dotlock.1 smime_keys.1
 MAN5=		muttrc.5 mbox.5 mmdf.5
 
 pre-configure:
 .if defined(NOPORTDOCS)
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-aa
-	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-ab
+	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-nodoc-contrib
 .endif
 	(cd ${WRKSRC}; ${ACLOCAL} -I m4; ${AUTOHEADER})
 
@@ -144,4 +167,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/manual.ja.sgml ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index f26761659e79..e7bc2ad70e8d 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,36 +1,30 @@
-MD5 (mutt/mutt-1.5.14.tar.gz) = 6d33b4f0074e39772021d947c49b30c6
-SHA256 (mutt/mutt-1.5.14.tar.gz) = 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a
-SIZE (mutt/mutt-1.5.14.tar.gz) = 3441678
-MD5 (mutt/manual_ja-1.4i-1.tar.gz) = 07623b9b958f89070f8dd1f227f71605
+SHA256 (mutt/mutt-1.5.21.tar.gz) = 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0
+SIZE (mutt/mutt-1.5.21.tar.gz) = 3716886
 SHA256 (mutt/manual_ja-1.4i-1.tar.gz) = a0c02908bb5d47c30cf7a8c5e05bfe875439448ec050382671c1368b7d3c4d61
 SIZE (mutt/manual_ja-1.4i-1.tar.gz) = 300461
-MD5 (mutt/manual.ja-20050813.tar.gz) = 3aa5054d043b225b3a469ab01be8ef55
 SHA256 (mutt/manual.ja-20050813.tar.gz) = bee26bc377bc51e68611cbfaf2d352ad4bf00648ad86ba96b572a21cd27774cd
 SIZE (mutt/manual.ja-20050813.tar.gz) = 281491
-MD5 (mutt/README.JA-PATCH.ja.html) = c677d0a2587a0f81208936dc6880f720
 SHA256 (mutt/README.JA-PATCH.ja.html) = 6f23bde1416919205cf6a9393abf295b533ca2f82cd59bfabb6f1a6970ae0196
 SIZE (mutt/README.JA-PATCH.ja.html) = 15346
-MD5 (mutt/README.JA-PATCH.ja) = 99a681762ff6e12357ab899ef3356c55
 SHA256 (mutt/README.JA-PATCH.ja) = 4b017013108ac0bf45e6e5117351f8d6f61bedabf46f1c719985f82d1c12993f
 SIZE (mutt/README.JA-PATCH.ja) = 8978
-MD5 (mutt/INSTALL.JA-PATCH.ja.html) = cfaa54611c90d6319178c7caadcd1f68
 SHA256 (mutt/INSTALL.JA-PATCH.ja.html) = ad2ad98c745544d4558f82c33873380066c526d7775a0685be54758682907646
 SIZE (mutt/INSTALL.JA-PATCH.ja.html) = 11821
-MD5 (mutt/INSTALL.JA-PATCH.ja) = 9a80dd039a19465d74065dc3aee21984
 SHA256 (mutt/INSTALL.JA-PATCH.ja) = 2e1e3bc60937f2b116be58bf16987339efaef6c5130e253038b91f364f8ac929
 SIZE (mutt/INSTALL.JA-PATCH.ja) = 7651
-MD5 (mutt/manual-ja-patch.ja.html) = 3e2495936a70c8c5146840ceee56c79c
 SHA256 (mutt/manual-ja-patch.ja.html) = 8607c4d692956c9b1ce8ad58c88761c7ddfe5089b7b6a343c1fae43b0f72893a
 SIZE (mutt/manual-ja-patch.ja.html) = 15415
-MD5 (mutt/manual-ja-patch.ja.txt) = a73d34b8c25cc3a73b6456dd2abc62ee
 SHA256 (mutt/manual-ja-patch.ja.txt) = a68952bfb8b250566cd41e00f99e6b959639df0aa286e7f6b98598f357c8c094
 SIZE (mutt/manual-ja-patch.ja.txt) = 7691
-MD5 (mutt/usage-japanese.ja.html) = b20bae612f5b116f8a07825a4d42dbf1
 SHA256 (mutt/usage-japanese.ja.html) = 2d1a9eb0a84d6134da2d94c8456f70f86d6e5be9ec1798ebf81040d06bc27049
 SIZE (mutt/usage-japanese.ja.html) = 14177
-MD5 (mutt/usage-japanese.ja.txt) = a251df9d97fc60b5e07e6155f2124c96
 SHA256 (mutt/usage-japanese.ja.txt) = 0ea8d1afeb361a8a4e99563c7173cd7e30b4f4f00ff7b71381ce649d53e7c3cd
 SIZE (mutt/usage-japanese.ja.txt) = 9969
-MD5 (mutt/patch-1.5.14.mutt-j.ja.1.gz) = 9d0a1489b3c96fc100b4f846103bbcd7
-SHA256 (mutt/patch-1.5.14.mutt-j.ja.1.gz) = 65e268c16cf3af625d1e1601a405e5ebf02f69d8623b1f87ecdc33af5155842b
-SIZE (mutt/patch-1.5.14.mutt-j.ja.1.gz) = 25284
+SHA256 (mutt/patch-1.5.21.tt.wcwidth.1.gz) = f08f60d94be290b9d0eff3399ae97f620afba497960e4c3d112dc2f306047f59
+SIZE (mutt/patch-1.5.21.tt.wcwidth.1.gz) = 8145
+SHA256 (mutt/patch-1.5.21.tt.create_rfc2047_params.1.gz) = 71251917b4a9ec791dbe728df26f4f31bc86db8a920c6b70f282796cf8aa4d8d
+SIZE (mutt/patch-1.5.21.tt.create_rfc2047_params.1.gz) = 1115
+SHA256 (mutt/patch-1.5.21.tt+yy.delete_prefix.1.gz) = 0b673b504c22e942f92a7df95c9a1bc00551ffc50ac6c3a445713ac18807f460
+SIZE (mutt/patch-1.5.21.tt+yy.delete_prefix.1.gz) = 1568
+SHA256 (mutt/patch-1.5.21.tt.sanitize_ja_char.1.gz) = dea6d350838422f50c9fde9e8238156a55aa1a404e968e86d260fa8e5fa9e954
+SIZE (mutt/patch-1.5.21.tt.sanitize_ja_char.1.gz) = 2924
diff --git a/japanese/mutt-devel/files/extra-patch-nodoc-contrib b/japanese/mutt-devel/files/extra-patch-nodoc-contrib
new file mode 100644
index 000000000000..c9c6ec1b7548
--- /dev/null
+++ b/japanese/mutt-devel/files/extra-patch-nodoc-contrib
@@ -0,0 +1,31 @@
+--- Makefile.am.orig	Fri Feb 11 14:54:08 2005
++++ Makefile.am	Fri Feb 11 14:55:33 2005
+@@ -10,7 +10,7 @@
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
++SUBDIRS = m4 po intl $(IMAP_SUBDIR) . doc
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
+--- doc/Makefile.am.orig	2009-06-25 14:00:16.000000000 +0900
++++ doc/Makefile.am	2009-06-25 14:04:02.000000000 +0900
+@@ -59,17 +59,6 @@
+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+ 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+ 	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
+-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+-	for f in $(topsrcdir_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+-	done
+-	for f in $(srcdir_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
+-	done
+-	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
+-	-for f in $(HTML_DOCFILES) ; do \
+-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
+-	done
+ 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
+ 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
+ 		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \
diff --git a/japanese/mutt-devel/files/extrapatch-nodoc-aa b/japanese/mutt-devel/files/extrapatch-nodoc-aa
deleted file mode 100644
index ed013043b8e3..000000000000
--- a/japanese/mutt-devel/files/extrapatch-nodoc-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.am.orig	2008-06-17 14:30:46.000000000 +0900
-+++ doc/Makefile.am	2008-06-17 14:31:10.000000000 +0900
-@@ -55,17 +55,6 @@
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
- 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
- 	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
--	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
--	for f in $(topsrcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
--	done
--	for f in $(srcdir_DOCFILES) ; do \
--		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
--	done
--	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
--	-for f in $(HTML_DOCFILES) ; do \
--		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir) ; \
--	done
- 
- uninstall-local:
- 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
diff --git a/japanese/mutt-devel/files/extrapatch-nodoc-ab b/japanese/mutt-devel/files/extrapatch-nodoc-ab
deleted file mode 100644
index 3d17e55d300c..000000000000
--- a/japanese/mutt-devel/files/extrapatch-nodoc-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	Sun Jun 23 16:04:34 2002
-+++ Makefile.am	Sun Jun 23 16:04:40 2002
-@@ -9,7 +9,7 @@
- IMAP_INCLUDES = -I$(top_srcdir)/imap
- endif
- 
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 po intl doc $(IMAP_SUBDIR)
- 
- bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- 
diff --git a/japanese/mutt-devel/files/patch-02 b/japanese/mutt-devel/files/patch-02
new file mode 100644
index 000000000000..6d5c008b7835
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-02
@@ -0,0 +1,11 @@
+--- doc/Makefile.am.orig	2010-09-17 16:04:58.000000000 +0200
++++ doc/Makefile.am	2010-09-17 16:09:09.000000000 +0200
+@@ -47,7 +47,7 @@
+ 
+ all: makedoc-all
+ 
+-makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
++makedoc-all: mutt.1 smime_keys.1 muttrc.man
+ 
+ install-data-local: makedoc-all instdoc
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
diff --git a/japanese/mutt-devel/files/patch-Makefile.am.doc b/japanese/mutt-devel/files/patch-Makefile.am.doc
new file mode 100644
index 000000000000..5c5854250df1
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-Makefile.am.doc
@@ -0,0 +1,11 @@
+--- Makefile.am.orig2	Mon Feb  7 10:20:52 2005
++++ Makefile.am	Mon Feb  7 10:29:41 2005
+@@ -10,7 +10,7 @@
+ IMAP_INCLUDES = -I$(top_srcdir)/imap
+ endif
+ 
+-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
++SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
+ 
+ bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
+ 
diff --git a/japanese/mutt-devel/files/patch-aj b/japanese/mutt-devel/files/patch-aj
deleted file mode 100644
index c567936301ae..000000000000
--- a/japanese/mutt-devel/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	Sun Jun 23 14:41:02 2002
-+++ configure.in	Sun Jun 23 14:42:05 2002
-@@ -596,7 +596,7 @@
-         then
-           if test "$with_sasl" != "yes"
-           then
--            CPPFLAGS="$CPPFLAGS -I$with_sasl/include"
-+            CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1"
-             LDFLAGS="$LDFLAGS -L$with_sasl/lib"
-           fi
- 
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index a6538de6f631..8deb35542d80 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -10,7 +10,6 @@ etc/Muttrc.dist
 etc/mime.types.dist
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.old
 %%PORTDOCS%%%%DOCSDIR%%/GPL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.JA-PATCH.ja
@@ -46,6 +45,7 @@ etc/mime.types.dist
 %%PORTDOCS%%%%DOCSDIR%%/manual.ja.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.ja.sgml
 %%PORTDOCS%%%%DOCSDIR%%/manual.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/optionalfeatures.html
 %%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc
@@ -80,6 +80,8 @@ etc/mime.types.dist
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux
+%%PORTDOCS%%%%DOCSDIR%%/samples/mutt_xtitle
+%%PORTDOCS%%%%DOCSDIR%%/security.html
 %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning.html
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo