--- a/components/lcms/lcms.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/lcms/lcms.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,12 +20,18 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="A small-footprint color management engine, with special focus on accuracy and performance"
 set name=pkg.summary value="The Little Color Management System"
-set name=pkg.description value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.littlecms.com/"
+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.littlecms.com/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/071
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
@@ -34,8 +40,8 @@
 dir path=usr/include/lcms
 dir path=usr/lib
 dir path=usr/lib/$(MACH64)
+dir path=usr/lib/$(MACH64)/pkgconfig
 dir path=usr/lib/pkgconfig
-dir path=usr/lib/$(MACH64)/pkgconfig
 dir path=usr/lib/python2.6
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/64
@@ -53,33 +59,32 @@
 file path=usr/bin/tiffdiff
 file path=usr/bin/tifficc
 file path=usr/bin/wtpt
+file path=usr/include/lcms/icc34.h
 file path=usr/include/lcms/lcms.h
-file path=usr/include/lcms/icc34.h
+file path=usr/lib/$(MACH64)/liblcms.so.1.0.19
+file path=usr/lib/$(MACH64)/llib-llcms.ln
+file path=usr/lib/$(MACH64)/pkgconfig/lcms.pc
 file path=usr/lib/liblcms.so.1.0.19
-file path=usr/lib/$(MACH64)/liblcms.so.1.0.19
 file path=usr/lib/llib-llcms
 file path=usr/lib/llib-llcms.ln
-file path=usr/lib/$(MACH64)/llib-llcms.ln
 file path=usr/lib/pkgconfig/lcms.pc
-file path=usr/lib/$(MACH64)/pkgconfig/lcms.pc
+file path=usr/lib/python2.6/vendor-packages/64/_lcms.so
 file path=usr/lib/python2.6/vendor-packages/_lcms.so
-file path=usr/lib/python2.6/vendor-packages/64/_lcms.so
 file path=usr/lib/python2.6/vendor-packages/lcms.py
 file path=usr/share/man/man1/icc2ps.1
 file path=usr/share/man/man1/icclink.1
-file path=usr/share/man/man1/icctrans.1
+file samples/icctrans.1 path=usr/share/man/man1/icctrans.1
 file path=usr/share/man/man1/jpegicc.1
 file path=usr/share/man/man1/tifficc.1
 file path=usr/share/man/man1/wtpt.1
 #
-link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
-link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
-link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
-link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
+legacy pkg=SUNWlcms desc="LCMS - Little Color Management System (1.19)" \
+    name="Little Color Management System"
+#
+license lcms.license license=MIT
 #
-license lcms.license license="MIT"
-#
-legacy pkg=SUNWlcms \
-    desc="LCMS - Little Color Management System (1.19)" \
-    name="Little Color Management System"
+link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
+link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19