--- a/components/gnuplot/gnuplot.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gnuplot/gnuplot.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,21 +18,22 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, 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.fmri \
+    value=pkg:/image/gnuplot@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gnuplot - plotting utility"
-set name=pkg.description value="gnuplot - command-driven interactive function plotting program"
+set name=pkg.description \
+    value="gnuplot - command-driven interactive function plotting program"
 set name=com.oracle.info.description value="the gnuplot plotting utility"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2009/395
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license gnuplot.license license=other
 
 
 file usr/bin/$(MACH64)/gnuplot path=usr/bin/gnuplot mode=555
@@ -50,8 +51,8 @@
 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/barchart_art.dem
 file path=usr/demo/gnuplot/big_peak.dat
 file path=usr/demo/gnuplot/binary.dem
 file $(MACH64)/demo/binary1 path=usr/demo/gnuplot/binary1
@@ -207,6 +208,8 @@
 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
+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
@@ -249,12 +252,14 @@
 file path=usr/share/gnuplot/4.6/lua/gnuplot-tikz.lua
 file path=usr/share/info/gnuplot.info
 file path=usr/share/man/man1/gnuplot.1 mangler.man.stability=uncommitted
-link path=usr/share/X11/app-defaults/Gnuplot target=../../gnuplot/4.6/app-defaults/Gnuplot
+license gnuplot.license license=other
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/libXevie.so
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/libXss.so
 
 # Add some dependencies that pkg is not finding
 
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/libcanberra-gtk.so type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/libXss.so type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/libXevie.so type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/share/fonts/X11/Type1/cour.pfa type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/share/fonts/TrueType/liberation/LiberationSans-Regular.ttf type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/libcanberra-gtk.so
+depend type=require fmri=__TBD \
+    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