4 files changed, 20 insertions, 27 deletions

diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 07daf86cb008..aeb34837d242 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	2
+#PORTREVISION=	0
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.emaillab.org/mutt/1.4/ \
 		http://my.reset.jp/~iwashita/mutt/distfiles/ \
@@ -24,21 +24,15 @@ DIST_SUBDIR=	mutt
 MAINTAINER=	iwashita@cqmail.net
 COMMENT=	Text-based mail client (Japanised Version)
 
-FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/67c05283-5d62-11d8-80e3-0020ed76ef5a.html
-
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
+RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-.if !defined(WITH_GETTEXT)
 USE_GETTEXT=	yes
-.else
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-.endif
 .if defined(WITH_MUTT_CYRUS_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 .endif
-RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.4.1
+VERSION=	1.4.2.1
 JP_VERSION=	1
 MANUALVERSION=	1.4
 
@@ -51,7 +45,7 @@ USE_AUTOMAKE_VER=	14
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang"
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--without-wc-funcs \
@@ -61,9 +55,6 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-docdir=${DOCSDIR} \
 		--enable-pop --enable-imap \
 		--enable-default-japanese
-.if defined(WITH_GETTEXT)
-CONFIGURE_ARGS+=	--with-included-gettext
-.endif
 .if defined(WITH_MUTT_CYRUS_SASL)
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
@@ -76,7 +67,6 @@ DIFFDIR=	${WRKDIR}/${DISTNAME}-ja.${JP_VERSION}
 DIFFNAME=	patch-${VERSION}.tt.ja.${JP_VERSION}
 
 pre-patch:
-	(cd ${DIFFDIR}; ${PATCH} < ${FILESDIR}/prepatch-aa)
 	(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
 
 pre-configure:
diff --git a/japanese/mutt/distinfo b/japanese/mutt/distinfo
index 6a2f512f5937..e1cec9c4311f 100644
--- a/japanese/mutt/distinfo
+++ b/japanese/mutt/distinfo
@@ -1,6 +1,6 @@
-MD5 (mutt/mutt-1.4.1i.tar.gz) = fb5418135c5be2638964eef2f654f847
-SIZE (mutt/mutt-1.4.1i.tar.gz) = 2599487
-MD5 (mutt/mutt-1.4.1i-ja.1.tar.gz) = 093a8bc4b61a79606d5ce20052ae5da9
-SIZE (mutt/mutt-1.4.1i-ja.1.tar.gz) = 80251
+MD5 (mutt/mutt-1.4.2.1i.tar.gz) = 710bd56d3c4c4bcd1403bc4e053f7476
+SIZE (mutt/mutt-1.4.2.1i.tar.gz) = 2611253
+MD5 (mutt/mutt-1.4.2.1i-ja.1.tar.gz) = e5e108a990346eacff0b2648e03d098f
+SIZE (mutt/mutt-1.4.2.1i-ja.1.tar.gz) = 78266
 MD5 (mutt/manual_ja-1.4i-1.tar.gz) = 07623b9b958f89070f8dd1f227f71605
 SIZE (mutt/manual_ja-1.4i-1.tar.gz) = 300461
diff --git a/japanese/mutt/files/patch-ak b/japanese/mutt/files/patch-ak
new file mode 100644
index 000000000000..1509c8242685
--- /dev/null
+++ b/japanese/mutt/files/patch-ak
@@ -0,0 +1,12 @@
+--- muttlib.c.orig	Mon Feb  9 08:25:28 2004
++++ muttlib.c	Mon Feb  9 08:32:46 2004
+@@ -656,7 +656,8 @@
+ 
+ void mutt_mktemp (char *s)
+ {
+-  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++);
++  snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname));
++  mkstemp (s);
+   unlink (s);
+ }
+ 
diff --git a/japanese/mutt/files/prepatch-aa b/japanese/mutt/files/prepatch-aa
deleted file mode 100644
index b721d50aeedc..000000000000
--- a/japanese/mutt/files/prepatch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
---- patch-1.4.1.tt.ja.1.orig	Mon Mar 24 23:56:05 2003
-+++ patch-1.4.1.tt.ja.1	Wed Mar 26 01:11:45 2003
-@@ -2507,5 +2507,5 @@
-  
- --- mutt-ja/PATCHES~    Tue Nov  6 19:59:33 2001
- +++ mutt-ja/PATCHES     Tue Nov  6 19:59:42 2001
--@@ -1,0 +1 @@
-+@@ -0,0 +1 @@
- +patch-1.4.1.tt.ja.1