7 files changed, 69 insertions, 38 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 48c5bed81fb5..1ac9a97de7ff 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -29,7 +29,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 .endif
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.3.18
+VERSION=	1.3.19
 JP_VERSION=	0
 
 DIST_SUBDIR=	mutt
@@ -72,11 +72,16 @@ pre-configure:
 	(cd ${WRKSRC}; aclocal -I m4)
 
 post-install:
-	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH ${DOCDIR}
-	${INSTALL_DATA} ${DIFFDIR}/manual-ja-patch.txt ${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} ${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}
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index 6e1e4c1798b7..4102f0f22623 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.3.18i.tar.gz) = 5ebcd0923748dcd21b4d2af3612408b9
-MD5 (mutt/mutt-1.3.18i-ja0.tar.gz) = 66afe3787819e4b420bb9e97288d9108
+MD5 (mutt/mutt-1.3.19i.tar.gz) = 9fbc13fbf6f8de51e1fe4c9f7ba78149
+MD5 (mutt/mutt-1.3.19i-ja0.tar.gz) = b8f1881cb8312bc6226850eaac11cb47
 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 55cf75c6dba3..0d799f247185 100644
--- a/japanese/mutt-devel/files/patch-aa
+++ b/japanese/mutt-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Thu May  3 10:31:09 2001
-+++ configure.in	Thu May  3 10:34:15 2001
-@@ -417,14 +417,14 @@
+--- 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>
@@ -18,7 +18,7 @@
            [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);],
            mutt_cv_lib_iconv=yes
            mutt_cv_func_iconv=yes)
-@@ -435,7 +435,7 @@
+@@ -444,7 +444,7 @@
    AC_MSG_ERROR(Unable to find iconv library)
  fi
  if test "$mutt_cv_lib_iconv" = yes; then
@@ -27,7 +27,7 @@
  fi
  AC_DEFINE(HAVE_ICONV)
  
-@@ -448,7 +448,7 @@
+@@ -457,7 +457,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
@@ -36,7 +36,7 @@
  int main()
  {
    iconv_t cd;
-@@ -479,7 +479,7 @@
+@@ -488,7 +488,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
diff --git a/japanese/mutt-devel/files/patch-ac b/japanese/mutt-devel/files/patch-ac
deleted file mode 100644
index 7b7508c2fd0c..000000000000
--- a/japanese/mutt-devel/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext.c.orig	Thu Jan  4 14:38:55 2001
-+++ gettext.c	Sun Feb  4 21:06:06 2001
-@@ -5,7 +5,7 @@
- 
- #include "hash.h"
- 
--#include "iconv.h"
-+#include "giconv.h"
- #include "lib.h"
- #include "charset.h"
- 
diff --git a/japanese/mutt-devel/files/patch-ag b/japanese/mutt-devel/files/patch-ag
deleted file mode 100644
index c13de91882e0..000000000000
--- a/japanese/mutt-devel/files/patch-ag
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
--	$(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- 	-if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
- 		mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
diff --git a/japanese/mutt-devel/files/patch-ah b/japanese/mutt-devel/files/patch-ah
new file mode 100644
index 000000000000..422a151b8c42
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ah
@@ -0,0 +1,40 @@
+--- m4/iconv.m4.orig	Fri Jun 15 00:44:35 2001
++++ m4/iconv.m4	Fri Jun 15 00:45:30 2001
+@@ -19,16 +19,16 @@
+     am_cv_func_iconv="no, consider installing GNU libiconv"
+     am_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);],
+       am_cv_func_iconv=yes)
+     if test "$am_cv_func_iconv" != yes; then
+       am_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);],
+@@ -43,7 +43,7 @@
+     AC_CACHE_VAL(am_cv_proto_iconv, [
+       AC_TRY_COMPILE([
+ #include <stdlib.h>
+-#include <iconv.h>
++#include <giconv.h>
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -63,7 +63,7 @@
+   fi
+   LIBICONV=
+   if test "$am_cv_lib_iconv" = yes; then
+-    LIBICONV="-liconv"
++    LIBICONV="-lgiconv"
+   fi
+   AC_SUBST(LIBICONV)
+ ])
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index 518101e6284b..95611eee269d 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -10,10 +10,13 @@ share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
 share/doc/mutt/GPL
 share/doc/mutt/INSTALL
+share/doc/mutt/INSTALL.JA-PATCH.en
+share/doc/mutt/INSTALL.JA-PATCH.ja
 share/doc/mutt/NEWS
 share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/README
-share/doc/mutt/README.JA-PATCH
+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
@@ -28,7 +31,10 @@ share/doc/mutt/html/manual-5.html
 share/doc/mutt/html/manual-6.html
 share/doc/mutt/html/manual-7.html
 share/doc/mutt/html/manual.html
-share/doc/mutt/manual-ja-patch.txt
+share/doc/mutt/html/manual-ja-patch.en.html
+share/doc/mutt/html/manual-ja-patch.ja.html
+share/doc/mutt/html/usage-japanese.en.html
+share/doc/mutt/html/usage-japanese.ja.html
 share/doc/mutt/manual.txt
 share/doc/mutt/manual_ja.html
 share/doc/mutt/manual_ja.sgml
@@ -64,15 +70,16 @@ 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
 share/locale/de/LC_MESSAGES/mutt.mo
 share/locale/el/LC_MESSAGES/mutt.mo
 share/locale/eo/LC_MESSAGES/mutt.mo
 share/locale/es/LC_MESSAGES/mutt.mo
+share/locale/et/LC_MESSAGES/mutt.mo
 share/locale/fr/LC_MESSAGES/mutt.mo
 share/locale/gl/LC_MESSAGES/mutt.mo
+share/locale/hu/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