--- a/components/gd2/gd2.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/gd2/gd2.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -20,38 +20,26 @@
 #
 
 #
-# 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:/library/gd@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The Graphics Draw Library"
 set name=pkg.description \
     value="GD - An open source code library for the dynamic creation of images by programmers"
-set name=pkg.summary value="The Graphics Draw Library"
 set name=com.oracle.info.description value="the GD Graphics Draw Library"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 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/2007/166
+set name=org.opensolaris.arc-caseid value=PSARC/2007/166
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/gd2
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/gd2
-dir path=usr/share/doc/gd2/html
-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 path=usr/bin/annotate
 file path=usr/bin/gd2copypal
@@ -66,6 +54,8 @@
 file path=usr/bin/pngtogd
 file path=usr/bin/pngtogd2
 file path=usr/bin/webpng
+dir  path=usr/include
+dir  path=usr/include/gd2
 file path=usr/include/gd2/entities.h
 file path=usr/include/gd2/gd.h
 file path=usr/include/gd2/gd_io.h
@@ -79,13 +69,26 @@
 file path=usr/include/gd2/gdhelpers.h
 file path=usr/include/gd2/jisx0208.h
 file path=usr/include/gd2/wbmp.h
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libgd.so target=libgd.so.2.0.0
+link path=usr/lib/$(MACH64)/libgd.so.2 target=libgd.so.2.0.0
 file path=usr/lib/$(MACH64)/libgd.so.2.0.0
 file path=usr/lib/$(MACH64)/llib-lgd.ln
+link path=usr/lib/libgd.so target=libgd.so.2.0.0
+#
+link path=usr/lib/libgd.so.2 target=libgd.so.2.0.0
 file path=usr/lib/libgd.so.2.0.0
 file llib-lgd path=usr/lib/llib-lgd
 file path=usr/lib/llib-lgd.ln
+dir  path=usr/share
+dir  path=usr/share/doc
+dir  path=usr/share/doc/gd2
+dir  path=usr/share/doc/gd2/html
 file entities.html path=usr/share/doc/gd2/html/entities.html
 file index.html path=usr/share/doc/gd2/html/index.html
+dir  path=usr/share/man
+dir  path=usr/share/man/man1
 file Solaris/libgd2.1-extra path=usr/share/man/man1/annotate.1
 file Solaris/libgd2.1-extra path=usr/share/man/man1/gd2copypal.1
 file Solaris/libgd2.1-extra path=usr/share/man/man1/gd2time.1
@@ -99,12 +102,8 @@
 file Solaris/libgd2.1-extra path=usr/share/man/man1/pngtogd.1
 file Solaris/libgd2.1-extra path=usr/share/man/man1/pngtogd2.1
 file Solaris/libgd2.1-extra path=usr/share/man/man1/webpng.1
+dir  path=usr/share/man/man3
 file Solaris/libgd2.3 path=usr/share/man/man3/libgd2.3
 #
 license gd2.license license="GD2 License"
-link path=usr/lib/$(MACH64)/libgd.so target=libgd.so.2.0.0
-link path=usr/lib/$(MACH64)/libgd.so.2 target=libgd.so.2.0.0
-link path=usr/lib/libgd.so target=libgd.so.2.0.0
-#
-link path=usr/lib/libgd.so.2 target=libgd.so.2.0.0