From owner-ports-jp@jp.FreeBSD.org Mon Aug 30 12:49:07 2004
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) id i7U3n7l42694;
	Mon, 30 Aug 2004 12:49:07 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from takehiko.zive.net (p62f83c.tokynt01.ap.so-net.ne.jp [219.98.248.60])
	by castle.jp.FreeBSD.org (8.11.6p2+3.4W/8.11.3) with ESMTP/inet id i7U3n6842688
	for <ports-jp@jp.FreeBSD.org>; Mon, 30 Aug 2004 12:49:06 +0900 (JST)
	(envelope-from st@be.to)
Received: by takehiko.zive.net (Postfix, from userid 4013)
	id 72A4C1B51AC; Mon, 30 Aug 2004 12:49:20 +0900 (JST)
From: SHIOZAKI Takehiko <st@be.to>
To: ports-jp@jp.FreeBSD.org
Message-ID: <20040830034918.GA7978%st@be.to>
References: <20040829225750.89D324AC1F@straycat.ms.u-tokyo.ac.jp>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-2022-jp
Content-Disposition: inline
In-Reply-To: <20040829225750.89D324AC1F@straycat.ms.u-tokyo.ac.jp>
User-Agent: Mutt/1.5.6i
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
Date: Mon, 30 Aug 2004 12:49:19 +0900
X-Sequence: ports-jp 14985
Subject: [ports-jp 14985] Re: maildir/imap header cache patch for mutt
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: st@be.to
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+040816

[On Aug 30, KOMATSU Shinichiro <koma2@ms.u-tokyo.ac.jp> wrote:]

>maildir/imap header cache patch for mutt $B$H$$$&$N$,$"$j$^$9!#(B
>
>    http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/

$B$"$"!"JL7o$N$D$$$G$K$^$5$K:n6H$r$7$F$$$?$H$3$m$J$N$K$b$?$b$?$7$F(B
$B$$$F!"$*<j?t$r$*3]$1$7$F$7$^$$$^$7$?!#(B
http://www.momonga-linux.org/~tamo/
$B$K$"$k$b$N$r;29M$K$7$F!":#2s$N>.>>$5$s$N$b:.$<$F$"$j$^$9!#(B
$B;d$O(BMaildir$B$b(BIMAP$B$b(BIDN$B$b;H$C$F$$$J$$$N$G!"3'MM$N;n83Bg4?7^$G$9!#(B

$B85$N(Bjapanese/mutt-devel$B$H$NAj0[E@$O0J2<$N$H$*$j$G$9!#(B

* $B:G6a$N(Bwcwidth()$B$N%$%s%i%$%s2=$KBP1~$7$?!#(B
	$B$H8@$C$F$b!"%$%s%i%$%s$N$r;H$o$J$/$7$?$@$1$G$9!#(B
	$B$3$l$K$h$C$F!"(B5.2.1$B$G$O%3%s%Q%$%k$G$-$J$/$J$C$F$$$^$7$?!#(B
	$B$^$?!"$3$N<jEv$F$O(Bjapanese/mutt(1.4$B7ONs(B)$B$K$bI,MW$G$9!#(B

* WITH_MUTT_HEADER_CACHE$B$r@_Dj$9$k$3$H$K$h$j!"I=Bj$N(B
  maildir/imap header cache patch for mutt$B$,M-8z$K$J$k!#(B
	$B$=$N$^$^$G$O(Bgdbm$B$,;H$o$l$^$9$,!"(BWITH_BDB_VER$B$r(B42$B$K@_Dj$7(B
	$B$F$*$/$H(BBerkeley DB 4.2$B$,!"(BWITH_BDB_VER$B$r(B41$B$K@_Dj$7$F$*(B
	$B$/$H(BBerkeley DB 4.1$B$,!"$=$l$>$l;H$o$l$^$9!#(B

* WITH_MUTT_IDN$B$r@_Dj$9$k$3$H$K$h$j!"(BIDN$B$KBP1~$9$k!#(B

* devel$B7ONs$KBP1~$7$?F|K\8l%^%K%e%"%k$b4^$a$?!#(B

$B$^$?!"(Btamo$B$5$s$+$i$N;XE&$b4^$a$F!"$$$/$D$+<ALd$,$"$j$^$9!#(B

* NOPORTDOCS$B$,@_Dj$5$l$F$$$k$H$-$K!"(Bpkg-plist$B$N(B%%DOCSDIR%%$B$,%3%a(B
$B%s%H%"%&%H$5$l$J$$$N$G!"(B($B@N$+$i(B)$B$9$C$-$j(Bdeinstall$B$G$-$^$;$s!#(B
$B$3$l$O3F(Bport$B$N(BMakefile$B$G(B

.if defined(NOPORTDOCS)
PLIST_SUB+=	DOCSDIR="@comment "
.endif

$B$N$h$&$K=q$+$J$/$F$O$J$i$J$$$N$G$7$g$&$+!#(B
PORTDOCS$B$O(Bbsd.port.mk$B$,LLE]$r8+$F$/$l$F$$$k$h$&$G$9$,!#(B

* mail/mutt-devel$B$G$b!"(Bconfigure$B$KG$0U$N0z?t$rEO$;$k$h$&$K(B

.if defined(MUTT_CONFIGURE_ARGS)
CONFIGURE_ARGS+=	${MUTT_CONFIGURE_ARGS}
.endif

$B$H$$$&$h$&$J5-=R$,$J$5$l$F$$$^$9$,!"$=$b$=$b:G=i$N(B

CONFIGURE_ARGS=	...

$B$N9T$r(B

CONFIGURE_ARGS+=	...

$B$K$7$F$*$$$F!":G=i$+$i(BCONFIGURE_ARGS$B$K@_Dj$G$-$k$h$&$K$7$F$*$/$N(B
$B$O<YF;$J$N$G$7$g$&$+!#(B

* $B$H$/$K$3$@$o$j$,$J$$>l9g!"(BUSE_AUTOMAKE_VER$B$d(BUSE_AUTOCONF_VER$B$K(B
$B$O$I$N%P!<%8%g%s$r;XDj$7$F$*$/$N$,$h$$$N$G$7$g$&$+!#(B

diff -urN mutt-devel/Makefile mutt-devel-hcache/Makefile
--- mutt-devel/Makefile	Sat Jun  5 02:29:22 2004
+++ mutt-devel-hcache/Makefile	Mon Aug 30 12:15:51 2004
@@ -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,34 @@
 .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
+
+.if defined(WITH_BDB_VER)
+.if ${WITH_BDB_VER} == 42
+DB_CFLAGS=	-I${LOCALBASE}/include/db42
+LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
+.elif ${WITH_BDB_VER} == 41
+DB_CFLAGS=	-I${LOCALBASE}/include/db41
+LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
+.endif
+.else
+LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
+.endif
+.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 +75,7 @@
 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} \
@@ -71,6 +95,12 @@
 .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}
+.endif
 
 NOMANCOMPRESS=	yes
 MAN1=		flea.1 mutt.1 muttbug.1 mutt_dotlock.1
@@ -87,7 +117,7 @@
 	${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 +151,9 @@
 	${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 -urN mutt-devel/distinfo mutt-devel-hcache/distinfo
--- mutt-devel/distinfo	Wed Mar  3 01:16:59 2004
+++ mutt-devel-hcache/distinfo	Mon Aug 30 12:17:13 2004
@@ -4,3 +4,7 @@
 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 -urN mutt-devel/pkg-plist mutt-devel-hcache/pkg-plist
--- mutt-devel/pkg-plist	Mon May 17 11:35:24 2004
+++ mutt-devel-hcache/pkg-plist	Thu Aug 26 17:05:39 2004
@@ -47,6 +47,9 @@
 %%DOCSDIR%%/manual_ja.sgml
 %%DOCSDIR%%/manual_ja.tex
 %%DOCSDIR%%/manual_ja.txt
+%%DOCSDIR%%/manual.ja.html
+%%DOCSDIR%%/manual.ja.sgml
+%%DOCSDIR%%/manual.ja.txt
 %%DOCSDIR%%/patch-notes.txt
 %%DOCSDIR%%/samples/Mush.rc
 %%DOCSDIR%%/samples/Pine.rc

-- 
$B$?$@$7!";d$O<*I!0v9"$,<e$$$N$G!"2q5D$O6X1l$K$7$F$/$@$5$$!#(B
--
$B1v:j(B $B5#I'(B(SHIOZAKI Takehiko)
