7060335 several components contain version in their legacy actions' descriptions
authorRich Burridge <rich.burridge@oracle.com>
Thu, 17 Nov 2011 14:40:44 -0800
changeset 587 9cc973a7ad62
parent 586 7e532871fc48
child 588 a72cfdd57701
7060335 several components contain version in their legacy actions' descriptions
components/a2ps/a2ps.p5m
components/aalib/aalib.p5m
components/acpidump/acpidump.p5m
components/ant/ant.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_perl/apache-perl.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/autogen/autogen.p5m
components/bash/bash.p5m
components/beanshell/beanshell.p5m
components/binutils/binutils.p5m
components/bison/bison.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/diffutils/diffutils.p5m
components/elinks/elinks.p5m
components/fastcgi/fcgi-doc.p5m
components/fastcgi/fcgi.p5m
components/fetchmail/Makefile
components/fetchmail/fetchmail.p5m
components/flex/flex.p5m
components/flex/flexruntime.p5m
components/foomatic/db-engine/foomatic-db-engine.p5m
components/foomatic/filters/foomatic-rip.p5m
components/foomatic/fppd/foomatic-ppds.p5m
components/gawk/gawk.p5m
components/gcc3/gcc-3-runtime.p5m
components/gcc3/gcc-3.p5m
components/gd2/gd2.p5m
components/gdb/gdb.p5m
components/gdbm/gdbm.p5m
components/gettext/gettext.p5m
components/ggrep/gnu-grep.p5m
components/ghostscript/ghostscript.p5m
components/git/git.p5m
components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
components/gnump/gmp.p5m
components/gocr/gocr.p5m
components/gperf/gperf.p5m
components/guile/guile.p5m
components/gutenprint/gutenprint.p5m
components/gzip/gzip.p5m
components/hexedit/hexedit.p5m
components/hplip/hplip.p5m
components/httping/httping.p5m
components/iftop/iftop.p5m
components/imagemagick/imagemagick.p5m
components/iperf/iperf.p5m
components/ipmitool/ipmitool.p5m
components/ircii/ircii.p5m
components/junit/junit.p5m
components/lcms/lcms.p5m
components/less/less.p5m
components/lftp/lftp.p5m
components/libconfuse/libconfuse.p5m
components/libevent/libevent.p5m
components/libexpat/expat.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/librsync/librsync.p5m
components/libsigsegv/libsigsegv.p5m
components/libsndfile/libsndfile.p5m
components/libtorrent/libtorrent.p5m
components/libusb/ugen/libusbugen.p5m
components/libusb/wrapper/libusb.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/m4/m4.p5m
components/make/make.p5m
components/mc/mc.p5m
components/meld/meld.p5m
components/memcached-java/memcached-java.p5m
components/memcached/memcached.p5m
components/mpfr/mpfr.p5m
components/mutt/Makefile
components/mutt/mutt.p5m
components/ncftp/ncftp.p5m
components/net-snmp/net-snmp-addons.p5m
components/net-snmp/net-snmp-base.p5m
components/net-snmp/net-snmp-documentation.p5m
components/nmap/nmap.p5m
components/ntp/ntp.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/pam_pkcs11/pam_pkcs11.p5m
components/pcre/pcre.p5m
components/perl_modules/DBI/DBI.p5m
components/perl_modules/net-ssleay/net-ssleay.p5m
components/perl_modules/pmtools/pmtools.p5m
components/perl_modules/xml-parser/xml-parser.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-idn.p5m
components/php-5_2/php-memcache.p5m
components/php-5_2/php-suhosin.p5m
components/php-5_2/php-tcpwrap.p5m
components/php-5_2/php-xdebug.p5m
components/psutils/psutils.p5m
components/pv/pv.p5m
components/pwgen/pwgen.p5m
components/pylint/pylint.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/sane-backends/sane-backends.p5m
components/sane-frontends/sane-frontends.p5m
components/sblim/sblim.p5m
components/sed/sed.p5m
components/slang/Makefile
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/stdcxx/stdcxx.p5m
components/subversion/subversion.p5m
components/tcl/tcl/tcl.p5m
components/tcl/tk/tk.p5m
components/tcltls/tcltls.p5m
components/tcpdump/tcpdump.p5m
components/tcsh/tcsh.p5m
components/texinfo/texinfo.p5m
components/tidy/tidy.p5m
components/top/top.p5m
components/trousers/trousers.p5m
components/unrar/unrar.p5m
components/wget/wget.p5m
components/which/which.p5m
--- a/components/a2ps/a2ps.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/a2ps/a2ps.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -369,9 +369,11 @@
 file path=usr/share/ogonkify/ptmbi-o.ps
 file path=usr/share/ogonkify/ptmr-o.ps
 file path=usr/share/ogonkify/ptmri-o.ps
-legacy pkg=SUNWa2psr desc="a2ps - GNU Any to PostScript filter (root) 4.14" \
+legacy pkg=SUNWa2psr \
+    desc="a2ps - GNU Any to PostScript filter (root)" \
     name="a2ps - GNU Any to PostScript filter (root)"
-legacy pkg=SUNWa2psu desc="a2ps - GNU Any to PostScript filter (usr) 4.14" \
+legacy pkg=SUNWa2psu \
+    desc="a2ps - GNU Any to PostScript filter (usr)" \
     name="a2ps - GNU Any to PostScript filter (usr)"
 license a2ps.license license=GPLv3
 link path=usr/lib/liba2ps.so target=liba2ps.so.1.0.0
--- a/components/aalib/aalib.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/aalib/aalib.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -145,5 +145,5 @@
 link path=usr/lib/libaa.so.1 target=libaa.so.1.0.4
 
 legacy pkg=SUNWaalib \
-    desc="AAlib - Ascii art graphics library (1.4 rc5)" \
+    desc="AAlib - Ascii art graphics library" \
     name="AAlib - Ascii art graphics library"
--- a/components/acpidump/acpidump.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/acpidump/acpidump.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -49,7 +49,7 @@
 file madt.1 path=usr/share/man/man1/madt.1
 
 legacy pkg=SUNWacpidump \
-    desc="acpidump - utilities used to display ACPI tables (20071116)" \
+    desc="acpidump - utilities used to display ACPI tables" \
     name="acpidump - utilities used to display ACPI tables"
 
 license acpidump.license license=GPLv2
--- a/components/ant/ant.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ant/ant.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -2811,10 +2811,10 @@
 file path=usr/share/lib/ant/xercesImpl.jar
 file path=usr/share/lib/ant/xml-apis.jar
 file ant.1.sunman path=usr/share/man/man1/ant.1
-legacy pkg=SUNWant desc="The Jakarta ANT Java/XML-based build tool (1.7.1)" \
+legacy pkg=SUNWant \
+    desc="The Jakarta ANT Java/XML-based build tool" \
     name="Jakarta ANT"
 
-
 license ant.license license="Apache v2.0"
 link path=usr/sfw/bin/ant target=../../bin/ant
 link path=usr/sfw/bin/antRun target=../../bin/antRun
--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -49,9 +49,9 @@
 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 V2.2" \
-	desc="Dtrace plugin for Apache Web Server Version 2.2"
+	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 V2.2" \
-	desc="Dtrace plugin for Apache Web Server Version 2.2"
+	name="DTrace plugin for Apache Web Server" \
+	desc="Dtrace plugin for Apache Web Server"
--- a/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -56,9 +56,9 @@
 file path=usr/apache2/2.2/manual/mod/mod_fcgid.html
 
 legacy	pkg=SUNWapch22m-fcgid \
-	name="FastCGI plugin for Apache Web Server V2.2" \
-	desc="FastCGI plugin for Apache Web Server Version 2.2 (2.3.6)"
+	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 V2.2" \
-	desc="FastCGI plugin for Apache Web Server Version 2.2 (2.3.6)"
+	name="FastCGI plugin for Apache Web Server" \
+	desc="FastCGI plugin for Apache Web Server"
--- a/components/apache2-modules/mod_jk/apache-jk.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -54,9 +54,9 @@
 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 Version 2.2 (1.2.28)" \
-	desc="Tomcat Connector plugin for Apache Web Server Version 2.2 (1.2.28)"
+	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 Version 2.2 (1.2.28)" \
-	desc="Tomcat Connector plugin for Apache Web Server Version 2.2 (1.2.28)"
+	name="Tomcat Connector plugin for Apache Web Server" \
+	desc="Tomcat Connector plugin for Apache Web Server"
--- a/components/apache2-modules/mod_perl/apache-perl.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2-modules/mod_perl/apache-perl.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -492,5 +492,5 @@
 
 
 legacy	pkg=SUNWapch22u \
-	name="Apache Web Server V2.2 (usr)" \
-	desc="The Apache HTTP Server Version 2.2 (usr components)"
+	name="Apache Web Server (usr)" \
+	desc="The Apache HTTP Server Version (usr components)"
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -50,9 +50,9 @@
 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 V2.2" \
-	desc="Proxy HTML plugin for Apache Web Server Version 2.2 (3.1.1)"
+	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 V2.2" \
-	desc="Proxy HTML plugin for Apache Web Server Version 2.2 (3.1.1)"
+	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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -47,5 +47,5 @@
 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 V2.2" \
-	desc="xml2enc plugin for Apache Web Server Version 2.2 (1.0)"
+	name="xml2nec plugin for Apache Web Server" \
+	desc="xml2enc plugin for Apache Web Server"
--- a/components/apache2-modules/mod_security2/apache-security.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2-modules/mod_security2/apache-security.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -51,9 +51,9 @@
 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 (2.5.9) for Apache Web Server Version 2.2" \
-	desc="Mod Security plugin (2.5.9) for Apache Web Server Version 2.2"
+	name="Mod Security plugin for Apache Web Server" \
+	desc="Mod Security plugin for Apache Web Server"
 
 legacy	pkg=SUNWapch22r-security \
-	name="Mod Security plugin (2.5.9) for Apache Web Server Version 2.2" \
-	desc="Mod Security plugin (2.5.9) for Apache Web Server Version 2.2"
+	name="Mod Security plugin for Apache Web Server" \
+	desc="Mod Security plugin for Apache Web Server"
--- a/components/apache2/apache-22.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2/apache-22.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -642,9 +642,9 @@
 link path=var/apache2/2.2/libexec/64 target=$(MACH64)
 
 legacy	pkg=SUNWapch22u \
-	name="Apache Web Server V2.2 (usr)" \
-	desc="The Apache HTTP Server Version 2.2 (usr components)"
+	name="Apache Web Server (usr)" \
+	desc="The Apache HTTP Server (usr components)"
 
 legacy	pkg=SUNWapch22r \
-	name="Apache Web Server V2.2 (root)" \
-	desc="The Apache HTTP server Version 2.2 (root components)"
+	name="Apache Web Server (root)" \
+	desc="The Apache HTTP server (root components)"
--- a/components/apache2/apache-sed.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2/apache-sed.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -50,9 +50,9 @@
 file path=usr/apache2/2.2/libexec/$(MACH64)/mod_sed.so
 
 legacy	pkg=SUNWapch22m-sed \
-	name="mod_sed plugin for Apache Web Server V2.2" \
-	desc="mod_sed plugin for Apache Web Server Version 2.2"
+	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 V2.2 (root)" \
-	desc="mod_sed plugin for Apache Web Server Version 2.2 (root component)"
+	name="mod_sed plugin for Apache Web Server (root)" \
+	desc="mod_sed plugin for Apache Web Server (root component)"
--- a/components/apache2/documentation.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apache2/documentation.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -865,5 +865,5 @@
 file path=usr/apache2/2.2/manual/vhosts/name-based.html.tr.utf8
 
 legacy	pkg=SUNWapch22d \
-	name="Apache Web Server V2.2 Documentation" \
-	desc="The Apache HTTP Server Version 2.2 (documentation)"
+	name="Apache Web Server Documentation" \
+	desc="The Apache HTTP Server (documentation)"
--- a/components/apr-util/apr-util-13-apr-ldap.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apr-util/apr-util-13-apr-ldap.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -48,5 +48,5 @@
 license apr-util.license license="Apache v2.0"
 
 legacy	pkg=SUNWapu13-ldap \
-	name="Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub" \
-	desc="Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub"
+	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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apr-util/apr-util-13-dbd-mysql.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -48,5 +48,5 @@
 license apr-util.license license="Apache v2.0"
 
 legacy	pkg=SUNWapu13dbd-mysql \
-	name="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0" \
-	desc="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0"
+	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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apr-util/apr-util-13-dbd-sqlite.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -48,5 +48,5 @@
 license apr-util.license license="Apache v2.0"
 
 legacy	pkg=SUNWapu13dbd-sqlite \
-	name="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5" \
-	desc="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5"
+	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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apr-util/apr-util-13-doc.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -211,5 +211,5 @@
 license apr-util.license license="Apache v2.0"
 
 legacy	pkg=SUNWapu13doc \
-	name="Apache Portable Runtime Utility (APR-util) 1.3 documentation" \
-	desc="Apache Portable Runtime Utility (APR-util) 1.3 documentation"
+	name="Apache Portable Runtime Utility (APR-util) documentation" \
+	desc="Apache Portable Runtime Utility (APR-util) documentation"
--- a/components/apr-util/apr-util-13.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apr-util/apr-util-13.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -106,9 +106,9 @@
 license apr-util.license license="Apache v2.0"
 
 legacy	pkg=SUNWapu13dev \
-	name="Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries" \
-	desc="Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries"
+	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) 1.3 Shared Libraries" \
-	desc="Apache Portable Runtime Utility (APR-util) 1.3 Shared Libraries"
+	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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apr/apr-13-doc.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -220,5 +220,5 @@
 license apr.license license="Apache v2.0"
 
 legacy	pkg=SUNWapr13doc \
-	name="Apache Portable Runtime (APR) 1.3 documentation" \
-	desc="Apache Portable Runtime (APR) 1.3 documentation"
+	name="Apache Portable Runtime (APR) documentation" \
+	desc="Apache Portable Runtime (APR) documentation"
--- a/components/apr/apr-13.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/apr/apr-13.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -116,9 +116,9 @@
 license apr.license license="Apache v2.0"
 
 legacy	pkg=SUNWapr13dev \
-	name="Apache Portable Runtime (APR) 1.3 development header files and libraries" \
-	desc="Apache Portable Runtime (APR) 1.3 development header files and libraries"
+	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) 1.3 Shared Libraries" \
-	desc="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.3"
+	name="Apache Portable Runtime (APR) Shared Libraries" \
+	desc="The shared libraries for any component using Apache Portable Runtime (APR)"
--- a/components/areca/areca.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/areca/areca.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -131,7 +131,7 @@
 file path=usr/share/areca/translations/resources_tw.properties
 
 legacy pkg=SUNWareca \
-    desc="areca - backup utilities (7.1)" \
+    desc="Areca backup utilities" \
     name="Areca backup utilities"
 
 link path=usr/bin/areca target=../share/areca/areca.sh
--- a/components/autogen/autogen.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/autogen/autogen.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -111,7 +111,8 @@
 file path=usr/share/man/man3/streqvmap.3
 file path=usr/share/man/man3/strneqvcmp.3
 file path=usr/share/man/man3/strtransform.3
-legacy pkg=SUNWautogen desc="GNU autogen - repetitious text utility (5.9.0)" \
+legacy pkg=SUNWautogen \
+    desc="GNU autogen - repetitious text utility" \
     name="autogen - GNU autogen utility"
 license autogen.license license=GPLv2
 link path=usr/lib/libguileopts.so target=libguileopts.so.0.0.1
--- a/components/bash/bash.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/bash/bash.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -214,10 +214,10 @@
 file path=usr/share/man/man1/bashbug.1
 file rbash.1 path=usr/share/man/man1/rbash.1
 #
-legacy pkg=SUNWbash desc="GNU Bourne-Again shell (bash) version 4.1" \
+legacy pkg=SUNWbash desc="GNU Bourne-Again shell (bash)" \
     name="GNU Bourne-Again shell (bash)"
 legacy pkg=SUNWbashr \
-    desc="GNU Bourne-Again shell (bash) version 4.1  (root package)" \
+    desc="GNU Bourne-Again shell (bash) (root package)" \
     name="GNU Bourne-Again shell (bash) (root)"
 #
 license bash.license license="GPLv3, FDLv1.2"
--- a/components/beanshell/beanshell.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/beanshell/beanshell.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -251,5 +251,6 @@
 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 (2.0b4)" \
+legacy pkg=SUNWbeanshell \
+    desc="beanshell - a small and embeddable Java source interpreter" \
     name="beanshell - a small and embeddable Java source interpreter"
--- a/components/binutils/binutils.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/binutils/binutils.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -333,7 +333,8 @@
 link path=usr/share/man/man1/gstrip.1 \
     target=../../../gnu/share/man/man1/strip.1
 
-legacy pkg=SUNWbinutils desc="GNU binutils - Binary file utilities (2.19)" \
+legacy pkg=SUNWbinutils \
+    desc="GNU binutils - Binary file utilities" \
     name="binutils - GNU binutils"
 
 license binutils.license license=GPLv3
--- a/components/bison/bison.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/bison/bison.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -124,7 +124,8 @@
 file path=usr/share/locale/tr/LC_MESSAGES/bison.mo
 file path=usr/share/locale/vi/LC_MESSAGES/bison.mo
 file path=usr/share/man/man1/bison.1
-legacy pkg=SUNWbison desc="GNU bison 2.3 - A YACC Replacement" \
+legacy pkg=SUNWbison \
+    desc="GNU bison - A YACC Replacement" \
     name="bison - A YACC Replacement"
 
 
--- a/components/cdrtools/cdrtools.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/cdrtools/cdrtools.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -57,7 +57,7 @@
 
 legacy pkg=SUNWmkcd \
     name="CD creation utilities" \
-    desc="CD creation utilities 3.00"
+    desc="CD creation utilities"
 legacy pkg=SUNWmkcdr \
     name="CD creation utilities (Root)" \
-    desc="CD creation utilities 3.00 (Root)"
+    desc="CD creation utilities (Root)"
--- a/components/clisp/clisp.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/clisp/clisp.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -151,5 +151,5 @@
 file path=usr/share/vim/vimfiles/after/syntax/lisp.vim
 
 legacy pkg=SUNWclisp \
-    desc="GNU Common Lisp implementation (2.47)" \
+    desc="GNU Common Lisp implementation" \
     name="GNU Common Lisp"
--- a/components/cmake/cmake.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/cmake/cmake.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -451,5 +451,5 @@
 license cmake.license license="BSD, MIT, GPLv2, Curl, PD"
 
 legacy pkg=SUNWcmake \
-    desc="CMake - A cross-platform, open-source make system (2.6.2)" \
-    name="CMake - A cross-platform, open-source make system."
+    desc="CMake - A cross-platform, open-source make system" \
+    name="CMake - A cross-platform, open-source make system"
--- a/components/conflict/conflict.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/conflict/conflict.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -48,5 +48,5 @@
 file path=usr/share/man/man1/conflict.1
 
 legacy pkg=SUNWconflict \
-    desc="conflict - displays conflicting filenames in $PATH (6.0)" \
+    desc="conflict - displays conflicting filenames in $PATH" \
     name="conflict"
--- a/components/convmv/convmv.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/convmv/convmv.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -48,5 +48,5 @@
 file path=usr/share/man/man1/convmv.1
 
 legacy pkg=SUNWconvmv \
-    desc="Filename Encoding Conversion Tool (convmv 1.14)" \
+    desc="Filename Encoding Conversion Tool (convmv)" \
     name="Filename Encoding Conversion Tool"
--- a/components/coreutils/coreutils.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/coreutils/coreutils.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -404,7 +404,8 @@
 file usr/gnu/share/man/man1/users.1 path=usr/share/man/man1/users.1
 file usr/gnu/share/man/man1/vdir.1 path=usr/share/man/man1/vdir.1
 file usr/gnu/share/man/man1/whoami.1 path=usr/share/man/man1/whoami.1
-legacy pkg=SUNWgnu-coreutils desc="GNU core utilities (8.5)" \
+legacy pkg=SUNWgnu-coreutils \
+    desc="GNU core utilities" \
     name="coreutils - GNU core utilities"
 license coreutils.license license=GPLv3
 link path=usr/gnu/share/locale/af/LC_TIME/coreutils.mo \
--- a/components/cups/cups-libs.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/cups/cups-libs.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -43,5 +43,5 @@
 link path=usr/lib/$(MACH64)/libcupsimage.so target=libcupsimage.so.2
 
 legacy pkg=SUNWcupsu \
-       desc="Common Unix Print System v1.4 (usr)" \
-       name="Common Unix Print System v1.4 (usr)"
+       desc="Common Unix Print System (usr)" \
+       name="Common Unix Print System (usr)"
--- a/components/cups/cups.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/cups/cups.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -1207,9 +1207,9 @@
 link path=usr/share/man/man1/reject.1 target=../man1m/cupsaccept.1m
 
 legacy pkg=SUNWcupsr \
-       desc="Common Unix Print System v1.4 (root)" \
-       name="Common Unix Print System v1.4 (root)"
+       desc="Common Unix Print System (root)" \
+       name="Common Unix Print System (root)"
 
 legacy pkg=SUNWcupsu \
-       desc="Common Unix Print System v1.4 (usr)" \
-       name="Common Unix Print System v1.4 (usr)"
+       desc="Common Unix Print System (usr)" \
+       name="Common Unix Print System (usr)"
--- a/components/curl/curl.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/curl/curl.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -188,6 +188,5 @@
 license curl.license license="CURL"
 #
 legacy pkg=SUNWcurl \
-    desc="CURL - The C-URL Wrappers Library (7.21.2)" \
+    desc="CURL - The C-URL Wrappers Library" \
     name="The C-URL Wrappers Library"
-
--- a/components/diffutils/diffutils.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/diffutils/diffutils.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -129,7 +129,7 @@
 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 (2.8.7)" \
+    desc="GNU diffutils - Finds differences between and among files" \
     name="GNU diffutils"
 license diffutils.license license=GPLv2
 link path=usr/bin/gcmp \
--- a/components/elinks/elinks.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/elinks/elinks.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -162,6 +162,7 @@
 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 (0.11.7)" \
-    name=ELinks
+legacy pkg=SUNWelinks \
+    desc="ELinks - Text-based Web browser" \
+    name="ELinks"
 license elinks.license license=GPLv2
--- a/components/fastcgi/fcgi-doc.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/fastcgi/fcgi-doc.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -66,6 +66,6 @@
 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 (2.4.0)" \
+    desc="Documentation for FastCGI Application Libraries" \
     name="FastCGI Application Libraries - Documentation"
 license fcgi.license license=FastCGI
--- a/components/fastcgi/fcgi.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/fastcgi/fcgi.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -64,8 +64,8 @@
 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 (2.4.0)" \
-    name="FastCGI - fcgi Application Libraries (2.4.0)"
+    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/Makefile	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/fetchmail/Makefile	Thu Nov 17 14:40:44 2011 -0800
@@ -27,23 +27,16 @@
 
 COMPONENT_NAME=		fetchmail
 COMPONENT_VERSION=	6.3.21
-IPS_PKG_NAME=		mail/fetchmail
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:e32a0d40ec133d651782543ecd7bc9bbee52dff7
 COMPONENT_ARCHIVE_URL=	http://download.berlios.de/fetchmail/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://fetchmail.berlios.de/
-COPYRIGHT_FILE=		fetchmail.license
-COPYRIGHTS=		GPLv2
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-PKG_MACROS +=	IPS_PKG_NAME=$(IPS_PKG_NAME)
-PKG_MACROS +=	COPYRIGHT_FILE=$(COPYRIGHT_FILE)
-PKG_MACROS +=	COPYRIGHTS=$(COPYRIGHTS)
-
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		am_cv_python_pythondir="$(PYTHON_VENDOR_PACKAGES)"
 CONFIGURE_OPTIONS  +=		--with-kerberos5
--- a/components/fetchmail/fetchmail.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/fetchmail/fetchmail.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -25,7 +25,7 @@
 <transform file path=.*/vendor-packages/fetchmailconf.py$ -> default pkg.tmp.autopyc false>
 <transform file path=.*/vendor-packages/fetchmailconf.pyo$ -> drop>
 
-set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/mail/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="fetch mail from a POP, IMAP, ETRN, or ODMR-capable server"
 set name=pkg.description value="Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC."
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
@@ -35,10 +35,10 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/135/
 
-license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+license fetchmail.license license=GPLv2
 
 legacy pkg=SUNWfetchmail \
-    desc="Fetchmail Mail Retrieval and Forwarding Utility ($(IPS_COMPONENT_VERSION))" \
+    desc="Fetchmail Mail Retrieval and Forwarding Utility" \
     name="Fetchmail Mail Retrieval and Forwarding Utility"
 
 dir path=usr
--- a/components/flex/flex.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/flex/flex.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -101,4 +101,4 @@
 
 legacy pkg=SUNWflexlex \
 	name="Flex Lexer" \
-	desc="The Flex Lexer - A lex replacement/substitute (2.5.33)"
+	desc="The Flex Lexer - A lex replacement/substitute"
--- a/components/flex/flexruntime.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/flex/flexruntime.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -43,4 +43,4 @@
 
 legacy pkg=SUNWflexruntime \
 	name="Flex Lexer" \
-	desc="The Flex Lexer - A lex replacement/substitute runtime (2.5.33)"
+	desc="The Flex Lexer - A lex replacement/substitute runtime"
--- a/components/foomatic/db-engine/foomatic-db-engine.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -34,11 +34,11 @@
 license foomatic-db-engine.license license='GPLv2, MIT'
 
 legacy pkg=SUNWfoomatic-db-enginer \
-   desc="Foomatic Database Engine 3.0-20080903 (root)" \
+   desc="Foomatic Database Engine (root)" \
    name="Foomatic Database Engine (root)"
 
 legacy pkg=SUNWfoomatic-db-engineu \
-   desc="Foomatic Database Engine 3.0-20080903 (usr)" \
+   desc="Foomatic Database Engine (usr)" \
    name="Foomatic Database Engine (usr)"
 
 dir path=etc
--- a/components/foomatic/filters/foomatic-rip.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/foomatic/filters/foomatic-rip.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -39,11 +39,11 @@
 license foomatic-filters.license license='GPLv2'
 
 legacy pkg=SUNWffiltersr \
-   desc="foomatic-filters - Foomatic Print Filters (root) 3.0.2" \
+   desc="foomatic-filters - Foomatic Print Filters (root)" \
    name="foomatic-filters - Foomatic Print Filters (root)"
 
 legacy pkg=SUNWffiltersu \
-   desc="foomatic-filters - Foomatic Print Filters (user) 3.0.2" \
+   desc="foomatic-filters - Foomatic Print Filters (user)" \
    name="foomatic-filters - Foomatic Print Filters (user)"
 
 dir path=etc
--- a/components/foomatic/fppd/foomatic-ppds.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/foomatic/fppd/foomatic-ppds.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -31,7 +31,9 @@
 
 license foomatic-ppds.license license='GPLv2, MIT'
 
-legacy pkg=SUNWfppd desc="foomatic_ppds - Foomatic Print PPDs 3.0" name="foomatic_ppds - Foomatic Print PPDs"
+legacy pkg=SUNWfppd \
+    desc="foomatic_ppds - Foomatic Print PPDs" \
+    name="foomatic_ppds - Foomatic Print PPDs"
 
 dir path=usr
 dir path=usr/lib
--- a/components/gawk/gawk.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gawk/gawk.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -128,7 +128,8 @@
 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 3.1.5" \
+legacy pkg=SUNWgawk \
+    desc="gawk - GNU awk" \
     name="gawk - GNU implementation of awk"
 license gawk.license license=GPLv2
 link path=usr/bin/gawk target=../gnu/bin/awk facet.compat.gnulinks=true
--- a/components/gcc3/gcc-3-runtime.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gcc3/gcc-3-runtime.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -61,7 +61,7 @@
 link path=usr/sfw/lib/libstdc++.so.6 target=libstdc++.so.6.0.3
 
 legacy pkg=SUNWgccruntime \
-    name="GCC Runtime libraries" vendor="Oracle Corporation" \
+    name="GCC Runtime libraries" \
     desc="GCC Runtime - Shared libraries used by gcc and other gnu components"
 
 license gcc.license license=GPLv2
--- a/components/gcc3/gcc-3.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gcc3/gcc-3.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -483,4 +483,4 @@
 
 legacy pkg=SUNWgcc \
 	name="gcc - The GNU C compiler" \
-	desc="GNU C - The GNU C compiler 3.4.3"
+	desc="GNU C - The GNU C compiler"
--- a/components/gd2/gd2.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gd2/gd2.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -99,7 +99,8 @@
 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 (2.0.35)" \
+legacy pkg=SUNWgd2 \
+    desc="GD - The Graphics Draw Library" \
     name="The Graphics Draw Library"
 #
 license gd2.license license="GD2 License"
--- a/components/gdb/gdb.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gdb/gdb.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -110,7 +110,8 @@
 file path=usr/share/man/man1/gdb.1
 file path=usr/share/man/man1/gdbtui.1
 
-legacy pkg=SUNWgdb desc="gdb - GNU debugger (6.8)" \
-    name="gdb - GNU debugger" vendor="Oracle Corporation"
+legacy pkg=SUNWgdb \
+    desc="gdb - GNU debugger" \
+    name="gdb - GNU debugger"
 
 license gdb.license license='GPLv3'
--- a/components/gdbm/gdbm.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gdbm/gdbm.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -53,4 +53,4 @@
 
 legacy pkg=SUNWgnu-dbm \
 	name="GNU Database Manager" \
-	desc="GNU Database Manager - a set of database routines that use extensible hashing. (version 1.8.3)"
+	desc="GNU Database Manager - a set of database routines that use extensible hashing"
--- a/components/gettext/gettext.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gettext/gettext.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -1663,7 +1663,7 @@
 file path=usr/share/man/man1/msguniq.1
 file path=usr/share/man/man1/ngettext.1
 legacy pkg=SUNWgnu-gettext \
-    desc="GNU gettext - message handling utilities (0.16.1)" \
+    desc="GNU gettext - message handling utilities" \
     name="GNU gettext"
 license gettext.license license=GPLv2
 link path=usr/bin/ggettext target=../gnu/bin/gettext facet.compat.gnulinks=true
--- a/components/ggrep/gnu-grep.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ggrep/gnu-grep.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -178,7 +178,8 @@
 file usr/share/man/man1/egrep.1 path=usr/gnu/share/man/man1/egrep.1
 file usr/share/man/man1/fgrep.1 path=usr/gnu/share/man/man1/fgrep.1
 file usr/share/man/man1/grep.1 path=usr/gnu/share/man/man1/grep.1
-legacy pkg=SUNWggrp desc="ggrep - GNU grep utilities 2.5.4" \
+legacy pkg=SUNWggrp \
+    desc="ggrep - GNU grep utilities" \
     name="ggrep - GNU grep utilities"
 license gnu-grep.license license=GPLv3
 link path=usr/bin/gegrep \
--- a/components/ghostscript/ghostscript.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ghostscript/ghostscript.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -977,4 +977,4 @@
 
 legacy pkg=SUNWghostscript \
 	name="GPL Ghostscript" \
-	desc="GPL Ghostscript 8.64"
+	desc="GPL Ghostscript"
--- a/components/git/git.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/git/git.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -469,7 +469,8 @@
 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 (v1.7.3.2)" \
+legacy pkg=SUNWgit \
+    desc="git - Fast Version Control System" \
     name="git - Fast Version Control System"
 license git.license license=GPLv2
 
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -95,6 +95,7 @@
 file path=usr/share/ghostscript/fonts/u004006t.afm
 file path=usr/share/ghostscript/fonts/u004006t.gsf
 file path=usr/share/ghostscript/fonts/u004006t.pfm
-legacy pkg=SUNWgsfot desc="GNU Ghostscript Fonts (Other) 6.0" \
+legacy pkg=SUNWgsfot \
+    desc="GNU Ghostscript Fonts (Other)" \
     name="GNU Ghostscript Fonts (Other)"
 license gnu-gs-fonts-other.license license=GPLv2
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -142,6 +142,7 @@
 file path=usr/share/ghostscript/fonts/z003034l.afm
 file path=usr/share/ghostscript/fonts/z003034l.pfb
 file path=usr/share/ghostscript/fonts/z003034l.pfm
-legacy pkg=SUNWgsfst desc="GNU Ghostscript Fonts (Standard) 6.0" \
+legacy pkg=SUNWgsfst \
+    desc="GNU Ghostscript Fonts (Standard)" \
     name="GNU Ghostscript Fonts (Standard)"
 license gnu-gs-fonts-std.license license=GPLv2
--- a/components/gnump/gmp.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gnump/gmp.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -80,6 +80,5 @@
 license gmp.license license="LGPLv3, GPLv3, FDLv1.3"
 #
 legacy pkg=SUNWgnu-mp \
-    desc="GNU MP 4.3.2" \
-    name="The GNU Multiple Precision (Bignum) Library (4.3.2)"
-
+    desc="GNU MP" \
+    name="The GNU Multiple Precision (Bignum) Library"
--- a/components/gocr/gocr.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gocr/gocr.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -52,5 +52,5 @@
 file path=usr/share/man/man1/gocr.1
 
 legacy pkg=SUNWgocr \
-    desc="GOCR converts scanned images of text back to text files. (version 0.48)" \
+    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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gperf/gperf.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -47,6 +47,6 @@
 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 (3.0.3)" \
+    desc="GNU gperf - perfect hash function generator" \
     name="GNU gperf - perfect hash function generator"
 license gperf.license license=GPLv2
--- a/components/guile/guile.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/guile/guile.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -362,7 +362,8 @@
 file guile-snarf.1 path=usr/share/man/man1/guile-snarf.1
 file guile-tools.1 path=usr/share/man/man1/guile-tools.1
 file guile.1 path=usr/share/man/man1/guile.1
-legacy pkg=SUNWguile desc="GNU guile - extension language library (1.8.4)" \
+legacy pkg=SUNWguile \
+    desc="GNU guile - extension language library" \
     name="guile - GNU guile utility"
 license guile.license license=LGPLv2.1
 link path=usr/lib/$(MACH64)/libguile-srfi-srfi-1-v-3.so \
--- a/components/gutenprint/gutenprint.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gutenprint/gutenprint.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -418,7 +418,7 @@
 file path=usr/share/man/man8/cups-genppd.8
 file path=usr/share/man/man8/cups-genppdupdate.8
 legacy pkg=SUNWgutenprint \
-    desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers (5.2.4)" \
+    desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers" \
     name="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
 license gutenprint.license license=GPLv2
 link path=usr/lib/libgutenprint.so target=libgutenprint.so.2.0.5
--- a/components/gzip/gzip.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/gzip/gzip.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -66,8 +66,8 @@
 hardlink path=usr/bin/gzcmp target=gzdiff
 hardlink path=usr/bin/gzegrep target=gzgrep
 hardlink path=usr/bin/gzfgrep target=gzgrep
-legacy pkg=SUNWgzip desc="The GNU Zip (gzip) compression utility 1.3.5" \
+legacy pkg=SUNWgzip \
+    desc="The GNU Zip (gzip) compression utility" \
     name="The GNU Zip (gzip) compression utility"
 
-
 license gzip.license license=GPLv2
--- a/components/hexedit/hexedit.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/hexedit/hexedit.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -45,7 +45,7 @@
 file path=usr/share/man/man1/hexedit.1
 
 legacy pkg=SUNWhexedit \
-    desc="Hexedit - a command-line binary file editor (1.2.12)" \
+    desc="Hexedit - a command-line binary file editor" \
     name="Hexedit"
 
 license hexedit.license license=GPLv2
--- a/components/hplip/hplip.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/hplip/hplip.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -1224,7 +1224,8 @@
 file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950vr-hpijs.ppd.gz
 file path=usr/share/ppd/SUNWhpijs/HP/hp-psc_950xi-hpijs.ppd.gz
-legacy pkg=SUNWhpijs desc="hpijs - HP InkJet Server (from HPLIP 3.10.9)" \
+legacy pkg=SUNWhpijs \
+    desc="hpijs - HP InkJet Server" \
     name="hpijs - HP InkJet Server"
 license hplip.license license=GPLv2
 link path=usr/lib/libhpip.so target=libhpip.so.0.0.1
--- a/components/httping/httping.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/httping/httping.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -50,4 +50,4 @@
 
 legacy pkg=SUNWhttping \
 	name="httping - ping for http-requests" \
-	desc="httping - ping for http-requests (1.3.0)"
+	desc="httping - ping for http-requests"
--- a/components/iftop/iftop.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/iftop/iftop.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -43,5 +43,5 @@
 file path=usr/share/man/man8/iftop.8
 
 legacy pkg=SUNWiftop \
-    desc="iftop - Display bandwidth usage on an interface (0.17)" \
+    desc="iftop - Display bandwidth usage on an interface" \
     name="iftop - Display bandwidth usage on an interface"
--- a/components/imagemagick/imagemagick.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/imagemagick/imagemagick.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -802,7 +802,7 @@
 # Legacy
 #
 legacy pkg=SUNWimagick \
-    desc="ImageMagick - Image Manipulation Utilities and Libraries 6.3.4" \
+    desc="ImageMagick - Image Manipulation Utilities and Libraries" \
     name="ImageMagick - Image Manipulation Utilities and Libraries"
 license imagemagick.license license="Apache 2.0 license"
 link path=usr/lib/$(MACH64)/libMagick++.so target=libMagick++.so.10.0.8
--- a/components/iperf/iperf.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/iperf/iperf.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -43,5 +43,5 @@
 file path=usr/share/man/man1/iperf.1
 
 legacy pkg=SUNWiperf \
-    desc="iperf - tool for measuring maximum TCP and UDP bandwidth performance (2.0.4)" \
+    desc="iperf - tool for measuring maximum TCP and UDP bandwidth performance" \
     name="iperf - tool for measuring maximum TCP and UDP bandwidth performance"
--- a/components/ipmitool/ipmitool.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ipmitool/ipmitool.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -57,10 +57,9 @@
 file svc-ipmievd path=lib/svc/method/svc-ipmievd
 
 legacy pkg=SUNWipmi  \
-    desc="IPMI management tool 1.8.10" \
+    desc="IPMI management tool" \
     name="ipmitool, (usr)"
 
 legacy pkg=SUNWipmir \
-    desc="IPMI management tool 1.8.10 (root)" \
+    desc="IPMI management tool (root)" \
     name="ipmitool, (root)"
-
--- a/components/ircii/ircii.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ircii/ircii.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -647,7 +647,8 @@
 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 (ver 2006.07.25)" \
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/junit/junit.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -210,7 +210,8 @@
 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 4.5" \
+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
--- a/components/lcms/lcms.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/lcms/lcms.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -78,7 +78,8 @@
 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 (1.19)" \
+legacy pkg=SUNWlcms \
+    desc="LCMS - Little Color Management System" \
     name="Little Color Management System"
 #
 license lcms.license license=MIT
--- a/components/less/less.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/less/less.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -47,6 +47,7 @@
 file path=usr/share/man/man1/less.1
 file path=usr/share/man/man1/lessecho.1
 file path=usr/share/man/man1/lesskey.1
-legacy pkg=SUNWless desc="The GNU pager (less) 436" \
+legacy pkg=SUNWless \
+    desc="The GNU pager (less)" \
     name="The GNU pager (less)"
 license less.license license="Less License"
--- a/components/lftp/lftp.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/lftp/lftp.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -95,10 +95,9 @@
 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 4.0.10 (Root files package)" \
+    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 4.0.10 (User files package)" \
+    desc="lftp - Sophisticated file transfer program version (User files package)" \
     name="lftp - Sophisticated file transfer program (User files package)"
-
--- a/components/libconfuse/libconfuse.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libconfuse/libconfuse.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -149,5 +149,5 @@
 link path=usr/lib/libconfuse.so.0 target=./libconfuse.so.0.0.0
 
 legacy pkg=SUNWlibconfuse \
-    desc="libconfuse - configuration file parser library (2.6)" \
+    desc="libconfuse - configuration file parser library" \
     name="libconfuse"
--- a/components/libevent/libevent.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libevent/libevent.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -58,7 +58,7 @@
 link path=usr/lib/libevent.so.1 target=libevent.so.1.0.3
 
 legacy pkg=SUNWlibevent \
-    desc="Libevent - an event notification library (1.3e)" \
+    desc="Libevent - an event notification library" \
     name="Libevent - an event notification library"
 
 license libevent.license license=BSD
--- a/components/libexpat/expat.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libexpat/expat.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -52,4 +52,4 @@
 
 legacy pkg=SUNWlexpt \
     name="libexpat - XML parser library" \
-    desc="libexpat - XML parser library 2.0.1"
+    desc="libexpat - XML parser library"
--- a/components/libidn/libidn.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libidn/libidn.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -231,6 +231,5 @@
 license libidn.license license="LGPLv2.1, GPLv3, FDLv1.3"
 #
 legacy pkg=SUNWgnu-idn \
-    desc="IDN - The Internationalized Domains Library (1.19)" \
+    desc="IDN - The Internationalized Domains Library" \
     name="The Internationalized Domains Library"
-
--- a/components/libmcrypt/libmcrypt.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libmcrypt/libmcrypt.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -57,5 +57,5 @@
 link path=usr/lib/libmcrypt.so.4 target=libmcrypt.so.4.4.8
 
 legacy pkg=SUNWlibmcrypt \
-	desc="Libmcrypt - Encryption Algorithms Library (2.5.8)" \
+	desc="Libmcrypt - Encryption Algorithms Library" \
 	name="Libmcrypt Encryption Algorithms Library"
--- a/components/libmemcached/libmemcached.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libmemcached/libmemcached.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -126,5 +126,5 @@
 license libmemcached.license license="BSD"
 
 legacy pkg=SUNWlibmemcached \
-    desc="memcached C API 0.16" \
+    desc="memcached C API" \
     name="libmemcached"
--- a/components/libmng/libmng.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libmng/libmng.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -76,6 +76,5 @@
 license libmng.license license="MNG License (BSD-like)"
 #
 legacy pkg=SUNWlibmng \
-    desc="LibMNG - Multiple Image Network Graphics Library (1.0.10)" \
+    desc="LibMNG - Multiple Image Network Graphics Library" \
     name="Multiple Image Network Graphics Library"
-
--- a/components/libneon/libneon.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libneon/libneon.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -247,7 +247,8 @@
 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 (0.29.5)" \
+legacy pkg=SUNWneon \
+    desc="The Neon WebDAV library" \
     name="The Neon WebDAV library"
 #
 license libneon.license license="LGPLv2, GPLv2"
--- a/components/libnet/libnet.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libnet/libnet.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -61,6 +61,5 @@
 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 (1.1.2.1)" \
-    name=libnet
-
+    desc="libnet - a library for portable network packet construction" \
+    name="libnet"
--- a/components/librsync/librsync.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/librsync/librsync.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -92,5 +92,5 @@
 license librsync.copyright license="LGPLv2.1"
 
 legacy pkg=SUNWlibrsync \
-    desc="librsync - software library that implements the rsync remote-delta algorithm (0.9.7)" \
+    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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libsigsegv/libsigsegv.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -57,7 +57,7 @@
 file path=usr/share/man/man3/stackoverflow_deinstall_handler.3
 file path=usr/share/man/man3/stackoverflow_install_handler.3
 legacy pkg=SUNWlibsigsegv \
-    desc="libsigsegv - handling page faults in user mode(2.6)" \
+    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
--- a/components/libsndfile/libsndfile.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libsndfile/libsndfile.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -107,4 +107,4 @@
 
 legacy pkg=SUNWlibsndfile \
 	name="libsndfile" \
-	desc="libsndfile - a library for reading/writing sound files (1.0.23)"
+	desc="libsndfile - a library for reading/writing sound files"
--- a/components/libtorrent/libtorrent.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libtorrent/libtorrent.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -98,6 +98,5 @@
 link path=usr/lib/libtorrent.so.9 target=libtorrent.so.9.2.0
 
 legacy pkg=SUNWlibtorrent \
-    desc="libtorrent - a Bittorrent library for rtorrent (0.12.2)" \
-    name=libtorrent
-
+    desc="libtorrent - a Bittorrent library for rtorrent" \
+    name="libtorrent"
--- a/components/libusb/ugen/libusbugen.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libusb/ugen/libusbugen.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -47,4 +47,4 @@
 
 legacy pkg=SUNWlibusbugen \
 	name="SUN libusb ugen plugin" \
-	desc="libusb - User level usb ugen library (0.1.8)"
+	desc="libusb - User level usb ugen library"
--- a/components/libusb/wrapper/libusb.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/libusb/wrapper/libusb.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -55,6 +55,6 @@
 
 legacy pkg=SUNWlibusb \
 	name="Sun wrapper library for libusb" \
-	desc="Sun wrapper library for libusb (0.1.8)"
+	desc="Sun wrapper library for libusb"
 
 depend fmri=system/library/usb/libusbugen type=require
--- a/components/lighttpd/lighttpd.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/lighttpd/lighttpd.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -124,9 +124,10 @@
 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 (1.4.23) (Usr)" \
+legacy pkg=SUNWlighttpd14u \
+    desc="The Lighttpd Web Server (Usr)" \
     name="Lighttpd Web Server (Usr)"
 
-legacy pkg=SUNWlighttpd14r desc="The Lighttpd Web Server (1.4.23) (Root)" \
+legacy pkg=SUNWlighttpd14r \
+    desc="The Lighttpd Web Server (Root)" \
     name="Lighttpd Web Server (Root)"
-
--- a/components/links/links.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/links/links.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -43,5 +43,5 @@
 file path=usr/share/man/man1/links.1
 
 legacy pkg=SUNWlinks \
-	name="links - WWW text browser" vendor="Oracle Corporation" \
+	name="links - a text based web browser" \
 	desc="links - a text based web browser"
--- a/components/logilab-astng/logilab-astng.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/logilab-astng/logilab-astng.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -147,7 +147,7 @@
     path=usr/lib/python2.6/vendor-packages/logilab_astng-0.19.0-py2.6.egg-info/top_level.txt
 file logilab-astng.3 path=usr/share/man/man3/logilab-astng.3
 legacy pkg=SUNWlogilab-astng \
-    desc="logilab-astng - Python Abstract Syntax Tree New Generation (0.19.0)" \
+    desc="logilab-astng - Python Abstract Syntax Tree New Generation" \
     name="logilab-astng - Python Abstract Syntax Tree New Generation"
 license logilab-astng.license license=GPLv2
 
--- a/components/logilab-common/logilab-common.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/logilab-common/logilab-common.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -297,7 +297,7 @@
     path=usr/lib/python2.6/vendor-packages/logilab_common-0.40.0-py2.6.egg-info/top_level.txt
 file logilab-common.3 path=usr/share/man/man3/logilab-common.3
 legacy pkg=SUNWlogilab-common \
-    desc="common python libraries for logilab applications (0.39.0)" \
+    desc="common python libraries for logilab applications" \
     name="common python libraries for logilab applications"
 license logilab-common.license license=GPLv2
 
--- a/components/lua/lua.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/lua/lua.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -89,9 +89,9 @@
 file path=usr/share/doc/lua/readme.html
 file path=usr/share/man/man1/lua.1
 file path=usr/share/man/man1/luac.1
-legacy pkg=SUNWlua desc="lua - Lua Programming language 5.1.4" \
+legacy pkg=SUNWlua \
+    desc="lua - Lua Programming language" \
     name="lua - Lua Programming language"
 
-
 license lua.license license=MIT
 
--- a/components/m4/m4.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/m4/m4.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -54,10 +54,10 @@
 file path=usr/share/info/m4.info
 file path=usr/share/info/m4.info-1
 file path=usr/share/info/m4.info-2
-legacy pkg=SUNWgm4 desc="GNU m4 - A macro processor (gm4) 1.4.12" \
+legacy pkg=SUNWgm4 \
+    desc="GNU m4 - A macro processor (gm4)" \
     name="GNU m4"
 
-
 license m4.license license=GPLv3
 link path=usr/bin/gm4 \
     target=../gnu/bin/m4 facet.compat.gnulinks=true
--- a/components/make/make.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/make/make.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -128,7 +128,7 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/make.mo
 file usr/share/man/man1/gmake.1 path=usr/gnu/share/man/man1/make.1
 legacy pkg=SUNWgmake \
-    desc="GNU make - A utility used to build software (gmake) 3.81" \
+    desc="GNU make - A utility used to build software (gmake)" \
     name="gmake - GNU make"
 license make.license license=GPLv2
 link path=usr/bin/gmake target=../gnu/bin/make facet.compat.gnulinks=true
--- a/components/mc/mc.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/mc/mc.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -340,7 +340,8 @@
 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 4.7.3" \
+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
--- a/components/meld/meld.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/meld/meld.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -269,6 +269,7 @@
 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 (1.4.0)" \
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/memcached-java/memcached-java.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -98,5 +98,5 @@
 file path=usr/share/lib/java/javadoc/memcached-java/api/stylesheet.css
 
 legacy pkg=SUNWmemcached-java \
-	name="memcached client for the java platform" \
-	desc="memcached client for java (2.0.1)"
+	name="memcached client for java" \
+	desc="memcached client for java"
--- a/components/memcached/memcached.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/memcached/memcached.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -63,9 +63,9 @@
 file Solaris/memcached.1m path=usr/share/man/man1m/memcached.1m
 
 legacy pkg=SUNWmemcached \
-    desc="The memcached memory object cache (1.4.5)" \
+    desc="The memcached memory object cache" \
     name="memcached (usr)"
 
 legacy pkg=SUNWmemcachedr \
-    desc="The memcached memory object cache (1.4.1) (root components)" \
+    desc="The memcached memory object cache (root components)" \
     name="memcached (root)"
--- a/components/mpfr/mpfr.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/mpfr/mpfr.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -73,6 +73,5 @@
 license mpfr.license license="LGPLv2.1, GPLv2"
 #
 legacy pkg=SUNWgnu-mpfr \
-    desc="GNU MPFR 2.4.2" \
+    desc="GNU MPFR" \
     name="The GNU Multiple Precision Rounding Floating-Point Library"
-
--- a/components/mutt/Makefile	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/mutt/Makefile	Thu Nov 17 14:40:44 2011 -0800
@@ -27,23 +27,16 @@
 
 COMPONENT_NAME=		mutt
 COMPONENT_VERSION=	1.5.21
-IPS_PKG_NAME=		mail/mutt
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:a8475f2618ce5d5d33bff85c0affdf21ab1d76b9
 COMPONENT_ARCHIVE_URL=	ftp://ftp.mutt.org/mutt/devel/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.mutt.org/
-COPYRIGHT_FILE=		mutt.license
-COPYRIGHTS=		GPLv2
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-PKG_MACROS +=	IPS_PKG_NAME=$(IPS_PKG_NAME)
-PKG_MACROS +=	COPYRIGHT_FILE=$(COPYRIGHT_FILE)
-PKG_MACROS +=	COPYRIGHTS=$(COPYRIGHTS)
-
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		--sysconfdir="$(ETCDIR)/$(COMPONENT_NAME)"
 CONFIGURE_OPTIONS  +=		--enable-pop
--- a/components/mutt/mutt.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/mutt/mutt.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -35,7 +35,7 @@
 <transform file path=etc/mutt/mime.types$ -> default mode 0644>
 <transform file path=etc/mutt/mime.types$ -> default preserve renamenew>
 
-set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/mail/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Mutt E-Mail Client"
 set name=pkg.description value="Mutt is a small but very powerful text-based mail client for Unix operating systems."
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
@@ -45,11 +45,13 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/135/
 
-license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+license mutt.license license=GPLv2
 
-legacy pkg=SUNWmutt desc="Mutt E-Mail Client ($(IPS_COMPONENT_VERSION))" \
+legacy pkg=SUNWmutt \
+    desc="Mutt E-Mail Client" \
     name="Mutt E-Mail Client"
-legacy pkg=SUNWmuttr desc="Mutt E-Mail Client ($(IPS_COMPONENT_VERSION)) (root)" \
+legacy pkg=SUNWmuttr \
+    desc="Mutt E-Mail Client (root)" \
     name="Mutt E-Mail Client (root)"
 
 dir path=etc
--- a/components/ncftp/ncftp.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ncftp/ncftp.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -63,5 +63,4 @@
 
 legacy	pkg=SUNWncft \
 	name="NcFTP - client application implementing FTP" \
-	desc="NcFTP ncftp - File Transfer Protocol(FTP) 3.2.3"
-
+	desc="NcFTP ncftp - File Transfer Protocol (FTP)"
--- a/components/net-snmp/net-snmp-addons.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/net-snmp/net-snmp-addons.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -41,4 +41,4 @@
 
 legacy pkg=SUNWnet-snmp-addons \
 	name="Net-SNMP addon libraries" \
-	desc="Net-SNMP addon libraries (5.4.1)"
+	desc="Net-SNMP addon libraries"
--- a/components/net-snmp/net-snmp-base.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/net-snmp/net-snmp-base.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -581,10 +581,10 @@
 
 legacy pkg=SUNWnet-snmp-utils \
 	name="Net-SNMP Agent applications and utilities" \
-	desc="Net-SNMP Agent applications and utilities (5.4.1)"
+	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 (5.4.1)"
+	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 (5.4.1)"
+	desc="Net-SNMP Agent files and libraries"
--- a/components/net-snmp/net-snmp-documentation.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/net-snmp/net-snmp-documentation.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -638,4 +638,4 @@
 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 (5.4.1)"
+	desc="Net-SNMP Agent manpages and html documentation files"
--- a/components/nmap/nmap.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/nmap/nmap.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -436,7 +436,7 @@
 file path=usr/share/zenmap/pixmaps/zenmap.png
 file path=usr/share/zenmap/su-to-zenmap.sh
 legacy pkg=SUNWnmap \
-    desc="nmap - Network exploration tool and security / port scanner (5.21)" \
+    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
--- a/components/ntp/ntp.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ntp/ntp.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -299,10 +299,10 @@
 file manpages/ntp.conf.4 path=usr/share/man/man4/ntp.conf.4
 file manpages/ntprc.4 path=usr/share/man/man4/ntprc.4
 legacy pkg=SUNWntpr \
-    desc="Network Time Protocol v4, NTP Daemon and Utilities (4.2.5) (root)" \
+    desc="Network Time Protocol v4, NTP Daemon and Utilities (root)" \
     name="Network Time Protocol Daemon v4 (root)"
 legacy pkg=SUNWntpu \
-    desc="Network Time Protocol v4, NTP Daemon and Utilities (4.2.5) (usr)" \
+    desc="Network Time Protocol v4, NTP Daemon and Utilities (usr)" \
     name="Network Time Protocol Daemon v4 (usr)"
 license ntp.license license="ntp license"
 link path=usr/sbin/xntpdc target=ntpdc
--- a/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -141,5 +141,9 @@
 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 desc="FIPS 140-2 Capable OpenSSL libraries (0.9.8) (Root)" name="FIPS 140-2 Capable OpenSSL libraries" pkg=SUNWopenssl-fips-140
-legacy desc="FIPS Capable OpenSSL C/C++ header files for development of OpenSSL applications (0.9.8)" name="FIPS 140-2 Capable OpenSSL Header Files" pkg=SUNWopenssl-fips-140-include
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -1402,8 +1402,18 @@
 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 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" pkg=SUNWopenssl-commands
-legacy desc="OpenSSL C/C++ header files for development of OpenSSL applications (1.0.0)" name="OpenSSL Header Files" pkg=SUNWopenssl-include
-legacy desc="OpenSSL Libraries (1.0.0) (Usr)" name="OpenSSL Libraries (Usr)" pkg=SUNWopenssl-libraries
-legacy desc="OpenSSL Manual Pages (1.0.0)" name="OpenSSL Manual Pages" pkg=SUNWopenssl-man
-legacy desc="OpenSSL Libraries (1.0.0) (Root)" name="OpenSSL Libraries (Root)" pkg=SUNWopensslr
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/openusb/openusb.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -64,5 +64,5 @@
 license openusb.copyright license="LGPLv2.1, BSD"
 
 legacy pkg=SUNWlibopenusb \
-    desc="Libopenusb - a USB device management library (1.0.0)" \
+    desc="Libopenusb - a USB device management library" \
     name="Libopenusb - a USB device management library"
--- a/components/pam_pkcs11/pam_pkcs11.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/pam_pkcs11/pam_pkcs11.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -79,11 +79,14 @@
 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 0.6.0" \
+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 0.6.0" \
+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 0.6.0" \
+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/pcre/pcre.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/pcre/pcre.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -168,4 +168,4 @@
 
 legacy pkg=SUNWpcre \
     desc="Perl-Compatible Regular Expressions" \
-    name="PCRE - Perl-Compatible Regular Expressions (7.8)"
+    name="PCRE - Perl-Compatible Regular Expressions"
--- a/components/perl_modules/DBI/DBI.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/perl_modules/DBI/DBI.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -36,5 +36,6 @@
 # perl 5.12
 depend fmri=library/perl-5/database-512 predicate=runtime/perl-512 \
     type=conditional
-legacy pkg=SUNWpmdbi desc="Database independent interface module v1.58" \
+legacy pkg=SUNWpmdbi \
+    desc="Database independent interface module" \
     name="Perl Database Independent Interface"
--- a/components/perl_modules/net-ssleay/net-ssleay.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/perl_modules/net-ssleay/net-ssleay.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -43,5 +43,5 @@
     type=conditional
 
 legacy pkg=SUNWperl-net-ssleay \
-    desc="Net::SSLeay- Perl extension for using OpenSSL (1.36)" \
+    desc="Net::SSLeay- Perl extension for using OpenSSL" \
     name="Net::SSLeay- Perl extension for using OpenSSL"
--- a/components/perl_modules/pmtools/pmtools.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/perl_modules/pmtools/pmtools.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -33,7 +33,8 @@
 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 (1.10)" \
+legacy pkg=SUNWperl-pmtools \
+    desc="pmtools - Perl module tools" \
     name="Perl module tools"
 license pmtools.license license="GPLv2, Artistic"
 # perl 5.12
--- a/components/perl_modules/xml-parser/xml-parser.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/perl_modules/xml-parser/xml-parser.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -38,5 +38,5 @@
 depend fmri=library/perl-5/xml-parser-512 predicate=runtime/perl-512 \
     type=conditional
 legacy pkg=SUNWperl-xml-parser \
-	desc="Perl XML::Parser and XML::Simple PERL modules - development files v5.8.4" \
+	desc="Perl XML::Parser and XML::Simple PERL modules - development files" \
 	name="Perl XML::Parser and XML::Simple PERL modules"
--- a/components/php-5_2/apache-php5.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/apache-php5.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -47,11 +47,11 @@
 link path=usr/apache2/2.2/libexec/mod_php5.so target=mod_php5.2.so
 
 legacy pkg=SUNWapch22r-php52 \
-    desc="PHP 5.2 module for Apache Web Server V2.2 (Root)" \
-    name="PHP 5.2 module for Apache Web Server V2.2 (Root)"
+    desc="PHP module for Apache Web Server (Root)" \
+    name="PHP module for Apache Web Server (Root)"
 legacy pkg=SUNWapch22m-php52 \
-    desc="PHP Server 5.2 module for Apache Web Server V2.2" \
-    name="PHP Server 5.2 module for Apache Web Server V2.2"
+    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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/php-52.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -447,7 +447,9 @@
 link path=usr/php/man target=./5.2/man
 link path=usr/php/modules target=./5.2/modules
 
-legacy pkg=SUNWphp52r desc="PHP Server 5.2 (Root components)" \
-    name="PHP Server 5.2 (Root)"
-legacy pkg=SUNWphp52u desc="PHP Server Version 5.2" \
-    name="PHP Server Version 5.2"
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/php-apc.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -64,10 +64,10 @@
 file path=usr/php/5.2/zts-modules/apc.so
 
 legacy pkg=SUNWphp52r-apc \
-    desc="PHP-APC(3.0.19) extension provides PHP script caching for PHP(5.2) (Root)" \
+    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(3.0.19) extension provides PHP script caching for PHP(5.2)" \
+    desc="PHP-APC extension provides PHP script caching for PHP" \
     name="APC extension module for PHP"
 
 # need generic dependency on PHP itself
--- a/components/php-5_2/php-idn.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/php-idn.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -52,10 +52,10 @@
 file path=usr/php/5.2/zts-modules/idn.so
 
 legacy pkg=SUNWphp52r-idn \
-    desc="PHP-IDN(0.2.0) extension module for PHP(5.2) (Root)" \
+    desc="PHP-IDN extension module for PHP (Root)" \
     name="IDN extension module for PHP (Root)"
 legacy pkg=SUNWphp52u-idn \
-    desc="PHP-IDN(0.2.0) extension module for PHP(5.2)" \
+    desc="PHP-IDN extension module for PHP" \
     name="IDN extension module for PHP"
 
 # need generic dependency on PHP itself
--- a/components/php-5_2/php-memcache.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/php-memcache.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -63,10 +63,10 @@
 file path=usr/php/5.2/zts-modules/memcache.so
 
 legacy pkg=SUNWphp52r-memcache \
-    desc="PHP-Memcache(2.2.5) extension to store PHP(5.2) sessions in Memcached server (Root)" \
+    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(2.2.5) extension to store PHP(5.2) sessions in Memcached server" \
+    desc="PHP-Memcache extension to store PHP sessions in Memcached server" \
     name="Memcache extension module for PHP"
 
 # need generic dependency on PHP itself
--- a/components/php-5_2/php-suhosin.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/php-suhosin.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -53,10 +53,10 @@
 file path=usr/php/5.2/zts-modules/suhosin.so
 
 legacy pkg=SUNWphp52r-suhosin \
-    desc="PHP-Suhosin(0.9.29) extension to secure PHP(5.2) (Root)" \
+    desc="PHP-Suhosin extension to secure PHP (Root)" \
     name="Suhosin extension module for PHP (Root)"
 legacy pkg=SUNWphp52u-suhosin \
-    desc="PHP-Suhosin(0.9.29) extension to secure PHP(5.2)" \
+    desc="PHP-Suhosin extension to secure PHP" \
     name="Suhosin extension module for PHP"
 
 # need generic dependency on PHP itself
--- a/components/php-5_2/php-tcpwrap.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/php-tcpwrap.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -53,10 +53,10 @@
 file path=usr/php/5.2/zts-modules/tcpwrap.so
 
 legacy pkg=SUNWphp52r-tcpwrap \
-    desc="PHP-Tcpwrap(1.1.3) extension module for PHP(5.2) (Root)" \
+    desc="PHP-Tcpwrap extension module for PHP (Root)" \
     name="Tcpwrap extension module for PHP (Root)"
 legacy pkg=SUNWphp52u-tcpwrap \
-    desc="PHP-Tcpwrap(1.1.3) extension module for PHP(5.2)" \
+    desc="PHP-Tcpwrap extension module for PHP" \
     name="Tcpwrap extension module for PHP"
 
 # need generic dependency on PHP itself
--- a/components/php-5_2/php-xdebug.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/php-5_2/php-xdebug.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -55,10 +55,10 @@
 file path=usr/php/5.2/zts-modules/xdebug.so
 
 legacy pkg=SUNWphp52r-xdebug \
-    desc="PHP-XDebug(2.0.5) extension for debugging PHP(5.2) (Root)" \
+    desc="PHP-XDebug extension for debugging PHP (Root)" \
     name="XDebug extension module for PHP (Root)"
 legacy pkg=SUNWphp52u-xdebug \
-    desc="PHP-XDebug(2.0.5) extension for debugging PHP(5.2)" \
+    desc="PHP-XDebug extension for debugging PHP" \
     name="XDebug extension module for PHP"
 
 # need generic dependency on PHP itself
--- a/components/psutils/psutils.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/psutils/psutils.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -86,7 +86,8 @@
 file path=usr/share/man/man1/pstops.1
 file path=usr/share/psutils/md68_0.ps
 file path=usr/share/psutils/md71_0.ps
-legacy pkg=SUNWpsutils desc="psutils - PostScript utilities 1.17" \
+legacy pkg=SUNWpsutils \
+    desc="psutils - PostScript utilities" \
     name="psutils - PostScript utilities"
 license psutils.license license="psutils license"
 link path=usr/sfw/bin/epsffit target=../../bin/epsffit
--- a/components/pv/pv.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/pv/pv.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -56,5 +56,5 @@
 file doc/quickref.1 path=usr/share/man/man1/pv.1
 
 legacy pkg=SUNWpipe-viewer \
-    desc="pipeline monitoring tool (1.1.4)" \
+    desc="pipeline monitoring tool" \
     name="Pipe Viewer"
--- a/components/pwgen/pwgen.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/pwgen/pwgen.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -42,6 +42,7 @@
 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 (2.06)" \
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/pylint/pylint.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -103,7 +103,7 @@
 license pylint.license license="GPLv2"
 
 legacy pkg=SUNWpylint \
-    desc="Python source code analyzer (0.18.0)" \
+    desc="Python source code analyzer" \
     name="pylint python code static checker"
 
 # pkgdepend should have picked up the dependency on 
--- a/components/quagga/quagga.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/quagga/quagga.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -144,9 +144,11 @@
 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) 0.99.8" \
+legacy pkg=SUNWquaggar \
+    desc="Quagga Routing Software (root)" \
     name="Quagga - Quagga Routing Software (root)"
-legacy pkg=SUNWquaggau desc="Quagga Routing Software (usr) 0.99.8" \
+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
--- a/components/quilt/quilt.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/quilt/quilt.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -124,11 +124,11 @@
 link path=usr/share/quilt/compat/tr target=../../../gnu/bin/tr
 
 legacy pkg=SUNWquiltr \
-    desc="Quilt - tool to manage series of patches (0.47) (root)" \
+    desc="Quilt - tool to manage series of patches (root)" \
     name=Quilt
 
 legacy pkg=SUNWquiltu \
-    desc="Quilt - tool to manage series of patches (0.47)" \
+    desc="Quilt - tool to manage series of patches" \
     name=Quilt
 
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/gawk type=require
--- a/components/rdiff-backup/rdiff-backup.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/rdiff-backup/rdiff-backup.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -91,5 +91,5 @@
 license rdiff-backup.copyright license="GPLv2"
 
 legacy pkg=SUNWrdiff-backup \
-    desc="rdiff-backup is a local/remote mirror and incremental backup utility (1.2.1)" \
+    desc="rdiff-backup is a local/remote mirror and incremental backup utility" \
     name="rdiff-backup is a backup utility"
--- a/components/readline/readline.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/readline/readline.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -66,7 +66,8 @@
 file path=usr/share/info/rluserman.info
 file path=usr/share/man/man3/history.3
 file path=usr/share/man/man3/readline.3
-legacy pkg=SUNWgnu-readline desc="GNU readline library (5.2)" \
+legacy pkg=SUNWgnu-readline \
+    desc="GNU readline library" \
     name="GNU readline"
 license readline.license license=GPLv2
 link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
--- a/components/rtorrent/rtorrent.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/rtorrent/rtorrent.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -43,6 +43,5 @@
 file path=usr/share/man/man1/rtorrent.1
 
 legacy pkg=SUNWrtorrent \
-    desc="rtorrent - a BitTorrent client for ncurses (0.8.2)" \
+    desc="rtorrent - a BitTorrent client for ncurses" \
     name=rtorrent
-
--- a/components/ruby/ruby-18.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/ruby/ruby-18.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -19654,9 +19654,8 @@
 
 legacy  pkg=SUNWruby18r \
 	name="Ruby & RubyGems (Root)" \
-	desc="Ruby 1.8.7 patch 174 with integrated RubyGems v1.3.5 (Root)"
+	desc="Ruby with integrated RubyGems (Root)"
 
 legacy  pkg=SUNWruby18u \
 	name="Ruby & RubyGems (Usr)" \
-	desc="Ruby 1.8.7 patch 174 with integrated RubyGems v1.3.5 (Usr)"
-
+	desc="Ruby with integrated RubyGems (Usr)"
--- a/components/sane-backends/sane-backends.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/sane-backends/sane-backends.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -342,10 +342,12 @@
 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 (1.0.19) (Root)" \
-    name="SANE library and backends (root)" vendor="Oracle Corporation"
-legacy pkg=SUNWsane-backendu desc="SANE library and backends (1.0.19) (Usr)" \
-    name="SANE library and backends (usr)" vendor="Oracle Corporation"
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/sane-frontends/sane-frontends.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -39,6 +39,7 @@
 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 (1.0.14)" \
-    name="SANE frontends" vendor="Oracle Corporation"
+legacy pkg=SUNWsane-frontend \
+    desc="SANE frontend" \
+    name="SANE frontends"
 license sane-frontend.license license=GPLv2
--- a/components/sblim/sblim.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/sblim/sblim.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -541,5 +541,5 @@
 file files/SblimCimClient.3 path=usr/share/man/man3/SblimCimClient.3
 
 legacy pkg=SUNWSblimCimClient \
-    desc="sblim cim client for java (1.3.7)" \
-    name="sblim cim client for the java platform"
+    desc="sblim cim client for java" \
+    name="sblim cim client for java"
--- a/components/sed/sed.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/sed/sed.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -160,7 +160,8 @@
 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 4.2.1" \
+legacy pkg=SUNWgsed \
+    desc="gsed - GNU sed" \
     name="gsed - GNU implementation of sed, the Unix stream editor"
 license sed.license license=GPLv3
 link path=usr/bin/gsed \
--- a/components/slang/Makefile	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/slang/Makefile	Thu Nov 17 14:40:44 2011 -0800
@@ -27,23 +27,16 @@
 
 COMPONENT_NAME=		slang
 COMPONENT_VERSION=	2.2.4
-IPS_PKG_NAME=		library/slang
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:34e68a993888d0ae2ebc7bc31b40bc894813a7e2
 COMPONENT_ARCHIVE_URL=	ftp://space.mit.edu/pub/davis/slang/v2.2/$(COMPONENT_ARCHIVE)
 COMPONENT_PROJECT_URL=	http://www.jedsoft.org/slang/
-COPYRIGHT_FILE=		slang.license
-COPYRIGHTS=		GPLv2
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-PKG_MACROS +=	IPS_PKG_NAME=$(IPS_PKG_NAME)
-PKG_MACROS +=	COPYRIGHT_FILE=$(COPYRIGHT_FILE)
-PKG_MACROS +=	COPYRIGHTS=$(COPYRIGHTS)
-
 COMPONENT_PRE_CONFIGURE_ACTION = $(CLONEY) $(SOURCE_DIR) $(@D)
 CONFIGURE_SCRIPT = $(@D)/configure
 
--- a/components/slang/slang.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/slang/slang.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -27,7 +27,7 @@
 <transform file path=etc/slsh/slsh.rc$ -> default preserve renamenew>
 <transform file path=usr/share/slsh/scripts/.+ -> default mode 0555>
 
-set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Library designed to allow a developer to create robust multi-platform software"
 set name=pkg.description value="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software."
 set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
@@ -37,13 +37,13 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/135/
 
-license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+license slang.license license=GPLv2
 
 legacy pkg=SUNWslang \
-    desc="S-Lang Library ($(IPS_COMPONENT_VERSION))" \
+    desc="S-Lang Library" \
     name="S-Lang Library"
 legacy pkg=SUNWslangr \
-    desc="S-Lang Library ($(IPS_COMPONENT_VERSION)) (root)" \
+    desc="S-Lang Library (root)" \
     name="S-Lang Library (root)"
 
 dir path=etc
--- a/components/slib/slib.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/slib/slib.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -224,6 +224,6 @@
 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 (3b1)" \
+    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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/slrn/slrn.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -138,6 +138,6 @@
 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 (0.9.9p1)" \
+legacy pkg=SUNWslrn \
+    desc="slrn - S-Lang read news" \
     name="slrn - S-Lang read news"
-
--- a/components/snort/snort.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/snort/snort.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -170,9 +170,9 @@
     target=lib_sfdynamic_example_rule.so.0.0.0
 
 legacy pkg=SUNWsnortr \
-	desc="snort - Network Intrusion and Protection Detector (Root) (2.8.4.1)" \
+	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) (2.8.4.1)" \
+	desc="snort - Network Intrusion and Protection Detector (Usr)" \
 	name="snort - Network Intrusion Detector (usr)"
--- a/components/sox/sox.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/sox/sox.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -62,7 +62,7 @@
 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 (14.3.0)" \
+    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
--- a/components/spawn-fcgi/spawn-fcgi.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/spawn-fcgi/spawn-fcgi.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -42,6 +42,6 @@
 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 (1.6.3)" \
+    desc="Spawn-Fcgi utility for starting FCGI backends" \
     name="Spawn-Fcgi utility"
 license spawn-fcgi.license license=BSD
--- a/components/squid/squid.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/squid/squid.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -1621,10 +1621,10 @@
 file path=usr/squid/share/icons/anthony-xpm.gif
 file path=usr/squid/share/mib.txt
 legacy pkg=SUNWsquidr \
-    desc="Squid Web Proxy Cache (3.1.8)" \
+    desc="Squid Web Proxy Cache" \
     name="Squid Web Proxy Cache (root)"
 legacy pkg=SUNWsquidu \
-    desc="Squid Web Proxy Cache (3.1.8)" \
+    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
--- a/components/stdcxx/stdcxx.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/stdcxx/stdcxx.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -2161,6 +2161,5 @@
 license stdcxx.license license="Apache v2.0"
 #
 legacy pkg=SUNWlibstdcxx4 \
-    desc="The Apache Standard C++ Library (4.2.1)" \
+    desc="The Apache Standard C++ Library" \
     name="Apache Standard C++ Library"
-
--- a/components/subversion/subversion.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/subversion/subversion.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -189,6 +189,5 @@
 license subversion.license license="Subversion License"
 #
 legacy pkg=SUNWsvn \
-    desc="The Subversion Source Control Management System (1.6.16)" \
+    desc="The Subversion Source Control Management System" \
     name="Subversion"
-
--- a/components/tcl/tcl/tcl.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/tcl/tcl/tcl.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -504,7 +504,7 @@
 file path=usr/share/man/man1t/vwait.1t
 file path=usr/share/man/man1t/while.1t
 legacy pkg=SUNWTcl \
-    desc="Tcl - Tool Command Language (8.5.9)" \
+    desc="Tcl - Tool Command Language" \
     name="Tcl - Tool Command Language"
 license tcl.license license=BSD-like
 link path=usr/bin/tclsh target=tclsh8.5
--- a/components/tcl/tk/tk.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/tcl/tk/tk.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -402,7 +402,8 @@
 file path=usr/share/man/man3tk/Tk_WindowId.3tk
 file path=usr/share/man/man3tk/Ttk_CreateTheme.3tk
 file path=usr/share/man/man3tk/Ttk_MakeBox.3tk
-legacy pkg=SUNWTk desc="Tk - TCL GUI Toolkit (8.5.9)" \
+legacy pkg=SUNWTk \
+    desc="Tk - TCL GUI Toolkit" \
     name="Tk - TCL GUI Toolkit"
 license tk.license license=BSD-like
 link path=usr/bin/wish target=wish8.5
--- a/components/tcltls/tcltls.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/tcltls/tcltls.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -55,6 +55,7 @@
 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 (1.6)" \
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/tcpdump/tcpdump.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -42,6 +42,6 @@
 file path=usr/sbin/tcpdump
 file path=usr/share/man/man1/tcpdump.1
 legacy pkg=SUNWtcpdump \
-    desc="tcpdump - A tool for network monitoring and data acquisition 4.1.1" \
+    desc="tcpdump - A tool for network monitoring and data acquisition" \
     name="tcpdump - network traffic sniffer"
 license tcpdump.license license=BSD
--- a/components/tcsh/tcsh.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/tcsh/tcsh.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -74,7 +74,8 @@
 file $(MACH32)/nls/russian.cat path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
 file $(MACH32)/nls/ukrainian.cat path=usr/share/locale/uk/LC_MESSAGES/tcsh.cat
 file manpages/tcsh.1 path=usr/share/man/man1/tcsh.1
-legacy pkg=SUNWtcsh desc="Tenex C-shell (tcsh) 6.17.00" \
+legacy pkg=SUNWtcsh \
+    desc="Tenex C-shell (tcsh)" \
     name="Tenex C-shell (tcsh)"
 license tcsh.license license=BSD
 
--- a/components/texinfo/texinfo.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/texinfo/texinfo.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -151,4 +151,4 @@
 
 legacy	pkg=SUNWtexi \
 	name="GNU texinfo - Texinfo utilities (texinfo)" \
-	desc="GNU texinfo (texinfo) 4.7"
+	desc="GNU texinfo (texinfo)"
--- a/components/tidy/tidy.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/tidy/tidy.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -159,7 +159,8 @@
 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 (1.0.0)" \
+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
--- a/components/top/top.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/top/top.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -45,7 +45,7 @@
 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 - 3.8beta1" \
+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	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/trousers/trousers.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -188,8 +188,7 @@
 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 (0.3.6)"
+	desc="Trousers - TCG software stack"
 legacy pkg=SUNWtss \
     name="TCG Software Stack - software for accessing a TPM device" \
-    desc="Trousers - TCG software stack (0.3.6)"
-
+    desc="Trousers - TCG software stack"
--- a/components/unrar/unrar.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/unrar/unrar.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -42,7 +42,7 @@
 file unrar.1 path=usr/share/man/man1/unrar.1
 
 legacy pkg=SUNWunrar \
-    desc="Rar archives extractor utility (3.8.5)" \
+    desc="Rar archives extractor utility" \
     name="Rar archives extractor utility"
 
 license unrar.license license=UnRAR
--- a/components/wget/wget.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/wget/wget.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -176,9 +176,8 @@
 file path=usr/share/locale/zh_TW/LC_MESSAGES/wget.mo
 file path=usr/share/man/man1/wget.1
 legacy pkg=SUNWwget \
-    desc="GNU wget - a utility to retrieve files from the World Wide Web 1.12" \
+    desc="GNU wget - a utility to retrieve files from the World Wide Web" \
     name="wget - GNU wget"
 
-
 license wget.license license=GPLv3
 link path=usr/sfw/bin/wget target=../../bin/wget
--- a/components/which/which.p5m	Thu Nov 17 10:39:22 2011 -0800
+++ b/components/which/which.p5m	Thu Nov 17 14:40:44 2011 -0800
@@ -48,5 +48,7 @@
 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 (2.16)" name="GNU which"
+legacy pkg=SUNWgnu-which \
+    desc="GNU which utility" \
+    name="GNU which"
 license which.license license=GPLv2