--- a/components/gd2/gd2.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gd2/gd2.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -20,23 +20,22 @@
 #
 
 #
-# 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)
 #
 #
@@ -66,8 +65,13 @@
 file path=usr/include/gd2/gdhelpers.h
 file path=usr/include/gd2/jisx0208.h
 file path=usr/include/gd2/wbmp.h
+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
@@ -89,9 +93,4 @@
 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