--- a/components/libxml2/libxml2.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxml2/libxml2.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,13 +21,17 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XML library"
-set name=info.classification value=org.opensolaris.category.2008:System/Libraries
+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://xmlsoft.org
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/630
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=info.upstream_url value="http://xmlsoft.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-
 dir path=lib
 dir path=lib/$(MACH64)
 dir path=usr
@@ -44,7 +48,6 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man3
-
 file usr/lib/$(MACH64)/libxml2.so.2 path=lib/$(MACH64)/libxml2.so.2
 file $(MACH64)/llib-lxml2.ln path=lib/$(MACH64)/llib-lxml2.ln
 file usr/lib/libxml2.so.2 path=lib/libxml2.so.2
@@ -108,24 +111,19 @@
 file xmllint.1 path=usr/share/man/man1/xmllint.1
 file libxml.3 path=usr/share/man/man3/libxml.3
 file libxml2.3 path=usr/share/man/man3/libxml2.3
-
+legacy pkg=SUNWlxml desc="The XML library" name="The XML library"
+legacy pkg=SUNWlxml-devel desc="The XML library - developer files" \
+    name="The XML library - developer files"
+legacy pkg=SUNWlxmlr desc="The XML library (Root)" \
+    name="The XML library (Root)"
+license libxml2.license license="libxml license"
 link path=lib/$(MACH64)/libxml2.so target=libxml2.so.2
 link path=lib/libxml2.so target=libxml2.so.2
 link path=usr/lib/$(MACH64)/libxml2.so target=libxml2.so.2
-link path=usr/lib/$(MACH64)/libxml2.so.2 target=../../../lib/$(MACH64)/libxml2.so.2
-link path=usr/lib/$(MACH64)/llib-lxml2.ln target=../../../lib/$(MACH64)/llib-lxml2.ln
+link path=usr/lib/$(MACH64)/libxml2.so.2 \
+    target=../../../lib/$(MACH64)/libxml2.so.2
+link path=usr/lib/$(MACH64)/llib-lxml2.ln \
+    target=../../../lib/$(MACH64)/llib-lxml2.ln
 link path=usr/lib/libxml2.so target=./libxml2.so.2
 link path=usr/lib/libxml2.so.2 target=../../lib/libxml2.so.2
 link path=usr/lib/llib-lxml2.ln target=../../lib/llib-lxml2.ln
-
-license libxml2.license license="libxml license"
-
-legacy pkg=SUNWlxml \
-    name="The XML library" \
-    desc="The XML library"
-legacy pkg=SUNWlxml-devel \
-    name="The XML library - developer files" \
-    desc="The XML library - developer files"
-legacy pkg=SUNWlxmlr \
-    name="The XML library (Root)" \
-    desc="The XML library (Root)"