5 files changed, 93 insertions, 213 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index ccd99b34b095..9f3377c554db 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -14,10 +14,11 @@ MASTER_SITES=	ftp://ftp.gbnet.net/pub/mutt-international/ \
 		http://www.hiei.kit.ac.jp/~hitomi/mutt/
 DISTNAME=	${PORTNAME}-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		manual_ja-${VERSION:R}i-2.tar.gz
+		manual_ja-${VERSION:R}i-0.tar.gz
 
-PATCH_SITES=	http://kondara.sdri.co.jp/~kikutani/slang/
-PATCHFILES=	${DISTNAME}-jp${JP_VERSION}.patch.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
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
@@ -28,21 +29,24 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext \
 		automake:${PORTSDIR}/devel/automake
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.0.1
+VERSION=	1.2.4
 JP_VERSION=	0
 
 DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
+ALL_TARGET=	all
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix --with-included-gettext \
 		--enable-flock --disable-fcntl \
-		--sysconfdir=${PREFIX}/share/mutt \
+		--sysconfdir=${PREFIX}/etc \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt \
 		--enable-pop --enable-imap
 
 MAN1=		mutt.1 mutt_dotlock.1
+MAN5=		muttrc.5
 
 pre-configure:
 	(cd ${WRKSRC}; autoconf)
@@ -50,9 +54,7 @@ pre-configure:
 post-install:
 	strip ${PREFIX}/bin/mutt
 	strip ${PREFIX}/bin/mutt_dotlock
-	${INSTALL_DATA} ${WRKSRC}/contrib/sample.muttrc ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKSRC}/contrib/Mush.rc ${PREFIX}/share/doc/mutt
-	${INSTALL_DATA} ${WRKSRC}/contrib/Pine.rc ${PREFIX}/share/doc/mutt
+	strip ${PREFIX}/bin/pgpring
 	${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
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index 9829c542816f..e02773b1492a 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.0.1i.tar.gz) = bc9e998bcf0966796c1ccf78611b8a42
-MD5 (mutt/manual_ja-1.0i-2.tar.gz) = 6e1b6c6264a9c4a86e8d3b1cdb0e2987
-MD5 (mutt/mutt-1.0.1i-jp0.patch.gz) = e0b38fb7035a11fb872d402514a8a5a3
+MD5 (mutt/mutt-1.2.4i.tar.gz) = 30968eeb985c074d03078a3d6ae982c9
+MD5 (mutt/manual_ja-1.2i-0.tar.gz) = 809121b8baa58906fba7422de9c2b236
+MD5 (mutt/mutt-1.2.4i-jp0-diff.gz) = 9def4822cb3f152e89488e66df1ea2fc
diff --git a/japanese/mutt-devel/files/patch-aa b/japanese/mutt-devel/files/patch-aa
index 30622105f9e2..8f8537dfeb9a 100644
--- a/japanese/mutt-devel/files/patch-aa
+++ b/japanese/mutt-devel/files/patch-aa
@@ -1,34 +1,25 @@
-*** configure.in.orig	Sat Jan 22 22:24:10 2000
---- configure.in	Sat Jan 22 22:32:13 2000
-***************
-*** 114,131 ****
-  	
-  	AC_MSG_CHECKING(for S-Lang)
-  	if test $withval = yes; then
-! 		if test -d $srcdir/../slang; then
-! 			mutt_cv_slang=$srcdir/../slang/src
-! 			CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}"
-! 			LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
-! 		else
-! 			if test -d $mutt_cv_prefix/include/slang; then
-! 				CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang"
-! 			elif test -d /usr/include/slang; then
-! 				CPPFLAGS="$CPPFLAGS -I/usr/include/slang"
-! 			fi
-! 			mutt_cv_slang=yes
-  		fi
-  	else
-  		dnl ---Check to see if $withval is a source directory
-  		if test -f $withval/src/slang.h; then
---- 114,124 ----
-  	
-  	AC_MSG_CHECKING(for S-Lang)
-  	if test $withval = yes; then
-! 		if test -d $mutt_cv_prefix/include/slang; then
-! 			CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang"
-! 			LDFLAGS="$LDFLAGS -L$mutt_cv_prefix/lib"
-  		fi
-+ 		mutt_cv_slang=yes
-  	else
-  		dnl ---Check to see if $withval is a source directory
-  		if test -f $withval/src/slang.h; then
+--- configure.in.orig	Wed Jul 19 03:25:03 2000
++++ configure.in	Wed Jul 19 03:25:35 2000
+@@ -119,18 +119,11 @@
+ 	
+ 	AC_MSG_CHECKING(for S-Lang)
+ 	if test $withval = yes; then
+-		if test -d $srcdir/../slang; then
+-			mutt_cv_slang=$srcdir/../slang/src
+-			CPPFLAGS="$CPPFLAGS -I${mutt_cv_slang}"
+-			LDFLAGS="$LDFLAGS -L${mutt_cv_slang}/objs"
+-		else
+-			if test -d $mutt_cv_prefix/include/slang; then
+-				CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang"
+-			elif test -d /usr/include/slang; then
+-				CPPFLAGS="$CPPFLAGS -I/usr/include/slang"
+-			fi
+-			mutt_cv_slang=yes
++		if test -d $mutt_cv_prefix/include/slang; then
++			CPPFLAGS="$CPPFLAGS -I$mutt_cv_prefix/include/slang"
++			LDFLAGS="$LDFLAGS -L$mutt_cv_prefix/lib"
+ 		fi
++		mutt_cv_slang=yes
+ 	else
+ 		dnl ---Check to see if $withval is a source directory
+ 		if test -f $withval/src/slang.h; then
diff --git a/japanese/mutt-devel/files/patch-ab b/japanese/mutt-devel/files/patch-ab
new file mode 100644
index 000000000000..f8b06efd6686
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ab
@@ -0,0 +1,11 @@
+--- muttlib.c.orig	Wed Jul 19 03:25:03 2000
++++ muttlib.c	Wed Jul 19 03:26:06 2000
+@@ -1103,7 +1103,7 @@
+ void mutt_display_sanitize (char *s)
+ {
+ #ifdef KANJI
+-  if (strcmp(Charset, "iso-2022-jp") == 0)
++  if (strcmp(Charset, "iso-2022-jp") == 0 || strcmp(Charset, "euc-jp") == 0)
+     return;
+ #endif
+ 
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index b8563b70fe7c..86baa3adef44 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -1,5 +1,30 @@
 bin/mutt
 bin/mutt_dotlock
+bin/muttbug
+bin/pgpewrap
+bin/pgpring
+etc/Muttrc
+etc/mime.types
+share/doc/mutt/html/manual-1.html
+share/doc/mutt/html/manual-2.html
+share/doc/mutt/html/manual-3.html
+share/doc/mutt/html/manual-4.html
+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
+@dirrm share/doc/mutt/html
+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/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
+@dirrm share/doc/mutt/samples
 share/doc/mutt/COPYRIGHT
 share/doc/mutt/ChangeLog
 share/doc/mutt/GPL
@@ -8,225 +33,76 @@ share/doc/mutt/NEWS
 share/doc/mutt/PGP-Notes.txt
 share/doc/mutt/README
 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
 share/doc/mutt/manual.txt
-share/doc/mutt/sample.muttrc
-share/doc/mutt/Mush.rc
-share/doc/mutt/Pine.rc
-share/doc/mutt/manual_ja.txt
-share/doc/mutt/manual_ja.tex
 share/doc/mutt/manual_ja.html
 share/doc/mutt/manual_ja.sgml
+share/doc/mutt/manual_ja.tex
+share/doc/mutt/manual_ja.txt
 @dirrm share/doc/mutt
-share/mutt/charsets/ansi-x3-110-1983
-share/mutt/charsets/ansi-x3-4-1968
-share/mutt/charsets/asmo-449
-share/mutt/charsets/baltic
-share/mutt/charsets/bs-4730
-share/mutt/charsets/bs-viewdata
-share/mutt/charsets/charsets.alias
-share/mutt/charsets/charsets.alias.dist
-share/mutt/charsets/cp1250
-share/mutt/charsets/cp1251
-share/mutt/charsets/cp1252
-share/mutt/charsets/cp1253
-share/mutt/charsets/cp1254
-share/mutt/charsets/cp1255
-share/mutt/charsets/cp1256
-share/mutt/charsets/cp1257
-share/mutt/charsets/csa-z243-4-1985-1
-share/mutt/charsets/csa-z243-4-1985-2
-share/mutt/charsets/csa-z243-4-1985-gr
-share/mutt/charsets/csn-369103
-share/mutt/charsets/cwi
-share/mutt/charsets/dec-mcs
-share/mutt/charsets/din-66003
-share/mutt/charsets/ds-2089
-share/mutt/charsets/ebcdic-at-de
-share/mutt/charsets/ebcdic-at-de-a
-share/mutt/charsets/ebcdic-ca-fr
-share/mutt/charsets/ebcdic-dk-no
-share/mutt/charsets/ebcdic-dk-no-a
-share/mutt/charsets/ebcdic-es
-share/mutt/charsets/ebcdic-es-a
-share/mutt/charsets/ebcdic-es-s
-share/mutt/charsets/ebcdic-fi-se
-share/mutt/charsets/ebcdic-fi-se-a
-share/mutt/charsets/ebcdic-fr
-share/mutt/charsets/ebcdic-is-friss
-share/mutt/charsets/ebcdic-it
-share/mutt/charsets/ebcdic-pt
-share/mutt/charsets/ebcdic-uk
-share/mutt/charsets/ebcdic-us
-share/mutt/charsets/ecma-cyrillic
-share/mutt/charsets/es
-share/mutt/charsets/es2
-share/mutt/charsets/gb-1988-80
-share/mutt/charsets/gost-19768-74
-share/mutt/charsets/greek7
-share/mutt/charsets/greek7-old
-share/mutt/charsets/greek-ccitt
-share/mutt/charsets/hp-roman8
-share/mutt/charsets/ibm037
-share/mutt/charsets/ibm038
-share/mutt/charsets/ibm1004
-share/mutt/charsets/ibm1026
-share/mutt/charsets/ibm1047
-share/mutt/charsets/ibm256
-share/mutt/charsets/ibm273
-share/mutt/charsets/ibm274
-share/mutt/charsets/ibm275
-share/mutt/charsets/ibm277
-share/mutt/charsets/ibm278
-share/mutt/charsets/ibm280
-share/mutt/charsets/ibm281
-share/mutt/charsets/ibm284
-share/mutt/charsets/ibm285
-share/mutt/charsets/ibm290
-share/mutt/charsets/ibm297
-share/mutt/charsets/ibm420
-share/mutt/charsets/ibm423
-share/mutt/charsets/ibm424
-share/mutt/charsets/ibm437
-share/mutt/charsets/ibm500
-share/mutt/charsets/ibm850
-share/mutt/charsets/ibm851
-share/mutt/charsets/ibm852
-share/mutt/charsets/ibm855
-share/mutt/charsets/ibm857
-share/mutt/charsets/ibm860
-share/mutt/charsets/ibm861
-share/mutt/charsets/ibm862
-share/mutt/charsets/ibm863
-share/mutt/charsets/ibm864
-share/mutt/charsets/ibm865
-share/mutt/charsets/ibm868
-share/mutt/charsets/ibm869
-share/mutt/charsets/ibm870
-share/mutt/charsets/ibm871
-share/mutt/charsets/ibm875
-share/mutt/charsets/ibm880
-share/mutt/charsets/ibm891
-share/mutt/charsets/ibm903
-share/mutt/charsets/ibm904
-share/mutt/charsets/ibm905
-share/mutt/charsets/ibm918
-share/mutt/charsets/iec-p27-1
-share/mutt/charsets/inis
-share/mutt/charsets/inis-8
-share/mutt/charsets/inis-cyrillic
-share/mutt/charsets/invariant
-share/mutt/charsets/iso-10367-box
-share/mutt/charsets/iso-2033-1983
-share/mutt/charsets/iso-5427
-share/mutt/charsets/iso-5427-ext
-share/mutt/charsets/iso-5428
-share/mutt/charsets/iso-646-basic
-share/mutt/charsets/iso-646-irv
-share/mutt/charsets/iso-6937
-share/mutt/charsets/iso-6937-2-25
-share/mutt/charsets/iso-6937-2-add
-share/mutt/charsets/iso-8859-1
-share/mutt/charsets/iso-8859-10
-share/mutt/charsets/iso-8859-2
-share/mutt/charsets/iso-8859-3
-share/mutt/charsets/iso-8859-4
-share/mutt/charsets/iso-8859-5
-share/mutt/charsets/iso-8859-6
-share/mutt/charsets/iso-8859-7
-share/mutt/charsets/iso-8859-8
-share/mutt/charsets/iso-8859-9
-share/mutt/charsets/iso-8859-supp
-share/mutt/charsets/iso-ir-90
-share/mutt/charsets/it
-share/mutt/charsets/jis-c6220-1969-jp
-share/mutt/charsets/jis-c6220-1969-ro
-share/mutt/charsets/jis-c6229-1984-a
-share/mutt/charsets/jis-c6229-1984-b
-share/mutt/charsets/jis-c6229-1984-b-add
-share/mutt/charsets/jis-c6229-1984-hand
-share/mutt/charsets/jis-c6229-1984-hand-add
-share/mutt/charsets/jis-c6229-1984-kana
-share/mutt/charsets/jis-x0201
-share/mutt/charsets/jus-i-b1-002
-share/mutt/charsets/jus-i-b1-003-mac
-share/mutt/charsets/jus-i-b1-003-serb
-share/mutt/charsets/koi-8
-share/mutt/charsets/koi8-r
-share/mutt/charsets/ksc5636
-share/mutt/charsets/latin-greek
-share/mutt/charsets/latin-greek-1
-share/mutt/charsets/macintosh
-share/mutt/charsets/mac-is
-share/mutt/charsets/msz-7795-3
-share/mutt/charsets/nats-dano
-share/mutt/charsets/nats-dano-add
-share/mutt/charsets/nats-sefi
-share/mutt/charsets/nats-sefi-add
-share/mutt/charsets/nc-nc00-10
-share/mutt/charsets/nextstep
-share/mutt/charsets/nf-z-62-010
-share/mutt/charsets/nf-z-62-010-(1973)
-share/mutt/charsets/ns-4551-1
-share/mutt/charsets/ns-4551-2
-share/mutt/charsets/pt
-share/mutt/charsets/pt2
-share/mutt/charsets/sami
-share/mutt/charsets/sen-850200-b
-share/mutt/charsets/sen-850200-c
-share/mutt/charsets/t-101-g2
-share/mutt/charsets/t-61-7bit
-share/mutt/charsets/t-61-8bit
-share/mutt/charsets/videotex-suppl
-@dirrm share/mutt/charsets
-share/mutt/Muttrc
-share/mutt/mime.types
 @dirrm share/mutt
 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/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
+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/uk/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
 @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/eo/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@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
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
 @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_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
 @unexec rmdir %D/share/locale/de 2>/dev/null || true
 @unexec rmdir %D/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/share/locale/eo 2>/dev/null || true
 @unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@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
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
 @unexec rmdir %D/share/locale/ru 2>/dev/null || true
 @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_TW.Big5 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true