diff -r 7b09b73a67a4 -r 0f62cc221c7e components/cdrtools/cdrtools.p5m
--- a/components/cdrtools/cdrtools.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/cdrtools/cdrtools.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,23 +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.*/man/.+ -> default mangler.man.stability uncommitted>
-set name=pkg.fmri value=pkg:/media/cdrtools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/media/cdrtools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="CD/DVD/BluRay command line recording software"
-set name=com.oracle.info.description value="the cdrtools CD/DVD/BluRay recording software"
+set name=com.oracle.info.description \
+    value="the cdrtools CD/DVD/BluRay recording software"
 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/2005/520
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2005/520
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-license cdrtools.license license="CDDLv1.0, GPLv2, LGPLv2.1, BSD 2 clause"
-
 
 file Solaris/cdrtools path=etc/security/exec_attr.d/cdrtools
 file Solaris/cdda2wav path=usr/bin/cdda2wav
@@ -44,11 +43,6 @@
 file path=usr/bin/mkisofs
 file Solaris/readcd path=usr/bin/readcd
 file usr/bin/readcd path=usr/bin/readcd.bin
-file path=usr/share/man/man1/cdda2wav.1
-file path=usr/share/man/man1/cdrecord.1
-file path=usr/share/man/man1/readcd.1
-file path=usr/share/man/man8/mkisofs.8
-
 file path=usr/lib/siconv/cp10000
 file path=usr/lib/siconv/cp10006
 file path=usr/lib/siconv/cp10007
@@ -97,8 +91,11 @@
 file path=usr/lib/siconv/iso8859-9
 file path=usr/lib/siconv/koi8-r
 file path=usr/lib/siconv/koi8-u
+file path=usr/share/man/man1/cdda2wav.1
+file path=usr/share/man/man1/cdrecord.1
+file path=usr/share/man/man1/readcd.1
+file path=usr/share/man/man8/mkisofs.8
 
 
-legacy pkg=SUNWmkcd \
-    name="CD creation utilities" \
-    desc="CD creation utilities"
+legacy pkg=SUNWmkcd desc="CD creation utilities" name="CD creation utilities"
+license cdrtools.license license="CDDLv1.0, GPLv2, LGPLv2.1, BSD 2 clause"