4 files changed, 28 insertions, 26 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 94d49d0aa15d..e1026bef77ba 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.emaillab.org/mutt/1.3/ \
 DISTNAME=	${PORTNAME}-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME}-ja${JP_VERSION}${EXTRACT_SUFX} \
-		manual_ja-${VERSION:R}i-0${EXTRACT_SUFX}
+		manual_ja-${MANUALVERSION}-0${EXTRACT_SUFX}
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
 
@@ -29,8 +29,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 .endif
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.3.20
+VERSION=	1.3.22.1
 JP_VERSION=	0
+MANUALVERSION=	1.3i
 
 DIST_SUBDIR=	mutt
 NO_LATEST_LINK=	yes
@@ -45,7 +46,8 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/etc \
 		--with-docdir=${PREFIX}/share/doc/mutt \
-		--enable-pop --enable-imap
+		--enable-pop --enable-imap \
+		--enable-default-japanese
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=	--with-included-gettext
 .endif
@@ -62,8 +64,7 @@ CONFIGURE_ARGS+=	--with-ssl
 
 DIFFDIR=	${WRKDIR}/${DISTNAME}-ja${JP_VERSION}
 DIFFNAME=	${DISTNAME}-ja${JP_VERSION}.diff
-SRCDOCDIR=	${WRKDIR}/manual_ja-${VERSION:R}i
-DOCDIR=		${PREFIX}/share/doc/mutt
+SRCDOCSDIR=	${WRKDIR}/manual_ja-${MANUALVERSION}
 
 pre-patch:
 	(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
@@ -72,19 +73,20 @@ pre-configure:
 	(cd ${WRKSRC}; aclocal -I m4)
 
 post-install:
-	${INSTALL_DATA} ${DIFFDIR}/INSTALL.JA-PATCH.en ${DOCDIR}
-	${INSTALL_DATA} ${DIFFDIR}/INSTALL.JA-PATCH.ja ${DOCDIR}
-	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH.en ${DOCDIR}
-	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH.ja ${DOCDIR}
-	${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.en.html ${DOCDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.ja.html ${DOCDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/html/usage-japanese.en.html ${DOCDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/html/usage-japanese.ja.html ${DOCDIR}/html
-	${INSTALL_DATA} ${DIFFDIR}/sample/mutt-ja.rc ${DOCDIR}/samples
-	${INSTALL_DATA} ${DIFFDIR}/sample/sample.muttrc-tt ${DOCDIR}/samples
-	${INSTALL_DATA} ${SRCDOCDIR}/manual_ja.txt ${DOCDIR}
-	${INSTALL_DATA} ${SRCDOCDIR}/manual_ja.tex ${DOCDIR}
-	${INSTALL_DATA} ${SRCDOCDIR}/manual_ja.html ${DOCDIR}
-	${INSTALL_DATA} ${SRCDOCDIR}/manual_ja.sgml ${DOCDIR}
+	${INSTALL_DATA} ${DIFFDIR}/INSTALL.JA-PATCH.en ${DOCSDIR}
+	${INSTALL_DATA} ${DIFFDIR}/INSTALL.JA-PATCH.ja ${DOCSDIR}
+	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH.en ${DOCSDIR}
+	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH.ja ${DOCSDIR}
+	${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.en.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} ${SRCDOCSDIR}/manual_ja.txt ${DOCSDIR}
+	${INSTALL_DATA} ${SRCDOCSDIR}/manual_ja.tex ${DOCSDIR}
+	${INSTALL_DATA} ${SRCDOCSDIR}/manual_ja.html ${DOCSDIR}
+	${INSTALL_DATA} ${SRCDOCSDIR}/manual_ja.sgml ${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index 6831ddcdd43c..184545aa4409 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.3.20i.tar.gz) = 802bf75acd19566848e29dff0aef9940
-MD5 (mutt/mutt-1.3.20i-ja0.tar.gz) = 418e7c1996885ffe71f16d3739d106c6
+MD5 (mutt/mutt-1.3.22.1i.tar.gz) = cef70b45444ddff0a1128d89f9fc7086
+MD5 (mutt/mutt-1.3.22.1i-ja0.tar.gz) = 6ff1ee0c8d6ebcbe6ef024bc352dae55
 MD5 (mutt/manual_ja-1.3i-0.tar.gz) = 9e0ae5dc4807add543298366fad57e6a
diff --git a/japanese/mutt-devel/files/patch-aa b/japanese/mutt-devel/files/patch-aa
index 26d991d2be40..3368d6132b74 100644
--- a/japanese/mutt-devel/files/patch-aa
+++ b/japanese/mutt-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig2	Mon Aug  6 00:28:20 2001
-+++ configure.in	Mon Aug  6 00:28:28 2001
-@@ -679,7 +679,7 @@
+--- configure.in.orig	Sat Sep  1 23:38:52 2001
++++ configure.in	Sat Sep  1 23:39:17 2001
+@@ -683,7 +683,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
@@ -9,7 +9,7 @@
  int main()
  {
    iconv_t cd;
-@@ -710,7 +710,7 @@
+@@ -714,7 +714,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index fe98e1eb361a..5b9fcc040b7c 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -19,7 +19,6 @@ share/doc/mutt/README.JA-PATCH.en
 share/doc/mutt/README.JA-PATCH.ja
 share/doc/mutt/README.SECURITY
 share/doc/mutt/README.SSL
-share/doc/mutt/README.UPGRADE
 share/doc/mutt/TODO
 share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
@@ -44,6 +43,7 @@ share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Pine.rc
 share/doc/mutt/samples/Tin.rc
 share/doc/mutt/samples/gpg.rc
+share/doc/mutt/samples/mutt-en.rc
 share/doc/mutt/samples/mutt-ja.rc
 share/doc/mutt/samples/pgp2.rc
 share/doc/mutt/samples/pgp5.rc