o Added -D_DONT_USE_CTYPE_INLINE_ to CFLAGS not to use inlined wcwidth().

o Cleaned up pkg-plist for NOPORTDOCS.
o Added the latest Japanese documents.
o Also added the following knobs.
	WITH_MUTT_HEADER_CACHE
	WITH_MUTT_IDN
	MUTT_CONFIGURE_ARGS

PR:		ports-jp/14983[1], ports/71329[2]
Submitted by:	KOMATSU Shinichiro <koma2@ms.u-tokyo.ac.jp>[1]
		SHIOZAKI Takehiko <st@be.to> (maintainer)[2]
Reviewed by:	Kimura Fuyuki <fuyuki@hadaly.org>
		vs

3 files changed, 118 insertions, 83 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 3a4434fb40bc..dfc08c3868c5 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -9,16 +9,18 @@
 
 PORTNAME=	mutt-devel
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.emaillab.org/mutt/1.5/ \
 		http://my.reset.jp/~iwashita/mutt/distfiles/ \
 		http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
+		http://mutt-j.sourceforge.jp/ \
 		ftp://ftp.mutt.org/mutt/devel/
 DISTNAME=	mutt-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME}-ja.${JP_VERSION}${EXTRACT_SUFX} \
-		manual_ja-${MANUALVERSION}i-1${EXTRACT_SUFX}
+		manual_ja-${MANUALVERSION}i-1${EXTRACT_SUFX} \
+		manual.ja-${MANJADATE}${EXTRACT_SUFX}
 DIST_SUBDIR=	mutt
 
 MAINTAINER=	st@be.to
@@ -33,12 +35,24 @@ USE_GETTEXT=	yes
 .if defined(WITH_MUTT_CYRUS_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 .endif
+.if defined(WITH_MUTT_IDN)
+LIB_DEPENDS+=	idn.15:${PORTSDIR}/devel/libidn
+.endif
+
+.if defined(WITH_MUTT_HEADER_CACHE)
+PATCH_SITES+=	http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/:hcache
+PATCHFILES+=	patch-${VERSION}.tg.hcache.3:hcache
+PATCH_DIST_STRIP+=	-p1
+
+LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
+.endif
 
 CONFLICTS=	mutt-* ja-mutt-1.[024]*
 
 VERSION=	1.5.6
 JP_VERSION=	1
 MANUALVERSION=	1.4
+MANJADATE=	20040808
 
 FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
@@ -51,7 +65,7 @@ USE_AUTOCONF_VER=	213
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
+CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ ${DB_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
 		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-libiconv-prefix=${LOCALBASE} \
@@ -62,6 +76,9 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-docdir=${DOCSDIR} \
 		--enable-pop --enable-imap \
 		--enable-default-japanese
+.if defined(MUTT_CONFIGURE_ARGS)
+CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
+.endif
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB=	NLS="@comment "
@@ -71,6 +88,14 @@ PLIST_SUB+=	NLS=""
 .if defined(WITH_MUTT_CYRUS_SASL)
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
+.if defined(WITH_MUTT_HEADER_CACHE)
+CONFIGURE_ARGS+=	--enable-hcache
+.endif
+.if defined(WITH_MUTT_IDN)
+CONFIGURE_ARGS+=	--with-idn=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-idn
+.endif
 
 NOMANCOMPRESS=	yes
 MAN1=		flea.1 mutt.1 muttbug.1 mutt_dotlock.1
@@ -87,7 +112,7 @@ pre-configure:
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-aa
 	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-ab
 .endif
-	(cd ${WRKSRC}; ${ACLOCAL} -I m4)
+	(cd ${WRKSRC}; ${ACLOCAL} -I m4; ${AUTOHEADER})
 
 post-configure:
 	@${REINPLACE_CMD} -E "\
@@ -121,6 +146,9 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.sgml ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/manual.ja.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/manual.ja.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/manual.ja.sgml ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/mutt-devel/distinfo b/japanese/mutt-devel/distinfo
index b6cf1fe02308..9d9800dab7de 100644
--- a/japanese/mutt-devel/distinfo
+++ b/japanese/mutt-devel/distinfo
@@ -4,3 +4,7 @@ MD5 (mutt/mutt-1.5.6i-ja.1.tar.gz) = 491f3f73fe232d835f78a57838e1b5e5
 SIZE (mutt/mutt-1.5.6i-ja.1.tar.gz) = 78594
 MD5 (mutt/manual_ja-1.4i-1.tar.gz) = 07623b9b958f89070f8dd1f227f71605
 SIZE (mutt/manual_ja-1.4i-1.tar.gz) = 300461
+MD5 (mutt/manual.ja-20040808.tar.gz) = 393e8d39025278f263018f6d314049f8
+SIZE (mutt/manual.ja-20040808.tar.gz) = 272680
+MD5 (mutt/patch-1.5.6.tg.hcache.3) = d7a6eea28e0b3cfbe72623916eba6cb7
+SIZE (mutt/patch-1.5.6.tg.hcache.3) = 35166
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index f3fabe4aba5f..17955678c7d5 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -7,85 +7,88 @@ bin/pgpring
 bin/smime_keys
 etc/Muttrc
 etc/mime.types
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/ChangeLog.old
-%%DOCSDIR%%/GPL
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/INSTALL.ja
-%%DOCSDIR%%/INSTALL.JA-PATCH.ja
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/NEWS.ja
-%%DOCSDIR%%/PGP-Notes.txt
-%%DOCSDIR%%/PGP-Notes.ja.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.ja
-%%DOCSDIR%%/README.JA-PATCH.ja
-%%DOCSDIR%%/README.SECURITY
-%%DOCSDIR%%/README.SECURITY.ja
-%%DOCSDIR%%/README.SSL
-%%DOCSDIR%%/README.SSL.ja
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/applying-patches.txt
-%%DOCSDIR%%/applying-patches.ja.txt
-%%DOCSDIR%%/devel-notes.txt
-%%DOCSDIR%%/html/INSTALL.JA-PATCH.ja.html
-%%DOCSDIR%%/html/README.JA-PATCH.ja.html
-%%DOCSDIR%%/html/manual-1.html
-%%DOCSDIR%%/html/manual-2.html
-%%DOCSDIR%%/html/manual-3.html
-%%DOCSDIR%%/html/manual-4.html
-%%DOCSDIR%%/html/manual-5.html
-%%DOCSDIR%%/html/manual-6.html
-%%DOCSDIR%%/html/manual-7.html
-%%DOCSDIR%%/html/manual.html
-%%DOCSDIR%%/html/manual-ja-patch.en.html
-%%DOCSDIR%%/html/manual-ja-patch.ja.html
-%%DOCSDIR%%/html/usage-japanese.ja.html
-%%DOCSDIR%%/manual.txt
-%%DOCSDIR%%/manual_ja.html
-%%DOCSDIR%%/manual_ja.sgml
-%%DOCSDIR%%/manual_ja.tex
-%%DOCSDIR%%/manual_ja.txt
-%%DOCSDIR%%/patch-notes.txt
-%%DOCSDIR%%/samples/Mush.rc
-%%DOCSDIR%%/samples/Pine.rc
-%%DOCSDIR%%/samples/Tin.rc
-%%DOCSDIR%%/samples/ca-bundle.crt
-%%DOCSDIR%%/samples/gpg.rc
-%%DOCSDIR%%/samples/iconv/iconv.aix-3.2.5.rc
-%%DOCSDIR%%/samples/iconv/iconv.aix-4.1.5.rc
-%%DOCSDIR%%/samples/iconv/iconv.aix-4.2.0.rc
-%%DOCSDIR%%/samples/iconv/iconv.aix-4.3.2.rc
-%%DOCSDIR%%/samples/iconv/iconv.freebsd-3.3.rc
-%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.3.rc
-%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.90.rc
-%%DOCSDIR%%/samples/iconv/iconv.hpux-10.01.rc
-%%DOCSDIR%%/samples/iconv/iconv.hpux-10.20.rc
-%%DOCSDIR%%/samples/iconv/iconv.hpux-11.00.rc
-%%DOCSDIR%%/samples/iconv/iconv.irix-6.5.rc
-%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0a.rc
-%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0d.rc
-%%DOCSDIR%%/samples/iconv/iconv.solaris-2.4.rc
-%%DOCSDIR%%/samples/iconv/iconv.solaris-2.5.1.rc
-%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
-%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
-%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
-%%DOCSDIR%%/samples/mutt-en.rc
-%%DOCSDIR%%/samples/mutt-ja.rc
-%%DOCSDIR%%/samples/pgp2.rc
-%%DOCSDIR%%/samples/pgp5.rc
-%%DOCSDIR%%/samples/pgp6.rc
-%%DOCSDIR%%/samples/sample.mailcap
-%%DOCSDIR%%/samples/sample.muttrc
-%%DOCSDIR%%/samples/sample.muttrc-tlr
-%%DOCSDIR%%/samples/sample.muttrc-tt
-%%DOCSDIR%%/samples/smime.rc
-%%DOCSDIR%%/samples/smime_keys_test.pl
-%%DOCSDIR%%/samples/colors.default
-%%DOCSDIR%%/samples/colors.linux
-%%DOCSDIR%%/smime-notes.txt
-%%DOCSDIR%%/smime-notes.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.old
+%%PORTDOCS%%%%DOCSDIR%%/GPL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ja
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.JA-PATCH.ja
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.ja
+%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.ja
+%%PORTDOCS%%%%DOCSDIR%%/README.JA-PATCH.ja
+%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY.ja
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL.ja
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
+%%PORTDOCS%%%%DOCSDIR%%/applying-patches.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/INSTALL.JA-PATCH.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/html/README.JA-PATCH.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-ja-patch.en.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-ja-patch.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/html/usage-japanese.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.sgml
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.tex
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.ja.sgml
+%%PORTDOCS%%%%DOCSDIR%%/manual.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/ca-bundle.crt
+%%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-3.2.5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.1.5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.2.0.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.3.2.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.freebsd-3.3.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.3.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.90.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.01.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.20.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-11.00.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.irix-6.5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0a.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0d.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.4.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.5.1.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/mutt-en.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/mutt-ja.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tlr
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tt
+%%PORTDOCS%%%%DOCSDIR%%/samples/smime.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/smime_keys_test.pl
+%%PORTDOCS%%%%DOCSDIR%%/samples/colors.default
+%%PORTDOCS%%%%DOCSDIR%%/samples/colors.linux
+%%PORTDOCS%%%%DOCSDIR%%/smime-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/smime-notes.ja.txt
 %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/da/LC_MESSAGES/mutt.mo