--- a/components/a2ps/Makefile	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/a2ps/Makefile	Mon Feb 07 17:45:11 2011 -0800
@@ -18,17 +18,16 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		a2ps
 COMPONENT_VERSION=	4.13
-IPS_PKG_NAME=		print/lp/filter/a2ps
-COMPONENT_DESCRIPTION=	"GNU Any to PostScript filter"
-COMPONENT_CLASSIFICATION="System/Printing"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://www.gnu.org/software/a2ps/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)b.tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:cfc79a3e54115e569f667fa3fd2c2ec16d22b31a
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/a2ps/$(COMPONENT_ARCHIVE)

--- a/components/a2ps/a2ps.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/a2ps/a2ps.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -18,13 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# 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="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+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"
+set name=info.upstream_url value=http://www.gnu.org/software/a2ps/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
@@ -90,21 +90,21 @@
 dir path=usr/share/ogonkify
 dir path=usr/share/ogonkify/afm
 dir path=usr/share/ogonkify/fonts
-file NOHASH path=etc/gnu/a2ps-site.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps-site.cfg
-file NOHASH path=etc/gnu/a2ps.cfg mode=0644 preserve=true original_name=SUNWa2ps:etc/gnu/a2ps.cfg
-file NOHASH path=etc/lp/fd/a2ps.fd
-file NOHASH path=usr/bin/a2ps variant.arch=$(ARCH)
-file NOHASH path=usr/bin/card
-file NOHASH path=usr/bin/composeglyphs
-file NOHASH path=usr/bin/fixnt variant.arch=$(ARCH)
-file NOHASH path=usr/bin/fixps
-file NOHASH path=usr/bin/ogonkify
-file NOHASH path=usr/bin/pdiff
-file NOHASH path=usr/bin/psmandup
-file NOHASH path=usr/bin/psset
-file NOHASH path=usr/bin/texi2dvi4a2ps
-file NOHASH path=usr/include/liba2ps.h
-file NOHASH path=usr/lib/liba2ps.so.1.0.0 variant.arch=$(ARCH)
+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=usr/bin/a2ps variant.arch=$(ARCH)
+file path=usr/bin/card
+file path=usr/bin/composeglyphs
+file path=usr/bin/fixnt variant.arch=$(ARCH)
+file path=usr/bin/fixps
+file path=usr/bin/ogonkify
+file path=usr/bin/pdiff
+file path=usr/bin/psmandup
+file path=usr/bin/psset
+file path=usr/bin/texi2dvi4a2ps
+file path=usr/include/liba2ps.h
+file path=usr/lib/liba2ps.so.1.0.0 variant.arch=$(ARCH)
 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
@@ -115,291 +115,283 @@
 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 NOHASH path=usr/share/a2ps/README
-file NOHASH path=usr/share/a2ps/afm/fonts.map
-file NOHASH path=usr/share/a2ps/afm/make_fonts_map.sh mode=0555
-file NOHASH path=usr/share/a2ps/afm/pbkd.afm
-file NOHASH path=usr/share/a2ps/afm/pbkdi.afm
-file NOHASH path=usr/share/a2ps/afm/pbkl.afm
-file NOHASH path=usr/share/a2ps/afm/pbkli.afm
-file NOHASH path=usr/share/a2ps/afm/pcfont.afm
-file NOHASH path=usr/share/a2ps/afm/pcrb.afm
-file NOHASH path=usr/share/a2ps/afm/pcrbo.afm
-file NOHASH path=usr/share/a2ps/afm/pcrr.afm
-file NOHASH path=usr/share/a2ps/afm/pcrro.afm
-file NOHASH path=usr/share/a2ps/afm/phvb.afm
-file NOHASH path=usr/share/a2ps/afm/phvbo.afm
-file NOHASH path=usr/share/a2ps/afm/phvbon.afm
-file NOHASH path=usr/share/a2ps/afm/phvbrn.afm
-file NOHASH path=usr/share/a2ps/afm/phvr.afm
-file NOHASH path=usr/share/a2ps/afm/phvro.afm
-file NOHASH path=usr/share/a2ps/afm/phvron.afm
-file NOHASH path=usr/share/a2ps/afm/phvrrn.afm
-file NOHASH path=usr/share/a2ps/afm/pncb.afm
-file NOHASH path=usr/share/a2ps/afm/pncbi.afm
-file NOHASH path=usr/share/a2ps/afm/pncr.afm
-file NOHASH path=usr/share/a2ps/afm/pncri.afm
-file NOHASH path=usr/share/a2ps/afm/pplb.afm
-file NOHASH path=usr/share/a2ps/afm/pplbi.afm
-file NOHASH path=usr/share/a2ps/afm/pplr.afm
-file NOHASH path=usr/share/a2ps/afm/pplri.afm
-file NOHASH path=usr/share/a2ps/afm/psyr.afm
-file NOHASH path=usr/share/a2ps/afm/ptmb.afm
-file NOHASH path=usr/share/a2ps/afm/ptmbi.afm
-file NOHASH path=usr/share/a2ps/afm/ptmi.afm
-file NOHASH path=usr/share/a2ps/afm/ptmr.afm
-file NOHASH path=usr/share/a2ps/afm/pzcmi.afm
-file NOHASH path=usr/share/a2ps/afm/pzdr.afm
-file NOHASH path=usr/share/a2ps/encoding/ascii.edf
-file NOHASH path=usr/share/a2ps/encoding/encoding.map
-file NOHASH path=usr/share/a2ps/encoding/hp.edf
-file NOHASH path=usr/share/a2ps/encoding/ibm-cp437.edf
-file NOHASH path=usr/share/a2ps/encoding/ibm-cp850.edf
-file NOHASH path=usr/share/a2ps/encoding/iso1.edf
-file NOHASH path=usr/share/a2ps/encoding/iso10.edf
-file NOHASH path=usr/share/a2ps/encoding/iso13.edf
-file NOHASH path=usr/share/a2ps/encoding/iso15.edf
-file NOHASH path=usr/share/a2ps/encoding/iso2.edf
-file NOHASH path=usr/share/a2ps/encoding/iso3.edf
-file NOHASH path=usr/share/a2ps/encoding/iso4.edf
-file NOHASH path=usr/share/a2ps/encoding/iso5.edf
-file NOHASH path=usr/share/a2ps/encoding/iso7.edf
-file NOHASH path=usr/share/a2ps/encoding/iso9.edf
-file NOHASH path=usr/share/a2ps/encoding/koi8.edf
-file NOHASH path=usr/share/a2ps/encoding/mac.edf
-file NOHASH path=usr/share/a2ps/encoding/ms-cp1250.edf
-file NOHASH path=usr/share/a2ps/fonts/pcfont.pfa
-file NOHASH path=usr/share/a2ps/ppd/README
-file NOHASH path=usr/share/a2ps/ppd/level1.ppd
-file NOHASH path=usr/share/a2ps/ppd/level2.ppd
-file NOHASH path=usr/share/a2ps/ps/a2ps.hdr
-file NOHASH path=usr/share/a2ps/ps/base.ps
-file NOHASH path=usr/share/a2ps/ps/bold.pro
-file NOHASH path=usr/share/a2ps/ps/bw.pro
-file NOHASH path=usr/share/a2ps/ps/color.hdr
-file NOHASH path=usr/share/a2ps/ps/color.pro
-file NOHASH path=usr/share/a2ps/ps/diff.pro
-file NOHASH path=usr/share/a2ps/ps/ehandler.ps
-file NOHASH path=usr/share/a2ps/ps/fixed.pro
-file NOHASH path=usr/share/a2ps/ps/gray.pro
-file NOHASH path=usr/share/a2ps/ps/gray2.pro
-file NOHASH path=usr/share/a2ps/ps/matrix.pro
-file NOHASH path=usr/share/a2ps/ps/ul.pro
-file NOHASH path=usr/share/a2ps/sheets/68000.ssh
-file NOHASH path=usr/share/a2ps/sheets/a2psrc.ssh
-file NOHASH path=usr/share/a2ps/sheets/ada.ssh
-file NOHASH path=usr/share/a2ps/sheets/asn1.ssh
-file NOHASH path=usr/share/a2ps/sheets/autoconf.ssh
-file NOHASH path=usr/share/a2ps/sheets/awk.ssh
-file NOHASH path=usr/share/a2ps/sheets/b.ssh
-file NOHASH path=usr/share/a2ps/sheets/bc.ssh
-file NOHASH path=usr/share/a2ps/sheets/c.ssh
-file NOHASH path=usr/share/a2ps/sheets/caml.ssh
-file NOHASH path=usr/share/a2ps/sheets/card.ssh
-file NOHASH path=usr/share/a2ps/sheets/chlog.ssh
-file NOHASH path=usr/share/a2ps/sheets/cidl.ssh
-file NOHASH path=usr/share/a2ps/sheets/claire.ssh
-file NOHASH path=usr/share/a2ps/sheets/clisp.ssh
-file NOHASH path=usr/share/a2ps/sheets/coqv.ssh
-file NOHASH path=usr/share/a2ps/sheets/cpp.ssh
-file NOHASH path=usr/share/a2ps/sheets/csh.ssh
-file NOHASH path=usr/share/a2ps/sheets/cxx.ssh
-file NOHASH path=usr/share/a2ps/sheets/dc_shell.ssh
-file NOHASH path=usr/share/a2ps/sheets/eiffel.ssh
-file NOHASH path=usr/share/a2ps/sheets/elisp.ssh
-file NOHASH path=usr/share/a2ps/sheets/eps.ssh
-file NOHASH path=usr/share/a2ps/sheets/for-fixed.ssh
-file NOHASH path=usr/share/a2ps/sheets/for-free.ssh
-file NOHASH path=usr/share/a2ps/sheets/for77-fixed.ssh
-file NOHASH path=usr/share/a2ps/sheets/for77-free.ssh
-file NOHASH path=usr/share/a2ps/sheets/for77kwds.ssh
-file NOHASH path=usr/share/a2ps/sheets/for90-fixed.ssh
-file NOHASH path=usr/share/a2ps/sheets/for90-free.ssh
-file NOHASH path=usr/share/a2ps/sheets/for90kwds.ssh
-file NOHASH path=usr/share/a2ps/sheets/fortran.ssh
-file NOHASH path=usr/share/a2ps/sheets/gmake.ssh
-file NOHASH path=usr/share/a2ps/sheets/gnuc.ssh
-file NOHASH path=usr/share/a2ps/sheets/haskell.ssh
-file NOHASH path=usr/share/a2ps/sheets/html.ssh
-file NOHASH path=usr/share/a2ps/sheets/idl.ssh
-file NOHASH path=usr/share/a2ps/sheets/initora.ssh
-file NOHASH path=usr/share/a2ps/sheets/is5rul.ssh
-file NOHASH path=usr/share/a2ps/sheets/java.ssh
-file NOHASH path=usr/share/a2ps/sheets/js.ssh
-file NOHASH path=usr/share/a2ps/sheets/lace.ssh
-file NOHASH path=usr/share/a2ps/sheets/lex.ssh
-file NOHASH path=usr/share/a2ps/sheets/lout.ssh
-file NOHASH path=usr/share/a2ps/sheets/mail.ssh
-file NOHASH path=usr/share/a2ps/sheets/make.ssh
-file NOHASH path=usr/share/a2ps/sheets/maple.ssh
-file NOHASH path=usr/share/a2ps/sheets/matlab4.ssh
-file NOHASH path=usr/share/a2ps/sheets/mib.ssh
-file NOHASH path=usr/share/a2ps/sheets/mly.ssh
-file NOHASH path=usr/share/a2ps/sheets/modula2.ssh
-file NOHASH path=usr/share/a2ps/sheets/modula3.ssh
-file NOHASH path=usr/share/a2ps/sheets/o2c.ssh
-file NOHASH path=usr/share/a2ps/sheets/oberon.ssh
-file NOHASH path=usr/share/a2ps/sheets/objc.ssh
-file NOHASH path=usr/share/a2ps/sheets/ocaml.ssh
-file NOHASH path=usr/share/a2ps/sheets/octave.ssh
-file NOHASH path=usr/share/a2ps/sheets/oracle.ssh
-file NOHASH path=usr/share/a2ps/sheets/pascal.ssh
-file NOHASH path=usr/share/a2ps/sheets/perl.ssh
-file NOHASH path=usr/share/a2ps/sheets/plsql.ssh
-file NOHASH path=usr/share/a2ps/sheets/pov.ssh
-file NOHASH path=usr/share/a2ps/sheets/ppd.ssh
-file NOHASH path=usr/share/a2ps/sheets/pre.ssh
-file NOHASH path=usr/share/a2ps/sheets/pretex.ssh
-file NOHASH path=usr/share/a2ps/sheets/prolog.ssh
-file NOHASH path=usr/share/a2ps/sheets/promela.ssh
-file NOHASH path=usr/share/a2ps/sheets/ps.ssh
-file NOHASH path=usr/share/a2ps/sheets/python.ssh
-file NOHASH path=usr/share/a2ps/sheets/rexx.ssh
-file NOHASH path=usr/share/a2ps/sheets/sather.ssh
-file NOHASH path=usr/share/a2ps/sheets/scheme.ssh
-file NOHASH path=usr/share/a2ps/sheets/sdl88.ssh
-file NOHASH path=usr/share/a2ps/sheets/sed.ssh
-file NOHASH path=usr/share/a2ps/sheets/sh.ssh
-file NOHASH path=usr/share/a2ps/sheets/sheets.map
-file NOHASH path=usr/share/a2ps/sheets/shell.ssh
-file NOHASH path=usr/share/a2ps/sheets/sml.ssh
-file NOHASH path=usr/share/a2ps/sheets/sql.ssh
-file NOHASH path=usr/share/a2ps/sheets/sql92.ssh
-file NOHASH path=usr/share/a2ps/sheets/ssh.ssh
-file NOHASH path=usr/share/a2ps/sheets/symbols.ssh
-file NOHASH path=usr/share/a2ps/sheets/tcl.ssh
-file NOHASH path=usr/share/a2ps/sheets/tclx.ssh
-file NOHASH path=usr/share/a2ps/sheets/tcsh.ssh
-file NOHASH path=usr/share/a2ps/sheets/tex.ssh
-file NOHASH path=usr/share/a2ps/sheets/texinfo.ssh
-file NOHASH path=usr/share/a2ps/sheets/texscript.ssh
-file NOHASH path=usr/share/a2ps/sheets/tiger.ssh
-file NOHASH path=usr/share/a2ps/sheets/tk.ssh
-file NOHASH path=usr/share/a2ps/sheets/udiff.ssh
-file NOHASH path=usr/share/a2ps/sheets/unity.ssh
-file NOHASH path=usr/share/a2ps/sheets/vba.ssh
-file NOHASH path=usr/share/a2ps/sheets/verilog.ssh
-file NOHASH path=usr/share/a2ps/sheets/vhdl.ssh
-file NOHASH path=usr/share/a2ps/sheets/vrml.ssh
-file NOHASH path=usr/share/a2ps/sheets/vtcl.ssh
-file NOHASH path=usr/share/a2ps/sheets/wdiff.ssh
-file NOHASH path=usr/share/a2ps/sheets/xs.ssh
-file NOHASH path=usr/share/a2ps/sheets/yacc.ssh
-file NOHASH path=usr/share/a2ps/sheets/zsh.ssh
-file NOHASH path=usr/share/emacs/site-lisp/a2ps-print.el
-file NOHASH path=usr/share/emacs/site-lisp/a2ps-print.elc
-file NOHASH path=usr/share/emacs/site-lisp/a2ps.el
-file NOHASH path=usr/share/emacs/site-lisp/a2ps.elc
-file NOHASH path=usr/share/info/a2ps.info
-file NOHASH path=usr/share/info/a2ps.info-1
-file NOHASH path=usr/share/info/a2ps.info-2
-file NOHASH path=usr/share/info/a2ps.info-3
-file NOHASH path=usr/share/info/a2ps.info-4
-file NOHASH path=usr/share/info/a2ps.info-5
-file NOHASH path=usr/share/info/a2ps.info-6
-file NOHASH path=usr/share/info/ogonkify.info
-file NOHASH path=usr/share/info/regex.info
-file NOHASH path=usr/share/info/regex.info-1
-file NOHASH path=usr/share/info/regex.info-2
-file NOHASH path=usr/share/info/regex.info-3
-file NOHASH path=usr/share/locale/ca/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/cs/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/da/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/de/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/es/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/et/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/fr/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/it/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/ko/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/nl/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/no/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/pl/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/pt/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/ru/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/sl/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/sv/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/locale/tr/LC_MESSAGES/a2ps.mo
-file NOHASH path=usr/share/man/man1/a2ps.1
-file NOHASH path=usr/share/man/man1/card.1
-file NOHASH path=usr/share/man/man1/fixps.1
-file NOHASH path=usr/share/man/man1/ogonkify.1
-file NOHASH path=usr/share/man/man1/pdiff.1
-file NOHASH path=usr/share/man/man1/psmandup.1
-file NOHASH path=usr/share/man/man1/psset.1
-file NOHASH path=usr/share/man/man1/texi2dvi4a2ps.1
-file NOHASH path=usr/share/ogonkify/README
-file NOHASH path=usr/share/ogonkify/adobe.enc
-file NOHASH path=usr/share/ogonkify/afm/pcrb-o.afm
-file NOHASH path=usr/share/ogonkify/afm/pcrbo-o.afm
-file NOHASH path=usr/share/ogonkify/afm/pcrr-o.afm
-file NOHASH path=usr/share/ogonkify/afm/pcrro-o.afm
-file NOHASH path=usr/share/ogonkify/afm/phvb-o.afm
-file NOHASH path=usr/share/ogonkify/afm/phvbo-o.afm
-file NOHASH path=usr/share/ogonkify/afm/phvr-o.afm
-file NOHASH path=usr/share/ogonkify/afm/phvro-o.afm
-file NOHASH path=usr/share/ogonkify/afm/ptmb-o.afm
-file NOHASH path=usr/share/ogonkify/afm/ptmbi-o.afm
-file NOHASH path=usr/share/ogonkify/afm/ptmr-o.afm
-file NOHASH path=usr/share/ogonkify/afm/ptmri-o.afm
-file NOHASH path=usr/share/ogonkify/allchars.ps
-file NOHASH path=usr/share/ogonkify/ascii.enc
-file NOHASH path=usr/share/ogonkify/compose.ps
-file NOHASH path=usr/share/ogonkify/cp1250.enc
-file NOHASH path=usr/share/ogonkify/fonts/pcrb-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/pcrbo-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/pcrr-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/pcrro-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/phvb-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/phvbo-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/phvr-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/phvro-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/ptmb-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/ptmbi-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/ptmr-o.pfa
-file NOHASH path=usr/share/ogonkify/fonts/ptmri-o.pfa
-file NOHASH path=usr/share/ogonkify/helper.ps
-file NOHASH path=usr/share/ogonkify/hp.enc
-file NOHASH path=usr/share/ogonkify/ibmpc.enc
-file NOHASH path=usr/share/ogonkify/latin1.enc
-file NOHASH path=usr/share/ogonkify/latin2.enc
-file NOHASH path=usr/share/ogonkify/latin3.enc
-file NOHASH path=usr/share/ogonkify/latin4.enc
-file NOHASH path=usr/share/ogonkify/latin5.enc
-file NOHASH path=usr/share/ogonkify/latin6.enc
-file NOHASH path=usr/share/ogonkify/latin7.enc
-file NOHASH path=usr/share/ogonkify/latin9.enc
-file NOHASH path=usr/share/ogonkify/mac.enc
-file NOHASH path=usr/share/ogonkify/ogonki.enc
-file NOHASH path=usr/share/ogonkify/pcrb-o.ps
-file NOHASH path=usr/share/ogonkify/pcrbo-o.ps
-file NOHASH path=usr/share/ogonkify/pcrr-o.ps
-file NOHASH path=usr/share/ogonkify/pcrro-o.ps
-file NOHASH path=usr/share/ogonkify/phvb-o.ps
-file NOHASH path=usr/share/ogonkify/phvbo-o.ps
-file NOHASH path=usr/share/ogonkify/phvr-o.ps
-file NOHASH path=usr/share/ogonkify/phvro-o.ps
-file NOHASH path=usr/share/ogonkify/printenc.ps
-file NOHASH path=usr/share/ogonkify/ptmb-o.ps
-file NOHASH path=usr/share/ogonkify/ptmbi-o.ps
-file NOHASH path=usr/share/ogonkify/ptmr-o.ps
-file NOHASH path=usr/share/ogonkify/ptmri-o.ps
+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
+file path=usr/share/a2ps/afm/pbkd.afm
+file path=usr/share/a2ps/afm/pbkdi.afm
+file path=usr/share/a2ps/afm/pbkl.afm
+file path=usr/share/a2ps/afm/pbkli.afm
+file path=usr/share/a2ps/afm/pcfont.afm
+file path=usr/share/a2ps/afm/pcrb.afm
+file path=usr/share/a2ps/afm/pcrbo.afm
+file path=usr/share/a2ps/afm/pcrr.afm
+file path=usr/share/a2ps/afm/pcrro.afm
+file path=usr/share/a2ps/afm/phvb.afm
+file path=usr/share/a2ps/afm/phvbo.afm
+file path=usr/share/a2ps/afm/phvbon.afm
+file path=usr/share/a2ps/afm/phvbrn.afm
+file path=usr/share/a2ps/afm/phvr.afm
+file path=usr/share/a2ps/afm/phvro.afm
+file path=usr/share/a2ps/afm/phvron.afm
+file path=usr/share/a2ps/afm/phvrrn.afm
+file path=usr/share/a2ps/afm/pncb.afm
+file path=usr/share/a2ps/afm/pncbi.afm
+file path=usr/share/a2ps/afm/pncr.afm
+file path=usr/share/a2ps/afm/pncri.afm
+file path=usr/share/a2ps/afm/pplb.afm
+file path=usr/share/a2ps/afm/pplbi.afm
+file path=usr/share/a2ps/afm/pplr.afm
+file path=usr/share/a2ps/afm/pplri.afm
+file path=usr/share/a2ps/afm/psyr.afm
+file path=usr/share/a2ps/afm/ptmb.afm
+file path=usr/share/a2ps/afm/ptmbi.afm
+file path=usr/share/a2ps/afm/ptmi.afm
+file path=usr/share/a2ps/afm/ptmr.afm
+file path=usr/share/a2ps/afm/pzcmi.afm
+file path=usr/share/a2ps/afm/pzdr.afm
+file path=usr/share/a2ps/encoding/ascii.edf
+file path=usr/share/a2ps/encoding/encoding.map
+file path=usr/share/a2ps/encoding/hp.edf
+file path=usr/share/a2ps/encoding/ibm-cp437.edf
+file path=usr/share/a2ps/encoding/ibm-cp850.edf
+file path=usr/share/a2ps/encoding/iso1.edf
+file path=usr/share/a2ps/encoding/iso10.edf
+file path=usr/share/a2ps/encoding/iso13.edf
+file path=usr/share/a2ps/encoding/iso15.edf
+file path=usr/share/a2ps/encoding/iso2.edf
+file path=usr/share/a2ps/encoding/iso3.edf
+file path=usr/share/a2ps/encoding/iso4.edf
+file path=usr/share/a2ps/encoding/iso5.edf
+file path=usr/share/a2ps/encoding/iso7.edf
+file path=usr/share/a2ps/encoding/iso9.edf
+file path=usr/share/a2ps/encoding/koi8.edf
+file path=usr/share/a2ps/encoding/mac.edf
+file path=usr/share/a2ps/encoding/ms-cp1250.edf
+file path=usr/share/a2ps/fonts/pcfont.pfa
+file path=usr/share/a2ps/ppd/README
+file path=usr/share/a2ps/ppd/level1.ppd
+file path=usr/share/a2ps/ppd/level2.ppd
+file path=usr/share/a2ps/ps/a2ps.hdr
+file path=usr/share/a2ps/ps/base.ps
+file path=usr/share/a2ps/ps/bold.pro
+file path=usr/share/a2ps/ps/bw.pro
+file path=usr/share/a2ps/ps/color.hdr
+file path=usr/share/a2ps/ps/color.pro
+file path=usr/share/a2ps/ps/diff.pro
+file path=usr/share/a2ps/ps/ehandler.ps
+file path=usr/share/a2ps/ps/fixed.pro
+file path=usr/share/a2ps/ps/gray.pro
+file path=usr/share/a2ps/ps/gray2.pro
+file path=usr/share/a2ps/ps/matrix.pro
+file path=usr/share/a2ps/ps/ul.pro
+file path=usr/share/a2ps/sheets/68000.ssh
+file path=usr/share/a2ps/sheets/a2psrc.ssh
+file path=usr/share/a2ps/sheets/ada.ssh
+file path=usr/share/a2ps/sheets/asn1.ssh
+file path=usr/share/a2ps/sheets/autoconf.ssh
+file path=usr/share/a2ps/sheets/awk.ssh
+file path=usr/share/a2ps/sheets/b.ssh
+file path=usr/share/a2ps/sheets/bc.ssh
+file path=usr/share/a2ps/sheets/c.ssh
+file path=usr/share/a2ps/sheets/caml.ssh
+file path=usr/share/a2ps/sheets/card.ssh
+file path=usr/share/a2ps/sheets/chlog.ssh
+file path=usr/share/a2ps/sheets/cidl.ssh
+file path=usr/share/a2ps/sheets/claire.ssh
+file path=usr/share/a2ps/sheets/clisp.ssh
+file path=usr/share/a2ps/sheets/coqv.ssh
+file path=usr/share/a2ps/sheets/cpp.ssh
+file path=usr/share/a2ps/sheets/csh.ssh
+file path=usr/share/a2ps/sheets/cxx.ssh
+file path=usr/share/a2ps/sheets/dc_shell.ssh
+file path=usr/share/a2ps/sheets/eiffel.ssh
+file path=usr/share/a2ps/sheets/elisp.ssh
+file path=usr/share/a2ps/sheets/eps.ssh
+file path=usr/share/a2ps/sheets/for-fixed.ssh
+file path=usr/share/a2ps/sheets/for-free.ssh
+file path=usr/share/a2ps/sheets/for77-fixed.ssh
+file path=usr/share/a2ps/sheets/for77-free.ssh
+file path=usr/share/a2ps/sheets/for77kwds.ssh
+file path=usr/share/a2ps/sheets/for90-fixed.ssh
+file path=usr/share/a2ps/sheets/for90-free.ssh
+file path=usr/share/a2ps/sheets/for90kwds.ssh
+file path=usr/share/a2ps/sheets/fortran.ssh
+file path=usr/share/a2ps/sheets/gmake.ssh
+file path=usr/share/a2ps/sheets/gnuc.ssh
+file path=usr/share/a2ps/sheets/haskell.ssh
+file path=usr/share/a2ps/sheets/html.ssh
+file path=usr/share/a2ps/sheets/idl.ssh
+file path=usr/share/a2ps/sheets/initora.ssh
+file path=usr/share/a2ps/sheets/is5rul.ssh
+file path=usr/share/a2ps/sheets/java.ssh
+file path=usr/share/a2ps/sheets/js.ssh
+file path=usr/share/a2ps/sheets/lace.ssh
+file path=usr/share/a2ps/sheets/lex.ssh
+file path=usr/share/a2ps/sheets/lout.ssh
+file path=usr/share/a2ps/sheets/mail.ssh
+file path=usr/share/a2ps/sheets/make.ssh
+file path=usr/share/a2ps/sheets/maple.ssh
+file path=usr/share/a2ps/sheets/matlab4.ssh
+file path=usr/share/a2ps/sheets/mib.ssh
+file path=usr/share/a2ps/sheets/mly.ssh
+file path=usr/share/a2ps/sheets/modula2.ssh
+file path=usr/share/a2ps/sheets/modula3.ssh
+file path=usr/share/a2ps/sheets/o2c.ssh
+file path=usr/share/a2ps/sheets/oberon.ssh
+file path=usr/share/a2ps/sheets/objc.ssh
+file path=usr/share/a2ps/sheets/ocaml.ssh
+file path=usr/share/a2ps/sheets/octave.ssh
+file path=usr/share/a2ps/sheets/oracle.ssh
+file path=usr/share/a2ps/sheets/pascal.ssh
+file path=usr/share/a2ps/sheets/perl.ssh
+file path=usr/share/a2ps/sheets/plsql.ssh
+file path=usr/share/a2ps/sheets/pov.ssh
+file path=usr/share/a2ps/sheets/ppd.ssh
+file path=usr/share/a2ps/sheets/pre.ssh
+file path=usr/share/a2ps/sheets/pretex.ssh
+file path=usr/share/a2ps/sheets/prolog.ssh
+file path=usr/share/a2ps/sheets/promela.ssh
+file path=usr/share/a2ps/sheets/ps.ssh
+file path=usr/share/a2ps/sheets/python.ssh
+file path=usr/share/a2ps/sheets/rexx.ssh
+file path=usr/share/a2ps/sheets/sather.ssh
+file path=usr/share/a2ps/sheets/scheme.ssh
+file path=usr/share/a2ps/sheets/sdl88.ssh
+file path=usr/share/a2ps/sheets/sed.ssh
+file path=usr/share/a2ps/sheets/sh.ssh
+file path=usr/share/a2ps/sheets/sheets.map
+file path=usr/share/a2ps/sheets/shell.ssh
+file path=usr/share/a2ps/sheets/sml.ssh
+file path=usr/share/a2ps/sheets/sql.ssh
+file path=usr/share/a2ps/sheets/sql92.ssh
+file path=usr/share/a2ps/sheets/ssh.ssh
+file path=usr/share/a2ps/sheets/symbols.ssh
+file path=usr/share/a2ps/sheets/tcl.ssh
+file path=usr/share/a2ps/sheets/tclx.ssh
+file path=usr/share/a2ps/sheets/tcsh.ssh
+file path=usr/share/a2ps/sheets/tex.ssh
+file path=usr/share/a2ps/sheets/texinfo.ssh
+file path=usr/share/a2ps/sheets/texscript.ssh
+file path=usr/share/a2ps/sheets/tiger.ssh
+file path=usr/share/a2ps/sheets/tk.ssh
+file path=usr/share/a2ps/sheets/udiff.ssh
+file path=usr/share/a2ps/sheets/unity.ssh
+file path=usr/share/a2ps/sheets/vba.ssh
+file path=usr/share/a2ps/sheets/verilog.ssh
+file path=usr/share/a2ps/sheets/vhdl.ssh
+file path=usr/share/a2ps/sheets/vrml.ssh
+file path=usr/share/a2ps/sheets/vtcl.ssh
+file path=usr/share/a2ps/sheets/wdiff.ssh
+file path=usr/share/a2ps/sheets/xs.ssh
+file path=usr/share/a2ps/sheets/yacc.ssh
+file path=usr/share/a2ps/sheets/zsh.ssh
+file path=usr/share/emacs/site-lisp/a2ps-print.el
+file path=usr/share/emacs/site-lisp/a2ps-print.elc
+file path=usr/share/emacs/site-lisp/a2ps.el
+file path=usr/share/emacs/site-lisp/a2ps.elc
+file path=usr/share/info/a2ps.info
+file path=usr/share/info/a2ps.info-1
+file path=usr/share/info/a2ps.info-2
+file path=usr/share/info/a2ps.info-3
+file path=usr/share/info/a2ps.info-4
+file path=usr/share/info/a2ps.info-5
+file path=usr/share/info/a2ps.info-6
+file path=usr/share/info/ogonkify.info
+file path=usr/share/info/regex.info
+file path=usr/share/info/regex.info-1
+file path=usr/share/info/regex.info-2
+file path=usr/share/info/regex.info-3
+file path=usr/share/locale/ca/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/cs/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/da/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/de/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/es/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/et/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/fr/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/it/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/ko/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/nl/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/no/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/pl/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/pt/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/ru/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/sl/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/sv/LC_MESSAGES/a2ps.mo
+file path=usr/share/locale/tr/LC_MESSAGES/a2ps.mo
+file path=usr/share/man/man1/a2ps.1
+file path=usr/share/man/man1/card.1
+file path=usr/share/man/man1/fixps.1
+file path=usr/share/man/man1/ogonkify.1
+file path=usr/share/man/man1/pdiff.1
+file path=usr/share/man/man1/psmandup.1
+file path=usr/share/man/man1/psset.1
+file path=usr/share/man/man1/texi2dvi4a2ps.1
+file path=usr/share/ogonkify/README
+file path=usr/share/ogonkify/adobe.enc
+file path=usr/share/ogonkify/afm/pcrb-o.afm
+file path=usr/share/ogonkify/afm/pcrbo-o.afm
+file path=usr/share/ogonkify/afm/pcrr-o.afm
+file path=usr/share/ogonkify/afm/pcrro-o.afm
+file path=usr/share/ogonkify/afm/phvb-o.afm
+file path=usr/share/ogonkify/afm/phvbo-o.afm
+file path=usr/share/ogonkify/afm/phvr-o.afm
+file path=usr/share/ogonkify/afm/phvro-o.afm
+file path=usr/share/ogonkify/afm/ptmb-o.afm
+file path=usr/share/ogonkify/afm/ptmbi-o.afm
+file path=usr/share/ogonkify/afm/ptmr-o.afm
+file path=usr/share/ogonkify/afm/ptmri-o.afm
+file path=usr/share/ogonkify/allchars.ps
+file path=usr/share/ogonkify/ascii.enc
+file path=usr/share/ogonkify/compose.ps
+file path=usr/share/ogonkify/cp1250.enc
+file path=usr/share/ogonkify/fonts/pcrb-o.pfa
+file path=usr/share/ogonkify/fonts/pcrbo-o.pfa
+file path=usr/share/ogonkify/fonts/pcrr-o.pfa
+file path=usr/share/ogonkify/fonts/pcrro-o.pfa
+file path=usr/share/ogonkify/fonts/phvb-o.pfa
+file path=usr/share/ogonkify/fonts/phvbo-o.pfa
+file path=usr/share/ogonkify/fonts/phvr-o.pfa
+file path=usr/share/ogonkify/fonts/phvro-o.pfa
+file path=usr/share/ogonkify/fonts/ptmb-o.pfa
+file path=usr/share/ogonkify/fonts/ptmbi-o.pfa
+file path=usr/share/ogonkify/fonts/ptmr-o.pfa
+file path=usr/share/ogonkify/fonts/ptmri-o.pfa
+file path=usr/share/ogonkify/helper.ps
+file path=usr/share/ogonkify/hp.enc
+file path=usr/share/ogonkify/ibmpc.enc
+file path=usr/share/ogonkify/latin1.enc
+file path=usr/share/ogonkify/latin2.enc
+file path=usr/share/ogonkify/latin3.enc
+file path=usr/share/ogonkify/latin4.enc
+file path=usr/share/ogonkify/latin5.enc
+file path=usr/share/ogonkify/latin6.enc
+file path=usr/share/ogonkify/latin7.enc
+file path=usr/share/ogonkify/latin9.enc
+file path=usr/share/ogonkify/mac.enc
+file path=usr/share/ogonkify/ogonki.enc
+file path=usr/share/ogonkify/pcrb-o.ps
+file path=usr/share/ogonkify/pcrbo-o.ps
+file path=usr/share/ogonkify/pcrr-o.ps
+file path=usr/share/ogonkify/pcrro-o.ps
+file path=usr/share/ogonkify/phvb-o.ps
+file path=usr/share/ogonkify/phvbo-o.ps
+file path=usr/share/ogonkify/phvr-o.ps
+file path=usr/share/ogonkify/phvro-o.ps
+file path=usr/share/ogonkify/printenc.ps
+file path=usr/share/ogonkify/ptmb-o.ps
+file path=usr/share/ogonkify/ptmbi-o.ps
+file path=usr/share/ogonkify/ptmr-o.ps
+file path=usr/share/ogonkify/ptmri-o.ps
 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 arch=$(ARCH) category=system \
+legacy	pkg=SUNWa2psr \
 	name="a2ps - GNU Any to PostScript filter (root)" \
-	desc="a2ps - GNU Any to PostScript filter (root) 4.13b" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWa2psr variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.09.30.04.23
+	desc="a2ps - GNU Any to PostScript filter (root) 4.13b"
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWa2psu \
 	name="a2ps - GNU Any to PostScript filter (usr)" \
-	desc="a2ps - GNU Any to PostScript filter (usr) 4.13b" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWa2psu variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.09.30.04.23
-
-set name=variant.opensolaris.zone value=global value=nonglobal
+	desc="a2ps - GNU Any to PostScript filter (usr) 4.13b"

--- a/components/bzip2/Makefile	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/bzip2/Makefile	Mon Feb 07 17:45:11 2011 -0800
@@ -18,20 +18,19 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		bzip2
 COMPONENT_VERSION=	1.0.6
-IPS_PKG_NAME=		compress/bzip2
-COMPONENT_DESCRIPTION=	"The bzip compression utility"
-COMPONENT_CLASSIFICATION="Applications/System Utilities"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://www.bzip.org
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3f89f861209ce81a6bab1fd1998c0ef311712002
-COMPONENT_ARCHIVE_URL=	http://www.bzip.org/1.0.6/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	http://www.bzip.org/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk

--- a/components/bzip2/bzip2.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/bzip2/bzip2.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -1,3 +1,4 @@
+#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
@@ -17,13 +18,16 @@
 #
 # CDDL HEADER END
 #
+
+#
 # 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="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+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"
+set name=info.upstream_url value=http://www.bzip.org/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
@@ -71,12 +75,6 @@
 
 license bzip2.license license="bzip2 license"
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWbzip \
 	name="The bzip compression utility" \
-	desc="The bzip compression utility" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWbzip variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.10.26.16.59
-
-set name=variant.opensolaris.zone value=global value=nonglobal
-
+	desc="The bzip compression utility"

--- a/components/elinks/Makefile	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/elinks/Makefile	Mon Feb 07 17:45:11 2011 -0800
@@ -24,11 +24,7 @@
 
 COMPONENT_NAME=		elinks
 COMPONENT_VERSION=	0.11.7
-IPS_PKG_NAME=		web/browser/elinks
-COMPONENT_DESCRIPTION=	"ELinks - Text-based Web browser"
-COMPONENT_CLASSIFICATION="Applications/Internet"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://elinks.or.cz/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54
 COMPONENT_ARCHIVE_URL=	http://elinks.or.cz/download/$(COMPONENT_ARCHIVE)

--- a/components/elinks/elinks.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/elinks/elinks.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -21,10 +21,10 @@
 # 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)
-set name=pkg.summary value="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+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 enhanded 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.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
@@ -160,11 +160,6 @@
 
 license elinks.license license="GPLv2"
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWelinks \
 	name="ELinks" \
-	desc="ELinks - Text-based Web browser (0.11.7)" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWelinks variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.12.22.04.35
-
-set name=variant.opensolaris.zone value=global value=nonglobal
+	desc="ELinks - Text-based Web browser (0.11.7)"

--- a/components/gtar/Makefile	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/gtar/Makefile	Mon Feb 07 17:45:11 2011 -0800
@@ -24,11 +24,7 @@
 
 COMPONENT_NAME=		tar
 COMPONENT_VERSION=	1.25
-IPS_PKG_NAME=		archiver/gnu-tar
-COMPONENT_DESCRIPTION=	"GNU tar - A utility used to store, backup, and transport files"
-COMPONENT_CLASSIFICATION="Development/GNU"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://www.gnu.org/software/tar/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:0f0c090e51d127cbeffbb9aeeb90db1181d82aed
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/tar/$(COMPONENT_ARCHIVE)
@@ -61,7 +57,7 @@
 
 include ../../make-rules/shared-targets.mk
 
-COMPONENT_BUILD_TARGETS = all check
+COMPONENT_BUILD_TARGETS = all
 
 build:		$(BUILD_32)
 

--- a/components/gtar/gtar.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/gtar/gtar.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -21,10 +21,10 @@
 # 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)
-set name=pkg.summary value="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+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.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
@@ -164,11 +164,6 @@
 
 license gtar.license license="GPLv3"
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWgtar \
 	name="gtar - GNU tar" \
-	desc="GNU tar - A utility used to store, backup, and transport files (gtar) 1.25" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWgtar variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.10.26.16.59
-
-set name=variant.opensolaris.zone value=global value=nonglobal
+	desc="GNU tar - A utility used to store, backup, and transport files (gtar) 1.25"

--- a/components/less/Makefile	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/less/Makefile	Mon Feb 07 17:45:11 2011 -0800
@@ -18,6 +18,8 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
@@ -25,14 +27,10 @@
 
 COMPONENT_NAME=		less
 COMPONENT_VERSION=	436
-IPS_PKG_NAME=		text/less
-COMPONENT_DESCRIPTION=	"The GNU pager (less) 436"
-COMPONENT_CLASSIFICATION="Development/GNU"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://www.greenwoodsoftware.com/less/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:f78998a1a79a7e1962c901dd41bdc3d1c2005471
-COMPONENT_ARCHIVE_URL=	http://www.greenwoodsoftware.com/less/less-436.tar.gz
+COMPONENT_ARCHIVE_URL=	http://www.greenwoodsoftware.com/less/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk

--- a/components/less/less.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/less/less.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -18,18 +18,19 @@
 #
 # CDDL HEADER END
 #
+
+#
 # 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="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=pkg.fmri value=pkg:/text/less@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+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 ata time)."
+set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
+set name=info.upstream_url value=http://www.greenwoodsoftware.com/less/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 
 license less.license license='Less License'
 
@@ -45,10 +46,6 @@
 file path=usr/share/man/man1/lessecho.1
 file path=usr/share/man/man1/lesskey.1
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWless \
 	name="The GNU pager (less)" \
-	desc="The GNU pager (less) 436" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWless variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=010.10.26.15.59
-
+	desc="The GNU pager (less) 436"

--- a/components/make/Makefile	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/make/Makefile	Mon Feb 07 17:45:11 2011 -0800
@@ -18,6 +18,8 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
@@ -25,11 +27,7 @@
 
 COMPONENT_NAME=		make
 COMPONENT_VERSION=	3.81
-IPS_PKG_NAME=		developer/build/gnu-make
-COMPONENT_DESCRIPTION=	"GNU make - A utility used to build software (gmake) 3.81"
-COMPONENT_CLASSIFICATION="Development/GNU"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://http.gnu.org/software/make/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:cd4fa5a3184176492bf0799593a8f250a728210c
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/make/$(COMPONENT_ARCHIVE)

--- a/components/make/make.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/make/make.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -18,13 +18,16 @@
 #
 # CDDL HEADER END
 #
+
+#
 # 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)
-set name=pkg.summary value="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=pkg.summary value="A utility for directing compilation."
+set name=pkg.description value="GNU Make is an utility which controls the genration of executables and other target files."
+set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
+set name=info.upstream_url value=http://http.gnu.org/software/make/
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
@@ -127,14 +130,8 @@
 link path=usr/sfw/share/man/man1/gmake.1 \
     target=../../../../share/man/man1/gmake.1
 
-
 license make.license license="GPLv2"
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWgmake \
 	name="gmake - GNU make" \
-	desc="GNU make - A utility used to build software (gmake) 3.81" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWgmake variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.10.26.16.59
-
-set name=variant.opensolaris.zone value=global value=nonglobal
+	desc="GNU make - A utility used to build software (gmake) 3.81"

--- a/components/which/Makefile	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/which/Makefile	Mon Feb 07 17:45:11 2011 -0800
@@ -24,14 +24,10 @@
 
 COMPONENT_NAME=		which
 COMPONENT_VERSION=	2.16
-IPS_PKG_NAME=		shell/which
-COMPONENT_DESCRIPTION=	"GNU which"
-COMPONENT_CLASSIFICATION="Applications/System Utilities"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://www.xs4all.nl/~carlo17/which/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:247804c95e91583020b4d57ccb517a2997041bd5
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	http://www.gnu.org/gnu/which/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk

--- a/components/which/which.p5m	Mon Feb 07 08:17:09 2011 -0800
+++ b/components/which/which.p5m	Mon Feb 07 17:45:11 2011 -0800
@@ -21,10 +21,10 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri value=pkg:/shell/which@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=pkg.summary value="GNU which"
+set name=pkg.description 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.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
@@ -44,11 +44,6 @@
 
 license which.license license="GPLv2"
 
-legacy arch=$(ARCH) category=system \
+legacy	pkg=SUNWgnu-which \
 	name="GNU which" \
-	desc="GNU which utility (2.16)" \
-	hotline="Please contact your local service provider" \
-	pkg=SUNWgnu-which variant.arch=$(ARCH) vendor="Oracle Corporation" \
-	version=11.11.0,REV=2010.09.30.04.23
-
-set name=variant.opensolaris.zone value=global value=nonglobal
+	desc="GNU which utility (2.16)"

--- a/make-rules/ips.mk	Mon Feb 07 08:17:09 2011 -0800
+++ b/make-rules/ips.mk	Mon Feb 07 17:45:11 2011 -0800
@@ -65,21 +65,15 @@
 PKG_MACROS +=		ARCH=$(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)
 PKG_MACROS +=		SOLARIS_VERSION=$(SOLARIS_VERSION)
 PKG_MACROS +=		OS_VERSION=$(OS_VERSION)
 PKG_MACROS +=		IPS_COMPONENT_VERSION=$(IPS_COMPONENT_VERSION)
-PKG_MACROS +=		COMPONENT_PROJECT_URL=$(COMPONENT_PROJECT_URL)
 PKG_MACROS +=		COMPONENT_ARCHIVE_URL=$(COMPONENT_ARCHIVE_URL)
 
 PKG_OPTIONS +=		$(PKG_MACROS:%=-D %)
-# multi-word macros get broken up, so we handle them "specially"
-PKG_OPTIONS +=		-D COMPONENT_SUMMARY=$(COMPONENT_SUMMARY)
-PKG_OPTIONS +=		-D COMPONENT_DESCRIPTION=$(COMPONENT_DESCRIPTION)
-PKG_OPTIONS +=		-D COMPONENT_CLASSIFICATION=$(COMPONENT_CLASSIFICATION)
 
 MANIFEST_BASE =		$(BUILD_DIR)/manifest-$(MACH)
 
@@ -96,9 +90,6 @@
 ifeq	($(IPS_PKG_NAME),)
 	IPS_PKG_NAME =	$(COMPONENT_NAME)
 endif
-ifeq	($(COMPONENT_SUMMARY),)
-	COMPONENT_SUMMARY =	$(COMPONENT_DESCRIPTION)
-endif
 IPS_COMPONENT_VERSION =	$(COMPONENT_VERSION)
 
 .DEFAULT:		publish

--- a/transforms/defaults	Mon Feb 07 08:17:09 2011 -0800
+++ b/transforms/defaults	Mon Feb 07 17:45:11 2011 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform dir path=etc$ -> default group sys>
@@ -53,3 +53,14 @@
 <transform file -> default mode 0444>
 <transform dir -> default mode 0755>
 
+#
+# Defaults for legacy metadata for SVR4 package information
+#
+<transform legacy -> default vendor "OpenSolaris">
+<transform legacy -> default hotline \
+	"Please contact your local service provider">
+<transform legacy -> default arch $(ARCH)>
+<transform legacy -> default category "system">
+# This is set to the final version number delivered as SVR4 format
+<transform legacy -> default version "11.11.0,REV=2010.05.25.01.00">
+

--- a/transforms/manifest-metadata-template	Mon Feb 07 08:17:09 2011 -0800
+++ b/transforms/manifest-metadata-template	Mon Feb 07 17:45:11 2011 -0800
@@ -22,14 +22,12 @@
 #
 
 set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="$(COMPONENT_SUMMARY) "
-set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
-set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=pkg.summary value="XXX Summary XXX"
+set name=info.classification value="org.opensolaris.category.2008:XXX Classification XXX"
+set name=info.upstream_url value="XXX PROJECT URL XXX"
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
 
 license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'