7117296 legacy actions need some love
authorRich Burridge <rich.burridge@oracle.com>
Mon, 19 Dec 2011 14:41:24 -0800
changeset 629 daaab66f7276
parent 628 c3c0c8f3f696
child 630 e2df7cbd81a6
7117296 legacy actions need some love
components/aalib/aalib.p5m
components/acpidump/acpidump.p5m
components/apache2-modules/mod_dtrace/apache-dtrace.p5m
components/apache2-modules/mod_fcgid/apache-fcgid.p5m
components/apache2-modules/mod_jk/apache-jk.p5m
components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m
components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m
components/apache2-modules/mod_security2/apache-security.p5m
components/apache2/apache-22.p5m
components/apache2/apache-sed.p5m
components/apache2/documentation.p5m
components/apr-util/apr-util-13-apr-ldap.p5m
components/apr-util/apr-util-13-dbd-mysql.p5m
components/apr-util/apr-util-13-dbd-sqlite.p5m
components/apr-util/apr-util-13-doc.p5m
components/apr-util/apr-util-13.p5m
components/apr/apr-13-doc.p5m
components/apr/apr-13.p5m
components/areca/areca.p5m
components/autoconf/autoconf.p5m
components/autogen/autogen.p5m
components/automake/automake-1.10/automake.p5m
components/automake/automake-1.9.6/automake.p5m
components/bash/bash.p5m
components/bcc/bcc.p5m
components/beanshell/beanshell.p5m
components/bind/bindc.p5m
components/cdrtools/cdrtools.p5m
components/clisp/clisp.p5m
components/cmake/cmake.p5m
components/conflict/conflict.p5m
components/convmv/convmv.p5m
components/coreutils/coreutils.p5m
components/cups/cups-libs.p5m
components/cups/cups.p5m
components/curl/curl.p5m
components/cvs/cvs.p5m
components/diffutils/diffutils.p5m
components/doxygen/doxygen.p5m
components/ejabberd/ejabberd.p5m
components/elinks/elinks.p5m
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/erlang/erlang-doc.p5m
components/erlang/erlang.p5m
components/fastcgi/fcgi-doc.p5m
components/fastcgi/fcgi.p5m
components/fetchmail/fetchmail.p5m
components/foomatic/db-engine/foomatic-db-engine.p5m
components/foomatic/db/foomatic-db.p5m
components/fping/fping.p5m
components/gawk/gawk.p5m
components/gd2/gd2.p5m
components/gdb/gdb.p5m
components/gdbm/gdbm.p5m
components/gettext/gettext.p5m
components/ghostscript/ghostscript.p5m
components/git/git.p5m
components/gnump/gmp.p5m
components/gnupg/gnupg.p5m
components/gnupth/gnupth.p5m
components/gocr/gocr.p5m
components/gperf/gperf.p5m
components/grails/grails.p5m
components/guile/guile.p5m
components/gutenprint/gutenprint.p5m
components/hal-cups-utils/hal-cups-utils.p5m
components/hexedit/hexedit.p5m
components/httping/httping.p5m
components/hwdata/hwdata.p5m
components/iftop/iftop.p5m
components/ilmbase/ilmbase.p5m
components/iperf/iperf.p5m
components/ircii/ircii.p5m
components/junit/junit.p5m
components/lcms/lcms.p5m
components/lftp/lftp.p5m
components/libconfuse/libconfuse.p5m
components/libevent/libevent.p5m
components/libidn/libidn.p5m
components/libmcrypt/libmcrypt.p5m
components/libmemcached/libmemcached.p5m
components/libmng/libmng.p5m
components/libneon/libneon.p5m
components/libnet/libnet.p5m
components/libpcap/libpcap.p5m
components/librsync/librsync.p5m
components/libsigsegv/libsigsegv.p5m
components/libsndfile/libsndfile.p5m
components/libtool/libltdl.p5m
components/libtool/libtool.p5m
components/libtorrent/libtorrent.p5m
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2.p5m
components/libxslt/libxsl-26.p5m
components/libxslt/libxslt.p5m
components/lighttpd/lighttpd.p5m
components/links/links.p5m
components/logilab-astng/logilab-astng.p5m
components/logilab-common/logilab-common.p5m
components/lua/lua.p5m
components/mc/mc.p5m
components/meld/meld.p5m
components/memcached-java/memcached-java.p5m
components/memcached/memcached.p5m
components/mercurial/mercurial.p5m
components/mpfr/mpfr.p5m
components/mutt/mutt.p5m
components/mysql-5-1/mysql-51.p5m
components/mysql-5-1/mysql-51lib.p5m
components/mysql-5-1/mysql-51test.p5m
components/net-snmp/net-snmp-addons.p5m
components/net-snmp/net-snmp-base.p5m
components/net-snmp/net-snmp-documentation.p5m
components/nethack/nethack.p5m
components/nmap/nmap.p5m
components/openexr/openexr.p5m
components/openldap/openldap.p5m
components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m
components/openssl/openssl-1.0.0/openssl-1.0.0.p5m
components/openusb/openusb.p5m
components/p7zip/p7zip.p5m
components/pam_pkcs11/pam_pkcs11.p5m
components/pconsole/pconsole.p5m
components/pcre/pcre.p5m
components/perl_modules/net-ssleay/net-ssleay.p5m
components/perl_modules/pmtools/pmtools.p5m
components/php-5_2/apache-php5.p5m
components/php-5_2/php-52.p5m
components/php-5_2/php-apc.p5m
components/php-5_2/php-doc.p5m
components/php-5_2/php-idn.p5m
components/php-5_2/php-memcache.p5m
components/php-5_2/php-mysql.p5m
components/php-5_2/php-pear.p5m
components/php-5_2/php-suhosin.p5m
components/php-5_2/php-tcpwrap.p5m
components/php-5_2/php-xdebug.p5m
components/privoxy/privoxy.p5m
components/pv/pv.p5m
components/pwgen/pwgen.p5m
components/pylint/pylint.p5m
components/python/cherrypy/cherrypy.p5m
components/python/ldtp/ldtp.p5m
components/python/mako/mako.p5m
components/python/ply/ply.p5m
components/python/pycups/pycups.p5m
components/python/pycurl/pycurl.p5m
components/python/pylxml/pylxml.p5m
components/python/pyopenssl/pyopenssl-26.p5m
components/python/python26/python-26.p5m
components/quagga/quagga.p5m
components/quilt/quilt.p5m
components/rdiff-backup/rdiff-backup.p5m
components/readline/readline.p5m
components/rtorrent/rtorrent.p5m
components/ruby/ruby-18.p5m
components/samba/samba/samba.p5m
components/samba/samba30/libsmbclient.p5m
components/sane-backends/sane-backends.p5m
components/sane-frontends/sane-frontends.p5m
components/sblim/sblim.p5m
components/screen/screen.p5m
components/sed/sed.p5m
components/slang/slang.p5m
components/slib/slib.p5m
components/slrn/slrn.p5m
components/snort/snort.p5m
components/sox/sox.p5m
components/spawn-fcgi/spawn-fcgi.p5m
components/squid/squid.p5m
components/subversion/subversion-java.p5m
components/subversion/subversion-perl.p5m
components/subversion/subversion-python.p5m
components/subversion/subversion.p5m
components/sudo/sudo.p5m
components/swig/swig.p5m
components/tcl/expect/expect.p5m
components/tcltls/tcltls.p5m
components/tcpdump/tcpdump.p5m
components/tidy/tidy.p5m
components/tomcat/tomcat-examples.p5m
components/tomcat/tomcat.p5m
components/top/top.p5m
components/trousers/trousers.p5m
components/unixodbc/unixodbc.p5m
components/unrar/unrar.p5m
components/unzip/unzip.p5m
components/which/which.p5m
components/wireshark/wireshark.p5m
components/wxwidgets/wxwidgets.p5m
components/zlib/zlib.p5m
--- a/components/aalib/aalib.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/aalib/aalib.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -143,7 +143,3 @@
 link path=usr/lib/$(MACH64)/libaa.so.1 target=libaa.so.1.0.4
 link path=usr/lib/libaa.so target=libaa.so.1.0.4
 link path=usr/lib/libaa.so.1 target=libaa.so.1.0.4
-
-legacy pkg=SUNWaalib \
-    desc="AAlib - Ascii art graphics library" \
-    name="AAlib - Ascii art graphics library"
--- a/components/acpidump/acpidump.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/acpidump/acpidump.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -48,8 +48,4 @@
 file acpixtract.1 path=usr/share/man/man1/acpixtract.1
 file madt.1 path=usr/share/man/man1/madt.1
 
-legacy pkg=SUNWacpidump \
-    desc="acpidump - utilities used to display ACPI tables" \
-    name="acpidump - utilities used to display ACPI tables"
-
 license acpidump.license license=GPLv2
--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -47,11 +47,3 @@
     original_name=SUNWapch22m-dtrace:etc/apache2/2.2/conf.d/dtrace.conf
 file build/$(MACH32)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/mod_dtrace.so
 file build/$(MACH64)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_dtrace.so
-
-legacy	pkg=SUNWapch22m-dtrace \
-	name="DTrace plugin for Apache Web Server" \
-	desc="Dtrace plugin for Apache Web Server"
-
-legacy	pkg=SUNWapch22r-dtrace \
-	name="DTrace plugin for Apache Web Server" \
-	desc="Dtrace plugin for Apache Web Server"
--- a/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -54,11 +54,3 @@
 file path=usr/apache2/2.2/libexec/$(MACH64)/mod_fcgid.so
 file path=usr/apache2/2.2/manual/mod/mod_fcgid.html.en
 file path=usr/apache2/2.2/manual/mod/mod_fcgid.html
-
-legacy	pkg=SUNWapch22m-fcgid \
-	name="FastCGI plugin for Apache Web Server" \
-	desc="FastCGI plugin for Apache Web Server"
-
-legacy	pkg=SUNWapch22r-fcgid \
-	name="FastCGI plugin for Apache Web Server" \
-	desc="FastCGI plugin for Apache Web Server"
--- a/components/apache2-modules/mod_jk/apache-jk.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -52,11 +52,3 @@
     original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/workers.properties
 file build/$(MACH32)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/mod_jk.so
 file build/$(MACH64)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_jk.so
-
-legacy	pkg=SUNWapch22m-jk \
-	name="Tomcat Connector plugin for Apache Web Server" \
-	desc="Tomcat Connector plugin for Apache Web Server"
-
-legacy	pkg=SUNWapch22r-jk \
-	name="Tomcat Connector plugin for Apache Web Server" \
-	desc="Tomcat Connector plugin for Apache Web Server"
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -48,11 +48,3 @@
 file proxy_html.conf path=etc/apache2/2.2/samples-conf.d/proxy_html.conf
 file build/$(MACH32)/.libs/mod_proxy_html.so path=usr/apache2/2.2/libexec/mod_proxy_html.so
 file build/$(MACH64)/.libs/mod_proxy_html.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_proxy_html.so
-
-legacy	pkg=SUNWapch22m-proxy-html \
-	name="Proxy HTML plugin for Apache Web Server" \
-	desc="Proxy HTML plugin for Apache Web Server"
-
-legacy	pkg=SUNWapch22r-proxy-html \
-	name="Proxy HTML plugin for Apache Web Server" \
-	desc="Proxy HTML plugin for Apache Web Server"
--- a/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -45,7 +45,3 @@
 file mod_xml2enc.h path=usr/apache2/2.2/include/mod_xml2enc.h
 file build/$(MACH32)/.libs/mod_xml2enc.so path=usr/apache2/2.2/libexec/mod_xml2enc.so
 file build/$(MACH64)/.libs/mod_xml2enc.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_xml2enc.so
-
-legacy	pkg=SUNWapch22m-xml2enc \
-	name="xml2nec plugin for Apache Web Server" \
-	desc="xml2enc plugin for Apache Web Server"
--- a/components/apache2-modules/mod_security2/apache-security.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2-modules/mod_security2/apache-security.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -49,11 +49,3 @@
 file security2.conf path=etc/apache2/2.2/samples-conf.d/security2.conf
 file build/$(MACH32)/.libs/mod_security2.so path=usr/apache2/2.2/libexec/mod_security2.so
 file build/$(MACH64)/.libs/mod_security2.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_security2.so
-
-legacy	pkg=SUNWapch22m-security \
-	name="Mod Security plugin for Apache Web Server" \
-	desc="Mod Security plugin for Apache Web Server"
-
-legacy	pkg=SUNWapch22r-security \
-	name="Mod Security plugin for Apache Web Server" \
-	desc="Mod Security plugin for Apache Web Server"
--- a/components/apache2/apache-22.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2/apache-22.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -640,11 +640,3 @@
 link path=usr/share/man/man8/rotatelogs.8 target=../../../apache2/2.2/man/man8/rotatelogs.8
 link path=usr/share/man/man8/suexec.8 target=../../../apache2/2.2/man/man8/suexec.8
 link path=var/apache2/2.2/libexec/64 target=$(MACH64)
-
-legacy	pkg=SUNWapch22u \
-	name="Apache Web Server (usr)" \
-	desc="The Apache HTTP Server (usr components)"
-
-legacy	pkg=SUNWapch22r \
-	name="Apache Web Server (root)" \
-	desc="The Apache HTTP server (root components)"
--- a/components/apache2/apache-sed.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2/apache-sed.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -48,11 +48,3 @@
 file path=etc/apache2/2.2/samples-conf.d/sed.conf
 file path=usr/apache2/2.2/libexec/mod_sed.so
 file path=usr/apache2/2.2/libexec/$(MACH64)/mod_sed.so
-
-legacy	pkg=SUNWapch22m-sed \
-	name="mod_sed plugin for Apache Web Server" \
-	desc="mod_sed plugin for Apache Web Server"
-
-legacy	pkg=SUNWapch22r-sed \
-	name="mod_sed plugin for Apache Web Server (root)" \
-	desc="mod_sed plugin for Apache Web Server (root component)"
--- a/components/apache2/documentation.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apache2/documentation.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -863,7 +863,3 @@
 file path=usr/apache2/2.2/manual/vhosts/name-based.html.ja.utf8
 file path=usr/apache2/2.2/manual/vhosts/name-based.html.ko.euc-kr
 file path=usr/apache2/2.2/manual/vhosts/name-based.html.tr.utf8
-
-legacy	pkg=SUNWapch22d \
-	name="Apache Web Server Documentation" \
-	desc="The Apache HTTP Server (documentation)"
--- a/components/apr-util/apr-util-13-apr-ldap.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apr-util/apr-util-13-apr-ldap.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -46,7 +46,3 @@
 
 
 license apr-util.license license="Apache v2.0"
-
-legacy	pkg=SUNWapu13-ldap \
-	name="Apache Portable Runtime Utility (APR-util) LDAP's stub" \
-	desc="Apache Portable Runtime Utility (APR-util) LDAP's stub"
--- a/components/apr-util/apr-util-13-dbd-mysql.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apr-util/apr-util-13-dbd-mysql.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -46,7 +46,3 @@
 
 
 license apr-util.license license="Apache v2.0"
-
-legacy	pkg=SUNWapu13dbd-mysql \
-	name="Apache Portable Runtime Utility (APR-util) DBD Driver for MySQL" \
-	desc="Apache Portable Runtime Utility (APR-util) DBD Driver for MySQL"
--- a/components/apr-util/apr-util-13-dbd-sqlite.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apr-util/apr-util-13-dbd-sqlite.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -46,7 +46,3 @@
 
 
 license apr-util.license license="Apache v2.0"
-
-legacy	pkg=SUNWapu13dbd-sqlite \
-	name="Apache Portable Runtime Utility (APR-util) DBD Driver for SQLite" \
-	desc="Apache Portable Runtime Utility (APR-util) DBD Driver for SQLite"
--- a/components/apr-util/apr-util-13-doc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apr-util/apr-util-13-doc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -209,7 +209,3 @@
 
 
 license apr-util.license license="Apache v2.0"
-
-legacy	pkg=SUNWapu13doc \
-	name="Apache Portable Runtime Utility (APR-util) documentation" \
-	desc="Apache Portable Runtime Utility (APR-util) documentation"
--- a/components/apr-util/apr-util-13.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apr-util/apr-util-13.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -104,11 +104,3 @@
 
 
 license apr-util.license license="Apache v2.0"
-
-legacy	pkg=SUNWapu13dev \
-	name="Apache Portable Runtime Utility (APR-util) development header files and libraries" \
-	desc="Apache Portable Runtime Utility (APR-util) development header files and libraries"
-
-legacy	pkg=SUNWapu13lib \
-	name="Apache Portable Runtime Utility (APR-util) Shared Libraries" \
-	desc="Apache Portable Runtime Utility (APR-util) Shared Libraries"
--- a/components/apr/apr-13-doc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apr/apr-13-doc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -218,7 +218,3 @@
 
 
 license apr.license license="Apache v2.0"
-
-legacy	pkg=SUNWapr13doc \
-	name="Apache Portable Runtime (APR) documentation" \
-	desc="Apache Portable Runtime (APR) documentation"
--- a/components/apr/apr-13.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/apr/apr-13.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -114,11 +114,3 @@
 
 
 license apr.license license="Apache v2.0"
-
-legacy	pkg=SUNWapr13dev \
-	name="Apache Portable Runtime (APR) development header files and libraries" \
-	desc="Apache Portable Runtime (APR) development header files and libraries"
-
-legacy	pkg=SUNWapr13lib \
-	name="Apache Portable Runtime (APR) Shared Libraries" \
-	desc="The shared libraries for any component using Apache Portable Runtime (APR)"
--- a/components/areca/areca.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/areca/areca.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -130,10 +130,6 @@
 file path=usr/share/areca/translations/resources_se.properties
 file path=usr/share/areca/translations/resources_tw.properties
 
-legacy pkg=SUNWareca \
-    desc="Areca backup utilities" \
-    name="Areca backup utilities"
-
 link path=usr/bin/areca target=../share/areca/areca.sh
 
 # pkgdepend should have picked up the dependency on bash;
--- a/components/autoconf/autoconf.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/autoconf/autoconf.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -105,8 +105,6 @@
 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, FDLv1.2"
 link path=usr/sfw/bin/autoconf target=../../bin/autoconf
 link path=usr/sfw/bin/autoheader target=../../bin/autoheader
--- a/components/autogen/autogen.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/autogen/autogen.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -111,9 +111,6 @@
 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" \
-    name="autogen - GNU autogen utility"
 license autogen.license license="GPLv2, FDLv1.2"
 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
--- a/components/automake/automake-1.10/automake.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/automake/automake-1.10/automake.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -162,8 +162,6 @@
 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)
--- a/components/automake/automake-1.9.6/automake.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/automake/automake-1.9.6/automake.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -150,6 +150,4 @@
 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 desc="GNU Automake - A Makefile generator" \
-    name="GNU Automake - A Makefile generator"
 license automake.license license=GPLv2
--- a/components/bash/bash.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/bash/bash.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -216,9 +216,6 @@
 #
 legacy pkg=SUNWbash desc="GNU Bourne-Again shell (bash)" \
     name="GNU Bourne-Again shell (bash)"
-legacy pkg=SUNWbashr \
-    desc="GNU Bourne-Again shell (bash) (root package)" \
-    name="GNU Bourne-Again shell (bash) (root)"
 #
 license bash.license license="GPLv3, FDLv1.3"
 #
--- a/components/bcc/bcc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/bcc/bcc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -50,7 +50,3 @@
 file man/ld86.1 path=usr/share/man/man1/ld86.1 
 
 license bcc.license license="GPLv2"
-
-legacy pkg=SUNWbcc \
-    name="bcc - Development tools for 8086 code" \
-    desc="bcc - Development tools for 8086 code"
--- a/components/beanshell/beanshell.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/beanshell/beanshell.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -251,6 +251,3 @@
 file beanshell.1 path=usr/share/man/man1/beanshell.1
 link path=usr/bin/beanshell target=beansh
 license beanshell.license license="LGPLv2.1, SPL"
-legacy pkg=SUNWbeanshell \
-    desc="beanshell - a small and embeddable Java source interpreter" \
-    name="beanshell - a small and embeddable Java source interpreter"
--- a/components/bind/bindc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/bind/bindc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -66,7 +66,3 @@
 link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.4
 link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.4
 link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.4
-
-legacy pkg=SUNWbindc \
-       name="BIND DNS tools" \
-       desc="BIND DNS tools"
--- a/components/cdrtools/cdrtools.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/cdrtools/cdrtools.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -58,6 +58,3 @@
 legacy pkg=SUNWmkcd \
     name="CD creation utilities" \
     desc="CD creation utilities"
-legacy pkg=SUNWmkcdr \
-    name="CD creation utilities (Root)" \
-    desc="CD creation utilities (Root)"
--- a/components/clisp/clisp.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/clisp/clisp.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -149,7 +149,3 @@
 file path=usr/share/locale/ru/LC_MESSAGES/clisplow.mo
 file path=usr/share/man/man1/clisp.1
 file path=usr/share/vim/vimfiles/after/syntax/lisp.vim
-
-legacy pkg=SUNWclisp \
-    desc="GNU Common Lisp implementation" \
-    name="GNU Common Lisp"
--- a/components/cmake/cmake.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/cmake/cmake.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -674,7 +674,3 @@
 file path=usr/share/man/man1/ctest.1
 
 license cmake.license license="BSD, MIT, GPLv2, Curl, PD"
-
-legacy pkg=SUNWcmake \
-    desc="CMake - A cross-platform, open-source make system" \
-    name="CMake - A cross-platform, open-source make system"
--- a/components/conflict/conflict.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/conflict/conflict.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -46,7 +46,3 @@
 
 file path=usr/bin/conflict
 file path=usr/share/man/man1/conflict.1
-
-legacy pkg=SUNWconflict \
-    desc="conflict - displays conflicting filenames in $PATH" \
-    name="conflict"
--- a/components/convmv/convmv.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/convmv/convmv.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -45,7 +45,3 @@
 
 file path=usr/bin/convmv
 file path=usr/share/man/man1/convmv.1
-
-legacy pkg=SUNWconvmv \
-    desc="Filename Encoding Conversion Tool (convmv)" \
-    name="Filename Encoding Conversion Tool"
--- a/components/coreutils/coreutils.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/coreutils/coreutils.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -404,9 +404,6 @@
 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" \
-    name="coreutils - GNU core utilities"
 license coreutils.license license="GPLv3, FDLv1.3"
 link path=usr/gnu/share/locale/af/LC_TIME/coreutils.mo \
     target=../LC_MESSAGES/coreutils.mo
--- a/components/cups/cups-libs.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/cups/cups-libs.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,3 @@
 link path=usr/lib/libcupsimage.so target=libcupsimage.so.2
 link path=usr/lib/$(MACH64)/libcups.so target=libcups.so.2
 link path=usr/lib/$(MACH64)/libcupsimage.so target=libcupsimage.so.2
-
-legacy pkg=SUNWcupsu \
-       desc="Common Unix Print System (usr)" \
-       name="Common Unix Print System (usr)"
--- a/components/cups/cups.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/cups/cups.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -1205,11 +1205,3 @@
 link path=usr/share/man/man1/cupsdisable.1 target=../man1m/cupsenable.1m
 link path=usr/share/man/man1/cupsreject.1 target=../man1m/cupsaccept.1m
 link path=usr/share/man/man1/reject.1 target=../man1m/cupsaccept.1m
-
-legacy pkg=SUNWcupsr \
-       desc="Common Unix Print System (root)" \
-       name="Common Unix Print System (root)"
-
-legacy pkg=SUNWcupsu \
-       desc="Common Unix Print System (usr)" \
-       name="Common Unix Print System (usr)"
--- a/components/curl/curl.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/curl/curl.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -186,7 +186,3 @@
 link path=usr/lib/$(MACH64)/libcurl.so target=libcurl.so.3.0.0
 #
 license curl.license license="CURL"
-#
-legacy pkg=SUNWcurl \
-    desc="CURL - The C-URL Wrappers Library" \
-    name="The C-URL Wrappers Library"
--- a/components/cvs/cvs.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/cvs/cvs.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,6 +41,4 @@
 file path=usr/bin/cvs
 file path=usr/share/man/man1/cvs.1
 file path=usr/share/man/man5/cvs.5
-legacy pkg=SUNWcvs desc="The CVS version control system" \
-    name="The CVS version control system"
 license cvs.license license=GPLv2
--- a/components/diffutils/diffutils.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/diffutils/diffutils.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -128,9 +128,6 @@
 file usr/share/man/man1/diff.1 path=usr/gnu/share/man/man1/diff.1
 file usr/share/man/man1/diff3.1 path=usr/gnu/share/man/man1/diff3.1
 file usr/share/man/man1/sdiff.1 path=usr/gnu/share/man/man1/sdiff.1
-legacy pkg=SUNWgnu-diffutils \
-    desc="GNU diffutils - Finds differences between and among files" \
-    name="GNU diffutils"
 license diffutils.license license="GPLv2, FDLv1.1"
 link path=usr/bin/gcmp \
     target=../gnu/bin/cmp facet.compat.gnulinks=true
--- a/components/doxygen/doxygen.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/doxygen/doxygen.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -47,6 +47,4 @@
     path=usr/share/doc/doxygen-1.5.7.1/doxygen_manual-1.5.7.1.pdf
 file usr/man/man1/doxygen.1 path=usr/share/man/man1/doxygen.1
 file usr/man/man1/doxytag.1 path=usr/share/man/man1/doxytag.1
-legacy pkg=SUNWdoxygen desc="Doxygen - Source Code Documentation Tool" \
-    name="Source Code Documentation Tool"
 license doxygen.license license=GPLv2
--- a/components/ejabberd/ejabberd.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/ejabberd/ejabberd.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -327,11 +327,4 @@
 file path=usr/share/doc/ejabberd/webadmmainru.png
 file path=usr/share/doc/ejabberd/yozhikheader.png
 
-legacy pkg=SUNWejabberdr \
-    name="ejabberd - Jabber/XMPP instant messaging server (Root)" \
-    desc="ejabberd Jabber/XMPP instant messaging server"
-legacy pkg=SUNWejabberdu \
-    name="ejabberd - Jabber/XMPP instant messaging server (Usr)" \
-    desc="ejabberd Jabber/XMPP instant messaging server"
-
 license COPYING license="GPLv2"
--- a/components/elinks/elinks.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/elinks/elinks.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -162,7 +162,4 @@
 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
-legacy pkg=SUNWelinks \
-    desc="ELinks - Text-based Web browser" \
-    name="ELinks"
 license elinks.license license=GPLv2
--- a/components/emacs/gnu-emacs-gtk.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/emacs/gnu-emacs-gtk.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -33,10 +33,6 @@
 
 license emacs.license license="GPLv3"
 
-legacy pkg=SUNWgnu-emacs-gtk \
-	name="GNU emacs with X11 support (GTK toolkit)" \
-	desc="GNU emacs with X11 support (GTK toolkit)"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
--- a/components/emacs/gnu-emacs-lisp.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/emacs/gnu-emacs-lisp.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -33,10 +33,6 @@
 
 license emacs.license license="GPLv3"
 
-legacy pkg=SUNWgnu-emacs-el \
-	name="GNU emacs LISP (.el) files" \
-	desc="GNU emacs LISP (.el) files not accessed in normal use but necessary for emacs development"
-
 dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim
 dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim/ja-dic
 dir path=usr/share/emacs/$(COMPONENT_VERSION)/leim/quail
--- a/components/emacs/gnu-emacs-no-x11.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/emacs/gnu-emacs-no-x11.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -33,10 +33,6 @@
 
 license emacs.license license="GPLv3"
 
-legacy pkg=SUNWgnu-emacs-nox \
-	name="GNU emacs without X Window System support" \
-	desc="GNU emacs without X Window System support"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
--- a/components/emacs/gnu-emacs-x11.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/emacs/gnu-emacs-x11.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -33,10 +33,6 @@
 
 license emacs.license license="GPLv3"
 
-legacy pkg=SUNWgnu-emacs-x \
-	name="GNU emacs with X11 support (Xaw toolkit)" \
-	desc="GNU emacs with X11 support (Xaw toolkit)"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/share
--- a/components/emacs/gnu-emacs.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/emacs/gnu-emacs.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -34,10 +34,6 @@
 
 license emacs.license license="GPLv3"
 
-legacy pkg=SUNWgnu-emacs \
-	name="GNU emacs core" \
-	desc="GNU emacs core: All files needed to run emacs except for the program itself. Must be installed with one or more emacs binary package"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/gnu
--- a/components/erlang/erlang-doc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/erlang/erlang-doc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -37,10 +37,6 @@
 
 license EPLICENCE license="EPL 1.1"
 
-legacy pkg=SUNWerlang-doc \
-    name="Erlang/OTP Documentation" \
-    desc="Erlang/OTP HTML Documents"
-
 dir path=usr
 dir path=usr/share
 dir path=usr/share/doc
--- a/components/erlang/erlang.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/erlang/erlang.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -37,10 +37,6 @@
 
 license EPLICENCE license="EPL 1.1"
 
-legacy pkg=SUNWerlang \
-    name="Erlang/OTP" \
-    desc="Erlang programming language and OTP libraries"
-
 <transform file path=.*lib/.*app -> default mode 0444>
 <transform file path=.*lib/.*appup -> default mode 0444>
 <transform file path=.*lib/.*beam -> default mode 0444>
--- a/components/fastcgi/fcgi-doc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/fastcgi/fcgi-doc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -65,7 +65,4 @@
 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
-legacy pkg=SUNWfcgi-doc \
-    desc="Documentation for FastCGI Application Libraries" \
-    name="FastCGI Application Libraries - Documentation"
 license fcgi.license license=FastCGI
--- a/components/fastcgi/fcgi.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/fastcgi/fcgi.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -63,9 +63,6 @@
 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
-legacy pkg=SUNWfcgi \
-    desc="FastCGI is a high-speed and scalable interface for communicating with the web server" \
-    name="FastCGI - fcgi Application Libraries"
 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
--- a/components/fetchmail/fetchmail.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/fetchmail/fetchmail.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -37,10 +37,6 @@
 
 license fetchmail.license license=GPLv2
 
-legacy pkg=SUNWfetchmail \
-    desc="Fetchmail Mail Retrieval and Forwarding Utility" \
-    name="Fetchmail Mail Retrieval and Forwarding Utility"
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/lib
--- a/components/foomatic/db-engine/foomatic-db-engine.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -33,14 +33,6 @@
 
 license foomatic-db-engine.license license='GPLv2, MIT'
 
-legacy pkg=SUNWfoomatic-db-enginer \
-   desc="Foomatic Database Engine (root)" \
-   name="Foomatic Database Engine (root)"
-
-legacy pkg=SUNWfoomatic-db-engineu \
-   desc="Foomatic Database Engine (usr)" \
-   name="Foomatic Database Engine (usr)"
-
 dir path=etc
 dir path=etc/foomatic
 dir path=usr
--- a/components/foomatic/db/foomatic-db.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/foomatic/db/foomatic-db.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -31,8 +31,6 @@
 
 license foomatic-db.license license='GPLv2, MIT'
 
-legacy pkg=SUNWfoomatic-db desc="Foomatic database" name="foomatic-db"
-
 dir path=usr
 dir path=usr/share
 dir path=usr/share/cups
--- a/components/fping/fping.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/fping/fping.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -48,12 +48,4 @@
 file usr/sbin/fping path=usr/bin/fping
 file fping.1m path=usr/share/man/man1m/fping.1m
 
-legacy pkg=SUNWfpingr \
-    desc="fping - a program to ping hosts in parallel (Root)" \
-    name="fping - a program to ping hosts in parallel (Root)"
-
-legacy pkg=SUNWfping \
-    desc="fping - a program to ping hosts in parallel" \
-    name="fping - a program to ping hosts in parallel"
-
 license fping.license license=MIT
--- a/components/gawk/gawk.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gawk/gawk.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -128,9 +128,6 @@
 file path=usr/share/locale/vi/LC_MESSAGES/gawk.mo
 file usr/share/man/man1/gawk.1 path=usr/gnu/share/man/man1/awk.1
 file path=usr/share/man/man1/igawk.1
-legacy pkg=SUNWgawk \
-    desc="gawk - GNU awk" \
-    name="gawk - GNU implementation of awk"
 license gawk.license license="GPLv2, FDLv1.2"
 link path=usr/bin/gawk target=../gnu/bin/awk facet.compat.gnulinks=true
 link path=usr/share/man/man1/gawk.1 \
--- a/components/gd2/gd2.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gd2/gd2.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -99,10 +99,6 @@
 file Solaris/libgd2.1-extra path=usr/share/man/man1/webpng.1
 file Solaris/libgd2.3 path=usr/share/man/man3/libgd2.3
 #
-legacy pkg=SUNWgd2 \
-    desc="GD - The Graphics Draw Library" \
-    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
--- a/components/gdb/gdb.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gdb/gdb.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -110,8 +110,4 @@
 file path=usr/share/man/man1/gdb.1
 file path=usr/share/man/man1/gdbtui.1
 
-legacy pkg=SUNWgdb \
-    desc="gdb - GNU debugger" \
-    name="gdb - GNU debugger"
-
 license gdb.license license="GPLv3, FDLv1.1, FDLv1.2"
--- a/components/gdbm/gdbm.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gdbm/gdbm.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -50,7 +50,3 @@
 link path=usr/lib/$(MACH64)/libgdbm.so.3 target=libgdbm.so.3.0.0
 link path=usr/lib/libgdbm.so target=libgdbm.so.3.0.0
 link path=usr/lib/libgdbm.so.3 target=libgdbm.so.3.0.0
-
-legacy pkg=SUNWgnu-dbm \
-	name="GNU Database Manager" \
-	desc="GNU Database Manager - a set of database routines that use extensible hashing"
--- a/components/gettext/gettext.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gettext/gettext.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -1662,9 +1662,6 @@
 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" \
-    name="GNU gettext"
 license gettext.license license="GPLv2, FDLv1.2"
 link path=usr/bin/ggettext target=../gnu/bin/gettext facet.compat.gnulinks=true
 link path=usr/bin/gmsgfmt target=../gnu/bin/msgfmt facet.compat.gnulinks=true
--- a/components/ghostscript/ghostscript.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/ghostscript/ghostscript.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -975,6 +975,6 @@
 link path=usr/share/man/man1/ps2pdf12.1 target=ps2pdf.1
 link path=usr/share/man/man1/ps2pdf13.1 target=ps2pdf.1
 
-legacy pkg=SUNWghostscript \
+legacy pkg=SUNWgscr \
 	name="GPL Ghostscript" \
 	desc="GPL Ghostscript"
--- a/components/git/git.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/git/git.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -469,8 +469,4 @@
 hardlink path=usr/lib/git-core/git-verify-tag target=../../bin/git
 hardlink path=usr/lib/git-core/git-whatchanged target=../../bin/git
 hardlink path=usr/lib/git-core/git-write-tree target=../../bin/git
-legacy pkg=SUNWgit \
-    desc="git - Fast Version Control System" \
-    name="git - Fast Version Control System"
 license git.license license=GPLv2
-
--- a/components/gnump/gmp.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gnump/gmp.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -78,7 +78,3 @@
 link path=usr/lib/$(MACH64)/libgmpxx.so target=libgmpxx.so.4.1.2
 #
 license gmp.license license="LGPLv3, GPLv3, FDLv1.3"
-#
-legacy pkg=SUNWgnu-mp \
-    desc="GNU MP" \
-    name="The GNU Multiple Precision (Bignum) Library"
--- a/components/gnupg/gnupg.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gnupg/gnupg.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -224,8 +224,4 @@
 #
 license gnupg.license license="GPLv3, LGPLv3"
 #
-legacy pkg=SUNWgnupg \
-    desc="GnuPG - secure communication and data storage utility" \
-    name="Gnu secure communication and data storage utility"
-#
 depend fmri=__TBD pkg.debug.depend.file=usr/lib/pinentry type=require
--- a/components/gnupth/gnupth.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gnupth/gnupth.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -56,8 +56,3 @@
 link path=usr/lib/$(MACH64)/libpth.so.20 target=libpth.so.20.0.27
 #
 license gnupth.license license="LGPLv2.1"
-#
-legacy pkg=SUNWpth \
-    desc="Pth - GNU Portable Threads" \
-    name="GNU portable threads"
-
--- a/components/gocr/gocr.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gocr/gocr.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -50,7 +50,3 @@
 file examples/handwrt1.jpg path=usr/share/gocr/examples/handwrt1.jpg
 file examples/handwrt1.txt path=usr/share/gocr/examples/handwrt1.txt
 file path=usr/share/man/man1/gocr.1
-
-legacy pkg=SUNWgocr \
-    desc="GOCR converts scanned images of text back to text files" \
-    name="GOCR is an open source Optical Character Recognition program"
--- a/components/gperf/gperf.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gperf/gperf.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -46,7 +46,4 @@
 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 \
-    desc="GNU gperf - perfect hash function generator" \
-    name="GNU gperf - perfect hash function generator"
 license gperf.license license=GPLv2
--- a/components/grails/grails.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/grails/grails.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -1700,9 +1700,5 @@
 file path=usr/grails/1.0.3/doc/api/org/codehaus/groovy/grails/web/taglib/jsp/JspTimeZoneSelectTag.html
 file path=usr/grails/1.0.3/doc/api/org/codehaus/groovy/grails/web/taglib/jsp/class-use/JspActionSubmitTag.html
 
-legacy pkg=SUNWgrails \
-    desc="Grails framework" \
-    name="Grails framework"
-
 link path=usr/bin/grails-debug target=../grails/1.0.3/bin/grails-debug
 link path=usr/bin/grails target=../grails/1.0.3/bin/grails
--- a/components/guile/guile.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/guile/guile.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -362,9 +362,6 @@
 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" \
-    name="guile - GNU guile utility"
 license guile.license license="LGPLv2.1, FDLv1.2"
 link path=usr/lib/$(MACH64)/libguile-srfi-srfi-1-v-3.so \
     target=libguile-srfi-srfi-1-v-3.so.3.0.1
--- a/components/gutenprint/gutenprint.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/gutenprint/gutenprint.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -417,7 +417,7 @@
 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 \
+legacy pkg=SUNWgimpprint \
     desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers" \
     name="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
 license gutenprint.license license=GPLv2
--- a/components/hal-cups-utils/hal-cups-utils.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/hal-cups-utils/hal-cups-utils.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -51,8 +51,4 @@
 file path=usr/lib/cups/backend/hal mode=0555
 file path=usr/lib/hal/hal_lpadmin mode=0555 pkg.depend.bypass-generate=.*
 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/hexedit/hexedit.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/hexedit/hexedit.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -44,8 +44,4 @@
 file path=usr/bin/hexedit
 file path=usr/share/man/man1/hexedit.1
 
-legacy pkg=SUNWhexedit \
-    desc="Hexedit - a command-line binary file editor" \
-    name="Hexedit"
-
 license hexedit.license license=GPLv2
--- a/components/httping/httping.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/httping/httping.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -47,7 +47,3 @@
 file path=usr/share/doc/httping/license.OpenSSL
 file path=usr/share/doc/httping/readme.txt
 file path=usr/share/man/man1/httping.1
-
-legacy pkg=SUNWhttping \
-	name="httping - ping for http-requests" \
-	desc="httping - ping for http-requests"
--- a/components/hwdata/hwdata.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/hwdata/hwdata.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -42,9 +42,6 @@
 dir path=usr/share/hwdata group=sys
 file pci.ids path=usr/share/hwdata/pci.ids
 file usb.ids path=usr/share/hwdata/usb.ids
-legacy pkg=SUNWhwdata \
-    desc="ASCII databases describing various PCI, USB and other hardware" \
-    name="Hardware data files"
 license pci.ids.license license=pci.ids.license
 license usb.ids.license license=usb.ids.license
 
--- a/components/iftop/iftop.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/iftop/iftop.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,3 @@
 dir path=usr/share/man/man8
 file path=usr/sbin/iftop
 file path=usr/share/man/man8/iftop.8
-
-legacy pkg=SUNWiftop \
-    desc="iftop - Display bandwidth usage on an interface" \
-    name="iftop - Display bandwidth usage on an interface"
--- a/components/ilmbase/ilmbase.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/ilmbase/ilmbase.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -102,10 +102,6 @@
 file path=usr/lib/pkgconfig/IlmBase.pc
 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
--- a/components/iperf/iperf.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/iperf/iperf.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,3 @@
 dir path=usr/share/man/man1
 file path=usr/bin/iperf
 file path=usr/share/man/man1/iperf.1
-
-legacy pkg=SUNWiperf \
-    desc="iperf - tool for measuring maximum TCP and UDP bandwidth performance" \
-    name="iperf - tool for measuring maximum TCP and UDP bandwidth performance"
--- a/components/ircii/ircii.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/ircii/ircii.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -647,8 +647,5 @@
 file path=usr/share/irc/script/whowas
 file path=usr/share/irc/script/window
 file path=usr/share/man/man1/ircII.1
-legacy pkg=SUNWircii \
-    desc="Internet Relay Chat Client" \
-    name="Internet Relay Chat Client"
 license ircii.license license=BSD
 link path=usr/share/man/man1/irc.1 target=ircII.1
--- a/components/junit/junit.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/junit/junit.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -210,9 +210,6 @@
 file path=usr/share/lib/java/javadoc/junit/stylesheet.css
 file path=usr/share/lib/java/junit-4.5.jar
 file junit.3 path=usr/share/man/man3/junit.3
-legacy pkg=SUNWjunit \
-    desc="JUnit - Java unit testing framework" \
-    name="JUnit - Java unit testing framework"
 license junit.license license=CPLv1.0
 link path=usr/share/doc/junit/javadoc target=../../lib/java/javadoc/junit
 link path=usr/share/lib/java/junit.jar target=junit-4.5.jar
--- a/components/lcms/lcms.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/lcms/lcms.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -78,10 +78,6 @@
 file path=usr/share/man/man1/tifficc.1
 file path=usr/share/man/man1/wtpt.1
 #
-legacy pkg=SUNWlcms \
-    desc="LCMS - Little Color Management System" \
-    name="Little Color Management System"
-#
 license lcms.license license=MIT
 #
 link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
--- a/components/lftp/lftp.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/lftp/lftp.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -93,11 +93,3 @@
 file path=usr/share/man/man1/lftp.1
 file path=usr/share/man/man1/lftpget.1
 file usr/share/man/man5/lftp.conf.5 path=usr/share/man/man4/lftp.conf.4
-
-legacy pkg=SUNWlftpr \
-    desc="lftp - Sophisticated file transfer program version (Root files package)" \
-    name="lftp - Sophisticated file transfer program (Root files package)"
-
-legacy pkg=SUNWlftpu \
-    desc="lftp - Sophisticated file transfer program version (User files package)" \
-    name="lftp - Sophisticated file transfer program (User files package)"
--- a/components/libconfuse/libconfuse.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libconfuse/libconfuse.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -147,7 +147,3 @@
 link path=usr/lib/$(MACH64)/libconfuse.so.0 target=./libconfuse.so.0.0.0
 link path=usr/lib/libconfuse.so target=./libconfuse.so.0.0.0
 link path=usr/lib/libconfuse.so.0 target=./libconfuse.so.0.0.0
-
-legacy pkg=SUNWlibconfuse \
-    desc="libconfuse - configuration file parser library" \
-    name="libconfuse"
--- a/components/libevent/libevent.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libevent/libevent.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -77,8 +77,4 @@
 link path=usr/lib/libevent_core.so target=libevent_core-1.4.so.2.2.0
 link path=usr/lib/libevent_core-1.4.so.2 target=libevent_core-1.4.so.2.2.0
 
-legacy pkg=SUNWlibevent \
-    desc="Libevent - an event notification library" \
-    name="Libevent - an event notification library"
-
 license libevent.license license=BSD
--- a/components/libidn/libidn.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libidn/libidn.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -229,7 +229,3 @@
 link path=usr/lib/$(MACH64)/libidn.so target=libidn.so.11.6.2
 #
 license libidn.license license="LGPLv2.1, GPLv3, FDLv1.3"
-#
-legacy pkg=SUNWgnu-idn \
-    desc="IDN - The Internationalized Domains Library" \
-    name="The Internationalized Domains Library"
--- a/components/libmcrypt/libmcrypt.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libmcrypt/libmcrypt.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -55,7 +55,3 @@
 link path=usr/lib/$(MACH64)/libmcrypt.so.4 target=libmcrypt.so.4.4.8
 link path=usr/lib/libmcrypt.so target=libmcrypt.so.4.4.8
 link path=usr/lib/libmcrypt.so.4 target=libmcrypt.so.4.4.8
-
-legacy pkg=SUNWlibmcrypt \
-	desc="Libmcrypt - Encryption Algorithms Library" \
-	name="Libmcrypt Encryption Algorithms Library"
--- a/components/libmemcached/libmemcached.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libmemcached/libmemcached.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -124,7 +124,3 @@
 link path=usr/lib/libmemcached.so.2 target=libmemcached.so.2.0.0
 
 license libmemcached.license license="BSD"
-
-legacy pkg=SUNWlibmemcached \
-    desc="memcached C API" \
-    name="libmemcached"
--- a/components/libmng/libmng.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libmng/libmng.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -74,7 +74,3 @@
 link path=usr/lib/$(MACH64)/libmng.so target=libmng.so.1.0.0
 #
 license libmng.license license="MNG License (BSD-like)"
-#
-legacy pkg=SUNWlibmng \
-    desc="LibMNG - Multiple Image Network Graphics Library" \
-    name="Multiple Image Network Graphics Library"
--- a/components/libneon/libneon.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libneon/libneon.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -247,10 +247,6 @@
 file path=usr/share/man/man3/ne_xml_destroy.3
 file path=usr/share/man/man3/neon.3
 #
-legacy pkg=SUNWneon \
-    desc="The Neon WebDAV library" \
-    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
--- a/components/libnet/libnet.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libnet/libnet.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -114,7 +114,3 @@
 file libnet_802_1x_hdr.3 path=usr/share/man/man3/libnet_802_1x_hdr.3
 link path=usr/lib/$(MACH64)/libnet.so target=libnet.so.1.1.2.1 
 link path=usr/lib/libnet.so target=libnet.so.1.1.2.1
-
-legacy pkg=SUNWlibnet \
-    desc="libnet - a library for portable network packet construction" \
-    name="libnet"
--- a/components/libpcap/libpcap.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libpcap/libpcap.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -115,8 +115,6 @@
 file path=usr/share/man/man4/pcap-savefile.4
 file path=usr/share/man/man5/pcap-filter.5
 file path=usr/share/man/man5/pcap-linktype.5
-legacy pkg=SUNWlibpcap desc="libpcap" \
-    name="libpcap - a packet capture library"
 license license.pcap license=BSD
 link path=usr/lib/$(MACH64)/libpcap.so target=./libpcap.so.1.1.1
 link path=usr/lib/$(MACH64)/libpcap.so.1 target=./libpcap.so.1.1.1
--- a/components/librsync/librsync.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/librsync/librsync.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -90,7 +90,3 @@
 link path=usr/lib/$(MACH64)/librsync.so target=librsync.so.1.0.2
 
 license librsync.copyright license="LGPLv2.1"
-
-legacy pkg=SUNWlibrsync \
-    desc="librsync - software library that implements the rsync remote-delta algorithm" \
-    name="librsync - software library that implements the rsync remote-delta algorithm"
--- a/components/libsigsegv/libsigsegv.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libsigsegv/libsigsegv.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -56,9 +56,6 @@
 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" \
-    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
--- a/components/libsndfile/libsndfile.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libsndfile/libsndfile.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -104,7 +104,3 @@
     target=libsndfile.so.$(COMPONENT_VERSION)
 link path=usr/lib/libsndfile.so target=libsndfile.so.$(COMPONENT_VERSION)
 link path=usr/lib/libsndfile.so.1 target=libsndfile.so.$(COMPONENT_VERSION)
-
-legacy pkg=SUNWlibsndfile \
-	name="libsndfile" \
-	desc="libsndfile - a library for reading/writing sound files"
--- a/components/libtool/libltdl.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libtool/libltdl.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -36,8 +36,6 @@
 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
--- a/components/libtool/libtool.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libtool/libtool.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -77,5 +77,4 @@
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/nm type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/echo type=require
 
-legacy pkg=SUNWlibtool desc="GNU libtool" name="GNU libtool"
 license libtool.license license="GPLv2, FDLv1.1"
--- a/components/libtorrent/libtorrent.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libtorrent/libtorrent.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -96,7 +96,3 @@
 link path=usr/lib/$(MACH64)/libtorrent.so.9 target=libtorrent.so.9.2.0
 link path=usr/lib/libtorrent.so target=libtorrent.so.9.2.0
 link path=usr/lib/libtorrent.so.9 target=libtorrent.so.9.2.0
-
-legacy pkg=SUNWlibtorrent \
-    desc="libtorrent - a Bittorrent library for rtorrent" \
-    name="libtorrent"
--- a/components/libxml2/libxml2-26.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libxml2/libxml2-26.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -40,7 +40,5 @@
 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"
 
--- a/components/libxml2/libxml2.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libxml2/libxml2.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -112,10 +112,6 @@
 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
--- a/components/libxslt/libxsl-26.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libxslt/libxsl-26.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -39,6 +39,4 @@
 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/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
--- a/components/libxslt/libxslt.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/libxslt/libxslt.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -91,8 +91,6 @@
 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
--- a/components/lighttpd/lighttpd.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/lighttpd/lighttpd.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -122,11 +122,3 @@
 link path=usr/lighttpd/1.4/bin/spawn-fcgi target=../../../bin/spawn-fcgi
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/spawn-fcgi type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/share/man/man1/spawn-fcgi.1 type=require
-
-legacy pkg=SUNWlighttpd14u \
-    desc="The Lighttpd Web Server (Usr)" \
-    name="Lighttpd Web Server (Usr)"
-
-legacy pkg=SUNWlighttpd14r \
-    desc="The Lighttpd Web Server (Root)" \
-    name="Lighttpd Web Server (Root)"
--- a/components/links/links.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/links/links.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,3 @@
 dir path=usr/share/man/man1
 file path=usr/bin/links
 file path=usr/share/man/man1/links.1
-
-legacy pkg=SUNWlinks \
-	name="links - a text based web browser" \
-	desc="links - a text based web browser"
--- a/components/logilab-astng/logilab-astng.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/logilab-astng/logilab-astng.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -146,9 +146,6 @@
 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" \
-    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;
--- a/components/logilab-common/logilab-common.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/logilab-common/logilab-common.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -295,9 +295,6 @@
 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" \
-    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;
--- a/components/lua/lua.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/lua/lua.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -89,9 +89,5 @@
 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" \
-    name="lua - Lua Programming language"
 
 license lua.license license=MIT
-
--- a/components/mc/mc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/mc/mc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -340,13 +340,7 @@
 file path=usr/share/mc/syntax/xml.syntax
 file path=usr/share/mc/syntax/yum-repo.syntax
 file path=usr/share/mc/syntax/yxx.syntax
-legacy pkg=SUNWgnu-mc \
-    desc="The GNU Midnight Commander file manager" \
-    name="The GNU Midnight Commander file manager"
 license mc.license license=GPLv2
 link path=usr/bin/mcdiff target=mc
 link path=usr/bin/mcedit target=mc
 link path=usr/bin/mcview target=mc
-
-
-
--- a/components/meld/meld.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/meld/meld.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -269,7 +269,4 @@
 file path=usr/share/omf/meld/meld-es.omf
 file path=usr/share/omf/meld/meld-fr.omf
 file path=usr/share/pixmaps/meld.png
-legacy pkg=SUNWmeld \
-    desc="meld - graphical diff and merge tool" \
-    name="meld - graphical diff and merge tool"
 license meld.license license=GPLv2
--- a/components/memcached-java/memcached-java.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/memcached-java/memcached-java.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -96,7 +96,3 @@
 file path=usr/share/lib/java/javadoc/memcached-java/api/resources/inherit.gif
 file path=usr/share/lib/java/javadoc/memcached-java/api/serialized-form.html
 file path=usr/share/lib/java/javadoc/memcached-java/api/stylesheet.css
-
-legacy pkg=SUNWmemcached-java \
-	name="memcached client for java" \
-	desc="memcached client for java"
--- a/components/memcached/memcached.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/memcached/memcached.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -61,11 +61,3 @@
 file Solaris/memcached path=lib/svc/method/memcached
 file path=usr/include/memcached/protocol_binary.h
 file Solaris/memcached.1m path=usr/share/man/man1m/memcached.1m
-
-legacy pkg=SUNWmemcached \
-    desc="The memcached memory object cache" \
-    name="memcached (usr)"
-
-legacy pkg=SUNWmemcachedr \
-    desc="The memcached memory object cache (root components)" \
-    name="memcached (root)"
--- a/components/mercurial/mercurial.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/mercurial/mercurial.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -434,7 +434,3 @@
 file hg.1 path=usr/share/man/man1/hg.1
 file hgignore.5 path=usr/share/man/man5/hgignore.5
 file hgrc.5 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"
--- a/components/mpfr/mpfr.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/mpfr/mpfr.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -71,7 +71,3 @@
 link path=usr/lib/$(MACH64)/libmpfr.so target=libmpfr.so.1.2.2
 #
 license mpfr.license license="LGPLv2.1, GPLv2, FDLv1.2"
-#
-legacy pkg=SUNWgnu-mpfr \
-    desc="GNU MPFR" \
-    name="The GNU Multiple Precision Rounding Floating-Point Library"
--- a/components/mutt/mutt.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/mutt/mutt.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -47,13 +47,6 @@
 
 license mutt.license license=GPLv2
 
-legacy pkg=SUNWmutt \
-    desc="Mutt E-Mail Client" \
-    name="Mutt E-Mail Client"
-legacy pkg=SUNWmuttr \
-    desc="Mutt E-Mail Client (root)" \
-    name="Mutt E-Mail Client (root)"
-
 dir path=etc
 dir path=etc/mutt
 dir path=usr
--- a/components/mysql-5-1/mysql-51.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/mysql-5-1/mysql-51.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -344,12 +344,6 @@
 file path=usr/mysql/5.1/share/mysql/swedish/errmsg.sys
 file path=usr/mysql/5.1/share/mysql/ukrainian/errmsg.sys
 file Solaris/mysql_51.1 path=usr/share/man/man1/mysql_51.1
-legacy pkg=SUNWmysql51r \
-    desc="mysql - MySQL Database Management System (root component) 5.1" \
-    name="MySQL 5.1 - MySQL Database Management System (root component)"
-legacy pkg=SUNWmysql51u \
-    desc="mysql - MySQL Database Management System (usr component) 5.1" \
-    name="MySQL 5.1 - MySQL Database Management System (usr component)"
 license mysql-51.license license=GPLv2
 link path=etc/mysql/my.cnf target=5.1/my.cnf
 link path=usr/bin/mysql target=../mysql/5.1/bin/mysql
--- a/components/mysql-5-1/mysql-51lib.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/mysql-5-1/mysql-51lib.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -48,9 +48,6 @@
 file path=usr/mysql/5.1/lib/mysql/libmysqlclient.so.16.0.0
 file path=usr/mysql/5.1/lib/mysql/libmysqlclient_r.so.16.0.0
 file path=usr/mysql/5.1/lib/mysql/plugin/ha_example.so.0.0.0
-legacy pkg=SUNWmysql51lib \
-    desc="mysql - MySQL Database Management System (library component) 5.1" \
-    name="MySQL 5.1 - MySQL Database Management System (library component)"
 license mysql-51.license license=GPLv2
 link path=usr/mysql/5.1/lib/$(MACH64)/mysql/libmysqlclient.so \
     target=libmysqlclient.so.16.0.0
--- a/components/mysql-5-1/mysql-51test.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/mysql-5-1/mysql-51test.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -3948,9 +3948,6 @@
 file path=usr/mysql/5.1/sql-bench/test-select mode=0555
 file path=usr/mysql/5.1/sql-bench/test-transactions mode=0555
 file path=usr/mysql/5.1/sql-bench/test-wisconsin mode=0555
-legacy pkg=SUNWmysql51test \
-    desc="mysql - MySQL Database Management System (test component) 5.1" \
-    name="MySQL 5.1 - MySQL Database Management System (test component)"
 license mysql-51.license license=GPLv2
 link path=usr/mysql/mysql-test target=5.1/mysql-test
 link path=usr/mysql/sql-bench target=5.1/sql-bench
--- a/components/net-snmp/net-snmp-addons.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/net-snmp/net-snmp-addons.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -38,7 +38,3 @@
 
 file $(MACH64)/sun/agent/modules/seaExtensions/libseaExtensions.so path=usr/lib/$(MACH64)/libseaExtensions.so
 file $(MACH32)/sun/agent/modules/seaExtensions/libseaExtensions.so path=usr/lib/libseaExtensions.so
-
-legacy pkg=SUNWnet-snmp-addons \
-	name="Net-SNMP addon libraries" \
-	desc="Net-SNMP addon libraries"
--- a/components/net-snmp/net-snmp-base.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/net-snmp/net-snmp-base.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -578,13 +578,3 @@
 link path=usr/lib/libnetsnmptrapd.so.15 target=./libnetsnmptrapd.so.15.1.0
 link path=usr/lib/libsnmp.so target=./libsnmp.so.15.1.0
 link path=usr/lib/libsnmp.so.15 target=./libsnmp.so.15.1.0
-
-legacy pkg=SUNWnet-snmp-utils \
-	name="Net-SNMP Agent applications and utilities" \
-	desc="Net-SNMP Agent applications and utilities"
-legacy pkg=SUNWnet-snmp-mgr \
-	name="Net-SNMP Agent Configuration files and Startup scripts" \
-	desc="Net-SNMP Agent Configuration files and Startup scripts"
-legacy pkg=SUNWnet-snmp-core \
-	name="Net-SNMP Agent files and libraries" \
-	desc="Net-SNMP Agent files and libraries"
--- a/components/net-snmp/net-snmp-documentation.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/net-snmp/net-snmp-documentation.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -636,6 +636,3 @@
 file path=usr/share/man/man5/variables.5
 file path=usr/share/man/man8/snmpd.8
 file path=usr/share/man/man8/snmptrapd.8
-legacy pkg=SUNWnet-snmp-doc \
-	name="Net-SNMP Agent manpages and html documentation files" \
-	desc="Net-SNMP Agent manpages and html documentation files"
--- a/components/nethack/nethack.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/nethack/nethack.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -190,8 +190,3 @@
     original_name=SUNWnethack:var/games/nethack/perm preserve=true
 file path=var/games/nethack/record mode=0664 group=games \
     original_name=SUNWnethack:var/games/nethack/record preserve=true
-
-legacy pkg=SUNWnethack \
-	desc="Nethack is a turn-based single-player dungeon exploration game related to Hack and Rogue.  The primary interface is a pseudo-graphical display rendered in text in a terminal, and controlled by the keyboard." \
-	name="Nethack - a single-player dungeon exploration game"
-
--- a/components/nmap/nmap.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/nmap/nmap.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -504,9 +504,6 @@
 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" \
-    name="nmap - Network Mapper"
 license nmap.license license=GPLv2
 link path=usr/bin/nmapfe target=zenmap
 link path=usr/bin/xnmap target=zenmap
--- a/components/openexr/openexr.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/openexr/openexr.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -153,10 +153,6 @@
 file path=usr/share/man/man1/exrstdattr.1
 file path=usr/share/man/man3/libopenexr.3lib
 #
-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
--- a/components/openldap/openldap.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/openldap/openldap.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -269,10 +269,6 @@
 file path=usr/share/man/man8oldap/slaptest.8oldap
 file path=var/openldap/openldap-data/DB_CONFIG.example
 group groupname=openldap gid=75
-legacy pkg=SUNWopenldapr desc="OpenLDAP Software (root)" \
-    name="OpenLDAP Software (root)"
-legacy pkg=SUNWopenldapu desc="OpenLDAP Software (usr)" \
-    name="OpenLDAP Software (usr)"
 license openldap.license license="openldap license"
 link path=usr/bin/$(MACH64)/openldapadd target=openldapmodify
 link path=usr/bin/openldapadd target=openldapmodify
--- a/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -141,9 +141,3 @@
 file path=usr/include/openssl/fips-140/openssl/x509_vfy.h
 file path=usr/include/openssl/fips-140/openssl/x509v3.h
 license openssl-0.9.8-fips-140.license license="OpenSSL, SSLeay"
-legacy pkg=SUNWopenssl-fips-140 \
-    desc="FIPS 140-2 Capable OpenSSL libraries (Root)" \
-    name="FIPS 140-2 Capable OpenSSL libraries"
-legacy pkg=SUNWopenssl-fips-140-include \
-    desc="FIPS Capable OpenSSL C/C++ header files for development of OpenSSL applications" \
-    name="FIPS 140-2 Capable OpenSSL Header Files" 
--- a/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -1402,18 +1402,6 @@
 link path=usr/share/man/man3openssl/CMS_RecipientInfo_ktri_cert_cmp.3openssl target=CMS_get0_RecipientInfos.3openssl
 link path=usr/share/man/man3openssl/CMS_RecipientInfo_ktri_get0_signer_id.3openssl target=CMS_get0_RecipientInfos.3openssl
 license openssl-1.0.0.license license="OpenSSL, SSLeay"
-legacy pkg=SUNWopenssl-commands \
-    desc="OpenSSL is a full-featured toolkit implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1) protocols as well as a full-strength general purpose cryptography library." \
-    name="OpenSSL - a Toolkit for Secure Sockets Layer (SSL v2/v3) and Transport Layer (TLS v1) protocols and general purpose cryptographic library"
-legacy pkg=SUNWopenssl-include \
-    desc="OpenSSL C/C++ header files for development of OpenSSL applications" \
-    name="OpenSSL Header Files" 
-legacy pkg=SUNWopenssl-libraries \
-    desc="OpenSSL Libraries (Usr)" \
-    name="OpenSSL Libraries (Usr)"
-legacy pkg=SUNWopenssl-man \
-    desc="OpenSSL Manual Pages" \
-    name="OpenSSL Manual Pages"
 legacy pkg=SUNWopensslr \
     desc="OpenSSL Libraries (Root)" \
     name="OpenSSL Libraries (Root)"
--- a/components/openusb/openusb.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/openusb/openusb.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -62,7 +62,3 @@
 link path=usr/lib/libopenusb.so.0 target=libopenusb.so.0.0.1
 
 license openusb.copyright license="LGPLv2.1, BSD"
-
-legacy pkg=SUNWlibopenusb \
-    desc="Libopenusb - a USB device management library" \
-    name="Libopenusb - a USB device management library"
--- a/components/p7zip/p7zip.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/p7zip/p7zip.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -104,7 +104,5 @@
 file usr/man/man1/7zr.1 path=usr/share/man/man1/7zr.1
 file contrib/gzip-like_CLI_wrapper_for_7z/man1/p7zip.1 \
     path=usr/share/man/man1/p7zip.1
-legacy pkg=SUNWp7zip desc="The p7zip compression and archiving utility" \
-    name="The p7zip compression and archiving utility"
 license copying.txt license=LGPLv2.1+
 license unRarLicense.txt license=unRAR
--- a/components/pam_pkcs11/pam_pkcs11.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/pam_pkcs11/pam_pkcs11.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -79,14 +79,4 @@
 file doc/pam_pkcs11.html path=usr/share/doc/pam_pkcs11/pam_pkcs11.html
 file doc/mappers_api.html path=usr/share/doc/pam_pkcs11/mappers_api.html
 
-legacy pkg=SUNWpampkcs11u \
-    desc="The OpenSC PKCS#11 PAM Login Tools" \
-    name="The OpenSC PKCS#11 PAM Login Tools"
-legacy pkg=SUNWpampkcs11r \
-    desc="The OpenSC PKCS#11 PAM Login Tools" \
-    name="The OpenSC PKCS#11 PAM Login Tools"
-legacy pkg=SUNWpampkcs11-docs \
-    desc="The OpenSC PKCS#11 PAM Login Tools" \
-    name="The OpenSC PKCS#11 PAM Login Tools"
-
 license pam_pkcs11.license license=LGPLv2.1
--- a/components/pconsole/pconsole.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/pconsole/pconsole.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -61,7 +61,3 @@
 file usr/bin/pconsole path=usr/sbin/pconsole-bin
 file usr/bin/pconsole.sh path=usr/sbin/pconsole
 file usr/bin/ssh.sh path=usr/share/doc/pconsole/ssh.sh mode=0555
-
-legacy pkg=SUNWpconsole \
-    desc="pconsole - parallel console" \
-    name="pconsole - parallel console"
--- a/components/pcre/pcre.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/pcre/pcre.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -165,7 +165,3 @@
 link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.0
 
 license pcre.license license="BSD"
-
-legacy pkg=SUNWpcre \
-    desc="Perl-Compatible Regular Expressions" \
-    name="PCRE - Perl-Compatible Regular Expressions"
--- a/components/perl_modules/net-ssleay/net-ssleay.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/perl_modules/net-ssleay/net-ssleay.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,3 @@
 # perl 5.12
 depend fmri=library/perl-5/net-ssleay-512 predicate=runtime/perl-512 \
     type=conditional
-
-legacy pkg=SUNWperl-net-ssleay \
-    desc="Net::SSLeay- Perl extension for using OpenSSL" \
-    name="Net::SSLeay- Perl extension for using OpenSSL"
--- a/components/perl_modules/pmtools/pmtools.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/perl_modules/pmtools/pmtools.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -33,9 +33,6 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/121/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-legacy pkg=SUNWperl-pmtools \
-    desc="pmtools - Perl module tools" \
-    name="Perl module tools"
 license pmtools.license license="GPLv2, Artistic"
 # perl 5.12
 depend fmri=library/perl-5/pmtools-512 predicate=runtime/perl-512 \
--- a/components/php-5_2/apache-php5.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/apache-php5.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -46,12 +46,5 @@
 file path=usr/apache2/2.2/libexec/mod_php5.2.so
 link path=usr/apache2/2.2/libexec/mod_php5.so target=mod_php5.2.so
 
-legacy pkg=SUNWapch22r-php52 \
-    desc="PHP module for Apache Web Server (Root)" \
-    name="PHP module for Apache Web Server (Root)"
-legacy pkg=SUNWapch22m-php52 \
-    desc="PHP Server module for Apache Web Server" \
-    name="PHP Server module for Apache Web Server"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-52.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-52.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -446,10 +446,3 @@
 link path=usr/php/lib target=./5.2/lib
 link path=usr/php/man target=./5.2/man
 link path=usr/php/modules target=./5.2/modules
-
-legacy pkg=SUNWphp52r \
-    desc="PHP Server (Root components)" \
-    name="PHP Server (Root)"
-legacy pkg=SUNWphp52u \
-    desc="PHP Server Version" \
-    name="PHP Server Version"
--- a/components/php-5_2/php-apc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-apc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -63,12 +63,5 @@
 file path=usr/php/5.2/samples/apc/apc.php mode=0555
 file path=usr/php/5.2/zts-modules/apc.so
 
-legacy pkg=SUNWphp52r-apc \
-    desc="PHP-APC extension provides PHP script caching for PHP (Root)" \
-    name="APC extension module for PHP (Root)"
-legacy pkg=SUNWphp52u-apc \
-    desc="PHP-APC extension provides PHP script caching for PHP" \
-    name="APC extension module for PHP"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-doc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-doc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -8576,6 +8576,3 @@
 file path=usr/php/5.2/doc/html/zlib.resources.html
 file path=usr/php/5.2/doc/html/zlib.setup.html
 link path=usr/php/doc target=./5.2/doc
-
-legacy pkg=SUNWphp52d desc="PHP Server Documentation as of Sep 2008" \
-    name="PHP Server Documentation"
--- a/components/php-5_2/php-idn.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-idn.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -51,12 +51,5 @@
 file path=usr/php/5.2/modules/idn.so
 file path=usr/php/5.2/zts-modules/idn.so
 
-legacy pkg=SUNWphp52r-idn \
-    desc="PHP-IDN extension module for PHP (Root)" \
-    name="IDN extension module for PHP (Root)"
-legacy pkg=SUNWphp52u-idn \
-    desc="PHP-IDN extension module for PHP" \
-    name="IDN extension module for PHP"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-memcache.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-memcache.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -62,12 +62,5 @@
 file path=usr/php/5.2/samples/memcache/memcache.php mode=0555
 file path=usr/php/5.2/zts-modules/memcache.so
 
-legacy pkg=SUNWphp52r-memcache \
-    desc="PHP-Memcache extension to store PHP sessions in Memcached server (Root)" \
-    name="Memcache extension module for PHP (Root)"
-legacy pkg=SUNWphp52u-memcache \
-    desc="PHP-Memcache extension to store PHP sessions in Memcached server" \
-    name="Memcache extension module for PHP"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-mysql.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-mysql.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -62,12 +62,5 @@
 file path=usr/php/5.2/zts-modules/mysqli.so
 file path=usr/php/5.2/zts-modules/pdo_mysql.so
 
-legacy pkg=SUNWphp52u-mysql \
-    name="MySQL extension module for PHP" \
-    desc="PHP-MySQL extension to connect MySQL database from PHP(5.2)"
-legacy pkg=SUNWphp52r-mysql \
-    name="MySQL extension module for PHP (Root)" \
-    desc="PHP-MySQL extension to connect MySQL database from PHP(5.2) (Root)"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-pear.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-pear.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -303,12 +303,5 @@
 file path=var/php/5.2/pear/test/XML_Util/tests/testBug_4950.phpt
 file path=var/php/5.2/pear/test/XML_Util/tests/testBug_5392.phpt
 
-legacy pkg=SUNWphp52r-pear \
-    desc="Framework and reusable PHP components from PEAR repository(root) for PHP(5.2)" \
-    name="PHP Extension and Application Repository Components(root)"
-legacy pkg=SUNWphp52u-pear \
-    desc="Framework and reusable PHP components from PEAR repository for PHP(5.2)" \
-    name="PHP Extension and Application Repository Components"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-suhosin.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-suhosin.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -52,12 +52,5 @@
 file path=usr/php/5.2/modules/suhosin.so
 file path=usr/php/5.2/zts-modules/suhosin.so
 
-legacy pkg=SUNWphp52r-suhosin \
-    desc="PHP-Suhosin extension to secure PHP (Root)" \
-    name="Suhosin extension module for PHP (Root)"
-legacy pkg=SUNWphp52u-suhosin \
-    desc="PHP-Suhosin extension to secure PHP" \
-    name="Suhosin extension module for PHP"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-tcpwrap.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-tcpwrap.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -52,12 +52,5 @@
 file path=usr/php/5.2/modules/tcpwrap.so
 file path=usr/php/5.2/zts-modules/tcpwrap.so
 
-legacy pkg=SUNWphp52r-tcpwrap \
-    desc="PHP-Tcpwrap extension module for PHP (Root)" \
-    name="Tcpwrap extension module for PHP (Root)"
-legacy pkg=SUNWphp52u-tcpwrap \
-    desc="PHP-Tcpwrap extension module for PHP" \
-    name="Tcpwrap extension module for PHP"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/php-5_2/php-xdebug.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/php-5_2/php-xdebug.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -54,12 +54,5 @@
 file path=usr/php/5.2/modules/xdebug.so
 file path=usr/php/5.2/zts-modules/xdebug.so
 
-legacy pkg=SUNWphp52r-xdebug \
-    desc="PHP-XDebug extension for debugging PHP (Root)" \
-    name="XDebug extension module for PHP (Root)"
-legacy pkg=SUNWphp52u-xdebug \
-    desc="PHP-XDebug extension for debugging PHP" \
-    name="XDebug extension module for PHP"
-
 # need generic dependency on PHP itself
 depend fmri=web/[email protected] type=require
--- a/components/privoxy/privoxy.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/privoxy/privoxy.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -166,7 +166,3 @@
 file path=usr/share/man/man1/privoxy.1
 
 file usr/sbin/privoxy path=usr/lib/privoxy mode=0555
-
-legacy pkg=SUNWprivoxy \
-    desc="Privoxy Web Proxy" \
-    name="Privoxy Web Proxy"
--- a/components/pv/pv.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/pv/pv.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -54,7 +54,3 @@
 file path=usr/share/locale/pl/LC_MESSAGES/pv.mo
 file path=usr/share/locale/pt/LC_MESSAGES/pv.mo
 file doc/quickref.1 path=usr/share/man/man1/pv.1
-
-legacy pkg=SUNWpipe-viewer \
-    desc="pipeline monitoring tool" \
-    name="Pipe Viewer"
--- a/components/pwgen/pwgen.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/pwgen/pwgen.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -42,7 +42,4 @@
 dir path=usr/share/man/man1
 file path=usr/bin/pwgen
 file path=usr/share/man/man1/pwgen.1
-legacy pkg=SUNWpwgen \
-    desc="Easy to memorize passwords generator" \
-    name="pwgen - easy to memorize passwords generator"
 license pwgen.license license=GPLv2
--- a/components/pylint/pylint.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/pylint/pylint.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -102,10 +102,6 @@
 
 license pylint.license license="GPLv2"
 
-legacy pkg=SUNWpylint \
-    desc="Python source code analyzer" \
-    name="pylint python code static checker"
-
 # pkgdepend should have picked up the dependency on 
 # /library/python-2/logilab-common and /library/python-2/logilab-astng; 
 # this explicit depend action can be removed if pkgdepend is fixed later
--- a/components/python/cherrypy/cherrypy.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/cherrypy/cherrypy.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -32,7 +32,3 @@
 
 depend fmri=library/python-2/cherrypy-26 predicate=runtime/python-26 \
     type=conditional
-
-legacy pkg=SUNWpython-cherrypy \
-    desc="CherryPy is a Pythonic, object-oriented HTTP framework" \
-    name="Pythonic, object-oriented HTTP framework"
--- a/components/python/ldtp/ldtp.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/ldtp/ldtp.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -31,7 +31,3 @@
 
 depend fmri=system/desktop/ldtp-26 predicate=runtime/python-26 \
     type=conditional
-
-legacy pkg=SUNWldtp \
-    desc="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications." \
-    name="Linux Desktop Testing Project"
--- a/components/python/mako/mako.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/mako/mako.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -32,8 +32,3 @@
 
 depend fmri=library/python-2/mako-26 predicate=runtime/python-26 \
     type=conditional
-
-legacy pkg=SUNWpython-mako \
-    desc="Mako is an embedded Python (i.e., Python Server Page) templating language." \
-    name="Template library written in Python"
-
--- a/components/python/ply/ply.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/ply/ply.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -32,9 +32,3 @@
 
 depend fmri=library/python-2/ply-26 predicate=runtime/python-26 \
     type=conditional
-
-legacy pkg=SUNWpython-ply \
-    desc="PLY is an implementation of lex and yacc parsing tools for Python" \
-    name="Lex and yacc parsing tools for Python"
-
-
--- a/components/python/pycups/pycups.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/pycups/pycups.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -35,7 +35,4 @@
 dir path=usr/lib/python2.6/vendor-packages/64
 file path=usr/lib/python2.6/vendor-packages/64/cups.so
 file path=usr/lib/python2.6/vendor-packages/cups.so
-legacy pkg=SUNWpycups \
-    desc="Python language bindings for CUPS" \
-    name="Python language bindings for CUPS for Python 2.6"
 license pycups.copyright license=LGPLv2.1
--- a/components/python/pycurl/pycurl.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/pycurl/pycurl.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -31,8 +31,3 @@
 
 depend fmri=library/python-2/pycurl-26 predicate=runtime/python-26 \
     type=conditional
-
-legacy pkg=SUNWpython-pycurl \
-    desc="PycURL provides a thin layer of Python bindings on top of libcurl." \
-    name="Python bindings for libcurl"
-
--- a/components/python/pylxml/pylxml.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/pylxml/pylxml.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -76,7 +76,4 @@
 file path=usr/lib/python2.6/vendor-packages/lxml/pyclasslookup.py
 file path=usr/lib/python2.6/vendor-packages/lxml/sax.py
 file path=usr/lib/python2.6/vendor-packages/lxml/usedoctest.py
-legacy pkg=SUNWpython26-lxml \
-    desc="Pythonic 2.6 binding for the libxml2 and libxslt libraries" \
-    name="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
 license pylxml.copyright license="BSD, PSF, GPL"
--- a/components/python/pyopenssl/pyopenssl-26.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/pyopenssl/pyopenssl-26.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -57,7 +57,4 @@
 file path=usr/lib/python2.6/vendor-packages/OpenSSL/version.py
 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 \
-    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/python-26.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/python/python26/python-26.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -976,13 +976,6 @@
 file path=usr/lib/python2.6/zipfile.py
 file usr/share/man/man1/python.1 path=usr/share/man/man1/python2.6.1
 hardlink path=usr/bin/isapython2.6 target=../lib/isaexec
-legacy pkg=SUNWPython26 category=GNOME2,application,JDS4 \
-    desc="The Python interpreter, libraries and utilities" \
-    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" \
-    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
--- a/components/quagga/quagga.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/quagga/quagga.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -144,12 +144,6 @@
 file path=usr/share/man/man1m/zebra.1m
 file Solaris/quagga.1m path=usr/share/man/man8/quagga.1m
 file Solaris/quaggaadm.1m path=usr/share/man/man8/quaggaadm.1m
-legacy pkg=SUNWquaggar \
-    desc="Quagga Routing Software (root)" \
-    name="Quagga - Quagga Routing Software (root)"
-legacy pkg=SUNWquaggau \
-    desc="Quagga Routing Software (usr)" \
-    name="Quagga - Quagga Routing Software (root)"
 license quagga.license license=GPLv2
 link path=usr/lib/libospf.so target=libospf.so.0.0.0
 link path=usr/lib/libospf.so.0 target=libospf.so.0.0.0
--- a/components/quilt/quilt.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/quilt/quilt.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -123,14 +123,6 @@
 link path=usr/share/quilt/compat/tar target=../../../bin/gtar
 link path=usr/share/quilt/compat/tr target=../../../gnu/bin/tr
 
-legacy pkg=SUNWquiltr \
-    desc="Quilt - tool to manage series of patches (root)" \
-    name=Quilt
-
-legacy pkg=SUNWquiltu \
-    desc="Quilt - tool to manage series of patches" \
-    name=Quilt
-
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/gawk type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/cp type=require
 depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/date type=require
--- a/components/rdiff-backup/rdiff-backup.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/rdiff-backup/rdiff-backup.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -89,7 +89,3 @@
 file path=usr/share/man/man1/rdiff-backup.1
 
 license rdiff-backup.copyright license="GPLv2"
-
-legacy pkg=SUNWrdiff-backup \
-    desc="rdiff-backup is a local/remote mirror and incremental backup utility" \
-    name="rdiff-backup is a backup utility"
--- a/components/readline/readline.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/readline/readline.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -68,9 +68,6 @@
 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" \
-    name="GNU readline"
 license readline.license license="GPLv2, FDLv1.2"
 link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
 link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.5
--- a/components/rtorrent/rtorrent.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/rtorrent/rtorrent.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,3 @@
 dir path=usr/share/man/man1
 file path=usr/bin/rtorrent
 file path=usr/share/man/man1/rtorrent.1
-
-legacy pkg=SUNWrtorrent \
-    desc="rtorrent - a BitTorrent client for ncurses" \
-    name=rtorrent
--- a/components/ruby/ruby-18.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/ruby/ruby-18.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -19651,11 +19651,3 @@
 	target=../../../ruby/$(RUBY_VER)/share/man/man1/ruby.1
 
 license ruby-18.license license="GPLv2, LGPLv2.1, Artistic, BSD, PD"
-
-legacy  pkg=SUNWruby18r \
-	name="Ruby & RubyGems (Root)" \
-	desc="Ruby with integrated RubyGems (Root)"
-
-legacy  pkg=SUNWruby18u \
-	name="Ruby & RubyGems (Usr)" \
-	desc="Ruby with integrated RubyGems (Usr)"
--- a/components/samba/samba/samba.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/samba/samba/samba.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -37,12 +37,6 @@
 legacy pkg=SUNWsmbau \
  desc="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)" \
  name="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)"
-legacy pkg=SUNWsmbadocr \
- desc="samba - A Windows SMB/CIFS fileserver for UNIX (Root)" \
- name="Samba documentation (Root) package"
-legacy pkg=SUNWsmbadocu \
- desc="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)" \
- name="Samba documentation (Usr) package"
 
 #
 # Objects up to the end of file were generated from the SFW prototype_% files:
--- a/components/samba/samba30/libsmbclient.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/samba/samba30/libsmbclient.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -103,7 +103,3 @@
 link path=usr/lib/libprldap60.so target=libprldap60.so.1
 link path=usr/lib/libssldap60.so target=libssldap60.so.1
 link path=usr/sfw/lib/libsmbclient.so target=libsmbclient.so.0
-
-legacy	pkg=SUNWmozldapC-SDK \
-	name="Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)" \
-	desc="Mozilla Directory Server (LDAP) 6 C-API (Private interface for Samba)"
--- a/components/sane-backends/sane-backends.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/sane-backends/sane-backends.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -342,12 +342,6 @@
 file path=usr/share/man/man5/sane-usb.5
 file path=usr/share/man/man5/sane-v4l.5
 file path=usr/share/man/man7/sane.7
-legacy pkg=SUNWsane-backendr \
-    desc="SANE library and backends (Root)" \
-    name="SANE library and backends (root)"
-legacy pkg=SUNWsane-backendu \
-    desc="SANE library and backends (Usr)" \
-    name="SANE library and backends (usr)"
 license sane-backends.license license=GPLv2
 link path=usr/lib/libsane.so target=libsane.so.$(COMPONENT_VERSION)
 link path=usr/lib/libsane.so.1 target=libsane.so.$(COMPONENT_VERSION)
--- a/components/sane-frontends/sane-frontends.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/sane-frontends/sane-frontends.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -39,7 +39,4 @@
 dir path=usr/share/man/man1
 file path=usr/bin/xscanimage
 file path=usr/share/man/man1/xscanimage.1
-legacy pkg=SUNWsane-frontend \
-    desc="SANE frontend" \
-    name="SANE frontends"
 license sane-frontend.license license=GPLv2
--- a/components/sblim/sblim.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/sblim/sblim.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -539,7 +539,3 @@
 file cim-client/sblimCIMClient.jar path=usr/share/lib/java/sblimCIMClient.jar
 file cim-client/sblimSLPClient.jar path=usr/share/lib/java/sblimSLPClient.jar
 file files/SblimCimClient.3 path=usr/share/man/man3/SblimCimClient.3
-
-legacy pkg=SUNWSblimCimClient \
-    desc="sblim cim client for java" \
-    name="sblim cim client for java"
--- a/components/screen/screen.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/screen/screen.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -74,7 +74,5 @@
 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
--- a/components/sed/sed.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/sed/sed.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -160,9 +160,6 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/sed.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/sed.mo
 file usr/share/man/man1/sed.1 path=usr/gnu/share/man/man1/sed.1
-legacy pkg=SUNWgsed \
-    desc="gsed - GNU sed" \
-    name="gsed - GNU implementation of sed, the Unix stream editor"
 license sed.license license="GPLv3, FDLv1.3"
 link path=usr/bin/gsed \
     target=../gnu/bin/sed facet.compat.gnulinks=true
--- a/components/slang/slang.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/slang/slang.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -39,13 +39,6 @@
 
 license slang.license license=GPLv2
 
-legacy pkg=SUNWslang \
-    desc="S-Lang Library" \
-    name="S-Lang Library"
-legacy pkg=SUNWslangr \
-    desc="S-Lang Library (root)" \
-    name="S-Lang Library (root)"
-
 dir path=etc
 dir path=etc/slsh
 dir path=usr
--- a/components/slib/slib.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/slib/slib.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -223,7 +223,4 @@
 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 \
-    desc="GNU slib - a portable library for the programming language Scheme" \
-    name="GNU slib - a portable library for the programming language Scheme"
 license slib.license license="BSD-like, PD"
--- a/components/slrn/slrn.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/slrn/slrn.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -136,7 +136,3 @@
 file path=usr/share/slrn/slang/util.sl
 file path=usr/share/slrn/slang/varset.sl
 file path=usr/share/slrn/slang/xcomment.sl
-
-legacy pkg=SUNWslrn \
-    desc="slrn - S-Lang read news" \
-    name="slrn - S-Lang read news"
--- a/components/snort/snort.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/snort/snort.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -168,11 +168,3 @@
     target=lib_sfdynamic_example_rule.so.0.0.0
 link path=usr/lib/snort_dynamicrules/lib_sfdynamic_example_rule.so.0 \
     target=lib_sfdynamic_example_rule.so.0.0.0
-
-legacy pkg=SUNWsnortr \
-	desc="snort - Network Intrusion and Protection Detector (Root)" \
-	name="snort - Network Intrusion Detector (root)"
-
-legacy pkg=SUNWsnortu \
-	desc="snort - Network Intrusion and Protection Detector (Usr)" \
-	name="snort - Network Intrusion Detector (usr)"
--- a/components/sox/sox.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/sox/sox.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -61,9 +61,6 @@
 file path=usr/share/man/man1/soxi.1
 file path=usr/share/man/man3/libsox.3
 file soxformat.7 path=usr/share/man/man4/soxformat.4
-legacy pkg=SUNWsound-exchange \
-    desc="Sound eXchange, the Swiss Army knife of audio manipulation" \
-    name="Sound eXchange, the Swiss Army knife of audio manipulation"
 license sox.license license="GPLv2, LGPLv2.1"
 link path=usr/bin/play target=sox
 link path=usr/bin/rec target=sox
--- a/components/spawn-fcgi/spawn-fcgi.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/spawn-fcgi/spawn-fcgi.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,4 @@
 dir path=usr/share/man/man1
 file path=usr/bin/spawn-fcgi
 file path=usr/share/man/man1/spawn-fcgi.1
-legacy pkg=SUNWspawn-fcgi \
-    desc="Spawn-Fcgi utility for starting FCGI backends" \
-    name="Spawn-Fcgi utility"
 license spawn-fcgi.license license=BSD
--- a/components/squid/squid.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/squid/squid.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -1816,12 +1816,6 @@
 file path=usr/squid/share/icons/anthony-xbm.gif
 file path=usr/squid/share/icons/anthony-xpm.gif
 file path=usr/squid/share/mib.txt
-legacy pkg=SUNWsquidr \
-    desc="Squid Web Proxy Cache" \
-    name="Squid Web Proxy Cache (root)"
-legacy pkg=SUNWsquidu \
-    desc="Squid Web Proxy Cache" \
-    name="Squid Web Proxy Cache (usr)"
 license squid.license license=GPLv2
 link path=usr/squid/share/errors/ar-ae target=ar
 link path=usr/squid/share/errors/ar-bh target=ar
--- a/components/subversion/subversion-java.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/subversion/subversion-java.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -43,8 +43,3 @@
 link path=usr/lib/svn/libsvnjavahl-1.so.0 target=libsvnjavahl-1.so.0.0.0
 #
 license subversion.license license="Subversion License"
-#
-legacy pkg=SUNWsvn-java \
-    desc="Java bindings for the subversion source control management system" \
-    name="Java bindings for Subversion"
-
--- a/components/subversion/subversion-perl.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/subversion/subversion-perl.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -92,7 +92,3 @@
 link path=usr/lib/svn/libsvn_swig_perl-1.so.0 target=libsvn_swig_perl-1.so.0.0.0
 #
 license subversion.license license="Subversion License"
-#
-legacy pkg=SUNWsvn-perl \
-    desc="Perl Bindings for the Subversion Source Control Management System" \
-    name="Subversion Perl Bindings"
--- a/components/subversion/subversion-python.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/subversion/subversion-python.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -69,8 +69,3 @@
 link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0
 #
 license subversion.license license="Subversion License"
-#
-legacy pkg=SUNWsvn-python \
-    desc="Python Bindings for the Subversion Source Control Management System" \
-    name="Subversion Python Bindings"
-
--- a/components/subversion/subversion.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/subversion/subversion.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -187,7 +187,3 @@
 link path=usr/lib/svn/libsvn_wc-1.so target=libsvn_wc-1.so.0.0.0
 #
 license subversion.license license="Subversion License"
-#
-legacy pkg=SUNWsvn \
-    desc="The Subversion Source Control Management System" \
-    name="Subversion"
--- a/components/sudo/sudo.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/sudo/sudo.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -85,7 +85,3 @@
 hardlink path=usr/bin/sudoedit target=sudo
 
 license sudo.license license="ISC-like, BSD"
-
-legacy pkg=SUNWsudo \
-    desc="sudo - Tool to allow certain tasks to be run as root by ordinary users." \
-    name="sudo - Tool to allow certain tasks to be run as root by ordinary users."
--- a/components/swig/swig.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/swig/swig.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -726,7 +726,4 @@
 file path=usr/share/swig/$(COMPONENT_VERSION)/wchar.i
 file path=usr/share/swig/$(COMPONENT_VERSION)/windows.i
 
-
-legacy pkg=SUNWswig desc="The Simplified and Interface Generator (swig)" \
-    name="The Simplified and Interface Generator (swig)"
 license swig.license license=BSD-like
--- a/components/tcl/expect/expect.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/tcl/expect/expect.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -88,8 +88,5 @@
 file path=usr/lib/expect$(COMPONENT_VERSION)/pkgIndex.tcl
 file path=usr/share/man/man1/expect.1
 file path=usr/share/man/man3/libexpect.3
-legacy pkg=SUNWexpect \
-    desc="expect - Programmed dialogue with other interactive programs " \
-    name="expect - Programmed dialogue with other interactive programs "
 license expect.license license="BSD-like, GPLv2"
 
--- a/components/tcltls/tcltls.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/tcltls/tcltls.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -55,7 +55,4 @@
 file tls.htm path=usr/share/doc/tls-$(COMPONENT_VERSION)/html/tls.htm
 file tls.1t.sunman path=usr/share/man/man1t/tls.1t
 link path=usr/lib/tcl8.5/tls$(COMPONENT_VERSION)/64 target=./$(MACH64)
-legacy pkg=SUNWtcltls \
-    desc="Tcl binding to openssl toolkit" \
-    name="Tcl binding to openssl toolkit"
 license tcltls.license license=BSD-like
--- a/components/tcpdump/tcpdump.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/tcpdump/tcpdump.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,7 +41,4 @@
 dir path=usr/share/man/man1
 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" \
-    name="tcpdump - network traffic sniffer"
 license tcpdump.license license=BSD
--- a/components/tidy/tidy.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/tidy/tidy.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -159,9 +159,6 @@
 file files/tab2space.1 path=usr/share/man/man1/tab2space.1
 file files/tidy.1 path=usr/share/man/man1/tidy.1
 file files/libtidy.3 path=usr/share/man/man3/libtidy.3
-legacy pkg=SUNWtidy \
-    desc="The HTML Tidy Library" \
-    name="The HTML Tidy Library"
 license tidy.license license=W3C
 link path=usr/lib/$(MACH64)/libtidy-1.0.so target=libtidy-1.0.so.0.0.0
 link path=usr/lib/$(MACH64)/libtidy-1.0.so.0 target=libtidy-1.0.so.0.0.0
--- a/components/tomcat/tomcat-examples.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/tomcat/tomcat-examples.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -466,9 +466,6 @@
 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
-legacy pkg=SUNWtcat-examples \
-    desc="Tomcat Servlet/JSP Container - example applications" \
-    name="Tomcat Servlet/JSP Container - example applications"
 link path=var/tomcat6/webapps/docs target=../../../usr/tomcat6/docs
 
 license tomcat.license license="Apache v2.0"
--- a/components/tomcat/tomcat.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/tomcat/tomcat.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -291,8 +291,6 @@
 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
-legacy pkg=SUNWtcat desc="Tomcat Servlet/JSP Container" \
-    name="Tomcat Servlet/JSP Container"
 
 depend fmri=__TBD pkg.debug.depend.file=usr/jdk/instances/jdk1.6.0/bin/java \
     type=require
--- a/components/top/top.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/top/top.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -45,7 +45,4 @@
 file path=usr/bin/$(MACH64)/top
 file path=usr/share/man/man1/top.1
 hardlink path=usr/bin/top target=../lib/isaexec
-legacy pkg=SUNWtop \
-    desc="top" \
-    name="top - provides a rolling display of top cpu using processes"
 license top.license license="BSD, Apachev2.0"
--- a/components/trousers/trousers.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/trousers/trousers.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -186,9 +186,3 @@
 link path=usr/lib/$(MACH64)/libtspi.so.1 target=libtspi.so.1.1.3
 link path=usr/lib/libtspi.so target=libtspi.so.1.1.3
 link path=usr/lib/libtspi.so.1 target=libtspi.so.1.1.3
-legacy pkg=SUNWtss-root \
-	name="TCG Software Stack - software for accessing a TPM device" \
-	desc="Trousers - TCG software stack"
-legacy pkg=SUNWtss \
-    name="TCG Software Stack - software for accessing a TPM device" \
-    desc="Trousers - TCG software stack"
--- a/components/unixodbc/unixodbc.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/unixodbc/unixodbc.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -181,8 +181,3 @@
 link path=usr/lib/$(MACH64)/libtemplate.so target=libtemplate.so.1.0.0
 #
 license unixodbc.license license="LGPLv2.1, GPLv2"
-#
-legacy pkg=SUNWunixodbc \
-    desc="UnixODBC - The UnixODBC Subsystem and SDK" \
-    name="The UnixODBC Subsystem and SDK"
-
--- a/components/unrar/unrar.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/unrar/unrar.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -41,8 +41,4 @@
 file unrar path=usr/bin/unrar
 file unrar.1 path=usr/share/man/man1/unrar.1
 
-legacy pkg=SUNWunrar \
-    desc="Rar archives extractor utility" \
-    name="Rar archives extractor utility"
-
 license unrar.license license=UnRAR
--- a/components/unzip/unzip.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/unzip/unzip.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -52,7 +52,3 @@
 file path=usr/share/man/man1/unzipsfx.1
 file path=usr/share/man/man1/zipinfo.1
 file path=usr/share/man/man1/zipgrep.1
-
-legacy	pkg=SUNWunzip \
-	name="The Info-Zip (unzip) decompression utility" \
-	desc="The Info-Zip (unzip) decompression utility"
--- a/components/which/which.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/which/which.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -48,7 +48,4 @@
 link path=usr/bin/gwhich target=../gnu/bin/which facet.compat.gnulinks=true
 link path=usr/share/man/man1/gwhich.1 \
     target=../../../gnu/share/man/man1/which.1 facet.compat.gnulinks=true
-legacy pkg=SUNWgnu-which \
-    desc="GNU which utility" \
-    name="GNU which"
 license which.license license=GPLv2
--- a/components/wireshark/wireshark.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/wireshark/wireshark.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -49,7 +49,5 @@
 file path=usr/share/man/man1/wireshark.1
 file wireshark-$(IPS_COMPONENT_VERSION)/image/wsicon64.png \
     path=usr/share/pixmaps/wireshark.png
-legacy pkg=SUNWwireshark desc="Wireshark - Network protocol analyzer" \
-    name="Wireshark - Network protocol analyzer"
 
 license wireshark.license license=GPLv3
--- a/components/wxwidgets/wxwidgets.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/wxwidgets/wxwidgets.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -32,8 +32,6 @@
 set name=org.opensolaris.arc-caseid value=LSARC/2008/476/
 
 license wxwidgets.license license='wxWindows Library license'
-legacy pkg=SUNWwxwidgets desc="wxWidgets - A cross-platform GUI toolkit $(COMPONENT_VERSION)" \
-    name="wxWidgets - A cross-platform GUI toolkit"
 
 dir path=usr
 dir path=usr/bin
--- a/components/zlib/zlib.p5m	Fri Dec 16 08:40:13 2011 -0800
+++ b/components/zlib/zlib.p5m	Mon Dec 19 14:41:24 2011 -0800
@@ -67,6 +67,3 @@
 legacy pkg=SUNWzlib \
     name="The Zip compression library" \
     desc="The Zip compression library"
-legacy pkg=SUNWzlibr \
-    name="The Zip compression library (Root)" \
-    desc="The Zip compression library (Root)"