. Update to 4.6.1

Feature safe:	yes

4 files changed, 59 insertions, 210 deletions

diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index f8dc801161c6..8cff95dad0a1 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnuplot
-PORTVERSION=	4.6.0
-PORTREVISION=	2
+PORTVERSION=	4.6.1
 CATEGORIES=	math graphics
 MASTER_SITES=	SF
 
@@ -36,7 +35,6 @@ OPTIONS=	X11		"Enable X11 support"		on \
 USE_GCC=	any
 
 MAN1=		gnuplot.1 lasergnu.1
-INFO=		gnuplot
 
 .include <bsd.port.options.mk>
 
@@ -105,7 +103,10 @@ USE_GNOME+=		pango
 .endif
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	gnuplot.dvi gnuplot.ps gnuplot.txt psdoc
+PORTDOCS=	*
+.endif
+.if !defined(NOPORTEXAMPLES)
+PORTEXAMPLES=	*
 .endif
 
 post-patch:
diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo
index fd8302ffabce..2904c65ae80a 100644
--- a/math/gnuplot/distinfo
+++ b/math/gnuplot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnuplot-4.6.0.tar.gz) = 6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be
-SIZE (gnuplot-4.6.0.tar.gz) = 5017694
+SHA256 (gnuplot-4.6.1.tar.gz) = f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6
+SIZE (gnuplot-4.6.1.tar.gz) = 4959670
diff --git a/math/gnuplot/files/patch-docs-Makefile.in b/math/gnuplot/files/patch-docs-Makefile.in
index 75fbf7ecb089..242dc97b0328 100644
--- a/math/gnuplot/files/patch-docs-Makefile.in
+++ b/math/gnuplot/files/patch-docs-Makefile.in
@@ -1,23 +1,58 @@
-$FreeBSD$
-
---- 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 @@
+--- docs/Makefile.in.orig	2012-11-02 13:21:14.000000000 -0700
++++ docs/Makefile.in	2012-11-02 13:21:48.000000000 -0700
+@@ -395,15 +395,15 @@
  # Thanks to Bruce Ravel for doc2texi.el!
- $(srcdir)/gnuplot.texi: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
- 	@echo "Creating texinfo"
+ gnuplot.texi $(srcdir)/gnuplot-eldoc.el $(srcdir)/gnuplot-eldoc.elc: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+ 	@echo "Creating texinfo and eldoc strings file"
 -	@if test "$(EMACS)" != no; then \
--	   cd $(srcdir) ;  \
--	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
+-	   @test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
+-	   @test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
+-	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
+-	   echo "Compiling gnuplot-eldoc.el" ; \
+-	   $(EMACS) -batch --eval='(byte-compile-file "gnuplot-eldoc.el")' ; \
 -	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 ; \
++#	   @test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
++#	   @test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
++#	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
++#	   echo "Compiling gnuplot-eldoc.el" ; \
++#	   $(EMACS) -batch --eval='(byte-compile-file "gnuplot-eldoc.el")' ; \
 +#	else \
 +#	   echo "No emacs found - cannot create texinfo file" ; \
 +#	fi
  
+ 
  # this is how to make OS/2 ipfc documentation
- ipf: gnuplot.ipf
+@@ -461,18 +461,18 @@
+ 	    $(INSTALL_DATA) gnuplot.pdf $(DESTDIR)$(GIHDIR)/gnuplot.pdf; \
+ 	fi
+ 
+-install-info: gnuplot.info gnuplot-eldoc.el gnuplot-eldoc.elc
+-	@if test "$(EMACS)" != no; then \
+-	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(DESTDIR)$(lispdir); \
+-	    $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info; \
+-	    $(INSTALL_DATA) gnuplot-eldoc.el $(DESTDIR)$(lispdir)/gnuplot-eldoc.el; \
+-	    $(INSTALL_DATA) gnuplot-eldoc.elc $(DESTDIR)$(lispdir)/gnuplot-eldoc.elc; \
+-	else : ; fi
+-	@if (test "$(EMACS)" != no && install-info --version && \
+-	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
+-	  echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info";\
+-	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || :;\
+-	else : ; fi
++install-info:
++#	@if test "$(EMACS)" != no; then \
++#	    $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(DESTDIR)$(lispdir); \
++#	    $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info; \
++#	    $(INSTALL_DATA) gnuplot-eldoc.el $(DESTDIR)$(lispdir)/gnuplot-eldoc.el; \
++#	    $(INSTALL_DATA) gnuplot-eldoc.elc $(DESTDIR)$(lispdir)/gnuplot-eldoc.elc; \
++#	else : ; fi
++#	@if (test "$(EMACS)" != no && install-info --version && \
++#	     install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
++#	  echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info";\
++#	  install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || :;\
++#	else : ; fi
+ 
+ installcheck:
+ 
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index 5eadd3ffdbae..f30d9a22970c 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -1,196 +1,6 @@
 bin/gnuplot
 bin/lasergnu
 %%X11%%libexec/gnuplot/4.6/gnuplot_x11
-%%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%%/approximate.dem
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary2
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/binary3
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bivariat.dem
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/circles.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cities.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cities.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clip14in.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/colorscheme.dem
-%%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%%/delaunay-edges.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demo.edf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/density.fnc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dgrid3d.dem
-%%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
-%%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%%/fit3.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontfile.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fontfile_latex.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glass.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu-valley
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot.cfg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnuplot.rot
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpdemos.tcl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/heatmaps.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hemisphr.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hexa.fnc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hidden.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hidden2.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/histerror.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/histograms.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/histograms2.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/histopt.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/Makefile.canvas
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/Makefile.svg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/canvas_utf8.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/gnuplot_demo.css
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/html/webify_svg.pl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/image2.dem
-%%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
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/layout.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lcdemo.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lena-keypoints.bin
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lena.rgb
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/line.fnc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/macros.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/margins.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%%/multiaxis.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multimsh.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/multipalette.dem
-%%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
-%%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-points
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/random.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rectangle.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reflect.fnc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgb_variable.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgb_variable.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbalpha.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/running_avg.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%%/smooth.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%%/stats.dem
-%%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%%/transparent.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/transparent_solids.dem
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/triangle.dat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/using.bin
-%%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.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
@@ -206,7 +16,12 @@ bin/lasergnu
 %%DATADIR%%/4.6/PostScript/prologue.ps
 %%DATADIR%%/4.6/PostScript/utf-8.ps
 %%X11%%%%DATADIR%%/4.6/app-defaults/Gnuplot
+%%DATADIR%%/4.6/colors_default.gp
+%%DATADIR%%/4.6/colors_mono.gp
+%%DATADIR%%/4.6/colors_podo.gp
 %%DATADIR%%/4.6/gnuplot.gih
+%%DATADIR%%/4.6/gnuplot.pdf
+%%DATADIR%%/4.6/gnuplotrc
 %%DATADIR%%/4.6/js/README
 %%DATADIR%%/4.6/js/canvasmath.js
 %%DATADIR%%/4.6/js/canvastext.js
@@ -229,7 +44,5 @@ bin/lasergnu
 @dirrm %%DATADIR%%/4.6/PostScript
 @dirrm %%DATADIR%%/4.6
 @dirrm %%DATADIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/html
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm libexec/gnuplot/4.6
 @dirrm libexec/gnuplot