13 files changed, 158 insertions, 82 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 66e170341e3d..d36bf497e897 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -164,6 +164,7 @@
     SUBDIR += mule-sj3+wnn6
     SUBDIR += mule-wnn6
     SUBDIR += mutt
+    SUBDIR += mutt-devel
     SUBDIR += mypaedia-fpw
     SUBDIR += mypaedia-fpw-package
     SUBDIR += namazu
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 7e0f5c479e72..ae15ff058c46 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -1,30 +1,26 @@
 # New ports collection makefile for:	ja-mutt
-# Date created:		5 Sep 1999
+# Date created:		4 Sep 2000
 # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	mutt
-PORTVERSION=	${VERSION}.j${JP_VERSION}
+PORTVERSION=	${VERSION}.j${JP_VERSION}.b${JP_SUBVERSION}
 CATEGORIES=	japanese mail
-MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
-		ftp://ftp.gbnet.net/pub/mutt-international/ \
-		ftp://ftp.guug.de/pub/mutt/ \
-		ftp://ftp.guug.de/pub/mutt/historic/ \
-		http://www.hiei.kit.ac.jp/~hitomi/mutt/
+MASTER_SITES=	http://www.ne.jp/asahi/cyber/taki/unix-mailer/mutt-dev/ \
+		http://www.hiei.kit.ac.jp/~hitomi/mutt/ \
+		ftp://ftp.mutt.org/pub/mutt/devel/ \
+		http://www2.odn.ne.jp/~aab27060/ports/distfiles/
 DISTNAME=	${PORTNAME}-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		manual_ja-${VERSION:R}i-1.tar.gz
-
-PATCH_SITES=	http://www.geocities.co.jp/SiliconValley-PaloAlto/2594/ \
-		http://www2.odn.ne.jp/~aab27060/ports/distfiles/
-PATCHFILES=	${DISTNAME}-jp${JP_VERSION}-diff.gz
-PATCH_DIST_STRIP=	-p1
+		${DISTNAME}-ja${JP_VERSION}-beta${JP_SUBVERSION}${EXTRACT_SUFX} \
+		manual_ja-${PRE_VERSION}i-1${EXTRACT_SUFX}
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
+LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
+		giconv.2:${PORTSDIR}/converters/libiconv
 .if !defined(WITH_GETTEXT)
 LIB_DEPENDS+=	intl.1:${PORTSDIR}/devel/gettext
 .endif
@@ -33,16 +29,21 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 .endif
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.2.5
+PRE_VERSION=	1.2
+VERSION=	1.3.9
 JP_VERSION=	0
+JP_SUBVERSION=	0
 
 DIST_SUBDIR=	mutt
+NO_LATEST_LINK=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
+		--with-iconv=${PREFIX} \
+		--without-wc-funcs \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/etc \
 		--with-docdir=${PREFIX}/share/doc/mutt \
@@ -50,16 +51,27 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=	--with-included-gettext
 .endif
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		muttrc.5
+MAN1=		mutt.1 muttbug.1 mutt_dotlock.1
+MAN5=		muttrc.5 mbox.5
+
+DIFFDIR=	${WRKDIR}/${DISTNAME}-ja${JP_VERSION}-beta${JP_SUBVERSION}
+DIFFNAME=	${DISTNAME}-ja${JP_VERSION}-beta${JP_SUBVERSION}.diff
+DOCDIR=		${PREFIX}/share/doc/mutt
+
+pre-patch:
+	(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
 
 pre-configure:
 	(cd ${WRKSRC}; aclocal -I m4)
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.txt ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKDIR}/manual_ja.sgml ${PREFIX}/share/doc/mutt
+	${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}/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}
 
 .include <bsd.port.mk>
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index ce805c06c9b3..1ad76419e74f 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.2.5i.tar.gz) = 0ba5367059abdd55daceb82dce6be42f
+MD5 (mutt/mutt-1.3.9i.tar.gz) = 4fa9ae3d3bae4148b80d2e0208092cb2
+MD5 (mutt/mutt-1.3.9i-ja0-beta0.tar.gz) = 173a9089e6b379a7aa0efdf56aafd4f1
 MD5 (mutt/manual_ja-1.2i-1.tar.gz) = 709f021985530045ccb17601a6ac361b
-MD5 (mutt/mutt-1.2.5i-jp0-diff.gz) = b720222e1d8e9128af1ba3f8edfea271
diff --git a/japanese/mutt-devel/files/patch-aa b/japanese/mutt-devel/files/patch-aa
new file mode 100644
index 000000000000..64a78fec13d1
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-aa
@@ -0,0 +1,47 @@
+--- configure.in.orig	Sun Sep 24 04:54:05 2000
++++ configure.in	Sun Sep 24 04:54:50 2000
+@@ -416,14 +416,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)
+@@ -434,7 +434,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)
+ fi
+@@ -448,7 +448,7 @@
+ 	mutt_save_LIBS="$LIBS"
+ 	LIBS="$LIBS $LIBICONV"
+ 	AC_TRY_RUN([
+-#include <iconv.h>
++#include <giconv.h>
+ int main()
+ {
+   iconv_t cd;
+@@ -479,7 +479,7 @@
+ 	mutt_save_LIBS="$LIBS"
+ 	LIBS="$LIBS $LIBICONV"
+ 	AC_TRY_RUN([
+-#include <iconv.h>
++#include <giconv.h>
+ #include <string.h>
+ int main()
+ {
diff --git a/japanese/mutt-devel/files/patch-ab b/japanese/mutt-devel/files/patch-ab
new file mode 100644
index 000000000000..6c89b0ec2ab6
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ab
@@ -0,0 +1,11 @@
+--- charset.c.orig	Sun Sep 24 04:54:05 2000
++++ charset.c	Sun Sep 24 04:55:48 2000
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ 
+ #include "mutt.h"
+ #include "charset.h"
diff --git a/japanese/mutt-devel/files/patch-ac b/japanese/mutt-devel/files/patch-ac
new file mode 100644
index 000000000000..7556abc53b90
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ac
@@ -0,0 +1,11 @@
+--- gettext.c.orig	Wed Jul 19 19:16:08 2000
++++ gettext.c	Sun Sep 24 04:56:28 2000
+@@ -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-ad b/japanese/mutt-devel/files/patch-ad
index c2f2f5751739..15b88b34955e 100644
--- a/japanese/mutt-devel/files/patch-ad
+++ b/japanese/mutt-devel/files/patch-ad
@@ -1,10 +1,11 @@
---- Makefile.am.orig	Sat Jul 29 20:11:33 2000
-+++ Makefile.am	Sat Jul 29 20:15:54 2000
-@@ -122,7 +122,6 @@
- 	fi
+--- gnupgparse.c.orig	Thu May 25 04:18:32 2000
++++ gnupgparse.c	Sun Sep 24 04:57:10 2000
+@@ -44,7 +44,7 @@
+ #include "mutt.h"
+ #include "pgp.h"
+ #include "charset.h"
+-#include "iconv.h"
++#include "giconv.h"
  
- install-data-local: Muttrc
--	$(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- 	-if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
- 		mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
+ /* for hexval */
+ #include "mime.h"
diff --git a/japanese/mutt-devel/files/patch-ae b/japanese/mutt-devel/files/patch-ae
index 849ae36b0d64..0aed2ae6757c 100644
--- a/japanese/mutt-devel/files/patch-ae
+++ b/japanese/mutt-devel/files/patch-ae
@@ -1,46 +1,11 @@
---- khenkan.c.orig	Tue Aug  1 02:28:27 2000
-+++ khenkan.c	Tue Aug  1 03:13:51 2000
-@@ -1045,6 +1045,7 @@
- {
-   char *p = (char *)s, ch, *beg, *end=NULL, *to_ascii=NULL, *to_kanji=NULL;
-   int len = 0, count, beg_kanji, end_kanji=0;
-+  char *enc_end = NULL, *prev_brk = NULL;
+--- rfc2047.c.orig	Sun Sep 24 04:54:06 2000
++++ rfc2047.c	Sun Sep 24 04:57:38 2000
+@@ -24,7 +24,7 @@
  
-   /* check if buffer 'd' has a enough length */
-   if (dmax - d < strlen((char *)s) * 4 / 3) return (-1);
-@@ -1064,11 +1065,23 @@
-     if (d == dmax) return (-1);
- 
-     if (len > 75) { /* line break(in text) */
--      p = beg;  /* search previous word's end */
--      while(beg > (char *)s && *beg != ' ') beg--;
--      while(beg > (char *)s && *beg == ' ') beg--;
-+      if (enc_end == NULL) {
-+        enc_end = s;
-+      }
-+      while(beg >= enc_end && *beg != ' ') beg--;
-+      while(beg >= enc_end && *beg == ' ') beg--;
-       ++beg;
--      d -= p - beg + 1;
-+      if (prev_brk != NULL && beg <= prev_brk) {
-+        beg = p;
-+        while(beg > prev_brk && isalnum(*beg)) beg--;
-+      }
-+      if (prev_brk == NULL || beg > prev_brk) {
-+        d -= p - beg;
-+        p = beg;
-+        prev_brk = beg;
-+      } else {
-+        prev_brk = p;
-+      }
-       *d++ = '\n';
-       *d++ = ' ';
-       len = 0;
-@@ -1181,6 +1194,7 @@
-       new_d = encode_base64(d, jtmp_str, jtmp_str + count);
-       len += new_d - d;
-       d = new_d;
-+      enc_end = p;
- 
-       beg_kanji = end_kanji;
-       beg = p;
+ #include <ctype.h>
+ #include <errno.h>
+-#include <iconv.h>
++#include <giconv.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/japanese/mutt-devel/files/patch-af b/japanese/mutt-devel/files/patch-af
new file mode 100644
index 000000000000..230b67ea3f8f
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-af
@@ -0,0 +1,11 @@
+--- charset.h.orig	Sun Sep 24 04:54:05 2000
++++ charset.h	Sun Sep 24 04:58:15 2000
+@@ -19,7 +19,7 @@
+ #ifndef _CHARSET_H
+ #define _CHARSET_H
+ 
+-#include <iconv.h>
++#include <giconv.h>
+ 
+ int mutt_convert_string (char **, const char *, const char *);
+ void mutt_sanitize_ja_chars(char *);
diff --git a/japanese/mutt-devel/files/patch-ag b/japanese/mutt-devel/files/patch-ag
new file mode 100644
index 000000000000..34eb64d3b2b3
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ag
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	Wed Aug 30 18:59:43 2000
++++ Makefile.am	Sun Sep 24 04:58:37 2000
+@@ -137,7 +137,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/pkg-comment b/japanese/mutt-devel/pkg-comment
index 540edfab3b9d..3e793e09b981 100644
--- a/japanese/mutt-devel/pkg-comment
+++ b/japanese/mutt-devel/pkg-comment
@@ -1 +1 @@
-Text-based mail client (Japanised Version)
+Text-based mail client (Japanised development version)
diff --git a/japanese/mutt-devel/pkg-descr b/japanese/mutt-devel/pkg-descr
index 33eb8ee34767..59a274d690a0 100644
--- a/japanese/mutt-devel/pkg-descr
+++ b/japanese/mutt-devel/pkg-descr
@@ -4,7 +4,10 @@ advanced features like key bindings, keyboard macros, mail threading,
 regular expression searches and a powerful pattern matching language
 for selecting groups of messages.
 
-WWW: http://www.mutt.org/
+This is japanized development version.
+see /usr/local/share/doc/mutt/README.JA-PATCH
+
+WWW: http://www.ne.jp/asahi/cyber/taki/unix-mailer/mutt-dev/
 
 -
 IWASHITA Yoji
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index 99792d12c1ee..853de495a3a5 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -39,6 +39,10 @@ share/doc/mutt/TODO
 share/doc/mutt/applying-patches.txt
 share/doc/mutt/devel-notes.txt
 share/doc/mutt/manual.txt
+share/doc/mutt/README.JA-PATCH
+share/doc/mutt/manual-ja-patch.txt
+share/doc/mutt/sample.muttrc-tt
+share/doc/mutt/usage-japanese.txt
 share/doc/mutt/manual_ja.html
 share/doc/mutt/manual_ja.sgml
 share/doc/mutt/manual_ja.tex
@@ -54,7 +58,6 @@ 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/nl/LC_MESSAGES/mutt.mo
 share/locale/pl/LC_MESSAGES/mutt.mo
@@ -63,6 +66,7 @@ share/locale/ru/LC_MESSAGES/mutt.mo
 share/locale/sk/LC_MESSAGES/mutt.mo
 share/locale/sv/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
 @unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
@@ -74,7 +78,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 @unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
@@ -83,6 +86,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 @unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/cs 2>/dev/null || true
 @unexec rmdir %D/share/locale/da 2>/dev/null || true
@@ -94,7 +98,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 @unexec rmdir %D/share/locale/gl 2>/dev/null || true
 @unexec rmdir %D/share/locale/id 2>/dev/null || true
 @unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/ja 2>/dev/null || true
 @unexec rmdir %D/share/locale/ko 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl 2>/dev/null || true
 @unexec rmdir %D/share/locale/pl 2>/dev/null || true
@@ -103,5 +106,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/mutt.mo
 @unexec rmdir %D/share/locale/sk 2>/dev/null || true
 @unexec rmdir %D/share/locale/sv 2>/dev/null || true
 @unexec rmdir %D/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB2312 2>/dev/null || true
 @unexec rmdir %D/share/locale/zh_TW.Big5 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true