16472248 More minor changes to license file text and .p5m action for Userland S12
authorRich Burridge <rich.burridge@oracle.com>
Tue, 19 Mar 2013 14:32:45 -0700
changeset 1225 2e558aea9a28
parent 1224 aa9ac448f3e6
child 1226 5e2a9b83712f
16472248 More minor changes to license file text and .p5m action for Userland S12
components/berkeleydb/Makefile
components/berkeleydb/berkeleydb.p5m
components/graphviz/graphviz.p5m
components/groff/groff-core.p5m
components/groff/groff.p5m
components/guile/guile.p5m
components/gutenprint/gutenprint.p5m
components/lcms/lcms-py26.p5m
components/lcms/lcms-py27.p5m
components/libusb/ugen/Makefile
components/libusb/ugen/libusbugen.p5m
components/libusb/wrapper/libusb.license
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2-27.p5m
components/libxslt/libxsl-26.p5m
components/libxslt/libxsl-27.p5m
components/lighttpd/lighttpd.p5m
components/mc/mc.p5m
components/memcached-java/memcached-java.p5m
components/mpc/mpc.p5m
components/mpfr/mpfr.p5m
components/mysql-5-1/Makefile
components/mysql-5-1/mysql-51.p5m
components/mysql-5-1/mysql-51lib.p5m
components/mysql-5-1/mysql-51test.p5m
components/mysql-5-1/mysql-common.p5m
components/ncftp/ncftp.p5m
components/ncurses/ncurses.license
components/net-snmp/net-snmp-26.p5m
components/net-snmp/net-snmp-27.p5m
components/ntp/ntp.p5m
components/openscap/openscap-perl-512.p5m
components/openssl/openssl-1.0.1/openssl-1.0.1.p5m
components/openusb/openusb.p5m
components/patch/patch.p5m
components/pcre/pcre.p5m
components/perl/perl516/perl.license
components/perl512/perl.license
components/perl_modules/xml-parser/xml-parser-512.p5m
components/perl_modules/xml-parser/xml-parser-516.p5m
components/perl_modules/xml-parser/xml-parser.license
components/perl_modules/xml-simple/xml-simple.license
components/php-5_2/apache-php52.p5m
components/php-5_2/php-52.p5m
components/php-5_2/php-doc.p5m
components/php-5_2/php-pear.p5m
components/php-5_3/apache-php53.p5m
components/php-5_3/php-53.p5m
components/php-5_3/php-doc.p5m
components/php-5_3/php-pear.p5m
components/php-common/php-common.p5m
components/privoxy/privoxy.copyright
components/pylint/pylint.p5m
components/python/cherrypy/cherrypy.p5m
components/python/coverage/coverage-26.p5m
components/python/coverage/coverage-27.p5m
components/python/coverage/coverage.p5m
components/python/ipython/ipython-PYVER.p5m
components/python/jsonrpclib/jsonrpclib-26.p5m
components/python/jsonrpclib/jsonrpclib-27.p5m
components/python/m2crypto/m2crypto-26.p5m
components/python/m2crypto/m2crypto-27.p5m
components/python/m2crypto/m2crypto.p5m
components/python/mako/mako-PYVER.p5m
components/python/mysql/mysql-PYVER.p5m
components/python/pybonjour/pybonjour-26.p5m
components/python/pybonjour/pybonjour-27.p5m
components/python/pybonjour/pybonjour.p5m
components/python/pycups/pycups-26.p5m
components/python/pycups/pycups-27.p5m
components/python/pycups/pycups.p5m
components/python/pycurl/pycurl-26.p5m
components/python/pycurl/pycurl-27.p5m
components/python/pycurl/pycurl.p5m
components/python/pylxml/pylxml-26.p5m
components/python/pylxml/pylxml-27.p5m
components/python/pylxml/pylxml.p5m
components/python/pyopenssl/pyopenssl-26.p5m
components/python/pyopenssl/pyopenssl-27.p5m
components/python/pyopenssl/pyopenssl.p5m
components/python/python26/python-26-tests.p5m
components/python/python26/tkinter-26.p5m
components/python/python27/python-27-tests.p5m
components/python/python27/tkinter-27.p5m
components/python/setuptools/setuptools-26.p5m
components/python/setuptools/setuptools-27.p5m
components/python/setuptools/setuptools.p5m
components/python/twisted-web2/twisted-web2-PYVER.p5m
components/python/twisted/twisted-PYVER.p5m
components/python/zope-interface/zope-interface-PYVER.p5m
components/quagga/quagga.p5m
components/rdiff-backup/rdiff-backup-26.p5m
components/rdiff-backup/rdiff-backup-27.p5m
components/rdiff-backup/rdiff-backup.p5m
components/rpm2cpio/rpm2cpio.p5m
components/samba/samba/samba.p5m
components/sg3_utils/sg3_utils.p5m
components/stunnel/stunnel.p5m
components/subversion/subversion-java.p5m
components/subversion/subversion-perl.p5m
components/subversion/subversion-python.p5m
components/swig/swig.p5m
components/tcl/expect/expect.p5m
components/tcltls/tcltls.p5m
components/tcsh/tcsh.p5m
components/texinfo/texinfo.p5m
components/tidy/tidy.p5m
components/timezone/system-data-timezone.p5m
components/trousers/trousers.p5m
components/visual-panels/apache/Makefile
components/visual-panels/apache/system-management-visual-panels-panel-apache-message-files.p5m
components/visual-panels/apache/system-management-visual-panels-panel-apache.p5m
components/visual-panels/core/Makefile
components/visual-panels/core/system-management-visual-panels-core-message-files.p5m
components/visual-panels/core/system-management-visual-panels-core.p5m
components/visual-panels/core/system-management-visual-panels-doc.p5m
components/visual-panels/core/system-management-visual-panels.p5m
components/visual-panels/coreadm/Makefile
components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm-message-files.p5m
components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm.p5m
components/visual-panels/examples/Makefile
components/visual-panels/examples/system-management-visual-panels-panel-examples.p5m
components/visual-panels/firewall/Makefile
components/visual-panels/firewall/system-management-visual-panels-panel-firewall-message-files.p5m
components/visual-panels/firewall/system-management-visual-panels-panel-firewall.p5m
components/visual-panels/smf/Makefile
components/visual-panels/smf/system-management-visual-panels-panel-smf-message-files.p5m
components/visual-panels/smf/system-management-visual-panels-panel-smf.p5m
components/visual-panels/sysmon/Makefile
components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon-message-files.p5m
components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon.p5m
components/visual-panels/time/Makefile
components/visual-panels/time/system-management-visual-panels-panel-time-message-files.p5m
components/visual-panels/time/system-management-visual-panels-panel-time.p5m
components/visual-panels/usermgr/Makefile
components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr-message-files.p5m
components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr.p5m
components/visual-panels/zconsole/Makefile
components/visual-panels/zconsole/system-management-visual-panels-panel-zconsole-message-files.p5m
components/visual-panels/zconsole/system-management-visual-panels-panel-zconsole.p5m
components/webalizer/webalizer.p5m
components/wireshark/tshark.p5m
components/wireshark/wireshark-common.p5m
components/wireshark/wireshark.p5m
components/wxwidgets/wxwidgets.p5m
components/zip/zip.p5m
--- a/components/berkeleydb/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/berkeleydb/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -98,6 +98,9 @@
 
 $(BUILD_DIR)/%/.tested: configure_test= --enable-test
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 build:		$(BUILD_32_and_64)
 
--- a/components/berkeleydb/berkeleydb.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/berkeleydb/berkeleydb.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -30,7 +30,6 @@
 set name=pkg.summary value="Oracle Berkeley DB"
 set name=pkg.description \
     value="Berkeley DB is a computer software library that provides a high-performance embedded database for key/value data."
-set name=com.oracle.info.description value="the Oracle Berkeley DB"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Databases
 set name=info.keyword value=bdb
--- a/components/graphviz/graphviz.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/graphviz/graphviz.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
     value=pkg:/image/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="The Graphviz layout programs take descriptions of graphs in a simple text language, and make diagrams in useful formats, such as images and SVG for web pages, PDF or PostScript for inclusion in other documents; or display in an interactive graph browser.  Graphviz has many useful features for concrete diagrams, such as options for colors, fonts, tabular node layouts, line styles, hyperlinks, and custom shapes."
 set name=pkg.summary value="Graph visualization software"
-set name=com.oracle.info.description value="graphviz graph visualization software"
+set name=com.oracle.info.description value="Graphviz graph visualization software"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/groff/groff-core.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/groff/groff-core.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,8 +26,8 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/text/groff/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU roff Text Formatting (core system components)"
-set name=com.oracle.info.description value="the GNU roff Text Formatting (core system components)"
+set name=pkg.summary value="GNU troff Text Formatting (core system components)"
+set name=com.oracle.info.description value="GNU troff"
 set name=com.oracle.info.tpno value=7898
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Text Tools"
--- a/components/groff/groff.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/groff/groff.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,8 +26,8 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/text/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU roff Text Formatting"
-set name=com.oracle.info.description value="the GNU roff Text Formatting software"
+set name=pkg.summary value="GNU troff Text Formatting"
+set name=com.oracle.info.description value="GNU troff"
 set name=com.oracle.info.tpno value=7898
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Text Tools"
--- a/components/guile/guile.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/guile/guile.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -28,7 +28,7 @@
 set name=pkg.description \
     value="Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official extension language for the GNU operating system."
 set name=pkg.summary value="GNU guile utility"
-set name=com.oracle.info.description value="the GNU guile utility"
+set name=com.oracle.info.description value="GNU guile"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gutenprint/gutenprint.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/gutenprint/gutenprint.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,8 +27,8 @@
 set name=pkg.fmri \
     value=pkg:/print/filter/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
-    value="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
-set name=com.oracle.info.description value="the gutenprint drivers for Canon, Epson, Lexmark & PCL printers"
+    value="Gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
+set name=com.oracle.info.description value="the Gutenprint drivers for Canon, Epson, Lexmark & PCL printers"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lcms/lcms-py26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/lcms/lcms-py26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,10 +23,8 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description \
-    value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=pkg.summary value="The Little Color Management System"
-set name=com.oracle.info.description value="the Little Color Management System"
+set name=pkg.summary value="Python 2.6 bindings for the Little Color Management System"
+set name=com.oracle.info.description value="the Python 2.6 bindings for the Little Color Management System"
 set name=com.oracle.info.tpno value=9072
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
--- a/components/lcms/lcms-py27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/lcms/lcms-py27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,10 +23,8 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description \
-    value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=pkg.summary value="The Little Color Management System"
-set name=com.oracle.info.description value="the Little Color Management System"
+set name=pkg.summary value="Python 2.7 bindings for the Little Color Management System"
+set name=com.oracle.info.description value="the Python 2.7 bindings for the Little Color Management System"
 set name=com.oracle.info.tpno value=9072
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
--- a/components/libusb/ugen/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/libusb/ugen/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -40,6 +40,9 @@
 $(BUILD_DIR_64)/.installed:	BITS=64
 COMPONENT_INSTALL_ARGS += BITS=$(BITS)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 download:
 
 clobber:	clean
--- a/components/libusb/ugen/libusbugen.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/libusb/ugen/libusbugen.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
     value=pkg:/system/library/usb/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="libusb ugen plugin"
-set name=com.oracle.info.description value="the libusb ugen plugin"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Libraries"
 set name=info.source-url value=http://opensolaris.org/
--- a/components/libusb/wrapper/libusb.license	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/libusb/wrapper/libusb.license	Tue Mar 19 14:32:45 2013 -0700
@@ -1,6 +1,3 @@
-This package may include technology covered by one or more of the
-following additional notices:
-
 Copyright (c) 2000-2003 Johannes Erdfelt <[email protected]>
 All rights reserved.
 
--- a/components/libxml2/libxml2-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/libxml2/libxml2-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XML library - Python 2.6 bindings"
-set name=com.oracle.info.description value="the XML library Python 2.6 bindings"
+set name=com.oracle.info.description value="Python 2.6 bindings for the XML library"
 set name=com.oracle.info.tpno value=5302
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/libxml2/libxml2-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/libxml2/libxml2-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XML library - Python 2.7 bindings"
-set name=com.oracle.info.description value="the XML library Python 2.7 bindings"
+set name=com.oracle.info.description value="Python 2.7 bindings for the XML library"
 set name=com.oracle.info.tpno value=5302
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/libxslt/libxsl-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/libxslt/libxsl-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XSLT library - Python 2.6 bindings"
-set name=com.oracle.info.description value="the XSLT library Python 2.6 bindings"
+set name=com.oracle.info.description value="Python 2.6 bindings for the XSLT library"
 set name=com.oracle.info.tpno value=5303
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/libxslt/libxsl-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/libxslt/libxsl-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XSLT library - Python 2.7 bindings"
-set name=com.oracle.info.description value="the XSLT library Python 2.7 bindings"
+set name=com.oracle.info.description value="Python 2.7 bindings for the XSLT library"
 set name=com.oracle.info.tpno value=5303
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/lighttpd/lighttpd.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/lighttpd/lighttpd.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
     value=pkg:/web/server/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="The Lighttpd Web Server"
-set name=com.oracle.info.description value="the lightppd web server"
+set name=com.oracle.info.description value="the Lightppd web server"
 set name=com.oracle.info.tpno value=5585
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
--- a/components/mc/mc.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mc/mc.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.description \
     value="GNU Midnight Commander is a full-screen text mode application that allows user to copy, move and delete files and whole directory trees, search for files and run commands in the subshell"
 set name=pkg.summary value="The GNU Midnight Commander file manager"
-set name=com.oracle.info.description value="the GNU Midnight Commander file manager"
+set name=com.oracle.info.description value="GNU Midnight Commander file manager"
 set name=info.classification \
     value="org.opensolaris.category.2008:Desktop (GNOME)/File Managers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/memcached-java/memcached-java.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/memcached-java/memcached-java.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -30,8 +30,8 @@
 	set action.hash javadocs/%<1>>
 
 set name=pkg.fmri value=pkg:/library/java/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="memcached client for the java platform"
-set name=com.oracle.info.description value="the memcached client for the java platform"
+set name=pkg.summary value="memcached client for the Java platform"
+set name=com.oracle.info.description value="the memcached client for the Java platform"
 set name=com.oracle.info.tpno value=5586
 set name=info.classification value="org.opensolaris.category.2008:Development/Java"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/mpc/mpc.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mpc/mpc.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Multiprecision complex data type evaluation library"
-set name=com.oracle.info.description value="the mpc data type evaluation library"
+set name=com.oracle.info.description value="GNU Mpc"
 set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mpfr/mpfr.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mpfr/mpfr.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU MPFR"
 set name=pkg.description value="The GNU Multiple Precision with IEEE Rounding Floating-Point Library"
-set name=com.oracle.info.description value="GNU mpfr"
+set name=com.oracle.info.description value="GNU MPFR"
 set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mysql-5-1/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mysql-5-1/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -108,6 +108,9 @@
 CONFIGURE_OPTIONS.64 += --libexecdir=$(CONFIGURE_PREFIX)/bin/$(MACH64)	
 CONFIGURE_OPTIONS.64 += --enable-dtrace DTRACEFLAGS='-64'	
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 build: $(BUILD_32_and_64)
 
 install: $(INSTALL_32_and_64)
--- a/components/mysql-5-1/mysql-51.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mysql-5-1/mysql-51.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,6 @@
     value=pkg:/database/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="MySQL 5.1 Database Management System"
-set name=com.oracle.info.description value="the MySQL 5.1 Database Management System"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mysql-5-1/mysql-51lib.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mysql-5-1/mysql-51lib.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,6 @@
     value=pkg:/database/mysql-51/librar[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="MySQL 5.1 libraries"
-set name=com.oracle.info.description value="the MySQL 5.1 libraries"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mysql-5-1/mysql-51test.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mysql-5-1/mysql-51test.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
     value=pkg:/database/mysql-51/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="MySQL 5.1 tests"
-set name=com.oracle.info.description value="the MySQL 5.1 tests"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mysql-5-1/mysql-common.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/mysql-5-1/mysql-common.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,6 @@
 
 set name=pkg.fmri value=pkg:/database/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="MySQL Database Management System (Base)"
-set name=com.oracle.info.description value="the MySQL Database Management System base software"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/ncftp/ncftp.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/ncftp/ncftp.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.modified-date "April 20, 2011">
 set name=pkg.fmri value=pkg:/network/ftp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="NcFTP - client application implementing FTP"
-set name=com.oracle.info.description value="the ncftp client application"
+set name=com.oracle.info.description value="the ncftp file transfer application"
 set name=com.oracle.info.tpno value=9255
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/ncurses/ncurses.license	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/ncurses/ncurses.license	Tue Mar 19 14:32:45 2013 -0700
@@ -1,4 +1,4 @@
-Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              
+ Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              
  Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.             
  Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.             
  Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.            
--- a/components/net-snmp/net-snmp-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/net-snmp/net-snmp-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Net-SNMP - Python 2.6 bindings"
-set name=com.oracle.info.description value="the Net-SNMP Python 2.6 bindings"
+set name=com.oracle.info.description value="Python 2.6 bindings for Net-SNMP"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/net-snmp/net-snmp-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/net-snmp/net-snmp-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Net-SNMP - Python 2.7 bindings"
-set name=com.oracle.info.description value="the Net-SNMP Python 2.7 bindings"
+set name=com.oracle.info.description value="Python 2.7 bindings for Net-SNMP"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ntp/ntp.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/ntp/ntp.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -29,7 +29,7 @@
 set name=pkg.description \
     value="Network Time Protocol v4, NTP Daemon and Utilities"
 set name=pkg.summary value="Network Time Protocol Daemon v4"
-set name=com.oracle.info.description value="the Network Time Protocol Daemon v4"
+set name=com.oracle.info.description value="the Network Time Protocol Daemon"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Services
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openscap/openscap-perl-512.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/openscap/openscap-perl-512.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl 5.12 bindings for the Open implementation of SCAP"
-set name=com.oracle.info.description value="the Perl 5.12 bindings for the Open implementation of SCAP"
+set name=com.oracle.info.description value="Perl 5.12 bindings for the Open implementation of SCAP"
 set name=com.oracle.info.tpno value=8008
 set name=info.classification value="org.opensolaris.category.2008:System/Security"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/openssl/openssl-1.0.1/openssl-1.0.1.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -28,7 +28,7 @@
 set name=pkg.description \
     value="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."
 set name=pkg.summary value="OpenSSL - a Toolkit for Secure Sockets Layer (SSL v2/v3) and Transport Layer (TLS v1) protocols and general purpose cryptographic library"
-set name=com.oracle.info.description value="OpenSSL toolkit"
+set name=com.oracle.info.description value="OpenSSL"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Security"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/openusb/openusb.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/openusb/openusb.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
 set name=pkg.description \
     value="A library to enable userspace application programs to communicate with USB devices"
 set name=pkg.summary value="A USB device management library"
-set name=com.oracle.info.description value="the openusn USB device management library"
+set name=com.oracle.info.description value="the openusb USB device management library"
 set name=com.oracle.info.tpno value=8843
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
--- a/components/patch/patch.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/patch/patch.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 set name=pkg.fmri \
     value=pkg:/text/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The GNU Patch utility"
-set name=com.oracle.info.description value="the GNU patch utility"
+set name=com.oracle.info.description value="GNU patch"
 set name=com.oracle.info.tpno value=8588
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
--- a/components/pcre/pcre.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/pcre/pcre.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl-Compatible Regular Expressions"
 set name=pkg.description value="The PCRE library is a set of functions that implement regular expression pattern matching using almost the same syntax and semantics as Perl"
-set name=com.oracle.info.description value="the pcre library"
+set name=com.oracle.info.description value="the PCRE library"
 set name=com.oracle.info.tpno value=9271
 set name=info.classification value="org.opensolaris.category.2008:Development/C"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/perl/perl516/perl.license	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/perl/perl516/perl.license	Tue Mar 19 14:32:45 2013 -0700
@@ -1,3 +1,7 @@
+Oracle elects to have this file available under and governed by
+the Artistic License (see below for full license text).
+However, the following notice accompanied the original version of this file:
+
 This program is free software; you can redistribute it and/or modify
 it under the terms of either:
 
--- a/components/perl512/perl.license	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/perl512/perl.license	Tue Mar 19 14:32:45 2013 -0700
@@ -1,3 +1,7 @@
+Oracle elects to have this file available under and governed by
+the Artistic License (see below for full license text).
+However, the following notice accompanied the original version of this file:
+
 This program is free software; you can redistribute it and/or modify
 it under the terms of either:
 
--- a/components/perl_modules/xml-parser/xml-parser-512.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/perl_modules/xml-parser/xml-parser-512.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
 set name=pkg.summary \
     value="XML::Parser - A perl module for parsing XML documents"
 set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
-set name=com.oracle.info.description value="the Perl XML::Parser module for Perl 5.12"
+set name=com.oracle.info.description value="the XML::Parser Perl 5.12 module"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Perl"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/perl_modules/xml-parser/xml-parser-516.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/perl_modules/xml-parser/xml-parser-516.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
 set name=pkg.summary \
     value="XML::Parser - A perl module for parsing XML documents"
 set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
-set name=com.oracle.info.description value="the Perl XML::Parser module for Perl 5.16"
+set name=com.oracle.info.description value="the XML::Parser Perl 5.16 module"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Perl"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/perl_modules/xml-parser/xml-parser.license	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/perl_modules/xml-parser/xml-parser.license	Tue Mar 19 14:32:45 2013 -0700
@@ -1,3 +1,7 @@
+Oracle elects to have this file available under and governed by
+the Artistic License (see below for full license text).
+However, the following notice accompanied the original version of this file:
+
 Copyright (c) 1998-2000 Larry Wall and Clark Cooper.
 All rights reserved.
 This program is free software; you can redistribute it and/or modify it
--- a/components/perl_modules/xml-simple/xml-simple.license	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/perl_modules/xml-simple/xml-simple.license	Tue Mar 19 14:32:45 2013 -0700
@@ -1,3 +1,9 @@
+Oracle elects to have this file available under and governed by
+the Artistic License (see below for full license text).
+However, the following notice accompanied the original version of this file:
+
+COPYRIGHT
+
   Copyright 1999-2004 Grant McLean <[email protected]>
 
   This library is free software; you can redistribute it
--- a/components/php-5_2/apache-php52.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_2/apache-php52.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -32,7 +32,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license apache-php52.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
-    com.oracle.info.description="the PHP Server for Apache Web Server" \
+    com.oracle.info.description="the PHP 5.2 module for the Apache web server" \
     com.oracle.info.name=apache-php52 \
     com.oracle.info.version=5.2.17
 
--- a/components/php-5_2/php-52.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_2/php-52.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -40,7 +40,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-52.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
-    com.oracle.info.description="the PHP Server" \
+    com.oracle.info.description="the PHP scripting language" \
     com.oracle.info.name=php-52 \
     com.oracle.info.version=5.2.17
 
--- a/components/php-5_2/php-doc.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_2/php-doc.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -33,7 +33,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-doc.license license='PHP' \
-    com.oracle.info.description="the PHP Server Documentation" \
+    com.oracle.info.description="the PHP documentation" \
     com.oracle.info.name=php-doc \
     com.oracle.info.version=5.2.17
 
--- a/components/php-5_2/php-pear.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_2/php-pear.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -40,7 +40,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-pear.license license='PHP, LGPLv2.1' \
-    com.oracle.info.description="the PHP Extension and Application Repository" \
+    com.oracle.info.description="the PEAR extension module for PHP" \
     com.oracle.info.name=php-pear \
     com.oracle.info.version=5.2.17
 
--- a/components/php-5_3/apache-php53.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_3/apache-php53.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -30,7 +30,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license apache-php53.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
-    com.oracle.info.description="the PHP Server for Apache Web Server" \
+    com.oracle.info.description="the PHP 5.3 module for the Apache web server" \
     com.oracle.info.name=apache-php53 \
     com.oracle.info.version=5.3.14
 
--- a/components/php-5_3/php-53.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_3/php-53.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -39,7 +39,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-53.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \
-    com.oracle.info.description="the PHP Server" \
+    com.oracle.info.description="the PHP scripting language" \
     com.oracle.info.name=php-53 \
     com.oracle.info.version=5.3.14
 
--- a/components/php-5_3/php-doc.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_3/php-doc.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -31,7 +31,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-doc.license license='PHP' \
-    com.oracle.info.description="the PHP Server Documentation" \
+    com.oracle.info.description="the PHP documentation" \
     com.oracle.info.name=php-doc \
     com.oracle.info.version=5.3.14
 
--- a/components/php-5_3/php-pear.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-5_3/php-pear.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -38,7 +38,7 @@
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-pear.license license='PHP, LGPLv2.1' \
-    com.oracle.info.description="the PHP Extension and Application Repository" \
+    com.oracle.info.description="the PEAR extension module for PHP" \
     com.oracle.info.name=php-pear \
     com.oracle.info.version=5.3.14
 
--- a/components/php-common/php-common.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/php-common/php-common.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -31,7 +31,7 @@
 set name=pkg.description \
     value="A general-purpose scripting language originally designed for web development to produce dynamic web pages."
 set name=pkg.summary value="PHP Server"
-set name=com.oracle.info.description value="the PHP Server"
+set name=com.oracle.info.description value="the PHP scripting language"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/privoxy/privoxy.copyright	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/privoxy/privoxy.copyright	Tue Mar 19 14:32:45 2013 -0700
@@ -1,5 +1,3 @@
-				v.09232010
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/pylint/pylint.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/pylint/pylint.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri value=pkg:/developer/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="pylint - python code static checker"
 set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
-set name=com.oracle.info.description value="the pylint Python code static checker"
+set name=com.oracle.info.description value="the pylint code static checker for Python"
 set name=com.oracle.info.tpno value=9026
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/cherrypy/cherrypy.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/cherrypy/cherrypy.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
 set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
-set name=com.oracle.info.description value="the CherryPy Python object-oriented HTTP framework"
+set name=com.oracle.info.description value="the CherryPy object-oriented HTTP framework"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="CherryPy Team <[email protected]>"
--- a/components/python/coverage/coverage-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/coverage/coverage-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The coverage.py Python code coverage tool"
 set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
-set name=com.oracle.info.description value="The coverage Python code coverage tool for Python 2.6"
+set name=com.oracle.info.description value="coverage, the code coverage tool for Python 2.6"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Ned Batchelder <[email protected]>"
--- a/components/python/coverage/coverage-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/coverage/coverage-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The coverage.py Python code coverage tool"
 set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
-set name=com.oracle.info.description value="The coverage Python code coverage tool for Python 2.7"
+set name=com.oracle.info.description value="coverage, the code coverage tool for Python 2.7"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Ned Batchelder <[email protected]>"
--- a/components/python/coverage/coverage.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/coverage/coverage.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The coverage.py Python code coverage tool"
 set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
-set name=com.oracle.info.description value="The coverage Python code coverage tool"
+set name=com.oracle.info.description value="coverage, the code coverage tool for Python"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Ned Batchelder <[email protected]>"
--- a/components/python/ipython/ipython-PYVER.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/ipython/ipython-PYVER.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Enhanced interactive Python shell"
-set name=com.oracle.info.description value="the ipython interactive Python shell"
+set name=com.oracle.info.description value="the IPython interactive Python shell"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/jsonrpclib/jsonrpclib-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/jsonrpclib/jsonrpclib-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python implementation of JSON-RPC v2.0 for Python 2.6"
+set name=com.oracle.info.description value="the Python 2.6 implementation of JSON-RPC v2.0"
 set name=com.oracle.info.tpno value=8061
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/jsonrpclib/jsonrpclib-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/jsonrpclib/jsonrpclib-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python implementation of JSON-RPC v2.0 for Python 2.7"
+set name=com.oracle.info.description value="the Python 2.7 implementation of JSON-RPC v2.0"
 set name=com.oracle.info.tpno value=8061
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/python/m2crypto/m2crypto-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/m2crypto/m2crypto-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface for openssl"
-set name=com.oracle.info.description value="the Python 2.6 interface for m2crypto"
+set name=com.oracle.info.description value="Python 2.6 bindings for M2Crypto"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Heikki Toivonen <[email protected]>"
--- a/components/python/m2crypto/m2crypto-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/m2crypto/m2crypto-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface for openssl"
-set name=com.oracle.info.description value="the Python 2.7 interface for m2crypto"
+set name=com.oracle.info.description value="Python 2.7 bindings for M2Crypto"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Heikki Toivonen <[email protected]>"
--- a/components/python/m2crypto/m2crypto.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/m2crypto/m2crypto.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface for openssl"
-set name=com.oracle.info.description value="the Python interface for m2crypto"
+set name=com.oracle.info.description value="Python bindings for M2Crypto"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Heikki Toivonen <[email protected]>"
--- a/components/python/mako/mako-PYVER.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/mako/mako-PYVER.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/mako-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Template library written in Python"
 set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
-set name=com.oracle.info.description value="the mako Python template library"
+set name=com.oracle.info.description value="the Mako Python template library"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Mike Bayer <[email protected]>"
--- a/components/python/mysql/mysql-PYVER.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/mysql/mysql-PYVER.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
     value=pkg:/library/python-2/python-mysql-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="A MySQL database adapter for the Python programming language"
-set name=com.oracle.info.description value="A MySQL database adapter for Python"
+set name=com.oracle.info.description value="the MySQL database adapter for Python"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pybonjour/pybonjour-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pybonjour/pybonjour-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -22,9 +22,9 @@
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python bindings for bonjour / dns-sd"
-set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
-set name=com.oracle.info.description value="the Python 2.6 bindings for bonjour / dns-sd"
+set name=pkg.summary value="Python bindings for Bonjour / DNS-SD"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of Bonjour."
+set name=com.oracle.info.description value="Python 2.6 bindings for Bonjour / DNS-SD"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Christopher Stawarz <[email protected]>"
--- a/components/python/pybonjour/pybonjour-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pybonjour/pybonjour-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -22,9 +22,9 @@
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python bindings for bonjour / dns-sd"
-set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
-set name=com.oracle.info.description value="the Python 2.7 bindings for bonjour / dns-sd"
+set name=pkg.summary value="Python bindings for Bonjour / DNS-SD"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of Bonjour."
+set name=com.oracle.info.description value="Python 2.7 bindings for Bonjour / DNS-SD"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Christopher Stawarz <[email protected]>"
--- a/components/python/pybonjour/pybonjour.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pybonjour/pybonjour.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -22,9 +22,9 @@
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python bindings for bonjour / dns-sd"
-set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
-set name=com.oracle.info.description value="the Python bindings for bonjour / dns-sd"
+set name=pkg.summary value="Python bindings for Bonjour / DNS-SD"
+set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of Bonjour."
+set name=com.oracle.info.description value="Python bindings for Bonjour / DNS-SD"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Christopher Stawarz <[email protected]>"
--- a/components/python/pycups/pycups-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pycups/pycups-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python language bindings for CUPS"
-set name=com.oracle.info.description value="the Python 2.6 language bindings for CUPS"
+set name=com.oracle.info.description value="Python 2.6 bindings for CUPS"
 set name=com.oracle.info.tpno value=9025
 set name=info.classification value=org.opensolaris.category.2008:System/Printing
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pycups/pycups-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pycups/pycups-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python language bindings for CUPS"
-set name=com.oracle.info.description value="the Python 2.7 language bindings for CUPS"
+set name=com.oracle.info.description value="Python 2.7 bindings for CUPS"
 set name=com.oracle.info.tpno value=9025
 set name=info.classification value=org.opensolaris.category.2008:System/Printing
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pycups/pycups.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pycups/pycups.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -22,7 +22,7 @@
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python language bindings for CUPS"
+set name=pkg.summary value="Python bindings for CUPS"
 set name=com.oracle.info.description value="the Python language bindings for CUPS"
 set name=com.oracle.info.tpno value=9025
 set name=info.classification value=org.opensolaris.category.2008:System/Printing
--- a/components/python/pycurl/pycurl-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pycurl/pycurl-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for libcurl"
 set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
-set name=com.oracle.info.description value="the Python 2.6 bindings for libcurl"
+set name=com.oracle.info.description value="Python 2.6 bindings for libcurl"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pycurl/pycurl-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pycurl/pycurl-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for libcurl"
 set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
-set name=com.oracle.info.description value="the Python 2.7 bindings for libcurl"
+set name=com.oracle.info.description value="Python 2.7 bindings for libcurl"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pycurl/pycurl.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pycurl/pycurl.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for libcurl"
 set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
-set name=com.oracle.info.description value="the Python bindings for libcurl"
+set name=com.oracle.info.description value="Python bindings for libcurl"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pylxml/pylxml-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pylxml/pylxml-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
-set name=com.oracle.info.description value="the Python 2.6 bindings for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description value="Python 2.6 bindings for the libxml2 and libxslt libraries"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pylxml/pylxml-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pylxml/pylxml-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Pythonic 2.7 binding for the libxml2 and libxslt libraries"
-set name=com.oracle.info.description value="the Python 2.7 bindings for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description value="Python 2.7 bindings for the libxml2 and libxslt libraries"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pylxml/pylxml.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pylxml/pylxml.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
-set name=com.oracle.info.description value="the Python bindings for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description value="Python bindings for the libxml2 and libxslt libraries"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pyopenssl/pyopenssl-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pyopenssl/pyopenssl-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface to the OpenSSL library"
-set name=com.oracle.info.description value="the Python 2.6 interface to the OpenSSL library"
+set name=com.oracle.info.description value="Python 2.6 bindings for OpenSSL"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pyopenssl/pyopenssl-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pyopenssl/pyopenssl-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface to the OpenSSL library"
-set name=com.oracle.info.description value="the Python 2.7 interface to the OpenSSL library"
+set name=com.oracle.info.description value="Python 2.7 bindings for OpenSSL"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/pyopenssl/pyopenssl.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/pyopenssl/pyopenssl.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface to the OpenSSL library"
-set name=com.oracle.info.description value="the Python interface to the OpenSSL library"
+set name=com.oracle.info.description value="Python bindings for OpenSSL"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/python26/python-26-tests.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/python26/python-26-tests.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/runtime/python-26/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Tests for the Python interpreter, libraries and utilities"
-set name=com.oracle.info.description value="the tests for Python 2.6"
+set name=com.oracle.info.description value="test cases for Python 2.6"
 set name=com.oracle.info.tpno value=9104
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/python/python26/tkinter-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/python26/tkinter-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings to tcl/tk"
-set name=com.oracle.info.description value="the Python bindings to tcl/tk"
+set name=com.oracle.info.description value="Python 2.6 bindings for Tcl/Tk"
 set name=com.oracle.info.tpno value=9104
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/python/python27/python-27-tests.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/python27/python-27-tests.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -29,7 +29,7 @@
 set name=pkg.fmri \
     value=pkg:/runtime/python-27/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Python tests"
-set name=com.oracle.info.description value="the tests for Python 2.7"
+set name=com.oracle.info.description value="test cases for Python 2.7"
 set name=com.oracle.info.tpno value=9104
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/python/python27/tkinter-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/python27/tkinter-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python 2.7 bindings to tcl/tk"
-set name=com.oracle.info.description value="the Python 2.7 bindings to tcl/tk"
+set name=com.oracle.info.description value="Python 2.7 bindings for Tcl/Tk"
 set name=com.oracle.info.tpno value=9104
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
--- a/components/python/setuptools/setuptools-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/setuptools/setuptools-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.description value="the Python setup tools for Python 2.6"
+set name=com.oracle.info.description value="Python 2.6 setup tools"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/setuptools/setuptools-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/setuptools/setuptools-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.description value="the Python setup tools for Python 2.7"
+set name=com.oracle.info.description value="Python 2.7 setup tools"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/setuptools/setuptools.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/setuptools/setuptools.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.description value="the Python setup tools"
+set name=com.oracle.info.description value="Python setup tools"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
 set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/twisted-web2/twisted-web2-PYVER.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/twisted-web2/twisted-web2-PYVER.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/python-twisted-web2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A HTTP/1.1 Server Framework"
-set name=com.oracle.info.description value="the twisted-web2 Python HTTP/1.1 Server Framework"
+set name=com.oracle.info.description value="the Twisted Web2 Python HTTP/1.1 Server Framework"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/twisted/twisted-PYVER.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/twisted/twisted-PYVER.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/python-twisted-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Event-based framework for internet applications"
-set name=com.oracle.info.description value="the twisted Python event-based framework"
+set name=com.oracle.info.description value="the Twisted event-based Python framework"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/python/zope-interface/zope-interface-PYVER.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/python/zope-interface/zope-interface-PYVER.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,8 +26,8 @@
 set name=pkg.fmri \
     value=pkg:/library/python-2/python-zope-interface-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
-    value="A separate distribution of the zope.interface package used in Zope 3"
-set name=com.oracle.info.description value="the Python zope interface"
+    value="Zope interfaces package for Python"
+set name=com.oracle.info.description value="the Zope interfaces package for Python"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/quagga/quagga.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/quagga/quagga.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -29,7 +29,7 @@
 set name=pkg.description \
     value="Quagga is a routing software suite, providing implementations of OSPFv2, OSPFv3, RIP v1 and v2, RIPng, ISIS and BGP-4"
 set name=pkg.summary value="Quagga - Quagga Routing Software"
-set name=com.oracle.info.description value="the quagga routing software"
+set name=com.oracle.info.description value="the Quagga routing software"
 set name=com.oracle.info.tpno value=9106
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
--- a/components/rdiff-backup/rdiff-backup-26.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/rdiff-backup/rdiff-backup-26.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/backup/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Local/remote mirror and incremental backup utility"
-set name=com.oracle.info.description value="the rdiff backup utility for Python 2.6"
+set name=com.oracle.info.description value="Python 2.6 bindings for rdiff-backup"
 set name=com.oracle.info.tpno value=9055
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/rdiff-backup/rdiff-backup-27.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/rdiff-backup/rdiff-backup-27.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/backup/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Local/remote mirror and incremental backup utility"
-set name=com.oracle.info.description value="the rdiff backup utility for Python 2.7"
+set name=com.oracle.info.description value="Python 2.7 bindings for rdiff-backup"
 set name=com.oracle.info.tpno value=9055
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/rdiff-backup/rdiff-backup.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/rdiff-backup/rdiff-backup.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 
 set name=pkg.fmri value=pkg:/backup/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Local/remote mirror and incremental backup utility"
-set name=com.oracle.info.description value="the rdiff backup utility"
+set name=com.oracle.info.description value="the rdiff-backup file utility"
 set name=com.oracle.info.tpno value=9055
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/rpm2cpio/rpm2cpio.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/rpm2cpio/rpm2cpio.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,7 +24,7 @@
 set name=pkg.fmri \
     value=pkg:/package/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Utilities for processing RPM archives"
-set name=com.oracle.info.description value="the rpm2cpio utility for processing RPM archives"
+set name=com.oracle.info.description value="the rpm2cpio archive utility"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Packaging"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/samba/samba/samba.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/samba/samba/samba.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,7 +23,7 @@
 
 set name=pkg.fmri value=pkg:/service/network/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="samba - A Windows SMB/CIFS fileserver for UNIX"
-set name=com.oracle.info.description value="samba, a Windows SMB/CIFS fileserver for UNIX"
+set name=com.oracle.info.description value="Samba, a SMB/CIFS fileserver"
 set name=com.oracle.info.tpno value=12677
 set name=info.classification value="org.opensolaris.category.2008:System/File System"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/sg3_utils/sg3_utils.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/sg3_utils/sg3_utils.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -29,7 +29,7 @@
 set name=pkg.summary value="Utilities for devices that use SCSI command sets"
 set name=pkg.description \
     value='Collection of utilities for devices that use the SCSI command set. Includes utilities to copy data based on "dd" syntax and semantics (called sg_dd, sgp_dd and sgm_dd); check INQUIRY data and VPD pages (sg_inq); check mode and log pages (sginfo, sg_modes and sg_logs); spin up and down disks (sg_start); do self tests (sg_senddiag); and various other functions. Warning: Some of these tools access the internals of your system and the incorrect usage of them may render your system inoperable.'
-set name=com.oracle.info.description value="the sg3 SCSI utilities"
+set name=com.oracle.info.description value="the sg3_utils SCSI utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/stunnel/stunnel.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/stunnel/stunnel.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -29,7 +29,7 @@
 set name=pkg.summary value="An SSL-encrypting socket wrapper"
 set name=pkg.description \
     value="Stunnel is a socket wrapper which can provide SSL (Secure Sockets Layer) support to ordinary applications. For example, it can be used in conjunction with imapd to create an SSL secure IMAP server."
-set name=com.oracle.info.description value="stunnel, an SSL-encrypting socket wrapper"
+set name=com.oracle.info.description value="stunnel, a SSL-encrypting socket wrapper"
 set name=info.classification value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/subversion/subversion-java.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/subversion/subversion-java.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -22,7 +22,7 @@
 #
 set name=pkg.fmri value=pkg:/library/java/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Java bindings for the Subversion SCM"
-set name=com.oracle.info.description value="the Java bindings for the Subversion SCM"
+set name=com.oracle.info.description value="Java bindings for the Subversion SCM"
 set name=com.oracle.info.tpno value=9086
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/subversion/subversion-perl.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/subversion/subversion-perl.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
 
 set name=pkg.fmri value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl bindings for the Subversion SCM"
-set name=com.oracle.info.description value="the Perl bindings for the Subversion SCM"
+set name=com.oracle.info.description value="Perl bindings for the Subversion SCM"
 set name=com.oracle.info.tpno value=9086
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/subversion/subversion-python.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/subversion/subversion-python.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -22,7 +22,7 @@
 #
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.description value="the Python bindings for the Subversion SCM"
+set name=com.oracle.info.description value="Python bindings for the Subversion SCM"
 set name=com.oracle.info.tpno value=9086
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/swig/swig.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/swig/swig.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -24,8 +24,8 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/developer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="The Simplified and Interface Generator (swig)"
-set name=com.oracle.info.description value="swig, the Simplified and Interface Generator"
+set name=pkg.summary value="Simplified Wrapper and Interface Generator"
+set name=com.oracle.info.description value="SWIG, the Simplified Wrapper and Interface Generator"
 set name=com.oracle.info.tpno value=5686
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
--- a/components/tcl/expect/expect.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/tcl/expect/expect.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -30,7 +30,7 @@
     value="Expect is a tool for automating interactive applications, such as telnet, ftp, passwd, fsck, rlogin, tip, etc."
 set name=pkg.summary \
     value="expect - Programmed dialogue with other interactive programs"
-set name=com.oracle.info.description value="the expect tool"
+set name=com.oracle.info.description value="the Expect tool"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcltls/tcltls.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/tcltls/tcltls.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -23,8 +23,8 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/runtime/tcl-8/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Tcl binding to openssl toolkit"
-set name=com.oracle.info.description value="the Tcl binding to OpenSSL toolkit"
+set name=pkg.summary value="TCL bindings for OpenSSL"
+set name=com.oracle.info.description value="TCL bindings for OpenSSL"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/tcsh/tcsh.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/tcsh/tcsh.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
 set name=pkg.description \
     value="C shell with file name completion and command line editing"
 set name=pkg.summary value="Tenex C-shell (tcsh)"
-set name=com.oracle.info.description value="the tcsh shell"
+set name=com.oracle.info.description value="tcsh, the Tenex C-shell"
 set name=com.oracle.info.tpno value=5688
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/texinfo/texinfo.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/texinfo/texinfo.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri value=pkg:/text/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Documentation system for on-line information and printed output"
 set name=pkg.description value="Texinfo is a documentation system that uses a single source file to produce both on-line information and printed output."
-set name=com.oracle.info.description value="the texinfo documentation system"
+set name=com.oracle.info.description value="Texinfo, the GNU documentation system"
 set name=com.oracle.info.tpno value=9093
 set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/tidy/tidy.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/tidy/tidy.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,7 @@
 set name=pkg.description \
     value="HTML Tidy is an open source program and library for checking and generating clean XHTML/HTML."
 set name=pkg.summary value="The HTML Tidy Library."
-set name=com.oracle.info.description value="the tidy utility"
+set name=com.oracle.info.description value="the HTML Tidy utility"
 set name=com.oracle.info.tpno value=9098
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
--- a/components/timezone/system-data-timezone.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/timezone/system-data-timezone.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -28,7 +28,7 @@
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="Timezone Definition"
 set name=pkg.description value="Timezone definition files"
-set name=com.oracle.info.description value="the Timezone definition files"
+set name=com.oracle.info.description value="the timezone definition files"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Core
 set name=org.opensolaris.arc-caseid \
--- a/components/trousers/trousers.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/trousers/trousers.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -28,7 +28,7 @@
     value="TrouSerS TCG software to access a TPM device"
 set name=pkg.description \
     value="The TrouSerS library provides a software stack from the Trusted Computer Group (TCG) that accesses a Trusted Platform Module (TPM) hardware device."
-set name=com.oracle.info.description value="the trousers library"
+set name=com.oracle.info.description value="the TrouSerS library"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Security
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/visual-panels/apache/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/apache/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -49,6 +49,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/apache/system-management-visual-panels-panel-apache-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/apache/system-management-visual-panels-panel-apache-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for Apache Web Server Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels translatable content for Apache Web Server Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/apache/system-management-visual-panels-panel-apache.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/apache/system-management-visual-panels-panel-apache.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Apache Web Server Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels Apache Web Server Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/core/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/core/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -47,6 +47,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/core/system-management-visual-panels-core-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/core/system-management-visual-panels-core-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for Visual Panels framework"
-set name=com.oracle.info.description value="the Visual Panels translatable content for Visual Panels framework"
 set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/core/system-management-visual-panels-core.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/core/system-management-visual-panels-core.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -27,7 +27,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Visual Panels framework"
-set name=com.oracle.info.description value="the Visual Panels framework"
 set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/visual-panels/core/system-management-visual-panels-doc.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/core/system-management-visual-panels-doc.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,6 @@
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Visual Panels - API Documentation"
-set name=com.oracle.info.description value="the Visual Panels API Documentation"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
 
--- a/components/visual-panels/core/system-management-visual-panels.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/core/system-management-visual-panels.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Visual Panels group package"
-set name=com.oracle.info.description value="the Visual Panels group package"
 set name=info.classification value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/coreadm/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/coreadm/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -50,6 +50,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for Core Files Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels translatable content for Core Files Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/coreadm/system-management-visual-panels-panel-coreadm.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Core Files Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels Core Files Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/examples/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/examples/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -49,6 +49,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/examples/system-management-visual-panels-panel-examples.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/examples/system-management-visual-panels-panel-examples.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Visual Panels - Example Panels"
-set name=com.oracle.info.description value="the Visual Panels example panels"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/firewall/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/firewall/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -50,6 +50,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/firewall/system-management-visual-panels-panel-firewall-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/firewall/system-management-visual-panels-panel-firewall-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for Service Firewall Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels translatable content for Service Firewall Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/firewall/system-management-visual-panels-panel-firewall.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/firewall/system-management-visual-panels-panel-firewall.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Service Firewall Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels Service Firewall Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/smf/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/smf/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -50,6 +50,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/smf/system-management-visual-panels-panel-smf-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/smf/system-management-visual-panels-panel-smf-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for SMF Service Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels translatable content for SMF Service Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/smf/system-management-visual-panels-panel-smf.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/smf/system-management-visual-panels-panel-smf.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="SMF Service Administration GUI"
-set name=com.oracle.info.description value="the Visual Panels SMF Service Administration GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/sysmon/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/sysmon/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -50,6 +50,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for System Monitor GUI"
-set name=com.oracle.info.description value="the Visual Panels translatable content for System Monitor GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/sysmon/system-management-visual-panels-panel-sysmon.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="System Monitor GUI"
-set name=com.oracle.info.description value="the Visual Panels System Monitor GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/time/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/time/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -50,6 +50,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/time/system-management-visual-panels-panel-time-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/time/system-management-visual-panels-panel-time-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/panel-time[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for Time Settings GUI"
-set name=com.oracle.info.description value="the Visual Panel translatable content for Time Settings GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/time/system-management-visual-panels-panel-time.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/time/system-management-visual-panels-panel-time.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Time Settings GUI"
-set name=com.oracle.info.description value="the Visual Panels Time Settings GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/usermgr/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/usermgr/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -50,6 +50,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for User Manager GUI"
-set name=com.oracle.info.description value="the Visual Panels translatable content for User Manager GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/usermgr/system-management-visual-panels-panel-usermgr.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="User Manager GUI"
-set name=com.oracle.info.description value="the Visual Panels User Manager GUI"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/zconsole/Makefile	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/zconsole/Makefile	Tue Mar 19 14:32:45 2013 -0700
@@ -49,6 +49,9 @@
 COMPONENT_TEST_TARGETS =  	test
 COMPONENT_TEST_ENV =	  	$(COMPONENT_BUILD_ENV)
 
+# Do not apply the standard licence transforms for this component.
+LICENSE_TRANSFORMS =
+
 # common targets
 $(SOURCE_DIR)/.prep:
 	$(TOUCH) [email protected]
--- a/components/visual-panels/zconsole/system-management-visual-panels-panel-zconsole-message-files.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/zconsole/system-management-visual-panels-panel-zconsole-message-files.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg://$(PUBLISHER_LOCALIZABLE)/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Translatable content for Zone Console Panel"
-set name=com.oracle.info.description value="the Visual Panels translatable content for Zone Console Panel"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/visual-panels/zconsole/system-management-visual-panels-panel-zconsole.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/visual-panels/zconsole/system-management-visual-panels-panel-zconsole.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,6 @@
 
 set name=pkg.fmri value=pkg:/system/management/visual-panels/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Zone Console Panel"
-set name=com.oracle.info.description value="the Visual Panels Zone Console Panel"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Configuration and Preferences"
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=LSARC/2007/392
--- a/components/webalizer/webalizer.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/webalizer/webalizer.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -30,7 +30,7 @@
 set name=pkg.summary value="A flexible Web server log file analysis program"
 set name=pkg.description \
     value="The Webalizer is a Web server log analysis program. It is designed to scan Web server log files in various formats and produce usage statistics in HTML format for viewing through a browser. It produces professional looking graphs which make analyzing when and where your Web traffic is coming from easy."
-set name=com.oracle.info.description value="the webalizer utility"
+set name=com.oracle.info.description value="the Webalizer utility"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url \
--- a/components/wireshark/tshark.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/wireshark/tshark.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 set name=pkg.fmri \
     value=pkg:/diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Command-line network protocol analyzer"
-set name=com.oracle.info.description value="the wireshark command line network protocol analyzer"
+set name=com.oracle.info.description value="TShark, the Wireshark command line network protocol analyzer"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/wireshark/wireshark-common.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/wireshark/wireshark-common.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 set name=pkg.fmri \
     value=pkg:/diagnostic/wireshark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Libraries and Tools used by Wireshark and TShark Network protocol analyzers"
-set name=com.oracle.info.description value="the wireshark / tshark libraries and tools"
+set name=com.oracle.info.description value="the Wireshark and TShark common libraries and tools"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/wireshark/wireshark.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/wireshark/wireshark.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 set name=pkg.fmri \
     value=pkg:/diagnostic/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Graphical network protocol analyzer"
-set name=com.oracle.info.description value="the wireshark graphical network protocol analyzer"
+set name=com.oracle.info.description value="the Wireshark graphical network protocol analyzer"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/wxwidgets/wxwidgets.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/wxwidgets/wxwidgets.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -25,7 +25,7 @@
 
 set name=pkg.fmri value=pkg:/library/graphics/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="wxWidgets A cross-platform GUI toolkit"
-set name=com.oracle.info.description value="wxwidgets, a cross-platform GUI toolkit"
+set name=com.oracle.info.description value="wxWidgets, cross-platform GUI toolkit"
 set name=info.classification value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/zip/zip.p5m	Tue Mar 19 15:16:55 2013 -0600
+++ b/components/zip/zip.p5m	Tue Mar 19 14:32:45 2013 -0700
@@ -26,7 +26,7 @@
     value=pkg:/compress/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="The Info-Zip (zip) compression utility"
 set name=pkg.summary value="Info-Zip (zip)"
-set name=com.oracle.info.description value="the zip compression utility"
+set name=com.oracle.info.description value="the Info-Zip compression utility"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)