o update to 1.3.16.j0.

o update Japanese manual.
o add Japanese message catalog.

PR:		25637
Submitted by:	maintainer

7 files changed, 49 insertions, 26 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 5c1c1fa68249..fd36ad938fae 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	mutt
 PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.emaillab.org/mutt/1.3/ \
-		http://www.hiei.kit.ac.jp/~hitomi/mutt/ \
-		ftp://ftp.mutt.org/pub/mutt/devel/ \
-		http://www2.odn.ne.jp/~aab27060/ports/distfiles/
+		http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
+		http://www5.xdsl.ne.jp/~shuna/distfiles/mutt/ \
+		ftp://ftp.mutt.org/pub/mutt/devel/
 DISTNAME=	${PORTNAME}-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME}-ja${JP_VERSION}${EXTRACT_SUFX} \
-		manual_ja-${PRE_VERSION}i-2${EXTRACT_SUFX}
+		manual_ja-${VERSION:R}i-0${EXTRACT_SUFX}
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
 
@@ -29,8 +29,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 .endif
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-PRE_VERSION=	1.2
-VERSION=	1.3.14
+VERSION=	1.3.16
 JP_VERSION=	0
 
 DIST_SUBDIR=	mutt
@@ -55,6 +54,7 @@ MAN5=		muttrc.5 mbox.5
 
 DIFFDIR=	${WRKDIR}/${DISTNAME}-ja${JP_VERSION}
 DIFFNAME=	${DISTNAME}-ja${JP_VERSION}.diff
+SRCDOCDIR=	${WRKDIR}/manual_ja-${VERSION:R}i
 DOCDIR=		${PREFIX}/share/doc/mutt
 
 pre-patch:
@@ -66,11 +66,12 @@ pre-configure:
 post-install:
 	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH ${DOCDIR}
 	${INSTALL_DATA} ${DIFFDIR}/manual-ja-patch.txt ${DOCDIR}
-	${INSTALL_DATA} ${DIFFDIR}/sample.muttrc-tt ${DOCDIR}
+	${INSTALL_DATA} ${DIFFDIR}/mutt-ja.rc ${DOCDIR}/samples
+	${INSTALL_DATA} ${DIFFDIR}/sample.muttrc-tt ${DOCDIR}/samples
 	${INSTALL_DATA} ${DIFFDIR}/usage-japanese.txt ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.txt ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${DOCDIR}
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.sgml ${DOCDIR}
+	${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}
 
 .include <bsd.port.mk>
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index c941cde4c3fa..56c8a047eedb 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.3.14i.tar.gz) = ac3b821ae2ef39cc8c99bd151c788980
-MD5 (mutt/mutt-1.3.14i-ja0.tar.gz) = fa97242b23fe8c625893d3e98d9ca65a
-MD5 (mutt/manual_ja-1.2i-2.tar.gz) = 5a5675ffe23ffe273bd6fe246d3aaefd
+MD5 (mutt/mutt-1.3.16i.tar.gz) = 9c6f02e6716e444cf1537c6f56788551
+MD5 (mutt/mutt-1.3.16i-ja0.tar.gz) = d915b144258dd6152bdd04b52dc1d91e
+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 8185aa0e1397..28a001fdda58 100644
--- a/japanese/mutt-devel/files/patch-aa
+++ b/japanese/mutt-devel/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.in.orig	Sun Feb  4 21:04:05 2001
-+++ configure.in	Sun Feb  4 21:04:31 2001
+--- configure.in.orig	Tue Mar  6 00:03:05 2001
++++ configure.in	Tue Mar  6 00:03:19 2001
 @@ -417,14 +417,14 @@
      [ mutt_cv_func_iconv=no
        mutt_cv_lib_iconv=no
diff --git a/japanese/mutt-devel/files/patch-ab b/japanese/mutt-devel/files/patch-ab
index 684acbb5f7af..1c2c8aa18e49 100644
--- a/japanese/mutt-devel/files/patch-ab
+++ b/japanese/mutt-devel/files/patch-ab
@@ -1,6 +1,6 @@
---- charset.c.orig	Sun Feb  4 21:04:05 2001
-+++ charset.c	Sun Feb  4 21:05:27 2001
-@@ -29,7 +29,7 @@
+--- charset.c.orig	Thu Feb 15 17:09:02 2001
++++ charset.c	Thu Mar  1 02:27:30 2001
+@@ -31,7 +31,7 @@
  #include <unistd.h>
  #include <errno.h>
  
diff --git a/japanese/mutt-devel/files/patch-af b/japanese/mutt-devel/files/patch-af
index ddc587cfe712..9dc05d9d2c05 100644
--- a/japanese/mutt-devel/files/patch-af
+++ b/japanese/mutt-devel/files/patch-af
@@ -1,5 +1,5 @@
---- charset.h.orig	Sun Feb  4 21:04:05 2001
-+++ charset.h	Sun Feb  4 21:09:20 2001
+--- charset.h.orig	Tue Mar  6 00:03:04 2001
++++ charset.h	Tue Mar  6 00:04:22 2001
 @@ -19,7 +19,7 @@
  #ifndef _CHARSET_H
  #define _CHARSET_H
@@ -7,5 +7,5 @@
 -#include <iconv.h>
 +#include <giconv.h>
  
- int mutt_convert_string (char **, const char *, const char *);
+ int mutt_convert_string (char **, const char *, const char *, int);
  void mutt_sanitize_ja_chars (char *, size_t, int);
diff --git a/japanese/mutt-devel/files/patch-ag b/japanese/mutt-devel/files/patch-ag
index c810303a167c..c13de91882e0 100644
--- a/japanese/mutt-devel/files/patch-ag
+++ b/japanese/mutt-devel/files/patch-ag
@@ -1,6 +1,6 @@
---- Makefile.am.orig	Wed Oct 11 19:43:53 2000
-+++ Makefile.am	Sun Feb  4 21:10:00 2001
-@@ -138,7 +138,6 @@
+--- Makefile.am.orig	Tue Feb 13 01:59:42 2001
++++ Makefile.am	Thu Mar  1 02:28:56 2001
+@@ -139,7 +139,6 @@
  	fi
  
  install-data-local: Muttrc
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index 36850542073c..518101e6284b 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -34,17 +34,36 @@ share/doc/mutt/manual_ja.html
 share/doc/mutt/manual_ja.sgml
 share/doc/mutt/manual_ja.tex
 share/doc/mutt/manual_ja.txt
-share/doc/mutt/sample.muttrc-tt
 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-ja.rc
 share/doc/mutt/samples/pgp2.rc
 share/doc/mutt/samples/pgp5.rc
 share/doc/mutt/samples/pgp6.rc
 share/doc/mutt/samples/sample.mailcap
 share/doc/mutt/samples/sample.muttrc
 share/doc/mutt/samples/sample.muttrc-tlr
+share/doc/mutt/samples/sample.muttrc-tt
+share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
+share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
+share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
+share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
+share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
+share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
+share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
+share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
+share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
 share/doc/mutt/usage-japanese.txt
 share/locale/cs/LC_MESSAGES/mutt.mo
 share/locale/da/LC_MESSAGES/mutt.mo
@@ -56,6 +75,7 @@ share/locale/fr/LC_MESSAGES/mutt.mo
 share/locale/gl/LC_MESSAGES/mutt.mo
 share/locale/id/LC_MESSAGES/mutt.mo
 share/locale/it/LC_MESSAGES/mutt.mo
+share/locale/ja/LC_MESSAGES/mutt.mo
 share/locale/ko/LC_MESSAGES/mutt.mo
 share/locale/lt/LC_MESSAGES/mutt.mo
 share/locale/nl/LC_MESSAGES/mutt.mo
@@ -64,9 +84,11 @@ share/locale/pt_BR/LC_MESSAGES/mutt.mo
 share/locale/ru/LC_MESSAGES/mutt.mo
 share/locale/sk/LC_MESSAGES/mutt.mo
 share/locale/sv/LC_MESSAGES/mutt.mo
+share/locale/tr/LC_MESSAGES/mutt.mo
 share/locale/uk/LC_MESSAGES/mutt.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/mutt.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 @dirrm share/doc/mutt/html
+@dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples
 @dirrm share/doc/mutt