4 files changed, 10 insertions, 37 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 1ac9a97de7ff..94d49d0aa15d 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.emaillab.org/mutt/1.3/ \
 		http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
-		http://www5.xdsl.ne.jp/~shuna/distfiles/mutt/ \
+		http://www5.xdsl.ne.jp/~shuna/mutt/distfiles/ \
 		ftp://ftp.mutt.org/pub/mutt/devel/
 DISTNAME=	${PORTNAME}-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -29,7 +29,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 .endif
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.3.19
+VERSION=	1.3.20
 JP_VERSION=	0
 
 DIST_SUBDIR=	mutt
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index 4102f0f22623..6831ddcdd43c 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.3.19i.tar.gz) = 9fbc13fbf6f8de51e1fe4c9f7ba78149
-MD5 (mutt/mutt-1.3.19i-ja0.tar.gz) = b8f1881cb8312bc6226850eaac11cb47
+MD5 (mutt/mutt-1.3.20i.tar.gz) = 802bf75acd19566848e29dff0aef9940
+MD5 (mutt/mutt-1.3.20i-ja0.tar.gz) = 418e7c1996885ffe71f16d3739d106c6
 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 0d799f247185..26d991d2be40 100644
--- a/japanese/mutt-devel/files/patch-aa
+++ b/japanese/mutt-devel/files/patch-aa
@@ -1,33 +1,6 @@
---- configure.in.orig2	Tue Jun 12 00:35:01 2001
-+++ configure.in	Tue Jun 12 00:38:20 2001
-@@ -426,14 +426,14 @@
-     [ mutt_cv_func_iconv=no
-       mutt_cv_lib_iconv=no
-       AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-+#include <giconv.h>],
-         [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);],
-         mutt_cv_func_iconv=yes)
-       if test "$mutt_cv_func_iconv" = no; then
-         mutt_save_LIBS="$LIBS"
--        LIBS="$LIBS -liconv"
-+        LIBS="$LIBS -lgiconv"
-         AC_TRY_LINK([#include <stdlib.h>
--#include <iconv.h>],
-+#include <giconv.h>],
-           [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);],
-           mutt_cv_lib_iconv=yes
-           mutt_cv_func_iconv=yes)
-@@ -444,7 +444,7 @@
-   AC_MSG_ERROR(Unable to find iconv library)
- fi
- if test "$mutt_cv_lib_iconv" = yes; then
--  LIBICONV="-liconv"
-+  LIBICONV="-lgiconv"
- fi
- AC_DEFINE(HAVE_ICONV)
- 
-@@ -457,7 +457,7 @@
+--- configure.in.orig2	Mon Aug  6 00:28:20 2001
++++ configure.in	Mon Aug  6 00:28:28 2001
+@@ -679,7 +679,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
@@ -36,7 +9,7 @@
  int main()
  {
    iconv_t cd;
-@@ -488,7 +488,7 @@
+@@ -710,7 +710,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 95611eee269d..fe98e1eb361a 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -93,8 +93,8 @@ 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
+share/locale/zh_CN/LC_MESSAGES/mutt.mo
+share/locale/zh_TW/LC_MESSAGES/mutt.mo
 @dirrm share/doc/mutt/html
 @dirrm share/doc/mutt/samples/iconv
 @dirrm share/doc/mutt/samples