--- a/components/fastcgi/fcgi.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/fastcgi/fcgi.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,19 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/fastcgi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="FastCGI"
-set name=pkg.description value="FastCGI is a high-speed and scalable interface for communicating with the web server"
-set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/fastcgi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="FastCGI is a high-speed and scalable interface for communicating with the web server"
+set name=pkg.summary value=FastCGI
+set name=info.classification \
+    value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.fastcgi.com
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/014
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/bin/$(MACH64)
@@ -39,10 +44,8 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man3
-file path=usr/lib/$(MACH64)/libfcgi.so.0.0.0
-file path=usr/lib/$(MACH64)/llib-lfcgi.ln
-file path=usr/lib/libfcgi.so.0.0.0
-file path=usr/lib/llib-lfcgi.ln
+file path=usr/bin/$(MACH64)/cgi-fcgi
+file path=usr/bin/cgi-fcgi
 file path=usr/include/fastcgi/fastcgi.h
 file path=usr/include/fastcgi/fcgi_config.h
 file path=usr/include/fastcgi/fcgi_stdio.h
@@ -50,22 +53,22 @@
 file path=usr/include/fastcgi/fcgimisc.h
 file path=usr/include/fastcgi/fcgio.h
 file path=usr/include/fastcgi/fcgios.h
+file path=usr/lib/$(MACH64)/libfcgi.so.0.0.0
+file path=usr/lib/$(MACH64)/llib-lfcgi.ln
+file path=usr/lib/libfcgi.so.0.0.0
 file llib-lfcgi path=usr/lib/llib-lfcgi
+file path=usr/lib/llib-lfcgi.ln
 file doc/cgi-fcgi.1 path=usr/share/man/man1/cgi-fcgi.1
 file doc/FCGI_Accept.3 path=usr/share/man/man3/FCGI_Accept.3
 file doc/FCGI_Finish.3 path=usr/share/man/man3/FCGI_Finish.3
 file doc/FCGI_SetExitStatus.3 path=usr/share/man/man3/FCGI_SetExitStatus.3
 file doc/FCGI_StartFilterData.3 path=usr/share/man/man3/FCGI_StartFilterData.3
-file path=usr/bin/$(MACH64)/cgi-fcgi
-file path=usr/bin/cgi-fcgi
+legacy pkg=SUNWfcgi \
+    desc="FastCGI is a high-speed and scalable interface for communicating with the web server (2.4.0)" \
+    name="FastCGI - fcgi Application Libraries (2.4.0)"
+license fcgi.license license=FastCGI
+link path=usr/lib/$(MACH64)/libfcgi.so target=libfcgi.so.0.0.0
+link path=usr/lib/$(MACH64)/libfcgi.so.0 target=libfcgi.so.0.0.0
 link path=usr/lib/libfcgi.so target=libfcgi.so.0.0.0
 link path=usr/lib/libfcgi.so.0 target=libfcgi.so.0.0.0
-link path=usr/lib/$(MACH64)/libfcgi.so.0 target=libfcgi.so.0.0.0
-link path=usr/lib/$(MACH64)/libfcgi.so target=libfcgi.so.0.0.0
 
-license fcgi.license license="FastCGI"
-
-legacy  pkg=SUNWfcgi \
-        name="FastCGI - fcgi Application Libraries (2.4.0)" \
-        desc="FastCGI is a high-speed and scalable interface for communicating with the web server (2.4.0)"
-