--- a/components/bzip2/bzip2.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/bzip2/bzip2.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -20,47 +20,51 @@
 #
 
 #
-# 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 committed>
 set name=pkg.fmri \
     value=pkg:/compress/bzip2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="high-quality block-sorting file compressor - utilities"
 set name=pkg.description \
     value="bzip2 is a freely available, patent free, high-quality data compressor."
-set name=pkg.summary \
-    value="high-quality block-sorting file compressor - utilities"
 set name=com.oracle.info.description value="the bzip2 data compression utility"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 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/1999/555
+set name=org.opensolaris.arc-caseid value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/bin
 file build/$(MACH64)/bzip2 path=usr/bin/bunzip2
 file build/$(MACH64)/bzip2 path=usr/bin/bzcat
+link path=usr/bin/bzcmp target=./bzdiff
 file path=usr/bin/bzdiff
+link path=usr/bin/bzegrep target=./bzgrep
+link path=usr/bin/bzfgrep target=./bzgrep
 file path=usr/bin/bzgrep
 file build/$(MACH64)/bzip2 path=usr/bin/bzip2
 file build/$(MACH64)/bzip2recover path=usr/bin/bzip2recover
+link path=usr/bin/bzless target=./bzmore
 file path=usr/bin/bzmore
+dir  path=usr/include
 file path=usr/include/bzlib.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1
 file path=usr/lib/$(MACH64)/libbz2.so.1
 file path=usr/lib/$(MACH64)/llib-lbz2.ln
+link path=usr/lib/libbz2.so target=libbz2.so.1
 file path=usr/lib/libbz2.so.1
 file path=usr/lib/llib-lbz2
 file path=usr/lib/llib-lbz2.ln
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file manpages/bunzip2.1 path=usr/share/man/man1/bunzip2.1
 file manpages/bzcat.1 path=usr/share/man/man1/bzcat.1
 file path=usr/share/man/man1/bzcmp.1
@@ -72,13 +76,8 @@
 file manpages/bzip2recover.1 path=usr/share/man/man1/bzip2recover.1
 file path=usr/share/man/man1/bzless.1
 file manpages/bzmore.1 path=usr/share/man/man1/bzmore.1
+dir  path=usr/share/man/man3
 file manpages/libbz2.3 path=usr/share/man/man3/libbz2.3
 legacy pkg=SUNWbzip desc="The bzip compression utility" \
     name="The bzip compression utility"
 license bzip2.license license="bzip2 license"
-link path=usr/bin/bzcmp target=./bzdiff
-link path=usr/bin/bzegrep target=./bzgrep
-link path=usr/bin/bzfgrep target=./bzgrep
-link path=usr/bin/bzless target=./bzmore
-link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1
-link path=usr/lib/libbz2.so target=libbz2.so.1