--- a/components/visual-panels/core/system-management-visual-panels-core.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/visual-panels/core/system-management-visual-panels-core.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -20,59 +20,42 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
-
-set name=pkg.fmri value=pkg:/system/management/visual-panels-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/system/management/visual-panels-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Visual Panels framework"
-set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
-
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
-
-license ../vpanels.copyright license=Oracle
-
-depend fmri=__TBD \
-       pkg.debug.depend.file=java \
-       pkg.debug.depend.path=usr/bin \
-       pkg.debug.depend.reason=usr/bin/vp \
-       pkg.debug.depend.type=script \
-       type=require
-
-depend fmri=__TBD \
-       pkg.debug.depend.file=jhall.jar \
-       pkg.debug.depend.path=usr/jdk/packages/lib/ext \
-       pkg.debug.depend.reason=usr/share/vpanels/app/vpanels-panels-browser.jar \
-       pkg.debug.depend.type=script \
-       type=require
-
-depend fmri=__TBD \
-       pkg.debug.depend.file=gfind \
-       pkg.debug.depend.path=usr/bin \
-       pkg.debug.depend.reason=usr/bin/vp \
-       pkg.debug.depend.type=script \
-       type=require
-
-depend fmri=__TBD \
-       pkg.debug.depend.file=rad.jar \
-       pkg.debug.depend.path=usr/lib/rad/java \
-       pkg.debug.depend.reason=usr/share/vpanels/vpanels-client.jar \
-       pkg.debug.depend.type=java \
-       type=require
-
-depend fmri=pkg:/system/management/visual-panels-core/locale type=require
-
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/sleeklock
 file path=usr/bin/vp
 file path=usr/share/man/man1/vp.1
+file path=usr/share/vpanels/TimingFramework-1.0.jar
 file path=usr/share/vpanels/app/vpanels-panels-browser.jar
 file path=usr/share/vpanels/conf/browser.xml
 file path=usr/share/vpanels/java.policy
 file path=usr/share/vpanels/smf-old.jar
 file path=usr/share/vpanels/swingx-0.9.3.jar
-file path=usr/share/vpanels/TimingFramework-1.0.jar
 file path=usr/share/vpanels/vpanels-client.jar
 file path=usr/share/vpanels/vpanels-panel.jar
 file path=usr/share/vpanels/vpanels-util.jar
+license ../vpanels.copyright license=Oracle
+depend type=require fmri=__TBD pkg.debug.depend.file=gfind \
+    pkg.debug.depend.path=usr/bin pkg.debug.depend.reason=usr/bin/vp \
+    pkg.debug.depend.type=script
+depend type=require fmri=__TBD pkg.debug.depend.file=java \
+    pkg.debug.depend.path=usr/bin pkg.debug.depend.reason=usr/bin/vp \
+    pkg.debug.depend.type=script
+depend type=require fmri=__TBD pkg.debug.depend.file=jhall.jar \
+    pkg.debug.depend.path=usr/jdk/packages/lib/ext \
+    pkg.debug.depend.reason=usr/share/vpanels/app/vpanels-panels-browser.jar \
+    pkg.debug.depend.type=script
+depend type=require fmri=__TBD pkg.debug.depend.file=rad.jar \
+    pkg.debug.depend.path=usr/lib/rad/java \
+    pkg.debug.depend.reason=usr/share/vpanels/vpanels-client.jar \
+    pkg.debug.depend.type=java
+depend type=require fmri=pkg:/system/management/visual-panels-core/locale