- Remove support for deprecated cyrus-sasl and add support for cyrus-sasl2

- Bump PORTREVISION

PR:		ports/111567
Submitted by:	SHIOZAKI Takehiko <st@be.to> (maintainer)
Inspired by:	gabor

6 files changed, 92 insertions, 145 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 7e4066166288..67b0eb2cc6bb 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	ja-mutt
+[B# New ports collection makefile for:	ja-mutt
 # Date created:		4 Sep 2000
 # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
 #
@@ -9,57 +9,68 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese mail
-MASTER_SITES=	http://www.emaillab.org/mutt/1.5/ \
-		http://my.reset.jp/~iwashita/mutt/distfiles/ \
-		http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
+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/
-DISTNAME=	mutt-${VERSION}i
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DISTNAME}-ja.${JP_VERSION}${EXTRACT_SUFX} \
+PKGNAMEPREFIX=	ja-
+DISTNAME=	mutt-${VERSION}
+DISTFILES=	${EXTRACT_ONLY} \
+		README.JA-PATCH.ja.html:ja_doc \
+		README.JA-PATCH.ja:ja_doc \
+		INSTALL.JA-PATCH.ja.html:ja_doc \
+		INSTALL.JA-PATCH.ja:ja_doc \
+		manual-ja-patch.ja.html:ja_doc \
+		manual-ja-patch.ja.txt:ja_doc \
+		usage-japanese.ja.html:ja_doc \
+		usage-japanese.ja.txt:ja_doc
+DIST_SUBDIR=	mutt
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
 		manual_ja-${MANUALVERSION}i-1${EXTRACT_SUFX} \
 		manual.ja-${MANJADATE}${EXTRACT_SUFX}
-DIST_SUBDIR=	mutt
+
+PATCH_SITES=	http://www.emaillab.org/mutt/${VERSION}/:ja_patch
+PATCHFILES=	patch-${VERSION}.mutt-j.ja.${JP_VERSION}.gz:ja_patch
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	st@be.to
 COMMENT=	Text-based mail client (Japanised development version)
 
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
-RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
+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+=	sasl.8:${PORTSDIR}/security/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)
-PATCH_SITES+=	http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/:hcache
-PATCHFILES+=	patch-${VERSION}.tg.hcache.12:hcache
-PATCH_DIST_STRIP+=	-p1
-
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
+CONFIGURE_ARGS+=	--enable-hcache
 .endif
 
 CONFLICTS=	mutt-* ja-mutt-1.[024]*
 
-VERSION=	1.5.6
+VERSION=	1.5.14
 JP_VERSION=	1
 MANUALVERSION=	1.4
-MANJADATE=	20040808
+MANJADATE=	20050813
 
 FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	automake:14 autoconf:213
+USE_AUTOTOOLS=	automake:19 autoconf:259
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -97,13 +108,7 @@ CONFIGURE_ARGS+=	--without-idn
 
 NOMANCOMPRESS=	yes
 MAN1=		flea.1 mutt.1 muttbug.1 mutt_dotlock.1
-MAN5=		muttrc.5 mbox.5
-
-DIFFDIR=	${WRKDIR}/${DISTNAME}-ja.${JP_VERSION}
-DIFFNAME=	patch-${VERSION}.tt.ja.${JP_VERSION}
-
-pre-patch:
-	(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
+MAN5=		muttrc.5 mbox.5 mmdf.5
 
 pre-configure:
 .if defined(NOPORTDOCS)
@@ -122,24 +127,14 @@ post-configure:
 
 .if !defined(NOPORTDOCS)
 post-install:
-	${INSTALL_DATA} ${DIFFDIR}/INSTALL.JA-PATCH.ja ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/INSTALL.ja ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/NEWS.ja ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/PGP-Notes.ja.txt ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH.ja ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/README.SECURITY.ja ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/README.SSL.ja ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/README.ja ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/applying-patches.ja.txt ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/smime-notes.ja.txt ${DOCSDIR}
-	${INSTALL_DATA} ${DIFFDIR}/html/INSTALL.JA-PATCH.ja.html ${DOCSDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/html/README.JA-PATCH.ja.html ${DOCSDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.en.html ${DOCSDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.ja.html ${DOCSDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/html/usage-japanese.ja.html ${DOCSDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/samples/mutt-en.rc ${DOCSDIR}/samples
-	${INSTALL_DATA} ${DIFFDIR}/samples/mutt-ja.rc ${DOCSDIR}/samples
-	${INSTALL_DATA} ${DIFFDIR}/samples/sample.muttrc-tt ${DOCSDIR}/samples
+	${INSTALL_DATA} ${_DISTDIR}/INSTALL.JA-PATCH.ja ${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/README.JA-PATCH.ja ${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/manual-ja-patch.ja.txt ${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/usage-japanese.ja.txt ${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/INSTALL.JA-PATCH.ja.html ${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/README.JA-PATCH.ja.html ${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/manual-ja-patch.ja.html ${DOCSDIR}
+	${INSTALL_DATA} ${_DISTDIR}/usage-japanese.ja.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${DOCSDIR}
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index ba4b7df42d6a..f26761659e79 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,15 +1,36 @@
-MD5 (mutt/mutt-1.5.6i.tar.gz) = aa1433635d7c86beba1675a3408b0324
-SHA256 (mutt/mutt-1.5.6i.tar.gz) = e2144d12692a0dd3d348a0df6e0490469032e1ce31ba572466223d56254d6373
-SIZE (mutt/mutt-1.5.6i.tar.gz) = 2910730
-MD5 (mutt/mutt-1.5.6i-ja.1.tar.gz) = 491f3f73fe232d835f78a57838e1b5e5
-SHA256 (mutt/mutt-1.5.6i-ja.1.tar.gz) = 84b4eb85713605b27bd9476fdf9733b2932b7740990016c419c013c0426cb216
-SIZE (mutt/mutt-1.5.6i-ja.1.tar.gz) = 78594
+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/manual_ja-1.4i-1.tar.gz) = a0c02908bb5d47c30cf7a8c5e05bfe875439448ec050382671c1368b7d3c4d61
 SIZE (mutt/manual_ja-1.4i-1.tar.gz) = 300461
-MD5 (mutt/manual.ja-20040808.tar.gz) = 393e8d39025278f263018f6d314049f8
-SHA256 (mutt/manual.ja-20040808.tar.gz) = c710719e61845bf0b0074cefedda43766669e8c3fb17ea2d88686773b44d6a85
-SIZE (mutt/manual.ja-20040808.tar.gz) = 272680
-MD5 (mutt/patch-1.5.6.tg.hcache.12) = 8c0200a93b85b2c74c63dd1df54de017
-SHA256 (mutt/patch-1.5.6.tg.hcache.12) = c17292da38c15901f0b285cf165a3813b0e97c169966e5c1c7f7f9b65abf4f04
-SIZE (mutt/patch-1.5.6.tg.hcache.12) = 39095
+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
diff --git a/japanese/mutt-devel/files/patch-ai b/japanese/mutt-devel/files/patch-ai
deleted file mode 100644
index e6b04a327b34..000000000000
--- a/japanese/mutt-devel/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.in.orig	Sat Nov 10 04:06:08 2001
-+++ doc/Makefile.in	Sat Nov 10 04:06:36 2001
-@@ -73,7 +73,7 @@
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
- 	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
- 	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
--	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
-+	echo ".so man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
- 	./instdoc $(srcdir)/dotlock.man \
- 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
- 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
diff --git a/japanese/mutt-devel/files/patch-ak b/japanese/mutt-devel/files/patch-ak
deleted file mode 100644
index 37c4d12ab547..000000000000
--- a/japanese/mutt-devel/files/patch-ak
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.am.orig	Thu Feb  7 18:14:11 2002
-+++ Makefile.am	Sun May  5 10:53:00 2002
-@@ -3,7 +3,7 @@
- 
- AUTOMAKE_OPTIONS = foreign
- EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
--
-+EXTRA_SCRIPTS = smime_keys
- if BUILD_IMAP
- IMAP_SUBDIR = imap
- IMAP_INCLUDES = -I$(top_srcdir)/imap
-@@ -11,11 +11,11 @@
- 
- SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
- 
--bin_SCRIPTS = muttbug flea
-+bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- 
- BUILT_SOURCES = keymap_defs.h patchlist.c
- 
--bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@
-+bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
- mutt_SOURCES = $(BUILT_SOURCES) \
- 	addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \
- 	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
diff --git a/japanese/mutt-devel/files/patch-imap_browse.c b/japanese/mutt-devel/files/patch-imap_browse.c
deleted file mode 100644
index bb5565d56b3d..000000000000
--- a/japanese/mutt-devel/files/patch-imap_browse.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- imap/browse.c.orig	Wed Nov  5 09:41:36 2003
-+++ imap/browse.c	Sat Jul  1 20:47:53 2006
-@@ -452,7 +452,7 @@
- 	    if (*s == '\"')
- 	    {
- 	      s++;
--	      while (*s && *s != '\"') 
-+	      while (*s && *s != '\"' && n < sizeof (ns) - 1) 
- 	      {
- 		if (*s == '\\')
- 		  s++;
-@@ -463,12 +463,14 @@
- 		s++;
- 	    }
- 	    else
--	      while (*s && !ISSPACE (*s)) 
-+	      while (*s && !ISSPACE (*s) && n < sizeof (ns) - 1)
- 	      {
- 		ns[n++] = *s;
- 		s++;
- 	      }
- 	    ns[n] = '\0';
-+	    if (n == sizeof (ns) - 1)
-+	      dprint (1, (debugfile, "browse_get_namespace: too long: [%s]\n", ns));
- 	    /* delim? */
- 	    s = imap_next_word (s);
- 	    /* delimiter is meaningless if namespace is "". Why does
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index d08053ebbcfc..a6538de6f631 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -5,43 +5,39 @@ bin/muttbug
 bin/pgpewrap
 bin/pgpring
 bin/smime_keys
-etc/Muttrc
-etc/mime.types
+@unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi
+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
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.JA-PATCH.ja
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.ja
 %%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.ja.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.ja
 %%PORTDOCS%%%%DOCSDIR%%/README.JA-PATCH.ja
 %%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
-%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY.ja
 %%PORTDOCS%%%%DOCSDIR%%/README.SSL
-%%PORTDOCS%%%%DOCSDIR%%/README.SSL.ja
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
-%%PORTDOCS%%%%DOCSDIR%%/applying-patches.ja.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/html/INSTALL.JA-PATCH.ja.html
-%%PORTDOCS%%%%DOCSDIR%%/html/README.JA-PATCH.ja.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-1.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-2.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-3.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-4.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-5.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-6.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-7.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-ja-patch.en.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual-ja-patch.ja.html
-%%PORTDOCS%%%%DOCSDIR%%/html/usage-japanese.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-ja-patch.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/usage-japanese.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.JA-PATCH.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/README.JA-PATCH.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/advancedusage.html
+%%PORTDOCS%%%%DOCSDIR%%/configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/gettingstarted.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/mimesupport.html
+%%PORTDOCS%%%%DOCSDIR%%/miscellany.html
+%%PORTDOCS%%%%DOCSDIR%%/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/manual-ja-patch.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/usage-japanese.ja.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual_ja.html
 %%PORTDOCS%%%%DOCSDIR%%/manual_ja.sgml
@@ -74,21 +70,18 @@ etc/mime.types
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/mutt-en.rc
-%%PORTDOCS%%%%DOCSDIR%%/samples/mutt-ja.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc
 %%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tlr
-%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tt
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.default
 %%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux
 %%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
-%%PORTDOCS%%%%DOCSDIR%%/smime-notes.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/tuning.html
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
@@ -98,7 +91,9 @@ etc/mime.types
 %%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
@@ -118,5 +113,4 @@ etc/mime.types
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/samples/iconv
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%