[Midnightbsd-cvs] mports: math/gnuplot: Update to 4.2.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Jul 19 17:09:33 EDT 2008


Log Message:
-----------
Update to 4.2.3

Modified Files:
--------------
    mports/math/gnuplot:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/math/gnuplot/files:
        patch-docs-Makefile.in (r1.1 -> r1.2)

Removed Files:
-------------
    mports/math/gnuplot/files:
        patch-term-pdf.trm

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/math/gnuplot/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L math/gnuplot/pkg-plist -L math/gnuplot/pkg-plist -u -r1.1 -r1.2
--- math/gnuplot/pkg-plist
+++ math/gnuplot/pkg-plist
@@ -1,116 +1,170 @@
 bin/gnuplot
 bin/lasergnu
-%%X11%%libexec/gnuplot_x11
-%%PORTDOCS%%%%EXAMPLESDIR%%/1.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/2.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/3.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am.in
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
-%%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
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/ctg-y2.dat
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/datastrings.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
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/histograms.dem
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/histograms2.dem
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/immigration.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/klein.dat
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/labelplot.pdb
-%%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
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/nearmap.csv
-%%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
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/starmap.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
-%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/table.dat
-%%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
+lib/X11/app-defaults/Gnuplot
+%%X11%%libexec/gnuplot/4.2/gnuplot_x11
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.dvi
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.ps
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.txt
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/README
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_file.doc
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_fontfile_doc.tex
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_guide.ps
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_symbols.gpi
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.dvi
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.html
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.ps
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.txt
-%%EMACS_SITE_LISPDIR%%/gnuplot-gui.el
-%%EMACS_SITE_LISPDIR%%/gnuplot.el
-%%DATADIR%%/4.0/gnuplot.gih
- at dirrm %%DATADIR%%/4.0
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/1.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/2.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/3.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GM1_bonds.r3d
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/GM1_sugar.pdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/all.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animate.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/animate2.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrowstyle.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrowstyle.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asciimat.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/battery.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/big_peak.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bivariat.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blutux.rgb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/borders.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/candlesticks.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/candlesticks.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clip14in.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorwheel.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contours.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/controls.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ctg-y2.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dashcolor.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/datastrings.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo.edf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/density.fnc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/discrete.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/electron.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/enhancedtext.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/epslatex.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fillbetween.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fillcrvs.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fillstyle.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/finance.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/finance.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fit.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontfile.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontfile_latex.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glass.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot.cfg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot.rot
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hemisphr.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hexa.fnc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hidden.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hidden2.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/histograms.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/histograms2.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/gnuplot_demo.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/index.save
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/webify.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/immigration.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/key.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/klein.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/labelplot.pdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lcdemo.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line.fnc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/macros.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mgr.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/molecule.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/moli3.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mouselab_1.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mouselab_2.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mouselabels.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mousevariables.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multimsh.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multiplt.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nearmap.csv
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/param.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pm3d.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pm3dcolors.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pm3dgamma.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pointsize.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/polar.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poldat.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prob.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/prob2.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rainbow.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rectangle.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reflect.fnc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgb_variable.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgb_variable.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scatter.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scatter2.bin
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scatter2.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/silver.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sine.bin
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/singulr.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sound.par
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sound2.par
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/soundvel.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spline.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/srl.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/starmap.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/start.par
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stat.inc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/steps.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/steps.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stringvar.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface1.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/surface2.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/table.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textcolor.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/textrotate.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tics.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timedat.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/timedat.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triangle.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/using.bin
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/using.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/using.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vector.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whale.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/world.cor
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/world.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/world.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/world2.dem
+%%DATADIR%%/4.2/PostScript/8859-1.ps
+%%DATADIR%%/4.2/PostScript/8859-15.ps
+%%DATADIR%%/4.2/PostScript/8859-2.ps
+%%DATADIR%%/4.2/PostScript/cp1250.ps
+%%DATADIR%%/4.2/PostScript/cp437.ps
+%%DATADIR%%/4.2/PostScript/cp850.ps
+%%DATADIR%%/4.2/PostScript/cp852.ps
+%%DATADIR%%/4.2/PostScript/koi8r.ps
+%%DATADIR%%/4.2/PostScript/koi8u.ps
+%%DATADIR%%/4.2/PostScript/prologue.ps
+%%DATADIR%%/4.2/gnuplot.gih
+%%TETEX%%share/texmf-local/tex/latex/gnuplot/gnuplot.cfg
+%%TETEX%%@dirrm share/texmf-local/tex/latex/gnuplot
+ at dirrmtry share/texmf-local/tex/latex
+ at dirrmtry share/texmf-local/tex
+ at dirrmtry share/texmf-local
+ at dirrm %%DATADIR%%/4.2/PostScript
+ at dirrm %%DATADIR%%/4.2
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/html
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/psdoc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm libexec/gnuplot/4.2
+ at dirrm libexec/gnuplot
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/math/gnuplot/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L math/gnuplot/Makefile -L math/gnuplot/Makefile -u -r1.5 -r1.6
--- math/gnuplot/Makefile
+++ math/gnuplot/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	gnuplot
-PORTVERSION=	4.0.0
-PORTREVISION=	5
+PORTVERSION=	4.2.3
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,39 +18,29 @@
 
 USE_GCPIO=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
-CONFIGURE_ARGS=	--without-tutorial \
+WANT_WX=	yes
+CONFIGURE_TARGET=--build=${ARCH}-portbld-freebsd6.0
+CONFIGURE_ARGS+=--with-lasergnu \
+		--with-readline=gnu \
 		--without-linux-vga \
-		--with-lasergnu
+		--without-lisp-files \
+		--without-tutorial
 
 OPTIONS=	GD		"Enable GD support"		on \
-		HISTOGRAMS	"Enable stacked histograms"	off \
+		GRIDBOX		"Use the gridbox optimization for hidden3d" off \
 		PDF		"Enable PDF support"		on \
-		PNG		"Enable PNG support"		on \
-		READLINE	"Enable readline support"	on
+		PLOT		"Enable plot support"		on \
+		TETEX		"Search kpsexpand at run-time"	on \
+		THINSPLINES	"Enable thin plate splines for grids in dgrid3d" off \
+		WX		"Enable WX support"		off
 
 MAN1=		gnuplot.1 lasergnu.1
 INFO=		gnuplot
 
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
-USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
-EMACS_NO_BUILD_DEPENDS=	yes
-EMACS_NO_RUN_DEPENDS=	yes
-CONFIGURE_ARGS+=	--with-lisp-files
-.else
-PLIST_SUB+=		EMACS_SITE_LISPDIR="@comment "
-CONFIGURE_ARGS+=	--without-lisp-files
-.endif
-
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_READLINE)
-CONFIGURE_ARGS+=	--with-readline=gnu
-.endif
-
 .if !defined(WITHOUT_X11)
-USE_XLIB=		yes
+USE_XORG=		x11
 PLIST_SUB+=		X11=""
 .else
 CONFIGURE_ARGS+=	--without-x
@@ -65,6 +54,10 @@
 CONFIGURE_ARGS+=	--with-gd=${LOCALBASE}
 .endif
 
+.if !defined(WITHOUT_GRIDBOX)
+CONFIGURE_ARGS+=	--disable-h3d-quadtree --enable-h3d-gridbox
+.endif
+
 .if defined(WITHOUT_PDF)
 CONFIGURE_ARGS+=	--without-pdf
 .else
@@ -72,47 +65,60 @@
 CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .endif
 
-.if defined(WITHOUT_PNG)
-CONFIGURE_ARGS+=	--without-png
+.if defined(WITHOUT_PLOT)
+CONFIGURE_ARGS+=	--without-plot
+.else
+USE_XORG+=		xaw xmu xt xext
+LIB_DEPENDS+=		plot.4:${PORTSDIR}/graphics/plotutils
+CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
+.endif
+
+.if defined(WITHOUT_TETEX)
+PLIST_SUB+=		TETEX="@comment "
 .else
-LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
-CONFIGURE_ARGS+=	--with-png=${LOCALBASE}
+BUILD_DEPENDS+=		latex:${PORTSDIR}/print/teTeX-base
+CONFIGURE_ARGS+=	--with-kpsexpand
+PLIST_SUB+=		TETEX=""
 .endif
 
-.if defined(WITH_HISTOGRAMS)
-PATCH_SITES=		http://www.bmsc.washington.edu/people/merritt/gnuplot/
-PATCHFILES=		datastrings_4.0.patch histograms_4.0.patch
-PATCH_DIST_STRIP=	-p1
-USE_AUTOTOOLS=		autoconf:259
-CONFIGURE_ARGS+=	--enable-datastrings \
-			--enable-histograms
-PLIST_SUB+=		HISTOGRAMS=""
+.if defined(WITHOUT_THINSPLINES)
+CONFIGURE_ARGS+=	--disable-thin-splines
 .else
-PLIST_SUB+=		HISTOGRAMS="@comment "
+CONFIGURE_ARGS+=	--enable-thin-splines
+.endif
+
+.if defined(WITHOUT_WX)
+CONFIGURE_ARGS+=	--disable-wxwidgets
+.else
+USE_WX=			2.4+
+WX_CONF_ARGS=		absolute
 .endif
 
 post-patch:
+.if defined(WITHOUT_TETEX)
+	@${REINPLACE_CMD} -e \
+		'/^install:/s/install-am//' ${WRKSRC}/share/LaTeX/Makefile.in
+.endif
 	@${REINPLACE_CMD} -e \
 		's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
 	@${FIND} "${WRKSRC}" -name '*.orig' -delete
 
 .if !defined(NOPORTDOCS)
 post-build:
-	@cd ${WRKSRC}/docs && ${MAKE} groff html
+	@cd ${WRKSRC}/docs && ${MAKE} groff
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
-	${INSTALL_DATA} ${WRKSRC}/lisp/gnuplot*.el ${EMACS_SITE_LISPDIR}
-.endif
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/demo && ${FIND} . \
 		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}/psdoc
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.html \
-		gnuplot.dvi gnuplot.ps ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.dvi \
+		gnuplot.ps ${DOCSDIR}
 	cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${DOCSDIR}/psdoc
 .endif
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/math/gnuplot/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L math/gnuplot/distinfo -L math/gnuplot/distinfo -u -r1.1 -r1.2
--- math/gnuplot/distinfo
+++ math/gnuplot/distinfo
@@ -1,9 +1,3 @@
-MD5 (gnuplot-4.0.0.tar.gz) = 66258443d9f93cc4f46b147dac33e63a
-SHA256 (gnuplot-4.0.0.tar.gz) = a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48
-SIZE (gnuplot-4.0.0.tar.gz) = 2160918
-MD5 (datastrings_4.0.patch) = 7d2c4015f15f96e3a0f8063c2199ab6f
-SHA256 (datastrings_4.0.patch) = afe36f9c122538a8079da60bdffc97a59780acc82b174881b57efa8824bdf69d
-SIZE (datastrings_4.0.patch) = 77936
-MD5 (histograms_4.0.patch) = ba87f28e4aed68637e7b5160e7151919
-SHA256 (histograms_4.0.patch) = a59436358f845e22a1d740d70cf6a80b6b3e9dfd80550dd5652986f0d229f384
-SIZE (histograms_4.0.patch) = 63433
+MD5 (gnuplot-4.2.3.tar.gz) = 6b6d22662df5101b308c465a722c43ce
+SHA256 (gnuplot-4.2.3.tar.gz) = 4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4
+SIZE (gnuplot-4.2.3.tar.gz) = 2840611
--- math/gnuplot/files/patch-term-pdf.trm
+++ /dev/null
@@ -1,13 +0,0 @@
-$FreeBSD: ports/math/gnuplot/files/patch-term-pdf.trm,v 1.1 2004/06/25 16:33:57 glewis Exp $
-
---- term/pdf.trm.orig	Fri Jun 25 10:15:46 2004
-+++ term/pdf.trm	Fri Jun 25 10:16:01 2004
-@@ -343,7 +343,7 @@
- 	myPDF = PDF_new();
- 
-     /*open new PDF file */ 
--    if (PDF_open_fp(myPDF, gpoutfile) == -1)
-+    if (PDF_open_file(myPDF, gpoutfile) == -1)
- 	int_error(NO_CARET, "Error:cannot open PDF file .\n");
- 
- #ifdef PDF_DONT_COMPRESS
Index: patch-docs-Makefile.in
===================================================================
RCS file: /home/cvs/mports/math/gnuplot/files/patch-docs-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L math/gnuplot/files/patch-docs-Makefile.in -L math/gnuplot/files/patch-docs-Makefile.in -u -r1.1 -r1.2
--- math/gnuplot/files/patch-docs-Makefile.in
+++ math/gnuplot/files/patch-docs-Makefile.in
@@ -1,16 +1,23 @@
-$FreeBSD: ports/math/gnuplot/files/patch-docs-Makefile.in,v 1.1 2005/03/09 19:42:24 glewis Exp $
+$FreeBSD: ports/math/gnuplot/files/patch-docs-Makefile.in,v 1.3 2007/10/29 01:56:56 glewis Exp $
 
---- docs/Makefile.in.orig	Wed Mar  9 11:09:11 2005
-+++ docs/Makefile.in	Wed Mar  9 11:09:24 2005
-@@ -332,11 +332,6 @@
- 	@if test ! -f gnuplot.doc ; then \
- 	  cp $(srcdir)/gnuplot.doc. ; \
- 	fi
+--- docs/Makefile.in.orig	Sun Oct 28 18:24:49 2007
++++ docs/Makefile.in	Sun Oct 28 18:25:14 2007
+@@ -351,12 +351,12 @@
+ # Thanks to Bruce Ravel for doc2texi.el!
+ $(srcdir)/gnuplot.texi: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+ 	@echo "Creating texinfo"
 -	@if test "$(EMACS)" != no; then \
--	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi; \
+-	   cd $(srcdir) ;  \
+-	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
 -	else \
 -	   echo "No emacs found - cannot create texinfo file" ; \
 -	fi
++#	@if test "$(EMACS)" != no; then \
++#	   cd $(srcdir) ;  \
++#	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
++#	else \
++#	   echo "No emacs found - cannot create texinfo file" ; \
++#	fi
  
  # this is how to make OS/2 ipfc documentation
  ipf: gnuplot.ipf


More information about the Midnightbsd-cvs mailing list