--- a/components/gnuplot/gnuplot.p5m	Fri Jun 24 11:30:54 2016 -0700
+++ b/components/gnuplot/gnuplot.p5m	Fri Jun 24 16:19:17 2016 -0700
@@ -22,7 +22,6 @@
 #
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/demo/gnuplot/(.+[.-].+)$ -> set action.hash demo/%<1> >
 set name=pkg.fmri \
     value=pkg:/image/gnuplot@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gnuplot - plotting utility"
@@ -39,220 +38,233 @@
 
 
 file path=usr/bin/gnuplot mode=555
-file path=usr/demo/gnuplot/1.dat
-file path=usr/demo/gnuplot/2.dat
-file path=usr/demo/gnuplot/3.dat
-file path=usr/demo/gnuplot/GM1_bonds.r3d
-file path=usr/demo/gnuplot/GM1_sugar.pdb
-file path=usr/demo/gnuplot/airfoil.dem
-file path=usr/demo/gnuplot/all.dem
-file path=usr/demo/gnuplot/animate.dem
-file path=usr/demo/gnuplot/animate2.dem
-file path=usr/demo/gnuplot/approximate.dem
-file path=usr/demo/gnuplot/arrowstyle.dat
-file path=usr/demo/gnuplot/arrowstyle.dem
-file path=usr/demo/gnuplot/asciimat.dat
-file path=usr/demo/gnuplot/autoscale.dem
-file path=usr/demo/gnuplot/barchart_art.dem
-file path=usr/demo/gnuplot/battery.dat
-file path=usr/demo/gnuplot/big_peak.dat
-file path=usr/demo/gnuplot/binary.dem
+file demo/1.dat path=usr/demo/gnuplot/1.dat
+file demo/2.dat path=usr/demo/gnuplot/2.dat
+file demo/3.dat path=usr/demo/gnuplot/3.dat
+file demo/GM1_bonds.r3d path=usr/demo/gnuplot/GM1_bonds.r3d
+file demo/GM1_sugar.pdb path=usr/demo/gnuplot/GM1_sugar.pdb
+file demo/airfoil.dem path=usr/demo/gnuplot/airfoil.dem
+file demo/all.dem path=usr/demo/gnuplot/all.dem
+file demo/animate.dem path=usr/demo/gnuplot/animate.dem
+file demo/animate2.dem path=usr/demo/gnuplot/animate2.dem
+file demo/approximate.dem path=usr/demo/gnuplot/approximate.dem
+file demo/arrowstyle.dat path=usr/demo/gnuplot/arrowstyle.dat
+file demo/arrowstyle.dem path=usr/demo/gnuplot/arrowstyle.dem
+file demo/asciimat.dat path=usr/demo/gnuplot/asciimat.dat
+file demo/autoscale.dem path=usr/demo/gnuplot/autoscale.dem
+file demo/barchart_art.dem path=usr/demo/gnuplot/barchart_art.dem
+file demo/battery.dat path=usr/demo/gnuplot/battery.dat
+file demo/big_peak.dat path=usr/demo/gnuplot/big_peak.dat
+file demo/binary.dem path=usr/demo/gnuplot/binary.dem
 file $(MACH64)/demo/binary1 path=usr/demo/gnuplot/binary1
 file $(MACH64)/demo/binary2 path=usr/demo/gnuplot/binary2
 file $(MACH64)/demo/binary3 path=usr/demo/gnuplot/binary3
-file path=usr/demo/gnuplot/bivariat.dem
-file path=usr/demo/gnuplot/bldg.png
-file path=usr/demo/gnuplot/blutux.rgb
-file path=usr/demo/gnuplot/borders.dem
-file path=usr/demo/gnuplot/boxplot.dem
-file path=usr/demo/gnuplot/candlesticks.dat
-file path=usr/demo/gnuplot/candlesticks.dem
-file path=usr/demo/gnuplot/charset.dem
-file path=usr/demo/gnuplot/circles.dem
-file path=usr/demo/gnuplot/cities.dat
-file path=usr/demo/gnuplot/cities.dem
-file path=usr/demo/gnuplot/clip14in.dat
-file path=usr/demo/gnuplot/colorscheme.dem
-file path=usr/demo/gnuplot/colorwheel.dem
-file path=usr/demo/gnuplot/contours.dem
-file path=usr/demo/gnuplot/controls.dem
-file path=usr/demo/gnuplot/ctg-y2.dat
-file path=usr/demo/gnuplot/dashcolor.dem
-file path=usr/demo/gnuplot/datastrings.dem
-file path=usr/demo/gnuplot/delaunay-edges.dat
-file path=usr/demo/gnuplot/demo.edf
-file path=usr/demo/gnuplot/density.fnc
-file path=usr/demo/gnuplot/dgrid3d.dem
-file path=usr/demo/gnuplot/discrete.dem
-file path=usr/demo/gnuplot/electron.dem
-file path=usr/demo/gnuplot/ellipse.dem
-file path=usr/demo/gnuplot/ellipses.dat
-file path=usr/demo/gnuplot/ellipses_style.dem
-file path=usr/demo/gnuplot/empty-circles.dat
-file path=usr/demo/gnuplot/energy_circles.dat
-file path=usr/demo/gnuplot/enhanced_utf8.dem
-file path=usr/demo/gnuplot/enhancedtext.dem
-file path=usr/demo/gnuplot/epslatex.dem
-file path=usr/demo/gnuplot/fillbetween.dem
-file path=usr/demo/gnuplot/fillcrvs.dem
-file path=usr/demo/gnuplot/fillstyle.dem
-file path=usr/demo/gnuplot/finance.dat
-file path=usr/demo/gnuplot/finance.dem
-file path=usr/demo/gnuplot/fit.dem
-file path=usr/demo/gnuplot/fit3.dat
-file path=usr/demo/gnuplot/fontfile.dem
-file path=usr/demo/gnuplot/fontfile_latex.dem
-file path=usr/demo/gnuplot/glass.dat
-file path=usr/demo/gnuplot/gnu-valley
-file path=usr/demo/gnuplot/gnuplot.cfg
-file path=usr/demo/gnuplot/gnuplot.rot
-file path=usr/demo/gnuplot/gpdemos.tcl mode=555
-file path=usr/demo/gnuplot/heatmaps.dem
-file path=usr/demo/gnuplot/hemisphr.dat
-file path=usr/demo/gnuplot/hexa.fnc
-file path=usr/demo/gnuplot/hidden.dem
-file path=usr/demo/gnuplot/hidden2.dem
-file path=usr/demo/gnuplot/histerror.dat
-file path=usr/demo/gnuplot/histograms.dem
-file path=usr/demo/gnuplot/histograms2.dem
-file path=usr/demo/gnuplot/histopt.dat
-file path=usr/demo/gnuplot/image.dem
-file path=usr/demo/gnuplot/image2.dem
-file path=usr/demo/gnuplot/imageNaN.dem
-file path=usr/demo/gnuplot/immigration.dat
-file path=usr/demo/gnuplot/iterate.dem
-file path=usr/demo/gnuplot/kdensity2d.dem
-file path=usr/demo/gnuplot/key.dem
-file path=usr/demo/gnuplot/klein.dat
-file path=usr/demo/gnuplot/labelplot.pdb
-file path=usr/demo/gnuplot/layout.dem
-file path=usr/demo/gnuplot/lcdemo.dat
-file path=usr/demo/gnuplot/lena-keypoints.bin
-file path=usr/demo/gnuplot/lena.rgb
-file path=usr/demo/gnuplot/line.fnc
-file path=usr/demo/gnuplot/macros.dem
-file path=usr/demo/gnuplot/margins.dem
-file path=usr/demo/gnuplot/mgr.dem
-file path=usr/demo/gnuplot/molecule.dem
-file path=usr/demo/gnuplot/moli3.dat
-file path=usr/demo/gnuplot/mouselab_1.dem
-file path=usr/demo/gnuplot/mouselab_2.dem
-file path=usr/demo/gnuplot/mouselabels.dem
-file path=usr/demo/gnuplot/mousevariables.dem
-file path=usr/demo/gnuplot/multiaxis.dem
-file path=usr/demo/gnuplot/multimsh.dem
-file path=usr/demo/gnuplot/multipalette.dem
-file path=usr/demo/gnuplot/multiplt.dem
-file path=usr/demo/gnuplot/nearmap.csv
-file path=usr/demo/gnuplot/optimize.dat
-file path=usr/demo/gnuplot/orbital_elements.dat
-file path=usr/demo/gnuplot/orbits.dem
-file path=usr/demo/gnuplot/param.dem
-file path=usr/demo/gnuplot/pm3d.dem
-file path=usr/demo/gnuplot/pm3dcolors.dem
-file path=usr/demo/gnuplot/pm3dgamma.dem
-file path=usr/demo/gnuplot/pointsize.dem
-file path=usr/demo/gnuplot/polar.dem
-file path=usr/demo/gnuplot/poldat.dem
-file path=usr/demo/gnuplot/prob.dem
-file path=usr/demo/gnuplot/prob2.dem
-file path=usr/demo/gnuplot/rainbow.dem
-file path=usr/demo/gnuplot/random-points
-file path=usr/demo/gnuplot/random.dem
-file path=usr/demo/gnuplot/rectangle.dem
-file path=usr/demo/gnuplot/reflect.fnc
-file path=usr/demo/gnuplot/rgb_variable.dat
-file path=usr/demo/gnuplot/rgb_variable.dem
-file path=usr/demo/gnuplot/rgbalpha.dem
+file demo/bivariat.dem path=usr/demo/gnuplot/bivariat.dem
+file demo/bldg.png path=usr/demo/gnuplot/bldg.png
+file demo/blutux.rgb path=usr/demo/gnuplot/blutux.rgb
+file demo/bolditalic.dem path=usr/demo/gnuplot/bolditalic.dem
+file demo/borders.dem path=usr/demo/gnuplot/borders.dem
+file demo/boxplot.dem path=usr/demo/gnuplot/boxplot.dem
+file demo/callargs.dem path=usr/demo/gnuplot/callargs.dem
+file demo/candlesticks.dat path=usr/demo/gnuplot/candlesticks.dat
+file demo/candlesticks.dem path=usr/demo/gnuplot/candlesticks.dem
+file demo/cerf.dem path=usr/demo/gnuplot/cerf.dem
+file demo/charset.dem path=usr/demo/gnuplot/charset.dem
+file demo/circles.dem path=usr/demo/gnuplot/circles.dem
+file demo/cities.dat path=usr/demo/gnuplot/cities.dat
+file demo/cities.dem path=usr/demo/gnuplot/cities.dem
+file demo/clip14in.dat path=usr/demo/gnuplot/clip14in.dat
+file demo/clipobject.dem path=usr/demo/gnuplot/clipobject.dem
+file demo/colorscheme.dem path=usr/demo/gnuplot/colorscheme.dem
+file demo/colorwheel.dem path=usr/demo/gnuplot/colorwheel.dem
+file demo/complex_trig.dem path=usr/demo/gnuplot/complex_trig.dem
+file demo/contours.dem path=usr/demo/gnuplot/contours.dem
+file demo/controls.dem path=usr/demo/gnuplot/controls.dem
+file demo/ctg-y2.dat path=usr/demo/gnuplot/ctg-y2.dat
+file demo/dashcolor.dem path=usr/demo/gnuplot/dashcolor.dem
+file demo/dashtypes.dem path=usr/demo/gnuplot/dashtypes.dem
+file demo/datastrings.dem path=usr/demo/gnuplot/datastrings.dem
+file demo/delaunay-edges.dat path=usr/demo/gnuplot/delaunay-edges.dat
+file demo/demo.edf path=usr/demo/gnuplot/demo.edf
+file $(MACH64)/demo/plugin/demo_plugin.so path=usr/demo/gnuplot/demo_plugin.so \
+    pkg.linted.userland.action001.2=true
+file demo/density.fnc path=usr/demo/gnuplot/density.fnc
+file demo/dgrid3d.dem path=usr/demo/gnuplot/dgrid3d.dem
+file demo/discrete.dem path=usr/demo/gnuplot/discrete.dem
+file demo/electron.dem path=usr/demo/gnuplot/electron.dem
+file demo/ellipse.dem path=usr/demo/gnuplot/ellipse.dem
+file demo/ellipses.dat path=usr/demo/gnuplot/ellipses.dat
+file demo/ellipses_style.dem path=usr/demo/gnuplot/ellipses_style.dem
+file demo/empty-circles.dat path=usr/demo/gnuplot/empty-circles.dat
+file demo/energy_circles.dat path=usr/demo/gnuplot/energy_circles.dat
+file demo/enhanced_utf8.dem path=usr/demo/gnuplot/enhanced_utf8.dem
+file demo/enhancedtext.dem path=usr/demo/gnuplot/enhancedtext.dem
+file demo/epslatex.dem path=usr/demo/gnuplot/epslatex.dem
+file demo/fillbetween.dem path=usr/demo/gnuplot/fillbetween.dem
+file demo/fillcrvs.dem path=usr/demo/gnuplot/fillcrvs.dem
+file demo/fillstyle.dem path=usr/demo/gnuplot/fillstyle.dem
+file demo/finance.dat path=usr/demo/gnuplot/finance.dat
+file demo/finance.dem path=usr/demo/gnuplot/finance.dem
+file demo/fit.dem path=usr/demo/gnuplot/fit.dem
+file demo/fit3.dat path=usr/demo/gnuplot/fit3.dat
+file demo/fitmulti.dem path=usr/demo/gnuplot/fitmulti.dem
+file demo/fontfile.dem path=usr/demo/gnuplot/fontfile.dem
+file demo/fontfile_latex.dem path=usr/demo/gnuplot/fontfile_latex.dem
+file demo/gantt.dem path=usr/demo/gnuplot/gantt.dem
+file demo/gen-random.inc path=usr/demo/gnuplot/gen-random.inc
+file demo/glass.dat path=usr/demo/gnuplot/glass.dat
+file demo/gnu-valley path=usr/demo/gnuplot/gnu-valley
+file demo/gnuplot.cfg path=usr/demo/gnuplot/gnuplot.cfg
+file demo/gnuplot.rot path=usr/demo/gnuplot/gnuplot.rot
+file demo/gpdemos.tcl path=usr/demo/gnuplot/gpdemos.tcl mode=555
+file demo/heatmaps.dem path=usr/demo/gnuplot/heatmaps.dem
+file demo/hemisphr.dat path=usr/demo/gnuplot/hemisphr.dat
+file demo/hexa.fnc path=usr/demo/gnuplot/hexa.fnc
+file demo/hidden.dem path=usr/demo/gnuplot/hidden.dem
+file demo/hidden2.dem path=usr/demo/gnuplot/hidden2.dem
+file demo/histerror.dat path=usr/demo/gnuplot/histerror.dat
+file demo/histograms.dem path=usr/demo/gnuplot/histograms.dem
+file demo/histograms2.dem path=usr/demo/gnuplot/histograms2.dem
+file demo/histopt.dat path=usr/demo/gnuplot/histopt.dat
+file demo/hypertext.dem path=usr/demo/gnuplot/hypertext.dem
+file demo/image.dem path=usr/demo/gnuplot/image.dem
+file demo/image2.dem path=usr/demo/gnuplot/image2.dem
+file demo/imageNaN.dem path=usr/demo/gnuplot/imageNaN.dem
+file demo/immigration.dat path=usr/demo/gnuplot/immigration.dat
+file demo/iterate.dem path=usr/demo/gnuplot/iterate.dem
+file demo/kdensity2d.dem path=usr/demo/gnuplot/kdensity2d.dem
+file demo/key.dem path=usr/demo/gnuplot/key.dem
+file demo/klein.dat path=usr/demo/gnuplot/klein.dat
+file demo/layout.dem path=usr/demo/gnuplot/layout.dem
+file demo/lcdemo.dat path=usr/demo/gnuplot/lcdemo.dat
+file demo/lena-keypoints.bin path=usr/demo/gnuplot/lena-keypoints.bin
+file demo/lena.rgb path=usr/demo/gnuplot/lena.rgb
+file demo/line.fnc path=usr/demo/gnuplot/line.fnc
+file demo/lines_arrows.dem path=usr/demo/gnuplot/lines_arrows.dem
+file demo/linkedaxes.dem path=usr/demo/gnuplot/linkedaxes.dem
+file demo/macros.dem path=usr/demo/gnuplot/macros.dem
+file demo/margins.dem path=usr/demo/gnuplot/margins.dem
+file demo/matrix_index.dem path=usr/demo/gnuplot/matrix_index.dem
+file demo/mgr.dem path=usr/demo/gnuplot/mgr.dem
+file demo/molecule.dem path=usr/demo/gnuplot/molecule.dem
+file demo/moli3.dat path=usr/demo/gnuplot/moli3.dat
+file demo/mouselab_1.dem path=usr/demo/gnuplot/mouselab_1.dem
+file demo/mouselab_2.dem path=usr/demo/gnuplot/mouselab_2.dem
+file demo/mouselabels.dem path=usr/demo/gnuplot/mouselabels.dem
+file demo/mousevariables.dem path=usr/demo/gnuplot/mousevariables.dem
+file demo/multiaxis.dem path=usr/demo/gnuplot/multiaxis.dem
+file demo/multimsh.dem path=usr/demo/gnuplot/multimsh.dem
+file demo/multipalette.dem path=usr/demo/gnuplot/multipalette.dem
+file demo/multiplt.dem path=usr/demo/gnuplot/multiplt.dem
+file demo/named_var.dem path=usr/demo/gnuplot/named_var.dem
+file demo/nokey.dem path=usr/demo/gnuplot/nokey.dem
+file demo/optimize.dat path=usr/demo/gnuplot/optimize.dat
+file demo/orbital_elements.dat path=usr/demo/gnuplot/orbital_elements.dat
+file demo/orbits.dem path=usr/demo/gnuplot/orbits.dem
+file demo/parallel.dem path=usr/demo/gnuplot/parallel.dem
+file demo/param.dem path=usr/demo/gnuplot/param.dem
+file demo/piecewise.dem path=usr/demo/gnuplot/piecewise.dem
+file demo/plugin/plugin.dem path=usr/demo/gnuplot/plugin.dem
+file demo/pm3d.dem path=usr/demo/gnuplot/pm3d.dem
+file demo/pm3dcolors.dem path=usr/demo/gnuplot/pm3dcolors.dem
+file demo/pm3dgamma.dem path=usr/demo/gnuplot/pm3dgamma.dem
+file demo/pointsize.dem path=usr/demo/gnuplot/pointsize.dem
+file demo/polar.dem path=usr/demo/gnuplot/polar.dem
+file demo/poldat.dem path=usr/demo/gnuplot/poldat.dem
+file demo/prob.dem path=usr/demo/gnuplot/prob.dem
+file demo/prob2.dem path=usr/demo/gnuplot/prob2.dem
+file demo/rainbow.dem path=usr/demo/gnuplot/rainbow.dem
+file demo/random-points path=usr/demo/gnuplot/random-points
+file demo/random.dem path=usr/demo/gnuplot/random.dem
+file demo/rectangle.dem path=usr/demo/gnuplot/rectangle.dem
+file demo/reflect.fnc path=usr/demo/gnuplot/reflect.fnc
+file demo/rgb_variable.dat path=usr/demo/gnuplot/rgb_variable.dat
+file demo/rgb_variable.dem path=usr/demo/gnuplot/rgb_variable.dem
+file demo/rgba_lines.dem path=usr/demo/gnuplot/rgba_lines.dem
+file demo/rgbalpha.dem path=usr/demo/gnuplot/rgbalpha.dem
+file demo/rugplot.dem path=usr/demo/gnuplot/rugplot.dem
 file rundemo path=usr/demo/gnuplot/rundemo mode=555
-file path=usr/demo/gnuplot/running_avg.dem
+file demo/running_avg.dem path=usr/demo/gnuplot/running_avg.dem
 file runtcldemo path=usr/demo/gnuplot/runtcldemo mode=555
-file path=usr/demo/gnuplot/scatter.dem
-file path=usr/demo/gnuplot/scatter2.bin
-file path=usr/demo/gnuplot/scatter2.dat
-file path=usr/demo/gnuplot/silver.dat
-file path=usr/demo/gnuplot/simple.dem
-file path=usr/demo/gnuplot/sine.bin
-file path=usr/demo/gnuplot/singulr.dem
-file path=usr/demo/gnuplot/smooth.dem
-file path=usr/demo/gnuplot/sound.par
-file path=usr/demo/gnuplot/sound2.par
-file path=usr/demo/gnuplot/soundvel.dat
-file path=usr/demo/gnuplot/spline.dem
-file path=usr/demo/gnuplot/srl.dat
-file path=usr/demo/gnuplot/starmap.dem
-file path=usr/demo/gnuplot/start.par
-file path=usr/demo/gnuplot/stat.inc
-file path=usr/demo/gnuplot/stats.dem
-file path=usr/demo/gnuplot/steps.dat
-file path=usr/demo/gnuplot/steps.dem
-file path=usr/demo/gnuplot/stringvar.dem
-file path=usr/demo/gnuplot/surface1.dem
-file path=usr/demo/gnuplot/surface2.dem
-file path=usr/demo/gnuplot/table.dat
-file path=usr/demo/gnuplot/textcolor.dem
-file path=usr/demo/gnuplot/textrotate.dem
-file path=usr/demo/gnuplot/tics.dem
-file path=usr/demo/gnuplot/timedat.dat
-file path=usr/demo/gnuplot/timedat.dem
-file path=usr/demo/gnuplot/transparent.dem
-file path=usr/demo/gnuplot/transparent_solids.dem
-file path=usr/demo/gnuplot/triangle.dat
-file path=usr/demo/gnuplot/using.bin
-file path=usr/demo/gnuplot/using.dat
-file path=usr/demo/gnuplot/using.dem
-file path=usr/demo/gnuplot/utf8.dem
-file path=usr/demo/gnuplot/varcolor.dem
-file path=usr/demo/gnuplot/vector.dem
-file path=usr/demo/gnuplot/whale.dat
-file path=usr/demo/gnuplot/world.cor
-file path=usr/demo/gnuplot/world.dat
-file path=usr/demo/gnuplot/world.dem
-file path=usr/demo/gnuplot/world2.dem
-file path=usr/lib/$(MACH64)/gnuplot/4.6/gnuplot_x11 mode=555
+file demo/scatter.dem path=usr/demo/gnuplot/scatter.dem
+file demo/scatter2.bin path=usr/demo/gnuplot/scatter2.bin
+file demo/scatter2.dat path=usr/demo/gnuplot/scatter2.dat
+file demo/silver.dat path=usr/demo/gnuplot/silver.dat
+file demo/simple.dem path=usr/demo/gnuplot/simple.dem
+file demo/sine.bin path=usr/demo/gnuplot/sine.bin
+file demo/singulr.dem path=usr/demo/gnuplot/singulr.dem
+file demo/smooth.dem path=usr/demo/gnuplot/smooth.dem
+file demo/sound.par path=usr/demo/gnuplot/sound.par
+file demo/sound2.par path=usr/demo/gnuplot/sound2.par
+file demo/soundvel.dat path=usr/demo/gnuplot/soundvel.dat
+file demo/spline.dem path=usr/demo/gnuplot/spline.dem
+file demo/srl.dat path=usr/demo/gnuplot/srl.dat
+file demo/start.par path=usr/demo/gnuplot/start.par
+file demo/stat.inc path=usr/demo/gnuplot/stat.inc
+file demo/stats.dem path=usr/demo/gnuplot/stats.dem
+file demo/steps.dat path=usr/demo/gnuplot/steps.dat
+file demo/steps.dem path=usr/demo/gnuplot/steps.dem
+file demo/stringvar.dem path=usr/demo/gnuplot/stringvar.dem
+file demo/surface1.dem path=usr/demo/gnuplot/surface1.dem
+file demo/surface2.dem path=usr/demo/gnuplot/surface2.dem
+file demo/table.dat path=usr/demo/gnuplot/table.dat
+file demo/textcolor.dem path=usr/demo/gnuplot/textcolor.dem
+file demo/textrotate.dem path=usr/demo/gnuplot/textrotate.dem
+file demo/tics.dem path=usr/demo/gnuplot/tics.dem
+file demo/timedat.dat path=usr/demo/gnuplot/timedat.dat
+file demo/timedat.dem path=usr/demo/gnuplot/timedat.dem
+file demo/transparent.dem path=usr/demo/gnuplot/transparent.dem
+file demo/transparent_solids.dem path=usr/demo/gnuplot/transparent_solids.dem
+file demo/triangle.dat path=usr/demo/gnuplot/triangle.dat
+file demo/using.bin path=usr/demo/gnuplot/using.bin
+file demo/using.dat path=usr/demo/gnuplot/using.dat
+file demo/using.dem path=usr/demo/gnuplot/using.dem
+file demo/utf8.dem path=usr/demo/gnuplot/utf8.dem
+file demo/varcolor.dem path=usr/demo/gnuplot/varcolor.dem
+file demo/vector.dem path=usr/demo/gnuplot/vector.dem
+file demo/whale.dat path=usr/demo/gnuplot/whale.dat
+file demo/world.cor path=usr/demo/gnuplot/world.cor
+file demo/world.dat path=usr/demo/gnuplot/world.dat
+file demo/world.dem path=usr/demo/gnuplot/world.dem
+file demo/world2.dem path=usr/demo/gnuplot/world2.dem
+file path=usr/lib/$(MACH64)/gnuplot/5.0/gnuplot_x11 mode=555
 link path=usr/share/X11/app-defaults/Gnuplot \
-    target=../../gnuplot/4.6/app-defaults/Gnuplot
-file path=usr/share/emacs/site-lisp/gnuplot-gui.el
-file path=usr/share/emacs/site-lisp/gnuplot-gui.elc
-file path=usr/share/emacs/site-lisp/gnuplot.el
-file path=usr/share/emacs/site-lisp/gnuplot.elc
-file path=usr/share/emacs/site-lisp/info-look.20.2.el
-file path=usr/share/emacs/site-lisp/info-look.20.3.el
-file path=usr/share/gnuplot/4.6/PostScript/8859-1.ps
-file path=usr/share/gnuplot/4.6/PostScript/8859-15.ps
-file path=usr/share/gnuplot/4.6/PostScript/8859-2.ps
-file path=usr/share/gnuplot/4.6/PostScript/8859-9.ps
-file path=usr/share/gnuplot/4.6/PostScript/aglfn.txt
-file path=usr/share/gnuplot/4.6/PostScript/cp1250.ps
-file path=usr/share/gnuplot/4.6/PostScript/cp1251.ps
-file path=usr/share/gnuplot/4.6/PostScript/cp437.ps
-file path=usr/share/gnuplot/4.6/PostScript/cp850.ps
-file path=usr/share/gnuplot/4.6/PostScript/cp852.ps
-file path=usr/share/gnuplot/4.6/PostScript/koi8r.ps
-file path=usr/share/gnuplot/4.6/PostScript/koi8u.ps
-file path=usr/share/gnuplot/4.6/PostScript/prologue.ps
-file path=usr/share/gnuplot/4.6/PostScript/utf-8.ps
-file path=usr/share/gnuplot/4.6/app-defaults/Gnuplot
-file path=usr/share/gnuplot/4.6/colors_default.gp
-file path=usr/share/gnuplot/4.6/colors_mono.gp
-file path=usr/share/gnuplot/4.6/colors_podo.gp
-file path=usr/share/gnuplot/4.6/gnuplot.gih
-file path=usr/share/gnuplot/4.6/gnuplotrc
-file path=usr/share/gnuplot/4.6/js/README
-file path=usr/share/gnuplot/4.6/js/canvasmath.js
-file path=usr/share/gnuplot/4.6/js/canvastext.js
-file path=usr/share/gnuplot/4.6/js/gnuplot_common.js
-file path=usr/share/gnuplot/4.6/js/gnuplot_dashedlines.js
-file path=usr/share/gnuplot/4.6/js/gnuplot_mouse.css
-file path=usr/share/gnuplot/4.6/js/gnuplot_mouse.js
-file path=usr/share/gnuplot/4.6/js/gnuplot_svg.js
-file path=usr/share/gnuplot/4.6/js/grid.png
-file path=usr/share/gnuplot/4.6/js/help.png
-file path=usr/share/gnuplot/4.6/js/nextzoom.png
-file path=usr/share/gnuplot/4.6/js/previouszoom.png
-file path=usr/share/gnuplot/4.6/js/textzoom.png
-file path=usr/share/gnuplot/4.6/lua/gnuplot-tikz.lua
-file path=usr/share/info/gnuplot.info
+    target=../../gnuplot/5.0/app-defaults/Gnuplot
+file path=usr/share/gnuplot/5.0/PostScript/8859-1.ps
+file path=usr/share/gnuplot/5.0/PostScript/8859-15.ps
+file path=usr/share/gnuplot/5.0/PostScript/8859-2.ps
+file path=usr/share/gnuplot/5.0/PostScript/8859-9.ps
+file path=usr/share/gnuplot/5.0/PostScript/aglfn.txt
+file path=usr/share/gnuplot/5.0/PostScript/cp1250.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp1251.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp437.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp850.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp852.ps
+file path=usr/share/gnuplot/5.0/PostScript/koi8r.ps
+file path=usr/share/gnuplot/5.0/PostScript/koi8u.ps
+file path=usr/share/gnuplot/5.0/PostScript/prologue.ps
+file path=usr/share/gnuplot/5.0/PostScript/utf-8.ps
+file path=usr/share/gnuplot/5.0/app-defaults/Gnuplot
+file path=usr/share/gnuplot/5.0/colors_default.gp
+file path=usr/share/gnuplot/5.0/colors_mono.gp
+file path=usr/share/gnuplot/5.0/colors_podo.gp
+file path=usr/share/gnuplot/5.0/gnuplot.gih
+file path=usr/share/gnuplot/5.0/gnuplotrc
+file path=usr/share/gnuplot/5.0/js/README
+file path=usr/share/gnuplot/5.0/js/canvasmath.js
+file path=usr/share/gnuplot/5.0/js/canvastext.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_common.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_dashedlines.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_mouse.css
+file path=usr/share/gnuplot/5.0/js/gnuplot_mouse.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_svg.js
+file path=usr/share/gnuplot/5.0/js/grid.png
+file path=usr/share/gnuplot/5.0/js/help.png
+file path=usr/share/gnuplot/5.0/js/nextzoom.png
+file path=usr/share/gnuplot/5.0/js/previouszoom.png
+file path=usr/share/gnuplot/5.0/js/textzoom.png
+file path=usr/share/gnuplot/5.0/lua/gnuplot-tikz.lua
+file $(MACH64)/docs/gnuplot.info path=usr/share/info/gnuplot.info
 file path=usr/share/man/man1/gnuplot.1 mangler.man.stability=uncommitted
 license gnuplot.license license=other
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/libXevie.so
@@ -265,3 +277,8 @@
     pkg.debug.depend.file=usr/share/fonts/TrueType/liberation/LiberationSans-Regular.ttf
 depend type=require fmri=__TBD \
     pkg.debug.depend.file=usr/share/fonts/X11/Type1/cour.pfa
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/share/ghostscript/fonts/bchb.pfa
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/share/ghostscript/fonts/p052003l.pfb
+