7016734 move pz7ip from sfw to userland
authorDanek Duvall <danek.duvall@oracle.com>
Wed, 16 Mar 2011 13:33:17 -0700
changeset 138 089c2065503f
parent 137 6fb20db3eee4
child 139 5ae244456983
7016734 move pz7ip from sfw to userland
components/p7zip/Makefile
components/p7zip/SUNWp7zip.p5m
components/p7zip/gpl_disclaimer
components/p7zip/makefile.solaris
components/p7zip/p7zip.p5m
components/p7zip/patches/man.patch
components/p7zip/patches/plugindir.patch
make-rules/justmake.mk
make-rules/shared-macros.mk
transforms/docs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/Makefile	Wed Mar 16 13:33:17 2011 -0700
@@ -0,0 +1,77 @@
+#
+# 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.
+#
+
+include ../../make-rules/shared-macros.mk
+include ../../make-rules/shared-targets.mk
+
+COMPONENT_NAME=		p7zip
+COMPONENT_VERSION=	4.55
+COMPONENT_SRC=		$(COMPONENT_NAME)_$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC)_src_all.tar.bz2
+COMPONENT_ARCHIVE_HASH=	sha1:7dd6f75c031f15f3d379af3e208e2e4d65f55bb7
+COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/project/p7zip/p7zip/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/justmake.mk
+include ../../make-rules/ips.mk
+
+PKG_PROTO_DIRS += $(SOURCE_DIR)
+
+COMPONENT_PREP_ACTION = (cd $(@D); cp ../makefile.solaris makefile.machine)
+COMPONENT_BUILD_TARGETS = all3
+COMPONENT_INSTALL_ARGS += DEST_HOME=/usr DEST_DIR=$(PROTO_DIR)
+
+$(SOURCE_DIR)/DOCS/copying.txt $(SOURCE_DIR)/DOCS/unRarLicense.txt: prep
+
+$(BUILD_DIR)/%: $(SOURCE_DIR)/DOCS/%
+	$(CP) $< [email protected]
+
+$(BUILD_DIR)/copying.txt: $(SOURCE_DIR)/DOCS/copying.txt gpl_disclaimer
+	$(CP) gpl_disclaimer [email protected]
+	echo "================================================================================" >> [email protected]
+	cat $(SOURCE_DIR)/DOCS/copying.txt >> [email protected]
+
+# common targets
+build:		$(BUILD_32)
+
+EXTRATARGETS = \
+	$(BUILD_DIR)/copying.txt $(BUILD_DIR)/unRarLicense.txt
+
+install:	build $(INSTALL_32) $(EXTRATARGETS)
+
+# When p7zip's install target is run, it creates all its directories mode 555,
+# so they're impossible to remove without adding the write bit first.
+COMPONENT_POST_INSTALL_ACTION += $(CHMOD) -R u+w $(PROTO_DIR)
+
+# build does this always
+test:
+	cd $(BUILD_DIR_32) && $(MAKE) -e test P7ZIP_HOME_DIR=$(BUILD_DIR_32)/bin
+	cd $(BUILD_DIR_32) && $(MAKE) -e test_7z P7ZIP_HOME_DIR=$(BUILD_DIR_32)/bin
+	cd $(BUILD_DIR_32) && $(MAKE) -e test_7zr P7ZIP_HOME_DIR=$(BUILD_DIR_32)/bin
+
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/SUNWp7zip.p5m	Wed Mar 16 13:33:17 2011 -0700
@@ -0,0 +1,29 @@
+#
+# 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=compress/[email protected] type=require
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/gpl_disclaimer	Wed Mar 16 13:33:17 2011 -0700
@@ -0,0 +1,8 @@
+Oracle elects to use only the GNU Lesser General Public License version
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
+where a choice of LGPL/GPL license versions are made available with the
+language indicating that LGPLv2.1/GPLv2 or any later version may be
+used, or where a choice of which version of the LGPL/GPL is applied is
+unspecified.  Unless specifically stated otherwise, where a choice
+exists between another license and either the GPL or the LGPL, Oracle
+chooses the other license.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/makefile.solaris	Wed Mar 16 13:33:17 2011 -0700
@@ -0,0 +1,49 @@
+#
+# 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.
+#
+
+OPTFLAGS=-O
+
+LFS_CFLAGS = $(shell getconf LFS_CFLAGS)
+
+ALLFLAGS=${OPTFLAGS} -s -mt \
+        -DHAVE_LONG_LONG \
+        $(LFS_CFLAGS) \
+        -DENV_UNIX \
+        -DNDEBUG -D_REENTRANT \
+        $(LOCAL_FLAGS)
+
+CXX=CC $(ALLFLAGS)
+CC=cc $(ALLFLAGS)
+CC_SHARED=-KPIC
+LINK_SHARED=-KPIC -G
+LDFLAGS = -norunpath
+
+LOCAL_LIBS=-lpthread
+LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+
+../../../../bin/Codecs/Rar29.so ../../../../bin/7z.so : LOCAL_LIBS += -lCrun
+
+OBJ_CRC32=$(OBJ_CRC32_C)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/p7zip.p5m	Wed Mar 16 13:33:17 2011 -0700
@@ -0,0 +1,106 @@
+# 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:/compress/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The p7zip compression and archiving utility"
+set name=pkg.description value="P7zip is a unix port of the 7-Zip utility.  It has support for numerous compression algorithms, including LZMA and LZMA2, as well as for various archive and compression file formats, including 7z, xz, bzip2, gzip, tar, zip (read-write) and cab, cpio, deb, lzh, rar, and rpm (read-only)."
+set name=info.classification value=org.opensolaris.category.2008:System/Core
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://p7zip.sourceforge.net/
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+dir path=usr/lib/7z
+dir path=usr/lib/7z/Codecs
+dir path=usr/share/doc/p7zip
+dir path=usr/share/doc/p7zip/DOCS
+dir path=usr/share/doc/p7zip/DOCS/MANUAL
+dir path=usr/share/doc/p7zip/DOCS/MANUAL/commands
+dir path=usr/share/doc/p7zip/DOCS/MANUAL/switches
+dir path=usr/share/man/man1
+file usr/lib/p7zip/7z path=usr/bin/7z
+file usr/lib/p7zip/7za path=usr/bin/7za
+file usr/lib/p7zip/7zr path=usr/bin/7zr
+file contrib/gzip-like_CLI_wrapper_for_7z/p7zip path=usr/bin/p7zip
+file usr/lib/p7zip/7z.so path=usr/lib/7z/7z.so
+file usr/lib/p7zip/Codecs/Rar29.so path=usr/lib/7z/Codecs/Rar29.so
+file path=usr/share/doc/p7zip/ChangeLog
+file path=usr/share/doc/p7zip/DOCS/7zC.txt
+file path=usr/share/doc/p7zip/DOCS/7zFormat.txt
+file path=usr/share/doc/p7zip/DOCS/License.txt
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/add.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/index.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/list.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/style.css
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/test.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/commands/update.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/index.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/style.css
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/include.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/index.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/large_pages.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/method.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/password.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/style.css
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/type.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/update.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm
+file path=usr/share/doc/p7zip/DOCS/MANUAL/syntax.htm
+file path=usr/share/doc/p7zip/DOCS/Methods.txt
+file path=usr/share/doc/p7zip/DOCS/copying.txt
+file path=usr/share/doc/p7zip/DOCS/history.txt
+file path=usr/share/doc/p7zip/DOCS/lzma.txt
+file path=usr/share/doc/p7zip/DOCS/readme.txt
+file path=usr/share/doc/p7zip/DOCS/unRarLicense.txt
+file path=usr/share/doc/p7zip/README
+file usr/man/man1/7z.1 path=usr/share/man/man1/7z.1
+file usr/man/man1/7za.1 path=usr/share/man/man1/7za.1
+file usr/man/man1/7zr.1 path=usr/share/man/man1/7zr.1
+file contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 path=usr/share/man/man1/p7zip.1
+
+legacy pkg=SUNWp7zip desc="The p7zip compression and archiving utility" \
+    name="The p7zip compression and archiving utility"
+
+license copying.txt license=LGPLv2.1+
+license unRarLicense.txt license=unRAR
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/patches/man.patch	Wed Mar 16 13:33:17 2011 -0700
@@ -0,0 +1,131 @@
+--- p7zip_4.55/man1/7z.1	Sat Apr 21 02:06:20 2007
++++ p7zip_4.55/man1/7z.1	Wed Mar 16 13:09:27 2011
[email protected]@ -1,3 +1,4 @@
++'\" t
+ .TH P7ZIP 1 "September 1 2006" "Mohammed Adnene Trojette"
+ .SH NAME
+ 7-Zip - A file archiver with highest compression ratio
[email protected]@ -167,7 +168,25 @@
+ .SH "SEE ALSO"
+ .BR 7za (1)
+ .BR 7zr (1)
+-.BR HTML Help ( {DEST_SHARE_DOC}/MANUAL/index.htm )
++.BR HTML Help ( /usr/share/doc/p7zip/DOCS/MANUAL/index.htm )
+ .SH AUTHOR
+ .TP
+ Written for Debian by Mohammed Adnene Trojette.
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	compress/p7zip
++=
++Interface Stability	Uncommitted
++.TE
++.PP
++.SH NOTES
++Source for p7zip is available on http://opensolaris.org.
+--- p7zip_4.55/man1/7za.1	Sat Apr 21 02:06:20 2007
++++ p7zip_4.55/man1/7za.1	Wed Mar 16 13:09:30 2011
[email protected]@ -1,3 +1,4 @@
++'\" t
+ .TH P7ZIP 1 "September 1 2006" "Mohammed Adnene Trojette"
+ .SH NAME
+ 7-Zip - A file archiver with highest compression ratio
[email protected]@ -167,7 +168,25 @@
+ .SH "SEE ALSO"
+ .BR 7z (1)
+ .BR 7zr (1)
+-.BR HTML Help ( {DEST_SHARE_DOC}/MANUAL/index.htm )
++.BR HTML Help ( /usr/share/doc/p7zip/DOCS/MANUAL/index.htm )
+ .SH AUTHOR
+ .TP
+ Written for Debian by Mohammed Adnene Trojette.
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	compress/p7zip
++=
++Interface Stability	Uncommitted
++.TE
++.PP
++.SH NOTES
++Source for p7zip is available on http://opensolaris.org.
+--- p7zip_4.55/man1/7zr.1	Sat Apr 21 02:06:20 2007
++++ p7zip_4.55/man1/7zr.1	Wed Mar 16 13:09:36 2011
[email protected]@ -1,3 +1,4 @@
++'\" t
+ .TH P7ZIP 1 "September 1 2006" "Mohammed Adnene Trojette"
+ .SH NAME
+ 7-Zip - A file archiver with highest compression ratio
[email protected]@ -164,7 +165,25 @@
+ .SH "SEE ALSO"
+ .BR 7z (1)
+ .BR 7za (1)
+-.BR HTML Help ( {DEST_SHARE_DOC}/MANUAL/index.htm )
++.BR HTML Help ( /usr/share/doc/p7zip/DOCS/MANUAL/index.htm )
+ .SH AUTHOR
+ .TP
+ Written for Debian by Mohammed Adnene Trojette.
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	compress/p7zip
++=
++Interface Stability	Uncommitted
++.TE
++.PP
++.SH NOTES
++Source for p7zip is available on http://opensolaris.org.
+--- p7zip_4.55/contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1	Sat Jul 14 14:38:09 2007
++++ p7zip_4.55/contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1	Wed Mar 16 13:09:45 2011
[email protected]@ -1,3 +1,4 @@
++'\" t
+ .TH p7zip 1 "October 31 2004" "Mohammed Adnene Trojette"
+ .SH NAME
+ p7zip \- Wrapper on 7za, a 7-zip file archiver with high compression ratio
[email protected]@ -31,3 +32,21 @@
+ .SH AUTHOR
+ .TP
+ Written for Debian by Mohammed Adnene Trojette.
++.SH ATTRIBUTES
++See
++.BR attributes (5)
++for descriptions of the following attributes:
++.sp
++.TS
++box;
++cbp-1 | cbp-1
++l | l .
++ATTRIBUTE TYPE	ATTRIBUTE VALUE
++=
++Availability	compress/p7zip
++=
++Interface Stability	Uncommitted
++.TE
++.PP
++.SH NOTES
++Source for p7zip is available on http://opensolaris.org.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/p7zip/patches/plugindir.patch	Wed Mar 16 13:33:17 2011 -0700
@@ -0,0 +1,17 @@
+--- p7zip_4.55/CPP/myWindows/mySplitCommandLine.cpp.orig	Sat Apr 21 02:06:20 2007
++++ p7zip_4.55/CPP/myWindows/mySplitCommandLine.cpp	Fri Feb 18 15:34:14 2011
[email protected]@ -14,9 +14,11 @@
+ 
+   { // define P7ZIP_HOME_DIR
+     static char p7zip_home_dir[MAX_PATH];
+-    AString dir,name;
+-    my_windows_split_path(arguments[0],dir,name);
+-    snprintf(p7zip_home_dir,sizeof(p7zip_home_dir),"P7ZIP_HOME_DIR=%s/",(const char *)dir);
++    static char default_path[] = "/usr/lib/7z";
++    char *env;
++    if ((env = getenv("P7ZIP_HOME_DIR")) == NULL)
++      env = default_path;
++    snprintf(p7zip_home_dir,sizeof(p7zip_home_dir),"P7ZIP_HOME_DIR=%s/",env);
+     p7zip_home_dir[sizeof(p7zip_home_dir)-1] = 0;
+     putenv(p7zip_home_dir);
+   }
--- a/make-rules/justmake.mk	Wed Mar 16 13:47:22 2011 -0700
+++ b/make-rules/justmake.mk	Wed Mar 16 13:33:17 2011 -0700
@@ -58,7 +58,7 @@
 	$(CLONEY) $(SOURCE_DIR) $(@D)
 	$(COMPONENT_PRE_BUILD_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_BUILD_ENV) \
-		$(GMAKE) $(COMPONENT_BUILD_TARGETS))
+		$(GMAKE) $(COMPONENT_BUILD_ARGS) $(COMPONENT_BUILD_TARGETS))
 	$(COMPONENT_POST_BUILD_ACTION)
 	$(TOUCH) [email protected]
 
@@ -66,7 +66,7 @@
 $(BUILD_DIR)/%/.installed:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_INSTALL_ACTION)
 	(cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) $(GMAKE) \
-			$(COMPONENT_INSTALL_TARGETS))
+			$(COMPONENT_INSTALL_ARGS) $(COMPONENT_INSTALL_TARGETS))
 	$(COMPONENT_POST_INSTALL_ACTION)
 	$(TOUCH) [email protected]
 
--- a/make-rules/shared-macros.mk	Wed Mar 16 13:47:22 2011 -0700
+++ b/make-rules/shared-macros.mk	Wed Mar 16 13:33:17 2011 -0700
@@ -206,6 +206,7 @@
 SYMLINK =	/bin/ln -s
 ENV =		/usr/bin/env
 INSTALL =	/usr/bin/ginstall
+CHMOD =		/usr/bin/chmod
 
 INS.dir=        $(INSTALL) -d [email protected]
 INS.file=       $(INSTALL) -m 444 $< $(@D)
--- a/transforms/docs	Wed Mar 16 13:47:22 2011 -0700
+++ b/transforms/docs	Wed Mar 16 13:33:17 2011 -0700
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 # man pages
@@ -33,7 +32,7 @@
     default facet.doc.info true>
 
 # html docs
-<transform dir file link hardlink path=usr/.*/doc/.*html.* -> \
+<transform dir file link hardlink path=usr/.*/doc/.*(html?|css).* -> \
     default facet.doc.html true>
 <transform dir file link hardlink path=usr/lib/help/.*\.html$ -> \
     default facet.doc.html true>