3 files changed, 64 insertions, 56 deletions

diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index ccd49f34929f..03e2ed2be238 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnuplot
-PORTVERSION=	4.4.4
-PORTREVISION=	1
+PORTVERSION=	4.6.0
 CATEGORIES=	math graphics
 MASTER_SITES=	SF
 
@@ -77,7 +76,7 @@ PLIST_SUB+=		TETEX="@comment "
 BUILD_DEPENDS+=		kpsexpand:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS+=		kpsexpand:${PORTSDIR}/print/teTeX-base
 CONFIGURE_ARGS+=	--with-kpsexpand \
-			--with-texdir=${PREFIX}/share/texmf-local/tex/latex/gnuplot
+			--with-texdir=${LOCALBASE}/share/texmf/tex/latex/gnuplot
 PLIST_SUB+=		TETEX=""
 .endif
 
@@ -101,6 +100,10 @@ LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
 USE_GNOME+=		pango
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	gnuplot.dvi gnuplot.ps gnuplot.txt psdoc
+.endif
+
 post-patch:
 .if defined(WITHOUT_TETEX)
 	@${REINPLACE_CMD} -e \
diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo
index e9a549296bd4..fd8302ffabce 100644
--- a/math/gnuplot/distinfo
+++ b/math/gnuplot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnuplot-4.4.4.tar.gz) = d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd
-SIZE (gnuplot-4.4.4.tar.gz) = 3328278
+SHA256 (gnuplot-4.6.0.tar.gz) = 6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be
+SIZE (gnuplot-4.6.0.tar.gz) = 5017694
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index 253365ecf739..5eadd3ffdbae 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -1,14 +1,6 @@
 bin/gnuplot
 bin/lasergnu
-%%X11%%libexec/gnuplot/4.4/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
+%%X11%%libexec/gnuplot/4.6/gnuplot_x11
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/1.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/2.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/3.dat
@@ -26,6 +18,8 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrowstyle.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrowstyle.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/asciimat.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/autoscale.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/barchart_art.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/battery.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/big_peak.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary.dem
@@ -36,6 +30,7 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bldg.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/blutux.rgb
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/borders.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/boxplot.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/candlesticks.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/candlesticks.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/charset.dem
@@ -57,7 +52,10 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/discrete.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/electron.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ellipse.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ellipses.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ellipses_style.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/empty-circles.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/energy_circles.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/enhanced_utf8.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/enhancedtext.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/epslatex.dem
@@ -92,6 +90,7 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/index.canvas
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/index.save
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/index.svg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/mouseable.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/mousebox.template
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/webify.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/webify_canvas.pl
@@ -101,6 +100,7 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/imageNaN.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/immigration.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/iterate.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kdensity2d.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/key.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/klein.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/labelplot.pdb
@@ -124,6 +124,8 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multiplt.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nearmap.csv
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/optimize.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/orbital_elements.dat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/orbits.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/param.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pm3d.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pm3dcolors.dem
@@ -158,6 +160,7 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/starmap.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/start.par
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stat.inc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/stats.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/steps.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/steps.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/stringvar.dem
@@ -176,55 +179,57 @@ bin/lasergnu
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/using.dat
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/using.dem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/utf8.dem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/varcolor.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.4/PostScript/8859-1.ps
-%%DATADIR%%/4.4/PostScript/8859-15.ps
-%%DATADIR%%/4.4/PostScript/8859-2.ps
-%%DATADIR%%/4.4/PostScript/8859-9.ps
-%%DATADIR%%/4.4/PostScript/aglfn.txt
-%%DATADIR%%/4.4/PostScript/cp1250.ps
-%%DATADIR%%/4.4/PostScript/cp1251.ps
-%%DATADIR%%/4.4/PostScript/cp437.ps
-%%DATADIR%%/4.4/PostScript/cp850.ps
-%%DATADIR%%/4.4/PostScript/cp852.ps
-%%DATADIR%%/4.4/PostScript/koi8r.ps
-%%DATADIR%%/4.4/PostScript/koi8u.ps
-%%DATADIR%%/4.4/PostScript/prologue.ps
-%%DATADIR%%/4.4/PostScript/utf-8.ps
-%%X11%%%%DATADIR%%/4.4/app-defaults/Gnuplot
-%%DATADIR%%/4.4/gnuplot.gih
-%%DATADIR%%/4.4/js/README
-%%DATADIR%%/4.4/js/canvasmath.js
-%%DATADIR%%/4.4/js/canvastext.js
-%%DATADIR%%/4.4/js/gnuplot_common.js
-%%DATADIR%%/4.4/js/gnuplot_mouse.css
-%%DATADIR%%/4.4/js/gnuplot_mouse.js
-%%DATADIR%%/4.4/js/grid.png
-%%DATADIR%%/4.4/js/help.png
-%%DATADIR%%/4.4/js/nextzoom.png
-%%DATADIR%%/4.4/js/previouszoom.png
-%%DATADIR%%/4.4/js/textzoom.png
-%%DATADIR%%/4.4/lua/gnuplot-tikz.lua
-%%TETEX%%share/texmf-local/tex/latex/gnuplot/gnuplot-lua-tikz.sty
-%%TETEX%%share/texmf-local/tex/latex/gnuplot/gnuplot.cfg
-%%TETEX%%@dirrm share/texmf-local/tex/latex/gnuplot
-%%TETEX%%@dirrmtry share/texmf-local/tex/latex
-%%TETEX%%@dirrmtry share/texmf-local/tex
-%%TETEX%%@dirrmtry share/texmf-local
-@dirrm %%DATADIR%%/4.4/lua
-@dirrm %%DATADIR%%/4.4/js
-@dirrm %%DATADIR%%/4.4/app-defaults
-@dirrm %%DATADIR%%/4.4/PostScript
-@dirrm %%DATADIR%%/4.4
+%%DATADIR%%/4.6/colors_default.gp
+%%DATADIR%%/4.6/colors_mono.gp
+%%DATADIR%%/4.6/colors_podo.gp
+%%DATADIR%%/4.6/gnuplot.pdf
+%%DATADIR%%/4.6/gnuplotrc
+%%DATADIR%%/4.6/PostScript/8859-1.ps
+%%DATADIR%%/4.6/PostScript/8859-15.ps
+%%DATADIR%%/4.6/PostScript/8859-2.ps
+%%DATADIR%%/4.6/PostScript/8859-9.ps
+%%DATADIR%%/4.6/PostScript/aglfn.txt
+%%DATADIR%%/4.6/PostScript/cp1250.ps
+%%DATADIR%%/4.6/PostScript/cp1251.ps
+%%DATADIR%%/4.6/PostScript/cp437.ps
+%%DATADIR%%/4.6/PostScript/cp850.ps
+%%DATADIR%%/4.6/PostScript/cp852.ps
+%%DATADIR%%/4.6/PostScript/koi8r.ps
+%%DATADIR%%/4.6/PostScript/koi8u.ps
+%%DATADIR%%/4.6/PostScript/prologue.ps
+%%DATADIR%%/4.6/PostScript/utf-8.ps
+%%X11%%%%DATADIR%%/4.6/app-defaults/Gnuplot
+%%DATADIR%%/4.6/gnuplot.gih
+%%DATADIR%%/4.6/js/README
+%%DATADIR%%/4.6/js/canvasmath.js
+%%DATADIR%%/4.6/js/canvastext.js
+%%DATADIR%%/4.6/js/gnuplot_common.js
+%%DATADIR%%/4.6/js/gnuplot_dashedlines.js
+%%DATADIR%%/4.6/js/gnuplot_mouse.css
+%%DATADIR%%/4.6/js/gnuplot_mouse.js
+%%DATADIR%%/4.6/js/gnuplot_svg.js
+%%DATADIR%%/4.6/js/grid.png
+%%DATADIR%%/4.6/js/help.png
+%%DATADIR%%/4.6/js/nextzoom.png
+%%DATADIR%%/4.6/js/previouszoom.png
+%%DATADIR%%/4.6/js/textzoom.png
+%%DATADIR%%/4.6/lua/gnuplot-tikz.lua
+%%TETEX%%share/texmf/tex/latex/gnuplot/gnuplot.cfg
+%%TETEX%%@dirrm share/texmf/tex/latex/gnuplot
+@dirrm %%DATADIR%%/4.6/lua
+@dirrm %%DATADIR%%/4.6/js
+@dirrm %%DATADIR%%/4.6/app-defaults
+@dirrm %%DATADIR%%/4.6/PostScript
+@dirrm %%DATADIR%%/4.6
 @dirrm %%DATADIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/html
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/psdoc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/gnuplot/4.4
+@dirrm libexec/gnuplot/4.6
 @dirrm libexec/gnuplot