Patch file version updated from 1.1.8 to 1.1.9. Fix: Diff file for math/gnuplot+ is at http://www.rc.tutrp.tut.ac.jp/~nakaji/install/FreeBSD/ref/gnuplot+.diff
Responsible Changed From-To: freebsd-ports->billf Steve asked me to look into this one.
State Changed From-To: open->feedback I started looking at this update however there are several things that bother me so far. First why not use PATCH* for the patch operations instead of using your own targets. Second the primary CATEGORY always comes first, so CATEGORY should read "math japanese graphics" or "math graphics japanese". Third having one MASTER_SITE is bad, aren't there mirrors or something? Could you send some update or change the diff on your site.
State Changed From-To: feedback->open There has been recent discussion on gnuplot+
Responsible Changed From-To: billf->freebsd-ports I don't want to deal with this anymore, quite frankly.
I posted a patch to ports-jp@jp.freebsd.org. Here again. Please check. And Sorry for late response. I defined the variable USE_JP for someone like me who wants to use japanese/gd rather than graphics/gd. But it's not important. NOTE: You don't need patchs/patch-?? anymore. Thanks. -- NAKAJI Hiroyuki diff -ur ../gnuplot+/Makefile ./Makefile --- ../gnuplot+/Makefile Tue Aug 31 17:11:42 1999 +++ ./Makefile Tue Aug 31 17:54:38 1999 @@ -3,22 +3,33 @@ # 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 LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ VFlib2.24:${PORTSDIR}/japanese/vflib + +.if defined(USE_JP) +BUILD_DEPENDS= ${LOCALBASE}/lib/libgd.a:${PORTSDIR}/japanese/gd \ + ${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype +.else BUILD_DEPENDS= ${LOCALBASE}/lib/libgd.a:${PORTSDIR}/graphics/gd \ ${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype - -BROKEN= gd upgrade +.endif EXTRACT_ONLY= gnuplot-3.7.tar.gz @@ -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+
State Changed From-To: open->closed Committed, thanks!