--- a/components/xorriso/xorriso.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/xorriso/xorriso.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,32 +18,30 @@
 #
 # 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.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri value=pkg:/media/xorriso@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/media/xorriso@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU xorriso"
 set name=com.oracle.info.description value="GNU xorriso"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Media"
+set name=info.classification value=org.opensolaris.category.2008:System/Media
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2011/046
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2011/046
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license xorriso.license license="GPLv3"
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/xorriso
-file path=usr/share/man/man1/xorriso.1
-file path=usr/share/info/xorriso.info
+dir  path=usr
+dir  path=usr/bin
 link path=usr/bin/osirrox target=xorriso
 link path=usr/bin/xorrecord target=xorriso
+file path=usr/bin/xorriso
 link path=usr/bin/xorrisofs target=xorriso
+dir  path=usr/share
+dir  path=usr/share/info
+file path=usr/share/info/xorriso.info
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
+file path=usr/share/man/man1/xorriso.1
+license xorriso.license license=GPLv3