16431724 Adjust how license text and Oracle internal tracking numbers are propagated s11-update
authorRich Burridge <rich.burridge@oracle.com>
Sat, 06 Apr 2013 08:18:24 -0700
branchs11-update
changeset 2551 0391c5c3b137
parent 2550 02b339f70efd
child 2552 baac0839cd39
16431724 Adjust how license text and Oracle internal tracking numbers are propagated
components/a2ps/a2ps.license
components/a2ps/a2ps.p5m
components/aalib/aalib.license
components/aalib/aalib.p5m
components/acpidump/acpidump.license
components/acpidump/acpidump.p5m
components/ant/ant.license
components/ant/ant.p5m
components/apache2-modules/mod_dtrace/apache-dtrace.p5m
components/apache2-modules/mod_fcgid/apache-fcgid.p5m
components/apache2-modules/mod_jk/apache-jk.p5m
components/apache2-modules/mod_perl/apache-perl.p5m
components/apache2-modules/mod_proxy_html/apache-proxy_html.license
components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m
components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m
components/apache2-modules/mod_security2/apache-security.p5m
components/apache2-modules/mod_security2/security2.license
components/apache2-modules/mod_wsgi/mod_wsgi-26.p5m
components/apache2-modules/mod_wsgi/mod_wsgi-27.p5m
components/apache2-modules/mod_wsgi/mod_wsgi.license
components/apache2-modules/mod_wsgi/mod_wsgi.p5m
components/apache2/apache-22.p5m
components/apache2/apache-sed.p5m
components/apache2/documentation.p5m
components/apr-util/apr-util-13-apr-ldap.p5m
components/apr-util/apr-util-13-dbd-mysql.p5m
components/apr-util/apr-util-13-dbd-sqlite.p5m
components/apr-util/apr-util-13-doc.p5m
components/apr-util/apr-util-13.p5m
components/apr/apr-13-doc.p5m
components/apr/apr-13.p5m
components/areca/areca.copyright
components/areca/areca.p5m
components/autoconf/autoconf.license
components/autoconf/autoconf.p5m
components/autogen/autogen.license
components/autogen/autogen.p5m
components/automake/automake-1.10/automake.license
components/automake/automake-1.10/automake.p5m
components/automake/automake-1.11.2/automake-111.p5m
components/automake/automake-1.11.2/automake.license
components/automake/automake-1.11.2/automake.p5m
components/bash/bash.license
components/bash/bash.p5m
components/bcc/bcc.license
components/bcc/bcc.p5m
components/beanshell/beanshell.license
components/beanshell/beanshell.p5m
components/berkeleydb/Makefile
components/bind/bind.license
components/bind/bind.p5m
components/bind/bindc.p5m
components/binutils/binutils.license
components/binutils/binutils.p5m
components/bison/bison-runtime.p5m
components/bison/bison.license
components/bison/bison.p5m
components/bzip2/bzip2.license
components/bzip2/bzip2.p5m
components/cdrtools/cdrtools.p5m
components/clisp/clisp.copyright
components/clisp/clisp.p5m
components/cmake/cmake.license
components/cmake/cmake.p5m
components/common/gcmn.license
components/common/gcmn.p5m
components/conflict/conflict.copyright
components/conflict/conflict.p5m
components/convmv/convmv.copyright
components/convmv/convmv.p5m
components/coreutils/coreutils.license
components/coreutils/coreutils.p5m
components/cups/cups-libs.p5m
components/cups/cups-license
components/cups/cups.p5m
components/curl/curl.p5m
components/cvs/cvs.license
components/cvs/cvs.p5m
components/diffutils/diffutils.license
components/diffutils/diffutils.p5m
components/doxygen/doxygen.license
components/doxygen/doxygen.p5m
components/ejabberd/ejabberd.p5m
components/elinks/elinks.license
components/elinks/elinks.p5m
components/emacs/emacs.license
components/emacs/gnu-emacs-gtk.p5m
components/emacs/gnu-emacs-lisp.p5m
components/emacs/gnu-emacs-no-x11.p5m
components/emacs/gnu-emacs-x11.p5m
components/emacs/gnu-emacs.p5m
components/erlang/erlang-doc.p5m
components/erlang/erlang.p5m
components/fastcgi/fcgi-doc.p5m
components/fastcgi/fcgi.p5m
components/fetchmail/fetchmail.license
components/fetchmail/fetchmail.p5m
components/flex/flex.p5m
components/flex/flexruntime.p5m
components/foomatic/db-engine/foomatic-db-engine.license
components/foomatic/db-engine/foomatic-db-engine.p5m
components/foomatic/db/foomatic-db.license
components/foomatic/db/foomatic-db.p5m
components/foomatic/filters/foomatic-filters.license
components/foomatic/filters/foomatic-rip.p5m
components/foomatic/fppd/foomatic-ppds.license
components/foomatic/fppd/foomatic-ppds.p5m
components/fping/fping.p5m
components/gawk/gawk.license
components/gawk/gawk.p5m
components/gcc3/gcc-3-runtime.p5m
components/gcc3/gcc-3.p5m
components/gcc3/gcc.license
components/gcc45/gcc-45-runtime.p5m
components/gcc45/gcc-45.p5m
components/gcc45/gcc45.license
components/gd2/gd2.license
components/gd2/gd2.p5m
components/gdb/gdb.license
components/gdb/gdb.p5m
components/gdbm/gdbm.license
components/gdbm/gdbm.p5m
components/gettext/gettext.license
components/gettext/gettext.p5m
components/ggrep/gnu-grep.license
components/ggrep/gnu-grep.p5m
components/ghostscript/ghostscript.license
components/ghostscript/ghostscript.p5m
components/git/git.license
components/git/git.p5m
components/gnu-gs-fonts-other/gnu-gs-fonts-other.license
components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
components/gnu-gs-fonts-std/gnu-gs-fonts-std.license
components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
components/gnump/gmp.license
components/gnump/gmp.p5m
components/gnupg/gnupg.license
components/gnupg/gnupg.p5m
components/gnuplot/gnuplot.license
components/gnuplot/gnuplot.p5m
components/gnupth/gnupth.license
components/gnupth/gnupth.p5m
components/gocr/gocr.license
components/gocr/gocr.p5m
components/gperf/gperf.license
components/gperf/gperf.p5m
components/gpgme/gpgme.license
components/gpgme/gpgme.p5m
components/grails/grails.copyright
components/grails/grails.p5m
components/graphviz/graphviz-java.p5m
components/graphviz/graphviz-lua.p5m
components/graphviz/graphviz-ocaml.p5m
components/graphviz/graphviz-perl-512.p5m
components/graphviz/graphviz-php.p5m
components/graphviz/graphviz-python-26.p5m
components/graphviz/graphviz-python-27.p5m
components/graphviz/graphviz-ruby.p5m
components/graphviz/graphviz-sharp.p5m
components/graphviz/graphviz-tcl.p5m
components/graphviz/graphviz.p5m
components/gtar/gtar.license
components/gtar/gtar.p5m
components/guile/guile.license
components/guile/guile.p5m
components/gutenprint/gutenprint.license
components/gutenprint/gutenprint.p5m
components/gzip/gzip.license
components/gzip/gzip.p5m
components/hal-cups-utils/hal-cups-utils.copyright
components/hal-cups-utils/hal-cups-utils.p5m
components/hexedit/hexedit.license
components/hexedit/hexedit.p5m
components/hplip/hplip.license
components/hplip/hplip.p5m
components/httping/httping.license
components/httping/httping.p5m
components/hwdata/Makefile
components/hwdata/hwdata.p5m
components/hwdata/ids.license.tmpl
components/iftop/iftop.license
components/iftop/iftop.p5m
components/ilmbase/ilmbase.license
components/ilmbase/ilmbase.p5m
components/imagemagick/imagemagick.p5m
components/iperf/iperf.license
components/iperf/iperf.p5m
components/ircii/ircii.license
components/ircii/ircii.p5m
components/isc-dhcp/dhcp.p5m
components/isc-dhcp/isc-dhcp.license
components/junit/junit.license
components/junit/junit.p5m
components/ksh93/developer-astdev93.p5m
components/ksh93/ksh93.p5m
components/ksh93/source-demo-ksh93.p5m
components/lcms/lcms-py26.p5m
components/lcms/lcms-py27.p5m
components/lcms/lcms.license
components/lcms/lcms.p5m
components/less/less.license
components/less/less.p5m
components/lftp/lftp.license
components/lftp/lftp.p5m
components/libassuan/libassuan.license
components/libassuan/libassuan.p5m
components/libconfuse/libconfuse.p5m
components/libedit/libedit.license
components/libedit/libedit.p5m
components/libee/libee.license
components/libee/libee.p5m
components/libestr/libestr.license
components/libestr/libestr.p5m
components/libevent/libevent.license
components/libevent/libevent.p5m
components/libexpat/expat.p5m
components/libidn/libidn.license
components/libidn/libidn.p5m
components/libksba/libksba.license
components/libksba/libksba.p5m
components/libmcrypt/libmcrypt.license
components/libmcrypt/libmcrypt.p5m
components/libmemcached/libmemcached.license
components/libmemcached/libmemcached.p5m
components/libmng/libmng.license
components/libmng/libmng.p5m
components/libneon/libneon.license
components/libneon/libneon.p5m
components/libnet/libnet.license
components/libnet/libnet.p5m
components/libpcap/libpcap.p5m
components/librsync/librsync.copyright
components/librsync/librsync.p5m
components/libsigsegv/libsigsegv.license
components/libsigsegv/libsigsegv.p5m
components/libsndfile/libsndfile.license
components/libsndfile/libsndfile.p5m
components/libtecla/libtecla.p5m
components/libtool/libltdl.p5m
components/libtool/libtool.license
components/libtool/libtool.p5m
components/libtorrent/libtorrent.license
components/libtorrent/libtorrent.p5m
components/libusb/ugen/Makefile
components/libusb/wrapper/libusb.license
components/libusb/wrapper/libusb.p5m
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2-27.p5m
components/libxml2/libxml2.license
components/libxml2/libxml2.p5m
components/libxslt/libxsl-26.p5m
components/libxslt/libxsl-27.p5m
components/libxslt/libxslt.p5m
components/libxslt/xsl.license
components/lighttpd/lighttpd.license
components/lighttpd/lighttpd.p5m
components/links/links.license
components/links/links.p5m
components/logilab-astng/logilab-astng-26.p5m
components/logilab-astng/logilab-astng-27.p5m
components/logilab-astng/logilab-astng.license
components/logilab-astng/logilab-astng.p5m
components/logilab-common/logilab-common-26.p5m
components/logilab-common/logilab-common-27.p5m
components/logilab-common/logilab-common.license
components/logilab-common/logilab-common.p5m
components/lua/lua.license
components/lua/lua.p5m
components/m4/m4.license
components/m4/m4.p5m
components/make/make.license
components/make/make.p5m
components/mc/mc.license
components/mc/mc.p5m
components/meld/meld.license
components/meld/meld.p5m
components/memcached-java/memcached-java.license
components/memcached-java/memcached-java.p5m
components/memcached/memcached.license
components/memcached/memcached.p5m
components/mercurial/mercurial-26.p5m
components/mercurial/mercurial-27.p5m
components/mercurial/mercurial.copyright
components/mercurial/mercurial.p5m
components/mpc/mpc.p5m
components/mpfr/mpfr.license
components/mpfr/mpfr.p5m
components/mutt/mutt.license
components/mutt/mutt.p5m
components/mysql-5-1/Makefile
components/mysql-5-1/mysql-51.license
components/ncftp/ncftp.license
components/ncftp/ncftp.p5m
components/net-snmp/net-snmp-26.p5m
components/net-snmp/net-snmp-27.p5m
components/net-snmp/net-snmp-addons.p5m
components/net-snmp/net-snmp-base.p5m
components/net-snmp/net-snmp-documentation.p5m
components/nethack/nethack.p5m
components/nmap/nmap.license
components/nmap/nmap.p5m
components/ntp/ntp.p5m
components/open-fabrics/Makefile
components/open-fabrics/open-fabrics.p5m
components/openexr/openexr.license
components/openexr/openexr.p5m
components/openldap/openldap.license
components/openldap/openldap.p5m
components/openscap/openscap-perl-512.p5m
components/openscap/openscap-python-26.p5m
components/openscap/openscap.license
components/openscap/openscap.p5m
components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m
components/openssl/openssl-1.0.0/openssl-1.0.0.p5m
components/openusb/openusb.license
components/openusb/openusb.p5m
components/p7zip/Makefile
components/p7zip/gpl_disclaimer
components/p7zip/p7zip.p5m
components/pam_pkcs11/pam_pkcs11.license
components/pam_pkcs11/pam_pkcs11.p5m
components/patch/patch.license
components/patch/patch.p5m
components/pconsole/pconsole.copyright
components/pconsole/pconsole.p5m
components/pcre/pcre.license
components/pcre/pcre.p5m
components/perl512/perl-512.p5m
components/perl_modules/DBI/DBI.license
components/perl_modules/DBI/DBI.p5m
components/perl_modules/DBI/DBI_512.p5m
components/perl_modules/DBI/DBI_584.p5m
components/perl_modules/net-ssleay/net-ssleay-512.p5m
components/perl_modules/net-ssleay/net-ssleay-584.p5m
components/perl_modules/net-ssleay/net-ssleay.p5m
components/perl_modules/pmtools/pmtools.license
components/perl_modules/pmtools/pmtools.p5m
components/perl_modules/pmtools/pmtools_512.p5m
components/perl_modules/pmtools/pmtools_584.p5m
components/perl_modules/xml-parser/xml-parser-512.p5m
components/perl_modules/xml-parser/xml-parser-584.p5m
components/perl_modules/xml-parser/xml-parser.p5m
components/perl_modules/xml-simple/xml-simple-512.p5m
components/perl_modules/xml-simple/xml-simple-584.p5m
components/perl_modules/xml-simple/xml-simple.p5m
components/php-5_2/Makefile
components/php-5_2/apache-php52.license
components/php-5_2/apache-php52.p5m
components/php-5_2/php-52.license
components/php-5_2/php-52.p5m
components/php-5_2/php-apc.license
components/php-5_2/php-apc.p5m
components/php-5_2/php-doc.license
components/php-5_2/php-doc.p5m
components/php-5_2/php-idn.license
components/php-5_2/php-idn.p5m
components/php-5_2/php-memcache.license
components/php-5_2/php-memcache.p5m
components/php-5_2/php-mysql.license
components/php-5_2/php-mysql.p5m
components/php-5_2/php-pear.license
components/php-5_2/php-pear.p5m
components/php-5_2/php-suhosin.license
components/php-5_2/php-suhosin.p5m
components/php-5_2/php-tcpwrap.license
components/php-5_2/php-tcpwrap.p5m
components/php-5_2/php-xdebug.license
components/php-5_2/php-xdebug.p5m
components/php-5_3/apache-php53.license
components/php-5_3/apache-php53.p5m
components/php-5_3/php-53.license
components/php-5_3/php-53.p5m
components/php-5_3/php-apc.license
components/php-5_3/php-apc.p5m
components/php-5_3/php-doc.license
components/php-5_3/php-doc.p5m
components/php-5_3/php-idn.license
components/php-5_3/php-idn.p5m
components/php-5_3/php-memcache.license
components/php-5_3/php-memcache.p5m
components/php-5_3/php-mysql.license
components/php-5_3/php-mysql.p5m
components/php-5_3/php-pear.license
components/php-5_3/php-pear.p5m
components/php-5_3/php-suhosin.license
components/php-5_3/php-suhosin.p5m
components/php-5_3/php-tcpwrap.license
components/php-5_3/php-tcpwrap.p5m
components/php-5_3/php-xdebug.license
components/php-5_3/php-xdebug.p5m
components/php-common/php-common.p5m
components/php-common/php.license
components/pinentry/pinentry.license
components/pinentry/pinentry.p5m
components/privoxy/privoxy.copyright
components/privoxy/privoxy.p5m
components/proftpd/Makefile
components/proftpd/proftpd.license
components/proftpd/proftpd.p5m
components/psutils/psutils.license
components/psutils/psutils.p5m
components/pv/pv.p5m
components/pwgen/pwgen.license
components/pwgen/pwgen.p5m
components/pylint/pylint-26.p5m
components/pylint/pylint-27.p5m
components/pylint/pylint.license
components/pylint/pylint.p5m
components/python/cherrypy/cherrypy-26.p5m
components/python/cherrypy/cherrypy-27.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/jsonrpclib/jsonrpclib-26.p5m
components/python/jsonrpclib/jsonrpclib-27.p5m
components/python/jsonrpclib/jsonrpclib.license
components/python/jsonrpclib/jsonrpclib.p5m
components/python/ldtp/ldtp-26.p5m
components/python/ldtp/ldtp-27.p5m
components/python/ldtp/ldtp.copyright
components/python/ldtp/ldtp.p5m
components/python/m2crypto/m2crypto-26.p5m
components/python/m2crypto/m2crypto-27.p5m
components/python/m2crypto/m2crypto.p5m
components/python/mako/mako-26.p5m
components/python/mako/mako-27.p5m
components/python/mako/mako.p5m
components/python/nose/nose-26.p5m
components/python/nose/nose-27.p5m
components/python/nose/nose.license
components/python/nose/nose.p5m
components/python/ply/ply-26.p5m
components/python/ply/ply-27.p5m
components/python/ply/ply.copyright
components/python/ply/ply.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.copyright
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.copyright
components/python/pyopenssl/pyopenssl.p5m
components/python/python26/python-26-tests.p5m
components/python/python26/python-26.p5m
components/python/python26/python26.license
components/python/python26/tkinter-26.p5m
components/python/python27/python-27-tests.p5m
components/python/python27/python-27.p5m
components/python/python27/python27.license
components/python/python27/tkinter-27.p5m
components/python/setuptools/setuptools-26.p5m
components/python/setuptools/setuptools-27.p5m
components/python/setuptools/setuptools.p5m
components/quagga/quagga.license
components/quagga/quagga.p5m
components/quilt/quilt.license
components/quilt/quilt.p5m
components/rdiff-backup/rdiff-backup-26.p5m
components/rdiff-backup/rdiff-backup-27.p5m
components/rdiff-backup/rdiff-backup.copyright
components/rdiff-backup/rdiff-backup.p5m
components/readline/readline.license
components/readline/readline.p5m
components/rpm2cpio/rpm2cpio.p5m
components/rsync/rsync.license
components/rsync/rsync.p5m
components/rsyslog/rsyslog.license
components/rsyslog/rsyslog.p5m
components/rtorrent/rtorrent.license
components/rtorrent/rtorrent.p5m
components/ruby/ruby-18.p5m
components/samba/samba/samba-license
components/samba/samba/samba.p5m
components/samba/samba30/Makefile
components/samba/samba30/libsmbclient.p5m
components/samba/samba30/mozldap.license
components/sane-backends/sane-backends.license
components/sane-backends/sane-backends.p5m
components/sane-frontends/sane-frontend.license
components/sane-frontends/sane-frontends.p5m
components/screen/screen.license
components/screen/screen.p5m
components/sed/sed.license
components/sed/sed.p5m
components/slang/slang.license
components/slang/slang.p5m
components/slib/slib.p5m
components/slrn/slrn.license
components/slrn/slrn.p5m
components/snort/snort.license
components/snort/snort.p5m
components/sox/sox.license
components/sox/sox.p5m
components/spawn-fcgi/spawn-fcgi.p5m
components/squid/squid.license
components/squid/squid.p5m
components/stdcxx/stdcxx.license
components/stdcxx/stdcxx.p5m
components/subversion/subversion-java.p5m
components/subversion/subversion-perl.p5m
components/subversion/subversion-python.p5m
components/subversion/subversion.license
components/subversion/subversion.p5m
components/sudo/sudo.license
components/sudo/sudo.p5m
components/swig/swig.license
components/swig/swig.p5m
components/tcl/expect/expect.license
components/tcl/expect/expect.p5m
components/tcl/tcl/tcl.license
components/tcl/tcl/tcl.p5m
components/tcl/tk/tk.license
components/tcl/tk/tk.p5m
components/tcltls/tcltls.p5m
components/tcpdump/tcpdump.license
components/tcpdump/tcpdump.p5m
components/tcsh/tcsh.license
components/tcsh/tcsh.p5m
components/texinfo/texinfo.copyright
components/texinfo/texinfo.p5m
components/tidy/tidy.license
components/tidy/tidy.p5m
components/timezone/system-data-timezone-message-files.p5m
components/timezone/system-data-timezone.p5m
components/tomcat/tomcat-examples.p5m
components/tomcat/tomcat.p5m
components/top/top.p5m
components/trousers/trousers.p5m
components/unixodbc/unixodbc.license
components/unixodbc/unixodbc.p5m
components/unrar/unrar.license
components/unrar/unrar.p5m
components/unzip/unzip.p5m
components/vim/gvim.p5m
components/vim/vim-core.p5m
components/vim/vim.p5m
components/visual-panels/apache/Makefile
components/visual-panels/core/Makefile
components/visual-panels/coreadm/Makefile
components/visual-panels/examples/Makefile
components/visual-panels/firewall/Makefile
components/visual-panels/smf/Makefile
components/visual-panels/sysmon/Makefile
components/visual-panels/time/Makefile
components/visual-panels/usermgr/Makefile
components/visual-panels/zconsole/Makefile
components/wget/wget.license
components/wget/wget.p5m
components/which/which.license
components/which/which.p5m
components/wireshark/tshark.p5m
components/wireshark/wireshark-common.p5m
components/wireshark/wireshark.license
components/wireshark/wireshark.p5m
components/wxwidgets/wxwidgets.license
components/wxwidgets/wxwidgets.p5m
components/xorriso/xorriso.p5m
components/xz/xz.license
components/xz/xz.p5m
components/zip/zip.p5m
components/zlib/zlib.p5m
components/zsh/zsh.p5m
make-rules/ips.mk
tools/gen-components
transforms/license-changes
--- a/components/a2ps/a2ps.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/a2ps/a2ps.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---------------------------------------------------------------------
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/a2ps/a2ps.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/a2ps/a2ps.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,7 @@
     value="GNU a2ps converts files into PostScript for printing or viewing."
 set name=pkg.summary \
     value="GNU a2ps - 'Anything to PostScript' converter and pretty printer"
+set name=com.oracle.info.description value="GNU a2ps"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/aalib/aalib.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/aalib/aalib.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=====================================================================
-
 Copyright (C) 1997-2009 Jan Hubicka ([email protected])
 Copyright (C) 1997-2009 Thomas A. K. Kjaer ([email protected])
 Copyright (C) 1997-2009 Tim Newsome ([email protected])
--- a/components/aalib/aalib.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/aalib/aalib.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.human-version value=$(HUMAN_VERSION)
 set name=pkg.summary value="AAlib - Ascii art graphics library"
+set name=com.oracle.info.description value="the AAlib library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/acpidump/acpidump.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/acpidump/acpidump.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
-
 Copyright (c) 1999 - 2006, Intel Corp.
 
 
--- a/components/acpidump/acpidump.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/acpidump/acpidump.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommited>
@@ -29,6 +29,7 @@
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="acpidump - utilities used to display ACPI tables"
+set name=com.oracle.info.description value="the acpidump utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ant/ant.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ant/ant.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-
--------------
-- ant 1.8.4 -
--------------
-
-Oracle Internal Tracking Number : 6147
-
-
 File NOTICE:
 ---------------------------------------------------
 
--- a/components/ant/ant.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ant/ant.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -28,6 +28,8 @@
     value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="Apache Ant is a Java-based build tool"
 set name=pkg.summary value="Apache Ant"
+set name=com.oracle.info.description value="Apache Ant"
+set name=com.oracle.info.tpno value=6147
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Distribution Tools"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="DTrace plugin for Apache Web Server V2.2"
+set name=com.oracle.info.description value="the DTrace plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
     value="FastCGI plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="FastCGI plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the FastCGI plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_jk/apache-jk.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
     value="Tomcat Connector plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="Tomcat Connector plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Tomcat Connector plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_perl/apache-perl.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_perl/apache-perl.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -27,6 +27,7 @@
     value="Perl plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="Perl plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Perl plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
     value="Proxy HTML plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="Proxy HTML plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Proxy HTML plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected],$(BUILD_VERSION)
@@ -26,6 +26,7 @@
     value="xml2nec plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="xml2enc plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the xml2nec plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value="http://apache.webthing.com/mod_xml2enc/"
--- a/components/apache2-modules/mod_security2/apache-security.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_security2/apache-security.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
     value="Mod Security plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="Mod Security plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the Mod Security plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2-modules/mod_security2/security2.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_security2/security2.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/apache2-modules/mod_wsgi/mod_wsgi-26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-26.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,15 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Python 2.6 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.description value="the Python 2.6 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.tpno value=7687
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2-modules/mod_wsgi/mod_wsgi-27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi-27.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,13 +20,15 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Python 2.7 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.description value="the Python 2.7 mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.tpno value=7687
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2-modules/mod_wsgi/mod_wsgi.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- mod_wsgi 3.3 -
-----------------
-
-Oracle Internal Tracking Number 7687
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
--- a/components/apache2-modules/mod_wsgi/mod_wsgi.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2-modules/mod_wsgi/mod_wsgi.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,12 +20,14 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.description value="the mod_wsgi plugin for Apache Web Server v2.2"
+set name=com.oracle.info.tpno value=7687
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/apache2/apache-22.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2/apache-22.p5m	Sat Apr 06 08:18:24 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.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -27,6 +27,7 @@
     value="Apache Web Server V2.2"
 set name=pkg.description \
     value="The Apache HTTP Server Version 2.2"
+set name=com.oracle.info.description value="the Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apache2/apache-sed.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2/apache-sed.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/web/server/apache-22/module/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
     value="mod_sed plugin for Apache Web Server V2.2"
 set name=pkg.description \
     value="mod_sed plugin for Apache Web Server Version 2.2"
+set name=com.oracle.info.description value="the mod_sed plugin for Apache Web Server V2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value="$(COMPONENT_PROJECT_URL)/docs/2.3/mod/mod_sed.html"
--- a/components/apache2/documentation.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apache2/documentation.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -28,6 +28,7 @@
     value="Apache Web Server V2.2 Documentation"
 set name=pkg.description \
     value="The Apache HTTP Server Version 2.2 (documentation)"
+set name=com.oracle.info.description value="the Apache Web Server V2.2 Documentation"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-apr-ldap.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-apr-ldap.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/library/apr-util-13/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 LDAP's stub"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-dbd-mysql.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-dbd-mysql.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/library/apr-util-13/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
-    value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0"
+    value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-dbd-sqlite.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-dbd-sqlite.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/library/apr-util-13/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
-    value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5"
+    value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13-doc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13-doc.p5m	Sat Apr 06 08:18:24 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.
 #
 <transform file path=usr/apr-util/1.3/manual/(.+)$ -> set action.hash %<\1> >
 <transform file path=usr/apr-util/1.3/manual/search/(.+)$ -> set action.hash %<\1> >
@@ -27,6 +27,7 @@
     value=pkg:/library/apr-util-13/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Apache Portable Runtime Utility (APR-util) 1.3 documentation"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 documentation"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr-util/apr-util-13.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr-util/apr-util-13.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries"
+set name=com.oracle.info.description value="the Apache Portable Runtime Utility (APR-util) 1.3 development header files and libraries"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr/apr-13-doc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr/apr-13-doc.p5m	Sat Apr 06 08:18:24 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.
 #
 <transform file path=usr/apr/1.3/manual/(.+)$ -> set action.hash %<\1> >
 <transform file path=usr/apr/1.3/manual/search/(.+)$ -> set action.hash %<\1> >
@@ -27,6 +27,7 @@
     value=pkg:/library/apr-13/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Apache Portable Runtime (APR) 1.3 documentation"
+set name=com.oracle.info.description value="the Apache Portable Runtime (APR) 1.3 documentation"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/apr/apr-13.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/apr/apr-13.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,6 +26,7 @@
     value="Apache Portable Runtime (APR) 1.3 Shared Libraries"
 set name=pkg.description \
     value="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.3"
+set name=com.oracle.info.description value="the Apache Portable Runtime (APR) 1.3 Shared Libraries"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/areca/areca.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/areca/areca.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- areca 7.1 -
--------------
-
-Oracle Internal Tracking Number 6138
-
 Copyright 2005-2009, Olivier PETRUCCI. 
 This program is distributed under the GNU General Public License v2.
 
--- a/components/areca/areca.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/areca/areca.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -34,6 +34,8 @@
 set name=pkg.description \
     value="Areca is file backup software that supports incremental, image and delta backup on local drives or FTP servers."
 set name=pkg.summary value="Areca backup utilities."
+set name=com.oracle.info.description value="the Areca file backup software"
+set name=com.oracle.info.tpno value=6138
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/autoconf/autoconf.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autoconf/autoconf.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---------------------------------------------------------------------
-
-Copyright (C) 1985-2008 Free Software Foundation, Inc. 
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/autoconf/autoconf.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autoconf/autoconf.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU autoconf utility"
+set name=com.oracle.info.description value="GNU autoconf"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/autogen/autogen.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autogen/autogen.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- autogen 5.9 -
----------------
-
-Oracle Internal Tracking Number 6148
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/autogen/autogen.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/autogen/autogen.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="AutoGen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text."
 set name=pkg.summary value="GNU autogen utility"
+set name=com.oracle.info.description value="GNU autogen"
+set name=com.oracle.info.tpno value=6148
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/automake/automake-1.10/automake.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.10/automake.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,19 +1,3 @@
------------------
-- automake 1.10 -
------------------
-
-Oracle Internal Tracking Number 6149
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/automake/automake-1.10/automake.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.10/automake.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
     value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A Makefile generator"
+set name=com.oracle.info.description value="GNU automake"
+set name=com.oracle.info.tpno value=6149
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/automake/automake-1.11.2/automake-111.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.11.2/automake-111.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
 set name=pkg.fmri \
     value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A Makefile generator"
+set name=com.oracle.info.description value="GNU automake"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/automake/automake-1.11.2/automake.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.11.2/automake.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/automake/automake-1.11.2/automake.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/automake/automake-1.11.2/automake.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A Makefile generator"
+set name=com.oracle.info.description value="GNU automake"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bash/bash.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bash/bash.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-------------------------------------------------------------------
-
 		     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/bash/bash.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bash/bash.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/shell/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Bourne-Again shell (bash)"
+set name=com.oracle.info.description value="GNU Bourne-Again shell (bash)"
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/bcc/bcc.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bcc/bcc.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/bcc/bcc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bcc/bcc.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/developer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="bcc - Development tools for 8086 code"
+set name=pkg.summary value="Bruce's C Compiler"
+set name=pkg.description value="bcc is a suite of development tools for 8086 code, including a compiler, an assembler, a linker, and an archive utility."
+set name=com.oracle.info.description value="Bruce's C Compiler"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/beanshell/beanshell.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/beanshell/beanshell.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
  *****************************************************************************
  *                                                                           *
  *  This file is part of the BeanShell Java Scripting distribution.          *
--- a/components/beanshell/beanshell.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/beanshell/beanshell.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="beanshell - a small and embeddable Java source interpreter"
 set name=pkg.description value="BeanShell is a small, free, embeddable Java source interpreter with object scripting language features, written in Java. BeanShell dynamically executes standard Java syntax and extends it with common scripting conveniences such as loose types, commands, and method closures like those in Perl and JavaScript."
+set name=com.oracle.info.description value="the beanshell Java source interpreter"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Java"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/berkeleydb/Makefile	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/berkeleydb/Makefile	Sat Apr 06 08:18:24 2013 -0700
@@ -83,6 +83,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/bind/bind.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bind/bind.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-This package may include technology which may be subject to one or more of
-the following additional notices:
-
--------------------
-- BIND 9.6-ESV-R8 -
--------------------
-
-Oracle Internal Tracking Number: 10598
-
 Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
--- a/components/bind/bind.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bind/bind.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr/share/doc/bind/html/(.+)$ -> \
@@ -30,7 +30,9 @@
 set name=pkg.description \
     value="BIND is open source software that implements the Domain Name System (DNS) protocols for the Internet.  This package contains the DNS server 'named' and tools used to setup and validate configuration."
 set name=pkg.summary \
-    value="BIND DNS Name server and configuration tools."
+    value="BIND DNS name server and configuration tools."
+set name=com.oracle.info.description value="the BIND DNS name server and configuration tools"
+set name=com.oracle.info.tpno value=10598
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Services"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/bind/bindc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bind/bindc.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
     value=pkg:/network/dns/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="BIND DNS tools"
+set name=com.oracle.info.description value="the BIND DNS tools"
+set name=com.oracle.info.tpno value=10598
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/Internet"
 set name=pkg.description value="DNS tools and related libraries."
--- a/components/binutils/binutils.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/binutils/binutils.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------------
-- GNU Binutils v2.23.1  -
--------------------------
-Oracle Internal Tracking Number 7483
---------------------------------------------------------------------
-
  GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/binutils/binutils.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/binutils/binutils.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -27,6 +27,8 @@
 set name=pkg.fmri \
     value=pkg:/developer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="binutils - GNU binutils"
+set name=com.oracle.info.description value="GNU binutils"
+set name=com.oracle.info.tpno value=7483
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bison/bison-runtime.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bison/bison-runtime.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
 set name=pkg.description \
     value="Runtime library for a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar."
 set name=pkg.summary value="bison - A YACC Replacement (Runtime Libraries)"
+set name=com.oracle.info.description value="the bison runtime libraries"
+set name=com.oracle.info.tpno value=6254
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bison/bison.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bison/bison.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- bison 2.3 -
--------------
-
-Oracle Internal Tracking Number 6254
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/bison/bison.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bison/bison.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
 set name=pkg.description \
     value="a general-purpose parser generator that converts an annotated context-free grammar into an LALR(1) or GLR parser for that grammar"
 set name=pkg.summary value="bison - A YACC Replacement"
+set name=com.oracle.info.description value="the bison parser generator"
+set name=com.oracle.info.tpno value=6254
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/bzip2/bzip2.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bzip2/bzip2.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-----------------
-- bzip2 1.0.6  -
-----------------
-
-Oracle Internal Tracking Number 5547
-
---------------------------------------------------------------------------
-
 This program, "bzip2", the associated library "libbzip2", and all
 documentation, are copyright (C) 1996-2010 Julian R Seward.  All
 rights reserved.
--- a/components/bzip2/bzip2.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/bzip2/bzip2.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -30,6 +30,8 @@
     value="bzip2 is a freely available, patent free, high-quality data compressor."
 set name=pkg.summary \
     value="high-quality block-sorting file compressor - utilities"
+set name=com.oracle.info.description value="the bzip2 data compression utility"
+set name=com.oracle.info.tpno value=5547
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cdrtools/cdrtools.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cdrtools/cdrtools.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri value=pkg:/media/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="CD/DVD/BluRay command line recording software"
+set name=com.oracle.info.description value="the cdrtools CD/DVD/BluRay recording software"
 set name=info.classification value="org.opensolaris.category.2008:System/Media"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
--- a/components/clisp/clisp.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/clisp/clisp.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- clisp 2.49 -
---------------
-
-Oracle Internal Tracking Number 8347
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
--- a/components/clisp/clisp.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/clisp/clisp.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
     value=pkg:/runtime/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="ANSI Common Lisp compiler, interpreter and debugger"
 set name=pkg.summary value="GNU Common Lisp"
+set name=com.oracle.info.description value="GNU Common Lisp"
+set name=com.oracle.info.tpno value=8347
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cmake/cmake.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cmake/cmake.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
------------------
--  CMake 2.8.6  -
------------------
-Oracle Internal Tracking Number 6581
------------------------------------------------------------------------------- 
-
-Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-
-This package may include technology which may be subject to one or more of the
-following additional notices:
-
 ========================================================================
 CMAKE BSD LICENSE:
 ========================================================================
--- a/components/cmake/cmake.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cmake/cmake.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -33,6 +33,8 @@
 set name=pkg.summary value="A cross-platform, open-source make system"
 set name=pkg.description \
     value="CMake is a family of tools designed to build, test and package software.  It is used to control the software compilation process using simple platform and compiler-independent configuration files.  CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. "
+set name=com.oracle.info.description value="the cmake cross-platform make system"
+set name=com.oracle.info.tpno value=6581
 set name=info.classification \
 	value="org.opensolaris.category.2008:Development/Distribution Tools"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/common/gcmn.license	Fri Apr 05 07:47:58 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,350 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          59 Temple Place - Suite 330, Boston, MA
-                          02111-1307, USA.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	Appendix: How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
--- a/components/common/gcmn.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/common/gcmn.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,18 +18,17 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/system/prerequisite/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="gcmn - Common GNU package"
+set name=pkg.summary value="GNU prerequisites"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/GNU"
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/487
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license gcmn.license license=GPLv2
 
 dir path=usr
 dir path=usr/sfw
--- a/components/conflict/conflict.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/conflict/conflict.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------
-- conflict 20100627 -
----------------------
-
-Oracle Internal Tracking Number 5761
-
 Copyright 1995-2004,2010 by Thomas E. Dickey
 
 Permission to use, copy, modify, and distribute this software and its
--- a/components/conflict/conflict.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/conflict/conflict.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,8 @@
 set name=pkg.fmri \
     value=pkg:/shell/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Displays conflicting filenames in $PATH (6.0)"
+set name=com.oracle.info.description value="the conflict utility"
+set name=com.oracle.info.tpno value=5761
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/convmv/convmv.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/convmv/convmv.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
----------------
-- convmv 1.15 -
----------------
-
-Oracle Internal Tracking Number 6307
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-----------------------------------------------------------------------
 Copyright © 2003-2008 Bjoern JACKE <[email protected]> 
 
 		    GNU GENERAL PUBLIC LICENSE
--- a/components/convmv/convmv.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/convmv/convmv.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="Convmv helps convert a single filename, a directory tree and the contained files or a whole filesystem into a different encoding."
 set name=pkg.summary value="Filename Encoding Conversion Tool"
+set name=com.oracle.info.description value="the convmv utility"
+set name=com.oracle.info.tpno value=6307
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/coreutils/coreutils.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/coreutils/coreutils.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---
-   
-Copyright (C) 1984-1986, 1988-2009 Free Software Foundation, Inc. And others
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/coreutils/coreutils.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/coreutils/coreutils.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="GNU Core Utilities are the basic file, shell and text manipulation utilities"
 set name=pkg.summary value="GNU Core Utilities"
+set name=com.oracle.info.description value="GNU Core Utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cups/cups-libs.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cups/cups-libs.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/library/print/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="CUPS (Runtime Libraries)"
+set name=pkg.summary value="Common Unix Print System (CUPS) runtime libraries" 
+set name=com.oracle.info.description value="the Common Unix Print System (CUPS) runtime libraries" 
 set name=info.classification value="org.opensolaris.category.2008:System/Printing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cups/cups-license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cups/cups-license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
--------------------------------------------------------------------------------
                           CUPS License Agreement
 
 		      Copyright 2007-2009 by Apple Inc.
--- a/components/cups/cups.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cups/cups.p5m	Sat Apr 06 08:18:24 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.
 #
 
 # This is the template for package manifest (.p5m) file
@@ -35,7 +35,8 @@
 <transform file path=usr/lib/cups/.+ ->default mode 0555>
 
 set name=pkg.fmri value=pkg:/print/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Common Unix Print System"
+set name=pkg.summary value="Common Unix Print System (CUPS)"
+set name=com.oracle.info.description value="the Common Unix Print System (CUPS)"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/curl/curl.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/curl/curl.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/share/doc/curl/html/(.+)$ -> \
@@ -29,6 +29,7 @@
 set name=pkg.fmri value=pkg:/web/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The CURL Network Utility and Library"
 set name=pkg.description value="A command-line tool and library for transforming data with URL syntax"
+set name=com.oracle.info.description value="the CURL Network Utility and Library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/cvs/cvs.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cvs/cvs.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-================================================================================
 		    GNU GENERAL PUBLIC LICENSE
 		     Version 1, February 1989
 
--- a/components/cvs/cvs.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/cvs/cvs.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 set name=pkg.fmri \
     value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The CVS version control system"
+set name=com.oracle.info.description value="the CVS version control system"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/diffutils/diffutils.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/diffutils/diffutils.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/diffutils/diffutils.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/diffutils/diffutils.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,7 @@
     value=pkg:/text/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="Finds differences between and among files"
 set name=pkg.summary value="GNU diffutils"
+set name=com.oracle.info.description value="GNU diffutils"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/doxygen/doxygen.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/doxygen/doxygen.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/doxygen/doxygen.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/doxygen/doxygen.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="Doxygen is a documentation system for C++, C, Java, Objective-C, Python, IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some extent D."
 set name=pkg.summary value="Source Code Documentation Tool"
+set name=com.oracle.info.description value="the Doxygen documentation system"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Distribution Tools"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ejabberd/ejabberd.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ejabberd/ejabberd.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/web/server/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="ejabberd - Jabber/XMPP instant messaging server"
+set name=com.oracle.info.description value="the ejabberd Jabber/XMPP instant messaging server"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Communications"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/elinks/elinks.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/elinks/elinks.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------------------
-
 Copyright (c) 1991-2001 Unicode, Inc.  All Rights reserved.
 Copyright (C) 1999 - 2002  Mikulas Patocka
 Copyright (C) 2001 - 2004  Petr Baudis
--- a/components/elinks/elinks.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/elinks/elinks.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr/share/doc/elinks/(.+$) -> set action.hash doc/%<\1> >
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="ELinks is a feature-rich program for browsing the web in text mode.  It is like enhanced Lynx and Links."
 set name=pkg.summary value="advanced text-mode WWW browser"
+set name=com.oracle.info.description value="the elinks text based web browsing utility"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/emacs.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/emacs.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-====================================================================
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/emacs/gnu-emacs-gtk.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-gtk.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs with X11 support (GTK toolkit)"
+set name=com.oracle.info.description value="GNU emacs with X11 support (GTK toolkit)"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs-lisp.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-lisp.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # 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.
 #
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs LISP (.el) files"
 set name=pkg.description value="GNU emacs LISP (.el) files not accessed in normal use but necessary for emacs development"
+set name=com.oracle.info.description value="GNU emacs LISP (.el) files"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs-no-x11.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-no-x11.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs without X Window System support"
+set name=com.oracle.info.description value="GNU emacs without X Window System support"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs-x11.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs-x11.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/editor/gnu-emacs/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs with X11 support (Xaw toolkit)"
+set name=com.oracle.info.description value="GNU emacs with X11 support (Xaw toolkit)"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/emacs/gnu-emacs.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/emacs/gnu-emacs.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -25,6 +25,7 @@
 set name=pkg.fmri value=pkg:/editor/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU emacs core"
 set name=pkg.description value="GNU emacs core, runtime support for the emacs binary packages"
+set name=com.oracle.info.description value="GNU emacs core"
 set name=info.classification value="org.opensolaris.category.2008:Development/Editors"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/erlang/erlang-doc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/erlang/erlang-doc.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/runtime/erlang/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,6 +27,7 @@
     value="Erlang/OTP Documentation"
 set name=pkg.description \
     value="Erlang HTML Documents"
+set name=com.oracle.info.description value="the Erlang/OTP Documentation"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/erlang/erlang.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/erlang/erlang.p5m	Sat Apr 06 08:18:24 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.
 #
 set name=pkg.fmri \
     value=pkg:/runtime/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -27,6 +27,7 @@
     value="Erlang/OTP "
 set name=pkg.description \
     value="Erlang programming language and OTP librarie"
+set name=com.oracle.info.description value="the Erlang programming language and OTP libraries"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/fastcgi/fcgi-doc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fastcgi/fcgi-doc.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # These are not installed, but can be found in the doc directory.
@@ -29,6 +29,7 @@
 set name=pkg.description \
     value="Documentation for FastCGI application libraries"
 set name=pkg.summary value="FastCGI - documentation"
+set name=com.oracle.info.description value="the FastCGI documentation"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/fastcgi/fcgi.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fastcgi/fcgi.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -26,6 +26,7 @@
 set name=pkg.description \
     value="FastCGI is a high-speed and scalable interface for communicating with the web server"
 set name=pkg.summary value=FastCGI
+set name=com.oracle.info.description value="the FastCGI web server interface"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/fetchmail/fetchmail.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fetchmail/fetchmail.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
 This collective work is
 Copyright (C) 2002, 2003 Eric S. Raymond
 Copyright (C) 2004 Matthias Andree, Eric S. Raymond,
--- a/components/fetchmail/fetchmail.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fetchmail/fetchmail.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -28,6 +28,7 @@
 set name=pkg.fmri value=pkg:/mail/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="fetch mail from a POP, IMAP, ETRN, or ODMR-capable server"
 set name=pkg.description value="Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC."
+set name=com.oracle.info.description value="the fetchmail utility"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/flex/flex.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/flex/flex.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # 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.
 #
 
 set name=pkg.fmri value=pkg:/developer/lexer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Flex Lexer"
+set name=com.oracle.info.description value="the flex lexer utility"
 set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/flex/flexruntime.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/flex/flexruntime.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # 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.
 #
 
 set name=pkg.fmri value=pkg:/system/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Flex Lexer (Runtime)"
+set name=com.oracle.info.description value="the flex lexer runtime"
 set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/db-engine/foomatic-db-engine.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db-engine/foomatic-db-engine.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
-
    Copyright 2001-2003 LinuxPrinting.org
 
    This program is free software; you can redistribute it and/or modify it
--- a/components/foomatic/db-engine/foomatic-db-engine.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
 set name=pkg.fmri value=pkg:/print/cups/filter/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="Foomatic Database Engine"
+set name=com.oracle.info.description value="the Foomatic Database Engine"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/db/foomatic-db.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db/foomatic-db.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
-
    Copyright 2001-2003 LinuxPrinting.org
 
    This program is free software; you can redistribute it and/or modify it
--- a/components/foomatic/db/foomatic-db.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/db/foomatic-db.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/print/cups/filter/[email protected]$(COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Foomatic database of PostScript Printer Definition files"
+set name=com.oracle.info.description value="the Foomatic database of PostScript Printer Definition files"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/filters/foomatic-filters.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/filters/foomatic-filters.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
----------------------------
-- foomatic-filters 4.0.15 -
----------------------------
-Oracle Internal Tracking Number 6400
-
---------------------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/foomatic/filters/foomatic-rip.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/filters/foomatic-rip.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
 set name=pkg.fmri value=pkg:/print/lp/filter/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="foomatic-filters - Foomatic Print Filters"
+set name=com.oracle.info.description value="the Foomatic Print Filters"
+set name=com.oracle.info.tpno value=6400
 set name=info.classification value="org.opensolaris.category.2008:System/Printing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/foomatic/fppd/foomatic-ppds.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/fppd/foomatic-ppds.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
-
    Copyright 2001-2003 LinuxPrinting.org
 
    This program is free software; you can redistribute it and/or modify it
--- a/components/foomatic/fppd/foomatic-ppds.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/foomatic/fppd/foomatic-ppds.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/print/lp/filter/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="foomatic_ppds - Foomatic Print PPDs"
+set name=com.oracle.info.description value="the Foomatic Print PPDs"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/fping/fping.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/fping/fping.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,7 @@
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="fping - a program to ping hosts in parallel"
+set name=com.oracle.info.description value="the fping utility"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gawk/gawk.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gawk/gawk.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------
-- gawk 3.1.8 -
---------------
-
-Oracle Internal Tracking Number 6808
-
 			GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/gawk/gawk.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gawk/gawk.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="The awk utility interprets a special-purpose programming language that makes it possible to handle many data-reformatting jobs with just a few lines of code."
 set name=pkg.summary value="GNU awk"
+set name=com.oracle.info.description value="GNU awk"
+set name=com.oracle.info.tpno value=6808
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gcc3/gcc-3-runtime.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc3/gcc-3-runtime.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri value=pkg:/system/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GCC Runtime libraries"
 set name=pkg.description value="GCC Runtime - Shared libraries used by gcc and other gnu components"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
 set name=info.classification value=org.opensolaris.category.2008:Development/C
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/gcc3/gcc-3.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc3/gcc-3.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr/.*/man/.* -> default mangler.man.stability volatile >
@@ -28,6 +28,7 @@
 set name=pkg.fmri value=pkg:/developer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gcc - The GNU C compiler"
 set name=pkg.description value="GNU C - The GNU C compiler 3.4.3"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
 set name=info.classification value=org.opensolaris.category.2008:Development/C
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/gcc3/gcc.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc3/gcc.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/gcc45/gcc-45-runtime.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc45/gcc-45-runtime.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/system/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GCC - 4.5 Runtime"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
 set name=info.classification value="org.opensolaris.category.2008:Development/C" \
     value="org.opensolaris.category.2008:Development/C++" \
     value="org.opensolaris.category.2008:Development/Fortran" \
--- a/components/gcc45/gcc-45.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc45/gcc-45.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri value=pkg:/developer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GCC - 4.5 Compilers"
+set name=com.oracle.info.description value="the GNU Compiler Collection"
 set name=info.classification value="org.opensolaris.category.2008:Development/C" \
     value="org.opensolaris.category.2008:Development/C++" \
     value="org.opensolaris.category.2008:Development/Fortran" \
--- a/components/gcc45/gcc45.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gcc45/gcc45.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,18 +1,3 @@
-License:
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-__________________________________________________________________________________
 The GNU Compiler Collection version 4.5.2 includes the following licenses:
 GNU GENERAL PUBLIC LICENSE Version 2, June 1991 
 GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999
--- a/components/gd2/gd2.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gd2/gd2.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------------------------
-- GD2 [Graphics Draw] Library v2.0.35 -
----------------------------------------
-Oracle Internal Tracking Number 8786
-------------------------------------------------------------------------------
-
 John Ellson  ([email protected])  Oct 31, 1997
 
 ==============================================================================
--- a/components/gd2/gd2.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gd2/gd2.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
 set name=pkg.description \
     value="GD - An open source code library for the dynamic creation of images by programmers"
 set name=pkg.summary value="The Graphics Draw Library"
+set name=com.oracle.info.description value="the GD Graphics Draw Library"
+set name=com.oracle.info.tpno value=8786
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gdb/gdb.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdb/gdb.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-=============================================================================
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/gdb/gdb.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdb/gdb.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri value=pkg:/developer/debug/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GDB: The GNU Project Debugger"
+set name=com.oracle.info.description value="GNU GDB"
 set name=info.classification value="org.opensolaris.category.2008:Development/System"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gdbm/gdbm.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdbm/gdbm.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- GNU dbm 1.8.3 -
------------------
-
-Oracle Internal Tracking Number 8440
-
 GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/gdbm/gdbm.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gdbm/gdbm.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability Uncommitted>
@@ -26,6 +26,8 @@
 set name=pkg.summary value="GNU Database Manager"
 set name=pkg.description \
 	value="GNU dbm is a set of database routines that use extensible hashing. It works similar to the standard UNIX dbm routines."
+set name=com.oracle.info.description value="the GNU Database Manager"
+set name=com.oracle.info.tpno value=8440
 set name=info.classification value="org.opensolaris.category.2008:Development/Databases"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gettext/gettext.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gettext/gettext.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/gettext/gettext.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gettext/gettext.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
     value=pkg:/text/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="GNU gettext - message handling utilities"
 set name=pkg.summary value="GNU gettext"
+set name=com.oracle.info.description value="GNU gettext"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ggrep/gnu-grep.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ggrep/gnu-grep.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-===================================================================
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 3, 29 June 2007
 
--- a/components/ggrep/gnu-grep.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ggrep/gnu-grep.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="The grep command searches one or more input files for lines containing a match to a specified pattern."
 set name=pkg.summary value="GNU grep utilities"
+set name=com.oracle.info.description value="GNU grep"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ghostscript/ghostscript.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ghostscript/ghostscript.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 3 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv3 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-=========================================================================
   Copyright (C) 1994-2008 Artifex Software, Inc.  All rights reserved.
   Copyright (C) 1989-2002 Aladdin Enterprises, Menlo Park, CA.  All rights reserved.
 
--- a/components/ghostscript/ghostscript.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ghostscript/ghostscript.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -24,6 +24,7 @@
 
 set name=pkg.fmri value=pkg:/print/filter/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GPL Ghostscript"
+set name=com.oracle.info.description value="GNU Ghostscript"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing "
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/git/git.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/git/git.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- git 1.7.9.2 -
----------------
-
-Oracle Internal Tracking Number 8436
-
  GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/git/git.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/git/git.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr/lib/git-core/.* -> default mode 0555>
@@ -29,6 +29,8 @@
 set name=pkg.summary value="git - Fast Version Control System"
 set name=pkg.description \
     value="Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency."
+set name=com.oracle.info.description value="the git version control system"
+set name=com.oracle.info.tpno value=8436
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
---------------------------
-- Ghostscript Fonts 6.0 -
---------------------------
-
-Oracle Internal Tracking Number 8517
-
------------------------------------------------------------------------------
-				v.09232010
 USE RESTRICTION:
         This distribution of the Hershey Fonts may be used by anyone for
         any purpose, commercial or otherwise, providing that:
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/print/filter/ghostscript/fonts/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Ghostscript Fonts (Other)"
+set name=com.oracle.info.description value="GNU Ghostscript Fonts (Other)"
+set name=com.oracle.info.tpno value=8517
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
---------------------------
-- Ghostscript Fonts 6.0 -
---------------------------
-
-Oracle Internal Tracking Number 8517
-
------------------------------------------------------------------------------
-				v.09232010
 USE RESTRICTION:
         This distribution of the Hershey Fonts may be used by anyone for
         any purpose, commercial or otherwise, providing that:
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/print/filter/ghostscript/fonts/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Ghostscript Fonts (Standard)"
+set name=com.oracle.info.description value="GNU Ghostscript Fonts (Standard)"
+set name=com.oracle.info.tpno value=8517
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Printing "
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnump/gmp.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnump/gmp.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-------------------------------------------------------------------
-
 		   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/gnump/gmp.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnump/gmp.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GNU MP"
-set name=pkg.description value="The GNU Multiple Precision Bignum Library"
+set name=pkg.summary value="GNU Multiple Precision Bignum Library"
+set name=com.oracle.info.description value="the GNU Multiple Precision Bignum Library"
 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/gnupg/gnupg.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupg/gnupg.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
---------------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 3, 29 June 2007
 
--- a/components/gnupg/gnupg.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupg/gnupg.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform dir path=usr/share/gnupg$ -> default facet.locale true>
@@ -27,6 +27,7 @@
 set name=pkg.fmri value=pkg:/crypto/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU Privacy Guard"
 set name=pkg.description value="A complete and free implementation of the OpenPGP Standard as defined by RFC4880."
+set name=com.oracle.info.description value="GNU Privacy Guard"
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnuplot/gnuplot.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnuplot/gnuplot.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
------------------
-- gnuplot 4.6.0 -
------------------
-
-Oracle Internal Tracking Number 8452
-
-----------------------------------------------------------------------------
-
 ========== ADDENDUM 1: The gnuplot 4.6.0 general copyright ==========
 /*[ 
  * Copyright 1986 - 1993, 1998, 2004   Thomas Williams, Colin Kelley 
--- a/components/gnuplot/gnuplot.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnuplot/gnuplot.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # 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.
 #
 <transform file path=usr/demo/gnuplot/(.+[.-].+)$ -> set action.hash demo/%<\1> >
 
 set name=pkg.fmri value=pkg:/image/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gnuplot - plotting utility"
 set name=pkg.description value="gnuplot - command-driven interactive function plotting program"
+set name=com.oracle.info.description value="the gnuplot plotting utility"
+set name=com.oracle.info.tpno value=8452
 set name=info.classification value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gnupth/gnupth.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupth/gnupth.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,60 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-------------------------------------------------------------------
-
-   ____  _   _
-  |  _ \| |_| |__               ``Ian Fleming was a UNIX fan!
-  | |_) | __| '_ \                How do I know? Well, James Bond
-  |  __/| |_| | | |               had the (license to kill) number 007,
-  |_|    \__|_| |_|               i.e., he could execute anyone!''
-
-  GNU Pth - The GNU Portable Threads
-
-  LICENSE
-  =======
-
-  This library is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation; either version 2.1 of the
-  License, or (at your option) any later version.
-
-  For some people, it is not clear, what is the real intention of the
-  author by using the GNU Lesser General Public License (LGPL) as the
-  distribution license for GNU Pth. This is, because the LGPL and the
-  GPL can be (and are often) interpreted very differently and some
-  interpretations seem to be not compatible with others. So an explicit
-  clarification for the use of the LGPL for GNU Pth from the authors
-  point of view might be useful.
-
-  The author places this library under the LGPL to make sure that it
-  can be used both commercially and non-commercially provided that
-  modifications to the code base are always donated back to the official
-  code base under the same license conditions. Please keep in mind that
-  especially using this library in code not staying under the GPL or
-  the LGPL _is_ allowed and that any taint or license creap into code
-  that uses the library is not the authors intention. It is just the
-  case that _including_ this library into the source tree of other
-  applications is a little bit more inconvinient because of the LGPL.
-  But it has to be this way for good reasons. And keep in mind that
-  inconvinient doesn't mean not allowed or even impossible.
-
-  Even if you want to use this library in some BSD-style licensed
-  packages, this _is_ possible as long as you are a little bit
-  carefully. Usually this means you have to make sure that the code is
-  still clearly separated into the source tree and that modifications to
-  this source area are done under the conditions of the LGPL. Read below
-  for more details on the conditions. Contact the author if you have
-  more questions.
-
-  The license text of the GNU Lesser General Public License follows:
-  __________________________________________________________________________
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/gnupth/gnupth.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gnupth/gnupth.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The GNU Portable Threads Library"
 set name=pkg.description value="A portable POSIX/ANSI-C based library for Unix platforms providing non-preemptive priority-based scheduling for multiple threads"
+set name=com.oracle.info.description value="the GNU Portable Threads Library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gocr/gocr.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gocr/gocr.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- GOCR 0.48 -
--------------
-
-Oracle Internal Tracking Number 8587
-
 GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/gocr/gocr.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gocr/gocr.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 
 set name=pkg.fmri value=pkg:/image/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GOCR is an open source Optical Character Recognition program"
+set name=com.oracle.info.description value="the gocr Optical Character Recognition program"
+set name=com.oracle.info.tpno value=8587
 set name=info.classification value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gperf/gperf.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gperf/gperf.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- gperf 3.0.3 -
----------------
-
-Oracle Internal Tracking Number 8589
-
             GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
--- a/components/gperf/gperf.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gperf/gperf.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="GNU gperf is a perfect hash function generator. For a given list of strings, it produces a hash function and hash table, in form of C or C++ code, for looking up a value depending on the input string."
 set name=pkg.summary value="GNU gperf"
+set name=com.oracle.info.description value="GNU gperf"
+set name=com.oracle.info.tpno value=8589
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gpgme/gpgme.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gpgme/gpgme.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-------------------------------------
-- GPG ME [GNU PG Made Easy] v1.1.8  -
-------------------------------------
-
-Oracle Internal Tracking Number 8637
-------------------------------------------------------------------------------
-
                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
--- a/components/gpgme/gpgme.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gpgme/gpgme.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG Made Easy"
 set name=pkg.description value="A library designed to make access to GnuPG easier for applications."
+set name=com.oracle.info.description value="GnuPG Made Easy"
+set name=com.oracle.info.tpno value=8637
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/grails/grails.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/grails/grails.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
 Grails uses the "Apache Software License, Version 2.0"
 however Grails has dependencies and their licensing is summaried
 in http://svn.codehaus.org/grails/trunk/grails/dependencies.txt.
--- a/components/grails/grails.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/grails/grails.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -34,6 +34,7 @@
 set name=pkg.description \
     value="A web application framework which uses the Groovy programming language (which is in turn based on the Java platform)"
 set name=pkg.summary value="A web application framework"
+set name=com.oracle.info.description value="the grails web application framework"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-java.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-java.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Java bindings for Graphviz"
+set name=com.oracle.info.description value="Java bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-lua.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-lua.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Lua bindings for Graphviz"
+set name=com.oracle.info.description value="Lua bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-ocaml.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-ocaml.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="OCaml bindings for Graphviz"
+set name=com.oracle.info.description value="OCaml bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-perl-512.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-perl-512.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl 5.12 bindings for Graphviz"
+set name=com.oracle.info.description value="Perl 5.12 bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-php.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-php.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="PHP bindings for Graphviz"
+set name=com.oracle.info.description value="PHP bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-python-26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-python-26.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python 2.6 bindings for Graphviz"
+set name=com.oracle.info.description value="Python 2.6 bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-python-27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-python-27.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python 2.7 bindings for Graphviz"
+set name=com.oracle.info.description value="Python 2.7 bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-ruby.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-ruby.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Ruby bindings for Graphviz"
+set name=com.oracle.info.description value="Ruby bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-sharp.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-sharp.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="C# bindings for Graphviz"
+set name=com.oracle.info.description value="C# bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz-tcl.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz-tcl.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -26,6 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/image/graphviz/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Tcl bindings for Graphviz"
+set name=com.oracle.info.description value="Tcl bindings for Graphviz"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/graphviz/graphviz.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/graphviz/graphviz.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +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=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/gtar/gtar.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gtar/gtar.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-=============================================================================
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 3, 29 June 2007
 
--- a/components/gtar/gtar.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gtar/gtar.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="Tar is a program for packaging a set of files as a single archive in tar format."
 set name=pkg.summary value="GNU version of the tar archiving utility"
+set name=com.oracle.info.description value="GNU tar"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/guile/guile.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/guile/guile.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,17 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
-Copyright (C) 1985-2007 Free Software Foundation, Inc.
-
-
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 
--- a/components/guile/guile.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/guile/guile.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr/share/guile/.+/scripts/.+$ -> default mode 0555>
@@ -28,6 +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="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.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gutenprint/gutenprint.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------------
-- Gutenprint 5.2.7 -
---------------------
-Oracle Internal Tracking Number TBD
-
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/gutenprint/gutenprint.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gutenprint/gutenprint.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,7 +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"
+    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/gzip/gzip.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gzip/gzip.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-------------
-- gzip 1.5 -
-------------
-
-Oracle Internal Tracking Number 7913
-
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/gzip/gzip.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/gzip/gzip.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -26,6 +26,8 @@
     value=pkg:/compress/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.description value="The GNU Zip (gzip) compression utility"
 set name=pkg.summary value="GNU Zip (gzip)"
+set name=com.oracle.info.description value="GNU zip"
+set name=com.oracle.info.tpno value=7913
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/hal-cups-utils/hal-cups-utils.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hal-cups-utils/hal-cups-utils.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
--------------------------
-- hal-cups-utils 0.6.19 -
--------------------------
-
-Oracle Internal Tracking Number 8957
-
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/hal-cups-utils/hal-cups-utils.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hal-cups-utils/hal-cups-utils.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="hal-cups-utils is a Hardware Abstraction Layer (HAL) plugin module that automatically creates print queues under the Common UNIX Printing System (CUPS) for printers detected by HAL."
 set name=pkg.summary value="Automatic queue creation for CUPS"
+set name=com.oracle.info.description value="the HAL automatic queue creation plugin module for CUPS"
+set name=com.oracle.info.tpno value=8957
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/hexedit/hexedit.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hexedit/hexedit.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- hexedit 1.2.12 -
-------------------
-
-Oracle Internal Tracking Number 9060
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
--- a/components/hexedit/hexedit.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hexedit/hexedit.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommited>
@@ -28,6 +28,8 @@
     value=pkg:/editor/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
     value="Hexedit - a command-line binary file editor"
+set name=com.oracle.info.description value="the hexedit binary file editor"
+set name=com.oracle.info.tpno value=9060
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities" \
     value="org.opensolaris.category.2008:Development/Editors"
--- a/components/hplip/hplip.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hplip/hplip.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
--------------------------------------------------------------------------------
-
    (c) Copyright 2001-2008 Hewlett-Packard Development Company, L.P.
 
    This program is free software; you can redistribute it and/or modify
--- a/components/hplip/hplip.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hplip/hplip.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
     value=pkg:/print/filter/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="hpijs - HP InkJet Server"
+set name=com.oracle.info.description value="the hpijs HP InkJet Server"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Printing "
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/httping/httping.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/httping/httping.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
 Copyright (C) 2007 by [email protected]
 
 The GPL applies to this program. The license of this program
--- a/components/httping/httping.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/httping/httping.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
 set name=pkg.summary value="Ping for HTTP requests"
 set name=pkg.description \
 	value="Give httping an url, and it'll show you how long it takes to connect, send a request and retrieve the reply (only the headers)."
+set name=com.oracle.info.description value="the HTTP ping utility"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/hwdata/Makefile	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hwdata/Makefile	Sat Apr 06 08:18:24 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
 
@@ -48,7 +48,16 @@
 
 COMPONENT_BUGDB=	utility/hwdata
 
+# Retrieve version from ids file
+ID_VERSION_EXTRACT_COMMAND=$(GSED) -n -e '/Version:/ { s/^.*: //p' -e ' q }'
+
 PKG_OPTIONS += -D COMPONENT_ARCHIVE_URLS='$(COMPONENT_ARCHIVE_URLS:%=value="%")'
+PKG_MACROS += $(foreach i,$(ID_FILES),\
+    COMPONENT_VERSION_$(i)='$(shell $(ID_VERSION_EXTRACT_COMMAND) $(i))')
+
+# Since we have two separately licensed components we don't use the default
+# license transform rules, but handle the license info metadata directly
+LICENSE_TRANSFORMS =
 
 $(ID_FILES):
 	curl -s -o [email protected] $(COMPONENT_ARCHIVE_URL_$(@F))
@@ -56,8 +65,6 @@
 # License files for packaging are generated during the build
 LICENSES = $(ID_FILES:%=%.license)
 BUILT_LICENSES = $(LICENSES:%=$(BUILD_DIR)/%)
-TPNO_pci.ids.license = 7530
-TPNO_usb.ids.license = 7831
 
 # Extract the header up to the first blank line
 $(BUILD_DIR)/%.header: %
@@ -65,17 +72,10 @@
 	$(GSED) -e '/^$$/ q' $< > [email protected]
 
 # Generate license files for each document by substituting in templates:
-# __FILE_NAME_VERS__ replace with name & version of ids file
-# __TPNO__ - Oracle tracking number
 # __HEADER__ - read in contents of generated header file, then delete the 
 #		__HEADER__ line
 $(BUILD_DIR)/%.license: $(BUILD_DIR)/%.header
-	FILENAME="$(basename $(@F))" ; \
-	VERSION="$$(awk -F: '/Version:/ { print $$2 ; exit }' $<)" ; \
-	FILE_NAME_VERS="$${FILENAME}$${VERSION}" ; \
-	$(GSED) -e "s/__FILE_NAME_VERS__/$${FILE_NAME_VERS}/" \
-	    -e 's/__TPNO__/$(TPNO_$(@F))/' \
-	    -e '/__HEADER__/ r $<' -e '/__HEADER__/ d' ids.license.tmpl > [email protected]
+	$(GSED) -e '/__HEADER__/ r $<' -e '/__HEADER__/ d' ids.license.tmpl > [email protected]
 
 install build: $(BUILT_LICENSES)
 
--- a/components/hwdata/hwdata.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hwdata/hwdata.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -42,6 +42,11 @@
 dir path=usr/share/hwdata group=sys
 file pci.ids path=usr/share/hwdata/pci.ids
 file usb.ids path=usr/share/hwdata/usb.ids
-license pci.ids.license license=pci.ids.license
-license usb.ids.license license=usb.ids.license
-
+license pci.ids.license license="BSD (pci.ids)" \
+    com.oracle.info.description="the pci.ids list of PCI device & vendor IDs" \
+    com.oracle.info.name=pci.ids com.oracle.info.tpno=7530 \
+    com.oracle.info.version=$(COMPONENT_VERSION_pci.ids)
+license usb.ids.license license="BSD (usb.ids)" \
+    com.oracle.info.description="the usb.ids list of USB device & vendor IDs" \
+    com.oracle.info.name=usb.ids com.oracle.info.tpno=7831 \
+    com.oracle.info.version=$(COMPONENT_VERSION_usb.ids)
--- a/components/hwdata/ids.license.tmpl	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/hwdata/ids.license.tmpl	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------------
-- __FILE_NAME_VERS__ -
-----------------------
-
-Oracle Internal Tracking Number __TPNO__
-
 Oracle elects to license this file under the 3-clause BSD license (the
 template of which is reproduced below) based on the following notices
 included within the file:
--- a/components/iftop/iftop.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iftop/iftop.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
 Copyright (C) 1987-2006 Free Software Foundation, Inc.
 Copyright (C) 2000-2005, 2008 Tim Waugh <[email protected]>
 Copyright (C) 2001 Marko Kreen
--- a/components/iftop/iftop.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iftop/iftop.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/diagnostic/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="iftop - Display bandwidth usage on an interface"
+set name=com.oracle.info.description value="the iftop utility"
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ilmbase/ilmbase.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ilmbase/ilmbase.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- ilmbase 1.0.1 -
------------------
-
-Oracle Internal Tracking Number 5574
-
 OPENEXR:
 
 Copyright (c) 2006, Industrial Light & Magic, a division of Lucasfilm
--- a/components/ilmbase/ilmbase.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ilmbase/ilmbase.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,8 @@
     value="Base libraries to support the OpenEXR IlmImf library"
 set name=pkg.summary \
     value="Ilmbase libraries used to read and write OpenEXR images"
+set name=com.oracle.info.description value="the OpenEXR IlmImf base libraries"
+set name=com.oracle.info.tpno value=5574
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/imagemagick/imagemagick.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/imagemagick/imagemagick.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,7 @@
     value="ImageMagick is a software suite to create, edit, compose, or convert images"
 set name=pkg.summary \
     value="ImageMagick - Image Manipulation Utilities and Libraries"
+set name=com.oracle.info.description value="the ImageMagick Image Manipulation Utilities and Libraries"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Multimedia Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/iperf/iperf.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iperf/iperf.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------
-- iperf 2.0.4 -
----------------
- 
-Oracle Internal Tracking Number 5730
-
 Copyright (c) 1999-2007, The Board of Trustees of the University of Illinois
 All Rights Reserved.
 
--- a/components/iperf/iperf.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/iperf/iperf.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/benchmark/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="iperf - tool for measuring maximum TCP and UDP bandwidth performance"
+set name=com.oracle.info.description value="the iperf utility"
+set name=com.oracle.info.tpno value=5730
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ircii/ircii.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ircii/ircii.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- ircii 20060725 -
-------------------
-
-Oracle Internal Tracking Number 5578
-
 /*	$eterna: Copyright,v 1.13 2005/04/03 02:35:06 mrg Exp $	*/
 
 /*
--- a/components/ircii/ircii.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ircii/ircii.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.description value="A terminal-based IRC client that runs under most unix platforms."
 set name=pkg.summary value="Internet Relay Chat Client"
+set name=com.oracle.info.description value="the ircii Internet Relay Chat Client"
+set name=com.oracle.info.tpno value=5578
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/isc-dhcp/dhcp.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/isc-dhcp/dhcp.p5m	Sat Apr 06 08:18:24 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.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -26,6 +26,8 @@
 set name=pkg.description \
     value="ISC DHCP is open source software that implements the Dynamic Host Configuration Protocols for connection to a local network. This package includes the ISC DHCP server, relay agent and the omshell tool."
 set name=pkg.summary value="ISC DHCP Server and Relay Agent."
+set name=com.oracle.info.description value="the ISC DHCP Server and Relay Agent"
+set name=com.oracle.info.tpno value=10383
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Services
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/isc-dhcp/isc-dhcp.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/isc-dhcp/isc-dhcp.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
-
------------------------
-- ISC DHCP 4.1-ESV-R7 -
------------------------
-
-Oracle Internal Tracking Number : 10383
-
 # Copyright (c) 2004-2012 by Internet Systems Consortium, Inc. ("ISC")
 # Copyright (c) 1995-2003 by Internet Software Consortium
 #
--- a/components/junit/junit.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/junit/junit.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,7 +1,3 @@
---------------
-- Junit 4.10 -
---------------
-
 Common Public License - v 1.0
 
 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
--- a/components/junit/junit.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/junit/junit.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -32,6 +32,7 @@
 set name=pkg.description \
     value="Junit is a unit testing framework for the Java programming language."
 set name=pkg.summary value="Junit - Java unit testing framework"
+set name=com.oracle.info.description value="the Junit unit testing framework"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Java
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ksh93/developer-astdev93.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ksh93/developer-astdev93.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
@@ -34,6 +34,7 @@
 set name=pkg.description \
     value="AT&T AST development utilities for extracting messages for localisation"
 set name=pkg.summary value="AT&T AST development utilities"
+set name=com.oracle.info.description value="the AT&T AST development utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Software Management"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/ksh93/ksh93.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ksh93/ksh93.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
@@ -32,6 +32,7 @@
 set name=pkg.description \
     value="Korn Shell 93: A command and programming language that executes commands read from a terminal or a file"
 set name=pkg.summary value="Ksh93 - The AT&T Korn Shell"
+set name=com.oracle.info.description value="the AT&T ksh93 Korn Shell"
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream \
--- a/components/ksh93/source-demo-ksh93.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/ksh93/source-demo-ksh93.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
@@ -33,6 +33,7 @@
 set name=pkg.human-version value=$(IPS_HUMAN_VERSION)
 set name=pkg.description value="Source code to demonstrate the KornShell"
 set name=pkg.summary value="KornShell demos"
+set name=com.oracle.info.description value="the Korn Shell demos"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream \
--- a/components/lcms/lcms-py26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms-py26.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,14 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <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=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
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lcms/lcms-py27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms-py27.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,14 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <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=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
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lcms/lcms.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
----------------------
-- Little CMS v1.19  -
----------------------
-
-Oracle Internal Tracking Number 9072
------------------------------------------------------------------------------- 
-
 Little CMS
 	Copyright (c) 1998-2007 Marti Maria Saguer
 
--- a/components/lcms/lcms.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lcms/lcms.p5m	Sat Apr 06 08:18:24 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.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -26,6 +26,8 @@
 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=com.oracle.info.tpno value=9072
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/less/less.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/less/less.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------
-- less 436 -
-------------
-
-Oracle Internal Tracking Number 9286
-
                             Less, version 436
 
     This is the distribution of less, version 436, released 07 Jul 2009.
--- a/components/less/less.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/less/less.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
 set name=pkg.description \
     value="The package provides less, a file pager (a memory-efficient utility for displaying text one screenful at a time)."
 set name=pkg.summary value="pager program similar to more"
+set name=com.oracle.info.description value="the less pager program"
+set name=com.oracle.info.tpno value=9286
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lftp/lftp.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lftp/lftp.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-=============================================================================
-
 Copyright (c) 1996-2011 Alexander V. Lukyanov
 
                     GNU GENERAL PUBLIC LICENSE
--- a/components/lftp/lftp.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lftp/lftp.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/network/ftp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="lftp - Sophisticated file transfer program"
+set name=com.oracle.info.description value="the lftp file transfer program"
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libassuan/libassuan.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libassuan/libassuan.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,21 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
--------------------------------------------------------------------------
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------------
-
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/libassuan/libassuan.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libassuan/libassuan.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG IPC implementation library"
 set name=pkg.description value="A small library implementing the so-called Assuan protocol, used for interprocess communication between most GnuPG components."
+set name=com.oracle.info.description value="the GnuPG IPC implementation library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libconfuse/libconfuse.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libconfuse/libconfuse.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -41,6 +41,7 @@
     value="Configuration file parser library"
 set name=pkg.description \
     value="libConfuse is a configuration file parser library written in C. It supports sections and lists of values. It makes it very easy to add configuration file capability to a program using a simple API."
+set name=com.oracle.info.description value="the libconfuse configuration file parser library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/libedit/libedit.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libedit/libedit.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------------
-- libedit 20110802-3.0 -
-------------------------
-
-Oracle Internal Tracking Number : 7013
-
 Copyright (c) 1992, 1993
  The Regents of the University of California.  All rights reserved.
 
--- a/components/libedit/libedit.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libedit/libedit.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="Libedit - Command line editor library"
+set name=com.oracle.info.description value="the libedit command line editor library"
+set name=com.oracle.info.tpno value=7013
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libee/libee.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libee/libee.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
----------------
-- libee 0.3.2 -
----------------
-
-Oracle Internal Tracking Number 7585
-
-libee is available under the terms of the GNU GPL v2.1 or above (full
-text below).
------------------------------------------------------------------------
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/libee/libee.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libee/libee.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,12 +20,14 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="event expression library"
+set name=com.oracle.info.description value="the libee event expression library"
+set name=com.oracle.info.tpno value=7585
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libestr/libestr.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libestr/libestr.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
------------------
-- libestr 0.1.2 -
------------------
-
-Oracle Internal Tracking Number 7585
-
-libestr is available under the terms of the GNU GPL v2.1 or above (full
-text below).
------------------------------------------------------------------------
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/libestr/libestr.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libestr/libestr.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,12 +20,14 @@
 #
 
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="extended string handling library"
+set name=com.oracle.info.description value="the libestr extended string handling library"
+set name=com.oracle.info.tpno value=7585
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libevent/libevent.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libevent/libevent.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
---------------------
-- libevent 1.4.14b -
---------------------
-
-Oracle Internal Tracking Number : 5581
-
 buffer.c:
 /*
  * Copyright (c) 2002, 2003 Niels Provos <[email protected]>
--- a/components/libevent/libevent.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libevent/libevent.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary \
     value="Libevent - an event notification library"
+set name=com.oracle.info.description value="the libevent event notification library"
+set name=com.oracle.info.tpno value=5581
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Libraries"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libexpat/expat.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libexpat/expat.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="libexpat - XML parser library"
 set name=pkg.description value="A fast, non-validating, stream-oriented XML parsing library"
+set name=com.oracle.info.description value="the libexpat XML parser library"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libidn/libidn.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libidn/libidn.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,25 +1,3 @@
------------------
-- GNU IDN v1.19 -
------------------
-Oracle Internal Tracking Number 8079
------------------------------------------------------------------------------- 
-
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------------
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
---------------------------------------------------------------------------
-
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 
--- a/components/libidn/libidn.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libidn/libidn.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="IDN - The Internationalized Domains Library"
 set name=pkg.description value="A fully documented implementation of the Stringprep, Punycode and IDNA specifications for the purpose of encoding and decoding internationalized domain names"
+set name=com.oracle.info.description value="the libidn Internationalized Domains Library"
+set name=com.oracle.info.tpno value=8079
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libksba/libksba.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libksba/libksba.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
----------------------
-- libksba v1.1.0 -
----------------------
-Oracle Internal Tracking Number 8768
---------------------------------------------------------------------------------
-
-GPLv3 license:
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/libksba/libksba.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libksba/libksba.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GnuPG X.509 certificate library"
 set name=pkg.description value="A C library to make the tasks of working with X.509 certificates, CMS data and related objects easier, by encapsulating specific protocol details."
+set name=com.oracle.info.description value="the GnuPG X.509 certificate library"
+set name=com.oracle.info.tpno value=8768
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libmcrypt/libmcrypt.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmcrypt/libmcrypt.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,11 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
 --------------------------------------------------------------------
   Copyright (c) 1999 Mike Scott
   Copyright (C) 1998,1999,2000,2001,2002 Nikos Mavroyanopoulos
--- a/components/libmcrypt/libmcrypt.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmcrypt/libmcrypt.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/system/library/security/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Libmcrypt Encryption Algorithms Library"
+set name=com.oracle.info.description value="the libmcrypt encryption algorithms library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libmemcached/libmemcached.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmemcached/libmemcached.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
----------------------
-- libmemcached 0.16 -
----------------------
-
-Oracle Internal Tracking Number 5582
-
 Copyright (c) 2007, TangentOrg (Brian Aker)
 All rights reserved.
 
--- a/components/libmemcached/libmemcached.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmemcached/libmemcached.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.summary value="An open source C/C++ client library and tools for the memcached server"
 set name=pkg.description \
     value="Libmemcached has been designed to be light on memory usage, thread safe, and provide full access to server side methods."
+set name=com.oracle.info.description value="the memcached server library"
+set name=com.oracle.info.tpno value=5582
 set name=info.classification \
 	value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/libmng/libmng.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmng/libmng.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- libmng 1.0.10 -
------------------
-
-Oracle Internal Tracking Number 5583
-
 /* *                                                                        * */
 /* * COPYRIGHT NOTICE:                                                      * */
 /* *                                                                        * */
--- a/components/libmng/libmng.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libmng/libmng.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/graphics/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Multiple Image Network Graphics Library"
 set name=pkg.description value="A PNG-like image format library supporting multiple images, animations and transparent JPEG"
+set name=com.oracle.info.description value="the libmng multiple image network graphics library"
+set name=com.oracle.info.tpno value=5583
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libneon/libneon.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libneon/libneon.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------------------------------
-- NEON Client Library (libneon) v0.29.6 -
------------------------------------------
-
------------------------------------------------------------------------
-
 		  GNU LIBRARY GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/libneon/libneon.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libneon/libneon.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="An HTTP and WebDAV client library, with a C interface"
 set name=pkg.summary value="The Neon WebDAV library"
+set name=com.oracle.info.description value="the libneon WebDAV library"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libnet/libnet.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libnet/libnet.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-----------------
-- libnet 1.1.5 -
-----------------
-
-Oracle Internal Tracking Number 5584
-
 Copies of LICENSES and other notices:
 ===================================== 
 doc/COPYING:
--- a/components/libnet/libnet.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libnet/libnet.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 
 set name=pkg.fmri value=pkg:/system/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="libnet - a library for portable network packet construction"
+set name=com.oracle.info.description value="the libnet network packet construction library"
+set name=com.oracle.info.tpno value=5584
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libpcap/libpcap.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libpcap/libpcap.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 # The libpcap man pages should go in section 3pcap instead of
@@ -27,6 +27,7 @@
 set name=pkg.fmri \
     value=pkg:/system/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Packet capture library"
+set name=com.oracle.info.description value="the libpcap package capture library"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/librsync/librsync.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/librsync/librsync.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/librsync/librsync.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/librsync/librsync.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="A library that implements the rolling-checksum algorithm of remote file synchronization that was popularized by the rsync utility and is used in rproxy"
 set name=pkg.summary value="A library that implements the rsync remote-delta algorithm"
+set name=com.oracle.info.description value="the librsync rsync remote-delta algorithm library"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libsigsegv/libsigsegv.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsigsegv/libsigsegv.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
 Copyright 1998-1999, 2002-2008 Bruno Haible <[email protected]>
 Copyright 2002-2005 Paolo Bonzini <[email protected]> 
 
--- a/components/libsigsegv/libsigsegv.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsigsegv/libsigsegv.p5m	Sat Apr 06 08:18:24 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.
 #
 
 # pull the manpages out of the component dir
@@ -30,6 +30,7 @@
 set name=pkg.description \
     value="libsigsegv provides a set of functions for handling page faults in user mode"
 set name=pkg.summary value="libsigsegv - handling page faults in user mode"
+set name=com.oracle.info.description value="the libsigsegv page fault handling library"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libsndfile/libsndfile.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsndfile/libsndfile.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
--------------------------------------------------------------------
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/libsndfile/libsndfile.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libsndfile/libsndfile.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # 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.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="libsndfile - a library for reading/writing sound files"
 set name=pkg.description \
 	value="Libsndfile is a C library for reading and writing files containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) through one standard library interface."
+set name=com.oracle.info.description value="the libsndfile sound file library"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtecla/libtecla.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtecla/libtecla.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
@@ -34,6 +34,7 @@
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Tecla command-line editing library"
+set name=com.oracle.info.description value="the libtecla command-line editing library"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtool/libltdl.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtool/libltdl.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
     value=pkg:/library/libtool/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU libtool dlopen wrapper"
+set name=com.oracle.info.description value="the GNU libtool dlopen wrapper"
+set name=com.oracle.info.tpno value=9088
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtool/libtool.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtool/libtool.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- libtool 2.4.2 -
------------------
-
-Oracle Internal Tracking Number 9088
-
   GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
--- a/components/libtool/libtool.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtool/libtool.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # 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.
 #
 
 <transform file path=usr/share/man/.+$ -> set mangler.man.stability 'uncommitted (obsolete)' >
 set name=pkg.fmri \
     value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU libtool"
+set name=com.oracle.info.description value="GNU libtool"
+set name=com.oracle.info.tpno value=9088
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libtorrent/libtorrent.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtorrent/libtorrent.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-
 Copyright (C) 2005-2007, Jari Sundell <jaris (a] ifi.uio.no>
 
 		    GNU GENERAL PUBLIC LICENSE
--- a/components/libtorrent/libtorrent.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libtorrent/libtorrent.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="libtorrent - a Bittorrent library for rtorrent"
+set name=com.oracle.info.description value="the bittorrent library for rtorrent"
 set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libusb/ugen/Makefile	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libusb/ugen/Makefile	Sat Apr 06 08:18:24 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/wrapper/libusb.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libusb/wrapper/libusb.license	Sat Apr 06 08:18:24 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/libusb/wrapper/libusb.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libusb/wrapper/libusb.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
     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="Sun wrapper library for libusb"
+set name=com.oracle.info.description value="the wrapper library for libusb"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Libraries"
 set name=info.source-url value=http://opensolaris.org/
--- a/components/libxml2/libxml2-26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2-26.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
 #
 # 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.
 #
 
 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="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
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxml2/libxml2-27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2-27.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 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="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
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxml2/libxml2.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
------------------
-- libxml2 2.9.0 -
------------------
-
-Oracle Internal Tracking Number 5302
-
 Except where otherwise noted in the source code (e.g. the files hash.c,
 list.c and the trio files, which are covered by a similar licence but
 with different Copyright notices) all the files are:
--- a/components/libxml2/libxml2.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxml2/libxml2.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XML library"
+set name=com.oracle.info.description value="the XML library"
+set name=com.oracle.info.tpno value=5302
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/libxsl-26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/libxsl-26.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
 #
 # 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.
 #
 
 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="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
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/libxsl-27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/libxsl-27.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 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="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
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/libxslt.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/libxslt.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The XSLT library"
+set name=com.oracle.info.description value="the XSLT library"
+set name=com.oracle.info.tpno value=5303
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/libxslt/xsl.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/libxslt/xsl.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
-------------------
-- libxslt 1.1.27 -
-------------------
-
-Oracle Internal Tracking Number 5303
-
 Licence for libxslt except libexslt
 ----------------------------------------------------------------------
  Copyright (C) 2001-2002 Daniel Veillard.  All Rights Reserved.
--- a/components/lighttpd/lighttpd.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lighttpd/lighttpd.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------
-- lighttpd 1.4.23 -
--------------------
-
-Oracle Internal Tracking Number 5585
-
 Copyright (c) 2004, Jan Kneschke, incremental
  All rights reserved.
 
--- a/components/lighttpd/lighttpd.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lighttpd/lighttpd.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,8 @@
     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.tpno value=5585
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
--- a/components/links/links.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/links/links.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,4 @@
---------------
-- links 1.03 -
---------------
-
-Oracle Internal Tracking Number 9049
-                                                                                                     GNU GENERAL PUBLIC LICENSE 
+                     GNU GENERAL PUBLIC LICENSE 
                        Version 2, June 1991 
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
--- a/components/links/links.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/links/links.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri value=pkg:/web/browser/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.human-version value=$(COMPONENT_VERSION)
 set name=pkg.summary value="Text based web browser"
+set name=com.oracle.info.description value="the links text based web browser"
+set name=com.oracle.info.tpno value=9049
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-astng/logilab-astng-26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng-26.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
 set name=pkg.summary \
     value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=com.oracle.info.description value="the logilab-astng Python 2.6 module"
+set name=com.oracle.info.tpno value=8267
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-astng/logilab-astng-27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng-27.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -29,6 +29,8 @@
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
 set name=pkg.summary \
     value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=com.oracle.info.description value="the logilab-astng Python 2.7 module"
+set name=com.oracle.info.tpno value=8267
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-astng/logilab-astng.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,8 +1,3 @@
-------------------------
-- logilab-astng 0.24.0 -
-------------------------
-Oracle Internal Tracking Number 8267
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/logilab-astng/logilab-astng.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-astng/logilab-astng.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -28,6 +28,8 @@
     value="logilab-astng provides a common base representation of python source code for projects such as pylint."
 set name=pkg.summary \
     value="logilab-astng - Python Abstract Syntax Tree New Generation"
+set name=com.oracle.info.description value="the logilab-astng Python module"
+set name=com.oracle.info.tpno value=8267
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-common/logilab-common-26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common-26.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="Modules providing low level functionality shared among various python projects."
 set name=pkg.summary value="common python libraries for logilab applications"
+set name=com.oracle.info.description value="the logilab-common Python 2.6 module"
+set name=com.oracle.info.tpno value=8268
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-common/logilab-common-27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common-27.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="Modules providing low level functionality shared among various python projects."
 set name=pkg.summary value="common python libraries for logilab applications"
+set name=com.oracle.info.description value="the logilab-common Python 2.7 module"
+set name=com.oracle.info.tpno value=8268
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/logilab-common/logilab-common.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------------
-- logilab-common 0.58.2 -
--------------------------
-Oracle Internal Tracking Number 8268
-
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
--- a/components/logilab-common/logilab-common.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/logilab-common/logilab-common.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="Modules providing low level functionality shared among various python projects."
 set name=pkg.summary value="common python libraries for logilab applications"
+set name=com.oracle.info.description value="the logilab-common Python module"
+set name=com.oracle.info.tpno value=8268
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/lua/lua.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lua/lua.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------
-- lua 5.1.4 -
--------------
-
-Oracle Internal Tracking Number 5814
-
 License for Lua 5.0 and later versions
 
 Copyright (C) 1994-2010 Lua.org, PUC-Rio.
--- a/components/lua/lua.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/lua/lua.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,8 @@
 set name=pkg.description \
     value="Lua is a powerful, fast, lightweight, embeddable scripting language."
 set name=pkg.summary value="Lua Programming language"
+set name=com.oracle.info.description value="the lua scripting language"
+set name=com.oracle.info.tpno value=5814
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/m4/m4.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/m4/m4.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-For the avoidance of doubt, except that if any license choice other than
-GPL or LGPL is available it will apply instead, Oracle elects to use
-only the General Public License version 3 (GPLv3) at this time for any
-software where a choice of GPL license versions is made available with
-the language indicating that GPLv3 or any later version may be used.
-
---------------------------------------------------------------------
-
-Copyright (C) 1985-2008 Free Software Foundation, Inc. 
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/m4/m4.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/m4/m4.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -29,6 +29,7 @@
 set name=pkg.description \
     value="GNU M4 is an implementation of the traditional Unix macro processor"
 set name=pkg.summary value="GNU m4"
+set name=com.oracle.info.description value="GNU m4"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/make/make.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/make/make.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,10 +1,3 @@
------------------
-- GNU Make 3.82 -
------------------
-Oracle Internal Tracking Number 5521
-
------------------------------------------------------------------------
-
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
--- a/components/make/make.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/make/make.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -29,6 +29,8 @@
 set name=pkg.description \
     value="GNU Make is an utility which controls the generation of executables and other target files."
 set name=pkg.summary value="A utility for directing compilation."
+set name=com.oracle.info.description value="GNU make"
+set name=com.oracle.info.tpno value=5521
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mc/mc.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mc/mc.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,14 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-
---------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
--- a/components/mc/mc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mc/mc.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +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="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/meld/meld.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/meld/meld.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
-
 Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>
 Copyright (C) 2003-2007 Free Software Foundation, Inc.
 Copyright (C) 2003-2005 Miloslav Trmac <[email protected]>
--- a/components/meld/meld.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/meld/meld.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -27,6 +27,7 @@
 set name=pkg.description \
     value="Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial."
 set name=pkg.summary value="meld - graphical diff and merge tool"
+set name=com.oracle.info.description value="the meld graphical diff and merge tool"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/memcached-java/memcached-java.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached-java/memcached-java.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------------
-- memchached-java 2.0.1 -
--------------------------
-
-Oracle Internal Tracking Number 5586
-
 src/com/danga/ByteBufArrayInputStream.java
 ========================================== 
  * Copyright (c) 2007 Greg Whalin 
--- a/components/memcached-java/memcached-java.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached-java/memcached-java.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform dir file path=usr/share/lib/java/javadoc* -> default group other>
@@ -30,7 +30,9 @@
 	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=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)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/memcached/memcached.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached/memcached.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,9 +1,3 @@
--------------------
-- memcached 1.4.5 -
--------------------
-
-Oracle Internal Tracking Number 5711
-
 Copyright (c) 2003, Danga Interactive, Inc.
 All rights reserved.
 
--- a/components/memcached/memcached.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/memcached/memcached.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 set name=pkg.fmri value=pkg:/service/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The memcached memory object cache"
+set name=com.oracle.info.description value="the memcached memory object cache"
+set name=com.oracle.info.tpno value=5711
 set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mercurial/mercurial-26.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial-26.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # 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.
 #
 
 set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Mercurial Source Control Management System"
 set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=com.oracle.info.description value="the Mercurial source control management system"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mercurial/mercurial-27.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial-27.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,12 +18,13 @@
 #
 # 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.
 #
 
 set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Mercurial Source Control Management System"
 set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=com.oracle.info.description value="the Mercurial source control management system"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mercurial/mercurial.copyright	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial.copyright	Sat Apr 06 08:18:24 2013 -0700
@@ -1,12 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
---------------------------------------------------------------------
 Copyright (C) 2004, 2005 Canonical Ltd
 Copyright (C) 2005 Paul Mackerras.  All rights reserved.
 Copyright (C) 2005 Steve Borho
--- a/components/mercurial/mercurial.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mercurial/mercurial.p5m	Sat Apr 06 08:18:24 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -35,6 +35,7 @@
 set name=pkg.fmri value=pkg:/developer/versioning/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="The Mercurial Source Control Management System"
 set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
+set name=com.oracle.info.description value="the Mercurial source control management system"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/mpc/mpc.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mpc/mpc.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,11 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 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="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.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mpfr/mpfr.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-------------------------------------------------------------------
-
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999
 
--- a/components/mpfr/mpfr.p5m	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mpfr/mpfr.p5m	Sat Apr 06 08:18:24 2013 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 
 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=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/mutt/mutt.license	Fri Apr 05 07:47:58 2013 -0700
+++ b/components/mutt/mutt.license	Sat Apr 06 08:18:24 2013 -0700
@@ -1,13 +1,3 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
-====================================================================
-