ports/65447: Update: japanese/mutt 1.4.1 -> 1.4.2.1

[IWASHITA Yoji]

>Number:         65447
>Category:       ports
>Synopsis:       Update: japanese/mutt 1.4.1 -> 1.4.2.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 11 13:20:22 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     IWASHITA Yoji
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
personal
>Environment:
System: FreeBSD akia.my.domain 4.9-STABLE FreeBSD 4.9-STABLE #0: Sat Mar 27 11:39:12 JST 2004 shuna at akia.my.domain:/usr/obj/usr/src/sys/AKIA i386

>Description:
	Update japanese/mutt 1.4.1 -> 1.4.2.1
	remove: files/prepatch-aa
	add: files/patch-ak

>How-To-Repeat:
>Fix:

diff -uNr mutt.old/Makefile mutt/Makefile
--- mutt.old/Makefile	Mon Apr 12 03:45:13 2004
+++ mutt/Makefile	Mon Apr 12 04:44:49 2004
@@ -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 @@
 MAINTAINER=	iwashita at 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_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 @@
 		--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 @@
 DIFFNAME=	patch-${VERSION}.tt.ja.${JP_VERSION}
 
 pre-patch:
-	(cd ${DIFFDIR}; ${PATCH} < ${FILESDIR}/prepatch-aa)
 	(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
 
 pre-configure:
diff -uNr mutt.old/distinfo mutt/distinfo
--- mutt.old/distinfo	Mon Apr 12 03:45:13 2004
+++ mutt/distinfo	Mon Apr 12 04:36:36 2004
@@ -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 -uNr mutt.old/files/patch-ak mutt/files/patch-ak
--- mutt.old/files/patch-ak	Thu Jan  1 09:00:00 1970
+++ mutt/files/patch-ak	Mon Apr 12 04:55:38 2004
@@ -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 -uNr mutt.old/files/prepatch-aa mutt/files/prepatch-aa
--- mutt.old/files/prepatch-aa	Mon Apr 12 03:45:13 2004
+++ mutt/files/prepatch-aa	Thu Jan  1 09:00:00 1970
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: