--- a/components/gd2/gd2.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gd2/gd2.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,12 +23,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/gd@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<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.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=pkg.description value="GD - An open source code library for the dynamic creation of images by programmers" 
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.libgd.org/"
+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=http://www.libgd.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/166
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
@@ -71,13 +77,13 @@
 file path=usr/include/gd2/gdhelpers.h
 file path=usr/include/gd2/jisx0208.h
 file path=usr/include/gd2/wbmp.h
+file path=usr/lib/$(MACH64)/libgd.so.2.0.0
+file path=usr/lib/$(MACH64)/llib-lgd.ln
 file path=usr/lib/libgd.so.2.0.0
-file path=usr/lib/$(MACH64)/libgd.so.2.0.0
 file llib-lgd path=usr/lib/llib-lgd
 file path=usr/lib/llib-lgd.ln
-file path=usr/lib/$(MACH64)/llib-lgd.ln
+file entities.html path=usr/share/doc/gd2/html/entities.html
 file index.html path=usr/share/doc/gd2/html/index.html
-file entities.html path=usr/share/doc/gd2/html/entities.html
 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
@@ -93,14 +99,13 @@
 file Solaris/libgd2.1-extra path=usr/share/man/man1/webpng.1
 file Solaris/libgd2.3 path=usr/share/man/man3/libgd2.3
 #
-link path=usr/lib/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/$(MACH64)/libgd.so.2 target=libgd.so.2.0.0
-link path=usr/lib/$(MACH64)/libgd.so target=libgd.so.2.0.0
+legacy pkg=SUNWgd2 desc="GD - The Graphics Draw Library (2.0.35)" \
+    name="The Graphics Draw Library"
 #
 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
 #
-legacy pkg=SUNWgd2 \
-    desc="GD - The Graphics Draw Library (2.0.35)" \
-    name="The Graphics Draw Library"
+link path=usr/lib/libgd.so.2 target=libgd.so.2.0.0