Date: Sun, 18 Apr 2004 22:30:22 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/65717: Update port: math/gnuplot to 4.0.0 Message-ID: <20040418223022.7c4589ec.tkato@prontomail.com> Resent-Message-ID: <200404181340.i3IDeAcJ052328@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 65717
>Category: ports
>Synopsis: Update port: math/gnuplot to 4.0.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 18 06:40:10 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 4.0.0
Remove file:
files/README
files/patch-aa
files/patch-post.trm
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/math/gnuplot/Makefile math/gnuplot/Makefile
--- /usr/ports/math/gnuplot/Makefile Sat Sep 27 21:04:13 2003
+++ math/gnuplot/Makefile Sun Apr 18 20:45:55 2004
@@ -6,8 +6,7 @@
#
PORTNAME= gnuplot
-PORTVERSION= 3.7.3
-PORTREVISION= 2
+PORTVERSION= 4.0.0
CATEGORIES= math graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,12 +14,21 @@
MAINTAINER= glewis@FreeBSD.org
COMMENT= A command-driven interactive function plotting program
+USE_REINPLACE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --datadir=${DATADIR} \
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= --without-lisp-files --without-tutorial \
--without-linux-vga --without-gd \
- --with-readline=gnu --with-lasergnu
+ --with-lasergnu
MAN1= gnuplot.1 lasergnu.1
+INFO= gnuplot
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500018
+CONFIGURE_ARGS+= --with-readline=gnu
+.endif
.if !defined(WITHOUT_X11)
USE_XLIB= yes
@@ -44,11 +52,19 @@
CONFIGURE_ARGS+= --without-pdf
.endif
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
+
post-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/lisp/gnuplot*.el \
+ ${PREFIX}/share/emacs/site-lisp
.if !defined(NOPORTDOCS)
@${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${FILESDIR}/README ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/demo/* ${EXAMPLESDIR}
+ ${TAR} -C ${WRKSRC}/demo --exclude "*Makefile*" -cf - . | \
+ ${TAR} -C ${EXAMPLESDIR} --unlink -xf -
+ @${CHOWN} ${SHAREOWN}:${SHAREMODE} ${EXAMPLESDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -urN /usr/ports/math/gnuplot/distinfo math/gnuplot/distinfo
--- /usr/ports/math/gnuplot/distinfo Tue Mar 16 11:38:10 2004
+++ math/gnuplot/distinfo Sun Apr 18 02:47:13 2004
@@ -1,2 +1,2 @@
-MD5 (gnuplot-3.7.3.tar.gz) = 07921c091153b1f52825fb291849d36d
-SIZE (gnuplot-3.7.3.tar.gz) = 1418889
+MD5 (gnuplot-4.0.0.tar.gz) = 66258443d9f93cc4f46b147dac33e63a
+SIZE (gnuplot-4.0.0.tar.gz) = 2160918
diff -urN /usr/ports/math/gnuplot/files/README math/gnuplot/files/README
--- /usr/ports/math/gnuplot/files/README Mon Jan 24 07:49:30 2000
+++ math/gnuplot/files/README Thu Jan 1 09:00:00 1970
@@ -1,6 +0,0 @@
-There are two sets of demos available.
-
-Enter "gnuplot simple.dem" for the short demo, or
- "gnuplot all.dem" for the whole show.
-
-All demos are interactive, and prompt for "Hit a return to continue".
diff -urN /usr/ports/math/gnuplot/files/patch-aa math/gnuplot/files/patch-aa
--- /usr/ports/math/gnuplot/files/patch-aa Sat Sep 11 08:40:09 1999
+++ math/gnuplot/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,15 +0,0 @@
---- term.h.orig Fri Sep 10 17:50:52 1999
-+++ term.h Fri Sep 10 17:52:28 1999
-@@ -270,9 +270,9 @@
-
- /* NOTE THAT GIF REQUIRES A SEPARATE LIBRARY : see term/gif.trm */
- /* GIF format. */
--#ifdef HAVE_LIBGD
--# include "gif.trm"
--#endif
-+/* #ifdef HAVE_LIBGD */
-+/* # include "gif.trm" */
-+/* #endif */
-
- /* #include "grass.trm" /* geographical info system */
- #include "hp26.trm" /* HP2623A and probably others */
diff -urN /usr/ports/math/gnuplot/files/patch-post.trm math/gnuplot/files/patch-post.trm
--- /usr/ports/math/gnuplot/files/patch-post.trm Tue Jun 17 05:14:35 2003
+++ math/gnuplot/files/patch-post.trm Thu Jan 1 09:00:00 1970
@@ -1,21 +0,0 @@
-$FreeBSD: ports/math/gnuplot/files/patch-post.trm,v 1.1 2003/06/16 20:14:35 glewis Exp $
-
---- term/post.trm.orig Mon Jun 16 13:57:37 2003
-+++ term/post.trm Mon Jun 16 13:58:53 2003
-@@ -939,14 +939,14 @@
- {
- static char GPFAR psg1[] = "0 setgray\nnewpath\n";
- struct termentry *t = term;
-+float scale = (ps_common_encap ? 0.5 : 1.0)/PS_SC;
-
- ps_page++;
- if (!ps_common_encap)
- fprintf(gpoutfile,"%%%%Page: %d %d\n",ps_page,ps_page);
- fprintf(gpoutfile,"gnudict begin\ngsave\n");
- fprintf(gpoutfile,"%d %d translate\n",ps_common_xoff, ps_common_yoff);
-- fprintf(gpoutfile,"%.3f %.3f scale\n", (ps_common_encap ? 0.5 : 1.0)/PS_SC,
-- (ps_common_encap ? 0.5 : 1.0)/PS_SC);
-+ fprintf(gpoutfile,"%.3f %.3f scale\n", scale, scale);
- if (!ps_common_portrait) {
- fprintf(gpoutfile,"90 rotate\n0 %d translate\n", (int)(-PS_YMAX));
- }
diff -urN /usr/ports/math/gnuplot/pkg-plist math/gnuplot/pkg-plist
--- /usr/ports/math/gnuplot/pkg-plist Thu Jun 5 09:52:45 2003
+++ math/gnuplot/pkg-plist Sun Apr 18 03:56:14 2004
@@ -1,74 +1,92 @@
bin/gnuplot
-%%X11:%%bin/gnuplot_x11
bin/lasergnu
-@unexec install-info --delete %D/info/gnuplot.info %D/info/dir
-info/gnuplot.info
-@exec install-info %D/info/gnuplot.info %D/info/dir
-%%PORTDOCS%%share/examples/gnuplot/1.dat
-%%PORTDOCS%%share/examples/gnuplot/2.dat
-%%PORTDOCS%%share/examples/gnuplot/3.dat
-%%PORTDOCS%%share/examples/gnuplot/README
-%%PORTDOCS%%share/examples/gnuplot/airfoil.dem
-%%PORTDOCS%%share/examples/gnuplot/all.dem
-%%PORTDOCS%%share/examples/gnuplot/animate.dem
-%%PORTDOCS%%share/examples/gnuplot/battery.dat
-%%PORTDOCS%%share/examples/gnuplot/big_peak.dat
-%%PORTDOCS%%share/examples/gnuplot/binary.dem
-%%PORTDOCS%%share/examples/gnuplot/binary1
-%%PORTDOCS%%share/examples/gnuplot/binary2
-%%PORTDOCS%%share/examples/gnuplot/binary3
-%%PORTDOCS%%share/examples/gnuplot/bivariat.dem
-%%PORTDOCS%%share/examples/gnuplot/borders.dem
-%%PORTDOCS%%share/examples/gnuplot/contours.dem
-%%PORTDOCS%%share/examples/gnuplot/controls.dem
-%%PORTDOCS%%share/examples/gnuplot/density.fnc
-%%PORTDOCS%%share/examples/gnuplot/discrete.dem
-%%PORTDOCS%%share/examples/gnuplot/electron.dem
-%%PORTDOCS%%share/examples/gnuplot/fit.dem
-%%PORTDOCS%%share/examples/gnuplot/glass.dat
-%%PORTDOCS%%share/examples/gnuplot/gnuplot.rot
-%%PORTDOCS%%share/examples/gnuplot/hemisphr.dat
-%%PORTDOCS%%share/examples/gnuplot/hexa.fnc
-%%PORTDOCS%%share/examples/gnuplot/hidden.dem
-%%PORTDOCS%%share/examples/gnuplot/klein.dat
-%%PORTDOCS%%share/examples/gnuplot/lcdemo.dat
-%%PORTDOCS%%share/examples/gnuplot/line.fnc
-%%PORTDOCS%%share/examples/gnuplot/mgr.dem
-%%PORTDOCS%%share/examples/gnuplot/moli3.dat
-%%PORTDOCS%%share/examples/gnuplot/multimsh.dem
-%%PORTDOCS%%share/examples/gnuplot/multiplt.dem
-%%PORTDOCS%%share/examples/gnuplot/param.dem
-%%PORTDOCS%%share/examples/gnuplot/polar.dem
-%%PORTDOCS%%share/examples/gnuplot/poldat.dem
-%%PORTDOCS%%share/examples/gnuplot/prob.dem
-%%PORTDOCS%%share/examples/gnuplot/prob2.dem
-%%PORTDOCS%%share/examples/gnuplot/random.dem
-%%PORTDOCS%%share/examples/gnuplot/reflect.fnc
-%%PORTDOCS%%share/examples/gnuplot/reread.bor
-%%PORTDOCS%%share/examples/gnuplot/scatter.dem
-%%PORTDOCS%%share/examples/gnuplot/scatter2.dat
-%%PORTDOCS%%share/examples/gnuplot/silver.dat
-%%PORTDOCS%%share/examples/gnuplot/simple.dem
-%%PORTDOCS%%share/examples/gnuplot/singulr.dem
-%%PORTDOCS%%share/examples/gnuplot/sound.par
-%%PORTDOCS%%share/examples/gnuplot/sound2.par
-%%PORTDOCS%%share/examples/gnuplot/soundvel.dat
-%%PORTDOCS%%share/examples/gnuplot/spline.dem
-%%PORTDOCS%%share/examples/gnuplot/start.par
-%%PORTDOCS%%share/examples/gnuplot/stat.inc
-%%PORTDOCS%%share/examples/gnuplot/steps.dat
-%%PORTDOCS%%share/examples/gnuplot/steps.dem
-%%PORTDOCS%%share/examples/gnuplot/surface1.dem
-%%PORTDOCS%%share/examples/gnuplot/surface2.dem
-%%PORTDOCS%%share/examples/gnuplot/timedat.dat
-%%PORTDOCS%%share/examples/gnuplot/timedat.dem
-%%PORTDOCS%%share/examples/gnuplot/using.dat
-%%PORTDOCS%%share/examples/gnuplot/using.dem
-%%PORTDOCS%%share/examples/gnuplot/vector.dem
-%%PORTDOCS%%share/examples/gnuplot/whale.dat
-%%PORTDOCS%%share/examples/gnuplot/world.cor
-%%PORTDOCS%%share/examples/gnuplot/world.dat
-%%PORTDOCS%%share/examples/gnuplot/world.dem
-%%PORTDOCS%%@dirrm share/examples/gnuplot
-share/gnuplot/gnuplot.gih
-@dirrm share/gnuplot
+%%X11:%%libexec/gnuplot_x11
+%%PORTDOCS%%%%EXAMPLESDIR%%/1.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/2.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/3.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/airfoil.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/all.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/animate.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/battery.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/big_peak.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary1
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary2
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary3
+%%PORTDOCS%%%%EXAMPLESDIR%%/bivariat.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/borders.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/charset.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/clip14in.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/contours.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/controls.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/density.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/discrete.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/electron.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/enhancedtext.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/fillcrvs.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/fillstyle.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/fit.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/fontfile.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/fontfile_latex.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/glass.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.rot
+%%PORTDOCS%%%%EXAMPLESDIR%%/hemisphr.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/hexa.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/hidden.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/klein.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/lcdemo.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/line.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/mgr.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/moli3.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/mousevariables.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/multimsh.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/multiplt.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/param.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/pm3d.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/pm3dcolors.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/pm3dgamma.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/polar.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/poldat.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/prob.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/prob2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/random.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/reflect.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/reread.bor
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatter.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/silver.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/simple.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/singulr.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/sound.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/sound2.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/soundvel.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/spline.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/start.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/stat.inc
+%%PORTDOCS%%%%EXAMPLESDIR%%/steps.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/steps.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/surface1.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/surface2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/textcolor.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/textrotate.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/triangle.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/using.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/using.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/vector.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/webify.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/whale.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/world.cor
+%%PORTDOCS%%%%EXAMPLESDIR%%/world.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/world.dem
+share/emacs/site-lisp/gnuplot-gui.el
+share/emacs/site-lisp/gnuplot.el
+%%DATADIR%%/4.0/gnuplot.gih
+@dirrm %%DATADIR%%/4.0
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040418223022.7c4589ec.tkato>