--- a/components/fastcgi/Makefile	Mon Mar 21 07:02:04 2011 -0700
+++ b/components/fastcgi/Makefile	Tue Mar 22 10:33:36 2011 -0700
@@ -46,6 +46,7 @@
 CONFIGURE_OPTIONS += CXXFLAGS="$(CFLAGS)"
 
 PKG_PROTO_DIRS +=       $(COMPONENT_DIR)/$(COMPONENT_SRC)
+PUBLISH_TRANSFORMS +=	doc-transform
 
 COMPONENT_POST_BUILD_ACTION = \
          (cd $(@D); $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/fastcgi/SUNWfcgi-doc.p5m	Tue Mar 22 10:33:36 2011 -0700
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=library/fastcgi/[email protected] type=require

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/fastcgi/doc-transform	Tue Mar 22 10:33:36 2011 -0700
@@ -0,0 +1,26 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+# These are not installed, but can be found in the doc directory.
+<transform file path=usr/share/doc/fastcgi/(.+)$ -> \
+	set action.hash doc/%<\1> >

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/fastcgi/fcgi-doc.p5m	Tue Mar 22 10:33:36 2011 -0700
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/library/fastcgi/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="FastCGI - documentation"
+set name=pkg.description value="Documentation for FastCGI application libraries"
+set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=info.upstream_url value=http://www.fastcgi.com
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/fastcgi
+dir path=usr/share/doc/fastcgi/fastcgi-prog-guide
+dir path=usr/share/doc/fastcgi/fastcgi-whitepaper
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/apaman.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch1intra.gif
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ap_guide.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ap_guida.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch1inta1.gif
+file path=usr/share/doc/fastcgi/fastcgi-whitepaper/fastcgi.htm
+file path=usr/share/doc/fastcgi/fastcgi-whitepaper/img00001.gif
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch2c.htm
+file path=usr/share/doc/fastcgi/fastcgi-whitepaper/img00003.gif
+file path=usr/share/doc/fastcgi/fcgi-perf.htm
+file path=usr/share/doc/fastcgi/fcgi-perl.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch3perl.htm
+file path=usr/share/doc/fastcgi/fastcgi-whitepaper/img00002.gif
+file path=usr/share/doc/fastcgi/fcgi-java.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/covera.gif
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch1intro.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch4tcl.htm
+file path=usr/share/doc/fastcgi/fcgi-devel-kit.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/cover.htm
+file path=usr/share/doc/fastcgi/overview.html
+file path=usr/share/doc/fastcgi/fcgi-tcl.htm
+file path=usr/share/doc/fastcgi/omi-logo.gif
+file path=usr/share/doc/fastcgi/www5-api-workshop.html
+
+license fcgi.license license="FastCGI"
+
+legacy pkg=SUNWfcgi-doc \
+	name="FastCGI Application Libraries - Documentation" \
+	desc="Documentation for FastCGI Application Libraries (2.4.0)"

--- a/components/gd2/SUNWgd2.p5m	Mon Mar 21 07:02:04 2011 -0700
+++ b/components/gd2/SUNWgd2.p5m	Tue Mar 22 10:33:36 2011 -0700
@@ -21,7 +21,7 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg://solaris/[email protected],5.11-0.133
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
 set name=pkg.renamed value=true
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 depend fmri=library/[email protected] type=require

--- a/components/libneon/SUNWneon.p5m	Mon Mar 21 07:02:04 2011 -0700
+++ b/components/libneon/SUNWneon.p5m	Tue Mar 22 10:33:36 2011 -0700
@@ -25,7 +25,7 @@
 # Legacy package information for renamed SUNWneon package
 #
 
-set name=pkg.fmri value=pkg://solaris/[email protected],5.11-0.133
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
 set name=pkg.renamed value=true
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 depend fmri=library/[email protected] type=require

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/wireshark/SUNWwireshark.p5m	Tue Mar 22 10:33:36 2011 -0700
@@ -0,0 +1,26 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend fmri=diagnostic/[email protected] type=require