Update to 1.3.24

PR:		shuna@pop16.odn.ne.jp
Submitted by:	maintainer

7 files changed, 37 insertions, 14 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index ab9d849f3b65..63addbd11d5c 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.emaillab.org/mutt/1.3/ \
 		ftp://ftp.mutt.org/pub/mutt/devel/
 DISTNAME=	${PORTNAME}-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${DISTNAME}-ja${JP_VERSION}${EXTRACT_SUFX} \
+		${DISTNAME}-ja.${JP_VERSION}${EXTRACT_SUFX} \
 		manual_ja-${MANUALVERSION}i-0${EXTRACT_SUFX}
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
@@ -29,8 +29,8 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext
 .endif
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-VERSION=	1.3.23
-JP_VERSION=	0
+VERSION=	1.3.24
+JP_VERSION=	1
 MANUALVERSION=	1.3.23
 
 DIST_SUBDIR=	mutt
@@ -41,7 +41,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
-		--with-iconv=${PREFIX} \
+		--with-libiconv-prefix=${PREFIX} \
 		--without-wc-funcs \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/etc \
@@ -52,6 +52,7 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 CONFIGURE_ARGS+=	--with-included-gettext
 .endif
 
+NOMANCOMPRESS=	yes
 MAN1=		flea.1 mutt.1 muttbug.1 mutt_dotlock.1
 MAN5=		muttrc.5 mbox.5
 
@@ -62,11 +63,12 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--with-ssl
 .endif
 
-DIFFDIR=	${WRKDIR}/${DISTNAME}-ja${JP_VERSION}
-DIFFNAME=	${DISTNAME}-ja${JP_VERSION}.diff
+DIFFDIR=	${WRKDIR}/${DISTNAME}-ja.${JP_VERSION}
+DIFFNAME=	patch-${VERSION}.tt.ja.${JP_VERSION}
 SRCDOCSDIR=	${WRKDIR}/manual_ja-${MANUALVERSION}
 
 pre-patch:
+	(cd ${DIFFDIR}; ${PATCH} < ${FILESDIR}/prepatch-aa)
 	(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
 
 pre-configure:
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index 16a20da046e0..ec0a1eee645e 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (mutt/mutt-1.3.23i.tar.gz) = 0de890dca66042bcfcb01023c691bb5a
-MD5 (mutt/mutt-1.3.23i-ja0.tar.gz) = fd8ab3d4875dbb1a6f3fad89f408e379
+MD5 (mutt/mutt-1.3.24i.tar.gz) = 19628b9836d204abc23226257e260342
+MD5 (mutt/mutt-1.3.24i-ja.1.tar.gz) = e84097575a0fbcf8b5910b7db1593eab
 MD5 (mutt/manual_ja-1.3.23i-0.tar.gz) = dfbedc3b9b7beb9d797c899fec920300
diff --git a/japanese/mutt-devel/files/patch-aa b/japanese/mutt-devel/files/patch-aa
index 3368d6132b74..a596f56c149f 100644
--- a/japanese/mutt-devel/files/patch-aa
+++ b/japanese/mutt-devel/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.in.orig	Sat Sep  1 23:38:52 2001
-+++ configure.in	Sat Sep  1 23:39:17 2001
-@@ -683,7 +683,7 @@
+--- configure.in.orig	Fri Dec  7 03:41:04 2001
++++ configure.in	Fri Dec  7 03:41:14 2001
+@@ -684,7 +684,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
@@ -9,7 +9,7 @@
  int main()
  {
    iconv_t cd;
-@@ -714,7 +714,7 @@
+@@ -715,7 +715,7 @@
          mutt_save_LIBS="$LIBS"
          LIBS="$LIBS $LIBICONV"
          AC_TRY_RUN([
diff --git a/japanese/mutt-devel/files/patch-af b/japanese/mutt-devel/files/patch-af
index 9dc05d9d2c05..88ba7656f455 100644
--- a/japanese/mutt-devel/files/patch-af
+++ b/japanese/mutt-devel/files/patch-af
@@ -1,5 +1,5 @@
---- charset.h.orig	Tue Mar  6 00:03:04 2001
-+++ charset.h	Tue Mar  6 00:04:22 2001
+--- charset.h.orig	Fri Dec  7 03:41:04 2001
++++ charset.h	Fri Dec  7 03:42:31 2001
 @@ -19,7 +19,7 @@
  #ifndef _CHARSET_H
  #define _CHARSET_H
diff --git a/japanese/mutt-devel/files/patch-ai b/japanese/mutt-devel/files/patch-ai
new file mode 100644
index 000000000000..e6b04a327b34
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ai
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Sat Nov 10 04:06:08 2001
++++ doc/Makefile.in	Sat Nov 10 04:06:36 2001
+@@ -73,7 +73,7 @@
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
+ 	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
+ 	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
+-	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
++	echo ".so man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
+ 	./instdoc $(srcdir)/dotlock.man \
+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
diff --git a/japanese/mutt-devel/files/prepatch-aa b/japanese/mutt-devel/files/prepatch-aa
new file mode 100644
index 000000000000..1163394b55cf
--- /dev/null
+++ b/japanese/mutt-devel/files/prepatch-aa
@@ -0,0 +1,9 @@
+--- patch-1.3.24.tt.ja.1.orig	Fri Dec  7 03:38:54 2001
++++ patch-1.3.24.tt.ja.1	Fri Dec  7 03:39:09 2001
+@@ -2081,5 +2081,5 @@
+  msgid "Parent message is not available."
+ --- 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.3.24.tt.ja.1
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index 5b9fcc040b7c..097a00b870dc 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -39,6 +39,7 @@ share/doc/mutt/manual_ja.html
 share/doc/mutt/manual_ja.sgml
 share/doc/mutt/manual_ja.tex
 share/doc/mutt/manual_ja.txt
+share/doc/mutt/patch-notes.txt
 share/doc/mutt/samples/Mush.rc
 share/doc/mutt/samples/Pine.rc
 share/doc/mutt/samples/Tin.rc