7003927 userland should postprocess packaged files build-164
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Wed, 13 Apr 2011 09:58:06 -0700
changeset 181 87e11e685b1f
parent 180 4de0581be621
child 182 fa48f2b6c9af
7003927 userland should postprocess packaged files 7034188 userland should have common lint library rules 7034992 userland packages should include opensolaris.arc_url data 7019309 move ghostscript to userland (fix build)
components/a2ps/Makefile
components/a2ps/a2ps.p5m
components/ant/Makefile
components/ant/ant.1.sunman
components/ant/ant.p5m
components/autoconf/Makefile
components/autoconf/autoconf.p5m
components/autogen/Makefile
components/autogen/autogen.p5m
components/automake/automake-1.10/Makefile
components/automake/automake-1.10/automake.p5m
components/automake/automake-1.9.6/Makefile
components/automake/automake-1.9.6/automake.p5m
components/bash/Makefile
components/bash/Solaris/rbash.1
components/bash/bash.p5m
components/bash/oracleman-stability
components/bison/Makefile
components/bison/bison-runtime.p5m
components/bison/bison.p5m
components/bzip2/Makefile
components/bzip2/bzip2.p5m
components/bzip2/manpages/bzdiff.1
components/bzip2/manpages/bzgrep.1
components/bzip2/manpages/bzip2.1
components/bzip2/manpages/bzmore.1
components/bzip2/manpages/libbz2.3
components/coreutils/Makefile
components/coreutils/coreutils.p5m
components/coreutils/oracleman-stability
components/curl/Makefile
components/curl/curl.p5m
components/curl/oracleman-stability
components/cvs/Makefile
components/cvs/cvs.p5m
components/cvs/solarisman-stability
components/diffutils/Makefile
components/diffutils/diffutils.p5m
components/elinks/Makefile
components/elinks/elinks.p5m
components/elinks/oracleman-stability
components/emacs/Makefile
components/emacs/gnu-emacs-gtk.p5m
components/emacs/gnu-emacs-lisp.p5m
components/emacs/gnu-emacs-no-x11.p5m
components/emacs/gnu-emacs-x11.p5m
components/emacs/gnu-emacs.p5m
components/emacs/tools/solman.pl
components/fastcgi/Makefile
components/fastcgi/doc-transform
components/fastcgi/fcgi-doc.p5m
components/fastcgi/fcgi.p5m
components/gawk/Makefile
components/gawk/gawk.p5m
components/gawk/oracleman-stability
components/gawk/patches/gawk_manpage1.patch
components/gawk/patches/igawk_manpage1.patch
components/gd2/Makefile
components/gd2/Solaris/libgd2.1
components/gd2/Solaris/libgd2.3
components/gd2/gd2.p5m
components/gettext/Makefile
components/gettext/gettext.p5m
components/ggrep/Makefile
components/ggrep/gnu-grep.p5m
components/ghostscript/Makefile
components/ghostscript/ghostscript.p5m
components/git/Makefile
components/git/git.p5m
components/git/solarisman-stability
components/gnu-gs-fonts-other/Makefile
components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
components/gnu-gs-fonts-std/Makefile
components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
components/gperf/Makefile
components/gperf/gperf.p5m
components/gperf/solarisman-stability
components/gtar/Makefile
components/gtar/gtar.1.sunman
components/gtar/gtar.p5m
components/guile/guile-config.1
components/guile/guile-snarf.1
components/guile/guile-tools.1
components/guile/guile.1
components/guile/guile.p5m
components/gutenprint/Makefile
components/gutenprint/gutenprint.p5m
components/gzip/Makefile
components/gzip/gzip.p5m
components/hal-cups-utils/Makefile
components/hal-cups-utils/hal-cups-utils.5
components/hal-cups-utils/hal-cups-utils.p5m
components/hplip/Makefile
components/hplip/hplip.p5m
components/ilmbase/Makefile
components/ilmbase/Solaris/libilmbase.3lib
components/ilmbase/ilmbase.p5m
components/imagemagick/Makefile
components/imagemagick/imagemagick.p5m
components/lcms/Makefile
components/lcms/lcms.p5m
components/lcms/oracleman-stability
components/less/Makefile
components/less/less.p5m
components/libneon/Makefile
components/libneon/libneon.p5m
components/libneon/oracleman-stability
components/libsigsegv/Makefile
components/libsigsegv/libsigsegv.p5m
components/libsigsegv/man3/sigsegv.3
components/libsigsegv/man3/sigsegv_install_handler.3
components/libsigsegv/man3/sigsegv_register.3
components/libsigsegv/man3/stackoverflow_install_handler.3
components/libtool/Makefile
components/libtool/libltdl.p5m
components/libtool/libtool.1
components/libtool/libtool.p5m
components/libtool/libtoolize.1
components/libxml2/Makefile
components/libxml2/libxml.3
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2.p5m
components/libxml2/xmlcatalog.1
components/libxml2/xmllint.1
components/libxslt/Makefile
components/libxslt/libxsl-26.p5m
components/libxslt/libxslt.3
components/libxslt/libxslt.p5m
components/libxslt/xslt-config.1
components/libxslt/xsltproc.1
components/logilab-astng/Makefile
components/logilab-astng/logilab-astng.3
components/logilab-astng/logilab-astng.p5m
components/logilab-common/Makefile
components/logilab-common/logilab-common.3
components/logilab-common/logilab-common.p5m
components/lua/Makefile
components/lua/lua.p5m
components/m4/Makefile
components/m4/m4.p5m
components/make/Makefile
components/make/make.p5m
components/mercurial/Makefile
components/mercurial/demo-transform
components/mercurial/mercurial.p5m
components/mercurial/patches/manpages.patch
components/nmap/Makefile
components/nmap/nmap.p5m
components/nmap/oracleman-stability
components/ntp/Makefile
components/ntp/manpages/ntp-keygen.1m
components/ntp/manpages/ntp.conf.4
components/ntp/manpages/ntpd.1m
components/ntp/manpages/ntpdate.1m
components/ntp/manpages/ntpdc.1m
components/ntp/manpages/ntpq.1m
components/ntp/manpages/ntprc.4
components/ntp/manpages/ntptime.1m
components/ntp/manpages/ntptrace.1m
components/ntp/ntp.p5m
components/openexr/Makefile
components/openexr/Solaris/exrenvmap.1
components/openexr/Solaris/exrheader.1
components/openexr/Solaris/exrmakepreview.1
components/openexr/Solaris/exrmaketiled.1
components/openexr/Solaris/exrstdattr.1
components/openexr/Solaris/libopenexr.3lib
components/openexr/openexr.p5m
components/p7zip/Makefile
components/p7zip/p7zip.p5m
components/p7zip/patches/man.patch
components/patch/Makefile
components/patch/patch.p5m
components/perl512/Makefile
components/perl512/perl-512.p5m
components/perl_modules/DBI/DBI.p5m
components/psutils/Makefile
components/psutils/psutils.p5m
components/pwgen/Makefile
components/pwgen/pwgen.1.oracleman-stability
components/pwgen/pwgen.p5m
components/python/pyopenssl/Makefile
components/python/pyopenssl/pyopenssl-26.p5m
components/python/python26/Makefile
components/python/python26/python-26.p5m
components/readline/Makefile
components/readline/oracleman-stability
components/readline/patches/history.3.patch
components/readline/readline.p5m
components/screen/Makefile
components/screen/screen.p5m
components/sed/Makefile
components/sed/sed.p5m
components/slib/Makefile
components/slib/slib.p5m
components/slib/solarisman-stability
components/squid/Makefile
components/squid/oracleman-stability
components/squid/squid.p5m
components/swig/Makefile
components/swig/swig.1
components/swig/swig.p5m
components/tcl/tcl/Makefile
components/tcl/tcl/files/libtcl.3
components/tcl/tcl/oracleman-stability
components/tcl/tcl/patches/1.man.patch
components/tcl/tcl/tcl.p5m
components/tcpdump/Makefile
components/tcpdump/tcpdump.p5m
components/tcsh/Makefile
components/tcsh/manpages/tcsh.1
components/tcsh/tcsh.p5m
components/tomcat/tomcat-examples.p5m
components/tomcat/tomcat.p5m
components/top/Makefile
components/top/top.p5m
components/wget/Makefile
components/wget/wget.p5m
components/which/Makefile
components/which/oracleman-stability
components/which/which.p5m
components/wireshark/Makefile
components/wireshark/wireshark.p5m
components/zip/Makefile
components/zip/oracleman-stability
components/zip/zip.p5m
components/zsh/Makefile
components/zsh/zsh.p5m
doc/packaging.txt
make-rules/configure.mk
make-rules/ips.mk
make-rules/justmake.mk
make-rules/lint-libraries.mk
make-rules/setup.py.mk
make-rules/shared-macros.mk
tools/man-stability
tools/python/pkglint/userland.py
tools/userland-mangler
--- a/components/a2ps/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/a2ps/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -55,28 +55,12 @@
 	     ln -s $$sheet ; \
 	 done)
 
-SFWPROGS =	a2ps card composeglyphs fixnt fixps ogonkify pdiff psmandup \
-		psset texi2dvi4a2ps
-
-PROTOETCLPFD = $(PROTO_DIR)/etc/lp/fd
-FILTERDEFS =	a2ps.fd
-PROTOFILTERDEFS = $(FILTERDEFS:%=$(PROTOETCLPFD)/%)
-
-$(PROTOFILTERDEFS):	$(PROTOETCLPFD)
-	$(INSTALL) -m 444 $(@F) $(@D)
-
-$(PROTOETCLPFD):	$(INSTALL_32)
-	$(MKDIR) $@
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) $(PROTOFILTERDEFS) $(PROTOSFWLINKS)
+install:	$(INSTALL_32)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/a2ps/a2ps.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/a2ps/a2ps.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,21 @@
 #
 # Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/print/lp/filter/a2ps@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU a2ps - 'Anything to PostScript' converter and pretty printer"
-set name=pkg.description value="GNU a2ps converts files into PostScript for printing or viewing."
-set name=info.classification value="org.opensolaris.category.2008:System/Printing"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/print/lp/filter/a2ps@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="GNU a2ps converts files into PostScript for printing or viewing."
+set name=pkg.summary \
+    value="GNU a2ps - 'Anything to PostScript' converter and pretty printer"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Printing
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.gnu.org/software/a2ps/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2004/262
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=etc
 dir path=etc/gnu
 dir path=etc/lp
@@ -89,9 +96,11 @@
 dir path=usr/share/ogonkify
 dir path=usr/share/ogonkify/afm
 dir path=usr/share/ogonkify/fonts
-file path=etc/gnu/a2ps-site.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps-site.cfg
-file path=etc/gnu/a2ps.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps.cfg
-file path=etc/lp/fd/a2ps.fd
+file path=etc/gnu/a2ps-site.cfg mode=0644 \
+    original_name=SUNWa2ps:etc/gnu/a2ps-site.cfg preserve=true
+file path=etc/gnu/a2ps.cfg mode=0644 original_name=SUNWa2ps:etc/gnu/a2ps.cfg \
+    preserve=true
+file a2ps.fd path=etc/lp/fd/a2ps.fd
 file path=usr/bin/a2ps
 file path=usr/bin/card
 file path=usr/bin/composeglyphs
@@ -104,16 +113,6 @@
 file path=usr/bin/texi2dvi4a2ps
 file path=usr/include/liba2ps.h
 file path=usr/lib/liba2ps.so.1.0.0
-link path=usr/sfw/bin/a2ps target=../../bin/a2ps
-link path=usr/sfw/bin/card target=../../bin/card
-link path=usr/sfw/bin/composeglyphs target=../../bin/composeglyphs
-link path=usr/sfw/bin/fixnt target=../../bin/fixnt
-link path=usr/sfw/bin/fixps target=../../bin/fixps
-link path=usr/sfw/bin/ogonkify target=../../bin/ogonkify
-link path=usr/sfw/bin/pdiff target=../../bin/pdiff
-link path=usr/sfw/bin/psmandup target=../../bin/psmandup
-link path=usr/sfw/bin/psset target=../../bin/psset
-link path=usr/sfw/bin/texi2dvi4a2ps target=../../bin/texi2dvi4a2ps
 file path=usr/share/a2ps/README
 file path=usr/share/a2ps/afm/fonts.map
 file path=usr/share/a2ps/afm/make_fonts_map.sh mode=0555
@@ -382,15 +381,20 @@
 file path=usr/share/ogonkify/ptmbi-o.ps
 file path=usr/share/ogonkify/ptmr-o.ps
 file path=usr/share/ogonkify/ptmri-o.ps
+legacy pkg=SUNWa2psr desc="a2ps - GNU Any to PostScript filter (root) 4.13b" \
+    name="a2ps - GNU Any to PostScript filter (root)"
+legacy pkg=SUNWa2psu desc="a2ps - GNU Any to PostScript filter (usr) 4.13b" \
+    name="a2ps - GNU Any to PostScript filter (usr)"
+license a2ps.license license=GPLv2
 link path=usr/lib/liba2ps.so target=liba2ps.so.1.0.0
 link path=usr/lib/liba2ps.so.1 target=liba2ps.so.1.0.0
-
-license a2ps.license license="GPLv2"
-
-legacy	pkg=SUNWa2psr \
-	name="a2ps - GNU Any to PostScript filter (root)" \
-	desc="a2ps - GNU Any to PostScript filter (root) 4.13b"
-
-legacy	pkg=SUNWa2psu \
-	name="a2ps - GNU Any to PostScript filter (usr)" \
-	desc="a2ps - GNU Any to PostScript filter (usr) 4.13b"
+link path=usr/sfw/bin/a2ps target=../../bin/a2ps
+link path=usr/sfw/bin/card target=../../bin/card
+link path=usr/sfw/bin/composeglyphs target=../../bin/composeglyphs
+link path=usr/sfw/bin/fixnt target=../../bin/fixnt
+link path=usr/sfw/bin/fixps target=../../bin/fixps
+link path=usr/sfw/bin/ogonkify target=../../bin/ogonkify
+link path=usr/sfw/bin/pdiff target=../../bin/pdiff
+link path=usr/sfw/bin/psmandup target=../../bin/psmandup
+link path=usr/sfw/bin/psset target=../../bin/psset
+link path=usr/sfw/bin/texi2dvi4a2ps target=../../bin/texi2dvi4a2ps
--- a/components/ant/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ant/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -55,19 +55,14 @@
 COMPONENT_INSTALL_TARGETS =	dist
 COMPONENT_INSTALL_ENV +=	$(ANT_ENV)
 
-include ../../make-rules/shared-targets.mk
-
-MAN1FILES=ant.1 
-
-$(PROTOMAN1FILES): $(PROTOUSRSHAREMAN1DIR)
-	$(CP) $(COMPONENT_DIR)/$(@F).sunman $@ 
+COMPONENT_TEST_TARGETS =	test
+COMPONENT_TEST_ENV +=		$(ANT_ENV)
 
 build:	$(BUILD_32)
 
-install: $(INSTALL_32) $(PROTOMAN1FILES)
+install: $(INSTALL_32)
 
-test:  build
-	@cd $(BUILD_DIR_32); $(ENV) $(ANT_ENV) ./build.sh test
+test:  $(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/ant/ant.1.sunman	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ant/ant.1.sunman	Wed Apr 13 09:58:06 2011 -0700
@@ -1,5 +1,3 @@
-'\" t
-.\" ident	"@(#)ant.1.sunman	1.4	10/03/16 SMI"
 .\"
 .\" This man page created by Oracle to provide a reference to the html
 .\" for Apache Ant provided with the ant distribution.
@@ -24,20 +22,3 @@
 $HOME/.antrc
 Optional per-user environment file
 .PD
-.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	developer/build/ant
-=
-Interface Stability	Uncommitted
-.TE
-.SH NOTES
-Source for ant is available on http://opensolaris.org.
--- a/components/ant/ant.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ant/ant.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/ant@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Apache Ant"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/developer/build/ant@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="Apache Ant is a Java-based build tool"
-set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
-set name=info.upstream_url value=http://ant.apache.org
+set name=pkg.summary value="Apache Ant"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Distribution Tools"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://ant.apache.org
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2002/232
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/sfw
@@ -70,50 +74,87 @@
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors
-dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector
+dir \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util
 dir path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend
@@ -400,1181 +441,2291 @@
 file path=usr/share/doc/ant/manual/api/help-doc.html
 file path=usr/share/doc/ant/manual/api/index-all.html
 file path=usr/share/doc/ant/manual/api/index.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntClassLoader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntTypeDefinition.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntClassLoader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/AntTypeDefinition.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildEvent.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildListener.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/BuildLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ComponentHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ComponentHelper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DefaultLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DemuxInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DemuxOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DemuxInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DemuxOutputStream.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Diagnostics.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DirectoryScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicAttributeNS.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicConfigurator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicConfiguratorNS.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElementNS.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DirectoryScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicAttributeNS.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicConfigurator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicConfiguratorNS.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/DynamicElementNS.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Executor.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ExitException.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ExitStatusException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ExitStatusException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/FileScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/IntrospectionHelper.Creator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/IntrospectionHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/IntrospectionHelper.Creator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/IntrospectionHelper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Location.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/MagicNames.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Main.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/NoBannerLogger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/NoBannerLogger.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/PathTokenizer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Project.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ProjectComponent.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ProjectComponent.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/ProjectHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/PropertyHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/RuntimeConfigurable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/SubBuildListener.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/PropertyHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/RuntimeConfigurable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/SubBuildListener.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Target.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/Task.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/TaskAdapter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/TaskContainer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/TypeAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnknownElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnsupportedAttributeException.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnsupportedElementException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnknownElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnsupportedAttributeException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/UnsupportedElementException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/XmlLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/Dispatchable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/BaseFilterReader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/BaseParamFilterReader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ChainableReader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ClassConstants.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ConcatFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/EscapeUnicode.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ExpandProperties.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/FixCrLfFilter.AddAsisRemove.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/FixCrLfFilter.CrLf.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/FixCrLfFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/HeadFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/LineContains.Contains.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/LineContains.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/LineContainsRegExp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/PrefixLines.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ReplaceTokens.Token.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ReplaceTokens.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StringInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripJavaComments.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripLineBreaks.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripLineComments.Comment.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripLineComments.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TabsToSpaces.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TailFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ChainableReaderFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ContainsRegex.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ContainsString.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.DeleteCharacters.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.FileTokenizer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.Filter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.IgnoreBlank.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ReplaceRegex.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ReplaceString.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.StringTokenizer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.Trim.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/AntXMLContext.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/DefaultExecutor.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/IgnoreDependenciesExecutor.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.AntHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.ElementHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.MainHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.ProjectHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.RootHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.TargetHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelperImpl.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/SingleCheckExecutor.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/DefaultInputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/GreedyInputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/InputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/InputRequest.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/MultipleChoiceInputRequest.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/PropertyFileInputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/SecureInputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/AntMain.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/LaunchException.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/Launcher.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/Locator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/AnsiColorLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/BigProjectLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/CommonsLoggingListener.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/Log4jListener.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/MailLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/TimestampedLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/AntClassLoader2.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/DispatchUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/Dispatchable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/dispatch/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/BaseFilterReader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/BaseParamFilterReader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ChainableReader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ClassConstants.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ConcatFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/EscapeUnicode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ExpandProperties.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/FixCrLfFilter.AddAsisRemove.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/FixCrLfFilter.CrLf.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/FixCrLfFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/HeadFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/LineContains.Contains.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/LineContains.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/LineContainsRegExp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/PrefixLines.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ReplaceTokens.Token.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/ReplaceTokens.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StringInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripJavaComments.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripLineBreaks.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripLineComments.Comment.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/StripLineComments.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TabsToSpaces.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TailFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ChainableReaderFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ContainsRegex.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ContainsString.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.DeleteCharacters.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.FileTokenizer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.Filter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.IgnoreBlank.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ReplaceRegex.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.ReplaceString.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.StringTokenizer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.Trim.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/TokenFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/ChainReaderHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/JavaClassHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/filters/util/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/AntXMLContext.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/DefaultExecutor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/IgnoreDependenciesExecutor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.AntHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.ElementHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.MainHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.ProjectHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.RootHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.TargetHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelper2.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/ProjectHelperImpl.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/SingleCheckExecutor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/helper/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/DefaultInputHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/GreedyInputHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/InputHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/InputRequest.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/MultipleChoiceInputRequest.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/PropertyFileInputHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/SecureInputHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/input/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/AntMain.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/LaunchException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/Launcher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/Locator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/launch/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/AnsiColorLogger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/BigProjectLogger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/CommonsLoggingListener.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/Log4jListener.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/MailLogger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/TimestampedLogger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/listener/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/AntClassLoader2.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/loader/package-tree.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.Reference.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.TargetElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractCvsTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.Reference.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.TargetElement.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Ant.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AntStructure.StructurePrinter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AntStructure.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Antlib.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AntlibDefinition.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.Option.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AntStructure.StructurePrinter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AntStructure.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Antlib.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/AntlibDefinition.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.Option.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Apt.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Available.FileDir.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Available.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/BUnzip2.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/BZip2.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Basename.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/BuildNumber.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CVSPass.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CallTarget.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Checksum.FormatElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Checksum.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Chmod.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Classloader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.TextElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ConditionTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Available.FileDir.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Available.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/BUnzip2.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/BZip2.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Basename.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/BuildNumber.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CVSPass.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CallTarget.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Checksum.FormatElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Checksum.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Chmod.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Classloader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.TextElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Concat.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ConditionTask.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Copy.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CopyPath.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Copydir.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Copyfile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/CopyPath.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Copydir.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Copyfile.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Cvs.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DefBase.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DefaultExcludes.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Definer.Format.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Definer.OnError.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Definer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Delete.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Deltree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DependSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DiagnosticsTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Dirname.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DefBase.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DefaultExcludes.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Definer.Format.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Definer.OnError.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Definer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Delete.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Deltree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DependSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/DiagnosticsTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Dirname.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Ear.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Echo.EchoLevel.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Echo.EchoLevel.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Echo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/EchoXML.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/EchoXML.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Exec.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Execute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteJava.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.FileDirBoth.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteWatchdog.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Execute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteJava.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.FileDirBoth.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteOn.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ExecuteWatchdog.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Exit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Expand.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Filter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.AddAsisRemove.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.CrLf.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.OneLiner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GUnzip.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Expand.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Filter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.AddAsisRemove.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.CrLf.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.OneLiner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/FixCRLF.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GUnzip.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GZip.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DistinguishedName.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DnameParam.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.Base64Converter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.DownloadProgress.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.NullProgress.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.VerboseProgress.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DistinguishedName.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.DnameParam.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/GenerateKey.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.Base64Converter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.DownloadProgress.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.NullProgress.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.VerboseProgress.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Get.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ImportTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Input.Handler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Input.HandlerType.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Input.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/JDBCTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Jar.FilesetManifestConfig.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Jar.StrictMode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ImportTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Input.Handler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Input.HandlerType.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Input.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/JDBCTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Jar.FilesetManifestConfig.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Jar.StrictMode.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Jar.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Java.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javac.ImplementationSpecificArgument.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javac.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.AccessType.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletParam.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.ExtensionInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.GroupArgument.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.Html.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.LinkArgument.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.PackageName.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.ResourceCollectionContainer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.SourceFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.TagArgument.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Jikes.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/JikesOutputParser.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/KeySubst.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Length.FileMode.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Length.When.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Length.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LoadFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LoadProperties.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LoadResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LogStreamHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Attribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.NestedSequential.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.TemplateElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Text.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.Element.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MakeUrl.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Manifest.Attribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Manifest.Section.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Manifest.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestClassPath.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestException.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.Mode.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MatchingTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Mkdir.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javac.ImplementationSpecificArgument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javac.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.AccessType.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.DocletParam.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.ExtensionInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.GroupArgument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.Html.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.LinkArgument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.PackageName.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.ResourceCollectionContainer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.SourceFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.TagArgument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Javadoc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Jikes.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/JikesOutputParser.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/KeySubst.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Length.FileMode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Length.When.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Length.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LoadFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LoadProperties.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LoadResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LogOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/LogStreamHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Attribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.NestedSequential.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.TemplateElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.Text.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroDef.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.Element.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MacroInstance.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MakeUrl.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Manifest.Attribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Manifest.Section.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Manifest.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestClassPath.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.Mode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ManifestTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/MatchingTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Mkdir.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Move.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Nice.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Pack.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Parallel.TaskList.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Parallel.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Patch.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PathConvert.MapEntry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PathConvert.TargetOs.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PathConvert.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.PreSetDefinition.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Property.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PumpStreamHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.ActionChoices.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.VerbosityLevelChoices.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/RecorderEntry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Redirector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Rename.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Replace.NestedString.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Replace.Replacefilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Replace.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ResourceCount.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Retry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Rmic.ImplementationSpecificArgument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Parallel.TaskList.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Parallel.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Patch.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PathConvert.MapEntry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PathConvert.TargetOs.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PathConvert.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.PreSetDefinition.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PreSetDef.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Property.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/PumpStreamHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.ActionChoices.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.VerbosityLevelChoices.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Recorder.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/RecorderEntry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Redirector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Rename.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Replace.NestedString.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Replace.Replacefilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Replace.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/ResourceCount.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Retry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Rmic.ImplementationSpecificArgument.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Rmic.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.DelimiterType.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.OnError.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.Transaction.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SendEmail.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sequential.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SignJar.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sleep.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/StreamPumper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SubAnt.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sync.MyCopy.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sync.SyncTarget.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.DelimiterType.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.OnError.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.Transaction.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SQLExec.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SendEmail.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sequential.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SignJar.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sleep.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/StreamPumper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/SubAnt.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sync.MyCopy.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sync.SyncTarget.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Sync.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.TarCompressionMethod.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.TarFileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.TarLongFileMode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.TarCompressionMethod.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.TarFileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.TarLongFileMode.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tar.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/TaskOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Taskdef.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/TempFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Touch.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Transform.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Truncate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tstamp.CustomFormat.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tstamp.Unit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tstamp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Typedef.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Unpack.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Untar.UntarCompressionMethod.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Untar.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/UpToDate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/VerifyJar.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/WaitFor.Unit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/WaitFor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/TaskOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Taskdef.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/TempFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Touch.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Transform.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Truncate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tstamp.CustomFormat.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tstamp.Unit.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Tstamp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Typedef.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Unpack.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Untar.UntarCompressionMethod.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Untar.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/UpToDate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/VerifyJar.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/WaitFor.Unit.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/WaitFor.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/War.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/WhichResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison2.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison3.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.Attribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XmlProperty.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.ArchiveState.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.WhenEmpty.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/WhichResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison2.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLiaison3.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLogger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTLoggerAware.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.Attribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Factory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.OutputProperty.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.Param.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XSLTProcess.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/XmlProperty.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.ArchiveState.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.Duplicate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.WhenEmpty.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/Zip.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Gcj.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Javac12.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Javac13.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/JavacExternal.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Jikes.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Jvc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Kjc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Sj.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/And.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/AntVersion.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Condition.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ConditionBase.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Contains.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Equals.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/FilesMatch.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/HasMethod.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Http.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFailure.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFalse.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFileSelected.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsReachable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsReference.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsSigned.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsTrue.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Matches.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Not.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Or.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Os.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ParserSupports.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourceContains.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourcesMatch.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Socket.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/TypeFound.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Xor.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsUser.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailAddress.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailTask.Encoding.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/Header.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/Mailer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/Message.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/MimeMailer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ANTLR.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Cab.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.FormatAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.ClassArgument.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Native2Ascii.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.TraceAttr.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.VerboseAttr.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Operation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Type.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Unit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/RenameExtensions.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Rpm.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/SchemaValidate.SchemaLocation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/SchemaValidate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Script.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/StyleBook.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/TraXLiaison.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Attribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Property.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.ValidatorErrorHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/Depend.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.TargetTypes.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.TargetTypes.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.EncodingTypes.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.VisibilityOptions.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Compiler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Schema.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.CMPVersion.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.DTDLocation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.NamingScheme.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.EjbcException.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatability.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Extension.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Specification.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/Translate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/Image.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.FormatAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/jlink.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.WebAppParameter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.Format.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Constants.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeListImpl.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.TypeAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.ForkMode.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.JUnitLogOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.JUnitLogStreamHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.SummaryAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.TestResultHolder.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.JUnitResultFormatterMirror.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.JUnitTestRunnerMirror.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.SummaryJUnitResultFormatterMirror.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/OutErrSummaryJUnitResultFormatter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Action.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPRootFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPSystemType.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Granularity.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.LanguageCode.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/MimeMail.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.AntRExecClient.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.RExecRead.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.RExecSubTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.RExecWrite.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/SetProxy.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.AntTelnetClient.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.TelnetRead.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.TelnetSubTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.TelnetWrite.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.P4SubmitAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.Attribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.NestedElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOS.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.BuildAlert.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/Directory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/Scp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.UnmatchedFileMap.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chown.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Symlink.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.CurrentModUpdated.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.WritableFiles.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.BriefCodediffNofile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/Attrib.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/SunRmic.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/WLRmic.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/XNewRmic.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/AbstractFileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/AntFilterReader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ArchiveFileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ArchiveScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.BaseAssertion.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.DisabledAssertion.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.EnabledAssertion.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Commandline.Argument.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Commandline.Marker.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Commandline.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/CommandlineJava.SysProperties.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/CommandlineJava.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Comparison.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/DTDLocation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/DataType.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Description.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptCompilerAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/AptExternalCompilerAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/CompilerAdapterFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Gcj.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Javac12.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Javac13.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/JavacExternal.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Jikes.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Jvc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Kjc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/Sj.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/compilers/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/And.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/AntVersion.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Condition.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ConditionBase.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Contains.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Equals.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/FilesMatch.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/HasFreeSpace.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/HasMethod.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Http.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFailure.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFalse.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsFileSelected.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsReachable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsReference.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsSigned.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/IsTrue.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Matches.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Not.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Or.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Os.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ParserSupports.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourceContains.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/ResourcesMatch.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Socket.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/TypeFound.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/Xor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/condition/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CVSEntry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/ChangeLogWriter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsTagDiff.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsTagEntry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsUser.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/cvslib/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailAddress.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailTask.Encoding.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/EmailTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/Header.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/Mailer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/Message.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/MimeMailer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/email/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ANTLR.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Cab.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.FormatAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/EchoProperties.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.ClassArgument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Javah.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Native2Ascii.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.TraceAttr.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.VerboseAttr.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/NetRexxC.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Operation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.Type.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Entry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.Unit.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/PropertyFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/RenameExtensions.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Rpm.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/SchemaValidate.SchemaLocation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/SchemaValidate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/Script.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/StyleBook.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/TraXLiaison.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Attribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.Property.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.ValidatorErrorHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheck.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckin.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckinDefault.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCheckout.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMCreateTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/CCMReconfigure.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/Continuus.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ccm/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckin.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCCheckout.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCLock.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkattr.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkbl.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkdir.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMkelem.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklabel.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCMklbtype.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCRmtype.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnCheckout.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCUnlock.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/CCUpdate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/ClearCase.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/clearcase/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/ClassFileUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/Depend.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/DirectoryIterator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/JarFileIterator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ClassCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/ConstantPoolEntry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/DoubleCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FieldRefCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/FloatCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/IntegerCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/InterfaceMethodRefCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/LongCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/MethodRefCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/NameAndTypeCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/StringCPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/Utf8CPInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/constantpool/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/depend/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/CSharp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetBaseMatchingTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.TargetTypes.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetCompile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetDefine.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/DotnetResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.TargetTypes.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ilasm.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.EncodingTypes.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.VisibilityOptions.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/Ildasm.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/ImportTypelib.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/JSharp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/NetCommand.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/VisualBasicCompile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Compiler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.Schema.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/WsdlToDotnet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/dotnet/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/BorlandGenerateClient.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DDCreatorHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/DescriptorHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.CMPVersion.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.DTDLocation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.NamingScheme.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbJar.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/EjbcHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.EjbcException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/IPlanetEjbcTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/InnerClassFilenameFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JbossDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/JonasDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WLStop.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WeblogicTOPLinkDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ejb/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatability.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Compatibility.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/DeweyDecimal.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Extension.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionResolver.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtensionUtil.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/ExtraAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibAvailableTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibDisplayTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibManifestTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/JarLibResolveTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/LibFileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/Specification.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/AntResolver.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/LocationResolver.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/URLResolver.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/extension/resolvers/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/Translate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/i18n/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/Image.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/image/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/AbstractHotDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/GenericHotDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/HotDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/JonasHotDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/ServerDeploy.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/WebLogicHotDeploymentTool.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/j2ee/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javacc/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/JavahAdapterFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/Kaffeh.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/SunJavah.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/javah/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.FormatAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jdepend/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/ClassNameReader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/JlinkTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/jlink.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jlink/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/Jasper41Mangler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.WebAppParameter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspC.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspMangler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/JspNameMangler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/WLJspc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/DefaultJspCompilerAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JasperC.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/JspCompilerAdapterFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/compilers/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/jsp/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.Format.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BaseTest.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/BriefJUnitResultFormatter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Constants.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.NodeListImpl.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/DOMUtil.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Enumerations.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.TypeAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/FormatterElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitResultFormatter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.ForkMode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.JUnitLogOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.JUnitLogStreamHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.SummaryAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.TestResultHolder.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.JUnitResultFormatterMirror.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.JUnitTestRunnerMirror.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.SummaryJUnitResultFormatterMirror.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirror.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskMirrorImpl.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/JUnitVersionHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/OutErrSummaryJUnitResultFormatter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/SummaryJUnitResultFormatter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLConstants.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/Xalan2Executor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/junit/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/KaffeNative2Ascii.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/Native2AsciiAdapterFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/SunNative2Ascii.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/native2ascii/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Action.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.AntFTPRootFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPDirectoryScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.FTPSystemType.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.Granularity.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.LanguageCode.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/FTP.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/MimeMail.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.AntRExecClient.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.RExecRead.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.RExecSubTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.RExecWrite.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/RExecTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/SetProxy.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.AntTelnetClient.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.TelnetRead.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.TelnetSubTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.TelnetWrite.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/net/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Add.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Base.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Change.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Counter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Delete.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Edit.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Fstat.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Handler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4HandlerAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Have.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Integrate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Label.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Labelsync.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4OutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Reopen.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Resolve.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Revert.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.P4SubmitAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Submit.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/P4Sync.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/SimpleP4OutputHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/perforce/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/Pvcs.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/PvcsProject.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/pvcs/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/AntStarTeamCheckOut.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/scm/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.Attribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.NestedElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/ScriptDefBase.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/script/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOS.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckin.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCheckout.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSGet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/SOSLabel.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sos/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.BuildAlert.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/SoundTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/sound/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/SplashTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/splash/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/AbstractSshMessage.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/Directory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/LogListener.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHExec.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/Scp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessageBySftp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessageBySftp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/ssh/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckin.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamCheckout.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.UnmatchedFileMap.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/TreeBasedTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/starteam/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chgrp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Chown.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/Symlink.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/unix/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.CurrentModUpdated.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.WritableFiles.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSADD.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKIN.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCHECKOUT.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCP.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSCREATE.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSConstants.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSGET.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.BriefCodediffNofile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSHISTORY.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/MSVSSLABEL.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/vss/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/Attrib.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/optional/windows/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/ForkingSunRmic.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/SunRmic.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/WLRmic.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/XNewRmic.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/taskdefs/rmic/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/AbstractFileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/AntFilterReader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ArchiveFileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ArchiveScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.BaseAssertion.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.DisabledAssertion.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.EnabledAssertion.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Assertions.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Commandline.Argument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Commandline.Marker.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Commandline.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/CommandlineJava.SysProperties.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/CommandlineJava.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Comparison.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/DTDLocation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/DataType.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Description.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/DirSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/EnumeratedAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Environment.Variable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Environment.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FileList.FileName.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FileList.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/EnumeratedAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Environment.Variable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Environment.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FileList.FileName.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FileList.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterChain.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.Filter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.FiltersFile.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.OnMissing.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSetCollection.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FlexInteger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/LogLevel.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Mapper.MapperType.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterChain.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.Filter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.FiltersFile.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.OnMissing.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FilterSetCollection.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/FlexInteger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/LogLevel.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Mapper.MapperType.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Mapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Parameter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Parameterizable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Path.PathElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Parameter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Parameterizable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Path.PathElement.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Path.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PatternSet.NameEntry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PatternSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Permissions.Permission.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Permissions.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PropertySet.BuiltinPropertySetName.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PropertySet.PropertyRef.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PropertySet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Quantifier.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/RedirectorElement.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Reference.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/RegularExpression.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Resource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ResourceCollection.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ResourceFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ResourceLocation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Substitution.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/TarFileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/TarScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/TimeComparison.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/XMLCatalog.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ZipFileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ZipScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/FilterMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/AbstractScriptComponent.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptCondition.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptFilter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.ClassRoot.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/DependScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Arc.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/BasicShape.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/ColorMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Draw.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/DrawOperation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Ellipse.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/ImageOperation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Rectangle.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Rotate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Scale.ProportionsAttribute.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Scale.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Text.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/TransformOperation.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalog.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ArchiveResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BCFileSet.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BZip2Resource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/CompressedResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Difference.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/FileResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/FileResourceIterator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Files.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/First.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/GZipResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ImmutableResourceException.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Intersect.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/JavaResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Last.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/PropertyResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Resources.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Restrict.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/SizeLimitCollection.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Sort.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/StringResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/TarResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Tokens.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Touchable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/URLResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Union.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ZipResource.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Content.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Date.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Exists.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/FileSystem.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Name.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/ResourceComparator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Reverse.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Size.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Type.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/And.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Compare.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Date.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Exists.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/InstanceOf.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Majority.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Name.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/None.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Not.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Or.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/ResourceSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Size.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Type.FileDir.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Type.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/AndSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/BaseExtendSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/BaseSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/BaseSelectorContainer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ContainsSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DateSelector.TimeComparisons.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DateSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DependSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DepthSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DifferentSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ExtendFileSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ExtendSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/FileSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/FilenameSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/MajoritySelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/MappingSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/NoneSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/NotSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/OrSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/PresentSelector.FilePresence.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/PresentSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorContainer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SignedSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.ByteUnits.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.SizeComparisons.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.FileType.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Cache.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.AlgorithmName.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.CacheName.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.ComparatorName.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/Provider.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/Service.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Base64Converter.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ChainedMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ClasspathUtils.Delegate.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ClasspathUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/CollectionUtils.EmptyEnumeration.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/CollectionUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/CompositeMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ConcatFileInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ConcatResourceInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ContainerMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DOMElementWriter.XmlNamespacePolicy.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DOMElementWriter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PatternSet.NameEntry.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PatternSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Permissions.Permission.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Permissions.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PropertySet.BuiltinPropertySetName.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PropertySet.PropertyRef.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/PropertySet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Quantifier.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/RedirectorElement.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Reference.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/RegularExpression.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Resource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ResourceCollection.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ResourceFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ResourceLocation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/Substitution.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/TarFileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/TarScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/TimeComparison.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/XMLCatalog.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ZipFileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/ZipScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/FilterMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/mappers/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/AbstractScriptComponent.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptCondition.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptFilter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/ScriptSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.ClassRoot.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/ClassfileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/DependScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/depend/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Arc.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/BasicShape.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/ColorMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Draw.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/DrawOperation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Ellipse.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/ImageOperation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Rectangle.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Rotate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Scale.ProportionsAttribute.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Scale.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/Text.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/TransformOperation.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/image/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/optional/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalog.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/ApacheCatalogResolver.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resolver/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ArchiveResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BCFileSet.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BZip2Resource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BaseResourceCollectionContainer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/BaseResourceCollectionWrapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/CompressedResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Difference.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/FileResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/FileResourceIterator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Files.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/First.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/GZipResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ImmutableResourceException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Intersect.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/JavaResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Last.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/PropertyResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Resources.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Restrict.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/SizeLimitCollection.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Sort.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/StringResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/TarResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Tokens.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Touchable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/URLResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/Union.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/ZipResource.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Content.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Date.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/DelegatedResourceComparator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Exists.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/FileSystem.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Name.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/ResourceComparator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Reverse.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Size.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/Type.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/comparators/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/And.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Compare.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Date.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Exists.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/InstanceOf.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Majority.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Name.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/None.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Not.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Or.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/ResourceSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/ResourceSelectorContainer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Size.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Type.FileDir.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/Type.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/resources/selectors/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/AbstractSelectorContainer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/AndSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/BaseExtendSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/BaseSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/BaseSelectorContainer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ContainsRegexpSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ContainsSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DateSelector.TimeComparisons.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DateSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DependSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DepthSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/DifferentSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ExtendFileSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/ExtendSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/FileSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/FilenameSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/MajoritySelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/MappingSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/NoneSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/NotSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/OrSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/PresentSelector.FilePresence.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/PresentSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorContainer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SelectorUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SignedSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.ByteUnits.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.SizeComparisons.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/SizeSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.FileType.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/TypeSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Algorithm.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/Cache.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ChecksumAlgorithm.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/DigestAlgorithm.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/EqualComparator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/HashvalueAlgorithm.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.AlgorithmName.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.CacheName.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.ComparatorName.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/ModifiedSelector.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/PropertiesfileCache.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/modifiedselector/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/selectors/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/Provider.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/Service.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/types/spi/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Base64Converter.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ChainedMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ClasspathUtils.Delegate.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ClasspathUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/CollectionUtils.EmptyEnumeration.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/CollectionUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/CompositeMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ConcatFileInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ConcatResourceInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ContainerMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DOMElementWriter.XmlNamespacePolicy.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DOMElementWriter.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DOMUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DateUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DeweyDecimal.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FileNameMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FileTokenizer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FileUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FlatFileNameMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/GlobPatternMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/IdentityMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/IdentityStack.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/JAXPUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/JavaEnvUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/KeepAliveInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/KeepAliveOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LazyFileOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LazyHashtable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LeadPipeInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LineOrientedOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LineTokenizer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LoaderUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/MergingMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/OutputStreamFunneler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/PackageNameMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/PropertyOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ProxySetup.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReaderInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReflectUtil.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReflectWrapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/RegexpPatternMapper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/RetryHandler.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Retryable.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptFixBSFPath.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerBase.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerCreator.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/SourceFileScanner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/StringTokenizer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/StringUtils.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/TaskLogger.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/TeeOutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/TimeoutObserver.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Tokenizer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/UUEncoder.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/UnPackageNameMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DateUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/DeweyDecimal.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FileNameMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FileTokenizer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FileUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/FlatFileNameMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/GlobPatternMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/IdentityMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/IdentityStack.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/JAXPUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/JavaEnvUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/KeepAliveInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/KeepAliveOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LazyFileOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LazyHashtable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LeadPipeInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LineOrientedOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LineTokenizer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/LoaderUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/MergingMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/OutputStreamFunneler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/PackageNameMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/PropertyOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ProxySetup.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReaderInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReflectUtil.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ReflectWrapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/RegexpPatternMapper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ResourceUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/RetryHandler.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Retryable.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptFixBSFPath.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerBase.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerCreator.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/ScriptRunnerHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/SourceFileScanner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/StringTokenizer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/StringUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/TaskLogger.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/TeeOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/TimeoutObserver.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Tokenizer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/UUEncoder.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/UnPackageNameMapper.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/Watchdog.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/WeakishReference.HardReference.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/WeakishReference.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XMLFragment.Child.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XMLFragment.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XmlConstants.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/AbstractAnalyzer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/DependencyAnalyzer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/FacadeTaskHelper.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/ProxyDiagnostics.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/JavaxScriptRunner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/NoExitSecurityManager.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/ScriptRunner.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/WeakishReference12.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaOroMatcher.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaOroRegexp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/Regexp.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcher.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpUtil.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/BZip2Constants.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/CBZip2InputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/CBZip2OutputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-summary.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-tree.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/ErrorInQuitException.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/WeakishReference.HardReference.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/WeakishReference.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XMLFragment.Child.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XMLFragment.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/XmlConstants.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/AbstractAnalyzer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/DependencyAnalyzer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/AncestorAnalyzer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/DependencyVisitor.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/FullAnalyzer.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/bcel/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/depend/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/FacadeTaskHelper.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/ImplementationSpecificArgument.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/facade/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/ProxyDiagnostics.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/java15/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/JavaxScriptRunner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/NoExitSecurityManager.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/ScriptRunner.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/WeakishReference12.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/optional/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaOroMatcher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaOroRegexp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/JakartaRegexpRegexp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/Jdk14RegexpRegexp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/Regexp.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcher.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpMatcherFactory.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/RegexpUtil.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/ant/util/regexp/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/BZip2Constants.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/CBZip2InputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/CBZip2OutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/bzip2/package-tree.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/mail/ErrorInQuitException.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/MailMessage.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/SmtpResponseReader.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/mail/SmtpResponseReader.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-frame.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/mail/package-tree.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarBuffer.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarConstants.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarEntry.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarInputStream.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarInputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarOutputStream.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/TarUtils.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/tar/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/tar/package-tree.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/AsiExtraField.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ExtraFieldUtils.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/JarMarker.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnixStat.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnrecognizedExtraField.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/UnrecognizedExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipEntry.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipExtraField.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipFile.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipLong.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipOutputStream.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipOutputStream.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/ZipShort.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/package-frame.html
-file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/package-summary.html
+file \
+    path=usr/share/doc/ant/manual/api/org/apache/tools/zip/package-summary.html
 file path=usr/share/doc/ant/manual/api/org/apache/tools/zip/package-tree.html
 file path=usr/share/doc/ant/manual/api/overview-frame.html
 file path=usr/share/doc/ant/manual/api/overview-summary.html
@@ -1659,17 +2810,15 @@
 file path=usr/share/lib/ant/tagdiff.xsl
 file path=usr/share/lib/ant/xercesImpl.jar
 file path=usr/share/lib/ant/xml-apis.jar
-file path=usr/share/man/man1/ant.1
+file ant.1.sunman path=usr/share/man/man1/ant.1
+legacy pkg=SUNWant desc="The Jakarta ANT Java/XML-based build tool (1.7.1)" \
+    name="Jakarta ANT"
+
+
+license ant.license license="Apache v2.0"
 link path=usr/sfw/bin/ant target=../../bin/ant
+link path=usr/sfw/bin/antRun target=../../bin/antRun
 link path=usr/sfw/bin/antRun.pl target=../../bin/antRun.pl
-link path=usr/sfw/bin/antRun target=../../bin/antRun
 link path=usr/sfw/bin/complete-ant-cmd.pl target=../../bin/complete-ant-cmd.pl
 link path=usr/sfw/bin/runant.pl target=../../bin/runant.pl
 link path=usr/sfw/lib/ant target=../../share/lib/ant
-
-
-license ant.license license="Apache v2.0"
-
-legacy	pkg=SUNWant \
-	name="Jakarta ANT" \
-	desc="The Jakarta ANT Java/XML-based build tool (1.7.1)"
--- a/components/autoconf/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/autoconf/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,16 +40,13 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		PERL="$(PERL)"
 
-include $(WS_TOP)/make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
+test:		$(TEST_32)
+
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include $(WS_TOP)/make-rules/depend.mk
--- a/components/autoconf/autoconf.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/autoconf/autoconf.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,17 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/autoconf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/developer/build/autoconf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU autoconf utility"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/software/autoconf/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/autoconf/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/424
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license autoconf.license license='GPLv3'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/sfw
@@ -102,6 +104,10 @@
 file path=usr/share/man/man1/config.guess.1
 file path=usr/share/man/man1/config.sub.1
 file path=usr/share/man/man1/ifnames.1
+
+
+legacy pkg=SUNWaconf desc="GNU autoconf" name="GNU autoconf"
+license autoconf.license license=GPLv3
 link path=usr/sfw/bin/autoconf target=../../bin/autoconf
 link path=usr/sfw/bin/autoheader target=../../bin/autoheader
 link path=usr/sfw/bin/autom4te target=../../bin/autom4te
@@ -109,8 +115,3 @@
 link path=usr/sfw/bin/autoscan target=../../bin/autoscan
 link path=usr/sfw/bin/autoupdate target=../../bin/autoupdate
 link path=usr/sfw/bin/ifnames target=../../bin/ifnames
-
-
-legacy pkg=SUNWaconf \
-	name="GNU autoconf" \
-	desc="GNU autoconf"
--- a/components/autogen/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/autogen/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -48,8 +48,7 @@
 
 install:	$(INSTALL_32)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/autogen/autogen.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/autogen/autogen.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,16 +21,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/autogen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/developer/build/autogen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text."
 set name=pkg.summary value="GNU autogen utility"
-set name=pkg.description value="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text."
-set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value="http://www.gnu.org/software/autogen/"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/autogen/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/315
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license autogen.license license="GPLv2"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/include
@@ -108,11 +111,10 @@
 file path=usr/share/man/man3/streqvmap.3
 file path=usr/share/man/man3/strneqvcmp.3
 file path=usr/share/man/man3/strtransform.3
+legacy pkg=SUNWautogen desc="GNU autogen - repetitious text utility (5.9.0)" \
+    name="autogen - GNU autogen utility"
+license autogen.license license=GPLv2
 link path=usr/lib/libguileopts.so target=libguileopts.so.0.0.1
 link path=usr/lib/libguileopts.so.0 target=libguileopts.so.0.0.1
 link path=usr/lib/libopts.so target=libopts.so.25.3.0
 link path=usr/lib/libopts.so.25 target=libopts.so.25.3.0
-
-legacy pkg=SUNWautogen \
-	name="autogen - GNU autogen utility" \
-	desc="GNU autogen - repetitious text utility (5.9.0)"
--- a/components/automake/automake-1.10/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/automake/automake-1.10/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,16 +40,13 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		PERL="$(PERL)"
 
-include $(WS_TOP)/make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
+test:		$(TEST_32)
+
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include $(WS_TOP)/make-rules/depend.mk
--- a/components/automake/automake-1.10/automake.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/automake/automake-1.10/automake.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,16 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/automake-110@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/developer/build/automake-110@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A Makefile generator"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/software/automake/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/automake/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license automake.license license='GPLv2'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -43,7 +44,6 @@
 dir path=usr/share/info
 file path=usr/bin/aclocal-$(COMPONENT_VERSION)
 file path=usr/bin/automake-$(COMPONENT_VERSION)
-file dirlist path=usr/share/aclocal/dirlist
 file path=usr/share/aclocal-$(COMPONENT_VERSION)/amversion.m4
 file path=usr/share/aclocal-$(COMPONENT_VERSION)/as.m4
 file path=usr/share/aclocal-$(COMPONENT_VERSION)/auxdir.m4
@@ -78,6 +78,7 @@
 file path=usr/share/aclocal-$(COMPONENT_VERSION)/substnot.m4
 file path=usr/share/aclocal-$(COMPONENT_VERSION)/tar.m4
 file path=usr/share/aclocal-$(COMPONENT_VERSION)/upc.m4
+file dirlist path=usr/share/aclocal/dirlist
 file path=usr/share/automake-$(COMPONENT_VERSION)/Automake/ChannelDefs.pm
 file path=usr/share/automake-$(COMPONENT_VERSION)/Automake/Channels.pm
 file path=usr/share/automake-$(COMPONENT_VERSION)/Automake/Condition.pm
@@ -160,9 +161,8 @@
 file path=usr/share/info/automake.info
 file path=usr/share/info/automake.info-1
 file path=usr/share/info/automake.info-2
+legacy pkg=SUNWgnu-automake-110 desc="GNU Automake - A Makefile generator" \
+    name="GNU Automake - A Makefile generator"
+license automake.license license=GPLv2
 link path=usr/bin/aclocal target=aclocal-$(COMPONENT_VERSION)
 link path=usr/bin/automake target=automake-$(COMPONENT_VERSION)
-
-legacy pkg=SUNWgnu-automake-110 \
-	name="GNU Automake - A Makefile generator" \
-	desc="GNU Automake - A Makefile generator"
--- a/components/automake/automake-1.9.6/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/automake/automake-1.9.6/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,16 +40,13 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		PERL="$(PERL)"
 
-include $(WS_TOP)/make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
+test:		$(TEST_32)
+
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include $(WS_TOP)/make-rules/depend.mk
--- a/components/automake/automake-1.9.6/automake.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/automake/automake-1.9.6/automake.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,16 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/automake-19@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/developer/build/automake-19@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A Makefile generator"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/software/automake/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/automake/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license automake.license license='GPLv2'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -149,7 +150,6 @@
 file path=usr/share/automake-1.9/symlink-tree mode=0555
 file path=usr/share/automake-1.9/texinfo.tex
 file path=usr/share/automake-1.9/ylwrap mode=0555
-
-legacy pkg=SUNWgnu-automake-19 \
-	name="GNU Automake - A Makefile generator" \
-	desc="GNU Automake - A Makefile generator"
+legacy pkg=SUNWgnu-automake-19 desc="GNU Automake - A Makefile generator" \
+    name="GNU Automake - A Makefile generator"
+license automake.license license=GPLv2
--- a/components/bash/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bash/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -37,6 +37,7 @@
 IPS_COMPONENT_VERSION = $(COMPONENT_VERSION).9
 PATCH_LEVEL = 0
 
+PKG_PROTO_DIRS += $(COMPONENT_DIR)/Solaris
 
 # Enable C99 mode + -Xc for it's additional warnings.
 studio_C99MODE = -Xc $(studio_C99_ENABLE)
@@ -116,40 +117,19 @@
 CONFIGURE_OPTIONS  += 		--with-installed-readline=no	
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 
+TEST_ENV +=	-i
+TEST_ENV +=	$(TEST_PATH)
+TEST_ENV +=	$(TARGET_ENV)
+
 build: $(BUILD_32)
 
 install: $(INSTALL_32)
-	( mkdir -p $(PROTO_DIR)/etc/bash/bash_completion.d ; \
-	    cp -p $(COMPONENT_DIR)/Solaris/etc.bash.bash_completion \
-	    $(PROTO_DIR)/etc/bash/bash_completion.example ; \
-	    cp -p $(COMPONENT_DIR)/Solaris/etc.bash.bashrc \
-	    $(PROTO_DIR)/etc/bash/bashrc.example ; \
-	    cp -p $(COMPONENT_DIR)/Solaris/etc.bash.inputrc \
-	    $(PROTO_DIR)/etc/bash/inputrc.example ; \
-	    cp -p $(COMPONENT_DIR)/Solaris/rbash.1 \
-	    $(PROTOUSRSHAREMAN1DIR)/ )
-	( mkdir -p $(PROTO_DIR)/etc/skel ; \
-	    cp -p $(COMPONENT_DIR)/Solaris/etc.skel.bashrc \
-	    $(PROTO_DIR)/etc/skel/.bashrc )
 	( cd $(PROTOUSRSHAREDIR)/locale ; \
 	    cp -Rp "en@boldquot" en ; \
 	    cp -Rp "en@boldquot" en_CA ; \
 	    cp -Rp "en@boldquot" en_GB )
-	sed -f oracleman-stability $(PROTOUSRSHAREMAN1DIR)/bash.1 > \
-	    $(PROTOUSRSHAREMAN1DIR)/bash.1.sed
-	cp -fp $(PROTOUSRSHAREMAN1DIR)/bash.1.sed \
-	    $(PROTOUSRSHAREMAN1DIR)/bash.1
-	sed -f oracleman-stability $(PROTOUSRSHAREMAN1DIR)/rbash.1 > \
-	    $(PROTOUSRSHAREMAN1DIR)/rbash.1.sed
-	cp -fp $(PROTOUSRSHAREMAN1DIR)/rbash.1.sed \
-	    $(PROTOUSRSHAREMAN1DIR)/rbash.1
-	rm -f $(PROTOUSRSHAREMAN1DIR)/bash.1.sed \
-	    $(PROTOUSRSHAREMAN1DIR)/rbash.1.sed
 
-test: $(BUILD_32)
-	( cd $(BUILD_DIR_32) ; \
-	    env - $(TEST_PATH) $(TARGET_ENV) $(GMAKE) check > \
-	    $(TEST_OUTPUT) 2>&1 )
+test: $(TEST_32)
 
 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
--- a/components/bash/Solaris/rbash.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bash/Solaris/rbash.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,8 +1,3 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\" 
 .\"
 .\" MAN PAGE COMMENTS to
 .\"
@@ -225,23 +220,3 @@
 Comments and bug reports concerning
 this manual page should be directed to
 .IR [email protected] .
-.\" Begin Sun update
-.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	shell/bash 
-=
-Interface Stability	External 
-.TE 
-.PP
-.SH NOTES
-Source for bash is available on http://opensolaris.org.
-.\" End Sun update
--- a/components/bash/bash.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bash/bash.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,11 +20,16 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/shell/bash@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/shell/bash@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Bourne-Again shell (bash)"
-set name=info.classification value="org.opensolaris.category.2008:System/Shells"
-set name=info.upstream_url value="http://www.gnu.org/software/bash/"
+set name=info.classification value=org.opensolaris.category.2008:System/Shells
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/bash/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=etc
@@ -93,11 +98,11 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
+file etc.bash.bash_completion path=etc/bash/bash_completion.example
 #
-file path=etc/bash/bashrc.example
-file path=etc/bash/bash_completion.example
-file path=etc/bash/inputrc.example
-file path=etc/skel/.bashrc
+file etc.bash.bashrc path=etc/bash/bashrc.example
+file etc.bash.inputrc path=etc/bash/inputrc.example
+file etc.skel.bashrc path=etc/skel/.bashrc
 file path=usr/bin/bash
 file path=usr/share/bash/alias
 file path=usr/share/bash/arith
@@ -175,6 +180,7 @@
 file path=usr/share/bash/variable_help
 file path=usr/share/bash/wait
 file path=usr/share/bash/while
+file path=usr/share/info/bash.info
 file path=usr/share/locale/af/LC_MESSAGES/bash.mo
 file path=usr/share/locale/bg/LC_MESSAGES/bash.mo
 file path=usr/share/locale/ca/LC_MESSAGES/bash.mo
@@ -204,19 +210,16 @@
 file path=usr/share/locale/vi/LC_MESSAGES/bash.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/bash.mo
 file path=usr/share/man/man1/bash.1
-file path=usr/share/man/man1/rbash.1
-file path=usr/share/info/bash.info
+file rbash.1 path=usr/share/man/man1/rbash.1
 #
-link path=usr/bin/rbash target=./bash
-link path=usr/gnu/bin/sh target=../../bin/bash
+legacy pkg=SUNWbash desc="GNU Bourne-Again shell (bash) version 4.1" \
+    name="GNU Bourne-Again shell (bash)"
+legacy pkg=SUNWbashr \
+    desc="GNU Bourne-Again shell (bash) version 4.1  (root package)" \
+    name="GNU Bourne-Again shell (bash) (root)"
 #
 license bash.license license="GPLv3, FDLv1.2"
 #
-legacy pkg=SUNWbash \
-    desc="GNU Bourne-Again shell (bash) version 4.1" \
-    name="GNU Bourne-Again shell (bash)"
+link path=usr/bin/rbash target=./bash
+link path=usr/gnu/bin/sh target=../../bin/bash
 
-legacy pkg=SUNWbashr \
-    desc="GNU Bourne-Again shell (bash) version 4.1  (root package)" \
-    name="GNU Bourne-Again shell (bash) (root)"
-
--- a/components/bash/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Oracle update\
-.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	shell/bash \
-=\
-Interface Stability	External \
-.TE \
-.PP\
-.SH NOTES\
-Source for bash is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/bison/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bison/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -42,21 +42,15 @@
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-SFWPROGS=	bison
-
-include ../../make-rules/shared-targets.mk
+$(INSTALL_32):	$(INSTALL_64)
 
 # common targets
-build:		$(BUILD_32) $(BUILD_64)
+build:		$(BUILD_32_and_64)
 
-install:	build $(INSTALL_32) $(PROTOSFWLINKS)
-	cd $(PROTOSFWLIB); rm -f liby.so; ln -s liby.so.1 liby.so
-	$(INSTALL) -D $(BUILD_DIR_64)/lib/liby.so.1 $(PROTOSFWLIB64)/liby.so.1
-	cd $(PROTOSFWLIB64); rm -f liby.so; ln -s liby.so.1 liby.so
+install:	$(INSTALL_32_and_64)
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/bison/bison-runtime.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bison/bison-runtime.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,17 +23,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/system/library/bison-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/system/library/bison-runtime@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Runtime library for a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar."
 set name=pkg.summary value="bison - A YACC Replacement (Runtime Libraries)"
-set name=pkg.description value="Runtime library for a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar."
-set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value=http://www.gnu.org/software/bison/
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/bison/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-
-license bison.license license="GPLv2"
-
 dir path=usr
 dir path=usr/sfw
 dir path=usr/sfw/lib
@@ -111,5 +113,6 @@
 file path=usr/share/locale/tr/LC_MESSAGES/bison-runtime.mo
 file path=usr/share/locale/vi/LC_MESSAGES/bison-runtime.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
+license bison.license license=GPLv2
 link path=usr/sfw/lib/$(MACH64)/liby.so target=liby.so.1
 link path=usr/sfw/lib/liby.so target=liby.so.1
--- a/components/bison/bison.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bison/bison.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,17 +23,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/parser/bison@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/developer/parser/bison@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar"
 set name=pkg.summary value="bison - A YACC Replacement"
-set name=pkg.description value="a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar"
-set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value=http://www.gnu.org/software/bison/
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/bison/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-
-license bison.license license="GPLv2"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/sfw
@@ -122,8 +124,9 @@
 file path=usr/share/locale/tr/LC_MESSAGES/bison.mo
 file path=usr/share/locale/vi/LC_MESSAGES/bison.mo
 file path=usr/share/man/man1/bison.1
-link path=usr/sfw/bin/bison target=../../bin/bison
+legacy pkg=SUNWbison desc="GNU bison 2.3 - A YACC Replacement" \
+    name="bison - A YACC Replacement"
 
-legacy	pkg=SUNWbison \
-	name="bison - A YACC Replacement" \
-	desc="GNU bison 2.3 - A YACC Replacement"
+
+license bison.license license=GPLv2
+link path=usr/sfw/bin/bison target=../../bin/bison
--- a/components/bzip2/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bzip2/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -35,11 +35,9 @@
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk
 include ../../make-rules/ips.mk
+include ../../make-rules/lint-libraries.mk
 
-LIBNAME=	bz2
-LINTOUT=	lint.out
-LINTFLAGS=	-nsvx -I. $(BITS32)
-LINTFLAGS64=	-nsvx -I. $(BITS64)
+LINT_FLAGS +=	-I.
 
 # we need to enable large file support and build PIC for our shared libraries
 CFLAGS += $(CPP_LARGEFILE) $(CC_PIC)
@@ -53,35 +51,19 @@
 	(cd $(@D) ; \
 	    cp ../../oldapi.c . )
 
-COMPONENT_POST_BUILD_ACTION= \
-	(cd $(@D) ; \
-	    $(LINT) -o $(LIBNAME) ../../llib-lbz2 > $(LINTOUT) 2>&1)
-
-
 # common targets
 build:		$(BUILD_32) $(BUILD_64)
 
-MAN1FILES= bunzip2.1 bzcat.1 bzdiff.1 bzgrep.1 \
-    bzip2.1 bzip2recover.1 bzmore.1
-MAN3FILES=libbz2.3
-
-include ../../make-rules/shared-targets.mk
-
-install:	build $(INSTALL_32) $(PROTOMAN3FILES) $(PROTOMAN1FILES)
+install:	build $(INSTALL_32)
 	$(INSTALL) $(BUILD_DIR_32)/libbz2.so.1 $(PROTOUSRLIBDIR)
 	cd $(PROTOUSRLIBDIR); rm -f libbz2.so; ln -s libbz2.so.1 libbz2.so
-	$(INSTALL) llib-lbz2 $(PROTOUSRLIBDIR)
-	$(INSTALL) $(BUILD_DIR_32)/llib-lbz2.ln $(PROTOUSRLIBDIR)
 	$(MKDIR) $(PROTOUSRLIBDIR64)
 	$(INSTALL) $(BUILD_DIR_64)/libbz2.so.1 $(PROTOUSRLIBDIR64)
 	cd $(PROTOUSRLIBDIR64); rm -f libbz2.so; ln -s libbz2.so.1 libbz2.so
 	$(INSTALL) $(BUILD_DIR_64)/llib-lbz2.ln $(PROTOUSRLIBDIR64)
 
 # build does this always
-test:  build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-	@cd $(BUILD_DIR_64); $(MAKE) check
-
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/bzip2/bzip2.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bzip2/bzip2.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,20 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/compress/bzip2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="high-quality block-sorting file compressor - utilities"
-set name=pkg.description value="bzip2 is a freely available, patent free, high-quality data compressor."
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/compress/bzip2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="bzip2 is a freely available, patent free, high-quality data compressor."
+set name=pkg.summary \
+    value="high-quality block-sorting file compressor - utilities"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.bzip.org/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/include
@@ -53,27 +59,24 @@
 file path=usr/lib/libbz2.so.1
 file path=usr/lib/llib-lbz2
 file path=usr/lib/llib-lbz2.ln
-file path=usr/share/man/man1/bunzip2.1
-file path=usr/share/man/man1/bzcat.1
+file manpages/bunzip2.1 path=usr/share/man/man1/bunzip2.1
+file manpages/bzcat.1 path=usr/share/man/man1/bzcat.1
 file path=usr/share/man/man1/bzcmp.1
-file path=usr/share/man/man1/bzdiff.1
+file manpages/bzdiff.1 path=usr/share/man/man1/bzdiff.1
 file path=usr/share/man/man1/bzegrep.1
 file path=usr/share/man/man1/bzfgrep.1
-file path=usr/share/man/man1/bzgrep.1
-file path=usr/share/man/man1/bzip2.1
-file path=usr/share/man/man1/bzip2recover.1
+file manpages/bzgrep.1 path=usr/share/man/man1/bzgrep.1
+file manpages/bzip2.1 path=usr/share/man/man1/bzip2.1
+file manpages/bzip2recover.1 path=usr/share/man/man1/bzip2recover.1
 file path=usr/share/man/man1/bzless.1
-file path=usr/share/man/man1/bzmore.1
-file path=usr/share/man/man3/libbz2.3
+file manpages/bzmore.1 path=usr/share/man/man1/bzmore.1
+file manpages/libbz2.3 path=usr/share/man/man3/libbz2.3
+legacy pkg=SUNWbzip desc="The bzip compression utility" \
+    name="The bzip compression utility"
+license bzip2.license license="bzip2 license"
 link path=usr/bin/bzcmp target=./bzdiff
 link path=usr/bin/bzegrep target=./bzgrep
 link path=usr/bin/bzfgrep target=./bzgrep
 link path=usr/bin/bzless target=./bzmore
 link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1
 link path=usr/lib/libbz2.so target=libbz2.so.1
-
-license bzip2.license license="bzip2 license"
-
-legacy	pkg=SUNWbzip \
-	name="The bzip compression utility" \
-	desc="The bzip compression utility"
--- a/components/bzip2/manpages/bzdiff.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bzip2/manpages/bzdiff.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,5 +1,3 @@
-'\" t
-.\"
 .\"
 \"Shamelessly copied from zmore.1 by Philippe Troin <[email protected]>
 \"for Debian GNU/Linux
@@ -40,22 +38,6 @@
 or
 .I diff
 is preserved.
-.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/bzip2
-=
-Interface Stability	Committed
-.TE 
-.PP
 .SH "SEE ALSO"
 cmp(1), diff(1), bzmore(1), bzless(1), bzgrep(1), bzip2(1)
 .SH BUGS
--- a/components/bzip2/manpages/bzgrep.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bzip2/manpages/bzgrep.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,5 +1,3 @@
-'\" t
-.\"
 .\"
 \"Shamelessly copied from zmore.1 by Philippe Troin <[email protected]>
 \"for Debian GNU/Linux
@@ -55,21 +53,5 @@
 .SH AUTHOR
 Charles Levert ([email protected]). Adapted to bzip2 by Philippe
 Troin <[email protected]> for Debian GNU/Linux.
-.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/bzip2
-=
-Interface Stability	Committed
-.TE 
-.PP
 .SH "SEE ALSO"
 grep(1), egrep(1), fgrep(1), bzdiff(1), bzmore(1), bzless(1), bzip2(1)
--- a/components/bzip2/manpages/bzip2.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bzip2/manpages/bzip2.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,7 +1,3 @@
-'\" t
-.\"
-.\" modified to reference existing Solaris man pages, and to add note
-.\" about source availability
 .\"
 .PU
 .TH bzip2 1
@@ -457,21 +453,3 @@
 Many people sent patches, helped
 with portability problems, lent machines, gave advice and were generally
 helpful.
-.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/bzip2
-=
-Interface Stability	Committed
-.TE 
-.PP
-.SH NOTES
-Source for bzip2 is available on http://opensolaris.org.
--- a/components/bzip2/manpages/bzmore.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bzip2/manpages/bzmore.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,5 +1,3 @@
-'\" t
-.\"
 .\"
 .\"Shamelessly copied from zmore.1 by Philippe Troin <[email protected]>
 .\"for Debian GNU/Linux
@@ -151,21 +149,5 @@
 .SH FILES
 .DT
 /etc/termcap		Terminal data base
-.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/bzip2
-=
-Interface Stability	Committed
-.TE 
-.PP
 .SH "SEE ALSO"
 more(1), less(1), bzip2(1), bzdiff(1), bzgrep(1)
--- a/components/bzip2/manpages/libbz2.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/bzip2/manpages/libbz2.3	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .TH libbz2 3 "8 Oct 1999"
 .SH NAME
 libbz2 \- library for block-sorting data compression
@@ -87,21 +86,3 @@
 compression performance.  Many people sent patches, helped
 with portability problems, lent machines, gave advice  and
 were generally helpful.
-.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/bzip2
-=
-Interface Stability	Committed
-.TE 
-.PP
-.SH NOTES
-Source for libbz is available on http://opensolaris.org.
--- a/components/coreutils/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/coreutils/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -39,57 +39,16 @@
 CONFIGURE_OPTIONS	+=	CPPFLAGS=-I/usr/include/gmp
 CONFIGURE_OPTIONS	+=	CFLAGS="$(CFLAGS)"
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-CMDS_NONCONFLICTING=\[ base64 dir dircolors md5sum nproc pinky \
-printenv ptx readlink seq sha1sum sha224sum sha256sum sha384sum sha512sum \
-shred shuf stat stdbuf tac timeout truncate users vdir whoami
-
-MANS_NONCONFLICTING=base64.1 dir.1 dircolors.1 md5sum.1 nproc.1 pinky.1 \
-printenv.1 ptx.1 readlink.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 \
-sha384sum.1 sha512sum.1 shred.1 shuf.1 stat.1 stdbuf.1 tac.1 \
-timeout.1 truncate.1 users.1 vdir.1 whoami.1
-
-NEEDMV=if [ -e $(1) ]; then $(RM) $(2); /usr/bin/mv $(1) $(2); fi
-RMDIR=/usr/bin/rmdir
-
 #
 # whoami is in both /usr/bin and /usr/gnu/bin; mistake?
 #
+install:	$(INSTALL_32)
 
-install:	$(PROTOUSRBINDIR) $(PROTOUSRSHAREMAN1DIR) $(INSTALL_32)
-	for command in $(CMDS_NONCONFLICTING); do \
-		$(call NEEDMV,$(PROTOGNUBIN)/$$command,\
-			$(PROTOUSRBINDIR)/$$command) \
-	done
-	for manpage in $(COMPONENT_SRC)/man/*.1; do \
-		sed -f oracleman-stability $$manpage > \
-			$(PROTO_DIR)/$(GNUSHAREMAN1)/`basename $$manpage`; \
-	done
-	for manpage in $(MANS_NONCONFLICTING); do \
-		$(call NEEDMV,$(PROTOGNUSHAREMAN1)/$$manpage,\
-			$(PROTOUSRSHAREMAN1DIR)/$$manpage); \
-	done
-	$(CP) $(PROTOUSRBINDIR)/whoami $(PROTOGNUBIN)/whoami
-	$(CP) $(PROTOUSRSHAREMAN1DIR)/whoami.1 $(PROTOGNUSHAREMAN1)/whoami.1
-	$(call NEEDMV,$(PROTOGNUBIN)/install,$(PROTOUSRBINDIR)/ginstall)
-	$(call NEEDMV,$(PROTOGNUSHAREMAN1)/install.1,\
-		$(PROTOUSRSHAREMAN1DIR)/ginstall.1)
-	$(call NEEDMV,$(PROTOUSRLIBDIR)/coreutils/libstdbuf.so,\
-		$(PROTOUSRLIBDIR)/libstdbuf.so)
-	-$(RMDIR) $(PROTOUSRLIBDIR)/coreutils
-	$(RM) $(PROTOGNUBIN)/chcon
-	$(RM) $(PROTOGNUBIN)/runcon
-	$(RM) $(PROTOGNUSHAREMAN1)/chcon.1
-	$(RM) $(PROTOGNUSHAREMAN1)/runcon.1
-	$(RM) $(PROTOUSRLIBDIR)/charset.alias
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/coreutils/coreutils.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/coreutils/coreutils.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/file/gnu-coreutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/file/gnu-coreutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="GNU Core Utilities are the basic file, shell and text manipulation utilities"
 set name=pkg.summary value="GNU Core Utilities"
-set name=pkg.description value="GNU Core Utilities are the basic file, shell and text manipulation utilities"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://ftp.gnu.org/gnu/coreutils/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2010/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -158,33 +164,33 @@
 dir path=usr/share/info
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/bin/[
-file path=usr/bin/base64
-file path=usr/bin/dir
-file path=usr/bin/dircolors
-file path=usr/bin/ginstall
-file path=usr/bin/md5sum
-file path=usr/bin/nproc
-file path=usr/bin/pinky
-file path=usr/bin/printenv
-file path=usr/bin/ptx
-file path=usr/bin/readlink
-file path=usr/bin/seq
-file path=usr/bin/sha1sum
-file path=usr/bin/sha224sum
-file path=usr/bin/sha256sum
-file path=usr/bin/sha384sum
-file path=usr/bin/sha512sum
-file path=usr/bin/shred
-file path=usr/bin/shuf
-file path=usr/bin/stat
-file path=usr/bin/stdbuf
-file path=usr/bin/tac
-file path=usr/bin/timeout
-file path=usr/bin/truncate
-file path=usr/bin/users
-file path=usr/bin/vdir
-file path=usr/bin/whoami
+file usr/gnu/bin/[ path=usr/bin/[
+file usr/gnu/bin/base64 path=usr/bin/base64
+file usr/gnu/bin/dir path=usr/bin/dir
+file usr/gnu/bin/dircolors path=usr/bin/dircolors
+file usr/gnu/bin/install path=usr/bin/ginstall
+file usr/gnu/bin/md5sum path=usr/bin/md5sum
+file usr/gnu/bin/nproc path=usr/bin/nproc
+file usr/gnu/bin/pinky path=usr/bin/pinky
+file usr/gnu/bin/printenv path=usr/bin/printenv
+file usr/gnu/bin/ptx path=usr/bin/ptx
+file usr/gnu/bin/readlink path=usr/bin/readlink
+file usr/gnu/bin/seq path=usr/bin/seq
+file usr/gnu/bin/sha1sum path=usr/bin/sha1sum
+file usr/gnu/bin/sha224sum path=usr/bin/sha224sum
+file usr/gnu/bin/sha256sum path=usr/bin/sha256sum
+file usr/gnu/bin/sha384sum path=usr/bin/sha384sum
+file usr/gnu/bin/sha512sum path=usr/bin/sha512sum
+file usr/gnu/bin/shred path=usr/bin/shred
+file usr/gnu/bin/shuf path=usr/bin/shuf
+file usr/gnu/bin/stat path=usr/bin/stat
+file usr/gnu/bin/stdbuf path=usr/bin/stdbuf
+file usr/gnu/bin/tac path=usr/bin/tac
+file usr/gnu/bin/timeout path=usr/bin/timeout
+file usr/gnu/bin/truncate path=usr/bin/truncate
+file usr/gnu/bin/users path=usr/bin/users
+file usr/gnu/bin/vdir path=usr/bin/vdir
+file usr/gnu/bin/whoami path=usr/bin/whoami
 file path=usr/gnu/bin/basename
 file path=usr/gnu/bin/cat
 file path=usr/gnu/bin/chgrp
@@ -259,83 +265,44 @@
 file path=usr/gnu/bin/whoami
 file path=usr/gnu/bin/yes
 file path=usr/gnu/share/locale/af/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/af/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/be/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/be/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/bg/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/bg/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ca/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/ca/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/cs/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/cs/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/da/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/da/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/de/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/de/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/el/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/el/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/en/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/en/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/es/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/es/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/et/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/et/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/eu/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/eu/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/fi/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/fi/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/fr/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/fr/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ga/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/ga/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/gl/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/gl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/hu/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/hu/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/id/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/id/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/it/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/it/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ja/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/ja/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ko/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/ko/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/lg/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/lg/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/lt/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/lt/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ms/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/ms/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/nb/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/nb/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/nl/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/nl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/pl/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/pl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/pt/LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/pt_BR/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
-file path=usr/gnu/share/locale/pt/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/pt/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ro/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/ro/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/ru/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/ru/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/sk/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/sk/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/sl/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/sl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/sv/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/sv/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/tr/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/tr/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/uk/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/uk/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/vi/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/vi/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/zh_CN/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
-link path=usr/gnu/share/locale/zh_TW/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
 file path=usr/gnu/share/man/man1/basename.1
 file path=usr/gnu/share/man/man1/cat.1
 file path=usr/gnu/share/man/man1/chgrp.1
@@ -409,37 +376,112 @@
 file path=usr/gnu/share/man/man1/who.1
 file path=usr/gnu/share/man/man1/whoami.1
 file path=usr/gnu/share/man/man1/yes.1
-file path=usr/lib/libstdbuf.so
+file usr/lib/coreutils/libstdbuf.so path=usr/lib/libstdbuf.so
 file path=usr/share/info/coreutils.info
-file path=usr/share/man/man1/base64.1
-file path=usr/share/man/man1/dir.1
-file path=usr/share/man/man1/dircolors.1
-file path=usr/share/man/man1/ginstall.1
-file path=usr/share/man/man1/md5sum.1
-file path=usr/share/man/man1/nproc.1
-file path=usr/share/man/man1/pinky.1
-file path=usr/share/man/man1/printenv.1
-file path=usr/share/man/man1/ptx.1
-file path=usr/share/man/man1/readlink.1
-file path=usr/share/man/man1/seq.1
-file path=usr/share/man/man1/sha1sum.1
-file path=usr/share/man/man1/sha224sum.1
-file path=usr/share/man/man1/sha256sum.1
-file path=usr/share/man/man1/sha384sum.1
-file path=usr/share/man/man1/sha512sum.1
-file path=usr/share/man/man1/shred.1
-file path=usr/share/man/man1/shuf.1
-file path=usr/share/man/man1/stat.1
-file path=usr/share/man/man1/stdbuf.1
-file path=usr/share/man/man1/tac.1
-file path=usr/share/man/man1/timeout.1
-file path=usr/share/man/man1/truncate.1
-file path=usr/share/man/man1/users.1
-file path=usr/share/man/man1/vdir.1
-file path=usr/share/man/man1/whoami.1
-
-license coreutils.license license="GPLv3"
-
-legacy	pkg=SUNWgnu-coreutils \
-	name="coreutils - GNU core utilities" \
-	desc="GNU core utilities (8.5)"
+file usr/gnu/share/man/man1/base64.1 path=usr/share/man/man1/base64.1
+file usr/gnu/share/man/man1/dir.1 path=usr/share/man/man1/dir.1
+file usr/gnu/share/man/man1/dircolors.1 path=usr/share/man/man1/dircolors.1
+file usr/gnu/share/man/man1/install.1 path=usr/share/man/man1/ginstall.1
+file usr/gnu/share/man/man1/md5sum.1 path=usr/share/man/man1/md5sum.1
+file usr/gnu/share/man/man1/nproc.1 path=usr/share/man/man1/nproc.1
+file usr/gnu/share/man/man1/pinky.1 path=usr/share/man/man1/pinky.1
+file usr/gnu/share/man/man1/printenv.1 path=usr/share/man/man1/printenv.1
+file usr/gnu/share/man/man1/ptx.1 path=usr/share/man/man1/ptx.1
+file usr/gnu/share/man/man1/readlink.1 path=usr/share/man/man1/readlink.1
+file usr/gnu/share/man/man1/seq.1 path=usr/share/man/man1/seq.1
+file usr/gnu/share/man/man1/sha1sum.1 path=usr/share/man/man1/sha1sum.1
+file usr/gnu/share/man/man1/sha224sum.1 path=usr/share/man/man1/sha224sum.1
+file usr/gnu/share/man/man1/sha256sum.1 path=usr/share/man/man1/sha256sum.1
+file usr/gnu/share/man/man1/sha384sum.1 path=usr/share/man/man1/sha384sum.1
+file usr/gnu/share/man/man1/sha512sum.1 path=usr/share/man/man1/sha512sum.1
+file usr/gnu/share/man/man1/shred.1 path=usr/share/man/man1/shred.1
+file usr/gnu/share/man/man1/shuf.1 path=usr/share/man/man1/shuf.1
+file usr/gnu/share/man/man1/stat.1 path=usr/share/man/man1/stat.1
+file usr/gnu/share/man/man1/stdbuf.1 path=usr/share/man/man1/stdbuf.1
+file usr/gnu/share/man/man1/tac.1 path=usr/share/man/man1/tac.1
+file usr/gnu/share/man/man1/timeout.1 path=usr/share/man/man1/timeout.1
+file usr/gnu/share/man/man1/truncate.1 path=usr/share/man/man1/truncate.1
+file usr/gnu/share/man/man1/users.1 path=usr/share/man/man1/users.1
+file usr/gnu/share/man/man1/vdir.1 path=usr/share/man/man1/vdir.1
+file usr/gnu/share/man/man1/whoami.1 path=usr/share/man/man1/whoami.1
+legacy pkg=SUNWgnu-coreutils desc="GNU core utilities (8.5)" \
+    name="coreutils - GNU core utilities"
+license coreutils.license license=GPLv3
+link path=usr/gnu/share/locale/af/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/be/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/bg/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ca/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/cs/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/da/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/de/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/el/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/en/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/es/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/et/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/eu/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/fi/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/fr/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ga/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/gl/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/hu/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/id/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/it/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ja/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ko/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/lg/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/lt/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ms/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/nb/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/nl/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/pl/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/pt/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/pt_BR/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ro/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ru/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/sk/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/sl/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/sv/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/tr/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/uk/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/vi/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/zh_CN/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/zh_TW/LC_TIME/coreutils.mo \
+    target=../LC_MESSAGES/coreutils.mo
--- a/components/coreutils/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.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	file/gnu-coreutils \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for GNU coreutils is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/components/curl/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/curl/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -33,15 +33,13 @@
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
+include ../../make-rules/lint-libraries.mk
 
 PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig
 PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig
 
 PATCH_LEVEL = 0
 
-LIBNAME =       $(COMPONENT_NAME)
-LINTOUT =       lint.out
-
 GSSAPI_LIBDIR_32 = /usr/lib
 GSSAPI_LIBDIR_64 = /usr/lib/$(MACH64)
 
@@ -84,131 +82,13 @@
 CONFIGURE_OPTIONS += --with-pic
 CONFIGURE_OPTIONS += "curl_disallow_getifaddrs=yes"
 
-PKG_PROTO_DIRS +=	$(COMPONENT_SRC)
-
-COMPONENT_POST_BUILD_ACTION = \
-    ( cd $(@D) ; \
-	$(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \
-	-I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \
-	-I$(COMPONENT_DIR)/$(COMPONENT_SRC) \
-	$(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1)
-
-COMPONENT_POST_INSTALL_ACTION = \
-    ( $(CP) $(COMPONENT_DIR)/llib-l$(LIBNAME) $(PROTOUSRLIBDIR)/ ; \
-	cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \
-	    $(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)) )
-
-PROTOUSRBINDIR64 = $(PROTOUSRBINDIR)/$(MACH64)
-PROTOUSRSHAREDOCDIR1 = $(PROTOUSRSHAREDIR)/doc/curl/html
-PROTOUSRSHAREDOCDIR2 = $(PROTOUSRSHAREDIR)/doc/libcurl/html
+LINT_FLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
 
 build: $(BUILD_32_and_64)
 
-HTMLDOCLIST1 = curl.html curl-config.html index.html
-HTMLDOCLIST2 = curl_easy_cleanup.html curl_easy_duphandle.html \
-	       curl_easy_escape.html curl_easy_getinfo.html \
-	       curl_easy_init.html curl_easy_pause.html \
-	       curl_easy_perform.html curl_easy_recv.html \
-	       curl_easy_reset.html curl_easy_send.html \
-	       curl_easy_setopt.html curl_easy_strerror.html \
-	       curl_easy_unescape.html curl_escape.html \
-	       curl_formadd.html curl_formfree.html \
-	       curl_formget.html curl_free.html \
-	       curl_getdate.html curl_getenv.html \
-	       curl_global_cleanup.html curl_global_init.html \
-	       curl_global_init_mem.html curl_mprintf.html \
-	       curl_multi_add_handle.html curl_multi_assign.html \
-	       curl_multi_cleanup.html curl_multi_fdset.html \
-	       curl_multi_info_read.html curl_multi_init.html \
-	       curl_multi_perform.html curl_multi_remove_handle.html \
-	       curl_multi_setopt.html curl_multi_socket.html \
-	       curl_multi_socket_action.html curl_multi_strerror.html \
-	       curl_multi_timeout.html curl_share_cleanup.html \
-	       curl_share_init.html curl_share_setopt.html \
-	       curl_share_strerror.html curl_slist_append.html \
-	       curl_slist_free_all.html curl_strequal.html \
-	       curl_unescape.html curl_version.html \
-	       curl_version_info.html index.html \
-	       libcurl-easy.html libcurl-errors.html \
-	       libcurl-multi.html libcurl-share.html \
-	       libcurl-tutorial.html libcurl.html
+install: $(INSTALL_32_and_64)
 
-MAN1LIST = curl-config.1 curl.1
-MAN3LIST = curl_easy_cleanup.3 curl_easy_duphandle.3 \
-	   curl_easy_escape.3 curl_easy_getinfo.3 \
-	   curl_easy_init.3 curl_easy_pause.3 \
-	   curl_easy_perform.3 curl_easy_recv.3 \
-	   curl_easy_reset.3 curl_easy_send.3 \
-	   curl_easy_setopt.3 curl_easy_strerror.3 \
-	   curl_easy_unescape.3 curl_escape.3 \
-	   curl_formadd.3 curl_formfree.3 \
-	   curl_formget.3 curl_free.3 \
-	   curl_getdate.3 curl_getenv.3 \
-	   curl_global_cleanup.3 curl_global_init.3 \
-	   curl_global_init_mem.3 curl_mprintf.3 \
-	   curl_multi_add_handle.3 curl_multi_assign.3 \
-	   curl_multi_cleanup.3 curl_multi_fdset.3 \
-	   curl_multi_info_read.3 curl_multi_init.3 \
-	   curl_multi_perform.3 curl_multi_remove_handle.3 \
-	   curl_multi_setopt.3 curl_multi_socket.3 \
-	   curl_multi_socket_action.3 curl_multi_strerror.3 \
-	   curl_multi_timeout.3 curl_share_cleanup.3 \
-	   curl_share_init.3 curl_share_setopt.3 \
-	   curl_share_strerror.3 curl_slist_append.3 \
-	   curl_slist_free_all.3 curl_strequal.3 \
-	   curl_unescape.3 curl_version.3 \
-	   curl_version_info.3 libcurl-easy.3 \
-	   libcurl-errors.3 libcurl-multi.3 \
-	   libcurl-share.3 libcurl-tutorial.3 libcurl.3
-
-GSED = /usr/gnu/bin/sed
-
-include ../../make-rules/shared-targets.mk
-
-install: $(INSTALL_32_and_64)
-	$(MKDIR) $(PROTOUSRSHAREDOCDIR1) ; \
-	    list1='$(HTMLDOCLIST1)' ; for f in $$list1; do \
-	    $(INSTALL) -m 0644 $(COMPONENT_DIR)/$(COMPONENT_SRC)/docs/$$f \
-		$(PROTOUSRSHAREDOCDIR1)/ ; \
-	    done
-	$(MKDIR) $(PROTOUSRSHAREDOCDIR2) ; \
-	    list2='$(HTMLDOCLIST2)' ; for f in $$list2; do \
-	    $(INSTALL) -m 0644 \
-		$(COMPONENT_DIR)/$(COMPONENT_SRC)/docs/libcurl/$$f \
-		$(PROTOUSRSHAREDOCDIR2)/ ; \
-	    done
-	$(MKDIR) $(PROTOUSRSHAREMAN1DIR) ; \
-	    list3='$(MAN1LIST)'; for f in $$list3; do \
-	    $(GSED) -f oracleman-stability \
-		$(PROTOUSRSHAREMAN1DIR)/$$f > \
-		$(PROTOUSRSHAREMAN1DIR)/$$f.sed 2>&1 ; \
-	    $(CP) -fp $(PROTOUSRSHAREMAN1DIR)/$$f.sed \
-		$(PROTOUSRSHAREMAN1DIR)/$$f ; \
-	    $(RM) -f $(PROTOUSRSHAREMAN1DIR)/$$f.sed ; \
-	    done
-	$(MKDIR) $(PROTOUSRSHAREMAN3DIR) ; \
-	    list4='$(MAN3LIST)'; for f in $$list4; do \
-	    $(GSED) -f oracleman-stability \
-		$(PROTOUSRSHAREMAN3DIR)/$$f > \
-		$(PROTOUSRSHAREMAN3DIR)/$$f.sed 2>&1 ; \
-	    $(CP) -fp $(PROTOUSRSHAREMAN3DIR)/$$f.sed \
-		$(PROTOUSRSHAREMAN3DIR)/$$f ; \
-	    $(RM) -f $(PROTOUSRSHAREMAN3DIR)/$$f.sed ; \
-	    done
-	$(RM) $(PROTOUSRBINDIR)/curl-config ; \
-	$(INSTALL) -m 0755 $(COMPONENT_DIR)/Solaris/curl-config \
-	    $(PROTOUSRBINDIR)/
-	$(RM) $(PROTOUSRBINDIR64)/curl-config 
-	$(GSED) -e "s#MACH64#$(MACH64)#g" \
-	    $(COMPONENT_DIR)/Solaris/curl-config-64 > \
-		$(COMPONENT_DIR)/curl-config 
-	$(INSTALL) -m 0755  \
-		$(COMPONENT_DIR)/curl-config $(PROTOUSRBINDIR64)/
-	$(RM) $(COMPONENT_DIR)/curl-config
-
-test: $(BUILD_32_and_64)
-	@cd $(BUILD_DIR_32); $(GMAKE) check
-	@cd $(BUILD_DIR_64); $(GMAKE) check
+test: $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
--- a/components/curl/curl.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/curl/curl.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,12 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+<transform file path=usr/share/doc/curl/html/(.+)$ -> \
+	set action.hash curl-7.21.2/docs/%<\1> >
+<transform file path=usr/share/doc/libcurl/html/(.+)$ -> \
+	set action.hash curl-7.21.2/docs/libcurl/%<\1> >
+
 set name=pkg.fmri value=pkg:/web/curl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The CURL Network Utility and Library"
 set name=pkg.description value="A command-line tool and library for transforming data with URL syntax"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream_url value="http://curl.haxx.se/"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/165
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/curl/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.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	web/curl \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for C-URL is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/components/cvs/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/cvs/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -36,18 +36,16 @@
 CONFIGURE_OPTIONS  +=	--with-external-zlib
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 
+# "check" is not working yet.  It's asking for a password.
+COMPONENT_TEST_ENV += PATH=$(GNUBIN):$(PATH)
+COMPONENT_TEST_TARGETS = localcheck
+
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
-	sed -f solarisman-stability $(COMPONENT_SRC)/doc/cvs.1 > \
-				   $(PROTOUSRSHAREMAN1DIR)/cvs.1
-	sed -f solarisman-stability $(COMPONENT_SRC)/man/cvs.5 > \
-				   $(PROTOUSRSHAREMAN5DIR)/cvs.5
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-# "check" is not working yet.  It's asking for a password.
-test: build
-	@cd $(BUILD_DIR_32); PATH=/usr/gnu/bin:$(PATH) $(MAKE) localcheck
-
 include ../../make-rules/depend.mk
--- a/components/cvs/cvs.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/cvs/cvs.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,17 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/versioning/cvs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/developer/versioning/cvs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The CVS version control system"
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value="http://www.nongnu.org/cvs/"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.nongnu.org/cvs/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/128
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license cvs.license license="GPLv2"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -39,7 +41,6 @@
 file path=usr/bin/cvs
 file path=usr/share/man/man1/cvs.1
 file path=usr/share/man/man5/cvs.5
-
-legacy	pkg=SUNWcvs \
-	name="The CVS version control system" \
-	desc="The CVS version control system"
+legacy pkg=SUNWcvs desc="The CVS version control system" \
+    name="The CVS version control system"
+license cvs.license license=GPLv2
--- a/components/cvs/solarisman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Solaris update\
-.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	developer/versioning/cvs \
-=\
-Interface Stability	Committed \
-.TE \
-.PP\
-.SH NOTES\
-Source for cvs is available on http://opensolaris.org.\
-\.\\" End Solaris update
--- a/components/diffutils/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/diffutils/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,20 +40,13 @@
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-GNUPROGS =	cmp diff3 diff sdiff
-GNUMAN1 =	cmp.1 diff.1 diff3.1 sdiff.1
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) \
-    $(PROTOGNULINKS) $(PROTOGNUMAN1LINKS)
+install:	$(INSTALL_32)
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/diffutils/diffutils.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/diffutils/diffutils.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/text/gnu-diffutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU diffutils"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/text/gnu-diffutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="Finds differences between and among files"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value=http://www.gnu.org/software/diffutils/
+set name=pkg.summary value="GNU diffutils"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/diffutils/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -124,6 +128,10 @@
 file path=usr/share/man/man1/gdiff.1
 file path=usr/share/man/man1/gdiff3.1
 file path=usr/share/man/man1/gsdiff.1
+legacy pkg=SUNWgnu-diffutils \
+    desc="GNU diffutils - Finds differences between and among files (2.8.7)" \
+    name="GNU diffutils"
+license diffutils.license license=GPLv2
 link path=usr/gnu/bin/cmp target=../../bin/gcmp
 link path=usr/gnu/bin/diff target=../../bin/gdiff
 link path=usr/gnu/bin/diff3 target=../../bin/gdiff3
@@ -136,9 +144,3 @@
     target=../../../../share/man/man1/gdiff3.1
 link path=usr/gnu/share/man/man1/sdiff.1 \
     target=../../../../share/man/man1/gsdiff.1
-
-license diffutils.license license="GPLv2"
-
-legacy	pkg=SUNWgnu-diffutils \
-	name="GNU diffutils" \
-	desc="GNU diffutils - Finds differences between and among files (2.8.7)"
--- a/components/elinks/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/elinks/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -41,32 +41,9 @@
 # common targets
 build:		$(BUILD_32)
 
-DOCFILES= bittorrent.txt color-model.txt bookmarks.txt dev-intro.txt \
-	ecmascript.txt elinks.1.txt elinks.conf.5.txt elinkskeys.5.txt \
-	events.txt exmode.txt faq.txt feedback.txt hacking.txt \
-	installation.txt introduction.txt lua-scripting.txt mailcap.txt \
-	manual.txt marks.txt mime.txt remote.txt small.txt tabs.txt \
-	terminals.txt urlshortcuts.txt
-
-PROTODOCDIR = $(PROTO_DIR)/usr/share/doc/elinks
-PROTODOCFILES=$(DOCFILES:%=$(PROTODOCDIR)/%)
-
-$(PROTODOCDIR):	$(INSTALL_32)
-	$(MKDIR) $@
+install:	$(INSTALL_32)
 
-$(PROTODOCFILES):	$(PROTODOCDIR)
-	$(INSTALL) -m 444 $(COMPONENT_SRC)/doc/$(@F) $(@D)
-
-install:	$(INSTALL_32) $(PROTODOCDIR) $(PROTODOCFILES)
-	(sed -f oracleman-stability $(COMPONENT_SRC)/doc/man/man1/elinks.1.in > \
-		$(PROTO_DIR)/$(USRSHAREMAN1DIR)/elinks.1 ; \
-	 sed -f oracleman-stability $(COMPONENT_SRC)/doc/man/man5/elinks.conf.5 > \
-		$(PROTO_DIR)/$(USRSHAREMAN5DIR)/elinks.conf.5 ; \
-	 sed -f oracleman-stability $(COMPONENT_SRC)/doc/man/man5/elinkskeys.5 > \
-		$(PROTO_DIR)/$(USRSHAREMAN5DIR)/elinkskeys.5)
-
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/elinks/elinks.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/elinks/elinks.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/web/browser/elinks@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr/share/doc/elinks/(.+$) -> set action.hash doc/%<\1> >
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/web/browser/elinks@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="ELinks is a feature-rich program for browsing the web in text mode.  It is like enhanced Lynx and Links."
 set name=pkg.summary value="advanced text-mode WWW browser"
-set name=pkg.description value="ELinks is a feature-rich program for browsing the web in text mode.  It is like enhanced Lynx and Links."
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url value="http://elinks.or.cz/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://elinks.or.cz/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/028
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -99,8 +105,8 @@
 dir path=usr/share/man/man5
 file path=usr/bin/elinks
 file path=usr/share/doc/elinks/bittorrent.txt
+file path=usr/share/doc/elinks/bookmarks.txt
 file path=usr/share/doc/elinks/color-model.txt
-file path=usr/share/doc/elinks/bookmarks.txt
 file path=usr/share/doc/elinks/dev-intro.txt
 file path=usr/share/doc/elinks/ecmascript.txt
 file path=usr/share/doc/elinks/elinks.1.txt
@@ -156,9 +162,6 @@
 file path=usr/share/man/man1/elinks.1
 file path=usr/share/man/man5/elinks.conf.5
 file path=usr/share/man/man5/elinkskeys.5
-
-license elinks.license license="GPLv2"
-
-legacy	pkg=SUNWelinks \
-	name="ELinks" \
-	desc="ELinks - Text-based Web browser (0.11.7)"
+legacy pkg=SUNWelinks desc="ELinks - Text-based Web browser (0.11.7)" \
+    name=ELinks
+license elinks.license license=GPLv2
--- a/components/elinks/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Oracle update\
-.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	web/browser/elinks\
-=\
-Interface Stability	Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-Source for elinks is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/emacs/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/emacs/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -134,34 +134,18 @@
 COMPONENT_POST_INSTALL_ACTION += mv $(PETC)/DOC-$(COMPONENT_VERSION).2 \
 					$(PETC)/DOC-$(COMPONENT_VERSION).1 ;
 
-# Throw away the manpages that were installed, and generate them again, using
-# sed to bolt on an ATTRIBUTES section. ctags is special in that it simply
-# inlines etags.1, and should not pass through solman.pl.
-SOLMAN=perl tools/solman.pl
-SOLMAN_CORE= $(SOLMAN) editor/gnu-emacs
-MAN_DIST_PCORE= $(SOLMAN_CORE) < $(COMPONENT_SRC)/doc/man/XXX \
-	> $(PSHAREMAN1)/XXX
-
-COMPONENT_POST_INSTALL_ACTION += rm $(PSHAREMAN1)/* ;
-COMPONENT_POST_INSTALL_ACTION += $(MAN_DIST_PCORE:XXX=b2m.1) ;
-COMPONENT_POST_INSTALL_ACTION += $(MAN_DIST_PCORE:XXX=ebrowse.1) ;
-COMPONENT_POST_INSTALL_ACTION += $(MAN_DIST_PCORE:XXX=emacs.1) ;
-COMPONENT_POST_INSTALL_ACTION += $(MAN_DIST_PCORE:XXX=emacsclient.1) ;
-COMPONENT_POST_INSTALL_ACTION += $(MAN_DIST_PCORE:XXX=grep-changelog.1) ;
-COMPONENT_POST_INSTALL_ACTION += $(MAN_DIST_PCORE:XXX=rcs-checkin.1) ;
-
-COMPONENT_POST_INSTALL_ACTION += $(SOLMAN) editor/gnu-emacs/gnu-emacs-gtk \
-	< augment/man/man1/emacs-gtk.1 > $(PSHAREMAN1)/emacs-gtk.1 ;
-COMPONENT_POST_INSTALL_ACTION += $(SOLMAN) editor/gnu-emacs/gnu-emacs-no-x11 \
-	< augment/man/man1/emacs-nox.1 > $(PSHAREMAN1)/emacs-nox.1 ;
-COMPONENT_POST_INSTALL_ACTION += $(SOLMAN) editor/gnu-emacs/gnu-emacs-x11 \
-	< augment/man/man1/emacs-x.1 > $(PSHAREMAN1)/emacs-x.1 ;
+COMPONENT_POST_INSTALL_ACTION += cp augment/man/man1/emacs-gtk.1 \
+			$(PSHAREMAN1)/emacs-gtk.1 ;
+COMPONENT_POST_INSTALL_ACTION += cp augment/man/man1/emacs-nox.1 \
+			$(PSHAREMAN1)/emacs-nox.1 ;
+COMPONENT_POST_INSTALL_ACTION += cp augment/man/man1/emacs-x.1 \
+			$(PSHAREMAN1)/emacs-x.1 ;
 
 COMPONENT_POST_INSTALL_ACTION += mkdir -p $(PGSHAREMAN1) ;
 COMPONENT_POST_INSTALL_ACTION += cp $(COMPONENT_SRC)/doc/man/ctags.1 \
 					$(PGSHAREMAN1)/ctags.1 ;
-COMPONENT_POST_INSTALL_ACTION += $(SOLMAN_CORE) \
-	< $(COMPONENT_SRC)/doc/man/etags.1 > $(PGSHAREMAN1)/etags.1 ;
+COMPONENT_POST_INSTALL_ACTION += cp $(COMPONENT_SRC)/doc/man/etags.1 \
+					$(PGSHAREMAN1)/etags.1 ;
 
 # Throw away usr/share/info/dir. This file is the topmost node of the Info
 # hierarchy. Emacs builds it, as presumably do all GNU packages, but on
--- a/components/emacs/gnu-emacs-gtk.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/emacs/gnu-emacs-gtk.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,12 +20,15 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/gnu-emacs-gtk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs with X11 support (GTK toolkit)"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream_url value=http://www.gnu.org/software/emacs/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs-lisp.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/emacs/gnu-emacs-lisp.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -27,6 +27,8 @@
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream_url value=http://www.gnu.org/software/emacs/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs-no-x11.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/emacs/gnu-emacs-no-x11.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,12 +20,15 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/gnu-emacs-no-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs without X Window System support"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream_url value=http://www.gnu.org/software/emacs/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs-x11.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/emacs/gnu-emacs-x11.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,12 +20,15 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/gnu-emacs-x11@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs with X11 support (Xaw toolkit)"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream_url value=http://www.gnu.org/software/emacs/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/emacs/gnu-emacs.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs core"
@@ -27,6 +28,8 @@
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream_url value=http://www.gnu.org/software/emacs/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
@@ -2273,7 +2276,7 @@
 file path=usr/share/info/woman
 file path=usr/share/man/man1/b2m.1
 file path=usr/share/man/man1/ebrowse.1
-file path=usr/share/man/man1/emacs.1
+file path=usr/share/man/man1/emacs.1 mangler.man.stability=committed
 file path=usr/share/man/man1/emacsclient.1
 file path=usr/share/man/man1/grep-changelog.1
 file path=usr/share/man/man1/rcs-checkin.1
--- a/components/emacs/tools/solman.pl	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#!/usr/bin/perl
-
-#
-# 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) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-# Copy the manpage text on stdin to stdout, adding an Attribute
-# block to the end:
-#
-#	solman pkgname
-#
-# where pkgname is the name of the Solaris package to show.
-#
-
-die "usage: solman pkgname\n" 
-    if (scalar(@ARGV) != 1);
-
-$pkgname = $ARGV[0];
-
-print <<TEXT;
-'\\" t\
-.\\"\
-.\\" Modified for Solaris to to add the Solaris stability classification,\
-.\\" and to add a note about source availability.\
-.\\"
-TEXT
-
-# Input to output, unmodified
-while ($line = <STDIN>) {
-	print $line;
-}
-
-print <<TEXT;
-.\\" Begin Solaris update\
-.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	$pkgname\
-=\
-Interface Stability	Uncommitted\
-.TE\
-.PP\
-.SH NOTES\
-Source for GNU emacs is available on http://opensolaris.org.\
-.\\" End Solaris update
-TEXT
--- a/components/fastcgi/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/fastcgi/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -35,9 +35,7 @@
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
-
-LIBNAME=        fcgi
-LINTOUT=        lint.out
+include ../../make-rules/lint-libraries.mk
 
 CONFIGURE_OPTIONS += --disable-static
 CONFIGURE_OPTIONS += --with-pic
@@ -45,24 +43,12 @@
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += CXXFLAGS="$(CFLAGS)"
 
-PUBLISH_TRANSFORMS +=	doc-transform
-
-COMPONENT_POST_BUILD_ACTION = \
-         (cd $(@D); $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \
-                        -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \
-                        $(COMPONENT_DIR)/llib-lfcgi > $(LINTOUT) 2>&1)
-
-COMPONENT_POST_INSTALL_ACTION = \
-        (cd $(@D); $(INSTALL) llib-lfcgi.ln \
-                        $(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)))
-
 # common targets
 build:     $(BUILD_32_and_64)
 
 install:        $(INSTALL_32_and_64)
 
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
--- a/components/fastcgi/doc-transform	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#
-# 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> >
--- a/components/fastcgi/fcgi-doc.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/fastcgi/fcgi-doc.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,46 +20,52 @@
 #
 # 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)
+
+# These are not installed, but can be found in the doc directory.
+<transform file path=usr/share/doc/fastcgi/(.+)$ -> set action.hash doc/%<\1> >
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/fastcgi/documentation@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Documentation for FastCGI application libraries"
 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.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/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_guida.htm
 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/apaman.htm
 file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch1inta1.gif
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch1intra.gif
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch1intro.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch2c.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch3perl.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/ch4tcl.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/cover.htm
+file path=usr/share/doc/fastcgi/fastcgi-prog-guide/covera.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/img00002.gif
 file path=usr/share/doc/fastcgi/fastcgi-whitepaper/img00003.gif
+file path=usr/share/doc/fastcgi/fcgi-devel-kit.htm
+file path=usr/share/doc/fastcgi/fcgi-java.htm
 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/overview.html
 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)"
+    desc="Documentation for FastCGI Application Libraries (2.4.0)" \
+    name="FastCGI Application Libraries - Documentation"
+license fcgi.license license=FastCGI
--- 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)"
-
--- a/components/gawk/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gawk/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -34,24 +34,16 @@
 include ../../make-rules/ips.mk
 
 CONFIGURE_OPTIONS	+=	--infodir=$(CONFIGURE_INFODIR)
-CONFIGURE_OPTIONS	+=	--libexecdir=/usr/lib
+CONFIGURE_OPTIONS	+=	--libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
 CONFIGURE_OPTIONS	+=	CFLAGS="$(CFLAGS)"
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-install:	$(PROTOGNUBIN) $(PROTOGNUSHAREMAN1) $(INSTALL_32)
-	$(RM) $(PROTOGNUBIN)/awk
-	$(SYMLINK) ../../bin/gawk $(PROTOGNUBIN)/awk
-	$(RM) $(PROTOGNUSHAREMAN1)/awk.1
-	$(SYMLINK) ../../../../share/man/man1/gawk.1 \
-			$(PROTOGNUSHAREMAN1)/awk.1
+install:	$(INSTALL_32)
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/gawk/gawk.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gawk/gawk.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,16 +21,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/text/gawk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/text/gawk@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="The awk utility interprets a special-purpose programming language that makes it possible to handle many data-reformatting jobs with just a few lines of code."
 set name=pkg.summary value="GNU awk"
-set name=pkg.description value="The awk utility interprets a special-purpose programming language that makes it possible to handle many data-reformatting jobs with just a few lines of code."
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://directory.fsf.org/project/gawk/"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://directory.fsf.org/project/gawk/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/594
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license gawk.license license="GPLv2"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -125,11 +128,10 @@
 file path=usr/share/locale/vi/LC_MESSAGES/gawk.mo
 file path=usr/share/man/man1/gawk.1
 file path=usr/share/man/man1/igawk.1
-link path=usr/share/man/man1/pgawk.1 target=gawk.1
+legacy pkg=SUNWgawk desc="gawk - GNU awk 3.1.5" \
+    name="gawk - GNU implementation of awk"
+license gawk.license license=GPLv2
 link path=usr/gnu/bin/awk target=../../bin/gawk
 link path=usr/gnu/share/man/man1/awk.1 \
     target=../../../../share/man/man1/gawk.1
-
-legacy  pkg=SUNWgawk \
-	name="gawk - GNU implementation of awk" \
-	desc="gawk - GNU awk 3.1.5"
+link path=usr/share/man/man1/pgawk.1 target=gawk.1
--- a/components/gawk/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Oracle update\
-.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	text/gawk\
-=\
-Interface Stability	Volatile\
-.TE \
-.PP\
-.SH NOTES\
-Source for gawk is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/gawk/patches/gawk_manpage1.patch	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- gawk-3.1.5/doc/gawk.1_orig	Sun Jun 26 06:42:14 2005
-+++ gawk-3.1.5/doc/gawk.1	Wed Feb 23 13:10:34 2011
-@@ -1,3 +1,8 @@
-+'\" t
-+.\"
-+.\" Modified for Solaris to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\" 
- .ds PX \s-1POSIX\s+1
- .ds UX \s-1UNIX\s+1
- .ds AN \s-1ANSI\s+1
-@@ -3456,3 +3461,23 @@
- manual page into another language, under the above conditions for
- modified versions, except that this permission notice may be stated in
- a translation approved by the Foundation.
-+.\" Begin Oracle update
-+.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	text/gawk
-+=
-+Interface Stability	Volatile
-+.TE 
-+.PP
-+.SH NOTES
-+Source for gawk is available on http://opensolaris.org.
-+.\" End Oracle update
--- a/components/gawk/patches/igawk_manpage1.patch	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- gawk-3.1.5/doc/igawk.1_orig	Wed May 11 08:28:14 2005
-+++ gawk-3.1.5/doc/igawk.1	Wed Feb 23 13:10:41 2011
-@@ -1,3 +1,8 @@
-+'\" t
-+.\"
-+.\" Modified for Solaris to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\" 
- .TH IGAWK 1 "Nov 3 1999" "Free Software Foundation" "Utility Commands"
- .SH NAME
- igawk \- gawk with include files
-@@ -71,3 +76,23 @@
- .SH AUTHOR
- Arnold Robbins
- .RB ( [email protected] ).
-+.\" Begin Oracle update
-+.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	text/gawk
-+=
-+Interface Stability	Volatile
-+.TE 
-+.PP
-+.SH NOTES
-+Source for gawk is available on http://opensolaris.org.
-+.\" End Oracle update
--- a/components/gd2/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gd2/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -35,9 +35,7 @@
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
-
-LIBNAME =       gd
-LINTOUT =       lint.out
+include ../../make-rules/lint-libraries.mk
 
 PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig
 PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig
@@ -59,26 +57,11 @@
 
 COMPONENT_PREP_ACTION = (cd $(@D) ; autoconf)
 
-COMPONENT_POST_BUILD_ACTION = \
-	 (cd $(@D); $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \
-			-I$(COMPONENT_DIR)/$(COMPONENT_SRC) \
-			$(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1)
-
-COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \
-			$(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)))
-
-PROTOUSRSHAREDOCDIR = $(PROTOUSRSHAREDIR)/doc/gd2/html
-
 build: $(BUILD_32_and_64)
 
-GSED =	/usr/gnu/bin/sed
-
-include ../../make-rules/shared-targets.mk
-
 install: $(INSTALL_32_and_64)
 
-test: $(BUILD_32_and_64)
+test: 	$(NO_TESTS)
 	@echo "There is no test harness for libgd2."
 	@echo "Test programs must be run manually and their output"
 	@echo "should be visually inspected."
--- a/components/gd2/Solaris/libgd2.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gd2/Solaris/libgd2.1	Wed Apr 13 09:58:06 2011 -0700
@@ -29,22 +29,3 @@
 details are available at \fIhttp://www.libgd.org/\fR.  LibGD is released
 under the \fILibGD License\fR.
 .LP
-.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    library/gd
-=
-Interface Stability     Uncommitted
-.TE
-.PP
-.SH NOTES
-Source for LibGD is available on http://opensolaris.org.
-
--- a/components/gd2/Solaris/libgd2.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gd2/Solaris/libgd2.3	Wed Apr 13 09:58:06 2011 -0700
@@ -24,23 +24,3 @@
 details are available at \fIhttp://www.libgd.org/\fR.  LibGD is released
 under the \fILibGD License\fR.
 .LP
-.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    library/gd
-=
-Interface Stability     Uncommitted
-.TE
-.PP
-.SH NOTES
-Source for LibGD is available on http://opensolaris.org.
-
-
--- a/components/gd2/gd2.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gd2/gd2.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,12 +23,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/gd@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/gd@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="GD - An open source code library for the dynamic creation of images by programmers"
 set name=pkg.summary value="The Graphics Draw Library"
-set name=pkg.description value="GD - An open source code library for the dynamic creation of images by programmers" 
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.libgd.org/"
+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.libgd.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/166
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
@@ -71,13 +77,13 @@
 file path=usr/include/gd2/gdhelpers.h
 file path=usr/include/gd2/jisx0208.h
 file path=usr/include/gd2/wbmp.h
+file path=usr/lib/$(MACH64)/libgd.so.2.0.0
+file path=usr/lib/$(MACH64)/llib-lgd.ln
 file path=usr/lib/libgd.so.2.0.0
-file path=usr/lib/$(MACH64)/libgd.so.2.0.0
 file llib-lgd path=usr/lib/llib-lgd
 file path=usr/lib/llib-lgd.ln
-file path=usr/lib/$(MACH64)/llib-lgd.ln
+file entities.html path=usr/share/doc/gd2/html/entities.html
 file index.html path=usr/share/doc/gd2/html/index.html
-file entities.html path=usr/share/doc/gd2/html/entities.html
 file Solaris/libgd2.1-extra path=usr/share/man/man1/annotate.1
 file Solaris/libgd2.1-extra path=usr/share/man/man1/gd2copypal.1
 file Solaris/libgd2.1-extra path=usr/share/man/man1/gd2time.1
@@ -93,14 +99,13 @@
 file Solaris/libgd2.1-extra path=usr/share/man/man1/webpng.1
 file Solaris/libgd2.3 path=usr/share/man/man3/libgd2.3
 #
-link path=usr/lib/libgd.so.2 target=libgd.so.2.0.0
-link path=usr/lib/libgd.so target=libgd.so.2.0.0
-link path=usr/lib/$(MACH64)/libgd.so.2 target=libgd.so.2.0.0
-link path=usr/lib/$(MACH64)/libgd.so target=libgd.so.2.0.0
+legacy pkg=SUNWgd2 desc="GD - The Graphics Draw Library (2.0.35)" \
+    name="The Graphics Draw Library"
 #
 license gd2.license license="GD2 License"
+link path=usr/lib/$(MACH64)/libgd.so target=libgd.so.2.0.0
+link path=usr/lib/$(MACH64)/libgd.so.2 target=libgd.so.2.0.0
+link path=usr/lib/libgd.so target=libgd.so.2.0.0
 #
-legacy pkg=SUNWgd2 \
-    desc="GD - The Graphics Draw Library (2.0.35)" \
-    name="The Graphics Draw Library"
+link path=usr/lib/libgd.so.2 target=libgd.so.2.0.0
 
--- a/components/gettext/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gettext/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -29,7 +29,6 @@
 COMPONENT_VERSION=	0.16.1
 IPS_PKG_NAME=		text/gnu-gettext
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://www.gnu.org/software/gettext/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:8642f4346dfd6a18ecd883329e150bfe9e0886c3
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/pub/gnu/gettext/$(COMPONENT_ARCHIVE)
@@ -46,33 +45,6 @@
 CONFIGURE_OPTIONS  +=		--disable-shared
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-MAN1PAGES =	autopoint
-MAN1PAGES +=	envsubst
-MAN1PAGES +=	gettext
-MAN1PAGES +=	gettextize
-MAN1PAGES +=	msgattrib
-MAN1PAGES +=	msgcat
-MAN1PAGES +=	msgcmp
-MAN1PAGES +=	msgcomm
-MAN1PAGES +=	msgconv
-MAN1PAGES +=	msgen
-MAN1PAGES +=	msgexec
-MAN1PAGES +=	msgfilter
-MAN1PAGES +=	msgfmt
-MAN1PAGES +=	msggrep
-MAN1PAGES +=	msginit
-MAN1PAGES +=	msgmerge
-MAN1PAGES +=	msgunfmt
-MAN1PAGES +=	msguniq
-MAN1PAGES +=	ngettext
-MAN1PAGES +=	xgettext
-
-COMPONENT_POST_INSTALL_ACTION = \
-	$(MAN_STABILITY) -n "GNU gettext" -p $(IPS_PKG_NAME) -s Uncommitted \
-	    $(MAN1PAGES:%=$(PROTOUSRSHAREMAN1DIR)/%.1) ; \
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
--- a/components/gettext/gettext.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gettext/gettext.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,14 +21,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU gettext"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/text/gnu-gettext@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="GNU gettext - message handling utilities"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=pkg.summary value="GNU gettext"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/gettext/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/635
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -300,7 +304,8 @@
 file path=usr/share/doc/gettext/examples/build-aux/javaexec.sh.in
 file path=usr/share/doc/gettext/examples/hello-c++-gnome/INSTALL
 file path=usr/share/doc/gettext/examples/hello-c++-gnome/Makefile.am
-file path=usr/share/doc/gettext/examples/hello-c++-gnome/autoclean.sh mode=0555
+file path=usr/share/doc/gettext/examples/hello-c++-gnome/autoclean.sh \
+    mode=0555
 file path=usr/share/doc/gettext/examples/hello-c++-gnome/autogen.sh mode=0555
 file path=usr/share/doc/gettext/examples/hello-c++-gnome/configure.ac
 file path=usr/share/doc/gettext/examples/hello-c++-gnome/hello.cc
@@ -448,8 +453,10 @@
 file path=usr/share/doc/gettext/examples/hello-c++-qt/po/zh_TW.po
 file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/INSTALL
 file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/Makefile.am
-file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/autoclean.sh mode=0555
-file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/autogen.sh mode=0555
+file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/autoclean.sh \
+    mode=0555
+file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/autogen.sh \
+    mode=0555
 file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/configure.ac
 file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/hello.cc
 file path=usr/share/doc/gettext/examples/hello-c++-wxwidgets/m4/Makefile.am
@@ -638,8 +645,10 @@
 file path=usr/share/doc/gettext/examples/hello-csharp-forms/INSTALL
 file path=usr/share/doc/gettext/examples/hello-csharp-forms/Makefile.am
 file path=usr/share/doc/gettext/examples/hello-csharp-forms/README
-file path=usr/share/doc/gettext/examples/hello-csharp-forms/autoclean.sh mode=0555
-file path=usr/share/doc/gettext/examples/hello-csharp-forms/autogen.sh mode=0555
+file path=usr/share/doc/gettext/examples/hello-csharp-forms/autoclean.sh \
+    mode=0555
+file path=usr/share/doc/gettext/examples/hello-csharp-forms/autogen.sh \
+    mode=0555
 file path=usr/share/doc/gettext/examples/hello-csharp-forms/configure.ac
 file path=usr/share/doc/gettext/examples/hello-csharp-forms/hello.cs
 file path=usr/share/doc/gettext/examples/hello-csharp-forms/m4/Makefile.am
@@ -823,7 +832,8 @@
 file path=usr/share/doc/gettext/examples/hello-java-swing/Hello.java
 file path=usr/share/doc/gettext/examples/hello-java-swing/INSTALL
 file path=usr/share/doc/gettext/examples/hello-java-swing/Makefile.am
-file path=usr/share/doc/gettext/examples/hello-java-swing/autoclean.sh mode=0555
+file path=usr/share/doc/gettext/examples/hello-java-swing/autoclean.sh \
+    mode=0555
 file path=usr/share/doc/gettext/examples/hello-java-swing/autogen.sh mode=0555
 file path=usr/share/doc/gettext/examples/hello-java-swing/configure.ac
 file path=usr/share/doc/gettext/examples/hello-java-swing/m4/Makefile.am
@@ -932,7 +942,8 @@
 file path=usr/share/doc/gettext/examples/hello-librep/po/zh_TW.po
 file path=usr/share/doc/gettext/examples/hello-objc-gnome/INSTALL
 file path=usr/share/doc/gettext/examples/hello-objc-gnome/Makefile.am
-file path=usr/share/doc/gettext/examples/hello-objc-gnome/autoclean.sh mode=0555
+file path=usr/share/doc/gettext/examples/hello-objc-gnome/autoclean.sh \
+    mode=0555
 file path=usr/share/doc/gettext/examples/hello-objc-gnome/autogen.sh mode=0555
 file path=usr/share/doc/gettext/examples/hello-objc-gnome/configure.ac
 file path=usr/share/doc/gettext/examples/hello-objc-gnome/hello.m
@@ -979,8 +990,10 @@
 file path=usr/share/doc/gettext/examples/hello-objc-gnustep/Hello.h
 file path=usr/share/doc/gettext/examples/hello-objc-gnustep/Hello.m
 file path=usr/share/doc/gettext/examples/hello-objc-gnustep/INSTALL
-file path=usr/share/doc/gettext/examples/hello-objc-gnustep/autoclean.sh mode=0555
-file path=usr/share/doc/gettext/examples/hello-objc-gnustep/autogen.sh mode=0555
+file path=usr/share/doc/gettext/examples/hello-objc-gnustep/autoclean.sh \
+    mode=0555
+file path=usr/share/doc/gettext/examples/hello-objc-gnustep/autogen.sh \
+    mode=0555
 file path=usr/share/doc/gettext/examples/hello-objc-gnustep/main.m
 file path=usr/share/doc/gettext/examples/hello-objc-gnustep/po/GNUmakefile
 file path=usr/share/doc/gettext/examples/hello-objc-gnustep/po/LINGUAS
@@ -1234,7 +1247,8 @@
 file path=usr/share/doc/gettext/examples/hello-sh/po/zh_TW.po
 file path=usr/share/doc/gettext/examples/hello-smalltalk/INSTALL
 file path=usr/share/doc/gettext/examples/hello-smalltalk/Makefile.am
-file path=usr/share/doc/gettext/examples/hello-smalltalk/autoclean.sh mode=0555
+file path=usr/share/doc/gettext/examples/hello-smalltalk/autoclean.sh \
+    mode=0555
 file path=usr/share/doc/gettext/examples/hello-smalltalk/autogen.sh mode=0555
 file path=usr/share/doc/gettext/examples/hello-smalltalk/configure.ac
 file path=usr/share/doc/gettext/examples/hello-smalltalk/hello.st.in
@@ -1648,6 +1662,10 @@
 file path=usr/share/man/man1/msgunfmt.1
 file path=usr/share/man/man1/msguniq.1
 file path=usr/share/man/man1/ngettext.1
+legacy pkg=SUNWgnu-gettext \
+    desc="GNU gettext - message handling utilities (0.16.1)" \
+    name="GNU gettext"
+license gettext.license license=GPLv2
 link path=usr/gnu/bin/gettext target=../../bin/ggettext
 link path=usr/gnu/bin/msgfmt target=../../bin/gmsgfmt
 link path=usr/gnu/bin/xgettext target=../../bin/gxgettext
@@ -1657,9 +1675,3 @@
     target=../../../../share/man/man1/gmsgfmt.1
 link path=usr/gnu/share/man/man1/xgettext.1 \
     target=../../../../share/man/man1/gxgettext.1
-
-license gettext.license license="GPLv2"
-
-legacy	pkg=SUNWgnu-gettext \
-	name="GNU gettext" \
-	desc="GNU gettext - message handling utilities (0.16.1)"
--- a/components/ggrep/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ggrep/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,23 +40,12 @@
 CONFIGURE_OPTIONS  +=		--prefix=/usr
 CONFIGURE_OPTIONS  +=		--program-prefix=g
 
-PROGS =		egrep fgrep grep
-GNUPROGS = $(PROGS)
-GNUMAN1=   $(PROGS:%=%.1)
-SFWPROGS = $(PROGS:%=g%)
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) $(PROTOSFWLINKS) $(PROTOGNULINKS) \
-		$(PROTOGNUMAN1LINKS)
+install:	$(INSTALL_32)
 
-test32:		$(BUILD_32)
-	(cd $(BUILD_DIR_32); env - $(GMAKE) check)
-
-test:	test32
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/ggrep/gnu-grep.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ggrep/gnu-grep.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/text/gnu-grep@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/text/gnu-grep@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="The grep command searches one or more input files for lines containing a match to a specified pattern."
 set name=pkg.summary value="GNU grep utilities"
-set name=pkg.description value="The grep command searches one or more input files for lines containing a match to a specified pattern."
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://gnu.org/software/grep/"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://gnu.org/software/grep/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -124,21 +130,24 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
+file path=usr/bin/gegrep
+file path=usr/bin/gfgrep
+file path=usr/bin/ggrep
 file path=usr/share/info/grep.info
+file path=usr/share/locale/af/LC_MESSAGES/grep.mo
+file path=usr/share/locale/be/LC_MESSAGES/grep.mo
+file path=usr/share/locale/bg/LC_MESSAGES/grep.mo
+file path=usr/share/locale/ca/LC_MESSAGES/grep.mo
 file path=usr/share/locale/cs/LC_MESSAGES/grep.mo
+file path=usr/share/locale/da/LC_MESSAGES/grep.mo
 file path=usr/share/locale/de/LC_MESSAGES/grep.mo
-file path=usr/share/locale/et/LC_MESSAGES/grep.mo
-file path=usr/share/locale/da/LC_MESSAGES/grep.mo
-file path=usr/share/locale/es/LC_MESSAGES/grep.mo
+file path=usr/share/locale/el/LC_MESSAGES/grep.mo
 file path=usr/share/locale/eo/LC_MESSAGES/grep.mo
-file path=usr/share/locale/ca/LC_MESSAGES/grep.mo
-file path=usr/share/locale/af/LC_MESSAGES/grep.mo
-file path=usr/share/locale/bg/LC_MESSAGES/grep.mo
-file path=usr/share/locale/be/LC_MESSAGES/grep.mo
-file path=usr/share/locale/el/LC_MESSAGES/grep.mo
-file path=usr/share/locale/fr/LC_MESSAGES/grep.mo
+file path=usr/share/locale/es/LC_MESSAGES/grep.mo
+file path=usr/share/locale/et/LC_MESSAGES/grep.mo
 file path=usr/share/locale/eu/LC_MESSAGES/grep.mo
 file path=usr/share/locale/fi/LC_MESSAGES/grep.mo
+file path=usr/share/locale/fr/LC_MESSAGES/grep.mo
 file path=usr/share/locale/ga/LC_MESSAGES/grep.mo
 file path=usr/share/locale/gl/LC_MESSAGES/grep.mo
 file path=usr/share/locale/he/LC_MESSAGES/grep.mo
@@ -155,7 +164,7 @@
 file path=usr/share/locale/pl/LC_MESSAGES/grep.mo
 file path=usr/share/locale/pt/LC_MESSAGES/grep.mo
 file path=usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
-file path=usr/share/locale/ro/LC_MESSAGES/grep.mo 
+file path=usr/share/locale/ro/LC_MESSAGES/grep.mo
 file path=usr/share/locale/ru/LC_MESSAGES/grep.mo
 file path=usr/share/locale/rw/LC_MESSAGES/grep.mo
 file path=usr/share/locale/sk/LC_MESSAGES/grep.mo
@@ -169,21 +178,18 @@
 file path=usr/share/man/man1/gegrep.1
 file path=usr/share/man/man1/gfgrep.1
 file path=usr/share/man/man1/ggrep.1
-file path=usr/bin/gegrep
-file path=usr/bin/gfgrep
-file path=usr/bin/ggrep
-link path=usr/gnu/share/man/man1/grep.1 target=../../../../share/man/man1/ggrep.1
+legacy pkg=SUNWggrp desc="ggrep - GNU grep utilities 2.5.4" \
+    name="ggrep - GNU grep utilities"
+license gnu-grep.license license=GPLv3
 link path=usr/gnu/bin/egrep target=../../bin/gegrep
+link path=usr/gnu/bin/fgrep target=../../bin/gfgrep
+link path=usr/gnu/bin/grep target=../../bin/ggrep
+link path=usr/gnu/share/man/man1/egrep.1 \
+    target=../../../../share/man/man1/ggrep.1
+link path=usr/gnu/share/man/man1/fgrep.1 \
+    target=../../../../share/man/man1/ggrep.1
+link path=usr/gnu/share/man/man1/grep.1 \
+    target=../../../../share/man/man1/ggrep.1
+link path=usr/sfw/bin/gegrep target=../../bin/gegrep
 link path=usr/sfw/bin/gfgrep target=../../bin/gfgrep
 link path=usr/sfw/bin/ggrep target=../../bin/ggrep
-link path=usr/gnu/bin/fgrep target=../../bin/gfgrep
-link path=usr/sfw/bin/gegrep target=../../bin/gegrep
-link path=usr/gnu/share/man/man1/egrep.1 target=../../../../share/man/man1/ggrep.1
-link path=usr/gnu/share/man/man1/fgrep.1 target=../../../../share/man/man1/ggrep.1
-link path=usr/gnu/bin/grep target=../../bin/ggrep
-
-license gnu-grep.license license="GPLv3"
-
-legacy pkg=SUNWggrp \
-	name="ggrep - GNU grep utilities" \
-	desc="ggrep - GNU grep utilities 2.5.4"
--- a/components/ghostscript/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ghostscript/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -70,7 +70,7 @@
 
 $(IJS_VARIANT)/.configured: COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR)/ijs $(@D); \
-	cd $(@D) ; $(ENV) $(CONFIGURE_ENV) autogen.sh )
+	cd $(@D) ; $(ENV) $(CONFIGURE_ENV) ./autogen.sh )
 
 CONFIGURE_SCRIPT = ./configure
 
--- a/components/ghostscript/ghostscript.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ghostscript/ghostscript.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,12 +20,15 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
 set name=pkg.fmri value=pkg:/print/filter/ghostscript@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GPL Ghostscript"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing "
 set name=info.upstream_url value=http://ghostscript.com/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license ghostscript.license license="GPLv2"
--- a/components/git/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/git/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -50,6 +50,8 @@
 COMPONENT_BUILD_ENV+=	NO_PERL_MAKEMAKER=1
 COMPONENT_INSTALL_ENV+=	PERL_LIB=$(shell /usr/perl5/$(PERL_VERSION)/bin/perl -MConfig -e 'print "$$Config{installvendorarch}"')
 
+COMPONENT_TEST_TARGETS = test
+
 #
 # This runs configure but configure doesn't generate a Makefile.
 # Instead a Makefile comes with git ...
@@ -69,7 +71,13 @@
 
 build:		$(BUILD_32) $(DOC)/.manpages
 
-install:	$(INSTALL_32) $(BUILD_DIR_32)/.manpages
+install:	$(INSTALL_32)
+
+#
+# tests fully pass when done in the archive directory.
+# fail here; probably due to the use of cloney.
+#
+test:	$(TEST_32)
 
 #
 # I know.  It's ugly.
@@ -79,58 +87,25 @@
 #
 $(DOC)/.manpages:
 	cd $(BUILD_DIR) ; $(UNPACK) $(UNPACK_ARGS) ../$(COMPONENT_ARCHIVE_1)
-	$(MKDIR) $(DOC)
+	$(MKDIR) $(@D)
 	cd $(BUILD_DIR)/man1 ; for manfile in *.1; \
 	do \
-		sed -f ../../solarisman-stability $$manfile > \
-			$(DOC)/$$manfile; \
+		name=`basename $$manfile .1`; \
+		cat $$manfile > $(DOC)/$$name.1; \
 	done
 	cd $(BUILD_DIR)/man5 ; for manfile in *.5; \
 	do \
 		name=`basename $$manfile .5`; \
-		sed 's/"5"/"4"/' $$manfile | \
-		sed -f ../../solarisman-stability > $(DOC)/$$name.4; \
+		sed 's/"5"/"4"/' $$manfile > $(DOC)/$$name.4; \
 	done
 	cd $(BUILD_DIR)/man7 ; for manfile in *.7; \
         do \
 		name=`basename $$manfile .7`; \
-		sed 's/"7"/"5"/' $$manfile | \
-		sed -f ../../solarisman-stability > $(DOC)/$$name.5; \
+		sed 's/"7"/"5"/' $$manfile > $(DOC)/$$name.5; \
 	done
-	@ touch $(DOC)/.manpages
-
-#
-# install manpages per architecture
-#
-$(BUILD_DIR_32)/.manpages:
-	$(MKDIR) $(PROTOUSRSHAREMAN1DIR)
-	$(MKDIR) $(PROTOUSRSHAREMAN4DIR)
-	$(MKDIR) $(PROTOUSRSHAREMAN5DIR)
-	cd $(DOC) ; for manfile in *.1; \
-	do \
-		$(RM) $(PROTOUSRSHAREMAN1DIR)/$$manfile; \
-		$(INSTALL) -m 0444 $$manfile $(PROTOUSRSHAREMAN1DIR); \
-	done
-	cd $(DOC) ; for manfile in *.4; \
-	do \
-		$(RM) $(PROTOUSRSHAREMAN4DIR)/$$manfile; \
-		$(INSTALL) -m 0444 $$manfile $(PROTOUSRSHAREMAN4DIR); \
-	done
-	cd $(DOC) ; for manfile in *.5; \
-	do \
-		$(RM) $(PROTOUSRSHAREMAN5DIR)/$$manfile; \
-		$(INSTALL) -m 0444 $$manfile $(PROTOUSRSHAREMAN5DIR); \
-	done
-	@ touch $(BUILD_DIR_32)/.manpages
+	$(TOUCH) $@
 
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-#
-# tests fully pass when done in the archive directory.
-# fail here; probably due to the use of cloney.
-#
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) test
-
 include ../../make-rules/depend.mk
--- a/components/git/git.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/git/git.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -22,6 +22,8 @@
 #
 
 <transform file path=usr/lib/git-core/.* -> default mode 0555>
+<transform file path=usr/share/man/man./(.+$) -> set action.hash Documentation/%<\1> >
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/developer/versioning/git@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -31,6 +33,8 @@
     value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://git-scm.com/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/360
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
@@ -126,8 +130,10 @@
 file path=usr/lib/python2.6/site-packages/git_remote_helpers/git/repo.pyc
 file path=usr/lib/python2.6/site-packages/git_remote_helpers/util.py
 file path=usr/lib/python2.6/site-packages/git_remote_helpers/util.pyc
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Error.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Git.pm
+file \
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Error.pm
+file \
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)-solaris-64int/Git.pm
 file path=usr/share/git-core/templates/description
 file path=usr/share/git-core/templates/hooks/applypatch-msg.sample
 file path=usr/share/git-core/templates/hooks/commit-msg.sample
--- a/components/git/solarisman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Solaris update\
-.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	developer/versioning/git \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for git is available on http://opensolaris.org.\
-\.\\" End Solaris update
--- a/components/gnu-gs-fonts-other/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gnu-gs-fonts-other/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -46,8 +46,7 @@
 	$(MKDIR) -m 755 -p $(PROTOGSSHAREDIR)
 	$(CP) -r $(SOURCE_DIR)/* $(PROTOGSSHAREDIR)
 
-# empty test target
-test:
+test:	$(NO_TESTS)
 
 clean::
 	$(RM) -r $(BUILD_DIR)
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,13 +20,16 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-other@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-other@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Ghostscript Fonts (Other)"
-set name=info.classification value="org.opensolaris.category.2008:System/Printing"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Printing
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://sourceforge.net/projects/gs-fonts/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/share
 dir path=usr/share/ghostscript
@@ -92,9 +95,6 @@
 file path=usr/share/ghostscript/fonts/u004006t.afm
 file path=usr/share/ghostscript/fonts/u004006t.gsf
 file path=usr/share/ghostscript/fonts/u004006t.pfm
-
-license gnu-gs-fonts-other.license license="GPLv2"
-
-legacy pkg=SUNWgsfot \
-	name="GNU Ghostscript Fonts (Other)" \
-	desc="GNU Ghostscript Fonts (Other) 6.0"
+legacy pkg=SUNWgsfot desc="GNU Ghostscript Fonts (Other) 6.0" \
+    name="GNU Ghostscript Fonts (Other)"
+license gnu-gs-fonts-other.license license=GPLv2
--- a/components/gnu-gs-fonts-std/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gnu-gs-fonts-std/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -46,8 +46,7 @@
 	$(MKDIR) -m 755 -p $(PROTOGSSHAREDIR)
 	$(CP) -r $(SOURCE_DIR)/* $(PROTOGSSHAREDIR)
 
-# empty test target
-test:
+test:	$(NO_TESTS)
 
 clean::
 	$(RM) -r $(BUILD_DIR)
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,13 +20,17 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-std@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+set name=pkg.fmri \
+    value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-std@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Ghostscript Fonts (Standard)"
-set name=info.classification value="org.opensolaris.category.2008:System/Printing "
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Printing "
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://sourceforge.net/projects/gs-fonts/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/share
 dir path=usr/share/ghostscript
@@ -138,9 +142,6 @@
 file path=usr/share/ghostscript/fonts/z003034l.afm
 file path=usr/share/ghostscript/fonts/z003034l.pfb
 file path=usr/share/ghostscript/fonts/z003034l.pfm
-
-license gnu-gs-fonts-std.license license="GPLv2"
-
-legacy pkg=SUNWgsfst \
-	name="GNU Ghostscript Fonts (Standard)" \
-	desc="GNU Ghostscript Fonts (Standard) 6.0"
+legacy pkg=SUNWgsfst desc="GNU Ghostscript Fonts (Standard) 6.0" \
+    name="GNU Ghostscript Fonts (Standard)"
+license gnu-gs-fonts-std.license license=GPLv2
--- a/components/gperf/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gperf/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -33,7 +33,6 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-CONFIGURE_PREFIX    =	/usr
 CONFIGURE_OPTIONS  +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=	--docdir=/usr/share/doc/gperf
 CFLAGS		   +=	-norunpath
@@ -44,13 +43,9 @@
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
-	sed -f solarisman-stability $(COMPONENT_SRC)/doc/gperf.1 > \
-				   $(PROTOUSRSHAREMAN1DIR)/gperf.1
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	# tests fail at languages.gperf
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/gperf/gperf.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gperf/gperf.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,16 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/developer/gperf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/developer/gperf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string."
 set name=pkg.summary value="GNU gperf"
-set name=pkg.description value="GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string."
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/software/gperf"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/gperf
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/123
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license gperf.license license="GPLv2"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -42,7 +46,7 @@
 file path=usr/share/doc/gperf/gperf.html
 file path=usr/share/info/gperf.info
 file path=usr/share/man/man1/gperf.1
-
-legacy	pkg=SUNWgnu-gperf \
-	name="GNU gperf - perfect hash function generator" \
-	desc="GNU gperf - perfect hash function generator (3.0.3)"
+legacy pkg=SUNWgnu-gperf \
+    desc="GNU gperf - perfect hash function generator (3.0.3)" \
+    name="GNU gperf - perfect hash function generator"
+license gperf.license license=GPLv2
--- a/components/gperf/solarisman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Solaris update\
-.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	developer/gperf\
-=\
-Interface Stability	Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-Source for gperf is available on http://opensolaris.org.\
-\.\\" End Solaris update
--- a/components/gtar/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gtar/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -41,20 +41,13 @@
 CONFIGURE_OPTIONS +=	--program-prefix=g
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 
-GNUPROGS =	tar
-GNUMAN1 =	tar.1
-SFWPROGS =	gtar
-
-include ../../make-rules/shared-targets.mk
-
 COMPONENT_BUILD_TARGETS = all
 
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/gtar/gtar.1.sunman	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gtar/gtar.1.sunman	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\" This man page created by Sun to provide a reference to the info pages 
 .\" for gtar provided with the gtar distribution.
 .\"
@@ -33,23 +32,3 @@
 obtained by typing the command 'man -M /usr/share/man tar'.
 .SH LICENSE
 GNU General Public License (GPL)
-.\" Begin Sun update
-.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	archiver/gnu-tar
-=
-Interface Stability	Volatile
-.TE 
-.PP
-.SH NOTES
-Source for gtar is available on http://opensolaris.org.
-.\" End Sun update
--- a/components/gtar/gtar.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gtar/gtar.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/archiver/gnu-tar@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/archiver/gnu-tar@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Tar is a program for packaging a set of files as a single archive in tar format."
 set name=pkg.summary value="GNU version of the tar archiving utility"
-set name=pkg.description value="Tar is a program for packaging a set of files as a single archive in tar format."
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/software/tar/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/tar/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -155,14 +161,13 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/tar.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/tar.mo
 file gtar.1.sunman path=usr/share/man/man1/gtar.1
+legacy pkg=SUNWgtar \
+    desc="GNU tar - A utility used to store, backup, and transport files (gtar) 1.25" \
+    name="gtar - GNU tar"
+
+
+license gtar.license license=GPLv3
 link path=usr/gnu/bin/tar target=../../bin/gtar
 link path=usr/gnu/share/man/man1/tar.1 \
     target=../../../../share/man/man1/gtar.1
 link path=usr/sfw/bin/gtar target=../../bin/gtar
-
-
-license gtar.license license="GPLv3"
-
-legacy	pkg=SUNWgtar \
-	name="gtar - GNU tar" \
-	desc="GNU tar - A utility used to store, backup, and transport files (gtar) 1.25"
--- a/components/guile/guile-config.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/guile/guile-config.1	Wed Apr 13 09:58:06 2011 -0700
@@ -66,20 +66,3 @@
 
 Behavior is undefined for null ARGS or unrecognized commands.
 .PD
-.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	library/guile
-=
-Interface Stability	Uncommitted
-.TE
-.SH NOTES
-Source for guile is available on http://opensolaris.org.
--- a/components/guile/guile-snarf.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/guile/guile-snarf.1	Wed Apr 13 09:58:06 2011 -0700
@@ -116,20 +116,3 @@
 the source code. this means you can pass normal compilation flags to 
 guile-snarf to define preprocessor symbols, add header file directories, 
 and so on. 
-.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	library/guile
-=
-Interface Stability	Uncommitted
-.TE
-.SH NOTES
-Source for guile is available on http://opensolaris.org.
--- a/components/guile/guile-tools.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/guile/guile-tools.1	Wed Apr 13 09:58:06 2011 -0700
@@ -42,20 +42,3 @@
  
         guile-tools display-commentary '(scripts lint)'
         guile-tools --source lint
-.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	library/guile
-=
-Interface Stability	Uncommitted
-.TE
-.SH NOTES
-Source for guile is available on http://opensolaris.org.
--- a/components/guile/guile.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/guile/guile.1	Wed Apr 13 09:58:06 2011 -0700
@@ -24,20 +24,3 @@
 that has already adopted it.   However, it is not recommended that
 \fBguile\fR be used when developing new software projects.
 .PD
-.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	library/guile
-=
-Interface Stability	Uncommitted
-.TE
-.SH NOTES
-Source for guile is available on http://opensolaris.org.
--- a/components/guile/guile.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/guile/guile.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,6 +21,8 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr/share/guile/.+/scripts/.+$ -> default mode 0555>
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/guile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -30,12 +32,9 @@
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.gnu.org/software/guile/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/315
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license guile.license license=LGPLv2.1
-
-<transform file path=usr/share/guile/.+/scripts/.+$ -> default mode 0555>
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/bin/$(MACH64)
@@ -363,6 +362,9 @@
 file guile-snarf.1 path=usr/share/man/man1/guile-snarf.1
 file guile-tools.1 path=usr/share/man/man1/guile-tools.1
 file guile.1 path=usr/share/man/man1/guile.1
+legacy pkg=SUNWguile desc="GNU guile - extension language library (1.8.4)" \
+    name="guile - GNU guile utility"
+license guile.license license=LGPLv2.1
 link path=usr/lib/$(MACH64)/libguile-srfi-srfi-1-v-3.so \
     target=libguile-srfi-srfi-1-v-3.so.3.0.1
 link path=usr/lib/$(MACH64)/libguile-srfi-srfi-1-v-3.so.3 \
@@ -407,6 +409,3 @@
     target=libguilereadline-v-17.so.17.0.3
 link path=usr/lib/libguilereadline-v-17.so.17 \
     target=libguilereadline-v-17.so.17.0.3
-
-legacy pkg=SUNWguile desc="GNU guile - extension language library (1.8.4)" \
-    name="guile - GNU guile utility"
--- a/components/gutenprint/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gutenprint/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -53,9 +53,7 @@
 install:	$(INSTALL_32)
 
 # the tests mostly pass, but it can't find several drivers for ppd files
-test:		build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/gutenprint/gutenprint.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gutenprint/gutenprint.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,13 +20,19 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/print/filter/gutenprint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
-set name=info.classification value="org.opensolaris.category.2008:System/Printing"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/print/filter/gutenprint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Printing
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.gutenprint.org/software/gutenprint
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/469
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/include
@@ -162,18 +168,18 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/cmykro.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/cx3650.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/defaultblack.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_photo.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_photo7_japan.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome_k3v.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360_ultrachrome.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/inks/f360.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/nx100.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen0.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen1.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen2.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen3.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen3_4.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen3.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_gen4.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/photo_pigment.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/picturemate_4.xml
@@ -181,17 +187,18 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_gen1.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_gen2.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_pigment.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome_k3.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/inks/pro_ultrachrome.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/standard_gen0.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/inks/standard.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/wf40.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/wf500.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inks/x80.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/artisan.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/b500.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
+file \
+    path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml
@@ -215,18 +222,18 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/media/cmykrb.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/cmykro.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/cx3650.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/media/f360.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/f360_photo.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/f360_photo7_japan.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/media/f360_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/f360_ultrachrome_k3.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/f360_ultrachrome_k3v.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/media/f360_ultrachrome.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/media/f360.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/nx100.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_gen0.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_gen1.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_gen2.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_gen3.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_gen3_4.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_gen3.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_gen4.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/photo_pigment.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/picturemate_4.xml
@@ -234,11 +241,11 @@
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_gen1.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_gen2.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_pigment.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome_k3.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/media/pro_ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/r800.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/media/standard.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/standard_gen0.xml
-file path=usr/share/gutenprint/5.2/xml/escp2/media/standard.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/ultrachrome.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/wf500.xml
 file path=usr/share/gutenprint/5.2/xml/escp2/media/x80.xml
@@ -354,14 +361,14 @@
 file path=usr/share/gutenprint/5.2/xml/papers.xml
 file path=usr/share/gutenprint/5.2/xml/printers.xml
 file path=usr/share/gutenprint/doc/AUTHORS
+file path=usr/share/gutenprint/doc/COPYING
 file path=usr/share/gutenprint/doc/ChangeLog
-file path=usr/share/gutenprint/doc/COPYING
 file path=usr/share/gutenprint/doc/FAQ.html
+file path=usr/share/gutenprint/doc/NEWS
+file path=usr/share/gutenprint/doc/README
 file path=usr/share/gutenprint/doc/gutenprint-users-manual.odt
 file path=usr/share/gutenprint/doc/gutenprint-users-manual.pdf
 file path=usr/share/gutenprint/doc/gutenprint.pdf
-file path=usr/share/gutenprint/doc/NEWS
-file path=usr/share/gutenprint/doc/README
 file path=usr/share/gutenprint/doc/reference-html/book1.html
 file path=usr/share/gutenprint/doc/reference-html/c1717.html
 file path=usr/share/gutenprint/doc/reference-html/c194.html
@@ -408,13 +415,11 @@
 file path=usr/share/man/man8/cups-calibrate.8
 file path=usr/share/man/man8/cups-genppd.8
 file path=usr/share/man/man8/cups-genppdupdate.8
+legacy pkg=SUNWgutenprint \
+    desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers (5.2.4)" \
+    name="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
+license gutenprint.license license=GPLv2
 link path=usr/lib/libgutenprint.so target=libgutenprint.so.2.0.5
 link path=usr/lib/libgutenprint.so.2 target=libgutenprint.so.2.0.5
 link path=usr/lib/libgutenprintui2.so target=libgutenprintui2.so.1.0.0
 link path=usr/lib/libgutenprintui2.so.1 target=libgutenprintui2.so.1.0.0
-
-license gutenprint.license license="GPLv2"
-
-legacy	pkg=SUNWgutenprint \
-	name="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers" \
-	desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers (5.2.4)"
--- a/components/gzip/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gzip/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -66,8 +66,7 @@
 
 install:	$(INSTALL_32) $(GZGREP_MAN_VARIANTS)
 
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/gzip/gzip.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/gzip/gzip.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:/compress/gzip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU Zip (gzip)"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/compress/gzip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="The GNU Zip (gzip) compression utility"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://directory.fsf.org/GNU/gzip.html"
+set name=pkg.summary value="GNU Zip (gzip)"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://directory.fsf.org/GNU/gzip.html
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -61,10 +66,8 @@
 hardlink path=usr/bin/gzcmp target=gzdiff
 hardlink path=usr/bin/gzegrep target=gzgrep
 hardlink path=usr/bin/gzfgrep target=gzgrep
+legacy pkg=SUNWgzip desc="The GNU Zip (gzip) compression utility 1.3.5" \
+    name="The GNU Zip (gzip) compression utility"
 
 
-license gzip.license license="GPLv2"
-
-legacy	pkg=SUNWgzip \
-	name="The GNU Zip (gzip) compression utility" \
-	desc="The GNU Zip (gzip) compression utility 1.3.5"
+license gzip.license license=GPLv2
--- a/components/hal-cups-utils/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/hal-cups-utils/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -57,8 +57,7 @@
 
 install:	$(INSTALL_32)
 
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/hal-cups-utils/hal-cups-utils.5	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/hal-cups-utils/hal-cups-utils.5	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" te
 .TH hal-cups-utils 5 "14 Apr 2009" "SunOS 5.11" "Standards, Environments, and Macros"
 .SH NAME
 hal-cups-utils - automatic queue configuration for CUPS
@@ -22,23 +21,3 @@
 http://www.cups.org/
 .sp
 .LP
-.SH ATTRIBUTES
-.sp
-.LP
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-box;
-cbp-1 | cbp-1
-l | l .
-ATTRIBUTE TYPE  ATTRIBUTE VALUE
-=
-Availability    print/cups/hal-cups-utils
-=
-Interface Stability     Volatile
-.TE 
-.PP
-.SH NOTES
-Source for hal-cups-utils is available on http://opensolaris.org.
--- a/components/hal-cups-utils/hal-cups-utils.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/hal-cups-utils/hal-cups-utils.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,16 +21,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/print/cups/hal-cups-utils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="hal-cups-utils is a Hardware Abstraction Layer (HAL) plugin module that automatically creates print queues under the Common UNIX Printing System (CUPS) for printers detected by HAL."
 set name=pkg.summary value="Automatic queue creation for CUPS"
-set name=pkg.description value="hal-cups-utils is a Hardware Abstraction Layer (HAL) plugin module that automatically creates print queues under the Common UNIX Printing System (CUPS) for printers detected by HAL."
-set name=pkg.fmri value=pkg:/print/cups/hal-cups-utils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=info.classification value="org.opensolaris.category.2008:System/Printing"
-set name=info.upstream_url value="http://fedorahosted.org/hal-cups-utils/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Printing
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://fedorahosted.org/hal-cups-utils/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/240
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license hal-cups-utils.copyright license="CUPS license"
-
 dir path=etc
 dir path=etc/hal
 dir path=etc/hal/fdi
@@ -45,13 +48,11 @@
 dir path=usr/share/man
 dir path=usr/share/man/man5
 file path=etc/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi
-file hal-cups-utils.5 path=usr/share/man/man5/hal-cups-utils.5
 file path=usr/lib/cups/backend/hal mode=0555
 file path=usr/lib/hal/hal_lpadmin mode=0555 pkg.depend.bypass-generate=.*
-
-legacy pkg=SUNWhal-cups-utils \
-	desc="Automatic queue creation for CUPS" \
-	name="hal-cups-utils (usr)"
-legacy pkg=SUNWhal-cups-utilsr \
-	desc="Automatic queue configuration for CUPS" \
-	name="hal-cups-utils (root)"
+file hal-cups-utils.5 path=usr/share/man/man5/hal-cups-utils.5
+legacy pkg=SUNWhal-cups-utils desc="Automatic queue creation for CUPS" \
+    name="hal-cups-utils (usr)"
+legacy pkg=SUNWhal-cups-utilsr desc="Automatic queue configuration for CUPS" \
+    name="hal-cups-utils (root)"
+license hal-cups-utils.copyright license="CUPS license"
--- a/components/hplip/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/hplip/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -76,8 +76,6 @@
 
 COMPONENT_INSTALL_ARGS += -e
 
-include ../../make-rules/shared-targets.mk
-
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
 
@@ -106,7 +104,6 @@
 		$(KSH93) cache.ksh)
 
 # empty test target
-test:
-	@echo "no tests available"
+test:	$(NO_TESTS)
 
 include ../../make-rules/depend.mk
--- a/components/hplip/hplip.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/hplip/hplip.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,33 +20,36 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/print/filter/hplip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/print/filter/hplip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="hpijs - HP InkJet Server"
-set name=info.classification value="org.opensolaris.category.2008:System/Printing "
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Printing "
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://hplipopensource.com/hplip-web/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2004/262
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 # HPIJS support for LP
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
-dir path=usr/lib/lp group=lp
-dir path=usr/lib/lp/caches group=lp
-dir path=usr/sfw
-dir path=usr/sfw/bin
-dir path=usr/share
-dir path=usr/share/ppd group=lp
-dir path=usr/share/ppd/SUNWhpijs
-dir path=usr/share/ppd/SUNWhpijs/HP
-
-# HPLIP support for SANE
-dir path=usr/lib/sane
 
 # HPLIP support for CUPS
 dir path=usr/lib/cups
 dir path=usr/lib/cups/backend
 dir path=usr/lib/cups/filter
+dir path=usr/lib/lp group=lp
+dir path=usr/lib/lp/caches group=lp
+
+# HPLIP support for SANE
+dir path=usr/lib/sane
+dir path=usr/sfw
+dir path=usr/sfw/bin
+dir path=usr/share
 dir path=usr/share/cups
 dir path=usr/share/cups/drv
 dir path=usr/share/cups/drv/hp
@@ -59,1102 +62,1175 @@
 dir path=usr/share/doc/hplip-3.10.9/images
 dir path=usr/share/doc/hplip-3.10.9/styles
 dir path=usr/share/doc/hplip-3.10.9/styles
+dir path=usr/share/ppd group=lp
+dir path=usr/share/ppd/SUNWhpijs
+dir path=usr/share/ppd/SUNWhpijs/HP
+
+# HPLIP support for CUPS
+file path=usr/bin/hp-mkuri
 
 # HPIJS support for LP
 file path=usr/bin/hpijs
-file path=usr/lib/lp/caches/SUNWhpijs.cache group=lp 
-link path=usr/sfw/bin/hpijs target=../../bin/hpijs
-file path=usr/share/ppd/SUNWhpijs/HP/hp-2000c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-2500c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-910-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-915-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_1000-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_1100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_1200-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2200-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2230-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2250-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2280-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2300-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2600-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2800-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_3000-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_inkjet_cp1700-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_1600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2550_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2600n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2605-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2605dn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2605dtn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2700-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2700n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2800-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2820-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2830-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2840-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3000-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3500-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3500n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3550-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3550n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3800-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4500-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4550-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4610-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4650-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4700-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4730mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5500-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5550-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5m-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8500-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8550-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1015-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1017-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1514n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1515n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1518ni-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025dn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025x-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3505-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3525-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4005-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-cp1160-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4020ps-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500mfp.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4520mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4520ps-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1100ps_24in-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1100ps_44in-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_24in-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_44in-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770_postscript-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770ps_24in-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1200_postscript-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1000_j110_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1120-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1125-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1200c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1220c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1280-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600cm-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600cn-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2000_j210_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3320-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3325-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3420-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3425-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3450-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3500-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3550-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3650-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3740-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3810-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3816-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3819-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3820-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3822-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3840-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3870-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3900-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3910-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3920-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3940-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_400-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_400l-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_460-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_500-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_500c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_505j-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_510-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_520-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_540-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_550c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5550-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5551-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5552-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5650-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5652-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5700-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5800-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5850-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5900_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_610c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_610cl-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6120-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6122-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6127-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_612c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_630c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_632c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_640c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_648c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6500-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_656c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_660-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_670-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_670c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_670tv-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_672c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_680-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6800-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_682-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_690-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_690c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_692-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_693-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_694-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6940_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_695-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_697-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6980_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_810c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_812c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_815c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_816c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_825c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_830c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_832c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_840c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_841c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_842c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_843c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_845c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_850c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_855c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_870c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_880c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_882c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_890c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_895c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_916c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_920c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_9300-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_930c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_932c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_933c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_934c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_935c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_940c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_948c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_950c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_952c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_955c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_957c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_959c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_9600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_960c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_970c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_975c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_9800-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_980c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_990c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_995c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d4100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d4200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d4300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d5500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d730-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4210_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4213_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f735-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-dj350-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-dj450-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_100_d410_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1000-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1005_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1010-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1012-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1015-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1018-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1020-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022-hpijs-zjs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022n-hpijs-zjs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022nw-hpijs-zjs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1100a-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1100xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1150-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1160-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1160_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220se-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220se-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300xi-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320nw-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320nw-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320tn-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320tn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2410-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2410-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2420-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2420-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2430-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2430-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3015-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3015-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3020-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3020-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3030-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3030-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3050-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3050-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3052-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3052-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3055-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3150-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200m-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200se-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3330-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3380-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3380-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3390-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3390-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3392-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4000_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4050_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4150_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4200-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4200-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4240-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4240-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4250-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4250-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4300-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4300-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4345_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4350-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4350-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4_plus-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4l-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4ml-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4ml-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4mp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4mp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4si-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4si-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4v-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4v-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5100_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200l-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200l-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200lx-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200lx-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5l-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5mp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5mp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5p-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5p-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si_mopier-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6l-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6mp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6p-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6p-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8150_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8150_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9055mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9065mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1005-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1120n_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1319f_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727nf_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727nfs_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3027_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3035_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4345_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4349_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5025_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9050_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9059_mfp-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1005-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1006-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1007-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1008-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1009-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1505-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1505n-hpijs-zxs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014-hpijs-zxs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014n-hpijs-zxs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015d_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015dn_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015dn_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015n_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015n_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015x_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015x_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035-hpijs-zjs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035n-hpijs-zjs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055d-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055dn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055x-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3004-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3004-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3005-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3010_series-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014dn-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014dn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015dn-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015dn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015tn-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015tn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015x-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015x-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515n-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515tn-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515tn-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-ps.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4000_k210-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4105-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4115_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4255-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4400_k410-hpijs.ppd.gz  
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510n-z-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_k710-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5105-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5110-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5110v-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609a-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6150_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e709a-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e709n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710a-f-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7500_e910-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_d_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g55-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g55xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g85-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g85xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g95-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_h470-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j3500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j3600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j4500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j4660_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j4680_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j5500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j5700_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j6400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k60-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k60xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k7100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k80-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k80xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_lx-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_1150c-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a910-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5300-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5400-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k550-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k850-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k8600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7300-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7400-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7500-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7700-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r40-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r40xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r45-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r60-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r65-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r80-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r80xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_300-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_310-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_320-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_330-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_350-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_500-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_520-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_570-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_580-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_590-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_600-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_610-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_630-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_700-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_710-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_720-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_725-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_t_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v30-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v40-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v40xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v45-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1115-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1215-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1218-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_130-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1315-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_140_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_230-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_240_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_2570_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_2600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_2700_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_3100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_3200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_320_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_3300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_330_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_370_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_380_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_420_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_470_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7150-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7345-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7350-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7550-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7700_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7800_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7900_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8000_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8700_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a310_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a320_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a430_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a440_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a510_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a520_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a530_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a610_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a620_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a630_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a640_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a710_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a820_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b010_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b109a_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b109a-m-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b110_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b8500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c309a_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c3100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4340_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4380_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4700_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c6100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c6200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c6300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c7100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c7200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c8100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d110_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5060_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d6100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_estn_c510_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1000-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1100-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_plus_b210_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem_c310_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem_c410_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_pro_b8300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_pro_b8800_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-printer_scanner_copier_300-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1000_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1310_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1358_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1510_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1600_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2100_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2150_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2170_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2200_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2210_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2300_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2350_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2400_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2500_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_500-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_720-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_750-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_750xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_760-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_780-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_780xi-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_900_series-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_920-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950vr-hpijs.ppd.gz 
-file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950xi-hpijs.ppd.gz 
-
-# HPLIP support for SANE
-file path=usr/lib/sane/libsane-hpaio.so.1.0.0
-link path=usr/lib/sane/libsane-hpaio.so target=libsane-hpaio.so.1.0.0
-link path=usr/lib/sane/libsane-hpaio.so.1 target=libsane-hpaio.so.1.0.0
-
-# HPLIP support for CUPS
-file path=usr/bin/hp-mkuri
 file path=usr/lib/cups/backend/hp mode=0555
 file path=usr/lib/cups/filter/hpcac mode=0555
 file path=usr/lib/cups/filter/hpcups mode=0555
 file path=usr/lib/cups/filter/hpcupsfax mode=0555
 file path=usr/lib/cups/filter/pstotiff mode=0555 \
+    pkg.depend.bypass-generate=.*/os.py.* pkg.depend.bypass-generate=.*/os.so \
     pkg.depend.bypass-generate=.*/os/__init__.py \
-    pkg.depend.bypass-generate=.*/os.py.* \
-    pkg.depend.bypass-generate=.*/os.so \
-    pkg.depend.bypass-generate=.*/osmodule.so \
-    pkg.depend.bypass-generate=.*/os/path/__init__.py \
     pkg.depend.bypass-generate=.*/os/path.py.* \
     pkg.depend.bypass-generate=.*/os/path.so \
-    pkg.depend.bypass-generate=.*/os/pathmodule.so
+    pkg.depend.bypass-generate=.*/os/path/__init__.py \
+    pkg.depend.bypass-generate=.*/os/pathmodule.so \
+    pkg.depend.bypass-generate=.*/osmodule.so
 file path=usr/lib/libhpip.so.0.0.1
+file path=usr/lib/libhpmud.so.0.0.6
+file path=usr/lib/lp/caches/SUNWhpijs.cache group=lp
+
+# HPLIP support for SANE
+file path=usr/lib/sane/libsane-hpaio.so.1.0.0
+file path=usr/share/cups/drv/hp/hpcups.drv
+file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2250-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2280-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2300-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2600-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2800-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_3000-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2500-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2500_series-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2550_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2605-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2605dn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2605dtn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2700-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2700n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2800-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2820-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2830-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2840-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3000-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3700-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3700n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3800-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4500-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4550-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4600-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4600_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4610-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4650-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4700-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4730mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_5500-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_5550-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_5m-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_8500-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_8550-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_9500-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_9500_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1015-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1017-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1514n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1515n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1518ni-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025dn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025x-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp3505-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp3525-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4005-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4020_series-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4520_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225dn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp6015-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_4020ps-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_4500mfp.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_4500ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_4520mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_4520ps-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1100ps_24in-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1100ps_44in-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_24in-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_44in-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-designjet_t1200_postscript-ps.ppd.gz
+file \
+    path=usr/share/cups/model/SUNWhplip/hp-designjet_t770_postscript-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-designjet_t770ps_24in-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1200-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1200n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1220-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1220se-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1300-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1300n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1300xi-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320nw-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320tn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2100-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2100_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2200-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2200_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2300-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2300_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2410-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2420-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2430-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3015-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3020-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3030-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3050-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3052-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3200m-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3300_3310_3320-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3380-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3390-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4000_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4050_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4100_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4100_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4200-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4240-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4250-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4300-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4345_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4350-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4_plus-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4ml-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4mp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4si-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4v-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5000-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5000_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5100_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200l-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200lx-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5mp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5p-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5si-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5si_mopier-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_6mp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_6p-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8000-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8000_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8100_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8100_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8150_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9000_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9000_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9040-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9040_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9050-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9050_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9055mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9065mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522n_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522nf_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727nf_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727nfs_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m3027_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m3035_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4345_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4349_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5025_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5035_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9040_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9050_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9059_mfp-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015dn_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015n_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015x_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055d-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055dn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055x-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3004-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3005-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3010_series-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014dn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015dn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015tn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015x-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515n-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515tn-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515x-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515xm-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-mopier_240-ps.ppd.gz
+file path=usr/share/cups/model/SUNWhplip/hp-mopier_320-ps.ppd.gz
+
+# Common files
+file path=usr/share/doc/hplip-3.10.9/COPYING
+file path=usr/share/doc/hplip-3.10.9/README_LIBJPG
+file path=usr/share/doc/hplip-3.10.9/commandline.html
+file path=usr/share/doc/hplip-3.10.9/copying.html
+file path=usr/share/doc/hplip-3.10.9/copyright
+file path=usr/share/doc/hplip-3.10.9/devicemanager.html
+file path=usr/share/doc/hplip-3.10.9/faxtrouble.html
+file path=usr/share/doc/hplip-3.10.9/gettinghelp.html
+file path=usr/share/doc/hplip-3.10.9/hpscan.html
+file path=usr/share/doc/hplip-3.10.9/images/favicon.ico
+file path=usr/share/doc/hplip-3.10.9/images/print.png
+file path=usr/share/doc/hplip-3.10.9/images/toolbox_actions.png
+file path=usr/share/doc/hplip-3.10.9/images/toolbox_fax.png
+file path=usr/share/doc/hplip-3.10.9/images/toolbox_print_control.png
+file path=usr/share/doc/hplip-3.10.9/images/toolbox_print_settings.png
+file path=usr/share/doc/hplip-3.10.9/images/toolbox_status.png
+file path=usr/share/doc/hplip-3.10.9/images/toolbox_supplies.png
+file path=usr/share/doc/hplip-3.10.9/images/xsane.png
+file path=usr/share/doc/hplip-3.10.9/index.html
+file path=usr/share/doc/hplip-3.10.9/mainttask.html
+file path=usr/share/doc/hplip-3.10.9/plugins.html
+file path=usr/share/doc/hplip-3.10.9/print.html
+file path=usr/share/doc/hplip-3.10.9/printing.html
+file path=usr/share/doc/hplip-3.10.9/printoptions.html
+file path=usr/share/doc/hplip-3.10.9/printtroubleshooting.html
+file path=usr/share/doc/hplip-3.10.9/scanning.html
+file path=usr/share/doc/hplip-3.10.9/scantrouble.html
+file path=usr/share/doc/hplip-3.10.9/sendfax.html
+file path=usr/share/doc/hplip-3.10.9/setup.html
+file path=usr/share/doc/hplip-3.10.9/styles/css.css
+file path=usr/share/doc/hplip-3.10.9/systray.html
+file path=usr/share/doc/hplip-3.10.9/troubleshooting.html
+file path=usr/share/doc/hplip-3.10.9/uninstalling.html
+file path=usr/share/doc/hplip-3.10.9/upgrading.html
+file path=usr/share/ppd/SUNWhpijs/HP/hp-2000c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-2500c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-910-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-915-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_1000-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_1100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_1200-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2200-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2230-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2250-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2250-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2280-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2280-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2300-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2300-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2600-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2600-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2800-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_2800-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_3000-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-business_inkjet_3000-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-cm8050_mfp_with_edgeline-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-cm8060_mfp_with_edgeline-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_inkjet_cp1700-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_inkjet_printer_cp1700-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_1600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2500_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2550_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2600n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2605-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2605dn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2605dtn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2700-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2700n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2800-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2820-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2830-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_2840-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3000-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3000-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3500-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3500n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3550-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3550n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3700n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3800-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_3800-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4500-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4500-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4550-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4550-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4600_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4610-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4610-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4650-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4650-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4700-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4700-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4730mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_4730mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5500-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5500-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5550-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5550-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5m-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_5m-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8500-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8500-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8550-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_8550-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_9500_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1015-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1017-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312nfi_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320fxi_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320n_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320nf_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm3530_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm3530_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4730_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm4730_mfp-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6030_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6030_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6040_mfp-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6040_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6049_mfp-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cm6049_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1215-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1514n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1514n-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1515n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1515n-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1518ni-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp1518ni-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025dn-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025dn-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025n-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025x-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp2025x-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3505-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3505-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3525-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp3525-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4005-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4005-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4020_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4020_series-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4520_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp4520_series-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225dn-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225dn-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp5225n-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-color_laserjet_cp6015-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-cp1160-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4020ps-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500mfp.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4500ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4520mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_4520ps-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1100ps_24in-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1100ps_44in-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_24in-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1120ps_44in-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t1200_postscript-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770_postscript-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-designjet_t770ps_24in-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1000_j110_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1050_j410_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1120-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1125-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1200c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1220c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1280-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600cm-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_1600cn-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2000_j210_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_2050_j510_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3000_j310_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3050_j610_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3320-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3325-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3420-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3425-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3450-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3500-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3550-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3650-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3740-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3810-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3816-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3819-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3820-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3822-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3840-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3870-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3900-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3910-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3920-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_3940-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_400-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_400l-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_460-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_500-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_500c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_505j-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_510-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_520-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_540-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_550c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5550-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5551-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5552-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5650-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5652-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5700-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5800-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5850-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_5900_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_610c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_610cl-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6120-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6122-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6127-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_612c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_630c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_632c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_640c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_648c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6500-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_656c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_660-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_670-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_670c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_670tv-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_672c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_680-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6800-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_682-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_690-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_690c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_692-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_693-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_694-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6940_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_695-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_697-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_6980_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_810c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_812c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_815c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_816c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_825c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_830c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_832c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_840c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_841c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_842c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_843c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_845c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_850c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_855c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_870c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_880c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_882c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_890c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_895c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_916c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_920c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_9300-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_930c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_932c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_933c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_934c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_935c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_940c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_948c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_950c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_952c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_955c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_957c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_959c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_9600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_960c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_970c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_975c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_9800-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_980c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_990c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_995c-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d1600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d2600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d4100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d4200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d4300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d5500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_d730-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f2400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4210_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4213_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f4500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_f735-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_advant_k109a-z-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-deskjet_ink_advant_k209a-z-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-dj350-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-dj450-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-envy_100_d410_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1000-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1005_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1010-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1012-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1015-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1018-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1020-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022-hpijs-zjs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022n-hpijs-zjs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022nw-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1022nw-hpijs-zjs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1100a-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1100xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1150-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1160-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1160_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1200n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220se-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1220se-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300xi-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1300xi-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320nw-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320nw-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320tn-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_1320tn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2100_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2200_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2300_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2410-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2410-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2420-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2420-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2430-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_2430-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3015-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3015-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3020-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3020-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3030-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3030-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3050-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3050-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3052-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3052-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3055-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3150-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200m-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200m-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3200se-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3300_3310_3320-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3300_3310_3320-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3330-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3380-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3380-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3390-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3390-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_3392-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4000_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4000_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4050_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4050_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4100_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4150_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4200-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4200-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4240-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4240-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4250-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4250-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4300-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4300-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4345_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4345_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4350-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4350-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4_plus-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4_plus-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4l-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4ml-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4ml-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4mp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4mp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4si-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4si-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4v-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_4v-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5000_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5100_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5100_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200l-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200l-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200lx-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5200lx-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5l-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5mp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5mp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5p-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5p-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si_mopier-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_5si_mopier-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6l-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6mp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6mp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6p-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_6p-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8000_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_mfp-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8100_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8150_mfp-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8150_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_8150_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9000_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9040_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9050_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9055mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9055mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9065mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_9065mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1005-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1120_mfp-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1120n_mfp-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1319f_mfp-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522n_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522nf_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m1522nf_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727nf_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m2727nfs_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3027_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3027_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3035_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m3035_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4345_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4345_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4349_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m4349_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5025_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5025_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5035_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m5039_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9040_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9050_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9050_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9059_mfp-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_m9059_mfp-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1005-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1006-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1007-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1008-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1009-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1505-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1505n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p1505n-hpijs-zxs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014-hpijs-zxs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2014n-hpijs-zxs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015d_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015dn_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015dn_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015n_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015n_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015x_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2015x_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035-hpijs-zjs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035n-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2035n-hpijs-zjs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055d-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055d-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055dn-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055dn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055x-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p2055x-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3004-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3004-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3005-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3005-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3010_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p3010_series-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014dn-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014dn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4014n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015dn-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015dn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015tn-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015tn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015x-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4015x-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515n-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515tn-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515tn-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515x-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_p4515xm-ps.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1132_mfp-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1136_mfp-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1212nf_mfp-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_m1217nfw_mfp-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1102w-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1566-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-laserjet_professional_p1606dn-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_240-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-mopier_320-ps.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_150_mobile_l511-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4000_k210-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4105-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4115_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4255-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4400_k410-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510a-f-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510g-m-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_g510n-z-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_4500_k710-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5105-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5110-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5110v-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_5600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609a-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6000_e609n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6150_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e709a-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e709n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710a-f-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_6500_e710n-z-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7000_e809a_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_7500_e910-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_9100_series-hpijs-pcl3.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_d_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g55-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g55xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g85-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g85xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_g95-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_h470-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j3500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j3600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j4500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j4660_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j4680_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j5500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j5700_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_j6400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k60-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k60xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k7100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k80-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_k80xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_lx-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_1150c-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_1170c_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8000_a809-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909a-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909g-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a909n-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_8500_a910-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5300-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k5400-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k550-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k850-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_k8600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7300-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7400-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7500-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_pro_l7700-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r40-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r40xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r45-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r60-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r65-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r80-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_r80xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_300-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_310-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_320-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_330-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_350-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_500-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_520-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_570-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_580-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_590-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_600-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_610-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_630-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_700-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_710-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_720-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_series_725-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_t_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v30-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v40-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v40xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-officejet_v45-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1115-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1215-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1218-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_130-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_1315-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_140_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_230-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_240_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_2570_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_2600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_2700_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_3100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_3200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_320_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_3300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_330_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_370_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_380_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_420_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_470_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7150-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7345-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7350-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7550-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7700_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7800_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_7900_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8000_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_8700_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a310_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a320_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a430_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a440_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a510_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a520_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a530_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a610_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a620_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a630_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a640_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a710_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_a820_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b010_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b109a-m-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b109a_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b110_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_b8500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c309a_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c3100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4340_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4380_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c4700_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c5500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c6100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c6200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c6300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c7100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c7200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_c8100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d110_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5060_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d5400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d6100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_d7500_series-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_estn_c510_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1000-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_p1100-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_plus_b209a-m-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_plus_b210_series-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem-web_c309n-s-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem_c310_series-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_prem_c410_series-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_premium_c309g-m-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_pro_b8300_series-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_pro_b8800_series-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-photosmart_wireless_b109n-z-hpijs.ppd.gz
+file \
+    path=usr/share/ppd/SUNWhpijs/HP/hp-printer_scanner_copier_300-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1000_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1310_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1358_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1510_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_1600_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2100_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2150_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2170_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2200_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2210_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2300_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2350_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2400_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_2500_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_500-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_720-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_750-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_750xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_760-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_780-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_780xi-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_900_series-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_920-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950vr-hpijs.ppd.gz
+file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950xi-hpijs.ppd.gz
+legacy pkg=SUNWhpijs desc="hpijs - HP InkJet Server (from HPLIP 3.10.9)" \
+    name="hpijs - HP InkJet Server"
+license hplip.license license=GPLv2
 link path=usr/lib/libhpip.so target=libhpip.so.0.0.1
 link path=usr/lib/libhpip.so.0 target=libhpip.so.0.0.1
-file path=usr/lib/libhpmud.so.0.0.6
 link path=usr/lib/libhpmud.so target=libhpmud.so.0.0.6
 link path=usr/lib/libhpmud.so.0 target=libhpmud.so.0.0.6
-file path=usr/share/cups/drv/hp/hpcups.drv 
-file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2250-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2280-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2300-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2600-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_2800-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-business_inkjet_3000-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-cm8050_mfp_with_edgeline-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-cm8060_mfp_with_edgeline-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2500-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2500_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2550_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2605-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2605dn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2605dtn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2700-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2700n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2800-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2820-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2830-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_2840-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3000-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3700-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3700n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_3800-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4500-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4550-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4600-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4600_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4610-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4650-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4700-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_4730mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_5500-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_5550-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_5m-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_8500-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_8550-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_9500-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_9500_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1015-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1017-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1312_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm1312nfi_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320fxi_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320n_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm2320nf_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm3530_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm4730_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6030_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6040_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cm6049_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1514n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1515n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp1518ni-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025dn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp2025x-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp3505-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp3525-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4005-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4020_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp4520_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp5225dn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-color_laserjet_cp6015-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_4020ps-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_4500ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_4500mfp.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_4520mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_4520ps-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_t770_postscript-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_t770ps_24in-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1100ps_24in-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1100ps_44in-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_24in-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1120ps_44in-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-designjet_t1200_postscript-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1200-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1200n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1220-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1220se-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1300-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1300n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1300xi-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320nw-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_1320tn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2100-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2100_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2200-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2200_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2300-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2300_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2410-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2420-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_2430-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3015-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3020-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3030-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3050-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3052-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3200m-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3300_3310_3320-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3380-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_3390-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4000_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4050_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4100_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4100_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4200-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4240-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4250-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4300-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4345_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4350-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4_plus-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4ml-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4mp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4si-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_4v-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5000-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5000_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5100_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200l-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5200lx-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5mp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5p-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5si-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_5si_mopier-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_6mp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_6p-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8000-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8000_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8100_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8100_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_8150_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9000_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9000_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9040-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9040_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9050-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9050_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9055mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_9065mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522n_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m1522nf_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727nf_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m2727nfs_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m3027_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m3035_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4345_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m4349_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5025_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m5035_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9040_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9050_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_m9059_mfp-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015dn_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015n_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2015x_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055d-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055dn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p2055x-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3004-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3005-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p3010_series-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014dn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4014n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015dn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015tn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4015x-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515n-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515tn-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515x-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-laserjet_p4515xm-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-mopier_240-ps.ppd.gz 
-file path=usr/share/cups/model/SUNWhplip/hp-mopier_320-ps.ppd.gz 
+link path=usr/lib/sane/libsane-hpaio.so target=libsane-hpaio.so.1.0.0
+link path=usr/lib/sane/libsane-hpaio.so.1 target=libsane-hpaio.so.1.0.0
+link path=usr/sfw/bin/hpijs target=../../bin/hpijs
 
-# Common files
-file path=usr/share/doc/hplip-3.10.9/COPYING 
-file path=usr/share/doc/hplip-3.10.9/README_LIBJPG 
-file path=usr/share/doc/hplip-3.10.9/commandline.html 
-file path=usr/share/doc/hplip-3.10.9/copying.html 
-file path=usr/share/doc/hplip-3.10.9/copyright 
-file path=usr/share/doc/hplip-3.10.9/devicemanager.html 
-file path=usr/share/doc/hplip-3.10.9/faxtrouble.html 
-file path=usr/share/doc/hplip-3.10.9/gettinghelp.html 
-file path=usr/share/doc/hplip-3.10.9/hpscan.html 
-file path=usr/share/doc/hplip-3.10.9/images/favicon.ico 
-file path=usr/share/doc/hplip-3.10.9/images/print.png 
-file path=usr/share/doc/hplip-3.10.9/images/toolbox_actions.png 
-file path=usr/share/doc/hplip-3.10.9/images/toolbox_fax.png 
-file path=usr/share/doc/hplip-3.10.9/images/toolbox_print_control.png 
-file path=usr/share/doc/hplip-3.10.9/images/toolbox_print_settings.png 
-file path=usr/share/doc/hplip-3.10.9/images/toolbox_status.png 
-file path=usr/share/doc/hplip-3.10.9/images/toolbox_supplies.png 
-file path=usr/share/doc/hplip-3.10.9/images/xsane.png 
-file path=usr/share/doc/hplip-3.10.9/index.html 
-file path=usr/share/doc/hplip-3.10.9/mainttask.html 
-file path=usr/share/doc/hplip-3.10.9/plugins.html 
-file path=usr/share/doc/hplip-3.10.9/print.html 
-file path=usr/share/doc/hplip-3.10.9/printing.html 
-file path=usr/share/doc/hplip-3.10.9/printoptions.html 
-file path=usr/share/doc/hplip-3.10.9/printtroubleshooting.html 
-file path=usr/share/doc/hplip-3.10.9/scanning.html 
-file path=usr/share/doc/hplip-3.10.9/scantrouble.html 
-file path=usr/share/doc/hplip-3.10.9/sendfax.html 
-file path=usr/share/doc/hplip-3.10.9/setup.html 
-file path=usr/share/doc/hplip-3.10.9/styles/css.css 
-file path=usr/share/doc/hplip-3.10.9/systray.html 
-file path=usr/share/doc/hplip-3.10.9/troubleshooting.html 
-file path=usr/share/doc/hplip-3.10.9/uninstalling.html 
-file path=usr/share/doc/hplip-3.10.9/upgrading.html 
-
-license hplip.license license="GPLv2"
-
-legacy pkg=SUNWhpijs \
-	name="hpijs - HP InkJet Server" \
-	desc="hpijs - HP InkJet Server (from HPLIP 3.10.9)"
-
--- a/components/ilmbase/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ilmbase/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -67,15 +67,9 @@
 
 build: $(BUILD_32_and_64)
 
-include ../../make-rules/shared-targets.mk
+install: $(INSTALL_32_and_64)
 
-install: $(INSTALL_32_and_64)
-	$(MKDIR) $(PROTOUSRSHAREMAN3DIR) ; \
-	$(INSTALL) -m 0644 Solaris/libilmbase.3lib $(PROTOUSRSHAREMAN3DIR)/
-
-test: $(BUILD_32_and_64)
-	@cd $(BUILD_DIR_32); $(GMAKE) check
-	@cd $(BUILD_DIR_64); $(GMAKE) check
+test:	 $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
--- a/components/ilmbase/Solaris/libilmbase.3lib	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ilmbase/Solaris/libilmbase.3lib	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,9 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-.\"
-.\"
+.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 .TH libilmbase 3LIB "Mar 21 2011" "SunOS 5.11" "Interface Libraries" 
 .SH NAME
 libilmbase \- user-level ILM base libraries
@@ -82,22 +79,6 @@
 .rt
 shared object
 .in -40n
-.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	library/ilmbase
-=
-Interface Stability	Uncommitted
-.TE 
-.PP
 .SH "SEE ALSO"
 .PP
 \fBintro\fR(3), \fBlibz\fR(3LIB), \fBlibopenexr\fR(3LIB)
@@ -109,5 +90,3 @@
 The ilmbase source code distribution is free software.  See the file
 named COPYING (included in this distribution) for details.
 .LP
-.SH NOTES
-Source for ilmbase is available on http://opensolaris.org.
--- a/components/ilmbase/ilmbase.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ilmbase/ilmbase.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,100 +20,108 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/ilmbase@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Ilmbase libraries used to read and write OpenEXR images"
-set name=pkg.description value="Base libraries to support the OpenEXR IlmImf library"
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.openexr.com/"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/ilmbase@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Base libraries to support the OpenEXR IlmImf library"
+set name=pkg.summary \
+    value="Ilmbase libraries used to read and write OpenEXR images"
+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.openexr.com/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/209
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
 dir path=usr/include
 dir path=usr/include/OpenEXR
 dir path=usr/lib
-dir path=usr/lib/pkgconfig
 dir path=usr/lib/$(MACH64)
 dir path=usr/lib/$(MACH64)/pkgconfig
+dir path=usr/lib/pkgconfig
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man3
+file path=usr/include/OpenEXR/Iex.h
+file path=usr/include/OpenEXR/IexBaseExc.h
+file path=usr/include/OpenEXR/IexErrnoExc.h
+file path=usr/include/OpenEXR/IexMacros.h
+file path=usr/include/OpenEXR/IexMathExc.h
+file path=usr/include/OpenEXR/IexThrowErrnoExc.h
+file path=usr/include/OpenEXR/IlmBaseConfig.h
+file path=usr/include/OpenEXR/IlmThread.h
+file path=usr/include/OpenEXR/IlmThreadMutex.h
+file path=usr/include/OpenEXR/IlmThreadPool.h
+file path=usr/include/OpenEXR/IlmThreadSemaphore.h
+file path=usr/include/OpenEXR/ImathBox.h
+file path=usr/include/OpenEXR/ImathBoxAlgo.h
+file path=usr/include/OpenEXR/ImathColor.h
+file path=usr/include/OpenEXR/ImathColorAlgo.h
+file path=usr/include/OpenEXR/ImathEuler.h
+file path=usr/include/OpenEXR/ImathExc.h
+file path=usr/include/OpenEXR/ImathFrame.h
+file path=usr/include/OpenEXR/ImathFrustum.h
+file path=usr/include/OpenEXR/ImathFun.h
+file path=usr/include/OpenEXR/ImathGL.h
+file path=usr/include/OpenEXR/ImathGLU.h
+file path=usr/include/OpenEXR/ImathHalfLimits.h
+file path=usr/include/OpenEXR/ImathInt64.h
+file path=usr/include/OpenEXR/ImathInterval.h
+file path=usr/include/OpenEXR/ImathLimits.h
+file path=usr/include/OpenEXR/ImathLine.h
+file path=usr/include/OpenEXR/ImathLineAlgo.h
+file path=usr/include/OpenEXR/ImathMath.h
+file path=usr/include/OpenEXR/ImathMatrix.h
+file path=usr/include/OpenEXR/ImathMatrixAlgo.h
+file path=usr/include/OpenEXR/ImathPlane.h
+file path=usr/include/OpenEXR/ImathPlatform.h
+file path=usr/include/OpenEXR/ImathQuat.h
+file path=usr/include/OpenEXR/ImathRandom.h
+file path=usr/include/OpenEXR/ImathRoots.h
+file path=usr/include/OpenEXR/ImathShear.h
+file path=usr/include/OpenEXR/ImathSphere.h
+file path=usr/include/OpenEXR/ImathVec.h
+file path=usr/include/OpenEXR/ImathVecAlgo.h
 #
 file path=usr/include/OpenEXR/half.h
 file path=usr/include/OpenEXR/halfFunction.h
 file path=usr/include/OpenEXR/halfLimits.h
-file path=usr/include/OpenEXR/IexBaseExc.h
-file path=usr/include/OpenEXR/IexMathExc.h
-file path=usr/include/OpenEXR/IexThrowErrnoExc.h
-file path=usr/include/OpenEXR/IexErrnoExc.h
-file path=usr/include/OpenEXR/IexMacros.h
-file path=usr/include/OpenEXR/Iex.h
-file path=usr/include/OpenEXR/ImathColorAlgo.h
-file path=usr/include/OpenEXR/ImathMatrixAlgo.h
-file path=usr/include/OpenEXR/ImathVec.h
-file path=usr/include/OpenEXR/ImathShear.h
-file path=usr/include/OpenEXR/ImathFun.h
-file path=usr/include/OpenEXR/ImathBox.h
-file path=usr/include/OpenEXR/ImathBoxAlgo.h
-file path=usr/include/OpenEXR/ImathEuler.h
-file path=usr/include/OpenEXR/ImathExc.h
-file path=usr/include/OpenEXR/ImathLimits.h
-file path=usr/include/OpenEXR/ImathLine.h
-file path=usr/include/OpenEXR/ImathLineAlgo.h
-file path=usr/include/OpenEXR/ImathMatrix.h
-file path=usr/include/OpenEXR/ImathPlane.h
-file path=usr/include/OpenEXR/ImathSphere.h
-file path=usr/include/OpenEXR/ImathVecAlgo.h
-file path=usr/include/OpenEXR/ImathQuat.h
-file path=usr/include/OpenEXR/ImathFrustum.h
-file path=usr/include/OpenEXR/ImathMath.h
-file path=usr/include/OpenEXR/ImathGL.h
-file path=usr/include/OpenEXR/ImathColor.h
-file path=usr/include/OpenEXR/ImathRandom.h
-file path=usr/include/OpenEXR/ImathRoots.h
-file path=usr/include/OpenEXR/ImathHalfLimits.h
-file path=usr/include/OpenEXR/ImathInterval.h
-file path=usr/include/OpenEXR/ImathGLU.h
-file path=usr/include/OpenEXR/ImathFrame.h
-file path=usr/include/OpenEXR/ImathPlatform.h
-file path=usr/include/OpenEXR/ImathInt64.h
-file path=usr/include/OpenEXR/IlmThreadPool.h
-file path=usr/include/OpenEXR/IlmThread.h
-file path=usr/include/OpenEXR/IlmThreadSemaphore.h
-file path=usr/include/OpenEXR/IlmThreadMutex.h
-file path=usr/include/OpenEXR/IlmBaseConfig.h
+file path=usr/lib/$(MACH64)/libHalf.so.6.0.0
+file path=usr/lib/$(MACH64)/libIex.so.6.0.0
+file path=usr/lib/$(MACH64)/libIlmThread.so.6.0.0
+file path=usr/lib/$(MACH64)/libImath.so.6.0.0
+file path=usr/lib/$(MACH64)/pkgconfig/IlmBase.pc
 file path=usr/lib/libHalf.so.6.0.0
 file path=usr/lib/libIex.so.6.0.0
+file path=usr/lib/libIlmThread.so.6.0.0
 file path=usr/lib/libImath.so.6.0.0
-file path=usr/lib/libIlmThread.so.6.0.0
 file path=usr/lib/pkgconfig/IlmBase.pc
-file path=usr/lib/$(MACH64)/libHalf.so.6.0.0
-file path=usr/lib/$(MACH64)/libIex.so.6.0.0
-file path=usr/lib/$(MACH64)/libImath.so.6.0.0
-file path=usr/lib/$(MACH64)/libIlmThread.so.6.0.0
-file path=usr/lib/$(MACH64)/pkgconfig/IlmBase.pc
-file path=usr/share/man/man3/libilmbase.3lib
-#
-link path=usr/lib/libHalf.so.6 target=libHalf.so.6.0.0
-link path=usr/lib/libHalf.so target=libHalf.so.6.0.0
-link path=usr/lib/libIex.so.6 target=libIex.so.6.0.0
-link path=usr/lib/libIex.so target=libIex.so.6.0.0
-link path=usr/lib/libImath.so.6 target=libImath.so.6.0.0
-link path=usr/lib/libImath.so target=libImath.so.6.0.0
-link path=usr/lib/libIlmThread.so.6 target=libIlmThread.so.6.0.0
-link path=usr/lib/libIlmThread.so target=libIlmThread.so.6.0.0
-link path=usr/lib/$(MACH64)/libHalf.so.6 target=libHalf.so.6.0.0
-link path=usr/lib/$(MACH64)/libHalf.so target=libHalf.so.6.0.0
-link path=usr/lib/$(MACH64)/libIex.so.6 target=libIex.so.6.0.0
-link path=usr/lib/$(MACH64)/libIex.so target=libIex.so.6.0.0
-link path=usr/lib/$(MACH64)/libImath.so.6 target=libImath.so.6.0.0
-link path=usr/lib/$(MACH64)/libImath.so target=libImath.so.6.0.0
-link path=usr/lib/$(MACH64)/libIlmThread.so.6 target=libIlmThread.so.6.0.0
-link path=usr/lib/$(MACH64)/libIlmThread.so target=libIlmThread.so.6.0.0
-#
-license ilmbase.license license="BSD"
+file Solaris/libilmbase.3lib path=usr/share/man/man3/libilmbase.3lib
 #
 legacy pkg=SUNWilmbase \
     desc="Ilmbase libraries to read and write OpenEXR images" \
     name="Libraries to support high dynamic-range image (HDR) format"
+#
+license ilmbase.license license=BSD
+link path=usr/lib/$(MACH64)/libHalf.so target=libHalf.so.6.0.0
+link path=usr/lib/$(MACH64)/libHalf.so.6 target=libHalf.so.6.0.0
+link path=usr/lib/$(MACH64)/libIex.so target=libIex.so.6.0.0
+link path=usr/lib/$(MACH64)/libIex.so.6 target=libIex.so.6.0.0
+link path=usr/lib/$(MACH64)/libIlmThread.so target=libIlmThread.so.6.0.0
+link path=usr/lib/$(MACH64)/libIlmThread.so.6 target=libIlmThread.so.6.0.0
+link path=usr/lib/$(MACH64)/libImath.so target=libImath.so.6.0.0
+link path=usr/lib/$(MACH64)/libImath.so.6 target=libImath.so.6.0.0
+link path=usr/lib/libHalf.so target=libHalf.so.6.0.0
+#
+link path=usr/lib/libHalf.so.6 target=libHalf.so.6.0.0
+link path=usr/lib/libIex.so target=libIex.so.6.0.0
+link path=usr/lib/libIex.so.6 target=libIex.so.6.0.0
+link path=usr/lib/libIlmThread.so target=libIlmThread.so.6.0.0
+link path=usr/lib/libIlmThread.so.6 target=libIlmThread.so.6.0.0
+link path=usr/lib/libImath.so target=libImath.so.6.0.0
+link path=usr/lib/libImath.so.6 target=libImath.so.6.0.0
 
--- a/components/imagemagick/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/imagemagick/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -84,7 +84,7 @@
 # can be run only after ImageMagick is actually installed and this is not 
 # possible, so the tests are not invoked.
 #
-test:
+test:		$(NO_TESTS)
 	@echo "Tests can be run only after ImageMagick is installed."
 
 BUILD_PKG_DEPENDENCIES= $(BUILD_TOOLS)
--- a/components/imagemagick/imagemagick.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/imagemagick/imagemagick.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,6 +21,7 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/image/imagemagick@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -31,6 +32,8 @@
     value="org.opensolaris.category.2008:System/Multimedia Libraries"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.imagemagick.org
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2007/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
@@ -67,8 +70,7 @@
 dir path=usr/perl5/site_perl/5.8.4/i86pc-solaris-64int/auto/Image/Magick \
     variant.arch=i386
 dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int variant.arch=sparc
-dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/Image \
-    variant.arch=sparc
+dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/Image variant.arch=sparc
 dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto variant.arch=sparc
 dir path=usr/perl5/site_perl/5.8.4/sun4-solaris-64int/auto/Image \
     variant.arch=sparc
--- a/components/lcms/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/lcms/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -35,15 +35,13 @@
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
+include ../../make-rules/lint-libraries.mk
 
 PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig
 PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig
 
 PATCH_LEVEL = 0
 
-LIBNAME =       $(COMPONENT_NAME)
-LINTOUT =       lint.out
-
 # These aren't set by default.
 PYTHON.$(PYTHON_VERSION).32 = /usr/bin/python2.6
 PYTHON.$(PYTHON_VERSION).64 = /usr/bin/$(MACH64)/python2.6
@@ -54,6 +52,10 @@
 PROTOPYTHONMODULE64DIR = $(PROTOUSRLIBDIR)/python$(PYTHON_VERSION)/vendor-packages/64
 PROTOUSRINCLUDEDIR = $(PROTO_DIR)/usr/include
 
+# We have to do this because libtool builds the C++ library with an
+# incorrect RUNPATH/RPATH
+CCC += -norunpath
+
 CFLAGS += -Xc -xnorunpath $(CC_BITS)
 CFLAGS += $(studio_C99_ENABLE) $(CPP_POSIX) $(CPP_LARGEFILES)
 CPPFLAGS += $(CPP_POSIX) $(CPP_LARGEFILES) -DNDEBUG
@@ -66,9 +68,6 @@
 LDFLAGS += -lpython$(PYTHON_VERSION) -lc -lm
 PYTHONPATH_32 = /usr/lib/python$(PYTHON_VERSION)
 PYTHONPATH_64 = /usr/lib/$(MACH64)/python$(PYTHON_VERSION)
-ELFEDIT = /usr/bin/elfedit
-GSED = /usr/gnu/bin/sed
-DOS2UNIX = /usr/bin/dos2unix
 
 CONFIGURE_ENV += CXX="$(CCC)"
 CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
@@ -100,59 +99,13 @@
     $(RM) -f $(SOURCE_DIR)/include/icc34.h ; \
     $(CP) -p include/icc34.h $(SOURCE_DIR)/include/ )
 
-COMPONENT_POST_BUILD_ACTION = \
-    ( cd $(@D) ; \
-	$(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \
-	-I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \
-	-I$(COMPONENT_DIR)/$(COMPONENT_SRC) \
-	$(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1)
-
-# We have to do this because libtool builds the C++ library with an
-# incorrect RUNPATH/RPATH
-COMPONENT_POST_INSTALL_ACTION = \
-    ( $(ELFEDIT) -e "dyn:runpath $(USRLIBDIR)" \
-	    $(PROTOPYTHONMODULE32DIR)/_lcms.so ; \
-	$(ELFEDIT) -e "dyn:rpath $(USRLIBDIR)" \
-	    $(PROTOPYTHONMODULE32DIR)/_lcms.so ; \
-	$(ELFEDIT) -e "dyn:runpath $(USRLIBDIR64)" \
-		$(PROTOPYTHONMODULE64DIR)/_lcms.so ; \
-	$(ELFEDIT) -e "dyn:rpath $(USRLIBDIR64)" \
-		$(PROTOPYTHONMODULE64DIR)/_lcms.so ; \
-	$(DOS2UNIX) $(PROTOUSRINCLUDEDIR)/lcms/icc34.h > \
-	    $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u ; \
-	$(CP) -fp $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u \
-	    $(PROTOUSRINCLUDEDIR)/lcms/icc34.h ; \
-	$(DOS2UNIX) $(PROTOUSRINCLUDEDIR)/lcms/lcms.h > \
-	    $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u ; \
-	$(CP) -fp $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u \
-	    $(PROTOUSRINCLUDEDIR)/lcms/lcms.h ; \
-	$(RM) -f $(PROTOUSRINCLUDEDIR)/lcms/icc34.h.u \
-	    $(PROTOUSRINCLUDEDIR)/lcms/lcms.h.u ; \
-	$(CP) $(COMPONENT_DIR)/llib-l$(LIBNAME) $(PROTOUSRLIBDIR)/ ; \
-	cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \
-	    $(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)) )
+LINT_FLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
 
 build: $(BUILD_32_and_64)
 
-MAN1LIST = icc2ps.1 icclink.1 icctrans.1 \
-	   jpegicc.1 tifficc.1 wtpt.1
-
-include ../../make-rules/shared-targets.mk
+install: $(INSTALL_32_and_64)
 
-install: $(INSTALL_32_and_64)
-	$(MKDIR) $(PROTOUSRSHAREMAN1DIR) ; \
-	    list1='$(MAN1LIST)'; for f in $$list1; do \
-	    $(GSED) -f oracleman-stability \
-		$(PROTOUSRSHAREMAN1DIR)/$$f > \
-		$(PROTOUSRSHAREMAN1DIR)/$$f.sed 2>&1 ; \
-	    $(CP) -fp $(PROTOUSRSHAREMAN1DIR)/$$f.sed \
-		$(PROTOUSRSHAREMAN1DIR)/$$f ; \
-	    $(RM) -f $(PROTOUSRSHAREMAN1DIR)/$$f.sed ; \
-	    done
-
-test: $(BUILD_32_and_64)
-	@cd $(BUILD_DIR_32); $(GMAKE) check
-	@cd $(BUILD_DIR_64); $(GMAKE) check
+test: $(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
--- 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
 
--- a/components/lcms/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Oracle update\
-.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	library/lcms \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for LCMS is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/less/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/less/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -43,8 +43,7 @@
 
 install:	$(INSTALL_32)
 
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/less/less.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/less/less.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,16 +23,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/text/less@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/text/less@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="The package provides less, a file pager (a memory-efficient utility for displaying text one screenful at a time)."
 set name=pkg.summary value="pager program similar to more"
-set name=pkg.description value="The package provides less, a file pager (a memory-efficient utility for displaying text one screenful at a time)."
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.greenwoodsoftware.com/less/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license less.license license='Less License'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -44,7 +47,6 @@
 file path=usr/share/man/man1/less.1
 file path=usr/share/man/man1/lessecho.1
 file path=usr/share/man/man1/lesskey.1
-
-legacy	pkg=SUNWless \
-	name="The GNU pager (less)" \
-	desc="The GNU pager (less) 436"
+legacy pkg=SUNWless desc="The GNU pager (less) 436" \
+    name="The GNU pager (less)"
+license less.license license="Less License"
--- a/components/libneon/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libneon/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -56,22 +56,13 @@
 CONFIGURE_OPTIONS += --with-libproxy
 CONFIGURE_OPTIONS += --with-libxml2
 
-build: $(BUILD_32) $(BUILD_64)
+COMPONENT_TEST_ENV +=	PATH="$(GNUBIN):$(PATH)"
 
-GSED =	/usr/gnu/bin/sed
-
-include ../../make-rules/shared-targets.mk
+build:		$(BUILD_32_and_64)
 
-install: $(INSTALL_32) $(INSTALL_64)
-	$(GSED) -f oracleman-stability $(PROTOUSRSHAREMAN3DIR)/neon.3 > \
-	    $(PROTOUSRSHAREMAN3DIR)/neon.3.sed
-	cp -fp $(PROTOUSRSHAREMAN3DIR)/neon.3.sed \
-	    $(PROTOUSRSHAREMAN3DIR)/neon.3
-	rm -f $(PROTOUSRSHAREMAN3DIR)/neon.3.sed
+install:	$(INSTALL_32_and_64)
 
-test: $(BUILD_32_and_64)
-	@cd $(BUILD_DIR_32); env PATH="$(GNUBIN):$(PATH)" $(GMAKE) check
-	@cd $(BUILD_DIR_64); env PATH="$(GNUBIN):$(PATH)" $(GMAKE) check
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
--- a/components/libneon/libneon.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libneon/libneon.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,12 +20,19 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/neon@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/library/neon@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="An HTTP and WebDAV client library, with a C interface"
 set name=pkg.summary value="The Neon WebDAV library"
-set name=pkg.description value="An HTTP and WebDAV client library, with a C interface"
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.webdav.org/neon/"
+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.webdav.org/neon/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
@@ -34,15 +41,12 @@
 dir path=usr/include/neon
 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/share
 dir path=usr/share/doc
 dir path=usr/share/doc/neon-$(COMPONENT_VERSION)
 dir path=usr/share/doc/neon-$(COMPONENT_VERSION)/html
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
 dir path=usr/share/locale
 dir path=usr/share/locale/cs
 dir path=usr/share/locale/cs/LC_MESSAGES
@@ -62,6 +66,9 @@
 dir path=usr/share/locale/tr/LC_MESSAGES
 dir path=usr/share/locale/zh_CN
 dir path=usr/share/locale/zh_CN/LC_MESSAGES
+dir path=usr/share/man
+dir path=usr/share/man/man1
+dir path=usr/share/man/man3
 #
 file path=usr/bin/neon-config
 file path=usr/include/neon/ne_207.h
@@ -88,10 +95,10 @@
 file path=usr/include/neon/ne_utils.h
 file path=usr/include/neon/ne_xml.h
 file path=usr/include/neon/ne_xmlreq.h
+file path=usr/lib/$(MACH64)/libneon.so.27.2.5
+file path=usr/lib/$(MACH64)/pkgconfig/neon.pc
 file path=usr/lib/libneon.so.27.2.5
 file path=usr/lib/pkgconfig/neon.pc
-file path=usr/lib/$(MACH64)/libneon.so.27.2.5
-file path=usr/lib/$(MACH64)/pkgconfig/neon.pc
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/api.html
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/biblio.html
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/compliance.html
@@ -138,6 +145,15 @@
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/security.html
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/using.html
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/xml.html
+file path=usr/share/locale/cs/LC_MESSAGES/neon.mo
+file path=usr/share/locale/de/LC_MESSAGES/neon.mo
+file path=usr/share/locale/fr/LC_MESSAGES/neon.mo
+file path=usr/share/locale/ja/LC_MESSAGES/neon.mo
+file path=usr/share/locale/nn/LC_MESSAGES/neon.mo
+file path=usr/share/locale/pl/LC_MESSAGES/neon.mo
+file path=usr/share/locale/ru/LC_MESSAGES/neon.mo
+file path=usr/share/locale/tr/LC_MESSAGES/neon.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/neon.mo
 file path=usr/share/man/man1/neon-config.1
 file path=usr/share/man/man3/ne_add_request_header.3
 file path=usr/share/man/man3/ne_addr_destroy.3
@@ -230,24 +246,14 @@
 file path=usr/share/man/man3/ne_xml_create.3
 file path=usr/share/man/man3/ne_xml_destroy.3
 file path=usr/share/man/man3/neon.3
-file path=usr/share/locale/cs/LC_MESSAGES/neon.mo
-file path=usr/share/locale/de/LC_MESSAGES/neon.mo
-file path=usr/share/locale/fr/LC_MESSAGES/neon.mo
-file path=usr/share/locale/ja/LC_MESSAGES/neon.mo
-file path=usr/share/locale/nn/LC_MESSAGES/neon.mo
-file path=usr/share/locale/pl/LC_MESSAGES/neon.mo
-file path=usr/share/locale/ru/LC_MESSAGES/neon.mo
-file path=usr/share/locale/tr/LC_MESSAGES/neon.mo
-file path=usr/share/locale/zh_CN/LC_MESSAGES/neon.mo
+#
+legacy pkg=SUNWneon desc="The Neon WebDAV library (0.29.5)" \
+    name="The Neon WebDAV library"
+#
+license libneon.license license="LGPLv2, GPLv2"
+link path=usr/lib/$(MACH64)/libneon.so target=libneon.so.27.2.5
+link path=usr/lib/$(MACH64)/libneon.so.27 target=libneon.so.27.2.5
+link path=usr/lib/libneon.so target=libneon.so.27.2.5
 #
 link path=usr/lib/libneon.so.27 target=libneon.so.27.2.5
-link path=usr/lib/libneon.so target=libneon.so.27.2.5
-link path=usr/lib/$(MACH64)/libneon.so.27 target=libneon.so.27.2.5
-link path=usr/lib/$(MACH64)/libneon.so target=libneon.so.27.2.5
-#
-license libneon.license license="LGPLv2, GPLv2"
-#
-legacy pkg=SUNWneon \
-    desc="The Neon WebDAV library (0.29.5)" \
-    name="The Neon WebDAV library"
 
--- a/components/libneon/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Oracle update\
-.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	library/neon \
-=\
-Interface Stability	Volatile \
-.TE \
-.PP\
-.SH NOTES\
-Source for libneon is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/libsigsegv/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libsigsegv/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,15 +40,9 @@
 # common targets
 build:		$(BUILD_32_and_64)
 
-include ../../make-rules/shared-targets.mk
-
-install:	$(PROTOUSRSHAREMAN3DIR) $(INSTALL_32_and_64)
-	$(CP) -f $(COMPONENT_DIR)/man3/*.3 $(PROTOUSRSHAREMAN3DIR)
+install:	$(INSTALL_32_and_64)
 
-# build does this always
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-	@cd $(BUILD_DIR_64); $(MAKE) check
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/libsigsegv/libsigsegv.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libsigsegv/libsigsegv.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,23 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/libsigsegv@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# pull the manpages out of the component dir
+<transform file path=usr/share/man/(man3/.+$) -> set action.hash %<\1> >
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/libsigsegv@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="libsigsegv provides a set of functions for handling page faults in user mode"
 set name=pkg.summary value="libsigsegv - handling page faults in user mode"
-set name=pkg.description value="libsigsegv provides a set of functions for handling page faults in user mode"
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.gnu.org/software/libsigsegv/"
+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.gnu.org/software/libsigsegv/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/107
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/include
 dir path=usr/lib
@@ -35,25 +44,23 @@
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man3
-file path=usr/share/man/man3/sigsegv_deinstall_handler.3
-file path=usr/share/man/man3/sigsegv_dispatch.3
-file path=usr/share/man/man3/sigsegv_install_handler.3
-file path=usr/share/man/man3/sigsegv_init.3
-file path=usr/share/man/man3/stackoverflow_deinstall_handler.3
-file path=usr/share/man/man3/sigsegv_unregister.3
-file path=usr/share/man/man3/stackoverflow_install_handler.3
-file path=usr/share/man/man3/sigsegv_register.3
-file path=usr/share/man/man3/sigsegv.3
 file path=usr/include/sigsegv.h
 file path=usr/lib/$(MACH64)/libsigsegv.so.0.0.0
+file path=usr/lib/libsigsegv.so.0.0.0
+file path=usr/share/man/man3/sigsegv.3
+file path=usr/share/man/man3/sigsegv_deinstall_handler.3
+file path=usr/share/man/man3/sigsegv_dispatch.3
+file path=usr/share/man/man3/sigsegv_init.3
+file path=usr/share/man/man3/sigsegv_install_handler.3
+file path=usr/share/man/man3/sigsegv_register.3
+file path=usr/share/man/man3/sigsegv_unregister.3
+file path=usr/share/man/man3/stackoverflow_deinstall_handler.3
+file path=usr/share/man/man3/stackoverflow_install_handler.3
+legacy pkg=SUNWlibsigsegv \
+    desc="libsigsegv - handling page faults in user mode(2.6)" \
+    name="libsigsegv - handling page faults in user mode"
+license libsigsegv.license license=GPLv2
 link path=usr/lib/$(MACH64)/libsigsegv.so target=./libsigsegv.so.0.0.0
 link path=usr/lib/$(MACH64)/libsigsegv.so.0 target=./libsigsegv.so.0.0.0
-file path=usr/lib/libsigsegv.so.0.0.0
 link path=usr/lib/libsigsegv.so target=./libsigsegv.so.0.0.0
 link path=usr/lib/libsigsegv.so.0 target=./libsigsegv.so.0.0.0
-
-license libsigsegv.license license="GPLv2"
-
-legacy	pkg=SUNWlibsigsegv \
-	name="libsigsegv - handling page faults in user mode" \
-	desc="libsigsegv - handling page faults in user mode(2.6)"
--- a/components/libsigsegv/man3/sigsegv.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libsigsegv/man3/sigsegv.3	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" te
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH SIGSEGV 3 "13 Jan 2009" "SunOS 5.11"
@@ -180,31 +179,7 @@
 .sp
 void \fBstackoverflow_deinstall_handler\fR (void);
 .sp
-.SH ATTRIBUTES
-See
-.BR attributes(5)
-for descriptions of the  following  attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitylibrary/libsigsegv
-_
-Interface StabilityUncommitted
-_
-StandardSee \fBstandards\fR(5).
-.TE
-
 .SH SEE ALSO
 .sp
 .LP
 \fBattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5), \fBsigsegv_install_handler, \fBsigsegv_deinstall_handler\fR(3), \fBsigsegv_init\fR(3), \fBsigsegv_register\fR(3), \fBsigsegv_unregister\fR(3), \fBsigsegv_dispatch\fR(3), \fBstackoverflow_install_handler\fR(3), \fBstackoverflow_deinstall_handler\fR(3)
-
-.SH NOTES
-The libsigsegv project is located at http://libsigsegv.sourceforge.net.
-.sp
-Source for libsigsegv is available on http://opensolaris.org.
--- a/components/libsigsegv/man3/sigsegv_install_handler.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libsigsegv/man3/sigsegv_install_handler.3	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" te
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH sigsegv_install_handler 3 "13 Jan 2009" "SunOS 5.11"
@@ -69,31 +68,8 @@
 .LP
 If success, sigsegv_install_handler returns 0, or -1 if the system doesn't support catching SIGSEGV.
 .sp
-.SH ATTRIBUTES
-See
-.BR attributes(5)
-for descriptions of the  following  attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitylibrary/libsigsegv
-_
-Interface StabilityUncommitted
-_
-StandardSee \fBstandards\fR(5).
-.TE
 
 .SH SEE ALSO
 .sp
 .LP
 \fBattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5)
-
-.SH NOTES
-The libsigsegv project is located at http://libsigsegv.sourceforge.net.
-.sp
-Source for libsigsegv is available on http://opensolaris.org.
--- a/components/libsigsegv/man3/sigsegv_register.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libsigsegv/man3/sigsegv_register.3	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" te
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH sigsegv_register 3 "13 Jan 2009" "SunOS 5.11"
@@ -96,31 +95,8 @@
 .LP
 Sigsegv_dispatcher returns the handler's return value. 0 means that no handler has been found, or that a handler was found but declined responsibility.
 .sp
-.SH ATTRIBUTES
-See
-.BR attributes(5)
-for descriptions of the  following  attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitylibrary/libsigsegv
-_
-Interface StabilityUncommitted
-_
-StandardSee \fBstandards\fR(5).
-.TE
 
 .SH SEE ALSO
 .sp
 .LP
 \fBattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5)
-
-.SH NOTES
-The libsigsegv project is located at http://libsigsegv.sourceforge.net.
-.sp
-Source for libsigsegv is available on http://opensolaris.org.
--- a/components/libsigsegv/man3/stackoverflow_install_handler.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libsigsegv/man3/stackoverflow_install_handler.3	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" te
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH stackoverflow_install_handler 3 "13 Jan 2009" "SunOS 5.11"
@@ -70,31 +69,8 @@
 .LP
 If success, \fBstackoverflow_install_handler()\fR returns 0 on success, or -1 if the system doesn't support catching stack overflow.
 .sp
-.SH ATTRIBUTES
-See
-.BR attributes(5)
-for descriptions of the  following  attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilitylibrary/libsigsegv
-_
-Interface StabilityUncommitted
-_
-StandardSee \fBstandards\fR(5).
-.TE
 
 .SH SEE ALSO
 .sp
 .LP
 \fattributes\fR(5), \fBsigsegv\fR(3), \fBstandards\fR(5)
-
-.SH NOTES
-The libsigsegv project is located at http://libsigsegv.sourceforge.net.
-.sp
-Source for libsigsegv is available on http://opensolaris.org.
--- a/components/libtool/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libtool/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -41,16 +41,13 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		PERL="$(PERL)"
 
-include $(WS_TOP)/make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 
+test:		$(TEST_32_and_64)
+
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include $(WS_TOP)/make-rules/depend.mk
--- a/components/libtool/libltdl.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libtool/libltdl.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,25 +21,25 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/libtool/libltdl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/libtool/libltdl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU libtool dlopen wrapper"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/gnu/libtool/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/gnu/libtool/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license libtool.license license='GPLv2'
-
 dir path=usr
 dir path=usr/lib
 dir path=usr/lib/$(MACH64)
+file path=usr/lib/$(MACH64)/libltdl.so.3.1.4
 file path=usr/lib/libltdl.so.3.1.4
+legacy pkg=SUNWlibltdl desc="GNU libtool dlopen wrapper" \
+    name="GNU libtool dlopen wrapper"
+license libtool.license license=GPLv2
+link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.3.1.4
+link path=usr/lib/$(MACH64)/libltdl.so.3 target=libltdl.so.3.1.4
 link path=usr/lib/libltdl.so target=libltdl.so.3.1.4
 link path=usr/lib/libltdl.so.3 target=libltdl.so.3.1.4
-file path=usr/lib/$(MACH64)/libltdl.so.3.1.4
-link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.3.1.4
-link path=usr/lib/$(MACH64)/libltdl.so.3 target=libltdl.so.3.1.4
-
-legacy pkg=SUNWlibltdl \
-	name="GNU libtool dlopen wrapper" \
-	desc="GNU libtool dlopen wrapper"
--- a/components/libtool/libtool.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libtool/libtool.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,8 +1,3 @@
-'\" t
-.\"
-.\" This man page created by Sun to provide a reference to the
-.\" Info format documentation for libtool provided with the distribution.
-.\"
 .TH libtool 1 "18 Sep 2007"
 .SH NAME
 libtool \- shared library support tool
@@ -25,20 +20,3 @@
 Note that the \fBlibtool\fR command has an interface stability of
 Uncommitted (Obsolete).
 .PD
-.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	developer/build/libtool
-=
-Interface Stability	Uncommitted (Obsolete)
-.TE
-.SH NOTES
-Source for libtool is available on http://opensolaris.org.
--- a/components/libtool/libtool.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libtool/libtool.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,17 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/libtool@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr/share/man/.+$ -> set mangler.man.stability 'uncommitted (obsolete)' >
+set name=pkg.fmri \
+    value=pkg:/developer/build/libtool@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU libtool"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/gnu/libtool/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/gnu/libtool/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license libtool.license license='GPLv2'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/include
@@ -68,7 +70,5 @@
 file path=usr/share/libtool/ltmain.sh
 file libtool.1 path=usr/share/man/man1/libtool.1
 file libtoolize.1 path=usr/share/man/man1/libtoolize.1
-
-legacy pkg=SUNWlibtool \
-	name="GNU libtool" \
-	desc="GNU libtool"
+legacy pkg=SUNWlibtool desc="GNU libtool" name="GNU libtool"
+license libtool.license license=GPLv2
--- a/components/libtool/libtoolize.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libtool/libtoolize.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,8 +1,3 @@
-'\" t
-.\"
-.\" This man page created by Sun to provide a reference to the
-.\" Info format documentation for libtoolize provided with the distribution.
-.\"
 .TH libtoolize 1 "18 Sep 2007"
 .SH NAME
 libtoolize - prepare a package to use \fBlibtool\fR(1)
@@ -26,20 +21,3 @@
 .PD
 .SH SEE ALSO
 .BR libtool (1)
-.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	developer/build/libtool
-=
-Interface Stability	Uncommitted (Obsolete)
-.TE
-.SH NOTES
-Source for libtool is available on http://opensolaris.org.
--- a/components/libxml2/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxml2/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -35,9 +35,7 @@
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
-
-LIBNAME=	xml2
-LINTOUT=	lint.out
+include ../../make-rules/lint-libraries.mk
 
 CFLAGS +=	$(CPP_LARGEFILES)
 LDFLAGS +=	$(LD_Z_DEFS) $(LD_Z_TEXT) -lpthread
@@ -52,24 +50,14 @@
 
 COMPONENT_PREP_ACTION += (cd $(@D) ; cp ../mapfile libxml2.syms ; autoconf)
 
-COMPONENT_POST_BUILD_ACTION = \
-	 (cd $(@D); $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \
-			-I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \
-			$(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1)
-
-COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \
-			$(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)))
+COMPONENT_TEST_TARGETS = tests
 
 # common targets
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 
-test:	$(TEST_32_and_64)
-
-$(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built
-	(cd $(@D) ; gmake tests || exit 0)
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/libxml2/libxml.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxml2/libxml.3	Wed Apr 13 09:58:06 2011 -0700
@@ -75,6 +75,3 @@
 .IR xmlcatalog (1),
 .IR xmllint (1),
 .IR xml2-config (1).
-.SH NOTES
-Source for libxml is available on http://opensolaris.org.
-Documentation for libxml is available on-line at http://www.xmlsoft.org/
--- a/components/libxml2/libxml2-26.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxml2/libxml2-26.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,27 +21,26 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/python-2/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/python-2/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XML library - Python 2.6 bindings"
-set name=info.classification value=org.opensolaris.category.2008:Development/Python
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+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=usr
 dir path=usr/lib
 dir path=usr/lib/python2.6
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/64
-
 file path=usr/lib/python2.6/vendor-packages/64/libxml2mod.so
 file path=usr/lib/python2.6/vendor-packages/drv_libxml2.py
 file path=usr/lib/python2.6/vendor-packages/libxml2.py
 file path=usr/lib/python2.6/vendor-packages/libxml2mod.so
-
+legacy pkg=SUNWlxml-python26 desc="The XML library - Python 2.6 bindings" \
+    name="The XML library - Python 2.6 bindings"
 license libxml2.license license="libxml license"
 
-legacy pkg=SUNWlxml-python26 \
-    name="The XML library - Python 2.6 bindings" \
-    desc="The XML library - Python 2.6 bindings"
-
--- 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/libxml2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/library/libxml2@$(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)" 
--- a/components/libxml2/xmlcatalog.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxml2/xmlcatalog.1	Wed Apr 13 09:58:06 2011 -0700
@@ -78,6 +78,3 @@
 John Fleck  <[email protected]>
 This is release 0.2 of the xmlcatalog Manual.
 
-.SH NOTES
-Source for libxml is available on http://opensolaris.org.
-Documentation for libxml is available on-line at http://www.xmlsoft.org/
--- a/components/libxml2/xmllint.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxml2/xmllint.1	Wed Apr 13 09:58:06 2011 -0700
@@ -113,6 +113,3 @@
 .SH AUTHORS
 John Fleck <[email protected]>, Ziying Sherwin <[email protected]>, Heiko Rupp <[email protected]>
 This is release 0.2 of the xmllint Manual.
-.SH NOTES
-Source for libxml is available on http://opensolaris.org.
-Documentation for libxml is available on-line at http://www.xmlsoft.org/
--- a/components/libxslt/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxslt/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -35,10 +35,9 @@
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
+include ../../make-rules/lint-libraries.mk
 
-LIBNAME=	xslt
-LIBNAME2=	exslt
-LINTOUT=	lint.out
+LINT_FLAGS +=	-I/usr/include/libxml2 
 
 CFLAGS +=	$(CPP_LARGEFILES)
 LDFLAGS +=	$(LD_Z_DEFS) $(LD_Z_TEXT) -lpthread
@@ -52,6 +51,8 @@
 CONFIGURE_OPTIONS += LDFLAGS="$(LDFLAGS)"
 CONFIGURE_OPTIONS += PYTHON_VENDOR_PACKAGES=$(PYTHON_VENDOR_PACKAGES)
 
+COMPONENT_TEST_TARGETS = tests
+
 COMPONENT_PREP_ACTION = \
 	(cd $(@D) ; cp ../mapfile.xslt libxslt/libxslt.syms ; \
 		    cp ../mapfile.exslt libexslt/libexslt.syms ; \
@@ -59,31 +60,12 @@
 		    libtoolize --force --copy ; aclocal-1.10 ; \
 		    automake-1.10 --addmissing --copy ; autoconf)
 
-COMPONENT_POST_BUILD_ACTION = \
-	(cd $(@D); $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME) -I$(@D) \
-			-I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \
-			-I/usr/include/libxml2 \
-			$(COMPONENT_DIR)/llib-l$(LIBNAME) > $(LINTOUT) 2>&1 ; \
-	 	    $(LINT) -nsvx $(CC_BITS) -o $(LIBNAME2) -I$(@D) \
-			-I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include \
-			-I/usr/include/libxml2 \
-			$(COMPONENT_DIR)/llib-l$(LIBNAME2) >> $(LINTOUT) 2>&1)
-
-COMPONENT_POST_INSTALL_ACTION = \
-	(cd $(@D); $(INSTALL) llib-l$(LIBNAME).ln \
-			$(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)) ; \
-		   $(INSTALL) llib-l$(LIBNAME2).ln \
-			$(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS)))
-
 # common targets
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
 
-test:	$(TEST_32_and_64)
-
-$(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built
-	(cd $(@D) ; gmake tests || exit 0)
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/libxslt/libxsl-26.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxslt/libxsl-26.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,24 +21,24 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/python-2/libxsl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/python-2/libxsl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XSLT library - Python 2.6 bindings"
-set name=info.classification value=org.opensolaris.category.2008:Development/Python
-set name=info.upstream_url value="http://xmlsoft.org/XSLT"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://xmlsoft.org/XSLT
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/lib
 dir path=usr/lib/python2.6
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/64
+file path=usr/lib/python2.6/vendor-packages/64/libxsltmod.so
 file path=usr/lib/python2.6/vendor-packages/libxslt.py
-file path=usr/lib/python2.6/vendor-packages/64/libxsltmod.so
 file path=usr/lib/python2.6/vendor-packages/libxsltmod.so
-
+legacy pkg=SUNWlxsl-python26 desc="The XSLT library - Python 2.6 bindings" \
+    name="The XSLT library - Python 2.6 bindings"
 license xsl.license license=SUNWlxsl-python26.copyright
-
-legacy pkg=SUNWlxsl-python26 \
-	desc="The XSLT library - Python 2.6 bindings" \
-	name="The XSLT library - Python 2.6 bindings"
--- a/components/libxslt/libxslt.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxslt/libxslt.3	Wed Apr 13 09:58:06 2011 -0700
@@ -44,6 +44,3 @@
 .IR xsltproc (1),
 .IR xslt-config (1),
 .IR libxml (3)
-.SH NOTES
-Source for libxslt is available on http://opensolaris.org.
-Documentation for libxslt is available on-line at http://www.xmlsoft.org/XSLT.
--- a/components/libxslt/libxslt.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxslt/libxslt.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/libxslt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/libxslt@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XSLT library"
-set name=info.classification value=org.opensolaris.category.2008:System/Libraries
-set name=info.upstream_url value="http://xmlsoft.org/XSLT"
+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/XSLT
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/include
@@ -42,24 +46,22 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man3
-file xslt-config.1 path=usr/share/man/man1/xslt-config.1
-file xsltproc.1 path=usr/share/man/man1/xsltproc.1
+file path=usr/bin/xslt-config
+file path=usr/bin/xsltproc
+file path=usr/include/libexslt/exslt.h
+file path=usr/include/libexslt/exsltconfig.h
+file path=usr/include/libexslt/exsltexports.h
+file path=usr/include/libxslt/attributes.h
 file path=usr/include/libxslt/documents.h
-file libxslt.3 path=usr/share/man/man3/libxslt.3
 file path=usr/include/libxslt/extensions.h
-file path=usr/bin/xslt-config
+file path=usr/include/libxslt/extra.h
 file path=usr/include/libxslt/functions.h
+file path=usr/include/libxslt/imports.h
+file path=usr/include/libxslt/keys.h
 file path=usr/include/libxslt/namespaces.h
-file path=usr/include/libexslt/exslt.h
-file path=usr/include/libxslt/extra.h
-file path=usr/include/libxslt/keys.h
-file path=usr/include/libxslt/attributes.h
-file path=usr/include/libexslt/exsltconfig.h
-file path=usr/include/libxslt/imports.h
-file path=usr/include/libexslt/exsltexports.h
-file path=usr/include/libxslt/preproc.h
 file path=usr/include/libxslt/numbersInternals.h
 file path=usr/include/libxslt/pattern.h
+file path=usr/include/libxslt/preproc.h
 file path=usr/include/libxslt/security.h
 file path=usr/include/libxslt/templates.h
 file path=usr/include/libxslt/transform.h
@@ -70,33 +72,29 @@
 file path=usr/include/libxslt/xsltexports.h
 file path=usr/include/libxslt/xsltlocale.h
 file path=usr/include/libxslt/xsltutils.h
-file llib-lexslt path=usr/lib/llib-lexslt
-file path=usr/lib/pkgconfig/libxslt.pc
-file llib-lexslt path=usr/lib/llib-lxslt
-file path=usr/lib/pkgconfig/libexslt.pc
-file path=usr/bin/xsltproc
-file path=usr/share/aclocal/libxslt.m4
 file path=usr/lib/$(MACH64)/libexslt.so.0
 file path=usr/lib/$(MACH64)/libxslt.so.1
-file path=usr/lib/libexslt.so.0
-file path=usr/lib/libxslt.so.1
 file path=usr/lib/$(MACH64)/llib-lexslt.ln
 file path=usr/lib/$(MACH64)/llib-lxslt.ln
 file path=usr/lib/$(MACH64)/pkgconfig/libexslt.pc
 file path=usr/lib/$(MACH64)/pkgconfig/libxslt.pc
+file path=usr/lib/libexslt.so.0
+file path=usr/lib/libxslt.so.1
+file llib-lexslt path=usr/lib/llib-lexslt
 file path=usr/lib/llib-lexslt.ln
+file llib-lexslt path=usr/lib/llib-lxslt
 file path=usr/lib/llib-lxslt.ln
+file path=usr/lib/pkgconfig/libexslt.pc
+file path=usr/lib/pkgconfig/libxslt.pc
+file path=usr/share/aclocal/libxslt.m4
+file xslt-config.1 path=usr/share/man/man1/xslt-config.1
+file xsltproc.1 path=usr/share/man/man1/xsltproc.1
+file libxslt.3 path=usr/share/man/man3/libxslt.3
+legacy pkg=SUNWlxsl desc="The XSLT library" name="The XSLT library"
+legacy pkg=SUNWlxsl-devel desc="The XSLT library - developer files" \
+    name="The XSLT library - developer files"
+license xsl.license license=SUNWlxsl.copyright
+link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0
+link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1
 link path=usr/lib/libexslt.so target=./libexslt.so.0
 link path=usr/lib/libxslt.so target=./libxslt.so.1
-link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1
-link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0
-
-license xsl.license license=SUNWlxsl.copyright
-
-legacy pkg=SUNWlxsl \
-	name="The XSLT library" \
-	desc="The XSLT library"
-
-legacy pkg=SUNWlxsl-devel \
-	name="The XSLT library - developer files" \
-	desc="The XSLT library - developer files"
--- a/components/libxslt/xslt-config.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxslt/xslt-config.1	Wed Apr 13 09:58:06 2011 -0700
@@ -36,6 +36,3 @@
 
 .SH AUTHORS
 Daniel Veillard ([email protected])
-.SH NOTES
-Source for libxslt is available on http://opensolaris.org.
-Documentation for libxslt is available on-line at http://www.xmlsoft.org/XSLT.
--- a/components/libxslt/xsltproc.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/libxslt/xsltproc.1	Wed Apr 13 09:58:06 2011 -0700
@@ -125,6 +125,3 @@
 Copyright 2001 by John Fleck  <[email protected]>.
 This is release 0.2 of the xsltproc Manual.
 
-.SH NOTES
-Source for libxslt is available on http://opensolaris.org.
-Documentation for libxslt is available on-line at http://xmlsoft.org/XSLT/
--- a/components/logilab-astng/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/logilab-astng/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -36,8 +36,6 @@
 include ../../make-rules/ips.mk
 include ../../make-rules/setup.py.mk
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 
 build:		$(BUILD_32)
@@ -50,8 +48,7 @@
 #        (cd $(COMPONENT_SRC)/test; $(ENV) - \
 #        PYTHONPATH=$(PROTO_DIR)/usr/lib/python2.6/vendor-packages \
 #        ./fulltest.sh)
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/logilab-astng/logilab-astng.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/logilab-astng/logilab-astng.3	Wed Apr 13 09:58:06 2011 -0700
@@ -1,6 +1,5 @@
-'\" te
 .\"
-.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" logilab-astng.3
 .\"
@@ -49,26 +48,6 @@
 .SH SUPPORT
 [email protected]
 
-.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	library/python-2/logilab-astng
-=
-Interface Stability	Uncommitted
-.TE
 .SH SEE ALSO
 .IR logilab-common (3),
 .IR pylint (1),
-.SH NOTES
-
-Documentation for logilab-astng is available on-line at http://www.logilab.org/project/logilab-astng
-
-Source for logilab-astng is available on http://opensolaris.org.
--- a/components/logilab-astng/logilab-astng.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/logilab-astng/logilab-astng.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,21 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/python-2/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="logilab-astng - Python Abstract Syntax Tree New Generation"
-set name=pkg.description value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="logilab-astng provides a common base representation of python source code for projects such as pylint."
+set name=pkg.summary \
+    value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.logilab.org/project/logilab-astng/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/299
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/lib
 dir path=usr/lib/python2.6
@@ -40,8 +47,10 @@
 dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl
 dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2
 dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage
 dir path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info
 dir path=usr/share
 dir path=usr/share/man
@@ -72,8 +81,10 @@
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/nodes.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/nodes_as_string.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/nodes_as_string.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/patchcomptransformer.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/patchcomptransformer.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/patchcomptransformer.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/patchcomptransformer.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/protocols.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/protocols.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/raw_building.py
@@ -84,80 +95,129 @@
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/scoped_nodes.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/__init__.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.egg
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.zip
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/Connection1.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/Connection1.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/__init__.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.egg
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/MyPyPa-0.1.0-py2.5.zip
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/Connection1.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/Connection1.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/SSL1/__init__.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/__init__.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/all.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/all.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/myConnection.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/myConnection.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/__init__.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/myConnection.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/appl/myConnection.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/format.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/format.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module2.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module2.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/noendingnewline.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/noendingnewline.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/module2.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/noendingnewline.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/noendingnewline.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/nonregr.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/nonregr.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/nonregr.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/notall.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data/notall.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/clientmodule_test.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/clientmodule_test.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/suppliermodule_test.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/suppliermodule_test.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/__init__.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/clientmodule_test.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/clientmodule_test.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/suppliermodule_test.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/data2/suppliermodule_test.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/descriptor_crash.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/import_package_subpackage_module.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/module.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_builder.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_builder.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inference.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inference.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inspector.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inspector.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_lookup.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_lookup.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_manager.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_manager.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_nodes.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_nodes.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_scoped_nodes.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_scoped_nodes.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_utils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_utils.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/descriptor_crash.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/import_package_subpackage_module.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/regrtest_data/package/subpackage/module.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_builder.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_builder.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inference.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inference.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inspector.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_inspector.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_lookup.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_lookup.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_manager.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_manager.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_nodes.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_nodes.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_scoped_nodes.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_scoped_nodes.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_utils.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/astng/test/unittest_utils.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/utils.py
 file path=usr/lib/python2.6/vendor-packages/logilab/astng/utils.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6-nspkg.pth
-file path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/PKG-INFO
-file path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/SOURCES.txt
-file path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/dependency_links.txt
-file path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/namespace_packages.txt
-file path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/requires.txt
-file path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/top_level.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6-nspkg.pth
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/namespace_packages.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/requires.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/top_level.txt
 file logilab-astng.3 path=usr/share/man/man3/logilab-astng.3
+legacy pkg=SUNWlogilab-astng \
+    desc="logilab-astng - Python Abstract Syntax Tree New Generation (0.19.0)" \
+    name="logilab-astng - Python Abstract Syntax Tree New Generation"
+license logilab-astng.license license=GPLv2
 
 # pkgdepend should have picked up the dependency on /library/python-2/logilab-common;
 # this explicit depend action can be removed if pkgdepend is fixed later
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/logilab/common/modutils.py \
-        pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/astng/manager.py \
-        type=require
-
-license logilab-astng.license license="GPLv2"
-
-legacy pkg=SUNWlogilab-astng \
-	desc="logilab-astng - Python Abstract Syntax Tree New Generation (0.19.0)" \
-	name="logilab-astng - Python Abstract Syntax Tree New Generation"
+depend fmri=__TBD \
+    pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/logilab/common/modutils.py \
+    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/astng/manager.py \
+    type=require
--- a/components/logilab-common/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/logilab-common/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -36,18 +36,11 @@
 include ../../make-rules/ips.mk
 include ../../make-rules/setup.py.mk
 
-MAN3FILES =	logilab-common.3
-
-include ../../make-rules/shared-targets.mk
-
-$(PROTOMAN3FILES):
-	$(CP) $(MAN3FILES) $(PROTOMAN3FILES)
-
 # common targets
 
 build:		$(BUILD_32)
 
-install:	$(PROTOMAN3FILES) $(INSTALL_32)
+install:	$(INSTALL_32)
 
 # Expected failures for test target:
 # In unittest_modutils.py, one failure in
--- a/components/logilab-common/logilab-common.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/logilab-common/logilab-common.3	Wed Apr 13 09:58:06 2011 -0700
@@ -1,6 +1,5 @@
-'\" te
 .\"
-.\" Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\" logilab-common.3
 .\"
@@ -219,25 +218,6 @@
 .SH SUPPORT
 [email protected]
 
-.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	library/python-2/logilab-common
-=
-Interface Stability	Uncommitted
-.TE
 .SH SEE ALSO
 .IR logilab-astng (3),
 .IR pylint (1)
-.SH NOTES
-Documentation for logilab-common is available on-line at http://www.logilab.org/project/logilab-common
-
-Source for logilab-common is available on http://opensolaris.org.
--- a/components/logilab-common/logilab-common.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/logilab-common/logilab-common.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,47 +20,60 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/python-2/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/python-2/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Modules providing low level functionality shared among various python projects."
 set name=pkg.summary value="common python libraries for logilab applications"
-set name=pkg.description value="Modules providing low level functionality shared among various python projects."
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value=http://www.logilab.org/project/logilab-common/
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url \
+    value=http://www.logilab.org/project/logilab-common/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/298
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/lib
 dir path=usr/lib/python2.6
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/logilab
-dir path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info
 dir path=usr/lib/python2.6/vendor-packages/logilab/common
 dir path=usr/lib/python2.6/vendor-packages/logilab/common/test
 dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo
 dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir
 dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir
 dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir
-dir path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir
 dir path=usr/lib/python2.6/vendor-packages/logilab/common/ureports
+dir \
+    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man3
-file path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6-nspkg.pth
-file path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/dependency_links.txt
-file path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/namespace_packages.txt
-file path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/PKG-INFO
-file path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/SOURCES.txt
-file path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/top_level.txt
 file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/__init__.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/__init__.pyc
@@ -142,121 +155,226 @@
 file path=usr/lib/python2.6/vendor-packages/logilab/common/table.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/tasksqueue.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/tasksqueue.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/__init__.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/ChangeLog
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/NOTHING
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/README
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/coin
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/toto.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/NOTHING
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/README
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdir/toto.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo/Hello
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/foo.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module2.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module2.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/newlines.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/noendingnewline.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/noendingnewline.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/nonregr.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/nonregr.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/normal_file.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/spam.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub/doc.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub/momo.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test.ini
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test1.msg
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test2.msg
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/write_protected_file.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.egg
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.zip
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/__init__.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/NOTHING
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/README
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/coin
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/content_differ_dir/subdir/toto.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/NOTHING
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/README
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdir/toto.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/file_differ_dir/subdirtwo/Hello
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/__init__.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/foo.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module2.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/module2.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/newlines.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/noendingnewline.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/noendingnewline.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/nonregr.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/nonregr.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/normal_file.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/spam.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub/doc.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/sub/momo.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test.ini
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test1.msg
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/test2.msg
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/find_test/write_protected_file.txt
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/foo.txt
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module2.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module2.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.egg
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/MyPyPa-0.1.0-py2.5.zip
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/newlines.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/noendingnewline.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/noendingnewline.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/nonregr.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/nonregr.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/normal_file.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/NOTHING
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/README
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir/coin
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir/toto.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/NOTHING
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/README
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir/coin
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir/toto.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module2.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/module2.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/newlines.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/noendingnewline.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/noendingnewline.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/nonregr.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/nonregr.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/normal_file.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/NOTHING
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/README
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir/coin
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/reference_dir/subdir/toto.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/NOTHING
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/README
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir/coin
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/same_dir/subdir/toto.txt
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/spam.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub/doc.txt
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub/momo.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/NOTHING
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/README
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/coin
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/toto.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub/doc.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/sub/momo.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/NOTHING
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/README
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/coin
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/subdir_differ_dir/subdir/toto.txt
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/test.ini
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/test1.msg
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/test2.msg
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/write_protected_file.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/data/write_protected_file.txt
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/foomod.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/foomod.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_adbh.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_adbh.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_bind.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_bind.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_cache.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_cache.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_changelog.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_changelog.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_compat.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_compat.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_configuration.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_configuration.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_date.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_date.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_adbh.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_adbh.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_bind.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_bind.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_cache.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_cache.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_changelog.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_changelog.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_compat.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_compat.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_configuration.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_configuration.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_date.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_date.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_db.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_db.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_decorators.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_decorators.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_fileutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_fileutils.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_graph.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_graph.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_interface.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_interface.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_logger.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_logger.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_modutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_modutils.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_patricia.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_patricia.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_pytest.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_pytest.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_shellutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_shellutils.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_table.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_table.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_taskqueue.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_taskqueue.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_testlib.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_testlib.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_textutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_textutils.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_tree.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_tree.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_umessage.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_umessage.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_html.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_html.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_text.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_text.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_db.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_decorators.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_decorators.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_fileutils.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_fileutils.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_graph.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_graph.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_interface.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_interface.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_logger.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_logger.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_modutils.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_modutils.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_patricia.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_patricia.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_pytest.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_pytest.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_shellutils.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_shellutils.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_table.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_table.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_taskqueue.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_taskqueue.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_testlib.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_testlib.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_textutils.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_textutils.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_tree.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_tree.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_umessage.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_umessage.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_html.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_html.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_text.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/test/unittest_ureports_text.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/utils.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/test/utils.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/testlib.py
@@ -265,36 +383,57 @@
 file path=usr/lib/python2.6/vendor-packages/logilab/common/textutils.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/tree.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/tree.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/twisted_distutils.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/twisted_distutils.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/twisted_distutils.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/twisted_distutils.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/umessage.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/umessage.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/nodes.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/nodes.pyc
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.py
-file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.py
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/vcgutils.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/vcgutils.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/visitor.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/visitor.pyc
 file path=usr/lib/python2.6/vendor-packages/logilab/common/xmlrpcutils.py
 file path=usr/lib/python2.6/vendor-packages/logilab/common/xmlrpcutils.pyc
-file path=usr/share/man/man3/logilab-common.3
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6-nspkg.pth
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/PKG-INFO
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/SOURCES.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/dependency_links.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/namespace_packages.txt
+file \
+    path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/top_level.txt
+file logilab-common.3 path=usr/share/man/man3/logilab-common.3
+legacy pkg=SUNWlogilab-common \
+    desc="common python libraries for logilab applications (0.39.0)" \
+    name="common python libraries for logilab applications"
+license logilab-common.license license=GPLv2
 
 # pkgdepend should have picked up the dependency on /library/python-2/python-gnome-libs-26;
 # this explicit depend action can be removed if pkgdepend is fixed later
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/CORBA.py \
-	pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py \
-	type=require 
-
-license logilab-common.license license="GPLv2"
-
-legacy pkg=SUNWlogilab-common \
-	desc="common python libraries for logilab applications (0.39.0)" \
-	name="common python libraries for logilab applications"
+depend fmri=__TBD \
+    pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/CORBA.py \
+    pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py \
+    type=require
--- a/components/lua/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/lua/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -42,23 +42,15 @@
 COMPONENT_BUILD_ARGS += CFLAGS="$(CFLAGS)"
 COMPONENT_INSTALL_ARGS += INSTALL=$(INSTALL)
 COMPONENT_INSTALL_ARGS += INSTALL_TOP=$(PROTOUSRDIR)
-
-include ../../make-rules/shared-targets.mk
+$(INSTALL_64):	COMPONENT_INSTALL_ARGS += INSTALL_LIB=$(PROTOUSRLIBDIR64)
+$(INSTALL_64):	COMPONENT_INSTALL_ARGS += INSTALL_BIN=$(PROTOUSRBINDIR64)
 
 # common targets
 build:		$(BUILD_32_and_64)
-
 	
-install:	build $(INSTALL_32)
-		$(MKDIR) $(PROTOUSRDIR)/lib/pkgconfig
-		$(CP) $(SOURCE_DIR)/etc/lua.pc $(PROTOUSRDIR)/lib/pkgconfig
-		$(MKDIR) $(PROTOUSRLIBDIR64) 
-		$(INSTALL) $(BUILD_DIR_64)/src/liblua.so $(PROTOUSRLIBDIR64)
+install:	$(INSTALL_32_and_64)
 		
-test:  build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-	@cd $(BUILD_DIR_64); $(MAKE) check
-
+test: 		$(TEST_32_and_64)
 		
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
--- a/components/lua/lua.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/lua/lua.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/runtime/lua@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/runtime/lua@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Lua is a powerful, fast, lightweight, embeddable scripting language."
 set name=pkg.summary value="Lua Programming language"
-set name=pkg.description value="Lua is a powerful, fast, lightweight, embeddable scripting language."
-set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Other Languages"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.lua.org
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/013
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr
 dir path=usr/bin
@@ -43,51 +49,49 @@
 dir path=usr/share/doc/lua
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/share/doc/lua/manual.html
-file path=usr/bin/lua 
-file path=usr/share/doc/lua/readme.html 
-file path=usr/share/doc/lua/lua.html 
+file path=usr/bin/lua
+file path=usr/bin/luac
+file path=usr/demo/lua/test/bisect.lua
+file path=usr/demo/lua/test/cf.lua
+file path=usr/demo/lua/test/echo.lua
+file path=usr/demo/lua/test/env.lua
+file path=usr/demo/lua/test/factorial.lua
+file path=usr/demo/lua/test/fib.lua
+file path=usr/demo/lua/test/fibfor.lua
+file path=usr/demo/lua/test/globals.lua
+file path=usr/demo/lua/test/hello.lua
+file path=usr/demo/lua/test/life.lua
+file path=usr/demo/lua/test/luac.lua
+file path=usr/demo/lua/test/printf.lua
+file path=usr/demo/lua/test/readonly.lua
+file path=usr/demo/lua/test/sieve.lua
+file path=usr/demo/lua/test/sort.lua
 file path=usr/demo/lua/test/table.lua
-file path=usr/share/man/man1/luac.1 
-file path=usr/demo/lua/test/trace-globals.lua 
-file path=usr/share/doc/lua/logo.gif 
-file path=usr/include/lauxlib.h 
-file path=usr/lib/pkgconfig/lua.pc 
+file path=usr/demo/lua/test/trace-calls.lua
+file path=usr/demo/lua/test/trace-globals.lua
+file path=usr/demo/lua/test/xd.lua
+file path=usr/include/lauxlib.h
+file path=usr/include/lua.h
+file path=usr/include/luaconf.h
+file path=usr/include/lualib.h
+file path=usr/lib/$(MACH64)/liblua.so
+file path=usr/lib/liblua.so
+file $(MACH32)/etc/lua.pc path=usr/lib/pkgconfig/lua.pc
+file path=usr/share/doc/lua/amazon.gif
+file path=usr/share/doc/lua/contents.html
+file path=usr/share/doc/lua/cover.png
+file path=usr/share/doc/lua/logo.gif
+file path=usr/share/doc/lua/lua.css
+file path=usr/share/doc/lua/lua.html
 file path=usr/share/doc/lua/luac.html
-file path=usr/demo/lua/test/globals.lua 
-file path=usr/demo/lua/test/readonly.lua
-file path=usr/demo/lua/test/hello.lua 
-file path=usr/demo/lua/test/cf.lua 
-file path=usr/demo/lua/test/fib.lua 
-file path=usr/demo/lua/test/fibfor.lua 
-file path=usr/lib/liblua.so 
 file path=usr/share/doc/lua/manual.css
-file path=usr/demo/lua/test/luac.lua 
-file path=usr/demo/lua/test/life.lua 
-file path=usr/demo/lua/test/sieve.lua 
-file path=usr/demo/lua/test/sort.lua 
-file path=usr/share/man/man1/lua.1 
-file path=usr/demo/lua/test/echo.lua 
-file path=usr/bin/luac 
-file path=usr/share/doc/lua/lua.css 
-file path=usr/demo/lua/test/trace-calls.lua 
-file path=usr/share/doc/lua/cover.png 
-file path=usr/share/doc/lua/amazon.gif 
-file path=usr/include/luaconf.h 
-file path=usr/demo/lua/test/env.lua 
-file path=usr/share/doc/lua/contents.html 
-file path=usr/include/lua.h 
-file path=usr/demo/lua/test/xd.lua 
-file path=usr/lib/$(MACH64)/liblua.so 
-file path=usr/include/lualib.h 
-file path=usr/demo/lua/test/bisect.lua 
-file path=usr/demo/lua/test/factorial.lua 
-file path=usr/demo/lua/test/printf.lua 
+file path=usr/share/doc/lua/manual.html
+file path=usr/share/doc/lua/readme.html
+file path=usr/share/man/man1/lua.1
+file path=usr/share/man/man1/luac.1
+legacy pkg=SUNWlua desc="lua - Lua Programming language 5.1.4" \
+    name="lua - Lua Programming language"
 
 
-license lua.license license="MIT"
+license lua.license license=MIT
 
-legacy  pkg=SUNWlua \
-	name="lua - Lua Programming language" \
-	desc="lua - Lua Programming language 5.1.4" 
-
--- a/components/m4/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/m4/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,16 +40,13 @@
 CONFIGURE_OPTIONS  +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
 
+test:		$(TEST_32)
+
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/m4/m4.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/m4/m4.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/macro/gnu-m4@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/developer/macro/gnu-m4@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="GNU M4 is an implementation of the traditional Unix macro processor"
 set name=pkg.summary value="GNU m4"
-set name=pkg.description value="GNU M4 is an implementation of the traditional Unix macro processor"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.gnu.org/software/m4/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/388
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -49,13 +54,11 @@
 file path=usr/share/info/m4.info
 file path=usr/share/info/m4.info-1
 file path=usr/share/info/m4.info-2
-link path=usr/bin/gm4 target=../gnu/bin/m4
-link path=usr/share/man/man1/gm4.1 target=../../../gnu/share/man/man1/m4.1
-link path=usr/sfw/bin/gm4 target=../../gnu/bin/m4
+legacy pkg=SUNWgm4 desc="GNU m4 - A macro processor (gm4) 1.4.12" \
+    name="GNU m4"
 
 
-license m4.license license="GPLv3"
-
-legacy	pkg=SUNWgm4 \
-	name="GNU m4" \
-	desc="GNU m4 - A macro processor (gm4) 1.4.12"
+license m4.license license=GPLv3
+link path=usr/bin/gm4 target=../gnu/bin/m4
+link path=usr/sfw/bin/gm4 target=../../gnu/bin/m4
+link path=usr/share/man/man1/gm4.1 target=../../../gnu/share/man/man1/m4.1
--- a/components/make/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/make/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,23 +40,14 @@
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-GNUPROGS =	make
-GNUMAN1 =	make.1
-SFWPROGS=	gmake
-SFWMAN1=	gmake.1
-
-include ../../make-rules/shared-targets.mk
 
 # common targets
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) \
-    $(PROTOGNULINKS) $(PROTOGNUMAN1LINKS) \
-    $(PROTOSFWLINKS) $(PROTOSFWMAN1LINKS)
+install:	$(INSTALL_32)
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/make/make.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/make/make.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/build/gnu-make@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/developer/build/gnu-make@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="GNU Make is an utility which controls the generation of executables and other target files."
 set name=pkg.summary value="A utility for directing compilation."
-set name=pkg.description value="GNU Make is an utility which controls the generation of executables and other target files."
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.gnu.org/software/make/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -122,15 +127,13 @@
 file path=usr/share/locale/vi/LC_MESSAGES/make.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/make.mo
 file path=usr/share/man/man1/gmake.1
+legacy pkg=SUNWgmake \
+    desc="GNU make - A utility used to build software (gmake) 3.81" \
+    name="gmake - GNU make"
+license make.license license=GPLv2
 link path=usr/gnu/bin/make target=../../bin/gmake
 link path=usr/gnu/share/man/man1/make.1 \
     target=../../../../share/man/man1/gmake.1
 link path=usr/sfw/bin/gmake target=../../bin/gmake
 link path=usr/sfw/share/man/man1/gmake.1 \
     target=../../../../share/man/man1/gmake.1
-
-license make.license license="GPLv2"
-
-legacy	pkg=SUNWgmake \
-	name="gmake - GNU make" \
-	desc="GNU make - A utility used to build software (gmake) 3.81"
--- a/components/mercurial/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/mercurial/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,7 +40,6 @@
 
 PKG_PROTO_DIRS +=	$(COMPONENT_SRC)/contrib
 PKG_PROTO_DIRS +=	$(COMPONENT_SRC)/doc
-PUBLISH_TRANSFORMS +=	demo-transform
 
 # common targets
 build:		$(BUILD_32)
--- a/components/mercurial/demo-transform	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-#
-# 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 source contrib
-# directory.
-<transform file path=usr/demo/mercurial/(.+)$ -> \
-	set action.hash %<\1> >
--- a/components/mercurial/mercurial.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/mercurial/mercurial.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,16 +21,22 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+# These are not installed, but can be found in the source contrib directory.
+<transform file path=usr/demo/mercurial/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
 set name=pkg.summary value="The Mercurial Source Control Management System"
-set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value="http://www.selenic.com/mercurial/wiki/index.cgi/Mercurial"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url \
+    value=http://www.selenic.com/mercurial/wiki/index.cgi/Mercurial
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2006/417
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license mercurial.copyright license='GPLv2'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/demo
@@ -82,6 +88,41 @@
 dir path=usr/share/man/man1
 dir path=usr/share/man/man5
 file path=usr/bin/hg
+file path=usr/demo/mercurial/bash_completion
+file path=usr/demo/mercurial/convert-repo
+file path=usr/demo/mercurial/dumprevlog
+file path=usr/demo/mercurial/git-viz/git-cat-file
+file path=usr/demo/mercurial/git-viz/git-diff-tree
+file path=usr/demo/mercurial/git-viz/git-rev-list
+file path=usr/demo/mercurial/git-viz/git-rev-tree
+file path=usr/demo/mercurial/git-viz/hg-viz
+file path=usr/demo/mercurial/hg-relink mode=0555
+file path=usr/demo/mercurial/hg-ssh mode=0555
+file path=usr/demo/mercurial/hgdiff mode=0555
+file path=usr/demo/mercurial/hgk mode=0555
+file path=usr/demo/mercurial/hgsh/Makefile
+file path=usr/demo/mercurial/hgsh/hgsh.c
+file path=usr/demo/mercurial/hgwebdir.fcgi
+file path=usr/demo/mercurial/hgwebdir.wsgi
+file path=usr/demo/mercurial/logo-droplets.svg
+file path=usr/demo/mercurial/mercurial.el
+file path=usr/demo/mercurial/mergetools.hgrc
+file path=usr/demo/mercurial/mq.el
+file path=usr/demo/mercurial/perf.py
+file path=usr/demo/mercurial/python-hook-examples.py
+file path=usr/demo/mercurial/rewrite-log
+file path=usr/demo/mercurial/sample.hgrc
+file path=usr/demo/mercurial/simplemerge
+file path=usr/demo/mercurial/tcsh_completion
+file path=usr/demo/mercurial/tcsh_completion_build.sh
+file path=usr/demo/mercurial/tmplrewrite.py
+file path=usr/demo/mercurial/undumprevlog
+file path=usr/demo/mercurial/vim/HGAnnotate.vim
+file path=usr/demo/mercurial/vim/hg-menu.vim
+file path=usr/demo/mercurial/vim/hgcommand.vim
+file path=usr/demo/mercurial/vim/patchreview.txt
+file path=usr/demo/mercurial/vim/patchreview.vim
+file path=usr/demo/mercurial/zsh_completion
 file path=usr/lib/python2.6/vendor-packages/hgext/__init__.py
 file path=usr/lib/python2.6/vendor-packages/hgext/__init__.pyc
 file path=usr/lib/python2.6/vendor-packages/hgext/acl.py
@@ -320,7 +361,8 @@
 file path=usr/lib/python2.6/vendor-packages/mercurial/repo.pyc
 file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.py
 file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.pyc
-file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.pyc
 file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.py
 file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.pyc
@@ -587,47 +629,10 @@
 file path=usr/lib/python2.6/vendor-packages/mercurial/win32.pyc
 file path=usr/lib/python2.6/vendor-packages/mercurial/windows.py
 file path=usr/lib/python2.6/vendor-packages/mercurial/windows.pyc
-
-file path=usr/demo/mercurial/bash_completion
-file path=usr/demo/mercurial/convert-repo
-file path=usr/demo/mercurial/dumprevlog
-file path=usr/demo/mercurial/git-viz/git-cat-file
-file path=usr/demo/mercurial/git-viz/git-diff-tree
-file path=usr/demo/mercurial/git-viz/git-rev-list
-file path=usr/demo/mercurial/git-viz/git-rev-tree
-file path=usr/demo/mercurial/git-viz/hg-viz
-file path=usr/demo/mercurial/hg-relink mode=0555
-file path=usr/demo/mercurial/hg-ssh mode=0555
-file path=usr/demo/mercurial/hgdiff mode=0555
-file path=usr/demo/mercurial/hgk mode=0555
-file path=usr/demo/mercurial/hgsh/hgsh.c
-file path=usr/demo/mercurial/hgsh/Makefile
-file path=usr/demo/mercurial/hgwebdir.fcgi
-file path=usr/demo/mercurial/hgwebdir.wsgi
-file path=usr/demo/mercurial/logo-droplets.svg
-file path=usr/demo/mercurial/mercurial.el
-file path=usr/demo/mercurial/mergetools.hgrc
-file path=usr/demo/mercurial/mq.el
-file path=usr/demo/mercurial/perf.py
-file path=usr/demo/mercurial/python-hook-examples.py
-file path=usr/demo/mercurial/rewrite-log
-file path=usr/demo/mercurial/sample.hgrc
-file path=usr/demo/mercurial/simplemerge
-file path=usr/demo/mercurial/tcsh_completion
-file path=usr/demo/mercurial/tcsh_completion_build.sh
-file path=usr/demo/mercurial/tmplrewrite.py
-file path=usr/demo/mercurial/undumprevlog
-file path=usr/demo/mercurial/vim/hg-menu.vim
-file path=usr/demo/mercurial/vim/HGAnnotate.vim
-file path=usr/demo/mercurial/vim/hgcommand.vim
-file path=usr/demo/mercurial/vim/patchreview.txt
-file path=usr/demo/mercurial/vim/patchreview.vim
-file path=usr/demo/mercurial/zsh_completion
-
 file path=usr/share/man/man1/hg.1
 file path=usr/share/man/man5/hgignore.5
 file path=usr/share/man/man5/hgrc.5
-
 legacy pkg=SUNWmercurial \
     desc="A fast, lightweight source control management system designed for efficient handling of very large distributed projects." \
     name="The Mercurial Source Control Management System"
+license mercurial.copyright license=GPLv2
--- a/components/mercurial/patches/manpages.patch	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/mercurial/patches/manpages.patch	Wed Apr 13 09:58:06 2011 -0700
@@ -1,15 +1,5 @@
 --- mercurial-1.3.1/doc/hg.1	Thu Jul 23 10:58:26 2009
 +++ /usr/share/man/man1/hg.1	Tue Feb 19 05:28:30 2002
-@@ -1,4 +1,9 @@
- '\" t
-+.\"
-+.\" Modified for Solaris to to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\"
-+'\" t
- .\"     Title: hg
- .\"    Author: [see the "AUTHOR" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
 @@ -757,7 +762,7 @@
  .RS 4
  .\}
@@ -32,42 +22,8 @@
  .SH "BUGS"
  .sp
  Probably lots, please post them to the mailing list (See Resources below) when you find them\&.
-@@ -4376,3 +4387,23 @@
- .RS 4
- \%http://selenic.com/mailman/listinfo/mercurial
- .RE
-+.\" Begin Sun update
-+.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	developer/versioning/mercurial
-+=
-+Interface Stability	Volatile
-+.TE
-+.PP
-+.SH NOTES
-+Source for Mercurial is available on http://opensolaris.org.
-+.\" End Sun update
 --- mercurial-1.3.1/doc/hgrc.5	Thu Jul 23 10:58:38 2009
 +++ /usr/share/man/man5/hgrc.5	Tue Feb 19 05:28:30 2002
-@@ -1,4 +1,9 @@
- '\" t
-+.\"
-+.\" Modified for Solaris to to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\"
-+'\" t
- .\"     Title: hgrc
- .\"    Author: [see the "AUTHOR" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
 @@ -27,7 +32,7 @@
  .sp
  Mercurial reads configuration data from several files, if they exist\&. The names of these files depend on the system on which Mercurial is installed\&. *\&.rc files from a single directory are read in alphabetical order, later ones overriding earlier ones\&. Where multiple paths are given below, settings from later paths override earlier ones\&.
@@ -119,63 +75,3 @@
  .RE
  .RE
  .PP
-@@ -1275,3 +1280,23 @@
- .RS 4
- \%mailto:[email protected]
- .RE
-+.\" Begin Sun update
-+.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	developer/versioning/mercurial
-+=
-+Interface Stability	Volatile
-+.TE
-+.PP
-+.SH NOTES
-+Source for Mercurial is available on http://opensolaris.org.
-+.\" End Sun update
---- mercurial-1.3.1/doc/hgignore.5	Thu Jul 23 10:58:30 2009
-+++ /usr/share/man/man5/hgignore.5	Tue Feb 19 05:28:30 2002
-@@ -1,4 +1,9 @@
- '\" t
-+.\"
-+.\" Modified for Solaris to to add the Solaris stability classification,
-+.\" and to add a note about source availability.
-+.\"
-+'\" t
- .\"     Title: hgignore
- .\"    Author: [see the "AUTHOR" section]
- .\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
-@@ -119,3 +124,23 @@
- .RS 4
- \%mailto:[email protected]
- .RE
-+.\" Begin Sun update
-+.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	developer/versioning/mercurial
-+=
-+Interface Stability	Volatile
-+.TE
-+.PP
-+.SH NOTES
-+Source for Mercurial is available on http://opensolaris.org.
-+.\" End Sun update
--- a/components/nmap/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/nmap/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -61,24 +61,12 @@
 CONFIGURE_OPTIONS  +=   --with-ndiff
 CONFIGURE_OPTIONS  +=   am_cv_python_pythondir=$(PYTHON_LIB)
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 		
 install:	$(INSTALL_32) 
-		sed -f oracleman-stability $(COMPONENT_SRC)/docs/nmap.1 \
-			> $(PROTOUSRSHAREMAN1DIR)/nmap.1
-		sed -f oracleman-stability $(COMPONENT_SRC)/docs/zenmap.1 \
-			> $(PROTOUSRSHAREMAN1DIR)/zenmap.1
-		sed -f oracleman-stability $(COMPONENT_SRC)/ncat/docs/ncat.1 \
-			> $(PROTOUSRSHAREMAN1DIR)/ncat.1
-		sed -f oracleman-stability $(COMPONENT_SRC)/ndiff/docs/ndiff.1 \
-			> $(PROTOUSRSHAREMAN1DIR)/ndiff.1
 
-test:
-		@echo "no tests available"
-	
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/nmap/nmap.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/nmap/nmap.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,21 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/diagnostic/nmap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Network exploration tool and security / port scanner."
-set name=pkg.description value="Nmap is useful for inventorying the network, managing service upgrade schedules, and monitoring host or service uptime."
-set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/diagnostic/nmap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Nmap is useful for inventorying the network, managing service upgrade schedules, and monitoring host or service uptime."
+set name=pkg.summary \
+    value="Network exploration tool and security / port scanner."
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://insecure.org/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/129
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
@@ -69,423 +76,486 @@
 dir path=usr/share/zenmap/misc
 dir path=usr/share/zenmap/pixmaps
 dir path=usr/share/zenmap/pixmaps/radialnet
-file ncat/certs/ca-bundle.crt path=usr/share/ncat/ca-bundle.crt 
-file nselib/data/favicon-db path=usr/share/nmap/nselib/data/favicon-db 
-file nselib/data/folders.lst path=usr/share/nmap/nselib/data/folders.lst 
-file nselib/data/http-fingerprints path=usr/share/nmap/nselib/data/http-fingerprints 
-file nselib/data/oracle-sids path=usr/share/nmap/nselib/data/oracle-sids 
-file nselib/data/passwords.lst path=usr/share/nmap/nselib/data/passwords.lst 
-file nselib/data/psexec/backdoor.lua path=usr/share/nmap/nselib/data/psexec/backdoor.lua
-file nselib/data/psexec/default.lua path=usr/share/nmap/nselib/data/psexec/default.lua 
-file nselib/data/psexec/drives.lua path=usr/share/nmap/nselib/data/psexec/drives.lua 
-file nselib/data/psexec/encoder.c path=usr/share/nmap/nselib/data/psexec/encoder.c 
-file nselib/data/psexec/examples.lua path=usr/share/nmap/nselib/data/psexec/examples.lua 
-file nselib/data/psexec/experimental.lua path=usr/share/nmap/nselib/data/psexec/experimental.lua 
-file nselib/data/psexec/network.lua path=usr/share/nmap/nselib/data/psexec/network.lua 
-file nselib/data/psexec/nmap_service.c path=usr/share/nmap/nselib/data/psexec/nmap_service.c 
-file nselib/data/psexec/nmap_service.exe path=usr/share/nmap/nselib/data/psexec/nmap_service.exe
-file nselib/data/psexec/nmap_service.vcproj path=usr/share/nmap/nselib/data/psexec/nmap_service.vcproj 
-file nselib/data/psexec/pwdump.lua path=usr/share/nmap/nselib/data/psexec/pwdump.lua 
-file nselib/data/psexec/README path=usr/share/nmap/nselib/data/psexec/README 
-file nselib/data/usernames.lst  path=usr/share/nmap/nselib/data/usernames.lst 
-file nselib/data/yokoso-fingerprints path=usr/share/nmap/nselib/data/yokoso-fingerprints 
-file path=usr/bin/ncat 
-file path=usr/bin/ndiff 
-file path=usr/bin/nmap 
-file path=usr/bin/zenmap 
-file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.pyc 
+file path=usr/bin/ncat
+file path=usr/bin/ndiff
+file path=usr/bin/nmap
+file path=usr/bin/zenmap
+file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/__init__.pyc
 file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/frames.py 
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/boxes.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/buttons.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.py
+file \
+    path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/comboboxes.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.py
+file \
+    path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/expanders.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/frames.py
 file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/frames.pyc
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/__init__.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/__init__.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Graph.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Graph.pyc 
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/labels.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/textview.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/bestwidgets/windows.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/ArgvHandle.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/Coordinate.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/Graph.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/Graph.pyc
 file path=usr/lib/python2.6/vendor-packages/radialnet/core/Info.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Info.pyc 
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/Info.pyc
 file path=usr/lib/python2.6/vendor-packages/radialnet/core/Interpolation.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/Interpolation.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Application.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Application.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.pyc 
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/Interpolation.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/XMLHandler.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/__init__.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/core/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Application.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Application.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/ControlWidget.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Dialogs.pyc
 file path=usr/lib/python2.6/vendor-packages/radialnet/gui/HostsViewer.py
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/HostsViewer.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Image.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Image.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeNotebook.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeNotebook.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeWindow.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeWindow.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/RadialNet.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/RadialNet.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/__init__.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/__init__.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/drawing.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/drawing.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/geometry.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/geometry.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/integration.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/integration.pyc 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/misc.py 
-file path=usr/lib/python2.6/vendor-packages/radialnet/util/misc.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/__init__.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/__init__.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/BugRegister.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/BugRegister.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Diff.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Diff.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/I18N.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/I18N.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Name.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Name.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Paths.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Paths.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.pyc 
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/HostsViewer.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Image.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Image.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeNotebook.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeNotebook.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeWindow.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/NodeWindow.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/RadialNet.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/RadialNet.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/SaveDialog.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/Toolbar.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/gui/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/__init__.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/drawing.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/drawing.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/geometry.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/geometry.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/integration.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/integration.pyc
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/misc.py
+file path=usr/lib/python2.6/vendor-packages/radialnet/util/misc.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/BasePaths.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/BugRegister.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/BugRegister.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Diff.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Diff.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/I18N.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/I18N.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Name.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Name.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NetworkInventory.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapCommand.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapOptions.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/NmapParser.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Paths.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Paths.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/RecentScans.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/SearchResult.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/TargetList.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConf.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitConfigParser.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitDB.pyc
 file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitLogging.py
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitLogging.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Version.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapCore/Version.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/About.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/About.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/App.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/App.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.py pkg.depend.bypass-generate=.* 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostDetailsPage.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostDetailsPage.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostsView.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostsView.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanInterface.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanInterface.pyc 
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitLogging.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/UmitOptionParser.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Version.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/Version.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/__init__.py
+file path=usr/lib/python2.6/vendor-packages/zenmapCore/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/About.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/About.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/App.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/App.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/BugReport.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/CrashReport.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/DiffCompare.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FileChoosers.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/FilterBar.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Icons.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/MainWindow.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputProperties.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/NmapOutputViewer.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/OptionBuilder.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileCombo.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileEditor.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ProfileHelp.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostDetailsPage.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostDetailsPage.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostsView.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanHostsView.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanInterface.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanInterface.pyc
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanNmapOutputPage.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanNmapOutputPage.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanOpenPortsPage.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanOpenPortsPage.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanRunDetailsPage.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanRunDetailsPage.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.pyc 
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanNmapOutputPage.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanOpenPortsPage.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanOpenPortsPage.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanRunDetailsPage.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanRunDetailsPage.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanScanListPage.pyc
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanToolbar.py
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanToolbar.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchWindow.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScanToolbar.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/ScansListStore.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchGUI.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchWindow.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/vendor-packages/zenmapGUI/SearchWindow.pyc
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Splash.py pkg.depend.bypass-generate=.*
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Splash.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.pyc 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.py 
-file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.pyc 
-file nmapfe.desktop path=usr/share/applications/nmapfe.desktop 
-file path=usr/share/applications/zenmap-root.desktop 
-file path=usr/share/applications/zenmap.desktop 
-file path=usr/share/man/man1/ncat.1 
-file path=usr/share/man/man1/ndiff.1 
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Splash.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/Splash.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TargetCombo.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/TopologyPage.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.py \
+    pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/gtkutils.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higboxes.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.py
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higbuttons.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.py \
+    pkg.depend.bypass-generate=.*
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higdialogs.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.py
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higentries.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.py \
+    pkg.depend.bypass-generate=.*
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higexpanders.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higframe.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlabels.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.py \
+    pkg.depend.bypass-generate=.*
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higlogindialogs.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.py \
+    pkg.depend.bypass-generate=.*
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/hignotebooks.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.py \
+    pkg.depend.bypass-generate=.*
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higprogressbars.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.py
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higscrollers.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.py \
+    pkg.depend.bypass-generate=.*
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higspinner.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtables.pyc
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.py
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higtextviewers.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.py
+file \
+    path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/higwindows.pyc
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.py
+file path=usr/lib/python2.6/vendor-packages/zenmapGUI/higwidgets/utils.pyc
+file nmapfe.desktop path=usr/share/applications/nmapfe.desktop
+file path=usr/share/applications/zenmap-root.desktop
+file path=usr/share/applications/zenmap.desktop
+file zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo \
+    path=usr/share/locale/de/LC_MESSAGES/zenmap.mo
+file zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo \
+    path=usr/share/locale/fr/LC_MESSAGES/zenmap.mo
+file zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo \
+    path=usr/share/locale/hr/LC_MESSAGES/zenmap.mo
+file zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo \
+    path=usr/share/locale/pt_BR/LC_MESSAGES/zenmap.mo
+file zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo \
+    path=usr/share/locale/ru/LC_MESSAGES/zenmap.mo
+file path=usr/share/man/man1/ncat.1
+file path=usr/share/man/man1/ndiff.1
 file path=usr/share/man/man1/nmap.1
-file path=usr/share/man/man1/zenmap.1 
-file path=usr/share/nmap/nmap-mac-prefixes 
-file path=usr/share/nmap/nmap-os-db 
-file path=usr/share/nmap/nmap-protocols 
-file path=usr/share/nmap/nmap-rpc 
-file path=usr/share/nmap/nmap-service-probes 
-file path=usr/share/nmap/nmap-services 
-file path=usr/share/nmap/nmap.dtd 
-file path=usr/share/nmap/nmap.xsl 
-file path=usr/share/nmap/nse_main.lua 
-file path=usr/share/nmap/nselib/base64.lua 
-file path=usr/share/nmap/nselib/citrixxml.lua 
-file path=usr/share/nmap/nselib/comm.lua 
-file path=usr/share/nmap/nselib/datafiles.lua 
-file path=usr/share/nmap/nselib/dns.lua 
-file path=usr/share/nmap/nselib/http.lua 
-file path=usr/share/nmap/nselib/imap.lua 
-file path=usr/share/nmap/nselib/ipOps.lua 
-file path=usr/share/nmap/nselib/listop.lua 
-file path=usr/share/nmap/nselib/match.lua 
-file path=usr/share/nmap/nselib/msrpc.lua 
-file path=usr/share/nmap/nselib/msrpcperformance.lua 
-file path=usr/share/nmap/nselib/msrpctypes.lua 
-file path=usr/share/nmap/nselib/netbios.lua 
-file path=usr/share/nmap/nselib/nsedebug.lua 
-file path=usr/share/nmap/nselib/packet.lua 
-file path=usr/share/nmap/nselib/pop3.lua 
-file path=usr/share/nmap/nselib/proxy.lua 
-file path=usr/share/nmap/nselib/shortport.lua 
-file path=usr/share/nmap/nselib/smb.lua 
-file path=usr/share/nmap/nselib/smbauth.lua 
-file path=usr/share/nmap/nselib/snmp.lua 
-file path=usr/share/nmap/nselib/ssh1.lua 
-file path=usr/share/nmap/nselib/ssh2.lua 
-file path=usr/share/nmap/nselib/stdnse.lua 
-file path=usr/share/nmap/nselib/strbuf.lua 
-file path=usr/share/nmap/nselib/strict.lua 
-file path=usr/share/nmap/nselib/tab.lua 
-file path=usr/share/nmap/nselib/unpwdb.lua 
-file path=usr/share/nmap/nselib/url.lua 
-file path=usr/share/nmap/scripts/asn-query.nse 
-file path=usr/share/nmap/scripts/auth-owners.nse 
-file path=usr/share/nmap/scripts/auth-spoof.nse 
-file path=usr/share/nmap/scripts/banner.nse 
-file path=usr/share/nmap/scripts/citrix-brute-xml.nse 
-file path=usr/share/nmap/scripts/citrix-enum-apps-xml.nse 
-file path=usr/share/nmap/scripts/citrix-enum-apps.nse 
-file path=usr/share/nmap/scripts/citrix-enum-servers-xml.nse 
-file path=usr/share/nmap/scripts/citrix-enum-servers.nse 
-file path=usr/share/nmap/scripts/daytime.nse 
-file path=usr/share/nmap/scripts/db2-info.nse 
-file path=usr/share/nmap/scripts/dhcp-discover.nse 
-file path=usr/share/nmap/scripts/dns-random-srcport.nse 
-file path=usr/share/nmap/scripts/dns-random-txid.nse 
-file path=usr/share/nmap/scripts/dns-recursion.nse 
-file path=usr/share/nmap/scripts/dns-zone-transfer.nse 
-file path=usr/share/nmap/scripts/finger.nse 
-file path=usr/share/nmap/scripts/ftp-anon.nse 
-file path=usr/share/nmap/scripts/ftp-bounce.nse 
-file path=usr/share/nmap/scripts/ftp-brute.nse 
-file path=usr/share/nmap/scripts/html-title.nse 
-file path=usr/share/nmap/scripts/http-auth.nse 
-file path=usr/share/nmap/scripts/http-date.nse 
+file path=usr/share/man/man1/zenmap.1
+file ncat/certs/ca-bundle.crt path=usr/share/ncat/ca-bundle.crt
+file path=usr/share/nmap/nmap-mac-prefixes
+file path=usr/share/nmap/nmap-os-db
+file path=usr/share/nmap/nmap-protocols
+file path=usr/share/nmap/nmap-rpc
+file path=usr/share/nmap/nmap-service-probes
+file path=usr/share/nmap/nmap-services
+file path=usr/share/nmap/nmap.dtd
+file path=usr/share/nmap/nmap.xsl
+file path=usr/share/nmap/nse_main.lua
+file path=usr/share/nmap/nselib/base64.lua
+file path=usr/share/nmap/nselib/citrixxml.lua
+file path=usr/share/nmap/nselib/comm.lua
+file nselib/data/favicon-db path=usr/share/nmap/nselib/data/favicon-db
+file nselib/data/folders.lst path=usr/share/nmap/nselib/data/folders.lst
+file nselib/data/http-fingerprints \
+    path=usr/share/nmap/nselib/data/http-fingerprints
+file nselib/data/oracle-sids path=usr/share/nmap/nselib/data/oracle-sids
+file nselib/data/passwords.lst path=usr/share/nmap/nselib/data/passwords.lst
+file nselib/data/psexec/README path=usr/share/nmap/nselib/data/psexec/README
+file nselib/data/psexec/backdoor.lua \
+    path=usr/share/nmap/nselib/data/psexec/backdoor.lua
+file nselib/data/psexec/default.lua \
+    path=usr/share/nmap/nselib/data/psexec/default.lua
+file nselib/data/psexec/drives.lua \
+    path=usr/share/nmap/nselib/data/psexec/drives.lua
+file nselib/data/psexec/encoder.c \
+    path=usr/share/nmap/nselib/data/psexec/encoder.c
+file nselib/data/psexec/examples.lua \
+    path=usr/share/nmap/nselib/data/psexec/examples.lua
+file nselib/data/psexec/experimental.lua \
+    path=usr/share/nmap/nselib/data/psexec/experimental.lua
+file nselib/data/psexec/network.lua \
+    path=usr/share/nmap/nselib/data/psexec/network.lua
+file nselib/data/psexec/nmap_service.c \
+    path=usr/share/nmap/nselib/data/psexec/nmap_service.c
+file nselib/data/psexec/nmap_service.exe \
+    path=usr/share/nmap/nselib/data/psexec/nmap_service.exe
+file nselib/data/psexec/nmap_service.vcproj \
+    path=usr/share/nmap/nselib/data/psexec/nmap_service.vcproj
+file nselib/data/psexec/pwdump.lua \
+    path=usr/share/nmap/nselib/data/psexec/pwdump.lua
+file nselib/data/usernames.lst path=usr/share/nmap/nselib/data/usernames.lst
+file nselib/data/yokoso-fingerprints \
+    path=usr/share/nmap/nselib/data/yokoso-fingerprints
+file path=usr/share/nmap/nselib/datafiles.lua
+file path=usr/share/nmap/nselib/dns.lua
+file path=usr/share/nmap/nselib/http.lua
+file path=usr/share/nmap/nselib/imap.lua
+file path=usr/share/nmap/nselib/ipOps.lua
+file path=usr/share/nmap/nselib/listop.lua
+file path=usr/share/nmap/nselib/match.lua
+file path=usr/share/nmap/nselib/msrpc.lua
+file path=usr/share/nmap/nselib/msrpcperformance.lua
+file path=usr/share/nmap/nselib/msrpctypes.lua
+file path=usr/share/nmap/nselib/netbios.lua
+file path=usr/share/nmap/nselib/nsedebug.lua
+file path=usr/share/nmap/nselib/packet.lua
+file path=usr/share/nmap/nselib/pop3.lua
+file path=usr/share/nmap/nselib/proxy.lua
+file path=usr/share/nmap/nselib/shortport.lua
+file path=usr/share/nmap/nselib/smb.lua
+file path=usr/share/nmap/nselib/smbauth.lua
+file path=usr/share/nmap/nselib/snmp.lua
+file path=usr/share/nmap/nselib/ssh1.lua
+file path=usr/share/nmap/nselib/ssh2.lua
+file path=usr/share/nmap/nselib/stdnse.lua
+file path=usr/share/nmap/nselib/strbuf.lua
+file path=usr/share/nmap/nselib/strict.lua
+file path=usr/share/nmap/nselib/tab.lua
+file path=usr/share/nmap/nselib/unpwdb.lua
+file path=usr/share/nmap/nselib/url.lua
+file path=usr/share/nmap/scripts/asn-query.nse
+file path=usr/share/nmap/scripts/auth-owners.nse
+file path=usr/share/nmap/scripts/auth-spoof.nse
+file path=usr/share/nmap/scripts/banner.nse
+file path=usr/share/nmap/scripts/citrix-brute-xml.nse
+file path=usr/share/nmap/scripts/citrix-enum-apps-xml.nse
+file path=usr/share/nmap/scripts/citrix-enum-apps.nse
+file path=usr/share/nmap/scripts/citrix-enum-servers-xml.nse
+file path=usr/share/nmap/scripts/citrix-enum-servers.nse
+file path=usr/share/nmap/scripts/daytime.nse
+file path=usr/share/nmap/scripts/db2-info.nse
+file path=usr/share/nmap/scripts/dhcp-discover.nse
+file path=usr/share/nmap/scripts/dns-random-srcport.nse
+file path=usr/share/nmap/scripts/dns-random-txid.nse
+file path=usr/share/nmap/scripts/dns-recursion.nse
+file path=usr/share/nmap/scripts/dns-zone-transfer.nse
+file path=usr/share/nmap/scripts/finger.nse
+file path=usr/share/nmap/scripts/ftp-anon.nse
+file path=usr/share/nmap/scripts/ftp-bounce.nse
+file path=usr/share/nmap/scripts/ftp-brute.nse
+file path=usr/share/nmap/scripts/html-title.nse
+file path=usr/share/nmap/scripts/http-auth.nse
+file path=usr/share/nmap/scripts/http-date.nse
 file path=usr/share/nmap/scripts/http-enum.nse
 file path=usr/share/nmap/scripts/http-favicon.nse
-file path=usr/share/nmap/scripts/http-headers.nse 
+file path=usr/share/nmap/scripts/http-headers.nse
 file path=usr/share/nmap/scripts/http-iis-webdav-vuln.nse
-file path=usr/share/nmap/scripts/http-malware-host.nse 
-file path=usr/share/nmap/scripts/http-open-proxy.nse 
+file path=usr/share/nmap/scripts/http-malware-host.nse
+file path=usr/share/nmap/scripts/http-open-proxy.nse
 file path=usr/share/nmap/scripts/http-passwd.nse
-file path=usr/share/nmap/scripts/http-trace.nse 
-file path=usr/share/nmap/scripts/http-userdir-enum.nse 
-file path=usr/share/nmap/scripts/iax2-version.nse 
+file path=usr/share/nmap/scripts/http-trace.nse
+file path=usr/share/nmap/scripts/http-userdir-enum.nse
+file path=usr/share/nmap/scripts/iax2-version.nse
 file path=usr/share/nmap/scripts/imap-capabilities.nse
-file path=usr/share/nmap/scripts/irc-info.nse 
-file path=usr/share/nmap/scripts/ms-sql-info.nse 
-file path=usr/share/nmap/scripts/mysql-info.nse 
-file path=usr/share/nmap/scripts/nbstat.nse 
-file path=usr/share/nmap/scripts/nfs-showmount.nse 
-file path=usr/share/nmap/scripts/ntp-info.nse 
-file path=usr/share/nmap/scripts/oracle-sid-brute.nse 
-file path=usr/share/nmap/scripts/p2p-conficker.nse 
-file path=usr/share/nmap/scripts/pjl-ready-message.nse 
-file path=usr/share/nmap/scripts/pop3-brute.nse 
-file path=usr/share/nmap/scripts/pop3-capabilities.nse 
-file path=usr/share/nmap/scripts/pptp-version.nse 
-file path=usr/share/nmap/scripts/realvnc-auth-bypass.nse 
-file path=usr/share/nmap/scripts/robots.txt.nse 
-file path=usr/share/nmap/scripts/rpcinfo.nse 
-file path=usr/share/nmap/scripts/script.db 
-file path=usr/share/nmap/scripts/skypev2-version.nse 
-file path=usr/share/nmap/scripts/smb-brute.nse 
+file path=usr/share/nmap/scripts/irc-info.nse
+file path=usr/share/nmap/scripts/ms-sql-info.nse
+file path=usr/share/nmap/scripts/mysql-info.nse
+file path=usr/share/nmap/scripts/nbstat.nse
+file path=usr/share/nmap/scripts/nfs-showmount.nse
+file path=usr/share/nmap/scripts/ntp-info.nse
+file path=usr/share/nmap/scripts/oracle-sid-brute.nse
+file path=usr/share/nmap/scripts/p2p-conficker.nse
+file path=usr/share/nmap/scripts/pjl-ready-message.nse
+file path=usr/share/nmap/scripts/pop3-brute.nse
+file path=usr/share/nmap/scripts/pop3-capabilities.nse
+file path=usr/share/nmap/scripts/pptp-version.nse
+file path=usr/share/nmap/scripts/realvnc-auth-bypass.nse
+file path=usr/share/nmap/scripts/robots.txt.nse
+file path=usr/share/nmap/scripts/rpcinfo.nse
+file path=usr/share/nmap/scripts/script.db
+file path=usr/share/nmap/scripts/skypev2-version.nse
+file path=usr/share/nmap/scripts/smb-brute.nse
 file path=usr/share/nmap/scripts/smb-check-vulns.nse
-file path=usr/share/nmap/scripts/smb-enum-domains.nse 
-file path=usr/share/nmap/scripts/smb-enum-groups.nse 
-file path=usr/share/nmap/scripts/smb-enum-processes.nse 
+file path=usr/share/nmap/scripts/smb-enum-domains.nse
+file path=usr/share/nmap/scripts/smb-enum-groups.nse
+file path=usr/share/nmap/scripts/smb-enum-processes.nse
 file path=usr/share/nmap/scripts/smb-enum-sessions.nse
-file path=usr/share/nmap/scripts/smb-enum-shares.nse 
-file path=usr/share/nmap/scripts/smb-enum-users.nse 
-file path=usr/share/nmap/scripts/smb-os-discovery.nse 
-file path=usr/share/nmap/scripts/smb-psexec.nse 
-file path=usr/share/nmap/scripts/smb-security-mode.nse 
-file path=usr/share/nmap/scripts/smb-server-stats.nse 
-file path=usr/share/nmap/scripts/smb-system-info.nse 
-file path=usr/share/nmap/scripts/smbv2-enabled.nse 
-file path=usr/share/nmap/scripts/smtp-commands.nse 
-file path=usr/share/nmap/scripts/smtp-open-relay.nse 
-file path=usr/share/nmap/scripts/smtp-strangeport.nse 
-file path=usr/share/nmap/scripts/sniffer-detect.nse 
-file path=usr/share/nmap/scripts/snmp-brute.nse 
-file path=usr/share/nmap/scripts/snmp-sysdescr.nse 
-file path=usr/share/nmap/scripts/socks-open-proxy.nse 
-file path=usr/share/nmap/scripts/sql-injection.nse 
-file path=usr/share/nmap/scripts/ssh-hostkey.nse 
-file path=usr/share/nmap/scripts/sshv1.nse 
-file path=usr/share/nmap/scripts/ssl-cert.nse 
-file path=usr/share/nmap/scripts/sslv2.nse 
-file path=usr/share/nmap/scripts/telnet-brute.nse 
-file path=usr/share/nmap/scripts/upnp-info.nse 
-file path=usr/share/nmap/scripts/whois.nse 
-file path=usr/share/nmap/scripts/x11-access.nse 
-file nmapfe.png path=usr/share/pixmaps/nmapfe.png 
-file path=usr/share/zenmap/config/scan_profile.usp 
-file path=usr/share/zenmap/config/zenmap_version 
-file path=usr/share/zenmap/config/zenmap.conf 
-file path=usr/share/zenmap/docs/help.html 
-file path=usr/share/zenmap/misc/profile_editor.xml 
-file path=usr/share/zenmap/pixmaps/default_32.png 
-file path=usr/share/zenmap/pixmaps/default_75.png 
-file path=usr/share/zenmap/pixmaps/freebsd_32.png 
-file path=usr/share/zenmap/pixmaps/freebsd_75.png 
-file path=usr/share/zenmap/pixmaps/irix_32.png 
-file path=usr/share/zenmap/pixmaps/irix_75.png 
+file path=usr/share/nmap/scripts/smb-enum-shares.nse
+file path=usr/share/nmap/scripts/smb-enum-users.nse
+file path=usr/share/nmap/scripts/smb-os-discovery.nse
+file path=usr/share/nmap/scripts/smb-psexec.nse
+file path=usr/share/nmap/scripts/smb-security-mode.nse
+file path=usr/share/nmap/scripts/smb-server-stats.nse
+file path=usr/share/nmap/scripts/smb-system-info.nse
+file path=usr/share/nmap/scripts/smbv2-enabled.nse
+file path=usr/share/nmap/scripts/smtp-commands.nse
+file path=usr/share/nmap/scripts/smtp-open-relay.nse
+file path=usr/share/nmap/scripts/smtp-strangeport.nse
+file path=usr/share/nmap/scripts/sniffer-detect.nse
+file path=usr/share/nmap/scripts/snmp-brute.nse
+file path=usr/share/nmap/scripts/snmp-sysdescr.nse
+file path=usr/share/nmap/scripts/socks-open-proxy.nse
+file path=usr/share/nmap/scripts/sql-injection.nse
+file path=usr/share/nmap/scripts/ssh-hostkey.nse
+file path=usr/share/nmap/scripts/sshv1.nse
+file path=usr/share/nmap/scripts/ssl-cert.nse
+file path=usr/share/nmap/scripts/sslv2.nse
+file path=usr/share/nmap/scripts/telnet-brute.nse
+file path=usr/share/nmap/scripts/upnp-info.nse
+file path=usr/share/nmap/scripts/whois.nse
+file path=usr/share/nmap/scripts/x11-access.nse
+file nmapfe.png path=usr/share/pixmaps/nmapfe.png
+file path=usr/share/zenmap/config/scan_profile.usp
+file path=usr/share/zenmap/config/zenmap.conf
+file path=usr/share/zenmap/config/zenmap_version
+file path=usr/share/zenmap/docs/help.html
+file path=usr/share/zenmap/misc/profile_editor.xml
+file path=usr/share/zenmap/pixmaps/default_32.png
+file path=usr/share/zenmap/pixmaps/default_75.png
+file path=usr/share/zenmap/pixmaps/freebsd_32.png
+file path=usr/share/zenmap/pixmaps/freebsd_75.png
+file path=usr/share/zenmap/pixmaps/irix_32.png
+file path=usr/share/zenmap/pixmaps/irix_75.png
 file path=usr/share/zenmap/pixmaps/linux_32.png
-file path=usr/share/zenmap/pixmaps/linux_75.png 
-file path=usr/share/zenmap/pixmaps/macosx_32.png 
-file path=usr/share/zenmap/pixmaps/macosx_75.png 
-file path=usr/share/zenmap/pixmaps/openbsd_32.png 
-file path=usr/share/zenmap/pixmaps/openbsd_75.png 
+file path=usr/share/zenmap/pixmaps/linux_75.png
+file path=usr/share/zenmap/pixmaps/macosx_32.png
+file path=usr/share/zenmap/pixmaps/macosx_75.png
+file path=usr/share/zenmap/pixmaps/openbsd_32.png
+file path=usr/share/zenmap/pixmaps/openbsd_75.png
 file path=usr/share/zenmap/pixmaps/radialnet/border.png
-file path=usr/share/zenmap/pixmaps/radialnet/firewall.png 
-file path=usr/share/zenmap/pixmaps/radialnet/logo.png 
+file path=usr/share/zenmap/pixmaps/radialnet/firewall.png
+file path=usr/share/zenmap/pixmaps/radialnet/logo.png
 file path=usr/share/zenmap/pixmaps/radialnet/padlock.png
-file path=usr/share/zenmap/pixmaps/radialnet/router.png 
-file path=usr/share/zenmap/pixmaps/radialnet/switch.png 
-file path=usr/share/zenmap/pixmaps/radialnet/wireless.png 
-file path=usr/share/zenmap/pixmaps/redhat_32.png 
-file path=usr/share/zenmap/pixmaps/redhat_75.png 
-file path=usr/share/zenmap/pixmaps/solaris_32.png 
-file path=usr/share/zenmap/pixmaps/solaris_75.png 
-file path=usr/share/zenmap/pixmaps/splash.png 
-file path=usr/share/zenmap/pixmaps/throbber.gif 
-file path=usr/share/zenmap/pixmaps/throbber.png 
-file path=usr/share/zenmap/pixmaps/ubuntu_32.png 
-file path=usr/share/zenmap/pixmaps/ubuntu_75.png 
-file path=usr/share/zenmap/pixmaps/unknown_32.png 
-file path=usr/share/zenmap/pixmaps/unknown_75.png 
-file path=usr/share/zenmap/pixmaps/vl_1_32.png 
-file path=usr/share/zenmap/pixmaps/vl_1_75.png 
+file path=usr/share/zenmap/pixmaps/radialnet/router.png
+file path=usr/share/zenmap/pixmaps/radialnet/switch.png
+file path=usr/share/zenmap/pixmaps/radialnet/wireless.png
+file path=usr/share/zenmap/pixmaps/redhat_32.png
+file path=usr/share/zenmap/pixmaps/redhat_75.png
+file path=usr/share/zenmap/pixmaps/solaris_32.png
+file path=usr/share/zenmap/pixmaps/solaris_75.png
+file path=usr/share/zenmap/pixmaps/splash.png
+file path=usr/share/zenmap/pixmaps/throbber.gif
+file path=usr/share/zenmap/pixmaps/throbber.png
+file path=usr/share/zenmap/pixmaps/ubuntu_32.png
+file path=usr/share/zenmap/pixmaps/ubuntu_75.png
+file path=usr/share/zenmap/pixmaps/unknown_32.png
+file path=usr/share/zenmap/pixmaps/unknown_75.png
+file path=usr/share/zenmap/pixmaps/vl_1_32.png
+file path=usr/share/zenmap/pixmaps/vl_1_75.png
 file path=usr/share/zenmap/pixmaps/vl_2_32.png
 file path=usr/share/zenmap/pixmaps/vl_2_75.png
-file path=usr/share/zenmap/pixmaps/vl_3_32.png 
-file path=usr/share/zenmap/pixmaps/vl_3_75.png 
-file path=usr/share/zenmap/pixmaps/vl_4_32.png 
-file path=usr/share/zenmap/pixmaps/vl_4_75.png 
+file path=usr/share/zenmap/pixmaps/vl_3_32.png
+file path=usr/share/zenmap/pixmaps/vl_3_75.png
+file path=usr/share/zenmap/pixmaps/vl_4_32.png
+file path=usr/share/zenmap/pixmaps/vl_4_75.png
 file path=usr/share/zenmap/pixmaps/vl_5_32.png
-file path=usr/share/zenmap/pixmaps/vl_5_75.png 
-file path=usr/share/zenmap/pixmaps/win_32.png 
-file path=usr/share/zenmap/pixmaps/win_75.png 
-file path=usr/share/zenmap/pixmaps/zenmap.png 
-file path=usr/share/zenmap/su-to-zenmap.sh 
-file zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo path=usr/share/locale/de/LC_MESSAGES/zenmap.mo
-file zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo path=usr/share/locale/fr/LC_MESSAGES/zenmap.mo 
-file zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo path=usr/share/locale/hr/LC_MESSAGES/zenmap.mo 
-file zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo path=usr/share/locale/pt_BR/LC_MESSAGES/zenmap.mo 
-file zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo path=usr/share/locale/ru/LC_MESSAGES/zenmap.mo 
+file path=usr/share/zenmap/pixmaps/vl_5_75.png
+file path=usr/share/zenmap/pixmaps/win_32.png
+file path=usr/share/zenmap/pixmaps/win_75.png
+file path=usr/share/zenmap/pixmaps/zenmap.png
+file path=usr/share/zenmap/su-to-zenmap.sh
+legacy pkg=SUNWnmap \
+    desc="nmap - Network exploration tool and security / port scanner (5.21)" \
+    name="nmap - Network Mapper"
+license nmap.license license=GPLv2
 link path=usr/bin/nmapfe target=zenmap
 link path=usr/bin/xnmap target=zenmap
+link path=usr/share/man/man1/nmapfe.1 target=zenmap.1
 link path=usr/share/man/man1/xnmap.1 target=zenmap.1
-link path=usr/share/man/man1/nmapfe.1 target=zenmap.1
-
-license nmap.license license="GPLv2"
-
-legacy	pkg=SUNWnmap \
-	name="nmap - Network Mapper" \
-	desc="nmap - Network exploration tool and security / port scanner (5.21)"
 
 
--- a/components/nmap/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.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	diagnostic/nmap \
-=\
-Interface Stability	Volatile\
-.TE \
-.PP\
-.SH NOTES\
-Source for nmap is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/components/ntp/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -39,7 +39,9 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-CONFIGURE_ENV +=	CFLAGS="$(CFLAGS) $(studio_C99_ENABLE) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__"
+CFLAGS +=	$(studio_C99_ENABLE) -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
+
+CONFIGURE_ENV +=	CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	--bindir=/usr/sbin
 CONFIGURE_OPTIONS +=	--with-binsubdir=sbin
 CONFIGURE_OPTIONS +=	--libexecdir=/usr/lib/inet
@@ -59,7 +61,6 @@
 
 build:		$(BUILD_32)
 install:	$(INSTALL_32)
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 include ../../make-rules/depend.mk
--- a/components/ntp/manpages/ntp-keygen.1m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntp-keygen.1m	Wed Apr 13 09:58:06 2011 -0700
@@ -192,29 +192,6 @@
 The documentation available at /usr/share/doc/ntp is provided as is from the
 \fBNTP\fR distribution and may contain information that is not applicable to
 the software as provided in this partIcular distribution.
-.SH ATTRIBUTES
-.sp
-.LP
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-AttributeAttribute Value
-_
-AvailabilityT{
-.nf
-service/network/ntp
-.fi
-T}
-_
-Interface StabilityUncommitted
-.TE
-.PP
 .SH SEE ALSO
 .LP
 \fBntpd\fR(1M), \fBntprc\fR(4), \fBattributes\fR(5)
--- a/components/ntp/manpages/ntp.conf.4	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntp.conf.4	Wed Apr 13 09:58:06 2011 -0700
@@ -1273,22 +1273,6 @@
 .LP
 \fB\fB/etc/inet/ntp.conf\fR\fR
 .LP
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i)
-lw(2.75i) |lw(2.75i)
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilityservice/network/ntp
-=
-Interface StabilityUncommitted
-.TE
 .SH NOTES
 The documentation available at /usr/share/doc/ntp is provided as is from the 
 \fBNTP\fR distribution and may contain information that is not applicable to 
--- a/components/ntp/manpages/ntpd.1m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntpd.1m	Wed Apr 13 09:58:06 2011 -0700
@@ -319,23 +319,6 @@
 \fBNTP\fR distribution and may contain information that is not applicable to 
 the software as provided in this partIcular distribution.
 .PP
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i)
-lw(2.75i) |lw(2.75i)
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilityservice/network/ntp
-=
-Interface StabilityUncommitted
-.TE 
-.PP
 .SH SEE ALSO
 .LP
 \fBsvcs\fR(1), \fBsntp\fR(1M), \fBntp-keygen\fR(1M), \fBntpdate\fR(1m), \fBntpq\fR(1M), \fBntptrace\fR(1M), \fBntptime\fR(1M), \fBsvcadm\fR(1M), \fBntpdc\fR(1M), \fBrename\fR(2), \fBattributes\fR(5), \fBsmf\fR(5)
--- a/components/ntp/manpages/ntpdate.1m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntpdate.1m	Wed Apr 13 09:58:06 2011 -0700
@@ -81,21 +81,6 @@
 Time adjustments are made by \fBntpdate\fR in one of two ways. If \fBntpdate\fR determines the clock is in error more than 0.5 second it will simply step the time by calling the system \fBsettimeofday()\fR routine. If the error is less than 0.5 seconds, it will slew the time by calling the system \fBadjtime()\fR routine. The latter technique is less disruptive and more accurate when the error is small, and works quite well when \fBntpdate\fR is run by \fBcron\fR every hour or two.
 \fBntpdate\fR will decline to set the date if an NTP server daemon (e.g., \fBntpd\fR) is running on the same host. When running \fBntpdate\fR on a regular basis from \fBcron\fR as an alternative to running a daemon, doing so once every hour or two will result in precise enough timekeeping to avoid stepping the clock.
 Note that in contexts where a host name is expected, a \fB-4\fR qualifier preceding the host name forces DNS resolution to the IPv4 namespace, while a \fB-6\fR qualifier forces DNS resolution to the IPv6 namespace.
-.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	service/network/ntp
-=
-Interface Stability	Uncommitted Obsolete
-.TE 
 .PP
 .SH NOTES
 Source for ntpdate is available on http://src.opensolaris.org.
--- a/components/ntp/manpages/ntpdc.1m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntpdc.1m	Wed Apr 13 09:58:06 2011 -0700
@@ -308,25 +308,6 @@
 For example, to set the --command option, you would set the NTPDC_COMMAND environment
 variable.
 The users home directory and the current directory are searched for a file named .ntprc.
-.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	service/network/ntp
-=
-Interface Stability	Uncommitted Obsolete
-.TE 
-.PP
-.SH NOTES
-Source for ntpdc is available on http://src.opensolaris.org.
-.TE
 .PP
 .SH SEE ALSO
 .LP
--- a/components/ntp/manpages/ntpq.1m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntpq.1m	Wed Apr 13 09:58:06 2011 -0700
@@ -515,22 +515,6 @@
 The output of the \fBntpq\P in version 4 differs from that in version 3 by the 
 replacement of the \fBdispersion\fP value with the \fBjitter\fP value in the
 \fBpeers\fP output.
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i)
-lw(2.75i) |lw(2.75i)
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilityservice/network/ntp
-=
-Interface StabilityUncommitted
-.TE
 .PP
 .SH SEE ALSO
 .LP
--- a/components/ntp/manpages/ntprc.4	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntprc.4	Wed Apr 13 09:58:06 2011 -0700
@@ -76,22 +76,6 @@
 .rt  
 
 .RE
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i)
-lw(2.75i) |lw(2.75i)
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilityservice/network/ntp
-=
-Interface StabilityUncommitted
-.TE
 .SH SEE ALSO
 .LP
 \fBntpq\fR(1M), \fBntpdc\fR(1M), \fBntp-keygen\fR(1M)
--- a/components/ntp/manpages/ntptime.1m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntptime.1m	Wed Apr 13 09:58:06 2011 -0700
@@ -70,22 +70,6 @@
 The documentation available at /usr/share/doc/ntp is provided as is from the
 \fBNTP\fR distribution and may contain information that is not applicable to
 the software as provided in this partIcular distribution.
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i)
-lw(2.75i) |lw(2.75i)
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilityservice/network/ntp
-=
-Interface StabilityVolatile
-.TE
 .PP
 .SH SEE ALSO
 .LP
--- a/components/ntp/manpages/ntptrace.1m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/manpages/ntptrace.1m	Wed Apr 13 09:58:06 2011 -0700
@@ -113,22 +113,6 @@
 .SH NOTES
 .LP
 Source for \fBntptrace\fR is available on http://src.opensolaris.org.
-.SH ATTRIBUTES
-See
-.BR attributes (5)
-for descriptions of the following attributes:
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i)
-lw(2.75i) |lw(2.75i)
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-Availabilityservice/network/ntp
-=
-Interface StabilityVolatile
-.TE 
 .PP
 .SH SEE ALSO
 .LP
--- a/components/ntp/ntp.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/ntp/ntp.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,18 +21,20 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=usr/share/doc/ntp/(.+$) -> \
-	set action.hash html/%<\1> >
-set name=pkg.fmri value=pkg:/service/network/ntp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr/share/doc/ntp/(.+$) -> set action.hash html/%<\1> >
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/service/network/ntp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Network Time Protocol v4, NTP Daemon and Utilities"
 set name=pkg.summary value="Network Time Protocol Daemon v4"
-set name=pkg.description value="Network Time Protocol v4, NTP Daemon and Utilities"
-set name=info.classification value="org.opensolaris.category.2008:System/Services"
-set name=info.upstream_url value="http://www.ntp.org/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Services
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.ntp.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license ntp.license license="ntp license"
-
 dir path=etc
 dir path=etc/inet
 dir path=etc/security
@@ -68,23 +70,26 @@
 dir path=var
 dir path=var/ntp group=sys
 dir path=var/ntp/ntpstats group=sys
-file Solaris/ntp.client group=sys path=etc/inet/ntp.client
-file Solaris/ntp.server group=sys path=etc/inet/ntp.server
+file Solaris/ntp.client path=etc/inet/ntp.client group=sys
+file Solaris/ntp.server path=etc/inet/ntp.server group=sys
 file Solaris/auth_attr path=etc/security/auth_attr.d/ntp
 file Solaris/prof_attr path=etc/security/prof_attr.d/ntp
 file Solaris/ntp.xml path=lib/svc/manifest/network/ntp.xml
 file Solaris/ntp.sh path=lib/svc/method/ntp
-file Solaris/RtNTPMngmnt.html path=usr/lib/help/auths/locale/C/RtNTPMngmnt.html
-file Solaris/SmfNTPStates.html path=usr/lib/help/auths/locale/C/SmfNTPStates.html
-file Solaris/SmfValueNTP.html path=usr/lib/help/auths/locale/C/SmfValueNTP.html
+file Solaris/RtNTPMngmnt.html \
+    path=usr/lib/help/auths/locale/C/RtNTPMngmnt.html
+file Solaris/SmfNTPStates.html \
+    path=usr/lib/help/auths/locale/C/SmfNTPStates.html
+file Solaris/SmfValueNTP.html \
+    path=usr/lib/help/auths/locale/C/SmfValueNTP.html
 file path=usr/lib/inet/ntp-wait
 file path=usr/lib/inet/ntpd
 file path=usr/sbin/ntp-keygen
-file path=usr/sbin/ntpdate
-file path=usr/sbin/ntpdc
+file path=usr/sbin/ntpdate mangler.man.stability="uncommitted obsolete"
+file path=usr/sbin/ntpdc mangler.man.stability="uncommitted obsolete"
 file path=usr/sbin/ntpq
-file path=usr/sbin/ntptime
-file path=usr/sbin/ntptrace
+file path=usr/sbin/ntptime mangler.man.stability=volatile
+file path=usr/sbin/ntptrace mangler.man.stability=volatile
 file path=usr/share/doc/ntp/accopt.html
 file path=usr/share/doc/ntp/assoc.html
 file path=usr/share/doc/ntp/audio.html
@@ -283,22 +288,21 @@
 file path=usr/share/doc/ntp/sntp.html
 file path=usr/share/doc/ntp/tickadj.html
 file path=usr/share/doc/ntp/xleave.html
-file manpages/ntp-keygen.1m  path=usr/share/man/man1m/ntp-keygen.1m
-file manpages/ntpd.1m  path=usr/share/man/man1m/ntpd.1m
-file manpages/ntpdc.1m  path=usr/share/man/man1m/ntpdc.1m
-file manpages/ntpq.1m  path=usr/share/man/man1m/ntpq.1m
-file manpages/ntpdate.1m  path=usr/share/man/man1m/ntpdate.1m
-file manpages/ntptime.1m  path=usr/share/man/man1m/ntptime.1m
-file manpages/ntptrace.1m  path=usr/share/man/man1m/ntptrace.1m
-file manpages/ntprc.4  path=usr/share/man/man4/ntprc.4
-file manpages/ntp.conf.4  path=usr/share/man/man4/ntp.conf.4
+file manpages/ntp-keygen.1m path=usr/share/man/man1m/ntp-keygen.1m
+file manpages/ntpd.1m path=usr/share/man/man1m/ntpd.1m
+file manpages/ntpdate.1m path=usr/share/man/man1m/ntpdate.1m
+file manpages/ntpdc.1m path=usr/share/man/man1m/ntpdc.1m
+file manpages/ntpq.1m path=usr/share/man/man1m/ntpq.1m
+file manpages/ntptime.1m path=usr/share/man/man1m/ntptime.1m
+file manpages/ntptrace.1m path=usr/share/man/man1m/ntptrace.1m
+file manpages/ntp.conf.4 path=usr/share/man/man4/ntp.conf.4
+file manpages/ntprc.4 path=usr/share/man/man4/ntprc.4
+legacy pkg=SUNWntpr \
+    desc="Network Time Protocol v4, NTP Daemon and Utilities (4.2.5) (root)" \
+    name="Network Time Protocol Daemon v4 (root)"
+legacy pkg=SUNWntpu \
+    desc="Network Time Protocol v4, NTP Daemon and Utilities (4.2.5) (usr)" \
+    name="Network Time Protocol Daemon v4 (usr)"
+license ntp.license license="ntp license"
 link path=usr/sbin/xntpdc target=ntpdc
 
-legacy  pkg=SUNWntpr \
-        name="Network Time Protocol Daemon v4 (root)" \
-        desc="Network Time Protocol v4, NTP Daemon and Utilities (4.2.5) (root)"
-
-legacy  pkg=SUNWntpu \
-        name="Network Time Protocol Daemon v4 (usr)" \
-        desc="Network Time Protocol v4, NTP Daemon and Utilities (4.2.5) (usr)"
-
--- a/components/openexr/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -67,22 +67,9 @@
 
 build: $(BUILD_32_and_64)
 
-MAN1LIST = exrenvmap.1 exrheader.1 exrmakepreview.1 \
-	   exrmaketiled.1 exrstdattr.1
-
-include ../../make-rules/shared-targets.mk
+install:	$(INSTALL_32_and_64)
 
-install: $(INSTALL_32_and_64)
-	$(MKDIR) $(PROTOUSRSHAREMAN1DIR) ; \
-	    list1='$(MAN1LIST)'; for f in $$list1; do \
-	    $(INSTALL) -m 0644 Solaris/$$f $(PROTOUSRSHAREMAN1DIR)/ ; \
-	    done
-	$(MKDIR) $(PROTOUSRSHAREMAN3DIR) ; \
-	$(INSTALL) -m 0644 Solaris/libopenexr.3lib $(PROTOUSRSHAREMAN3DIR)/
-
-test: $(BUILD_32_and_64)
-	@cd $(BUILD_DIR_32); $(GMAKE) check
-	@cd $(BUILD_DIR_64); $(GMAKE) check
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
 
--- a/components/openexr/Solaris/exrenvmap.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/Solaris/exrenvmap.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH exrenvmap 1 "Mar 21 2011" "SunOS 5.11" "User commands" 
@@ -32,21 +31,6 @@
 exrenvmap [options] infile outfile 
 .fi
 .in -40n
-.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	library/openexr
-=
-Interface Stability	Uncommitted
-.TE 
 .PP
 .SH "SEE ALSO"
 .PP
@@ -62,5 +46,3 @@
 The OpenEXR source code distribution is free software.  See the file
 named COPYING (included in this distribution) for details.
 .LP
-.SH NOTES
-Source for openexr is available on http://opensolaris.org.
--- a/components/openexr/Solaris/exrheader.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/Solaris/exrheader.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH exrheader 1 "Mar 21 2011" "SunOS 5.11" "User commands" 
@@ -31,22 +30,6 @@
 exrheader imagefile [imagefile ...]
 .fi
 .in -40n
-.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	library/openexr
-=
-Interface Stability	Uncommitted
-.TE 
-.PP
 .SH "SEE ALSO"
 .PP
 \fBexrenvmap\fR(1), 
@@ -61,5 +44,3 @@
 The OpenEXR source code distribution is free software.  See the file
 named COPYING (included in this distribution) for details.
 .LP
-.SH NOTES
-Source for openexr is available on http://opensolaris.org.
--- a/components/openexr/Solaris/exrmakepreview.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/Solaris/exrmakepreview.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH exrmakepreview 1 "Mar 21 2011" "SunOS 5.11" "User commands" 
@@ -31,22 +30,6 @@
 exrmakepreview [options] infile outfile 
 .fi
 .in -40n
-.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	library/openexr
-=
-Interface Stability	Uncommitted
-.TE 
-.PP
 .SH "SEE ALSO"
 .PP
 \fBexrenvmap\fR(1), 
@@ -61,5 +44,3 @@
 The OpenEXR source code distribution is free software.  See the file
 named COPYING (included in this distribution) for details.
 .LP
-.SH NOTES
-Source for openexr is available on http://opensolaris.org.
--- a/components/openexr/Solaris/exrmaketiled.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/Solaris/exrmaketiled.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH exrmaketiled 1 "Mar 21 2011" "SunOS 5.11" "User commands" 
@@ -31,22 +30,6 @@
 exrmaketiled [options] infile outfile
 .fi
 .in -40n
-.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	library/openexr
-=
-Interface Stability	Uncommitted
-.TE 
-.PP
 .SH "SEE ALSO"
 .PP
 \fBexrenvmap\fR(1), 
@@ -61,5 +44,3 @@
 The OpenEXR source code distribution is free software.  See the file
 named COPYING (included in this distribution) for details.
 .LP
-.SH NOTES
-Source for openexr is available on http://opensolaris.org.
--- a/components/openexr/Solaris/exrstdattr.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/Solaris/exrstdattr.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH exrstdattr 1 "Mar 21 2011" "SunOS 5.11" "User commands" 
@@ -31,22 +30,6 @@
 exrstdattr [options] infile outfile
 .fi
 .in -40n
-.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	library/openexr
-=
-Interface Stability	Uncommitted
-.TE 
-.PP
 .SH "SEE ALSO"
 .PP
 \fBexrenvmap\fR(1),
@@ -61,5 +44,3 @@
 The OpenEXR source code distribution is free software.  See the file
 named COPYING (included in this distribution) for details.
 .LP
-.SH NOTES
-Source for openexr is available on http://opensolaris.org.
--- a/components/openexr/Solaris/libopenexr.3lib	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/Solaris/libopenexr.3lib	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\"
 .\" CDDL HEADER START
 .\"
@@ -19,7 +18,7 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.\" Copyright (c) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
+.\" Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 .\"
 .\"
 .TH libopenexr 3LIB "Mar 21 2011" "SunOS 5.11" "Interface Libraries" 
@@ -51,22 +50,6 @@
 .rt
 shared object
 .in -40n
-.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	library/openexr
-=
-Interface Stability	Uncommitted
-.TE 
-.PP
 .SH "SEE ALSO"
 .PP
 \fBintro\fR(3), \fBlibz\fR(3LIB), \fBlibilmbase\fR(3LIB)
@@ -78,5 +61,3 @@
 The OpenEXR source code distribution is free software.  See the file
 named COPYING (included in this distribution) for details.
 .LP
-.SH NOTES
-Source for openexr is available on http://opensolaris.org.
--- a/components/openexr/openexr.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/openexr/openexr.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,110 +20,132 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/library/openexr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="OpenEXR header files and libraries used to read and write OpenEXR images"
-set name=pkg.description value="Libraries support for high dynamic-range image (HDR) format"
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.openexr.com/"
+
+<transform file path=usr/share/man/man./(.+$) -> set action.hash Solaris/%<\1> >
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/openexr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="Libraries support for high dynamic-range image (HDR) format"
+set name=pkg.summary \
+    value="OpenEXR header files and libraries used to read and write OpenEXR images"
+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.openexr.com/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2008/209
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
 dir path=usr/include
 dir path=usr/include/OpenEXR
 dir path=usr/lib
-dir path=usr/lib/pkgconfig
 dir path=usr/lib/$(MACH64)
 dir path=usr/lib/$(MACH64)/pkgconfig
+dir path=usr/lib/pkgconfig
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man3
+file path=usr/bin/exrenvmap
 #
 file path=usr/bin/exrheader
+file path=usr/bin/exrmakepreview
 file path=usr/bin/exrmaketiled
 file path=usr/bin/exrstdattr
-file path=usr/bin/exrmakepreview
-file path=usr/bin/exrenvmap
+file path=usr/include/OpenEXR/ImfArray.h
 file path=usr/include/OpenEXR/ImfAttribute.h
+file path=usr/include/OpenEXR/ImfB44Compressor.h
 file path=usr/include/OpenEXR/ImfBoxAttribute.h
 file path=usr/include/OpenEXR/ImfCRgbaFile.h
 file path=usr/include/OpenEXR/ImfChannelList.h
 file path=usr/include/OpenEXR/ImfChannelListAttribute.h
+file path=usr/include/OpenEXR/ImfChromaticities.h
+file path=usr/include/OpenEXR/ImfChromaticitiesAttribute.h
+file path=usr/include/OpenEXR/ImfCompression.h
 file path=usr/include/OpenEXR/ImfCompressionAttribute.h
+file path=usr/include/OpenEXR/ImfConvert.h
 file path=usr/include/OpenEXR/ImfDoubleAttribute.h
+file path=usr/include/OpenEXR/ImfEnvmap.h
+file path=usr/include/OpenEXR/ImfEnvmapAttribute.h
 file path=usr/include/OpenEXR/ImfFloatAttribute.h
 file path=usr/include/OpenEXR/ImfFrameBuffer.h
+file path=usr/include/OpenEXR/ImfFramesPerSecond.h
 file path=usr/include/OpenEXR/ImfHeader.h
+file path=usr/include/OpenEXR/ImfHuf.h
 file path=usr/include/OpenEXR/ImfIO.h
 file path=usr/include/OpenEXR/ImfInputFile.h
+file path=usr/include/OpenEXR/ImfInt64.h
 file path=usr/include/OpenEXR/ImfIntAttribute.h
+file path=usr/include/OpenEXR/ImfKeyCode.h
+file path=usr/include/OpenEXR/ImfKeyCodeAttribute.h
+file path=usr/include/OpenEXR/ImfLineOrder.h
 file path=usr/include/OpenEXR/ImfLineOrderAttribute.h
+file path=usr/include/OpenEXR/ImfLut.h
 file path=usr/include/OpenEXR/ImfMatrixAttribute.h
+file path=usr/include/OpenEXR/ImfName.h
 file path=usr/include/OpenEXR/ImfOpaqueAttribute.h
 file path=usr/include/OpenEXR/ImfOutputFile.h
-file path=usr/include/OpenEXR/ImfRgbaFile.h
-file path=usr/include/OpenEXR/ImfStringAttribute.h
-file path=usr/include/OpenEXR/ImfVecAttribute.h
-file path=usr/include/OpenEXR/ImfHuf.h
-file path=usr/include/OpenEXR/ImfWav.h
-file path=usr/include/OpenEXR/ImfLut.h
-file path=usr/include/OpenEXR/ImfArray.h
-file path=usr/include/OpenEXR/ImfCompression.h
-file path=usr/include/OpenEXR/ImfLineOrder.h
-file path=usr/include/OpenEXR/ImfName.h
 file path=usr/include/OpenEXR/ImfPixelType.h
-file path=usr/include/OpenEXR/ImfVersion.h
-file path=usr/include/OpenEXR/ImfXdr.h
-file path=usr/include/OpenEXR/ImfConvert.h
 file path=usr/include/OpenEXR/ImfPreviewImage.h
 file path=usr/include/OpenEXR/ImfPreviewImageAttribute.h
-file path=usr/include/OpenEXR/ImfChromaticities.h
-file path=usr/include/OpenEXR/ImfChromaticitiesAttribute.h
-file path=usr/include/OpenEXR/ImfKeyCode.h
-file path=usr/include/OpenEXR/ImfKeyCodeAttribute.h
-file path=usr/include/OpenEXR/ImfTimeCode.h
-file path=usr/include/OpenEXR/ImfTimeCodeAttribute.h
 file path=usr/include/OpenEXR/ImfRational.h
 file path=usr/include/OpenEXR/ImfRationalAttribute.h
-file path=usr/include/OpenEXR/ImfFramesPerSecond.h
+file path=usr/include/OpenEXR/ImfRgba.h
+file path=usr/include/OpenEXR/ImfRgbaFile.h
+file path=usr/include/OpenEXR/ImfRgbaYca.h
 file path=usr/include/OpenEXR/ImfStandardAttributes.h
-file path=usr/include/OpenEXR/ImfEnvmap.h
-file path=usr/include/OpenEXR/ImfEnvmapAttribute.h
-file path=usr/include/OpenEXR/ImfInt64.h
-file path=usr/include/OpenEXR/ImfRgba.h
+file path=usr/include/OpenEXR/ImfStringAttribute.h
+file path=usr/include/OpenEXR/ImfTestFile.h
+file path=usr/include/OpenEXR/ImfThreading.h
 file path=usr/include/OpenEXR/ImfTileDescription.h
 file path=usr/include/OpenEXR/ImfTileDescriptionAttribute.h
 file path=usr/include/OpenEXR/ImfTiledInputFile.h
 file path=usr/include/OpenEXR/ImfTiledOutputFile.h
 file path=usr/include/OpenEXR/ImfTiledRgbaFile.h
-file path=usr/include/OpenEXR/ImfRgbaYca.h
-file path=usr/include/OpenEXR/ImfTestFile.h
-file path=usr/include/OpenEXR/ImfThreading.h
-file path=usr/include/OpenEXR/ImfB44Compressor.h
+file path=usr/include/OpenEXR/ImfTimeCode.h
+file path=usr/include/OpenEXR/ImfTimeCodeAttribute.h
+file path=usr/include/OpenEXR/ImfVecAttribute.h
+file path=usr/include/OpenEXR/ImfVersion.h
+file path=usr/include/OpenEXR/ImfWav.h
+file path=usr/include/OpenEXR/ImfXdr.h
 file path=usr/include/OpenEXR/OpenEXRConfig.h
-file path=usr/lib/libIlmImf.so.6.0.0
-file path=usr/lib/pkgconfig/OpenEXR.pc
 file path=usr/lib/$(MACH64)/libIlmImf.so.6.0.0
 file path=usr/lib/$(MACH64)/pkgconfig/OpenEXR.pc
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/main.cpp
+file path=usr/lib/libIlmImf.so.6.0.0
+file path=usr/lib/pkgconfig/OpenEXR.pc
+file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/OpenEXRFileLayout.pdf
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/ReadingAndWritingImageFiles.pdf
+file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/TechnicalIntroduction.pdf
 file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/drawImage.cpp
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceExamples.cpp
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceTiledExamples.cpp
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceExamples.cpp
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/lowLevelIoExamples.cpp
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/previewImageExamples.cpp
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceTiledExamples.cpp
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceTiledExamples.h
 file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/drawImage.h
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceExamples.h
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceExamples.h
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceTiledExamples.h
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/lowLevelIoExamples.h
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/previewImageExamples.h
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/ReadingAndWritingImageFiles.pdf
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/TechnicalIntroduction.pdf
-file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/OpenEXRFileLayout.pdf
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceExamples.cpp
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceExamples.h
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceTiledExamples.cpp
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/generalInterfaceTiledExamples.h
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/lowLevelIoExamples.cpp
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/lowLevelIoExamples.h
+file path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/main.cpp
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/previewImageExamples.cpp
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/previewImageExamples.h
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceExamples.cpp
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceExamples.h
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceTiledExamples.cpp
+file \
+    path=usr/share/doc/OpenEXR-$(COMPONENT_VERSION)/examples/rgbaInterfaceTiledExamples.h
 file path=usr/share/man/man1/exrenvmap.1
 file path=usr/share/man/man1/exrheader.1
 file path=usr/share/man/man1/exrmakepreview.1
@@ -131,14 +153,14 @@
 file path=usr/share/man/man1/exrstdattr.1
 file path=usr/share/man/man3/libopenexr.3lib
 #
-link path=usr/lib/libIlmImf.so.6 target=libIlmImf.so.6.0.0
-link path=usr/lib/libIlmImf.so target=libIlmImf.so.6.0.0
-link path=usr/lib/$(MACH64)/libIlmImf.so.6 target=libIlmImf.so.6.0.0
-link path=usr/lib/$(MACH64)/libIlmImf.so target=libIlmImf.so.6.0.0
-#
-license openexr.license license="BSD"
-#
 legacy pkg=SUNWopenexr \
     desc="The IlmImf library and header files to read and write OpenEXR images" \
     name="Libraries to support high dynamic-range image (HDR) format"
+#
+license openexr.license license=BSD
+link path=usr/lib/$(MACH64)/libIlmImf.so target=libIlmImf.so.6.0.0
+link path=usr/lib/$(MACH64)/libIlmImf.so.6 target=libIlmImf.so.6.0.0
+link path=usr/lib/libIlmImf.so target=libIlmImf.so.6.0.0
+#
+link path=usr/lib/libIlmImf.so.6 target=libIlmImf.so.6.0.0
 
--- a/components/p7zip/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/p7zip/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -24,7 +24,6 @@
 #
 
 include ../../make-rules/shared-macros.mk
-include ../../make-rules/shared-targets.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
@@ -66,7 +65,7 @@
 COMPONENT_POST_INSTALL_ACTION += $(CHMOD) -R u+w $(PROTO_DIR)
 
 # build does this always
-test:
+test:	$(BUILD_32)
 	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
--- a/components/p7zip/p7zip.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/p7zip/p7zip.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -22,14 +22,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/compress/p7zip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/compress/p7zip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+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=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=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/617
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr/lib/7z
 dir path=usr/lib/7z/Codecs
 dir path=usr/share/doc/p7zip
@@ -94,13 +98,13 @@
 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/7z.1 path=usr/share/man/man1/7z.1 \
+    mangler.man.stability=Committed
 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
-
+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
--- a/components/p7zip/patches/man.patch	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
---- 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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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
-@@ -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.
--- a/components/patch/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/patch/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -37,19 +37,12 @@
 CONFIGURE_OPTIONS  +=		--program-prefix=g
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-GNUPROGS =	patch
-GNUMAN1 =	patch.1
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) \
-    $(PROTOGNULINKS) $(PROTOGNUMAN1LINKS)
+install:	$(INSTALL_32)
 
-test:
-	@echo "no tests available
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/patch/patch.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/patch/patch.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,17 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/text/gnu-patch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/text/gnu-patch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The GNU Patch utility"
-set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value=http://www.gnu.org/software/patch/
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/GNU
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/patch/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2001/799
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license patch.license license='GPLv2'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -41,15 +43,14 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 file path=usr/bin/gpatch
+file path=usr/share/man/man1/gpatch.1
+
+
+legacy pkg=SUNWgpch desc="The GNU Patch utility" name="The GNU Patch utility"
+license patch.license license=GPLv2
 link path=usr/bin/patch target=gpatch
-file path=usr/share/man/man1/gpatch.1
-link path=usr/share/man/man1/patch.1 target=gpatch.1
 link path=usr/gnu/bin/patch target=../../bin/gpatch
 link path=usr/gnu/share/man/man1/patch.1 \
     target=../../../../share/man/man1/gpatch.1
-
+link path=usr/share/man/man1/patch.1 target=gpatch.1
 
-legacy pkg=SUNWgpch \
-	name="The GNU Patch utility" \
-	desc="The GNU Patch utility"
-
--- a/components/perl512/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/perl512/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -91,13 +91,12 @@
 
 install:	$(INSTALL_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
-
-test: build
+test:		$(TEST_32)
 	#
 	# 2 expected failures because of the use of cloney in this build.
 	# Without cloney all tests pass.
 	#
-	@cd $(BUILD_DIR_32); $(MAKE) check
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
 include ../../make-rules/depend.mk
--- a/components/perl512/perl-512.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/perl512/perl-512.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,6 +21,7 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/runtime/perl-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -30,6 +31,8 @@
     value=org.opensolaris.category.2008:Development/Perl
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.perl.org
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2010/359
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/perl5
--- a/components/perl_modules/DBI/DBI.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/perl_modules/DBI/DBI.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,6 +21,7 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/database@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl Database Independent Interface"
@@ -28,6 +29,8 @@
     value=org.opensolaris.category.2008:Development/Perl
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://search.cpan.org/~timb/DBI/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2007/431
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/perl5
@@ -211,8 +214,7 @@
     path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)-solaris-64int/auto/DBI/dbixs_rev.h
 file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)-solaris-64int/dbixs_rev.pl
 file path=usr/perl5/vendor_perl/5.8.4/$(PERL_ARCH)-solaris-64int/goferperf.pl
+legacy pkg=SUNWpmdbi desc="Database independent interface module v1.58" \
+    name="Perl Database Independent Interface"
 license DBI.license license=Artistic
-legacy   pkg=SUNWpmdbi \
-	name="Perl Database Independent Interface" \
-	desc="Database independent interface module v1.58"
 
--- a/components/psutils/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/psutils/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -52,7 +52,7 @@
 
 # slightly hacky, since COMPONENT_BUILD_TARGETS are just arguments passed to
 # make
-COMPONENT_BUILD_TARGETS = -e -f Makefile.unix
+COMPONENT_BUILD_ARGS = -e -f Makefile.unix
 
 COMPONENT_INSTALL_ENV += BINDIR=$(PROTO_DIR)/usr/bin
 COMPONENT_INSTALL_ENV += INCLUDEDIR=$(PROTO_DIR)/usr/share/psutils
@@ -63,16 +63,15 @@
 
 # slightly hacky, since COMPONENT_BUILD_TARGETS are just arguments passed to
 # make
-COMPONENT_INSTALL_TARGETS = -e -f Makefile.unix install
+COMPONENT_INSTALL_ARGS = -e -f Makefile.unix
 
 build:		$(BUILD_32)
 
-$(INSTALL_32): $(PROTOUSRSHAREMAN1DIR) $(PROTOSFWBIN)
-
 install:	$(INSTALL_32)
 
-test: build
-	@echo no tests for psutils
+$(INSTALL_32):	$(PROTOUSRSHAREMAN1DIR) $(PROTOUSRBIN)
+
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/psutils/psutils.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/psutils/psutils.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,6 +20,8 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/print/psutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -29,6 +31,8 @@
     value=org.opensolaris.category.2008:System/Printing
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://knackered.knackered.org/angus/psutils
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2007/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
@@ -81,8 +85,7 @@
 file path=usr/share/man/man1/pstops.1
 file path=usr/share/psutils/md68_0.ps
 file path=usr/share/psutils/md71_0.ps
-legacy pkg=SUNWpsutils \
-    desc="psutils - PostScript utilities 1.17" \
+legacy pkg=SUNWpsutils desc="psutils - PostScript utilities 1.17" \
     name="psutils - PostScript utilities"
 license psutils.license license="psutils license"
 link path=usr/sfw/bin/epsffit target=../../bin/epsffit
--- a/components/pwgen/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/pwgen/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -62,10 +62,8 @@
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
-	sed -f pwgen.1.oracleman-stability $(COMPONENT_SRC)/pwgen.1 > \
-				   $(PROTO_DIR)/$(USRSHAREMAN1DIR)/pwgen.1
-test:
-	@echo "no tests available"
+
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/pwgen/pwgen.1.oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Oracle update\
-.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    crypto/pwgen\
-=\
-Interface Stability Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-Source for pwgen is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/pwgen/pwgen.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/pwgen/pwgen.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/crypto/pwgen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/crypto/pwgen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="pwgen is a password generator for creating passwords which can be easily memorized by a human."
 set name=pkg.summary value="Easy to memorize password generator"
-set name=pkg.description value="pwgen is a password generator for creating passwords which can be easily memorized by a human."
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://sourceforge.net/projects/pwgen/"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://sourceforge.net/projects/pwgen/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/453
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -35,9 +41,6 @@
 dir path=usr/share/man/man1
 file path=usr/bin/pwgen
 file path=usr/share/man/man1/pwgen.1
-
-license pwgen.license license="GPLv2"
-
-legacy	pkg=SUNWpwgen \
-	name="pwgen - easy to memorize passwords generator" \
-	desc="Easy to memorize passwords generator (2.06)"
+legacy pkg=SUNWpwgen desc="Easy to memorize passwords generator (2.06)" \
+    name="pwgen - easy to memorize passwords generator"
+license pwgen.license license=GPLv2
--- a/components/python/pyopenssl/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/python/pyopenssl/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,8 +40,7 @@
 
 install:	$(INSTALL_32_and_64)
 
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/python/pyopenssl/pyopenssl-26.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/python/pyopenssl/pyopenssl-26.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,16 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/python-2/pyopenssl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/python-2/pyopenssl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface to the OpenSSL library"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://pyopenssl.sourceforge.net"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://pyopenssl.sourceforge.net
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/176
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license pyopenssl.copyright license='LGPLv2.1'
-
 dir path=usr
 dir path=usr/lib
 dir path=usr/lib/python2.6
@@ -64,7 +65,7 @@
 file path=usr/lib/python2.6/vendor-packages/OpenSSL/version.pyc
 file path=usr/lib/python2.6/vendor-packages/pyOpenSSL-0.11-py2.6.egg-info
 file pyOpenSSL.txt path=usr/share/doc/pyOpenSSL/pyOpenSSL.txt
-
 legacy pkg=SUNWpython26-openssl \
-	name="pyOpenSSL - Python interface to the OpenSSL library for Python 2.6" \
-	desc="pyOpenSSL - Python interface to the OpenSSL library"
+    desc="pyOpenSSL - Python interface to the OpenSSL library" \
+    name="pyOpenSSL - Python interface to the OpenSSL library for Python 2.6"
+license pyopenssl.copyright license=LGPLv2.1
--- a/components/python/python26/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/python/python26/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -79,6 +79,8 @@
 CONFIGURE_OPTIONS  +=		DFLAGS="-$(BITS)"
 COMPONENT_BUILD_ENV  +=		DFLAGS="-$(BITS)"
 
+COMPONENT_TEST_TARGETS =	test
+
 # 64 bit shared objects need to go in a 64-bit directory
 COMPONENT_INSTALL_ARGS.64 += DESTSHARED=$(CONFIGURE_PREFIX)/lib/python2.6/lib-dynload
 
@@ -89,10 +91,7 @@
 
 install:	$(INSTALL_32_and_64)
 
-test:	$(TEST_32_and_64)
-
-$(BUILD_DIR)/%/.tested:	$(BUILD_DIR)/%/.built
-	(cd $(@D) ; gmake test || exit 0) 
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/python/python26/python-26.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/python/python26/python-26.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:/runtime/python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/runtime/python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Python interpreter, libraries and utilities"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://python.org/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://python.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/bin/$(MACH32)
@@ -37,6 +41,7 @@
 dir path=usr/lib
 dir path=usr/lib/$(MACH64)
 dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6
 dir path=usr/lib/python2.6/compiler
 dir path=usr/lib/python2.6/config
 dir path=usr/lib/python2.6/ctypes
@@ -57,6 +62,8 @@
 dir path=usr/lib/python2.6/json
 dir path=usr/lib/python2.6/json/tests
 dir path=usr/lib/python2.6/lib-dynload
+dir path=usr/lib/python2.6/lib-dynload
+dir path=usr/lib/python2.6/lib-dynload/64
 dir path=usr/lib/python2.6/lib-old
 dir path=usr/lib/python2.6/lib-tk
 dir path=usr/lib/python2.6/lib2to3
@@ -72,47 +79,29 @@
 dir path=usr/lib/python2.6/sqlite3/test
 dir path=usr/lib/python2.6/test
 dir path=usr/lib/python2.6/test/decimaltestdata
+dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/wsgiref
-dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/xml
 dir path=usr/lib/python2.6/xml/dom
 dir path=usr/lib/python2.6/xml/etree
 dir path=usr/lib/python2.6/xml/parsers
 dir path=usr/lib/python2.6/xml/sax
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/lib-dynload
-dir path=usr/lib/python2.6/lib-dynload/64
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
 
+# isapython2.6
+file usr/bin/python2.6 path=usr/bin/$(MACH32)/isapython2.6
+file usr/bin/$(MACH64)/python2.6 path=usr/bin/$(MACH64)/isapython2.6
+file path=usr/bin/$(MACH64)/python2.6-config pkg.depend.bypass-generate=.*
+
 
 # delivered from python-24, but should be delivered from here
 #file path=usr/bin/idle
 #file path=usr/bin/pydoc
 
 file path=usr/bin/2to3
-
-# isapython2.6
-file usr/bin/python2.6 path=usr/bin/$(MACH32)/isapython2.6
-file usr/bin/$(MACH64)/python2.6 path=usr/bin/$(MACH64)/isapython2.6
-hardlink path=usr/bin/isapython2.6 target=../lib/isaexec pkg.linted=true
-
-# python2.6
-link path=usr/bin/python target=python2.6
-link path=usr/bin/python2.6 target=$(MACH32)/isapython2.6
-link path=usr/bin/$(MACH64)/python target=python2.6
-link path=usr/bin/$(MACH64)/python2.6 target=isapython2.6
-
-link path=usr/bin/python-config target=python2.6-config
 file path=usr/bin/python2.6-config
-file path=usr/bin/$(MACH64)/python2.6-config pkg.depend.bypass-generate=.*
-
-link path=usr/lib/$(MACH64)/libpython2.6_db.so target=libpython2.6_db.so.1.0
-file path=usr/lib/$(MACH64)/libpython2.6_db.so.1.0
-link path=usr/lib/libpython2.6_db.so target=libpython2.6_db.so.1.0
-file path=usr/lib/libpython2.6_db.so.1.0
-
 file path=usr/include/python2.6/Python-ast.h
 file path=usr/include/python2.6/Python.h
 file path=usr/include/python2.6/abstract.h
@@ -202,7 +191,9 @@
 file path=usr/include/python2.6/warnings.h
 file path=usr/include/python2.6/weakrefobject.h
 file path=usr/lib/$(MACH64)/libpython2.6.so.1.0
+file path=usr/lib/$(MACH64)/libpython2.6_db.so.1.0
 file path=usr/lib/libpython2.6.so.1.0
+file path=usr/lib/libpython2.6_db.so.1.0
 file path=usr/lib/python2.6/BaseHTTPServer.py
 file path=usr/lib/python2.6/BaseHTTPServer.pyc
 file path=usr/lib/python2.6/Bastion.py
@@ -1227,6 +1218,75 @@
 file path=usr/lib/python2.6/json/tool.pyc
 file path=usr/lib/python2.6/keyword.py
 file path=usr/lib/python2.6/keyword.pyc
+file path=usr/lib/python2.6/lib-dynload/64/_bisect.so
+file path=usr/lib/python2.6/lib-dynload/64/_bytesio.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_cn.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_hk.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_iso2022.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_jp.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_kr.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_tw.so
+file path=usr/lib/python2.6/lib-dynload/64/_collections.so
+file path=usr/lib/python2.6/lib-dynload/64/_csv.so
+file path=usr/lib/python2.6/lib-dynload/64/_ctypes.so
+file path=usr/lib/python2.6/lib-dynload/64/_ctypes_test.so
+file path=usr/lib/python2.6/lib-dynload/64/_curses.so
+file path=usr/lib/python2.6/lib-dynload/64/_curses_panel.so
+file path=usr/lib/python2.6/lib-dynload/64/_elementtree.so
+file path=usr/lib/python2.6/lib-dynload/64/_fileio.so
+file path=usr/lib/python2.6/lib-dynload/64/_functools.so
+file path=usr/lib/python2.6/lib-dynload/64/_hashlib.so
+file path=usr/lib/python2.6/lib-dynload/64/_heapq.so
+file path=usr/lib/python2.6/lib-dynload/64/_hotshot.so
+file path=usr/lib/python2.6/lib-dynload/64/_json.so
+file path=usr/lib/python2.6/lib-dynload/64/_locale.so
+file path=usr/lib/python2.6/lib-dynload/64/_lsprof.so
+file path=usr/lib/python2.6/lib-dynload/64/_multibytecodec.so
+file path=usr/lib/python2.6/lib-dynload/64/_multiprocessing.so
+file path=usr/lib/python2.6/lib-dynload/64/_random.so
+file path=usr/lib/python2.6/lib-dynload/64/_socket.so
+file path=usr/lib/python2.6/lib-dynload/64/_sqlite3.so
+file path=usr/lib/python2.6/lib-dynload/64/_ssl.so
+file path=usr/lib/python2.6/lib-dynload/64/_struct.so
+file path=usr/lib/python2.6/lib-dynload/64/_testcapi.so
+file path=usr/lib/python2.6/lib-dynload/64/_tkinter.so
+file path=usr/lib/python2.6/lib-dynload/64/_weakref.so
+file path=usr/lib/python2.6/lib-dynload/64/array.so
+file path=usr/lib/python2.6/lib-dynload/64/audioop.so
+file path=usr/lib/python2.6/lib-dynload/64/binascii.so
+file path=usr/lib/python2.6/lib-dynload/64/bz2.so
+file path=usr/lib/python2.6/lib-dynload/64/cPickle.so
+file path=usr/lib/python2.6/lib-dynload/64/cStringIO.so
+file path=usr/lib/python2.6/lib-dynload/64/cmath.so
+file path=usr/lib/python2.6/lib-dynload/64/crypt.so
+file path=usr/lib/python2.6/lib-dynload/64/datetime.so
+file path=usr/lib/python2.6/lib-dynload/64/dbm.so
+file path=usr/lib/python2.6/lib-dynload/64/dlpi.so
+file path=usr/lib/python2.6/lib-dynload/64/fcntl.so
+file path=usr/lib/python2.6/lib-dynload/64/future_builtins.so
+file path=usr/lib/python2.6/lib-dynload/64/gdbm.so
+file path=usr/lib/python2.6/lib-dynload/64/grp.so
+file path=usr/lib/python2.6/lib-dynload/64/itertools.so
+file path=usr/lib/python2.6/lib-dynload/64/math.so
+file path=usr/lib/python2.6/lib-dynload/64/mmap.so
+file path=usr/lib/python2.6/lib-dynload/64/nis.so
+file path=usr/lib/python2.6/lib-dynload/64/operator.so
+file path=usr/lib/python2.6/lib-dynload/64/parser.so
+file path=usr/lib/python2.6/lib-dynload/64/privileges.so
+file path=usr/lib/python2.6/lib-dynload/64/pyexpat.so
+file path=usr/lib/python2.6/lib-dynload/64/rbac.so
+file path=usr/lib/python2.6/lib-dynload/64/readline.so
+file path=usr/lib/python2.6/lib-dynload/64/resource.so
+file path=usr/lib/python2.6/lib-dynload/64/select.so
+file path=usr/lib/python2.6/lib-dynload/64/spwd.so
+file path=usr/lib/python2.6/lib-dynload/64/strop.so
+file path=usr/lib/python2.6/lib-dynload/64/sunaudiodev.so
+file path=usr/lib/python2.6/lib-dynload/64/syslog.so
+file path=usr/lib/python2.6/lib-dynload/64/termios.so
+file path=usr/lib/python2.6/lib-dynload/64/time.so
+file path=usr/lib/python2.6/lib-dynload/64/ucred.so
+file path=usr/lib/python2.6/lib-dynload/64/unicodedata.so
+file path=usr/lib/python2.6/lib-dynload/64/zlib.so
 file path=usr/lib/python2.6/lib-dynload/Python-2.6.4-py2.6.egg-info
 file path=usr/lib/python2.6/lib-dynload/_bisect.so
 file path=usr/lib/python2.6/lib-dynload/_bytesio.so
@@ -1473,21 +1533,27 @@
 file path=usr/lib/python2.6/lib2to3/refactor.pyc
 file path=usr/lib/python2.6/lib2to3/tests/__init__.py
 file path=usr/lib/python2.6/lib2to3/tests/__init__.pyc
-file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.pyc
 file path=usr/lib/python2.6/lib2to3/tests/support.py
 file path=usr/lib/python2.6/lib2to3/tests/support.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_fixers.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_fixers.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/lib2to3/tests/test_fixers.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_parser.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_parser.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/lib2to3/tests/test_parser.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_pytree.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_pytree.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/lib2to3/tests/test_pytree.pyc
 file path=usr/lib/python2.6/lib2to3/tests/test_refactor.py
 file path=usr/lib/python2.6/lib2to3/tests/test_refactor.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_util.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_util.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/lib2to3/tests/test_util.pyc
 file path=usr/lib/python2.6/linecache.py
 file path=usr/lib/python2.6/linecache.pyc
@@ -1617,10 +1683,9 @@
 file path=usr/lib/python2.6/pstats.pyc
 file path=usr/lib/python2.6/pty.py
 file path=usr/lib/python2.6/pty.pyc
-link path=usr/lib/python2.6/pyCC target=pycc
-file path=usr/lib/python2.6/pycc mode=0555
 file path=usr/lib/python2.6/py_compile.py
 file path=usr/lib/python2.6/py_compile.pyc
+file path=usr/lib/python2.6/pycc mode=0555
 file path=usr/lib/python2.6/pyclbr.py
 file path=usr/lib/python2.6/pyclbr.pyc
 file path=usr/lib/python2.6/pydoc.py pkg.depend.bypass-generate=.*
@@ -1760,9 +1825,9 @@
 file path=usr/lib/python2.6/test/buffer_tests.py
 file path=usr/lib/python2.6/test/buffer_tests.pyc
 file path=usr/lib/python2.6/test/cfgparser.1
-file path=usr/lib/python2.6/test/check_soundcard.vbs
 file usr/bin/check_offset path=usr/lib/python2.6/test/check_offset
 file usr/bin/$(MACH64)/check_offset path=usr/lib/python2.6/test/check_offset64
+file path=usr/lib/python2.6/test/check_soundcard.vbs
 file path=usr/lib/python2.6/test/cjkencodings_test.py
 file path=usr/lib/python2.6/test/cjkencodings_test.pyc
 file path=usr/lib/python2.6/test/cmath_testcases.txt
@@ -2855,90 +2920,26 @@
 file path=usr/lib/python2.6/xmlrpclib.pyc
 file path=usr/lib/python2.6/zipfile.py
 file path=usr/lib/python2.6/zipfile.pyc
-file path=usr/lib/python2.6/lib-dynload/64/_bisect.so
-file path=usr/lib/python2.6/lib-dynload/64/_bytesio.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_cn.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_hk.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_iso2022.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_jp.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_kr.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_tw.so
-file path=usr/lib/python2.6/lib-dynload/64/_collections.so
-file path=usr/lib/python2.6/lib-dynload/64/_csv.so
-file path=usr/lib/python2.6/lib-dynload/64/_ctypes.so
-file path=usr/lib/python2.6/lib-dynload/64/_ctypes_test.so
-file path=usr/lib/python2.6/lib-dynload/64/_curses.so
-file path=usr/lib/python2.6/lib-dynload/64/_curses_panel.so
-file path=usr/lib/python2.6/lib-dynload/64/_elementtree.so
-file path=usr/lib/python2.6/lib-dynload/64/_fileio.so
-file path=usr/lib/python2.6/lib-dynload/64/_functools.so
-file path=usr/lib/python2.6/lib-dynload/64/_hashlib.so
-file path=usr/lib/python2.6/lib-dynload/64/_heapq.so
-file path=usr/lib/python2.6/lib-dynload/64/_hotshot.so
-file path=usr/lib/python2.6/lib-dynload/64/_json.so
-file path=usr/lib/python2.6/lib-dynload/64/_locale.so
-file path=usr/lib/python2.6/lib-dynload/64/_lsprof.so
-file path=usr/lib/python2.6/lib-dynload/64/_multibytecodec.so
-file path=usr/lib/python2.6/lib-dynload/64/_multiprocessing.so
-file path=usr/lib/python2.6/lib-dynload/64/_random.so
-file path=usr/lib/python2.6/lib-dynload/64/_socket.so
-file path=usr/lib/python2.6/lib-dynload/64/_sqlite3.so
-file path=usr/lib/python2.6/lib-dynload/64/_ssl.so
-file path=usr/lib/python2.6/lib-dynload/64/_struct.so
-file path=usr/lib/python2.6/lib-dynload/64/_testcapi.so
-file path=usr/lib/python2.6/lib-dynload/64/_tkinter.so
-file path=usr/lib/python2.6/lib-dynload/64/_weakref.so
-file path=usr/lib/python2.6/lib-dynload/64/array.so
-file path=usr/lib/python2.6/lib-dynload/64/audioop.so
-file path=usr/lib/python2.6/lib-dynload/64/binascii.so
-file path=usr/lib/python2.6/lib-dynload/64/bz2.so
-file path=usr/lib/python2.6/lib-dynload/64/cPickle.so
-file path=usr/lib/python2.6/lib-dynload/64/cStringIO.so
-file path=usr/lib/python2.6/lib-dynload/64/cmath.so
-file path=usr/lib/python2.6/lib-dynload/64/crypt.so
-file path=usr/lib/python2.6/lib-dynload/64/datetime.so
-file path=usr/lib/python2.6/lib-dynload/64/dbm.so
-file path=usr/lib/python2.6/lib-dynload/64/dlpi.so
-file path=usr/lib/python2.6/lib-dynload/64/fcntl.so
-file path=usr/lib/python2.6/lib-dynload/64/future_builtins.so
-file path=usr/lib/python2.6/lib-dynload/64/gdbm.so
-file path=usr/lib/python2.6/lib-dynload/64/grp.so
-file path=usr/lib/python2.6/lib-dynload/64/itertools.so
-file path=usr/lib/python2.6/lib-dynload/64/math.so
-file path=usr/lib/python2.6/lib-dynload/64/mmap.so
-file path=usr/lib/python2.6/lib-dynload/64/nis.so
-file path=usr/lib/python2.6/lib-dynload/64/operator.so
-file path=usr/lib/python2.6/lib-dynload/64/parser.so
-file path=usr/lib/python2.6/lib-dynload/64/privileges.so
-file path=usr/lib/python2.6/lib-dynload/64/pyexpat.so
-file path=usr/lib/python2.6/lib-dynload/64/rbac.so
-file path=usr/lib/python2.6/lib-dynload/64/readline.so
-file path=usr/lib/python2.6/lib-dynload/64/resource.so
-file path=usr/lib/python2.6/lib-dynload/64/select.so
-file path=usr/lib/python2.6/lib-dynload/64/spwd.so
-file path=usr/lib/python2.6/lib-dynload/64/strop.so
-file path=usr/lib/python2.6/lib-dynload/64/sunaudiodev.so
-file path=usr/lib/python2.6/lib-dynload/64/syslog.so
-file path=usr/lib/python2.6/lib-dynload/64/termios.so
-file path=usr/lib/python2.6/lib-dynload/64/time.so
-file path=usr/lib/python2.6/lib-dynload/64/ucred.so
-file path=usr/lib/python2.6/lib-dynload/64/unicodedata.so
-file path=usr/lib/python2.6/lib-dynload/64/zlib.so
 file usr/share/man/man1/python.1 path=usr/share/man/man1/python2.6.1
-link path=usr/bin/python-config target=python2.6-config
-link path=usr/lib/$(MACH64)/libpython2.6.so target=libpython2.6.so.1.0
-link path=usr/lib/libpython2.6.so target=libpython2.6.so.1.0
-
-license python26.license license="PSFv2"
-
-legacy pkg=SUNWPython26 \
+hardlink path=usr/bin/isapython2.6 pkg.linted=true target=../lib/isaexec
+legacy pkg=SUNWPython26 category=GNOME2,application,JDS4 \
     desc="The Python interpreter, libraries and utilities" \
-    name="The Python interpreter, libraries and utilities" \
-    category="GNOME2,application,JDS4" \
-    vendor=Python.org
-
-legacy pkg=SUNWPython26-devel \
+    name="The Python interpreter, libraries and utilities" vendor=Python.org
+legacy pkg=SUNWPython26-devel category=GNOME2,application,JDS4 \
     desc="The Python interpreter, libraries and utilities - development files" \
     name="The Python interpreter, libraries and utilities - development files" \
-    category="GNOME2,application,JDS4" \
     vendor=Python.org
+license python26.license license=PSFv2
+link path=usr/bin/$(MACH64)/python target=python2.6
+link path=usr/bin/$(MACH64)/python2.6 target=isapython2.6
+
+# python2.6
+link path=usr/bin/python target=python2.6
+link path=usr/bin/python-config target=python2.6-config
+link path=usr/bin/python-config target=python2.6-config
+link path=usr/bin/python2.6 target=$(MACH32)/isapython2.6
+link path=usr/lib/$(MACH64)/libpython2.6.so target=libpython2.6.so.1.0
+link path=usr/lib/$(MACH64)/libpython2.6_db.so target=libpython2.6_db.so.1.0
+link path=usr/lib/libpython2.6.so target=libpython2.6.so.1.0
+link path=usr/lib/libpython2.6_db.so target=libpython2.6_db.so.1.0
+link path=usr/lib/python2.6/pyCC target=pycc
--- a/components/readline/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/readline/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -45,25 +45,13 @@
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		LDFLAGS="$(LDFLAGS)"
 
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
-build:		$(BUILD_32) $(BUILD_64)
+build:		$(BUILD_32_and_64)
 
-install:	$(INSTALL_32) $(INSTALL_64)
-	$(MKDIR) $(PROTO_DIR)/usr/demo/readline
-	$(INSTALL) -D \
-	    $(SOURCE_DIR)/examples/Inputrc $(PROTO_DIR)/usr/demo/readline
-	sed -f oracleman-stability $(COMPONENT_SRC)/doc/history.3 \
-	    > $(PROTOUSRSHAREMAN3DIR)/history.3
-	sed -f oracleman-stability $(COMPONENT_SRC)/doc/readline.3 \
-	    > $(PROTOUSRSHAREMAN3DIR)/readline.3
+install:	$(INSTALL_32_and_64)
 
+test:		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/readline/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-#
-# Oracle nroff can only handle 2-char macro names, so replace longer names
-# (in history.3)
-#
-s/Fn1/F1/g
-s/Fn2/F2/g
-s/Fn3/F3/g
-#
-# Add comment to beginning of file
-#
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"
-#
-# Add ATTRIBUTES AND NOTES sections to end of file
-#
-$a\
-\.\\" Begin Oracle update\
-.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	library/readline \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for readline is available at http://opensolaris.org.\
-\.\\" End Oracle update
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/readline/patches/history.3.patch	Wed Apr 13 09:58:06 2011 -0700
@@ -0,0 +1,253 @@
+--- readline-5.2/doc/history.3.orig	Mon Apr  4 00:12:21 2011
++++ readline-5.2/doc/history.3	Mon Apr  4 00:13:09 2011
+@@ -19,16 +19,16 @@
+ .ds lp \fR\|(\fP
+ .ds rp \fR\|)\fP
+ .\" FnN return-value fun-name N arguments
+-.de Fn1
++.de F1
+ \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3\fP\\*(rp
+ .br
+ ..
+-.de Fn2
++.de F2
+ .if t \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3,\|\\$4\fP\\*(rp
+ .if n \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3, \\$4\fP\\*(rp
+ .br
+ ..
+-.de Fn3
++.de F3
+ .if t \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3,\|\\$4,\|\\$5\fP\|\\*(rp
+ .if n \fI\\$1\fP \fB\\$2\fP \\*(lp\fI\\$3, \\$4, \\$5\fP\\*(rp
+ .br
+@@ -331,14 +331,14 @@
+ the state of the History library when you want to use the history
+ functions in your program.
+ 
+-.Fn1 void using_history void
++.F1 void using_history void
+ Begin a session in which the history functions might be used.  This
+ initializes the interactive variables.
+ 
+-.Fn1 "HISTORY_STATE *" history_get_history_state void
++.F1 "HISTORY_STATE *" history_get_history_state void
+ Return a structure describing the current state of the input history.
+ 
+-.Fn1 void history_set_history_state "HISTORY_STATE *state"
++.F1 void history_set_history_state "HISTORY_STATE *state"
+ Set the state of the history list according to \fIstate\fP.
+ 
+ .SS History List Management
+@@ -346,43 +346,43 @@
+ These functions manage individual entries on the history list, or set
+ parameters managing the list itself.
+ 
+-.Fn1 void add_history "const char *string"
++.F1 void add_history "const char *string"
+ Place \fIstring\fP at the end of the history list.  The associated data
+ field (if any) is set to \fBNULL\fP.
+ 
+-.Fn1 void add_history_time "const char *string"
++.F1 void add_history_time "const char *string"
+ Change the time stamp associated with the most recent history entry to
+ \fIstring\fP.
+ 
+-.Fn1 "HIST_ENTRY *" remove_history "int which"
++.F1 "HIST_ENTRY *" remove_history "int which"
+ Remove history entry at offset \fIwhich\fP from the history.  The
+ removed element is returned so you can free the line, data,
+ and containing structure.
+ 
+-.Fn1 "histdata_t" free_history_entry "HIST_ENTRY *histent"
++.F1 "histdata_t" free_history_entry "HIST_ENTRY *histent"
+ Free the history entry \fIhistent\fP and any history library private
+ data associated with it.  Returns the application-specific data
+ so the caller can dispose of it.
+ 
+-.Fn3 "HIST_ENTRY *" replace_history_entry "int which" "const char *line" "histdata_t data"
++.F3 "HIST_ENTRY *" replace_history_entry "int which" "const char *line" "histdata_t data"
+ Make the history entry at offset \fIwhich\fP have \fIline\fP and \fIdata\fP.
+ This returns the old entry so the caller can dispose of any
+ application-specific data.  In the case
+ of an invalid \fIwhich\fP, a \fBNULL\fP pointer is returned.
+ 
+-.Fn1 void clear_history "void"
++.F1 void clear_history "void"
+ Clear the history list by deleting all the entries.
+ 
+-.Fn1 void stifle_history "int max"
++.F1 void stifle_history "int max"
+ Stifle the history list, remembering only the last \fImax\fP entries.
+ 
+-.Fn1 int unstifle_history "void"
++.F1 int unstifle_history "void"
+ Stop stifling the history.  This returns the previously-set
+ maximum number of history entries (as set by \fBstifle_history()\fP).
+ history was stifled.  The value is positive if the history was
+ stifled, negative if it wasn't.
+ 
+-.Fn1 int history_is_stifled "void"
++.F1 int history_is_stifled "void"
+ Returns non-zero if the history is stifled, zero if it is not.
+ 
+ .SS Information About the History List
+@@ -390,29 +390,29 @@
+ These functions return information about the entire history list or
+ individual list entries.
+ 
+-.Fn1 "HIST_ENTRY **" history_list "void"
++.F1 "HIST_ENTRY **" history_list "void"
+ Return a \fBNULL\fP terminated array of \fIHIST_ENTRY *\fP which is the
+ current input history.  Element 0 of this list is the beginning of time.
+ If there is no history, return \fBNULL\fP.
+ 
+-.Fn1 int where_history "void"
++.F1 int where_history "void"
+ Returns the offset of the current history element.
+ 
+-.Fn1 "HIST_ENTRY *" current_history "void"
++.F1 "HIST_ENTRY *" current_history "void"
+ Return the history entry at the current position, as determined by
+ \fBwhere_history()\fP.  If there is no entry there, return a \fBNULL\fP
+ pointer.
+ 
+-.Fn1 "HIST_ENTRY *" history_get "int offset"
++.F1 "HIST_ENTRY *" history_get "int offset"
+ Return the history entry at position \fIoffset\fP, starting from
+ \fBhistory_base\fP.
+ If there is no entry there, or if \fIoffset\fP
+ is greater than the history length, return a \fBNULL\fP pointer.
+ 
+-.Fn1 "time_t" history_get_time "HIST_ENTRY *"
++.F1 "time_t" history_get_time "HIST_ENTRY *"
+ Return the time stamp associated with the history entry passed as the argument.
+ 
+-.Fn1 int history_total_bytes "void"
++.F1 int history_total_bytes "void"
+ Return the number of bytes that the primary history entries are using.
+ This function returns the sum of the lengths of all the lines in the
+ history.
+@@ -422,18 +422,18 @@
+ These functions allow the current index into the history list to be
+ set or changed.
+ 
+-.Fn1 int history_set_pos "int pos"
++.F1 int history_set_pos "int pos"
+ Set the current history offset to \fIpos\fP, an absolute index
+ into the list.
+ Returns 1 on success, 0 if \fIpos\fP is less than zero or greater
+ than the number of history entries.
+ 
+-.Fn1 "HIST_ENTRY *" previous_history "void"
++.F1 "HIST_ENTRY *" previous_history "void"
+ Back up the current history offset to the previous history entry, and
+ return a pointer to that entry.  If there is no previous entry, return
+ a \fBNULL\fP pointer.
+ 
+-.Fn1 "HIST_ENTRY *" next_history "void"
++.F1 "HIST_ENTRY *" next_history "void"
+ Move the current history offset forward to the next history entry, and
+ return the a pointer to that entry.  If there is no next entry, return
+ a \fBNULL\fP pointer.
+@@ -445,7 +445,7 @@
+ from the current history position.  The search may be \fIanchored\fP,
+ meaning that the string must match at the beginning of the history entry.
+ 
+-.Fn2 int history_search "const char *string" "int direction"
++.F2 int history_search "const char *string" "int direction"
+ Search the history for \fIstring\fP, starting at the current history offset.
+ If \fIdirection\fP is less than 0, then the search is through
+ previous entries, otherwise through subsequent entries.
+@@ -455,7 +455,7 @@
+ \fIstring\fP was found.  Otherwise, nothing is changed, and a -1 is
+ returned.
+ 
+-.Fn2 int history_search_prefix "const char *string" "int direction"
++.F2 int history_search_prefix "const char *string" "int direction"
+ Search the history for \fIstring\fP, starting at the current history
+ offset.  The search is anchored: matching lines must begin with
+ \fIstring\fP.  If \fIdirection\fP is less than 0, then the search is
+@@ -464,7 +464,7 @@
+ current history index is set to that entry, and the return value is 0. 
+ Otherwise, nothing is changed, and a -1 is returned. 
+ 
+-.Fn3 int history_search_pos "const char *string" "int direction" "int pos"
++.F3 int history_search_pos "const char *string" "int direction" "int pos"
+ Search for \fIstring\fP in the history list, starting at \fIpos\fP, an
+ absolute index into the list.  If \fIdirection\fP is negative, the search
+ proceeds backward from \fIpos\fP, otherwise forward.  Returns the absolute
+@@ -474,12 +474,12 @@
+ The History library can read the history from and write it to a file.
+ This section documents the functions for managing a history file.
+ 
+-.Fn1 int read_history "const char *filename"
++.F1 int read_history "const char *filename"
+ Add the contents of \fIfilename\fP to the history list, a line at a time.
+ If \fIfilename\fP is \fBNULL\fP, then read from \fI~/.history\fP.
+ Returns 0 if successful, or \fBerrno\fP if not.
+ 
+-.Fn3 int read_history_range "const char *filename" "int from" "int to"
++.F3 int read_history_range "const char *filename" "int from" "int to"
+ Read a range of lines from \fIfilename\fP, adding them to the history list.
+ Start reading at line \fIfrom\fP and end at \fIto\fP.
+ If \fIfrom\fP is zero, start at the beginning.  If \fIto\fP is less than
+@@ -487,7 +487,7 @@
+ \fBNULL\fP, then read from \fI~/.history\fP.  Returns 0 if successful,
+ or \fBerrno\fP if not.
+ 
+-.Fn1 int write_history "const char *filename"
++.F1 int write_history "const char *filename"
+ Write the current history to \fIfilename\fP, overwriting \fIfilename\fP
+ if necessary.
+ If \fIfilename\fP is \fBNULL\fP, then write the history list to \fI~/.history\fP.
+@@ -494,12 +494,12 @@
+ Returns 0 on success, or \fBerrno\fP on a read or write error.
+ 
+ 
+-.Fn2 int append_history "int nelements" "const char *filename"
++.F2 int append_history "int nelements" "const char *filename"
+ Append the last \fInelements\fP of the history list to \fIfilename\fP.
+ If \fIfilename\fP is \fBNULL\fP, then append to \fI~/.history\fP.
+ Returns 0 on success, or \fBerrno\fP on a read or write error.
+ 
+-.Fn2 int history_truncate_file "const char *filename" "int nlines"
++.F2 int history_truncate_file "const char *filename" "int nlines"
+ Truncate the history file \fIfilename\fP, leaving only the last
+ \fInlines\fP lines.
+ If \fIfilename\fP is \fBNULL\fP, then \fI~/.history\fP is truncated.
+@@ -509,7 +509,7 @@
+ 
+ These functions implement history expansion.
+ 
+-.Fn2 int history_expand "char *string" "char **output"
++.F2 int history_expand "char *string" "char **output"
+ Expand \fIstring\fP, placing the result into \fIoutput\fP, a pointer
+ to a string.  Returns:
+ .RS
+@@ -534,7 +534,7 @@
+ If an error ocurred in expansion, then \fIoutput\fP contains a descriptive
+ error message.
+ 
+-.Fn3 "char *" get_history_event "const char *string" "int *cindex" "int qchar"
++.F3 "char *" get_history_event "const char *string" "int *cindex" "int qchar"
+ Returns the text of the history event beginning at \fIstring\fP +
+ \fI*cindex\fP.  \fI*cindex\fP is modified to point to after the event
+ specifier.  At function entry, \fIcindex\fP points to the index into
+@@ -542,7 +542,7 @@
+ is a character that is allowed to end the event specification in addition
+ to the ``normal'' terminating characters.
+ 
+-.Fn1 "char **" history_tokenize "const char *string"
++.F1 "char **" history_tokenize "const char *string"
+ Return an array of tokens parsed out of \fIstring\fP, much as the
+ shell might.
+ The tokens are split on the characters in the
+@@ -549,7 +549,7 @@
+ \fBhistory_word_delimiters\fP variable,
+ and shell quoting conventions are obeyed.
+ 
+-.Fn3 "char *" history_arg_extract "int first" "int last" "const char *string"
++.F3 "char *" history_arg_extract "int first" "int last" "const char *string"
+ Extract a string segment consisting of the \fIfirst\fP through \fIlast\fP
+ arguments present in \fIstring\fP.  Arguments are split using
+ \fBhistory_tokenize()\fP.
--- a/components/readline/readline.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/readline/readline.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,20 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/readline@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/readline@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
 set name=pkg.summary value="GNU readline"
-set name=pkg.description value="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+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://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/188
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/demo
 dir path=usr/demo/readline
@@ -42,7 +48,7 @@
 dir path=usr/share/info
 dir path=usr/share/man
 dir path=usr/share/man/man3
-file path=usr/demo/readline/Inputrc
+file examples/Inputrc path=usr/demo/readline/Inputrc
 file path=usr/include/readline/chardefs.h
 file path=usr/include/readline/history.h
 file path=usr/include/readline/keymaps.h
@@ -60,13 +66,10 @@
 file path=usr/share/info/rluserman.info
 file path=usr/share/man/man3/history.3
 file path=usr/share/man/man3/readline.3
+legacy pkg=SUNWgnu-readline desc="GNU readline library (5.2)" \
+    name="GNU readline"
+license readline.license license=GPLv2
 link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
 link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.5
 link path=usr/lib/libhistory.so target=libhistory.so.5
 link path=usr/lib/libreadline.so target=libreadline.so.5
-
-license readline.license license="GPLv2"
-
-legacy	pkg=SUNWgnu-readline \
-	name="GNU readline" \
-	desc="GNU readline library (5.2)"
--- a/components/screen/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/screen/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -42,17 +42,15 @@
 PROTOTERMINFODIR=$(PROTOUSRSHAREDIR)/lib/terminfo
 
 $(PROTOTERMINFODIR):
-	$(MKDIR) $@ 
+	$(MKDIR) $@
 
-include ../../make-rules/shared-targets.mk
-
-build: $(BUILD_32)
+$(INSTALL_32):	$(PROTOTERMINFODIR)
 
-install: $(PROTOETCDIR) $(PROTOTERMINFODIR) $(INSTALL_32)
-	$(CP) $(COMPONENT_SRC)/etc/screenrc $(PROTOETCDIR)
+build:		$(BUILD_32)
 
-test:
-	@echo "no tests available"
+install:	$(INSTALL_32)
+
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/screen/screen.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/screen/screen.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:/terminal/screen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU Screen"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/terminal/screen@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="GNU Screen terminal multiplexer"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://www.gnu.org/software/screen"
+set name=pkg.summary value="GNU Screen"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/screen
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/413
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=etc
 dir path=usr
 dir path=usr/bin
@@ -40,7 +45,8 @@
 dir path=usr/share/man/man1
 dir path=usr/share/screen
 dir path=usr/share/screen/utf8encodings
-file path=etc/screenrc mode=0644 group=sys preserve=renamenew original_name=SUNWscreen:etc/screenrc
+file path=etc/screenrc group=sys mode=0644 \
+    original_name=SUNWscreen:etc/screenrc preserve=renamenew
 file path=usr/bin/screen
 file path=usr/share/info/screen.info
 file path=usr/share/info/screen.info-1
@@ -48,8 +54,8 @@
 file path=usr/share/info/screen.info-3
 file path=usr/share/info/screen.info-4
 file path=usr/share/info/screen.info-5
+file path=usr/share/lib/terminfo/s/screen-bce
 file path=usr/share/lib/terminfo/s/screen-s
-file path=usr/share/lib/terminfo/s/screen-bce
 file path=usr/share/man/man1/screen.1
 file path=usr/share/screen/utf8encodings/01
 file path=usr/share/screen/utf8encodings/02
@@ -68,10 +74,7 @@
 file path=usr/share/screen/utf8encodings/cc
 file path=usr/share/screen/utf8encodings/cd
 file path=usr/share/screen/utf8encodings/d6
+legacy pkg=SUNWscreen desc="GNU Screen terminal multiplexer" name="GNU Screen"
 
 
-license screen.license license="GPLv2"
-
-legacy	pkg=SUNWscreen \
-	name="GNU Screen" \
-	desc="GNU Screen terminal multiplexer"
+license screen.license license=GPLv2
--- a/components/sed/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/sed/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,20 +40,13 @@
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-GNUPROGS =	sed
-GNUMAN1 =	sed.1
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) \
-    $(PROTOGNULINKS) $(PROTOGNUMAN1LINKS)
+install:	$(INSTALL_32)
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/sed/sed.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/sed/sed.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,14 +23,20 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/text/gnu-sed@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="gsed - GNU implementation of sed, the Unix stream editor"
-set name=pkg.description value="sed takes text input and performs some operation (or set of operations) on it and outputs the modified text."
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/text/gnu-sed@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="sed takes text input and performs some operation (or set of operations) on it and outputs the modified text."
+set name=pkg.summary \
+    value="gsed - GNU implementation of sed, the Unix stream editor"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.gnu.org/software/sed/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/254
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
@@ -154,12 +160,9 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/sed.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/sed.mo
 file path=usr/share/man/man1/gsed.1
+legacy pkg=SUNWgsed desc="gsed - GNU sed 4.2.1" \
+    name="gsed - GNU implementation of sed, the Unix stream editor"
+license sed.license license=GPLv3
 link path=usr/gnu/bin/sed target=../../bin/gsed
 link path=usr/gnu/share/man/man1/sed.1 \
     target=../../../../share/man/man1/gsed.1
-
-license sed.license license="GPLv3"
-
-legacy	pkg=SUNWgsed \
-	name="gsed - GNU implementation of sed, the Unix stream editor" \
-	desc="gsed - GNU sed 4.2.1"
--- a/components/slib/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/slib/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -51,12 +51,8 @@
 	cd $(SOURCE_DIR) ; \
 		$(MAKE) prefix=$(PROTO_DIR)/usr/ INSTALL=ginstall \
 			man1dir=$(PROTOUSRSHAREMAN1DIR) install
-	sed -f solarisman-stability $(SOURCE_DIR)/slib.1 > \
-	    $(PROTOUSRSHAREMAN1DIR)/slib.1
 
-# no tests
-test:
-	@echo "no tests available"
+test:	$(NO_TESTS)
 
 clean::
 	$(RM) -r $(BUILD_DIR)
--- a/components/slib/slib.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/slib/slib.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,15 +21,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/library/slib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU slib - a portable library for the programming language Scheme"
-set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value="http://people.csail.mit.edu/jaffer/SLIB"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/slib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="GNU slib - a portable library for the programming language Scheme"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://people.csail.mit.edu/jaffer/SLIB
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license slib.license license="BSD-like, PD"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
@@ -219,7 +222,7 @@
 file path=usr/lib/slib/xml-parse.scm
 file path=usr/lib/slib/yasyn.scm
 file path=usr/share/man/man1/slib.1
-
 legacy pkg=SUNWslib \
-	name="GNU slib - a portable library for the programming language Scheme" \
-	desc="GNU slib - a portable library for the programming language Scheme (3b1)"
+    desc="GNU slib - a portable library for the programming language Scheme (3b1)" \
+    name="GNU slib - a portable library for the programming language Scheme"
+license slib.license license="BSD-like, PD"
--- a/components/slib/solarisman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Solaris update\
-.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	library/slib \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for slib is available on http://opensolaris.org.\
-\.\\" End Solaris update
--- a/components/squid/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/squid/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -95,37 +95,12 @@
                 -e 's/^\# +dns_testnames.*/dns_testnames localhost/g' \
                		src/squid.conf.default )
 
-
-PKG_PROTO_DIRS +=       $(SOURCE_DIR)
-PKG_PROTO_DIRS +=       $(COMPONENT_DIR)
-
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32) 
 
 install:	$(INSTALL_32) 
-		sed -f oracleman-stability $(BUILD_DIR_32)/doc/squid.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/squid.8
-		sed -f oracleman-stability $(BUILD_DIR_32)/doc/cachemgr.cgi.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/cachemgr.cgi.8
-		sed -f oracleman-stability $(SOURCE_DIR)/helpers/basic_auth/NCSA/ncsa_auth.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/ncsa_auth.8
-		sed -f oracleman-stability $(SOURCE_DIR)/helpers/basic_auth/PAM/pam_auth.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/pam_auth.8
-		sed -f oracleman-stability $(BUILD_DIR_32)/helpers/basic_auth/DB/squid_db_auth.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/squid_db_auth.8
-		sed -f oracleman-stability $(SOURCE_DIR)/helpers/basic_auth/LDAP/squid_ldap_auth.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/squid_ldap_auth.8
-		sed -f oracleman-stability $(SOURCE_DIR)/helpers/external_acl/ldap_group/squid_ldap_group.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/squid_ldap_group.8
-		sed -f oracleman-stability $(SOURCE_DIR)/helpers/external_acl/unix_group/squid_unix_group.8 \
-			> $(PROTOUSRDIR)/squid/man/man8/squid_unix_group.8
 		
-test:
-	@echo "no tests available"
-
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/squid/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability .\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.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	web/proxy/squid \
-=\
-Interface Stability	Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-Source for squid is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/components/squid/squid.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/squid/squid.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,6 +20,8 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/web/proxy/squid@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -29,6 +31,8 @@
     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.squid-cache.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/LSARC/2009/130
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/squid
@@ -85,12 +89,16 @@
 dir path=var/squid
 dir path=var/squid/cache
 dir path=var/squid/logs
-file path=etc/squid/cachemgr.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/cachemgr.conf
-file path=etc/squid/mime.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/mime.conf
-file path=etc/squid/mime.conf.default 
-file path=etc/squid/msntauth.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/msntauth.conf
+file path=etc/squid/cachemgr.conf group=sys mode=0644 \
+    original_name=SUNWsquid:etc/squid/cachemgr.conf preserve=renamenew
+file path=etc/squid/mime.conf group=sys mode=0644 \
+    original_name=SUNWsquid:etc/squid/mime.conf preserve=renamenew
+file path=etc/squid/mime.conf.default
+file path=etc/squid/msntauth.conf group=sys mode=0644 \
+    original_name=SUNWsquid:etc/squid/msntauth.conf preserve=renamenew
 file path=etc/squid/msntauth.conf.default
-file path=etc/squid/squid.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/squid.conf
+file path=etc/squid/squid.conf group=sys mode=0644 \
+    original_name=SUNWsquid:etc/squid/squid.conf preserve=renamenew
 file path=etc/squid/squid.conf.default
 file http-squid.xml path=lib/svc/manifest/network/http-squid.xml
 file http-squid path=lib/svc/method/http-squid
--- a/components/swig/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/swig/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -40,19 +40,13 @@
 CCFLAGS +=	$(CFLAGS) -norunpath
 CONFIGURE_OPTIONS +=	CXXFLAGS="$(CCFLAGS)"
 
-PKG_PROTO_DIRS +=	$(COMPONENT_DIR) \
-	$(COMPONENT_DIR)/$(COMPONENT_SRC)
-
 # common targets
 build:		$(BUILD_32)
 
-include ../../make-rules/shared-targets.mk
-
 install:	$(INSTALL_32)
 
 # Fails due to deprecated OCAML example and boost library problems
-test:	build
-	@cd $(BUILD_DIR_32); $(MAKE) check
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/swig/swig.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/swig/swig.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,10 +1,3 @@
-'\" t
-.\"
-.\" Modified for Solaris to to add the Solaris stability classification,
-.\" and to add a note about source availability.
-.\" 
-.\"
-.\" 
 .\"
 .\" generic swig man page for the swig Project
 .br
@@ -67,23 +60,3 @@
 \fBswig\fR was originally written by Dave Beazley, and is now maintained and developed by an team of developers see: http://www.swig.org/guilty.html.  Further details are available at \fIhttp://www.swig.org/index.html\fR.  swig is released under the \fIswig License\fR.
 .LP
 
-.\" Begin Oracle update
-.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	developer/swig 
-=
-Interface Stability	Volatile 
-.TE 
-.PP
-.SH NOTES
-Source for swig is available on http://opensolaris.org.
-.\" End Oracle update
--- a/components/swig/swig.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/swig/swig.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,6 +21,7 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/developer/swig@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Simplified and Interface Generator (swig)"
@@ -28,6 +29,8 @@
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.swig.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/475
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/tcl/tcl/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcl/tcl/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -57,6 +57,8 @@
 CONFIGURE_OPTIONS	+= --enable-threads
 CONFIGURE_OPTIONS.64	+= --enable-64bit
 
+COMPONENT_TEST_TARGETS = test
+
 # common targets
 build:		$(BUILD_32_and_64)
 
@@ -66,10 +68,7 @@
 		$(MV) $(PROTOUSRLIBDIR)/tclConfig.sh.new $(PROTOUSRLIBDIR)/tclConfig.sh
 		$(CHMOD) 555 $(PROTOUSRLIBDIR)/tclConfig.sh
 
-test: 		build
-		@cd $(BUILD_DIR_32); $(MAKE) test
-		@cd $(BUILD_DIR_64); $(MAKE) test
-
+test: 		$(TEST_32_and_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/tcl/tcl/files/libtcl.3	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcl/tcl/files/libtcl.3	Wed Apr 13 09:58:06 2011 -0700
@@ -33,23 +33,3 @@
 /usr/lib/libtclstub8.4.a 
 stubs library
 .PD
-.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	runtime/tcl-8
-=
-Interface Stability	Uncommitted
-.TE
-.SH "SEE ALSO"
-libtk(3)
-.SH NOTES
-Source for Tcl is available on http://opensolaris.org.
-
--- a/components/tcl/tcl/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-#
-# 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) 2010, 2011 Oracle and/or its affiliates. All rights reserved.
-#
-#
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to change section headings where applicable \
-\.\\" to align with Solaris man page directories, as well as to add the \
-\.\\" Solaris stability classification, and to add a note about source \
-\.\\" availability .\
-\.\\"\ 
-/^\.TH/ s/ 3 / 3TCL /g
-/^\.TH/ s/ n / 1T /g
-s/(3)/(3TCL)/g
-s/(n)/(1T)/g
-$a\
-\.\\" Begin Oracle update\
-.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	runtime/tcl-8\
-=\
-Interface Stability	Uncommitted\
-.TE \
-.PP\
-.SH NOTES\
-Source for Tcl is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/tcl/tcl/patches/1.man.patch	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcl/tcl/patches/1.man.patch	Wed Apr 13 09:58:06 2011 -0700
@@ -9,11 +9,3 @@
  SRCDIR=`dirname $MANPAGE`
  FIRST=""
  for f in $NAMES; do
-@@ -57,6 +57,7 @@
- 	FIRST=$f
- 	rm -f $DIR/$FIRST $DIR/$FIRST.*
- 	sed -e "/man\.macros/r $SRCDIR/man.macros" -e "/man\.macros/d" \
-+	    -f ../../oracleman-stability \
- 	    $MANPAGE > $DIR/$FIRST
- 	chmod 444 $DIR/$FIRST
- 	$ZIP $DIR/$FIRST
--- a/components/tcl/tcl/tcl.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcl/tcl/tcl.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/runtime/tcl-8@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description \
@@ -29,14 +30,15 @@
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://prdownloads.sourceforge.net/tcl/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/317
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
-dir path=usr/bin/$(MACH64) 
+dir path=usr/bin/$(MACH64)
 dir path=usr/include
 dir path=usr/lib
-dir path=usr/lib/$(MACH64) 	
+dir path=usr/lib/$(MACH64)
 dir path=usr/lib/tcl8.4
 dir path=usr/lib/tcl8.4/encoding
 dir path=usr/lib/tcl8.4/http1.0
@@ -353,6 +355,9 @@
 file path=usr/share/man/man3tcl/Tcl_UniCharToUpper.3tcl
 file path=usr/share/man/man3tcl/Tcl_UpVar.3tcl
 file path=usr/share/man/man3tcl/Tcl_WrongNumArgs.3tcl
+legacy pkg=SUNWTcl desc="Tcl - Tool Command Language (8.4.18)" \
+    name="Tcl - Tool Command Language "
+license tcl.license license=BSD-like
 link path=usr/bin/$(MACH64)/tclsh target=tclsh8.4
 link path=usr/bin/tclsh target=tclsh8.4
 link path=usr/share/man/man1t/auto_import.1t target=auto_execok.1t
@@ -1070,10 +1075,4 @@
 link path=usr/share/man/man3tcl/panic.3tcl target=Tcl_Panic.3tcl
 link path=usr/share/man/man3tcl/panicVA.3tcl target=Tcl_Panic.3tcl
 
-license tcl.license license=BSD-like
 
-legacy pkg=SUNWTcl \
-    name="Tcl - Tool Command Language " \
-    desc="Tcl - Tool Command Language (8.4.18)"
-
-
--- a/components/tcpdump/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcpdump/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -43,9 +43,7 @@
 
 install:        $(INSTALL_32) 
 
-test:
-	@echo "no tests available"
-
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
--- a/components/tcpdump/tcpdump.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcpdump/tcpdump.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,26 +20,28 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/diagnostic/tcpdump@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/diagnostic/tcpdump@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="A tool for network monitoring and data acquisition"
 set name=pkg.summary value="network traffic sniffer"
-set name=pkg.description value="A tool for network monitoring and data acquisition"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=http://www.tcpdump.org
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/147
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/sbin
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=usr/sbin/tcpdump 
-file path=usr/share/man/man1/tcpdump.1 
-
-license tcpdump.license license="BSD"
-
-legacy  pkg=SUNWtcpdump \
-	name="tcpdump - network traffic sniffer" \
-	desc="tcpdump - A tool for network monitoring and data acquisition 4.1.1"
-
-
+file path=usr/sbin/tcpdump
+file path=usr/share/man/man1/tcpdump.1
+legacy pkg=SUNWtcpdump \
+    desc="tcpdump - A tool for network monitoring and data acquisition 4.1.1" \
+    name="tcpdump - network traffic sniffer"
+license tcpdump.license license=BSD
--- a/components/tcsh/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcsh/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -52,34 +52,13 @@
 CONFIGURE_OPTIONS  +=		--localedir=$(CONFIGURE_LOCALEDIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 
-MAN1FILES= tcsh.1
-
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) install-locales $(PROTOMAN1FILES)
-
-# we don't agree on locale names
-install-locales:
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/et.cat $(LOCALEDIR)/et/LC_MESSAGES/tcsh.cat 
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/finnish.cat $(LOCALEDIR)/fi/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/french.cat $(LOCALEDIR)/fr/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/german.cat $(LOCALEDIR)/de/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/greek.cat $(LOCALEDIR)/el/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/italian.cat $(LOCALEDIR)/it/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/ja.cat $(LOCALEDIR)/ja/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/pl.cat $(LOCALEDIR)/pl/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/russian.cat $(LOCALEDIR)/ru/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/spanish.cat $(LOCALEDIR)/es/LC_MESSAGES/tcsh.cat
-	$(INSTALL) -D $(BUILD_DIR_32)/nls/ukrainian.cat $(LOCALEDIR)/uk/LC_MESSAGES/tcsh.cat
-
+install:	$(INSTALL_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-# they don't seem quite doable for us
-test: 
-	@echo "no tests available"
+test: 		$(NO_TESTS)
 
 include ../../make-rules/depend.mk
--- a/components/tcsh/manpages/tcsh.1	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcsh/manpages/tcsh.1	Wed Apr 13 09:58:06 2011 -0700
@@ -1,4 +1,3 @@
-'\" t
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -5271,24 +5270,7 @@
 .PP
 Richard M. Alderson III, for writing the `T in tcsh' section
 
-.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	shell/tcsh
-=
-Interface Stability	Volatile
-.TE 
-
 .SH "NOTES"
-Source for tcsh is available on http://opensolaris.org.
 .PP
 It is no longer possible for variables to have a '-' or a '=' within the
 name. Any variables of this form will generate a 'setenv: Syntax error'
--- a/components/tcsh/tcsh.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tcsh/tcsh.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,16 +21,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/shell/tcsh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/shell/tcsh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="C shell with file name completion and command line editing"
 set name=pkg.summary value="Tenex C-shell (tcsh)"
-set name=pkg.description value="C shell with file name completion and command line editing"
-set name=info.classification value="org.opensolaris.category.2008:System/Shells"
-set name=info.upstream_url value="http://www.tcsh.org"
+set name=info.classification value=org.opensolaris.category.2008:System/Shells
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.tcsh.org
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license tcsh.license license='BSD'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -60,20 +62,19 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 file path=usr/bin/tcsh
-file path=usr/share/locale/de/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/el/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/es/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/et/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/fi/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/fr/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/it/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/ja/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/pl/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
-file path=usr/share/locale/uk/LC_MESSAGES/tcsh.cat
-file path=usr/share/man/man1/tcsh.1
+file $(MACH32)/nls/german.cat path=usr/share/locale/de/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/greek.cat path=usr/share/locale/el/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/spanish.cat path=usr/share/locale/es/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/et.cat path=usr/share/locale/et/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/finnish.cat path=usr/share/locale/fi/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/french.cat path=usr/share/locale/fr/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/italian.cat path=usr/share/locale/it/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/ja.cat path=usr/share/locale/ja/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/pl.cat path=usr/share/locale/pl/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/russian.cat path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
+file $(MACH32)/nls/ukrainian.cat path=usr/share/locale/uk/LC_MESSAGES/tcsh.cat
+file manpages/tcsh.1 path=usr/share/man/man1/tcsh.1
+legacy pkg=SUNWtcsh desc="Tenex C-shell (tcsh) 6.17.00" \
+    name="Tenex C-shell (tcsh)"
+license tcsh.license license=BSD
 
-legacy	pkg=SUNWtcsh \
-	name="Tenex C-shell (tcsh)" \
-	desc="Tenex C-shell (tcsh) 6.17.00"
-
--- a/components/tomcat/tomcat-examples.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tomcat/tomcat-examples.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -22,14 +22,17 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-
-set name=pkg.fmri value=pkg:/web/java-servlet/tomcat/tomcat-examples@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Tomcat Servlet/JSP Container - example applications"
-set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+set name=pkg.fmri \
+    value=pkg:/web/java-servlet/tomcat/tomcat-examples@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Tomcat Servlet/JSP Container - example applications"
+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://tomcat.apache.org
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/711
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=var
 dir path=var/tomcat6
 dir path=var/tomcat6/webapps group=webservd owner=webservd
@@ -108,16 +111,25 @@
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings.properties
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_en.properties
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_es.properties
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_fr.properties
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/LocalStrings_pt.properties
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestHeaderExample.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestInfoExample.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/RequestParamExample.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/SessionExample.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/Entries.class
@@ -128,73 +140,124 @@
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/JspCalendar.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/cal/TableBean.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet$MessageSender.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/chat/ChatServlet.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/checkbox/CheckTest.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/colors/ColorGameBean.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilter.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/dates/JspCalendar.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/error/Smart.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/LogTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/examples/ShowSource.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/BookBean.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/FooBean.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/ContextListener.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/listeners/SessionListener.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/num/NumberGuessBean.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/servletToJsp.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/sessions/DummyCart.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/util/HTMLFilter.java
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
-file path=var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.class
+file \
+    path=var/tomcat6/webapps/examples/WEB-INF/classes/validators/DebugValidator.java
 file path=var/tomcat6/webapps/examples/WEB-INF/jsp/applet/Clock2.java
 file path=var/tomcat6/webapps/examples/WEB-INF/jsp/debug-taglib.tld
 file path=var/tomcat6/webapps/examples/WEB-INF/jsp/example-taglib.tld
@@ -273,12 +336,16 @@
 file path=var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
 file path=var/tomcat6/webapps/examples/jsp/jsp2/el/implicit-objects.jsp.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/FooBean.java.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/HelloWorldSimpleTag.java.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/ShuffleSimpleTag.java.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/TileSimpleTag.java.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp
-file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/jspattribute.jsp.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspattribute/shuffle.jsp.html
@@ -290,7 +357,8 @@
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jpg
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx
 file path=var/tomcat6/webapps/examples/jsp/jsp2/jspx/textRotate.jspx.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/misc/EchoAttributesTag.java.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf
 file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/coda.jspf.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/config.html
@@ -302,10 +370,13 @@
 file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf
 file path=var/tomcat6/webapps/examples/jsp/jsp2/misc/prelude.jspf.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/BookBean.java.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/FindBookSimpleTag.java.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/Functions.java.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/HelloWorldSimpleTag.java.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/RepeatSimpleTag.java.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/book.jsp.html
@@ -315,7 +386,8 @@
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
 file path=var/tomcat6/webapps/examples/jsp/jsp2/simpletag/repeat.jsp.html
-file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html
+file \
+    path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/displayProducts.tag.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.html
 file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp
 file path=var/tomcat6/webapps/examples/jsp/jsp2/tagfiles/hello.jsp.html
@@ -385,11 +457,11 @@
 file path=var/tomcat6/webapps/examples/servlets/reqinfo.html
 file path=var/tomcat6/webapps/examples/servlets/reqparams.html
 file path=var/tomcat6/webapps/examples/servlets/sessions.html
-link path=var/tomcat6/webapps/docs target=../../../usr/tomcat6/docs pkg.linted=true
+legacy pkg=SUNWtcat-examples \
+    desc="Tomcat Servlet/JSP Container - example applications" \
+    name="Tomcat Servlet/JSP Container - example applications"
 
 
 license tomcat.license license="Apache v2.0"
-
-legacy	pkg=SUNWtcat-examples \
-	name="Tomcat Servlet/JSP Container - example applications" \
-	desc="Tomcat Servlet/JSP Container - example applications"
+link path=var/tomcat6/webapps/docs pkg.linted=true \
+    target=../../../usr/tomcat6/docs
--- a/components/tomcat/tomcat.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/tomcat/tomcat.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -23,13 +23,17 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/web/java-servlet/tomcat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/web/java-servlet/tomcat@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Tomcat Servlet/JSP Container"
-set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
+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://tomcat.apache.org
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/711
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=etc
 dir path=lib
 dir path=lib/svc
@@ -226,7 +230,8 @@
 file path=var/tomcat6/conf/context.xml mode=0644 preserve=renamenew
 file path=var/tomcat6/conf/logging.properties mode=0644 preserve=renamenew
 file path=var/tomcat6/conf/server.xml mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/tomcat-users.xml group=webservd owner=webservd mode=0600 preserve=renamenew
+file path=var/tomcat6/conf/tomcat-users.xml group=webservd mode=0600 \
+    owner=webservd preserve=renamenew
 file path=var/tomcat6/conf/web.xml mode=0644 preserve=renamenew
 file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 preserve=renamenew
 file path=var/tomcat6/webapps/host-manager/META-INF/context.xml
@@ -257,11 +262,9 @@
 file path=var/tomcat6/webapps/manager/images/void.gif
 file path=var/tomcat6/webapps/manager/status.xsd
 file path=var/tomcat6/webapps/manager/xform.xsl
-link path=etc/tomcat6 target=../var/tomcat6/conf
+legacy pkg=SUNWtcat desc="Tomcat Servlet/JSP Container" \
+    name="Tomcat Servlet/JSP Container"
 
 
 license tomcat.license license="Apache v2.0"
-
-legacy	pkg=SUNWtcat \
-	name="Tomcat Servlet/JSP Container" \
-	desc="Tomcat Servlet/JSP Container"
+link path=etc/tomcat6 target=../var/tomcat6/conf
--- a/components/top/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/top/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -47,7 +47,6 @@
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test:
-	@echo "no test available"
+test:		$(NO_TOOLS)
 
 include ../../make-rules/depend.mk
--- a/components/top/top.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/top/top.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,13 +21,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/diagnostic/top@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="provides a rolling display of top cpu using processes"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://www.unixtop.org/"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/diagnostic/top@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="provides a rolling display of top cpu using processes"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.unixtop.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2008/533
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/bin/$(MACH32)
@@ -37,12 +42,9 @@
 dir path=usr/share/man/man1
 file usr/bin/top path=usr/bin/$(MACH32)/top
 file path=usr/bin/$(MACH64)/top
-hardlink path=usr/bin/top target=../lib/isaexec pkg.linted=true
 file path=usr/share/man/man1/top.1
-
-license top.license license='BSD, Apachev2.0'
+hardlink path=usr/bin/top pkg.linted=true target=../lib/isaexec
+legacy pkg=SUNWtop desc="top - 3.8beta1" \
+    name="top - provides a rolling display of top cpu using processes"
+license top.license license="BSD, Apachev2.0"
 
-legacy pkg=SUNWtop \
-	name="top - provides a rolling display of top cpu using processes" \
-	desc="top - 3.8beta1"
-
--- a/components/wget/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/wget/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -42,16 +42,11 @@
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 CONFIGURE_OPTIONS +=	PATH="$(PATH):/usr/perl5/bin"
 
-SFWPROGS =	wget
-
-include ../../make-rules/shared-targets.mk
-
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) $(PROTOSFWLINKS)
+install:	$(INSTALL_32)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/wget/wget.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/wget/wget.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,14 +20,20 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/web/wget@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/web/wget@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="GNU wget - a utility to retrieve files from the World Wide Web"
 set name=pkg.summary value="wget - GNU wget"
-set name=pkg.description value="GNU wget - a utility to retrieve files from the World Wide Web"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url value="http://www.gnu.org/software/wget/"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.gnu.org/software/wget/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=etc
 dir path=usr
 dir path=usr/bin
@@ -122,7 +128,8 @@
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file path=etc/wgetrc mode=0644 group=sys preserve=renamenew original_name=SUNWwget:etc/wgetrc
+file path=etc/wgetrc group=sys mode=0644 original_name=SUNWwget:etc/wgetrc \
+    preserve=renamenew
 file path=usr/bin/wget
 file path=usr/share/info/wget.info
 file path=usr/share/locale/be/LC_MESSAGES/wget.mo
@@ -168,11 +175,10 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/wget.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/wget.mo
 file path=usr/share/man/man1/wget.1
-link path=usr/sfw/bin/wget target=../../bin/wget
+legacy pkg=SUNWwget \
+    desc="GNU wget - a utility to retrieve files from the World Wide Web 1.12" \
+    name="wget - GNU wget"
 
 
-license wget.license license="GPLv3"
-
-legacy	pkg=SUNWwget \
-	name="wget - GNU wget" \
-	desc="GNU wget - a utility to retrieve files from the World Wide Web 1.12"
+license wget.license license=GPLv3
+link path=usr/sfw/bin/wget target=../../bin/wget
--- a/components/which/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/which/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -43,12 +43,9 @@
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)
-	sed -f oracleman-stability $(COMPONENT_SRC)/which.1 > \
-				   $(PROTO_DIR)/$(GNUSHAREMAN1)/which.1
+
+test:		$(TEST_32)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-test: build
-	@cd $(BUILD_DIR_32); $(MAKE) check
-
 include ../../make-rules/depend.mk
--- a/components/which/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Oracle update\
-.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	shell/which \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for GNU which is available on http://opensolaris.org.\
-\.\\" End Oracle update
--- a/components/which/which.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/which/which.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -20,13 +20,19 @@
 #
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
-set name=pkg.fmri value=pkg:/shell/which@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# PSARC/2007/049
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/shell/which@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU which"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://www.xs4all.nl/~carlo17/which/"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.xs4all.nl/~carlo17/which/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/049
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/gnu
 dir path=usr/gnu/bin
@@ -38,9 +44,5 @@
 file path=usr/gnu/bin/which
 file path=usr/gnu/share/man/man1/which.1
 file path=usr/share/info/which.info
-
-license which.license license="GPLv2"
-
-legacy	pkg=SUNWgnu-which \
-	name="GNU which" \
-	desc="GNU which utility (2.16)"
+legacy pkg=SUNWgnu-which desc="GNU which utility (2.16)" name="GNU which"
+license which.license license=GPLv2
--- a/components/wireshark/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/wireshark/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -48,8 +48,7 @@
 
 install:	$(INSTALL_32)
 
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/wireshark/wireshark.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/wireshark/wireshark.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:/diagnostic/wireshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Wireshark - Network protocol analyzer"
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/diagnostic/wireshark@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="Wireshark - Network protocol analyzer (1.4.2)"
-set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url value="http://www.wireshark.org/"
+set name=pkg.summary value="Wireshark - Network protocol analyzer"
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.wireshark.org/
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=etc
 dir path=etc/security
 dir path=etc/security/exec_attr.d
@@ -81,7 +86,8 @@
 file path=usr/sbin/text2pcap
 file path=usr/sbin/tshark
 file path=usr/sbin/wireshark
-file wireshark-$(IPS_COMPONENT_VERSION)/wireshark.desktop path=usr/share/applications/wireshark.desktop
+file wireshark-$(IPS_COMPONENT_VERSION)/wireshark.desktop \
+    path=usr/share/applications/wireshark.desktop
 file path=usr/share/man/man1/capinfos.1
 file path=usr/share/man/man1/dumpcap.1
 file path=usr/share/man/man1/editcap.1
@@ -91,7 +97,8 @@
 file path=usr/share/man/man1/tshark.1
 file path=usr/share/man/man1/wireshark.1
 file path=usr/share/man/man4/wireshark-filter.4
-file wireshark-$(IPS_COMPONENT_VERSION)/image/wsicon64.png path=usr/share/pixmaps/wireshark.png
+file wireshark-$(IPS_COMPONENT_VERSION)/image/wsicon64.png \
+    path=usr/share/pixmaps/wireshark.png
 file path=usr/share/wireshark/AUTHORS-SHORT
 file path=usr/share/wireshark/COPYING
 file path=usr/share/wireshark/capinfos.html
@@ -284,16 +291,14 @@
 file path=usr/share/wireshark/wireshark-filter.html
 file path=usr/share/wireshark/wireshark.html
 file path=usr/share/wireshark/ws.css
+legacy pkg=SUNWwireshark desc="Wireshark - Network protocol analyzer" \
+    name="Wireshark - Network protocol analyzer"
+
+
+license wireshark.license license=GPLv3
 link path=usr/lib/libwireshark.so target=libwireshark.so.0.0.1
 link path=usr/lib/libwireshark.so.0 target=libwireshark.so.0.0.1
 link path=usr/lib/libwiretap.so target=libwiretap.so.0.0.1
 link path=usr/lib/libwiretap.so.0 target=libwiretap.so.0.0.1
 link path=usr/lib/libwsutil.so target=libwsutil.so.0.0.0
 link path=usr/lib/libwsutil.so.0 target=libwsutil.so.0.0.0
-
-
-license wireshark.license license="GPLv3"
-
-legacy	pkg=SUNWwireshark \
-	name="Wireshark - Network protocol analyzer" \
-	desc="Wireshark - Network protocol analyzer"
--- a/components/zip/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/zip/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -47,30 +47,12 @@
 COMPONENT_INSTALL_ARGS += BINDIR=$(PROTOUSRBINDIR)
 COMPONENT_INSTALL_ARGS += MANDIR=$(PROTOUSRSHAREMAN1DIR)
 
-# fix the man pages
-INST_MAN1PGS = zip zipcloak zipnote zipsplit
-INST_MANSCRIPT = oracleman-stability
-PROTOMAN1 = $(INST_MAN1PGS:%=$(PROTOUSRSHAREMAN1DIR)/%.1)
-
-# Manpage files are already created by INSTALL_32 target
-# so currently only the contents of files could be changed.
-$(PROTOMAN1):	$(INST_MAN1PGS:%=$(SOURCE_DIR)/man/%.1)
-	sed -f $(INST_MANSCRIPT) < $(SOURCE_DIR)/man/$(@F) > $@
-
-# It should be done without checking time-stamps of targets.
-.PHONY: $(PROTOMAN1)
-
-# But do no do it before the INSTALL_32 is really finished.
-$(INST_MAN1PGS:%=$(SOURCE_DIR)/man/%.1):	$(INSTALL_32)
-
 # common targets
-
 build:		$(BUILD_32)
 
-install:	$(INSTALL_32) $(PROTOMAN1)
+install:	$(INSTALL_32)
 
-test:
-	@echo "no tests available"
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/zip/oracleman-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-/^\.TH/ s/ 1L / 1 /g
-s/(1L)/(1)/g
-$a\
-\.\\" Begin Oracle update\
-.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/zip\
-=\
-Interface Stability	External\
-.TE \
-.PP\
-.SH NOTES\
-Sources to build zip on Solaris are available on http://opensolaris.org. \
-As Info-ZIP license mentions there are no Solaris speciffic source patches needed for build.\
-\.\\" End Oracle update
--- a/components/zip/zip.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/zip/zip.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -21,14 +21,18 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/compress/zip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Info-Zip (zip)"
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/compress/zip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="The Info-Zip (zip) compression utility"
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value=http://www.info-zip.org/Zip.html
+set name=pkg.summary value="Info-Zip (zip)"
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.info-zip.org/Zip.html
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
@@ -42,9 +46,6 @@
 file path=usr/share/man/man1/zipcloak.1
 file path=usr/share/man/man1/zipnote.1
 file path=usr/share/man/man1/zipsplit.1
-
-license info-zip.license license="Info-ZIP"
-
-legacy	pkg=SUNWzip \
-	name="The Info-Zip (zip) compression utility" \
-	desc="The Info-Zip (zip) compression utility"
+legacy pkg=SUNWzip desc="The Info-Zip (zip) compression utility" \
+    name="The Info-Zip (zip) compression utility"
+license info-zip.license license=Info-ZIP
--- a/components/zsh/Makefile	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/zsh/Makefile	Wed Apr 13 09:58:06 2011 -0700
@@ -88,7 +88,7 @@
 install:	build $(INSTALL_32) $(PROTOETCDIR)/zprofile $(PROTOETCDIR)/zshrc license
 
 # build does this always
-test:
+test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
--- a/components/zsh/zsh.p5m	Wed Apr 13 10:10:46 2011 -0600
+++ b/components/zsh/zsh.p5m	Wed Apr 13 09:58:06 2011 -0700
@@ -22,15 +22,19 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/shell/zsh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/shell/zsh@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="The Z Shell (zsh) is a Bourne-like shell designed for interactive use, although it is also a powerful scripting language.  Many of the useful features of bash, ksh, and tcsh were incorporated into zsh, but many original features were added."
 set name=pkg.summary value="Z Shell (zsh)"
-set name=pkg.description value="The Z Shell (zsh) is a Bourne-like shell designed for interactive use, although it is also a powerful scripting language.  Many of the useful features of bash, ksh, and tcsh were incorporated into zsh, but many original features were added."
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Zsh Development Group <[email protected]>"
 set name=info.upstream_url value=http://www.zsh.org/
-set name=info.upstream value="Zsh Development Group <[email protected]>"
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2007/533
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
 dir path=usr/lib/zsh
 dir path=usr/lib/zsh/$(COMPONENT_VERSION)
 dir path=usr/lib/zsh/$(COMPONENT_VERSION)/zsh
@@ -121,348 +125,552 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_add
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_edit
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_lockfiles
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_lockfiles
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_parse
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_read
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_scandate
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_scandate
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_show
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_showdate
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_showdate
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Calendar/calendar_sort
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_floppy
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_logical_volumes
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_logical_volumes
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_lscfg
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_lsdev
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_lslv
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_lspv
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_lsvg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_object_classes
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_physical_volumes
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_object_classes
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_physical_volumes
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_smit
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_volume_groups
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/AIX/_volume_groups
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_bsd_pkg
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_chflags
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_csup
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_cvsup
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_fetch
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_freebsd-update
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_freebsd-update
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_kld
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_portaudit
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_portlint
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_portsnap
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_portaudit
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_portlint
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_portsnap
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/BSD/_powerd
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_all_labels
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_all_matches
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_alternative
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_approximate
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_arg_compile
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_arguments
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_bash_completions
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_cache_invalid
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_call_function
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_call_program
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_combination
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete_debug
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete_help
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_all_labels
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_all_matches
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_alternative
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_approximate
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_arg_compile
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_arguments
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_bash_completions
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_cache_invalid
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_call_function
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_call_program
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_combination
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete_debug
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete_help
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete_help_generic
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete_tag
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_correct
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_correct_filename
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_correct_word
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_describe
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_description
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_dispatch
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_complete_tag
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_correct
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_correct_filename
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_correct_word
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_describe
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_description
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_dispatch
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_expand
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_expand_alias
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_expand_word
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_generic
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_expand_alias
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_expand_word
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_generic
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_guard
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_history
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_history
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_history_complete_word
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_ignored
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_ignored
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_list
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_main_complete
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_main_complete
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_match
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_menu
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_message
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_most_recent_file
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_multi_parts
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_next_label
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_next_tags
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_message
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_most_recent_file
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_multi_parts
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_next_label
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_next_tags
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_normal
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_nothing
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_oldlist
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_pick_variant
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_nothing
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_oldlist
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_pick_variant
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_prefix
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_read_comp
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_regex_arguments
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_regex_words
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_requested
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_retrieve_cache
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_sep_parts
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_set_command
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_read_comp
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_regex_arguments
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_regex_words
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_requested
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_retrieve_cache
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_sep_parts
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_set_command
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_store_cache
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_sub_commands
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_store_cache
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_sub_commands
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_tags
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_user_expand
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_user_expand
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_values
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Base/_wanted
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygcheck
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygpath
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygrunsrv
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygserver
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygstart
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_dumper
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_getclip
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_mkshortcut
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_mkzsh
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygcheck
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygpath
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygrunsrv
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygserver
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_cygstart
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_dumper
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_getclip
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_mkshortcut
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_mkzsh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_pscp
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_putclip
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_readshortcut
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_defaults
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_putclip
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Cygwin/_readshortcut
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_defaults
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_fink
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_hdiutil
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_mac_applications
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_hdiutil
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_mac_applications
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_mac_files_for_application
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_open
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_qtplay
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_retrieve_mac_apps
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_softwareupdate
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_a2utils
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_qtplay
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_retrieve_mac_apps
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Darwin/_softwareupdate
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_a2utils
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt-file
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt-move
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt-show-versions
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_aptitude
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_auto-apt
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt-file
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt-move
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_apt-show-versions
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_aptitude
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_auto-apt
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_bts
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_bug
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_cdbs-edit-patch
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_cdbs-edit-patch
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dak
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dchroot
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dchroot-dsa
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_deb_packages
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debchange
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debdiff
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debfoster
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debsign
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dlocate
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpatch-edit-patch
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dchroot
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dchroot-dsa
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_deb_packages
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debchange
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debdiff
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debfoster
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_debsign
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dlocate
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpatch-edit-patch
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg-buildpackage
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg-cross
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg-repack
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg_source
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg-buildpackage
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg-cross
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg-repack
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dpkg_source
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dput
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dupload
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_grep-excuses
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_invoke-rc.d
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_lighttpd
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_linda
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_lintian
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_madison
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_make-kpkg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_members
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_mergechanges
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_module-assistant
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_piuparts
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_reprepro
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_schroot
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_svn-buildpackage
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_toolchain-source
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_dupload
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_grep-excuses
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_invoke-rc.d
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_lighttpd
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_linda
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_lintian
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_madison
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_make-kpkg
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_members
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_mergechanges
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_module-assistant
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_piuparts
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_reprepro
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_schroot
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_svn-buildpackage
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_toolchain-source
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_update-alternatives
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_update-rc.d
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_uscan
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_vim-addons
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_wajig
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_wanna-build
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_update-rc.d
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_uscan
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_vim-addons
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_wajig
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Debian/_wanna-build
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_acpi
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_acpitool
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_analyseplugin
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_acpitool
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_analyseplugin
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_brctl
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_chrt
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_ethtool
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_fuse_arguments
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_fuse_values
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_fusermount
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_ionice
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_ethtool
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_fuse_arguments
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_fuse_values
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_fusermount
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_ionice
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_ipset
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_iptables
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_iwconfig
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_losetup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_iptables
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_iwconfig
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_losetup
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_lsusb
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_mdadm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_mii-tool
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_modutils
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_mii-tool
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_modutils
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_mondo
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_pkgtool
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_rpmbuild
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_pkgtool
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_rpmbuild
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_sshfs
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_strace
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_strace
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_tpb
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_tpconfig
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_tune2fs
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_tpconfig
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_tune2fs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_uml
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_valgrind
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_vserver
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_valgrind
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_vserver
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_wakeup_capable_devices
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Linux/_yast
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Mandriva/_rebootin
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Mandriva/_urpmi
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Mandriva/_rebootin
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Mandriva/_urpmi
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Redhat/_rpm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Redhat/_service
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Redhat/_service
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Redhat/_yum
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_coreadm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_dhcpinfo
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_dladm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_dumpadm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_flowadm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_gcore
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_inetadm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_netstat
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_pfexec
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_pkg5
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_prstat
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_coreadm
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_dhcpinfo
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_dladm
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_dumpadm
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_flowadm
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_gcore
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_inetadm
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_netstat
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_pfexec
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_pkg5
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_prstat
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_ps
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_ptree
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_savecore
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_snoop
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcadm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svccfg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcprop
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcs
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcs_fmri
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_zlogin
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_ptree
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_savecore
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_snoop
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcadm
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svccfg
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcprop
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcs
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_svcs_fmri
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Solaris/_zlogin
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_a2ps
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_aap
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ant
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_antiword
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_apachectl
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_antiword
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_apachectl
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_apm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_arch_archives
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_arch_namespace
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_arch_archives
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_arch_namespace
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_arp
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_arping
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_attr
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_awk
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_baz
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bind_addresses
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bind_addresses
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bison
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bittorrent
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bogofilter
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bittorrent
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bogofilter
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bzip2
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_bzr
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cal
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_calendar
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_canonical_paths
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_calendar
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_canonical_paths
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ccal
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cdcd
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cdrdao
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cdrecord
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chkconfig
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cdrecord
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chkconfig
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chmod
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_chown
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_comm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_compress
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_configure
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_compress
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_configure
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cowsay
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cp
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cpio
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cplay
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cssh
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ctags_tags
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ctags_tags
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cut
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_cvs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_darcs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_date
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dd
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_devtodo
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dhclient
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_devtodo
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dhclient
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dict
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dict_words
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dict_words
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_diff
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_diff_options
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_diffstat
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dir_list
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_directories
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_diff_options
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_diffstat
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dir_list
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_directories
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_django
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dmidecode
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_domains
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dmidecode
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_domains
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_du
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_dvi
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ecasound
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ecasound
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_elinks
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_elm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_email_addresses
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_enscript
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_email_addresses
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_enscript
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_env
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fakeroot
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fetchmail
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fakeroot
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fetchmail
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_figlet
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_file_systems
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_file_systems
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_files
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_find
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_finger
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_flasher
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_flasher
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_flex
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fortune
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fortune
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fsh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_fuser
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gcc
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gdb
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_genisoimage
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_getconf
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_genisoimage
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_getconf
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_getent
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_getfacl
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_getmail
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_getfacl
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_getmail
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_git
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_global
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_global_tags
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gnu_generic
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_global_tags
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gnu_generic
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gnupod
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gnutls
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gpg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gphoto2
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gphoto2
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gprof
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_grep
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_groff
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_groups
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_growisofs
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_growisofs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_guilt
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_gzip
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_have_glob_qual
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_have_glob_qual
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_hosts
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_iconv
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_id
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ifconfig
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ifconfig
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_iftop
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_imagemagick
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_imagemagick
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_init_d
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ip
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_irssi
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ispell
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_java
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_java_class
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_java_class
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_joe
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_join
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_killall
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_killall
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_knock
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_kvno
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_last
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ld_debug
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ld_debug
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ldd
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_less
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_links
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_list_files
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_loadkeys
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_locales
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_list_files
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_loadkeys
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_locales
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_locate
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_look
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_lp
@@ -471,65 +679,90 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_lynx
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_lzop
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mail
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mailboxes
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mailboxes
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_make
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_man
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_md5sum
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mencal
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mercurial
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_metaflac
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mercurial
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_metaflac
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mh
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mime_types
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mime_types
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mkdir
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_module
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_monotone
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_monotone
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mount
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mpc
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mt
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mtools
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mtr
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mutt
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_my_accounts
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mysql_utils
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mysqldiff
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_my_accounts
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mysql_utils
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_mysqldiff
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ncftp
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_net_interfaces
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_net_interfaces
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_netcat
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_newsgroups
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_newsgroups
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_nice
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_nmap
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_nslookup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_other_accounts
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_nslookup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_other_accounts
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pack
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_patch
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_path_commands
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_path_files
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_path_commands
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_path_files
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pax
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pbm
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pdf
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perforce
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perforce
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perl
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perl_basepods
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perl_modules
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perldoc
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perl_basepods
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perl_modules
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_perldoc
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_php
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pids
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pine
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ping
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkg-config
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkg_instance
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkg-config
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkg_instance
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkgadd
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkginfo
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkginfo
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pkgrm
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pon
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ports
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_postfix
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_postfix
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_prcs
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_printenv
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_printers
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_printenv
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_printers
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ps
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pspdf
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_psutils
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_psutils
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pump
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_pydoc
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_python
@@ -544,79 +777,106 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ri
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_rlogin
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_rm
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_rrdtool
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_rrdtool
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_rsync
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_rubber
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ruby
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sablotron
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sablotron
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_samba
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sccs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_screen
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sed
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_services
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_setfacl
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_services
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_setfacl
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sh
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_showmount
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_signals
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_showmount
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_signals
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sisu
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_slrn
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_socket
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sort
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_spamassassin
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_spamassassin
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sqsh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_ssh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_stgit
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_strip
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_stty
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_su
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_subversion
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_subversion
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sudo
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_surfraw
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_surfraw
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_sysctl
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tar
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tar_archive
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tar_archive
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tardy
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tcpdump
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tcptraceroute
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tcpdump
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tcptraceroute
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_telnet
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_terminals
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_terminals
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tex
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_texi
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_texinfo
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_texinfo
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tidy
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tiff
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tilde_files
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_time_zone
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tilde_files
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_time_zone
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tin
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tla
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_todo.sh
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_todo.sh
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_toilet
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_topgit
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_totd
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tracepath
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_twisted
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_tracepath
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_twisted
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_unace
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_uname
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_unexpand
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_unexpand
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_uniq
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_units
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_urls
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_user_admin
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_user_at_host
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_user_admin
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_user_at_host
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_users
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_users_on
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_users_on
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_vim
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_vorbis
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_vorbiscomment
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_vorbiscomment
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_vux
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_w3m
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_webbrowser
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_webbrowser
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_wget
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_whereis
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_whereis
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_whois
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_wiggle
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_xargs
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_xmlsoft
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_xmlsoft
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_xmms2
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_yafc
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_yodl
@@ -624,8 +884,10 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zcat
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zdump
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zfs
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zfs_dataset
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zfs_pool
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zfs_dataset
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zfs_pool
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zip
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Unix/_zpool
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_acroread
@@ -643,21 +905,29 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_setxkbmap
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_urxvt
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_vnc
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_arguments
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_borderwidth
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_arguments
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_borderwidth
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_color
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_colormapid
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_colormapid
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_cursor
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_display
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_extension
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_extension
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_font
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_geometry
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_geometry
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_keysym
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_locale
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_modifier
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_modifier
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_name
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_resource
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_selection_timeout
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_resource
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_selection_timeout
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_title
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_utils
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_x_visual
@@ -665,14 +935,18 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xauth
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xdvi
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xfig
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xloadimage
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xloadimage
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xmodmap
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xpdf
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xrandr
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xscreensaver
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xscreensaver
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xset
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xt_arguments
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xt_session_id
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xt_arguments
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xt_session_id
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xterm
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xv
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/X/_xwit
@@ -682,16 +956,21 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_assign
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_autocd
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_bindkey
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_brace_parameter
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_brace_parameter
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_builtin
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_cd
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_command
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_command_names
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_command_names
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_compdef
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_condition
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_condition
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_default
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_delimiters
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_directory_stack
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_delimiters
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_directory_stack
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_dirs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_disable
 file \
@@ -702,18 +981,26 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_enable
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_equal
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_fc
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_file_descriptors
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_file_descriptors
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_first
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_functions
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_globflags
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_globqual_delims
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_globquals
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_functions
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_globflags
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_globqual_delims
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_globquals
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_hash
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_history_modifiers
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_in_vared
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_history_modifiers
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_in_vared
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_jobs
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_jobs_bg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_jobs_builtin
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_jobs_builtin
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_jobs_fg
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_kill
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_limit
@@ -721,22 +1008,30 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_math
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_mere
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_options
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_options_set
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_options_unset
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_parameter
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_parameters
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_precommand
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_options_set
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_options_unset
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_parameter
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_parameters
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_precommand
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_print
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_prompt
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_read
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_redirect
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_redirect
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_sched
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_set
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_setopt
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_source
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_stat
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_subscript
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_suffix_alias_files
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_subscript
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_suffix_alias_files
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_tcpsys
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_tilde
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_trap
@@ -744,19 +1039,23 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_typeset
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_ulimit
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_unhash
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_unsetopt
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_unsetopt
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_value
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_vared
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_vars
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_wait
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_which
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zattr
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zcalc_line
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zcompile
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zcalc_line
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zcompile
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zed
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zftp
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zle
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zmodload
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zmodload
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zmv
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zpty
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Completion/Zsh/_zstyle
@@ -796,24 +1095,42 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Misc/zmv
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Misc/zrecompile
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Misc/zstyle+
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Newuser/zsh-newuser-install
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_adam1_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_adam2_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_bart_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_bigfade_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_clint_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_elite2_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_elite_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_fade_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_fire_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_off_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_oliver_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_pws_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_redhat_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_special_chars
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_suse_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_walters_setup
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_zefram_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Newuser/zsh-newuser-install
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_adam1_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_adam2_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_bart_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_bigfade_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_clint_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_elite2_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_elite_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_fade_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_fire_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_off_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_oliver_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_pws_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_redhat_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_special_chars
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_suse_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_walters_setup
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/prompt_zefram_setup
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Prompts/promptinit
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/TCP/tcp_alias
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/TCP/tcp_close
@@ -833,18 +1150,28 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/TCP/tcp_spam
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/TCP/tcp_talk
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/TCP/tcp_wait
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_bzr
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_cdv
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_cvs
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_bzr
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_cdv
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_cvs
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_darcs
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_git
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_hg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_mtn
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_p4
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_svk
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_svn
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_tla
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_git
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_hg
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_mtn
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_p4
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_svk
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_svn
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_detect_tla
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_get_data_bzr
 file \
@@ -867,20 +1194,32 @@
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_get_data_svn
 file \
     path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/Backends/VCS_INFO_get_data_tla
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_adjust
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_bydir_detect
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_check_com
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_formats
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_get_cmd
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_maxexports
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_nvcsformats
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_realpath
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_reposub
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_adjust
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_bydir_detect
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_check_com
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_formats
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_get_cmd
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_maxexports
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_nvcsformats
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_realpath
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_reposub
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/VCS_INFO_set
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/vcs_info
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/vcs_info_lastmsg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/vcs_info_printsys
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/vcs_info_setsys
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/vcs_info_lastmsg
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/vcs_info_printsys
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/VCS_Info/vcs_info_setsys
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zftp/zfanon
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zftp/zfautocheck
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zftp/zfcd
@@ -912,49 +1251,70 @@
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zftp/zftype
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zftp/zfuget
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zftp/zfuput
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/backward-kill-word-match
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/backward-kill-word-match
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/backward-word-match
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/capitalize-word-match
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/capitalize-word-match
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/copy-earlier-word
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/cycle-completion-positions
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/define-composed-chars
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/delete-whole-word-match
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/down-case-word-match
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/down-line-or-beginning-search
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/cycle-completion-positions
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/define-composed-chars
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/delete-whole-word-match
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/down-case-word-match
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/down-line-or-beginning-search
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/edit-command-line
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/forward-word-match
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/history-beginning-search-menu
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/history-pattern-search
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/history-beginning-search-menu
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/history-pattern-search
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/history-search-end
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/incarg
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/incremental-complete-word
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/insert-composed-char
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/incremental-complete-word
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/insert-composed-char
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/insert-files
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/insert-unicode-char
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/keeper
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/keymap+widget
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/kill-word-match
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/match-word-context
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/match-words-by-style
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/modify-current-argument
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/match-words-by-style
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/modify-current-argument
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/narrow-to-region
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/narrow-to-region-invisible
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/narrow-to-region-invisible
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/predict-on
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/quote-and-complete-word
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/read-from-minibuffer
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/quote-and-complete-word
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/read-from-minibuffer
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/replace-string
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/replace-string-again
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/replace-string-again
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/select-word-style
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/smart-insert-last-word
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/split-shell-arguments
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/transpose-words-match
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/smart-insert-last-word
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/split-shell-arguments
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/transpose-words-match
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/up-case-word-match
-file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/up-line-or-beginning-search
+file \
+    path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/up-line-or-beginning-search
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/url-quote-magic
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/which-command
 file path=usr/share/zsh/$(COMPONENT_VERSION)/functions/Zle/zed-set-file-name
 file path=usr/share/zsh/$(COMPONENT_VERSION)/scripts/newuser
 hardlink path=usr/bin/zsh target=zsh-$(COMPONENT_VERSION)
+license license license="Zsh License"
 # This link dangles deliberately, and userland.action002.0 doesn't like that.
-link path=etc/zprofile target=profile pkg.linted=true
-license license license="Zsh License"
+link path=etc/zprofile pkg.linted=true target=profile
--- a/doc/packaging.txt	Wed Apr 13 10:10:46 2011 -0600
+++ b/doc/packaging.txt	Wed Apr 13 09:58:06 2011 -0700
@@ -20,6 +20,10 @@
     (.../{component}/{build-dir}/manifest-$(MACH)-{component}.mogrified)
             |
             v
+    mangled manifest file contents
+    (.../{component}/{build-dir}/manifest-$(ARCH)-{component}.mangled)
+            |
+            v
     dependencies generated
     (.../{component}/{build-dir}/manifest-$(MACH)-{component}.depend)
             |
--- a/make-rules/configure.mk	Wed Apr 13 10:10:46 2011 -0600
+++ b/make-rules/configure.mk	Wed Apr 13 09:58:06 2011 -0700
@@ -81,23 +81,11 @@
 
 COMPONENT_INSTALL_ARGS +=	DESTDIR=$(PROTO_DIR)
 
-$(BUILD_DIR)/$(MACH32)/.configured:	BITS=32
-$(BUILD_DIR)/$(MACH64)/.configured:	BITS=64
-$(BUILD_DIR)/$(MACH32)/.built:		BITS=32
-$(BUILD_DIR)/$(MACH64)/.built:		BITS=64
-$(BUILD_DIR)/$(MACH32)/.installed:	BITS=32
-$(BUILD_DIR)/$(MACH64)/.installed:	BITS=64
-$(BUILD_DIR)/$(MACH32)/.tested:		BITS=32
-$(BUILD_DIR)/$(MACH64)/.tested:		BITS=64
+$(BUILD_DIR_32)/.configured:	BITS=32
+$(BUILD_DIR_64)/.configured:	BITS=64
 
 CONFIGURE_ENV += $(CONFIGURE_ENV.$(BITS))
 
-# set the default target for installation of the component
-COMPONENT_INSTALL_TARGETS =	install
-
-# set the default target for test of the component
-COMPONENT_TEST_TARGETS =	check
-
 # configure the unpacked source for building 32 and 64 bit version
 CONFIGURE_SCRIPT =	$(SOURCE_DIR)/configure
 $(BUILD_DIR)/%/.configured:	$(SOURCE_DIR)/.prep
--- a/make-rules/ips.mk	Wed Apr 13 10:10:46 2011 -0600
+++ b/make-rules/ips.mk	Wed Apr 13 09:58:06 2011 -0700
@@ -40,6 +40,7 @@
 PKGMOGRIFY =	/usr/bin/pkgmogrify
 PKGSEND =	/usr/bin/pkgsend
 PKGLINT =	/usr/bin/pkglint
+PKGMANGLE =	$(WS_TOOLS)/userland-mangler
 
 # Package headers should all pretty much follow the same format
 METADATA_TEMPLATE =		$(WS_TOP)/transforms/manifest-metadata-template
@@ -64,7 +65,6 @@
 PKG_MACROS +=		MACH=$(MACH)
 PKG_MACROS +=		MACH32=$(MACH32)
 PKG_MACROS +=		MACH64=$(MACH64)
-PKG_MACROS +=		IPS_PKG_NAME=$(IPS_PKG_NAME)
 PKG_MACROS +=		PUBLISHER=$(PUBLISHER)
 PKG_MACROS +=		CONSOLIDATION=$(CONSOLIDATION)
 PKG_MACROS +=		BUILD_VERSION=$(BUILD_VERSION)
@@ -77,7 +77,9 @@
 
 PKG_OPTIONS +=		$(PKG_MACROS:%=-D %)
 
-PKG_PROTO_DIRS += $(PROTO_DIR) $(@D) $(COMPONENT_DIR) $(COMPONENT_SRC)
+MANGLED_DIR =	$(PROTO_DIR)/mangled
+
+PKG_PROTO_DIRS += $(MANGLED_DIR) $(PROTO_DIR) $(@D) $(COMPONENT_DIR) $(COMPONENT_SRC)
 
 MANIFEST_BASE =		$(BUILD_DIR)/manifest-$(MACH)
 
@@ -117,9 +119,17 @@
 		$(PUBLISH_TRANSFORMS) | \
 		sed -e '/^$$/d' -e '/^#.*$$/d' | uniq >$@
 
+# mangle the file contents
+$(MANGLED_DIR):
+	$(MKDIR) $@
+
+PKGMANGLE_OPTIONS = -D $(MANGLED_DIR) $(PKG_PROTO_DIRS:%=-d %)
+$(MANIFEST_BASE)-%.mangled:	$(MANIFEST_BASE)-%.mogrified $(MANGLED_DIR)
+	$(PKGMANGLE) $(PKGMANGLE_OPTIONS) -m $< >$@
+
 # generate dependencies
 PKGDEPEND_GENERATE_OPTIONS = -m $(PKG_PROTO_DIRS:%=-d %)
-$(MANIFEST_BASE)-%.depend:	$(MANIFEST_BASE)-%.mogrified
+$(MANIFEST_BASE)-%.depend:	$(MANIFEST_BASE)-%.mangled
 	$(PKGDEPEND) generate $(PKGDEPEND_GENERATE_OPTIONS) $< >$@
 
 # resolve dependencies, prepend the mogrified manifest, less the unresolved
--- a/make-rules/justmake.mk	Wed Apr 13 10:10:46 2011 -0600
+++ b/make-rules/justmake.mk	Wed Apr 13 09:58:06 2011 -0700
@@ -44,14 +44,6 @@
 #	COMPONENT_BUILD_TARGETS, COMPONENT_INSTALL_TARGETS
 #
 
-$(BUILD_DIR_32)/.built:	BITS=32
-$(BUILD_DIR_64)/.built:	BITS=64
-$(BUILD_DIR_32)/.install:	BITS=32
-$(BUILD_DIR_64)/.install:	BITS=64
-
-# set the default target for installation of the component
-COMPONENT_INSTALL_TARGETS =	install
-
 # build the configured source
 $(BUILD_DIR)/%/.built:	$(SOURCE_DIR)/.prep
 	$(RM) -r $(@D) ; $(MKDIR) $(@D)
@@ -70,5 +62,13 @@
 	$(COMPONENT_POST_INSTALL_ACTION)
 	$(TOUCH) $@
 
+# test the built source
+$(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built
+	$(COMPONENT_PRE_TEST_ACTION)
+	(cd $(@D) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
+		$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
+	$(COMPONENT_POST_TEST_ACTION)
+	$(TOUCH) $@
+
 clean::
 	$(RM) -r $(BUILD_DIR) $(PROTO_DIR)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make-rules/lint-libraries.mk	Wed Apr 13 09:58:06 2011 -0700
@@ -0,0 +1,68 @@
+#
+# 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.
+#
+
+#
+# Rules and Macros for building lint libraries.  This searches for lint
+# libraries in the component directory and adds targets to build and install
+# them for 32/64 bit.
+#
+# To use these rules, include $(WS_TOP)/make-rules/lint-libraries.mk in your
+# Makefile and add your lint library source in your component directory as
+# llib-l{lib}.
+#
+# Makefile
+#    include $(WS_TOP)/make-rules/lint-libraries.mk
+#
+# llib-l{libname}
+#
+
+LINT_LIBRARIES = $(wildcard llib-*)
+
+LINT_FLAGS = -nsvx -I$(@D) -I$(SOURCE_DIR)/include -I$(SOURCE_DIR)
+
+# template for lint library rules. new rules will be added automatically
+define lintlib-rule
+$(BUILD_DIR_32)/$(1).ln:	BITS=32
+$(BUILD_DIR_64)/$(1).ln:	BITS=64
+
+$$(BUILD_DIR)/%/$(1).ln:	$(1) $(BUILD_DIR)/%/.built
+	(cd $$(@D) ; $$(LINT) $$(LINT_FLAGS) -o $$(@F:llib-l%.ln=%) ../../$$<)
+
+$$(PROTOUSRLIBDIR)/$(1):	$(1)
+	$(INSTALL) -c $$< $$@
+
+$$(PROTOUSRLIBDIR)/$(1).ln:	$$(BUILD_DIR)/$(MACH32)/$(1).ln
+	$(INSTALL) -c $$< $$@
+
+$$(PROTOUSRLIBDIR64)/$(1).ln:	$$(BUILD_DIR)/$(MACH64)/$(1).ln
+	$(INSTALL) -c $$< $$@
+
+BUILD_32 += $(BUILD_DIR_32)/$(1).ln
+BUILD_64 += $(BUILD_DIR_64)/$(1).ln
+INSTALL_32 += $(PROTOUSRLIBDIR)/$(1)
+INSTALL_32 += $(PROTOUSRLIBDIR)/$(1).ln
+INSTALL_64 += $(PROTOUSRLIBDIR64)/$(1).ln
+endef
+
+# Generate the lint library rules from the above template
+$(foreach lintlib,$(LINT_LIBRARIES),$(eval $(call lintlib-rule,$(lintlib))))
--- a/make-rules/setup.py.mk	Wed Apr 13 10:10:46 2011 -0600
+++ b/make-rules/setup.py.mk	Wed Apr 13 09:58:06 2011 -0700
@@ -25,7 +25,7 @@
 $(BUILD_DIR)/$(MACH32)-%/.built:	BITS=32
 $(BUILD_DIR)/$(MACH64)-%/.built:	BITS=64
 
-$(BUILD_DIR)/%-2.6/.installed:	PYTHON_VERSION=2.6
+$(BUILD_DIR)/%-2.6/.installed:		PYTHON_VERSION=2.6
 $(BUILD_DIR)/$(MACH32)-%/.installed:	BITS=32
 $(BUILD_DIR)/$(MACH64)-%/.installed:	BITS=64
 
--- a/make-rules/shared-macros.mk	Wed Apr 13 10:10:46 2011 -0600
+++ b/make-rules/shared-macros.mk	Wed Apr 13 09:58:06 2011 -0700
@@ -67,8 +67,6 @@
 
 CONFIG_SHELL =	/bin/bash
 
-MAN_STABILITY =	$(WS_TOOLS)/man-stability
-
 PKG_REPO =	file:$(WS_REPO)
 
 COMPONENT_DIR =	$(shell pwd)
@@ -156,14 +154,26 @@
 BUILD_32 =		$(BUILD_DIR_32)/.built
 BUILD_64 =		$(BUILD_DIR_64)/.built
 BUILD_32_and_64 =	$(BUILD_32) $(BUILD_64)
+$(BUILD_DIR_32)/.built:		BITS=32
+$(BUILD_DIR_64)/.built:		BITS=64
 
 INSTALL_32 =		$(BUILD_DIR_32)/.installed
 INSTALL_64 =		$(BUILD_DIR_64)/.installed
 INSTALL_32_and_64 =	$(INSTALL_32) $(INSTALL_64)
+$(BUILD_DIR_32)/.install:       BITS=32
+$(BUILD_DIR_64)/.install:       BITS=64
+
+# set the default target for installation of the component
+COMPONENT_INSTALL_TARGETS =	install
 
 TEST_32 =		$(BUILD_DIR_32)/.tested
 TEST_64 =		$(BUILD_DIR_64)/.tested
 TEST_32_and_64 =	$(TEST_32) $(TEST_64)
+$(BUILD_DIR_32)/.tested:       BITS=32
+$(BUILD_DIR_64)/.tested:       BITS=64
+
+# set the default target for test of the component
+COMPONENT_TEST_TARGETS =	check
 
 # BUILD_TOOLS is the root of all tools not normally installed on the system.
 BUILD_TOOLS =	/ws/onnv-tools
@@ -469,3 +479,8 @@
 COMPONENT_BUILD_ARGS += $(COMPONENT_BUILD_ARGS.$(BITS))
 COMPONENT_INSTALL_ENV += $(COMPONENT_INSTALL_ENV.$(BITS))
 COMPONENT_INSTALL_ARGS += $(COMPONENT_INSTALL_ARGS.$(BITS))
+
+# If there are no tests to execute
+NO_TESTS =	test-nothing
+test-nothing:
+	@echo "There are no tests available at this time."
--- a/tools/man-stability	Wed Apr 13 10:10:46 2011 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-#!/bin/sh
-#
-# 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) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-#
-# Environment
-#
-
-PATH="/usr/bin"
-export PATH
-
-basename=`basename $0`
-usage="\
-Usage: $basename -n <name> -p <package> -s <stability> <file>...
-       $basename --help"
-
-help="$usage
-
-Amends the given man pages to add a Solaris stability
-classification and a note about source availability.
-
--n, -p, and -s affect man pages specified thereafter and may be
-specified multiple times.
-
-Arguments:
-
-<file>
-    The man page file to amend (in place).
-
--n <name>
-    Specify the name of the project (required).
-
--p <package>
-    Specify the name of the package (required).
-
--s <stability>
-    A solaris stability level (required).
-
---help
-    Display this message."
-
-#
-# Functions
-#
-
-# Usage: die [<message>] [<exitcode>]
-die() {
-    test -n "$1" && echo "$basename: $1"
-    test -n "$2" && test "$2" -gt 0 && exit "$2"
-    exit 0
-}
-
-# Adds the given nroff preprocessing flags to the flags on stdin, avoiding
-# duplicates; outputs to stdout
-addflags() {
-    read flags
-
-    for f in "$@"
-    do
-        case "$flags" in
-            *${f}*) ;;
-            *) flags="${flags}$f" ;;
-        esac
-    done
-
-    echo "$flags"
-}
-
-# Amend the given man page file
-process() {
-    file="$1"
-    flagre="^'"'\\" '
-
-    # Add tbl (t) nroff preprocessing flag to existing flags, if any
-    flags=`head -1 "$file" | grep "$flagre" | cut -f2 -d' ' | addflags t`
-
-    # Remove existing flags from input
-    grep -v "$flagre" "$file" | (
-
-    # Replace flags and add comment header
-    cat <<EOF
-'\" $flags
-.\"
-.\" Modified to add a Solaris stability classification
-.\" and a note about source availability.
-.\"
-EOF
-
-cat
-
-cat <<EOF
-.\" Begin Oracle update
-.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	$pkg
-=
-Interface Stability	$stability
-.TE
-.PP
-.SH NOTES
-Source for $project is available on http://opensolaris.org.
-.\" End Oracle update
-EOF
-) > "$file"-
-
-    # preserve permissions
-    /usr/gnu/bin/chmod --reference="$file" "$file"-
-
-    mv -f "$file"- "$file" || die "could not amend $opt" 1
-}
-
-#
-# Main
-#
-
-project=
-pkg=
-stability=
-
-test $# -gt 0 || set -- --help
-
-while [ $# -gt 0 ]
-do
-    opt="$1"
-    shift
-
-    case "$opt" in
-        --help)
-            echo "$help"
-            exit
-        ;;
-
-        -[nps])
-            test $# -gt 0 || die "\"$opt\" requires an argument\n\n$usage"
-            optarg="$1"
-            shift
-
-            case "$opt" in
-                -n) project="$optarg" ;;
-                -p) pkg="$optarg" ;;
-                -s) stability="$optarg" ;;
-            esac
-        ;;
-
-        *)
-            test -f "$opt" || die "no such file: $opt"
-            test -z "$project" && die "-n not specified\n\n$usage"
-            test -z "$pkg" && die "-p not specified\n\n$usage"
-            test -z "$stability" && die "-s not specified\n\n$usage"
-
-            process "$opt"
-        ;;
-    esac
-done
--- a/tools/python/pkglint/userland.py	Wed Apr 13 10:10:46 2011 -0600
+++ b/tools/python/pkglint/userland.py	Wed Apr 13 09:58:06 2011 -0700
@@ -223,7 +223,7 @@
 	def __init__(self, config):
 		super(UserlandManifestChecker, self).__init__(config)
 
-	def license_check(self, manifest, engine, pkglint_id="001"):
+	def component_check(self, manifest, engine, pkglint_id="001"):
 		manifest_paths = []
 		files = False
 		license = False
@@ -236,10 +236,16 @@
 			return
 
 		for action in manifest.gen_actions_by_type("license"):
-			return
+			license = True
+			break
+
+		if license == False:
+			engine.error( _("missing license action"),
+				msgid="%s%s.0" % (self.name, pkglint_id))
 
-		engine.error( _("missing license action"),
-			msgid="%s%s.0" % (self.name, pkglint_id))
+		if 'opensolaris.arc_url' not in manifest:
+			engine.error( _("missing ARC data (opensolaris.arc_url)"),
+				msgid="%s%s.0" % (self.name, pkglint_id))
 
-	license_check.pkglint_dest = _(
-		"license actions are required if you deliver files.")
+	component_check.pkglint_dest = _(
+		"license actions and iARC information are required if you deliver files.")
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/userland-mangler	Wed Apr 13 09:58:06 2011 -0700
@@ -0,0 +1,272 @@
+#!/usr/bin/python2.6
+#
+# 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.
+#
+#
+# userland-mangler - a file mangling utility
+#
+#  A simple program to mangle files to conform to Solaris WOS or Consoldation
+#  requirements.
+#
+
+import os
+import sys
+import re
+
+import pkg.fmri
+import pkg.manifest
+import pkg.actions
+import pkg.elf as elf
+
+attribute_table_header = """
+.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 """
+
+attribute_table_availability = """
+=
+Availability	%s"""
+
+attribute_table_stability = """
+=
+Stability	%s"""
+
+attribute_table_footer = """
+.TE 
+.PP
+"""
+def write_attributes_section(ofp, availability, stability):
+	# is there anything to do?
+	if availability is None and stability is None:
+		return
+
+	# append the ATTRIBUTES section
+	ofp.write(attribute_table_header)
+	if availability is not None:
+		ofp.write(attribute_table_availability % availability)
+	if stability is not None:
+		ofp.write(attribute_table_stability % stability.capitalize())
+	ofp.write(attribute_table_footer)
+
+
+notes_header = """
+.SH NOTES
+"""
+
+notes_community = """
+Further information about this software can be found on the open source community website at %s.
+"""
+notes_source = """
+This software was built from source available at http://opensolaris.org/.  The original community source was downloaded from  %s
+"""
+
+def write_notes_section(ofp, header_seen, community, source):
+	# is there anything to do?
+	if community is None and source is None:
+		return
+
+	# append the NOTES section
+	if header_seen == False:
+		ofp.write(notes_header)
+	if source is not None:
+		ofp.write(notes_source % source)
+	if community is not None:
+		ofp.write(notes_community % community)
+
+
+section_re = re.compile('\.SH "?([^"]+).*$', re.IGNORECASE)
+#
+# mangler.man.stability = (mangler.man.stability)
+# mangler.man.availability = (pkg.fmri)
+# mangler.man.source_url = (pkg.source_url)
+# mangler.man.upstream_url = (pkg.upstream_url)
+#
+def mangle_manpage(manifest, action, src, dest):
+	# manpages must have a taxonomy defined
+	stability = action.attrs.pop('mangler.man.stability', None)
+	if stability is None:
+		sys.stderr.write("ERROR: manpage action missing mangler.man.stability: %s" % action)
+		sys.exit(1)
+
+	attributes_written = False
+	notes_seen = False
+
+	if 'pkg.fmri' in manifest.attributes:
+		fmri = pkg.fmri.PkgFmri(manifest.attributes['pkg.fmri'])
+		availability = fmri.pkg_name
+
+	if 'info.upstream_url' in manifest.attributes:
+		community = manifest.attributes['info.upstream_url']
+
+	if 'info.source_url' in manifest.attributes:
+		source = manifest.attributes['info.source_url']
+
+	# create a directory to write to
+	destdir = os.path.dirname(dest)
+	if not os.path.exists(destdir):
+		os.makedirs(destdir)
+
+	# read the source document
+	ifp = open(src, "r")
+	lines = ifp.readlines()
+	ifp.close()
+
+	# skip reference only pages
+	if lines[0].startswith(".so "):
+		return
+
+	# open a destination
+	ofp = open(dest, "w+")
+
+	# tell man that we want tables (and eqn)
+	ofp.write("'\\\" te\n")
+
+	# write the orginal data
+	for line in lines:
+		match = section_re.match(line)
+		if match is not None:
+			section = match.group(1)
+			if section in ['SEE ALSO', 'NOTES']:
+				if attributes_written == False:
+					write_attributes_section(ofp,
+								 availability,
+								 stability)
+					attributes_written = True
+				if section == 'NOTES':
+					notes_seen = True
+		ofp.write(line)
+
+	if attributes_written == False:
+		write_attributes_section(ofp, availability, stability)
+
+	write_notes_section(ofp, notes_seen, community, source)
+
+	ofp.close()
+
+
+#
+# mangler.elf.strip = (true|false)
+#
+def mangle_elf(manifest, action, src, dest):
+	pass
+
+#
+# mangler.script.file-magic =
+#
+def mangle_script(manifest, action, src, dest):
+	pass
+
+def mangle_path(manifest, action, src, dest):
+	if 'facet.doc.man' in action.attrs:
+		 mangle_manpage(manifest, action, src, dest)
+	elif 'mode' in action.attrs and int(action.attrs['mode'], 8) & 0111 != 0:
+		if elf.is_elf_object(src):
+			 mangle_elf(manifest, action, src, dest)
+		else:
+			 mangle_script(manifest, action, src, dest)
+
+#
+# mangler.bypass = (true|false)
+#
+def mangle_paths(manifest, search_paths, destination):
+	for action in manifest.gen_actions_by_type("file"):
+		bypass = action.attrs.pop('mangler.bypass', 'false').lower()
+		if bypass == 'true':
+			continue
+
+		path = None
+		if 'path' in action.attrs:
+			path = action.attrs['path']
+		if action.hash and action.hash != 'NOHASH':
+			path = action.hash
+		if not path:
+			continue
+
+		dest = os.path.join(destination, path)
+		for directory in search_paths:
+			if directory != destination:
+				src = os.path.join(directory, path)
+				if os.path.exists(src):
+					mangle_path(manifest, action, src, dest)
+					break
+
+def load_manifest(manifest_file):
+	manifest = pkg.manifest.Manifest()
+	manifest.set_content(pathname=manifest_file)
+
+	return manifest
+
+def usage():
+	print "Usage: %s [-m|--manifest (file)] [-d|--search-directory (dir)] [-D|--destination (dir)] " % (sys.argv[0].split('/')[-1])
+	sys.exit(1)
+
+def main():
+	import getopt
+
+	# FLUSH STDOUT 
+	sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
+
+	search_paths = []
+	destination = None
+	manifests = []
+
+	try:
+		opts, args = getopt.getopt(sys.argv[1:], "D:d:m:",
+			["destination=", "search-directory=", "manifest="])
+	except getopt.GetoptError, err:
+		print str(err)
+		usage()
+
+	for opt, arg in opts:
+		if opt in [ "-D", "--destination" ]:
+			destination = arg
+		elif opt in [ "-d", "--search-directory" ]:
+			search_paths.append(arg)
+		elif opt in [ "-m", "--manifest" ]:
+			try:
+				manifest = load_manifest(arg)
+			except IOError, err:
+				print "oops, %s: %s" % (arg, str(err))
+				usage()
+			else:
+				manifests.append(manifest)
+		else:
+			usage()
+
+	if destination == None:
+		usage()
+
+	for manifest in manifests:
+		mangle_paths(manifest, search_paths, destination)
+		print manifest
+
+	sys.exit(0)
+
+if __name__ == "__main__":
+	main()