From owner-ports-jp@jp.freebsd.org  Tue Aug 31 17:51:05 1999
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id RAA61730;
	Tue, 31 Aug 1999 17:51:05 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from nakaji.tutrp.tut.ac.jp (nakaji.tutrp.tut.ac.jp [133.15.188.118])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id RAA61724
	for <ports-jp@jp.freebsd.org>; Tue, 31 Aug 1999 17:51:03 +0900 (JST)
	(envelope-from nakaji@tutrp.tut.ac.jp)
Received: (from nakaji@localhost)
	by nakaji.tutrp.tut.ac.jp (8.9.3/3.7W) id RAA21277;
	Tue, 31 Aug 1999 17:51:02 +0900 (JST)
To: ports-jp@jp.freebsd.org
References: <199908290947.SAA13029@zeisei8.dpri.kyoto-u.ac.jp> <19990830094402Y.yamaga@daisy.ipc.chiba-u.ac.jp> <87yaeu83t4.fsf@nakaji.tutrp.tut.ac.jp> <vqciu5xmzao.fsf@silvia.hip.berkeley.edu> <87wvud7hqr.fsf@nakaji.tutrp.tut.ac.jp> <199908300927.CAA47945@silvia.hip.berkeley.edu> <873dx1a9q0.fsf@nakaji.tutrp.tut.ac.jp>
MIME-Version: 1.0 (generated by SEMI 1.13.6 - "Komatsu")
Content-Type: text/plain; charset=ISO-2022-JP
From: nakaji@tutrp.tut.ac.jp (=?ISO-2022-JP?B?GyRCQ2Y8IxsoQiAbJEI5MDlUGyhC?=)
Date: 31 Aug 1999 17:51:01 +0900
In-Reply-To: <873dx1a9q0.fsf@nakaji.tutrp.tut.ac.jp>
 (=?ISO-2022-JP?B?GyRCQ2Y8IxsoQiAbJEI5MDlUGyhCJ3M=?= message of "30 Aug 1999
 18:39:19 +0900")
Message-ID: <87u2pgjpu2.fsf@nakaji.tutrp.tut.ac.jp>
Lines: 130
User-Agent: T-gnus/6.13.1 (based on Pterodactyl Gnus v0.96) (revision 01) SEMI/1.13.6 (Komatsu) FLIM/1.13.2 (Kasanui) MULE XEmacs/21.2 (beta19) (Shinjuku) (i386-unknown-freebsd4.0)
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+990727
X-Sequence: ports-jp 7386
Subject: [ports-jp 7386] Re: japanese/gd needs update
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: nakaji@nakaji.tutrp.tut.ac.jp

$BCf<#(B@$BK-66$G$9!#$3$s$J$3$H$r$7$F$$$k>l9g$G$O$J$$$N$K!D(B

>>>>> In <873dx1a9q0.fsf@nakaji.tutrp.tut.ac.jp> 
>>>>>	nakaji@tutrp.tut.ac.jp ($BCf<#(B $B909T(B) wrote:

PW> $B$b$C$H4JC1$K(B
PW> BROKEN=	gd upgrade
PW> $B$H$7$F$*$-$^$7$?!#(B

$B;d(B> $B$"$j$,$H$&$4$6$$$^$9!#(Bgnuplot+ patch $B$NF08~$r8+$J$,$i!"$$$D$K$J$k$+CG(B
$B;d(B> $B8@$7$^$;$s$,!"(BBROKEN $B$,<h$l$k$h$&$K$7$^$9!#(B

$B;CDjE*$G$9$,!"(Bgd-1.6.x $B$G$"$l$P!"(Bterm/gif.trm $B$rFI$_9~$^$J$/$9$k$H$$$&(B
$B;32l$5$s$N%Q%C%A$r<h$j9~$s$@$b$N$r$3$7$i$($^$7$?!#(Bjapanese/gd $B$r;H$&$3(B
$B$H$K$h$k46F0$O$$$^$@L#$o$C$F$$$J$$$N$G$9$,!"$=$NMxMQ$b@9$j9~$a$k$h$&$K(B
$B$7$F$_$^$7$?!#(B

$B$4MxMQ$N:]$O!"(Bpatches/patch-a[ab] $B$,I,MW$J$/$J$j$^$7$?$N$G!">C$7$F$/$@(B
$B$5$$!#(B

$B$3$l$N(B send-pr $B$O!"L@F|$+$i(B2$B3X4|$,;O$^$k$N$G!"EvJ,$7$^$;$s!#(B
-- 
NAKAJI Hiroyuki ($BCf<#(B $B909T(B)

diff -ur ../gnuplot+/Makefile ./Makefile
--- ../gnuplot+/Makefile	Tue Aug 31 17:11:42 1999
+++ ./Makefile	Tue Aug 31 17:50:12 1999
@@ -3,23 +3,34 @@
 # Date created:         May 18, 1999
 # Whom:                 NAKAJI Hiroyuki
 #
-# $FreeBSD: ports/math/gnuplot+/Makefile,v 1.4 1999/08/30 09:26:53 asami Exp $
+# $Id: Makefile,v 1.2 1999/06/10 00:33:22 steve Exp $
 #
 
-DISTNAME=	gnuplot37+-1.1.8
-CATEGORIES=	japanese math graphics
-MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gnuplot+/3.7base/
-DISTFILES=	gnuplot-3.7.tar.gz gnuplot3.7+1.1.8.patch.tar.gz
+DISTNAME=	gnuplot37+-1.1.9
+CATEGORIES=	math japanese graphics
+MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gnuplot+/3.7base/ \
+		ftp://ftp.hipecs.hokudai.ac.jp/pub/GNU/jp/pub.yamaga/gnuplot+/3.7base/ \
+		ftp://ftp.tohoku.ac.jp/mirror/gnuplot+/3.7base/ \
+		ftp://ftp.win.ne.jp/pub/graphics/gnuplot/gnuplot+/3.7base/ \
+		ftp://ftp.rc.tutrp.tut.ac.jp/pub/mirror/gnuplot+/3.7base/
+
+DISTFILES=	gnuplot-3.7.tar.gz gnuplot3.7+1.1.9.patch.tar.gz \
+		gnuplot3.7+1.1.9.configure.gd.patch \
+		gnuplot3.7+1.1.9.configure.gd2.patch
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
+.if defined(USE_JP)
+LIB_DEPENDS=    png.3:${PORTSDIR}/japanese/png \
+		VFlib2.24:${PORTSDIR}/japanese/vflib
+.else
 LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png \
 		VFlib2.24:${PORTSDIR}/japanese/vflib
+.endif
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgd.a:${PORTSDIR}/graphics/gd \
 		${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype
 
-BROKEN=		gd upgrade
-
 EXTRACT_ONLY=	gnuplot-3.7.tar.gz
 
 USE_XLIB=	yes
@@ -45,15 +56,23 @@
 		${WRKSRC}/INSTALL.win.plus \
 		${WRKSRC}/README-J.plus \
 		${WRKSRC}/README.plus \
-		${WRKSRC}/gp+/plus-asc.dvi \
-		${WRKSRC}/gp+/plus-ntt.dvi \
+		${WRKSRC}/gp+/plus.dvi \
+		${WRKSRC}/gp+/plus.pdf \
+		${WRKSRC}/gp+/plus.ps \
 		${WRKSRC}/gp+/plus.tex
 
+pre-fetch:
+	@echo "*********************************************************"
+	@echo "If you want handle Japanese TrueType font, define USE_JP."
+	@echo "*********************************************************"
+
 post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7+1.1.8.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/gnuplot3.7+1.1.9.patch.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 
 pre-patch:
-	cd ${WRKSRC}; ${PATCH} --quiet -E -p0 < ${WRKSRC}/gnuplot3.7+1.1.patch
+	${PATCH} ${PATCH_ARGS} < ${WRKSRC}/gnuplot3.7+1.1.patch
+	${PATCH} ${PATCH_ARGS} < ${DISTDIR}/gnuplot3.7+1.1.9.configure.gd.patch
+	${PATCH} ${PATCH_ARGS} < ${DISTDIR}/gnuplot3.7+1.1.9.configure.gd2.patch
 
 post-patch:
 	cd ${WRKSRC}; ${TOUCH} aclocal.m4
@@ -64,7 +83,6 @@
 
 post-build:
 	cd ${WRKSRC}/docs; ${GMAKE} info
-	cd ${WRKSRC}/docs; ${PATCH} --quiet -E -p1 < ${FILESDIR}/gnuplot.info.diff
 
 post-install:
 	@test -d ${PREFIX}/share/doc/gnuplot+ || ${MKDIR} ${PREFIX}/share/doc/gnuplot+
diff -ur ../gnuplot+/files/md5 ./files/md5
--- ../gnuplot+/files/md5	Wed Jun  9 10:51:50 1999
+++ ./files/md5	Tue Aug 31 17:28:57 1999
@@ -1,2 +1,4 @@
 MD5 (gnuplot-3.7.tar.gz) = 18bbd384a991e7b20dbd2c29c239e90d
-MD5 (gnuplot3.7+1.1.8.patch.tar.gz) = f88b3dea62ec73048fb75481ae132b9d
+MD5 (gnuplot3.7+1.1.9.patch.tar.gz) = 0d9a5e8b6687c176dfc1e65cefecd9b8
+MD5 (gnuplot3.7+1.1.9.configure.gd.patch) = 5672b26aa80d8e917a3aaf019d0d1a5f
+MD5 (gnuplot3.7+1.1.9.configure.gd2.patch) = c8d594aeadaff30a2b1fcc9e642d3aae
Only in ../gnuplot+/patches: patch-aa
Only in ../gnuplot+/patches: patch-ab
diff -ur ../gnuplot+/pkg/PLIST ./pkg/PLIST
--- ../gnuplot+/pkg/PLIST	Thu Jun 10 18:48:05 1999
+++ ./pkg/PLIST	Fri Aug 20 11:31:06 1999
@@ -13,7 +13,8 @@
 share/doc/gnuplot+/INSTALL.win.plus
 share/doc/gnuplot+/README-J.plus
 share/doc/gnuplot+/README.plus
-share/doc/gnuplot+/plus-asc.dvi
-share/doc/gnuplot+/plus-ntt.dvi
+share/doc/gnuplot+/plus.dvi
+share/doc/gnuplot+/plus.pdf
+share/doc/gnuplot+/plus.ps
 share/doc/gnuplot+/plus.tex
 @dirrm share/doc/gnuplot+
