7073736 need to turn _ into -
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 08 Aug 2011 10:30:52 -0700
changeset 464 08f94c414553
parent 463 12371db48dee
child 465 48a8e911990f
7073736 need to turn _ into -
components/a2ps/a2ps.p5m
components/aalib/aalib.p5m
components/acpidump/acpidump.p5m
components/ant/ant.p5m
components/apache2-modules/mod_dtrace/apache-dtrace.p5m
components/apache2-modules/mod_fcgid/apache-fcgid.p5m
components/apache2-modules/mod_jk/apache-jk.p5m
components/apache2-modules/mod_perl/apache-perl.p5m
components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m
components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m
components/apache2-modules/mod_security2/apache-security.p5m
components/apache2/apache-22.p5m
components/apache2/apache-sed.p5m
components/apache2/documentation.p5m
components/apr-util/apr-util-13-apr-ldap.p5m
components/apr-util/apr-util-13-dbd-mysql.p5m
components/apr-util/apr-util-13-dbd-sqlite.p5m
components/apr-util/apr-util-13-doc.p5m
components/apr-util/apr-util-13.p5m
components/apr/apr-13-doc.p5m
components/apr/apr-13.p5m
components/areca/areca.p5m
components/autoconf/autoconf.p5m
components/autogen/autogen.p5m
components/automake/automake-1.10/automake.p5m
components/automake/automake-1.9.6/automake.p5m
components/bash/bash.p5m
components/bcc/bcc.p5m
components/beanshell/beanshell.p5m
components/berkeleydb/berkeleydb.p5m
components/bind/bind.p5m
components/bind/bindc.p5m
components/binutils/binutils.p5m
components/bison/bison-runtime.p5m
components/bison/bison.p5m
components/bzip2/bzip2.p5m
components/cdrtools/cdrtools.p5m
components/clisp/clisp.p5m
components/cmake/cmake.p5m
components/common/gcmn.p5m
components/conflict/conflict.p5m
components/convmv/convmv.p5m
components/coreutils/coreutils.p5m
components/cups/cups-libs.p5m
components/cups/cups.p5m
components/curl/curl.p5m
components/cvs/cvs.p5m
components/diffutils/diffutils.p5m
components/doxygen/doxygen.p5m
components/ejabberd/ejabberd.p5m
components/elinks/elinks.p5m
components/emacs/gnu-emacs-gtk.p5m
components/emacs/gnu-emacs-lisp.p5m
components/emacs/gnu-emacs-no-x11.p5m
components/emacs/gnu-emacs-x11.p5m
components/emacs/gnu-emacs.p5m
components/erlang/erlang-doc.p5m
components/erlang/erlang.p5m
components/fastcgi/fcgi-doc.p5m
components/fastcgi/fcgi.p5m
components/fetchmail/fetchmail.p5m
components/flex/flex.p5m
components/flex/flexruntime.p5m
components/foomatic/db-engine/foomatic-db-engine.p5m
components/foomatic/db/foomatic-db.p5m
components/foomatic/filters/foomatic-rip.p5m
components/foomatic/fppd/foomatic-ppds.p5m
components/fping/fping.p5m
components/gawk/gawk.p5m
components/gcc3/gcc-3-runtime.p5m
components/gcc3/gcc-3.p5m
components/gd2/gd2.p5m
components/gdb/gdb.p5m
components/gdbm/gdbm.p5m
components/gettext/gettext.p5m
components/ggrep/gnu-grep.p5m
components/ghostscript/ghostscript.p5m
components/git/git.p5m
components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
components/gnump/gmp.p5m
components/gnupg/gnupg.p5m
components/gnuplot/gnuplot.p5m
components/gnupth/gnupth.p5m
components/gocr/gocr.p5m
components/gperf/gperf.p5m
components/gpgme/gpgme.p5m
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-ruby.p5m
components/graphviz/graphviz-sharp.p5m
components/graphviz/graphviz-tcl.p5m
components/graphviz/graphviz.p5m
components/gtar/gtar.p5m
components/guile/guile.p5m
components/gutenprint/gutenprint.p5m
components/gzip/gzip.p5m
components/hal-cups-utils/hal-cups-utils.p5m
components/hexedit/hexedit.p5m
components/hplip/hplip.p5m
components/httping/httping.p5m
components/hwdata/hwdata.p5m
components/iftop/iftop.p5m
components/ilmbase/ilmbase.p5m
components/imagemagick/imagemagick.p5m
components/iperf/iperf.p5m
components/ipmitool/ipmitool.p5m
components/ircii/ircii.p5m
components/isc-dhcp/dhcp.p5m
components/junit/junit.p5m
components/lcms/lcms.p5m
components/less/less.p5m
components/lftp/lftp.p5m
components/libassuan/libassuan.p5m
components/libconfuse/libconfuse.p5m
components/libevent/libevent.p5m
components/libexpat/expat.p5m
components/libidn/libidn.p5m
components/libksba/libksba.p5m
components/libmcrypt/libmcrypt.p5m
components/libmemcached/libmemcached.p5m
components/libmng/libmng.p5m
components/libneon/libneon.p5m
components/libnet/libnet.p5m
components/libpcap/libpcap.p5m
components/librsync/librsync.p5m
components/libsigsegv/libsigsegv.p5m
components/libsndfile/libsndfile.p5m
components/libtool/libltdl.p5m
components/libtool/libtool.p5m
components/libtorrent/libtorrent.p5m
components/libusb/ugen/libusbugen.p5m
components/libusb/wrapper/libusb.p5m
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2.p5m
components/libxslt/libxsl-26.p5m
components/libxslt/libxslt.p5m
components/lighttpd/lighttpd.p5m
components/links/links.p5m
components/logilab-astng/logilab-astng.p5m
components/logilab-common/logilab-common.p5m
components/lua/lua.p5m
components/m4/m4.p5m
components/make/make.p5m
components/mc/mc.p5m
components/meld/meld.p5m
components/memcached-java/memcached-java.p5m
components/memcached/memcached.p5m
components/mercurial/mercurial.p5m
components/mpc/mpc.p5m
components/mpfr/mpfr.p5m
components/mutt/mutt.p5m
components/mysql-5-1/mysql-51.p5m
components/mysql-5-1/mysql-51lib.p5m
components/mysql-5-1/mysql-51test.p5m
components/ncftp/ncftp.p5m
components/net-snmp/net-snmp-addons.p5m
components/net-snmp/net-snmp-base.p5m
components/net-snmp/net-snmp-documentation.p5m
components/nethack/nethack.p5m
components/nmap/nmap.p5m
components/ntp/ntp.p5m
components/open-fabrics/open-fabrics.p5m
components/openexr/openexr.p5m
components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m
components/openssl/openssl-1.0.0/openssl-1.0.0.p5m
components/openusb/openusb.p5m
components/p7zip/p7zip.p5m
components/pam_pkcs11/pam_pkcs11.p5m
components/patch/patch.p5m
components/pconsole/pconsole.p5m
components/pcre/pcre.p5m
components/perl512/perl-512.p5m
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.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/apache-php5.p5m
components/php-5_2/php-52.p5m
components/php-5_2/php-apc.p5m
components/php-5_2/php-doc.p5m
components/php-5_2/php-idn.p5m
components/php-5_2/php-memcache.p5m
components/php-5_2/php-mysql.p5m
components/php-5_2/php-pear.p5m
components/php-5_2/php-suhosin.p5m
components/php-5_2/php-tcpwrap.p5m
components/php-5_2/php-xdebug.p5m
components/pinentry/pinentry.p5m
components/privoxy/privoxy.p5m
components/proftpd/proftpd.p5m
components/psutils/psutils.p5m
components/pv/pv.p5m
components/pwgen/pwgen.p5m
components/pylint/pylint.p5m
components/python/cherrypy/cherrypy-26.p5m
components/python/cherrypy/cherrypy.p5m
components/python/coverage/coverage-26.p5m
components/python/coverage/coverage.p5m
components/python/ldtp/ldtp-26.p5m
components/python/ldtp/ldtp.p5m
components/python/m2crypto/m2crypto-26.p5m
components/python/m2crypto/m2crypto.p5m
components/python/mako/mako-26.p5m
components/python/mako/mako.p5m
components/python/ply/ply-26.p5m
components/python/ply/ply.p5m
components/python/pybonjour/pybonjour-26.p5m
components/python/pybonjour/pybonjour.p5m
components/python/pycups/pycups.p5m
components/python/pycurl/pycurl-26.p5m
components/python/pycurl/pycurl.p5m
components/python/pylxml/pylxml.p5m
components/python/pyopenssl/pyopenssl-26.p5m
components/python/python26/python-26-tests.p5m
components/python/python26/python-26.p5m
components/python/python26/tkinter-26.p5m
components/python/python27/python-27-tests.p5m
components/python/python27/python-27.p5m
components/python/python27/tkinter-27.p5m
components/quagga/quagga.p5m
components/quilt/quilt.p5m
components/rdiff-backup/rdiff-backup.p5m
components/readline/readline.p5m
components/rpm2cpio/rpm2cpio.p5m
components/rsync/rsync.p5m
components/rtorrent/rtorrent.p5m
components/ruby/ruby-18.p5m
components/samba/samba/samba.p5m
components/samba/samba30/libsmbclient.p5m
components/sane-backends/sane-backends.p5m
components/sane-frontends/sane-frontends.p5m
components/sblim/sblim.p5m
components/screen/screen.p5m
components/sed/sed.p5m
components/slang/slang.p5m
components/slib/slib.p5m
components/slrn/slrn.p5m
components/snort/snort.p5m
components/sox/sox.p5m
components/spawn-fcgi/spawn-fcgi.p5m
components/squid/squid.p5m
components/stdcxx/stdcxx.p5m
components/subversion/subversion-java.p5m
components/subversion/subversion-perl.p5m
components/subversion/subversion-python.p5m
components/subversion/subversion.p5m
components/sudo/sudo.p5m
components/swig/swig.p5m
components/tcl/expect/expect.p5m
components/tcl/tcl/tcl.p5m
components/tcl/tk/tk.p5m
components/tcltls/tcltls.p5m
components/tcpdump/tcpdump.p5m
components/tcsh/tcsh.p5m
components/texinfo/texinfo.p5m
components/tidy/tidy.p5m
components/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.p5m
components/unrar/unrar.p5m
components/unzip/unzip.p5m
components/vim/gvim.p5m
components/vim/vim-core.p5m
components/vim/vim.p5m
components/wget/wget.p5m
components/which/which.p5m
components/wireshark/tshark.p5m
components/wireshark/wireshark-common.p5m
components/wireshark/wireshark.p5m
components/wxwidgets/wxwidgets.p5m
components/xorriso/xorriso.p5m
components/zip/zip.p5m
components/zlib/zlib.p5m
components/zsh/zsh.p5m
tools/python/pkglint/userland.py
tools/userland-mangler
transforms/manifest-metadata-template
--- a/components/a2ps/a2ps.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/a2ps/a2ps.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="GNU a2ps - 'Anything to PostScript' converter and pretty printer"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/a2ps/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2004/262
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/a2ps/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2004/262
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/gnu
--- a/components/aalib/aalib.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/aalib/aalib.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="AAlib - Ascii art graphics 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/302
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/302
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license aalib.license license='LGPLv2'
--- a/components/acpidump/acpidump.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/acpidump/acpidump.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="acpidump - utilities used to display ACPI tables"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.lesswatts.org/projects/acpi/utilities.php
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/458
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.lesswatts.org/projects/acpi/utilities.php
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/458
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/ant/ant.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ant/ant.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
 set name=pkg.summary value="Apache Ant"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Distribution Tools"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://ant.apache.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2002/232
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://ant.apache.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2002/232
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,9 +26,9 @@
     value="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="http://prefetch.net/projects/apache_modtrace/"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/090
+set name=info.upstream-url value="http://prefetch.net/projects/apache_modtrace/"
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/090
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="FastCGI plugin for Apache Web Server Version 2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://httpd.apache.org/mod_fcgid/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/600
+set name=info.upstream-url value="http://httpd.apache.org/mod_fcgid/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/600
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2-modules/mod_jk/apache-jk.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="Tomcat Connector plugin for Apache Web Server Version 2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://tomcat.apache.org/connectors-doc/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/090
+set name=info.upstream-url value="http://tomcat.apache.org/connectors-doc/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/090
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2-modules/mod_perl/apache-perl.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2-modules/mod_perl/apache-perl.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
     value="Perl plugin for Apache Web Server Version 2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://perl.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/586
+set name=info.upstream-url value="http://perl.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/586
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,9 +28,9 @@
     value="Proxy HTML plugin for Apache Web Server Version 2.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_proxy_html/"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/553
+set name=info.upstream-url value="http://apache.webthing.com/mod_proxy_html/"
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/553
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2-modules/mod_proxy_html/apache-xml2enc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,9 +28,9 @@
     value="xml2enc plugin for Apache Web Server Version 2.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/"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/553
+set name=info.upstream-url value="http://apache.webthing.com/mod_xml2enc/"
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/553
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2-modules/mod_security2/apache-security.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2-modules/mod_security2/apache-security.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="Mod Security plugin for Apache Web Server Version 2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://www.modsecurity.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/090
+set name=info.upstream-url value="http://www.modsecurity.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/090
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2/apache-22.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2/apache-22.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
     value="The Apache HTTP Server Version 2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://httpd.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/565
+set name=info.upstream-url value="http://httpd.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/565
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2/apache-sed.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2/apache-sed.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,9 +28,9 @@
     value="mod_sed plugin for Apache Web Server Version 2.2"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://httpd.apache.org/docs/2.3/mod/mod_sed.html"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/122
+set name=info.upstream-url value="http://httpd.apache.org/docs/2.3/mod/mod_sed.html"
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/122
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apache2/documentation.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apache2/documentation.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="The Apache HTTP Server Version 2.2 (documentation)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://httpd.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/565
+set name=info.upstream-url value="http://httpd.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/565
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 
--- a/components/apr-util/apr-util-13-apr-ldap.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apr-util/apr-util-13-apr-ldap.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
     value="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="http://apr.apache.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=info.upstream-url value="http://apr.apache.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/apr-util/apr-util-13-dbd-mysql.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apr-util/apr-util-13-dbd-mysql.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
     value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for MySQL 5.0"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://apr.apache.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=info.upstream-url value="http://apr.apache.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/apr-util/apr-util-13-dbd-sqlite.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apr-util/apr-util-13-dbd-sqlite.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
     value="Apache Portable Runtime Utility (APR-util) 1.3 DBD Driver for SQLite 3.5"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://apr.apache.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=info.upstream-url value="http://apr.apache.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/apr-util/apr-util-13-doc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apr-util/apr-util-13-doc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="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="http://apr.apache.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=info.upstream-url value="http://apr.apache.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/apr-util/apr-util-13.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apr-util/apr-util-13.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
     value="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="http://apr.apache.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=info.upstream-url value="http://apr.apache.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/apr/apr-13-doc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apr/apr-13-doc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="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="http://apr.apache.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=info.upstream-url value="http://apr.apache.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/apr/apr-13.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/apr/apr-13.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="The shared libraries for any component using Apache Portable Runtime (APR) Version 1.3"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url value="http://apr.apache.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/541
+set name=info.upstream-url value="http://apr.apache.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/541
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/areca/areca.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/areca/areca.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -36,10 +36,10 @@
 set name=pkg.summary value="Areca backup utilities."
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/681
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/681
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license areca.copyright license=GPLv2
--- a/components/autoconf/autoconf.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/autoconf/autoconf.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="GNU autoconf utility"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/autoconf/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/424
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/autoconf/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/424
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/autogen/autogen.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/autogen/autogen.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="GNU autogen utility"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/autogen/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/315
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/autogen/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/315
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/automake/automake-1.10/automake.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/automake/automake-1.10/automake.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="A Makefile generator"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/automake/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/293
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/automake/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/automake/automake-1.9.6/automake.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/automake/automake-1.9.6/automake.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="A Makefile generator"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/automake/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/293
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/automake/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/bash/bash.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/bash/bash.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
     value=pkg:/shell/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary 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=http://www.gnu.org/software/bash/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/bash/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=etc
--- a/components/bcc/bcc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/bcc/bcc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,11 +27,11 @@
 set name=pkg.summary value="bcc - Development tools for 8086 code"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url \
     value=http://homepage.ntlworld.com/robert.debath/dev86/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/336
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/336
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/beanshell/beanshell.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/beanshell/beanshell.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 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=info.classification \
     value="org.opensolaris.category.2008:Development/Java"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/270/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/270/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/berkeleydb/berkeleydb.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/berkeleydb/berkeleydb.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -33,11 +33,11 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Databases
 set name=info.keyword value=bdb
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url \
     value=http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2010/300
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2010/300
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/bind/bind.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/bind/bind.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
     value="BIND DNS Name server and configuration tools."
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Services"
-set name=info.upstream_url value="http://www.isc.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2009/308
+set name=info.upstream-url value="http://www.isc.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2009/308
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=lib
--- a/components/bind/bindc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/bind/bindc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,11 +27,11 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/Internet"
 set name=pkg.description value="DNS tools and related libraries."
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2009/308
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2009/308
 
 license bind.license license="ISC license"
 
--- a/components/binutils/binutils.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/binutils/binutils.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="binutils - GNU binutils"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/binutils/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/656/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/binutils/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/656/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/bison/bison-runtime.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/bison/bison-runtime.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="bison - A YACC Replacement (Runtime Libraries)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/bison/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/289
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/bison/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/sfw
--- a/components/bison/bison.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/bison/bison.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="bison - A YACC Replacement"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/bison/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/289
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/bison/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/bzip2/bzip2.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/bzip2/bzip2.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -32,10 +32,10 @@
     value="high-quality block-sorting file compressor - utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.bzip.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.bzip.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/cdrtools/cdrtools.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/cdrtools/cdrtools.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Media"
-set name=info.upstream_url value="http://cdrecord.berlios.de/private/cdrecord.html"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/089
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://cdrecord.berlios.de/private/cdrecord.html"
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/089
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license cdrtools.license license="CDDLv1.0, GPLv2, LGPLv2.1, BSD 2 clause"
--- a/components/clisp/clisp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/clisp/clisp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="GNU Common Lisp"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/141
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/141
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license clisp.copyright license="clisp, GPLv2"
--- a/components/cmake/cmake.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/cmake/cmake.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -35,11 +35,11 @@
     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=info.classification \
 	value="org.opensolaris.category.2008:Development/Distribution Tools"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/614
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/614
 
 dir path=usr
 dir path=usr/bin
--- a/components/common/gcmn.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/common/gcmn.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,8 +26,8 @@
 set name=pkg.summary value="gcmn - Common GNU package"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/GNU"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/487
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/487
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 license gcmn.license license=GPLv2
 
--- a/components/conflict/conflict.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/conflict/conflict.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Displays conflicting filenames in $PATH (6.0)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/003
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/003
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license conflict.copyright license='BSD-like'
--- a/components/convmv/convmv.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/convmv/convmv.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,11 +29,11 @@
 set name=pkg.summary value="Filename Encoding Conversion Tool"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url \
     value=http://www.j3e.de/linux/convmv/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/024
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/024
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license convmv.copyright license=GPLv2
--- a/components/coreutils/coreutils.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/coreutils/coreutils.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://ftp.gnu.org/gnu/coreutils/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2010/170
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://ftp.gnu.org/gnu/coreutils/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2010/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/cups/cups-libs.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/cups/cups-libs.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,9 +24,9 @@
 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=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)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2008/130
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/130
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license cups-license license="CUPS, GPLv2, LGPLv2.1, Aladdin, Unicode"
--- a/components/cups/cups.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/cups/cups.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -37,9 +37,9 @@
 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=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)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2008/130
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/130
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license cups-license license="CUPS, GPLv2, LGPLv2.1, Aladdin, Unicode"
--- a/components/curl/curl.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/curl/curl.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://curl.haxx.se/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/165
+set name=info.upstream-url value="http://curl.haxx.se/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/165
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/cvs/cvs.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/cvs/cvs.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.nongnu.org/cvs/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/128
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.nongnu.org/cvs/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/128
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/diffutils/diffutils.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/diffutils/diffutils.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
 set name=pkg.summary value="GNU diffutils"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/diffutils/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/189
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/diffutils/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/doxygen/doxygen.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/doxygen/doxygen.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,11 +29,11 @@
 set name=pkg.summary value="Source Code Documentation Tool"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Distribution Tools"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url \
     value=http://www.stack.nl/~dimitri/doxygen/index.html
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/612/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/612/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/ejabberd/ejabberd.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ejabberd/ejabberd.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="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)
-set name=info.upstream_url value=http://www.ejabberd.im/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/340
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.ejabberd.im/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/340
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=runtime/[email protected] type=require
--- a/components/elinks/elinks.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/elinks/elinks.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="advanced text-mode WWW browser"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://elinks.or.cz/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/028
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://elinks.or.cz/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/028
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/emacs/gnu-emacs-gtk.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/emacs/gnu-emacs-gtk.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 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=info.classification value="org.opensolaris.category.2008:Development/Editors"
-set name=info.upstream_url value=http://www.gnu.org/software/emacs/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
+set name=info.upstream-url value=http://www.gnu.org/software/emacs/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs-lisp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/emacs/gnu-emacs-lisp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 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=info.classification value="org.opensolaris.category.2008:Development/Editors"
-set name=info.upstream_url value=http://www.gnu.org/software/emacs/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
+set name=info.upstream-url value=http://www.gnu.org/software/emacs/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs-no-x11.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/emacs/gnu-emacs-no-x11.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 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=info.classification value="org.opensolaris.category.2008:Development/Editors"
-set name=info.upstream_url value=http://www.gnu.org/software/emacs/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
+set name=info.upstream-url value=http://www.gnu.org/software/emacs/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs-x11.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/emacs/gnu-emacs-x11.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 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=info.classification value="org.opensolaris.category.2008:Development/Editors"
-set name=info.upstream_url value=http://www.gnu.org/software/emacs/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
+set name=info.upstream-url value=http://www.gnu.org/software/emacs/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/emacs/gnu-emacs.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/emacs/gnu-emacs.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=info.classification value="org.opensolaris.category.2008:Development/Editors"
-set name=info.upstream_url value=http://www.gnu.org/software/emacs/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/494
+set name=info.upstream-url value=http://www.gnu.org/software/emacs/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/494
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license emacs.license license="GPLv3"
--- a/components/erlang/erlang-doc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/erlang/erlang-doc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="Erlang HTML Documents"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value="http://www.erlang.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/210
+set name=info.upstream-url value="http://www.erlang.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/210
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license EPLICENCE license="EPL 1.1"
--- a/components/erlang/erlang.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/erlang/erlang.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="Erlang programming language and OTP librarie"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value="http://www.erlang.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/210
+set name=info.upstream-url value="http://www.erlang.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/210
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license EPLICENCE license="EPL 1.1"
--- a/components/fastcgi/fcgi-doc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/fastcgi/fcgi-doc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="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)
-set name=info.upstream_url value=http://www.fastcgi.com
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/014
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.fastcgi.com
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/014
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/share
--- a/components/fastcgi/fcgi.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/fastcgi/fcgi.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value=FastCGI
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.fastcgi.com
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/014
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.fastcgi.com
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/014
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/fetchmail/fetchmail.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/fetchmail/fetchmail.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,11 +29,11 @@
 set name=pkg.summary value="fetch mail from a POP, IMAP, ETRN, or ODMR-capable server"
 set name=pkg.description value="Fetchmail is a full-featured, robust, well-documented remote-mail retrieval and forwarding utility intended to be used over on-demand TCP/IP links (such as SLIP or PPP connections). It supports every remote-mail protocol now in use on the Internet: POP2, POP3, RPOP, APOP, KPOP, all flavors of IMAP, ETRN, and ODMR. It can even support IPv6 and IPSEC."
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/135/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/135/
 
 license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
 
--- a/components/flex/flex.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/flex/flex.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,10 +24,10 @@
 set name=pkg.fmri value=pkg:/developer/lexer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Flex Lexer"
 set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value="http://flex.sourceforge/net"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://flex.sourceforge/net"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2007/289/
+set name=org.opensolaris.arc-caseid value=PSARC/2007/289/
 
 license flex.license license='BSD'
 
--- a/components/flex/flexruntime.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/flex/flexruntime.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,10 +24,10 @@
 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=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value="http://flex.sourceforge/net"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://flex.sourceforge/net"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2007/289/
+set name=org.opensolaris.arc-caseid value=PSARC/2007/289/
 
 license flex.license license='BSD'
 
--- a/components/foomatic/db-engine/foomatic-db-engine.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/foomatic/db-engine/foomatic-db-engine.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/print/cups/filter/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2008/595
+set name=org.opensolaris.arc-caseid value=PSARC/2008/595
 
 license foomatic-db-engine.license license='GPLv2, MIT'
 
--- a/components/foomatic/db/foomatic-db.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/foomatic/db/foomatic-db.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,10 +24,10 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2008/578
+set name=org.opensolaris.arc-caseid value=PSARC/2008/578
 
 license foomatic-db.license license='GPLv2, MIT'
 
--- a/components/foomatic/filters/foomatic-rip.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/foomatic/filters/foomatic-rip.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/LSARC/2004/262
+set name=org.opensolaris.arc-caseid value=LSARC/2004/262
 
 depend fmri=__TBD pkg.debug.depend.file=usr/bin/a2ps type=require
 
--- a/components/foomatic/fppd/foomatic-ppds.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/foomatic/fppd/foomatic-ppds.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,10 +24,10 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2008/537
+set name=org.opensolaris.arc-caseid value=PSARC/2008/537
 
 license foomatic-ppds.license license='GPLv2, MIT'
 
--- a/components/fping/fping.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/fping/fping.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="fping - a program to ping hosts in parallel"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://fping.sourceforge.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/160
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://fping.sourceforge.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/160
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/security
--- a/components/gawk/gawk.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gawk/gawk.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="GNU awk"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://directory.fsf.org/project/gawk/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/594
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://directory.fsf.org/project/gawk/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/594
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/gcc3/gcc-3-runtime.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gcc3/gcc-3-runtime.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.description value="GCC Runtime - Shared libraries used by gcc and other gnu components"
 set name=info.classification value=org.opensolaris.category.2008:Development/C
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=info.upstream_url value="http://gcc.gnu.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.upstream-url value="http://gcc.gnu.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2000/488
 
 dir path=usr
 dir path=usr/sfw
--- a/components/gcc3/gcc-3.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gcc3/gcc-3.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
 set name=pkg.description value="GNU C - The GNU C compiler 3.4.3"
 set name=info.classification value=org.opensolaris.category.2008:Development/C
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=info.upstream_url value="http://gcc.gnu.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.upstream-url value="http://gcc.gnu.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2000/488
 
 dir path=usr
 dir path=usr/bin
--- a/components/gd2/gd2.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gd2/gd2.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="The Graphics Draw 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=http://www.libgd.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/166
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.libgd.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/166
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/gdb/gdb.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gdb/gdb.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,11 +25,11 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/492/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/492/
 
 dir path=usr
 dir path=usr/bin
--- a/components/gdbm/gdbm.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gdbm/gdbm.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 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=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)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2008/645/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2008/645/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license gdbm.license license='GPLv2'
--- a/components/gettext/gettext.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gettext/gettext.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="GNU gettext"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/gettext/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/635
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/gettext/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/635
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/ggrep/gnu-grep.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ggrep/gnu-grep.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="GNU grep utilities"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://gnu.org/software/grep/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://gnu.org/software/grep/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/ghostscript/ghostscript.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ghostscript/ghostscript.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.fmri value=pkg:/print/filter/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GPL Ghostscript"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing "
-set name=info.upstream_url value=http://ghostscript.com/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2010/010
+set name=info.upstream-url value=http://ghostscript.com/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license ghostscript.license license="GPLv3"
--- a/components/git/git.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/git/git.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="git - Fast 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)
-set name=info.upstream_url value=http://git-scm.com/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/360
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://git-scm.com/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/360
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.summary value="GNU Ghostscript Fonts (Other)"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://sourceforge.net/projects/gs-fonts/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2010/010
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://sourceforge.net/projects/gs-fonts/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/share
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="GNU Ghostscript Fonts (Standard)"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Printing "
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://sourceforge.net/projects/gs-fonts/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2010/010
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://sourceforge.net/projects/gs-fonts/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/share
--- a/components/gnump/gmp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gnump/gmp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="GNU MP"
 set name=pkg.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="http://gmplib.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/634
+set name=info.upstream-url value="http://gmplib.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/634
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/gnupg/gnupg.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gnupg/gnupg.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 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=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://www.gnupg.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/397
+set name=info.upstream-url value="http://www.gnupg.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/gnuplot/gnuplot.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gnuplot/gnuplot.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,9 +26,9 @@
 set name=pkg.summary value="gnuplot - plotting utility"
 set name=pkg.description value="gnuplot - command-driven interactive function plotting program (4.4.0)"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
-set name=info.upstream_url value=http://sourceforge.net/projects/gnuplot/files/gnuplot/4.4.0/gnuplot-4.4.0.tar.gz/download
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2009/395
+set name=info.upstream-url value=http://sourceforge.net/projects/gnuplot/files/gnuplot/4.4.0/gnuplot-4.4.0.tar.gz/download
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/395
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 license gnuplot.license license=other
 
--- a/components/gnupth/gnupth.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gnupth/gnupth.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.gnu.org/software/pth/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/397
+set name=info.upstream-url value="http://www.gnu.org/software/pth/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/gocr/gocr.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gocr/gocr.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,11 +26,11 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/746
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/746
 
 license gocr.license license='GPLv2'
 
--- a/components/gperf/gperf.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gperf/gperf.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="GNU gperf"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/gperf
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/123
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/gperf
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/123
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/gpgme/gpgme.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gpgme/gpgme.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.gnupg.org/related_software/gpgme/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/397
+set name=info.upstream-url value="http://www.gnupg.org/related_software/gpgme/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/grails/grails.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/grails/grails.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -36,10 +36,10 @@
 set name=pkg.summary value="A 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)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/530
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/530
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license grails.copyright license="Apache v2.0, CPL, BSD, LGPLv2.1"
--- a/components/graphviz/graphviz-java.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-java.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/java
 file path=usr/lib/graphviz/java/SWIGTYPE_p_Agedge_t.java
--- a/components/graphviz/graphviz-lua.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-lua.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/lua
 dir path=usr/share/graphviz/demo
--- a/components/graphviz/graphviz-ocaml.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-ocaml.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/ocaml
 file path=usr/lib/graphviz/ocaml/META.gv
--- a/components/graphviz/graphviz-perl-512.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-perl-512.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/perl
 dir path=usr/share/graphviz/demo
--- a/components/graphviz/graphviz-php.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-php.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/php
 dir path=usr/share/graphviz/demo
--- a/components/graphviz/graphviz-python-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-python-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/python26
 file path=usr/lib/graphviz/python26/gv.py
--- a/components/graphviz/graphviz-ruby.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-ruby.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/ruby
 dir path=usr/share/graphviz/demo
--- a/components/graphviz/graphviz-sharp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-sharp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/sharp
 file path=usr/lib/graphviz/sharp/SWIGTYPE_p_Agedge_t.cs
--- a/components/graphviz/graphviz-tcl.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz-tcl.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary 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)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/lib/graphviz/tcl
 dir path=usr/share/graphviz/demo
--- a/components/graphviz/graphviz.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/graphviz/graphviz.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,11 +29,11 @@
 set name=pkg.summary value="Graph visualization software"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.graphviz.org/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.graphviz.org/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/269
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/269
 
 dir path=usr/include/graphviz
 dir path=usr/lib/graphviz
--- a/components/gtar/gtar.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gtar/gtar.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="GNU version of the tar archiving utility"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/tar/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/tar/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/guile/guile.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/guile/guile.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
 set name=pkg.summary value="GNU guile utility"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/guile/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/315
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/guile/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/315
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/gutenprint/gutenprint.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gutenprint/gutenprint.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="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)
-set name=info.upstream_url value=http://www.gutenprint.org/software/gutenprint
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/469
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gutenprint.org/software/gutenprint
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/469
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/gzip/gzip.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/gzip/gzip.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="GNU Zip (gzip)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://directory.fsf.org/GNU/gzip.html
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://directory.fsf.org/GNU/gzip.html
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/hal-cups-utils/hal-cups-utils.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/hal-cups-utils/hal-cups-utils.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Automatic queue creation for CUPS"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://fedorahosted.org/hal-cups-utils/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/240
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://fedorahosted.org/hal-cups-utils/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/240
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/hal
--- a/components/hexedit/hexedit.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/hexedit/hexedit.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities" \
     value="org.opensolaris.category.2008:Development/Editors"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://merd.sourceforge.net/pixel/hexedit.html
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/629
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://merd.sourceforge.net/pixel/hexedit.html
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/629
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/hplip/hplip.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/hplip/hplip.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="hpijs - HP InkJet Server"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Printing "
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://hplipopensource.com/hplip-web/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2004/262
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://hplipopensource.com/hplip-web/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2004/262
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 # HPIJS support for LP
--- a/components/httping/httping.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/httping/httping.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,11 +27,11 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2009/118
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2009/118
 
 license httping.license license='GPLv2'
 
--- a/components/hwdata/hwdata.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/hwdata/hwdata.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,12 +30,12 @@
 set name=pkg.summary value="Hardware data files"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Hardware
-set name=info.source_url $(COMPONENT_ARCHIVE_URLS)
-set name=info.upstream_url value=http://pciids.sf.net/ \
+set name=info.source-url $(COMPONENT_ARCHIVE_URLS)
+set name=info.upstream-url value=http://pciids.sf.net/ \
     value=http://www.linux-usb.org/usb-ids.html
 # PSARC/2005/399 Tamarack: Removable Media Enhancements in Solaris
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2005/399
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2005/399
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/share
--- a/components/iftop/iftop.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/iftop/iftop.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/018
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/018
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license iftop.license license='GPLv2'
--- a/components/ilmbase/ilmbase.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ilmbase/ilmbase.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="Ilmbase libraries used to read and write OpenEXR images"
 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=http://www.openexr.com/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/209
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.openexr.com/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/209
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/imagemagick/imagemagick.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/imagemagick/imagemagick.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="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)
-set name=info.upstream_url value=http://www.imagemagick.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2007/316
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.imagemagick.org
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2007/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/iperf/iperf.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/iperf/iperf.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/109
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/109
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license iperf.license license='BSD-like'
--- a/components/ipmitool/ipmitool.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ipmitool/ipmitool.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/system/management/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="ipmitool - utility for controlling IPMI-enabled devices"
 set name=info.classification value="org.opensolaris.category.2008:System/Hardware"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-   value=http://arc.opensolaris.org/caselog/PSARC/2004/453
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+   value=PSARC/2004/453
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license ipmitool.license license='BSD-like'
--- a/components/ircii/ircii.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ircii/ircii.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="Internet Relay Chat Client"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.eterna.com.au/ircii/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/373
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.eterna.com.au/ircii/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/373
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/isc-dhcp/dhcp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/isc-dhcp/dhcp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="ISC DHCP Server and Relay Agent."
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Services
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.isc.org/software/dhcp/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/043
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.isc.org/software/dhcp/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=etc
--- a/components/junit/junit.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/junit/junit.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -33,10 +33,10 @@
 set name=pkg.summary value="Junit - Java unit testing framework"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Java
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://sourceforge.net/projects/junit/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/633
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://sourceforge.net/projects/junit/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/633
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/share
--- a/components/lcms/lcms.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/lcms/lcms.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="The Little Color Management System"
 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=http://www.littlecms.com/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/071
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.littlecms.com/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/071
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/less/less.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/less/less.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="pager program similar to more"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.greenwoodsoftware.com/less/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.greenwoodsoftware.com/less/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/lftp/lftp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/lftp/lftp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/276
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/276
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license lftp.license license=GPLv3
--- a/components/libassuan/libassuan.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libassuan/libassuan.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.gnupg.org/related_software/libksba/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/397
+set name=info.upstream-url value="http://www.gnupg.org/related_software/libksba/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/libconfuse/libconfuse.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libconfuse/libconfuse.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -42,10 +42,10 @@
 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=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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/151
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/151
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license libconfuse.copyright license='ISC'
--- a/components/libevent/libevent.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libevent/libevent.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="Libevent - an event notification 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=http://monkey.org/~provos/libevent/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/580
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://monkey.org/~provos/libevent/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/580
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/libexpat/expat.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libexpat/expat.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.description value="A fast, non-validating, stream-oriented XML parsing 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=http://expat.sourceforge.net
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2007/378
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://expat.sourceforge.net
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2007/378
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license COPYING license="expat license"
--- a/components/libidn/libidn.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libidn/libidn.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.gnu.org/software/libidn/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/167
+set name=info.upstream-url value="http://www.gnu.org/software/libidn/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/167
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/libksba/libksba.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libksba/libksba.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.gnupg.org/related_software/libksba/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/397
+set name=info.upstream-url value="http://www.gnupg.org/related_software/libksba/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/libmcrypt/libmcrypt.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libmcrypt/libmcrypt.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,11 +26,11 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2008/203
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2008/203
 
 license libmcrypt.license license='LGPLv2.1'
 
--- a/components/libmemcached/libmemcached.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libmemcached/libmemcached.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,11 +29,11 @@
     value="Libmemcached has been designed to be light on memory usage, thread safe, and provide full access to server side methods."
 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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/126
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/126
 
 dir path=usr
 dir path=usr/bin
--- a/components/libmng/libmng.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libmng/libmng.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream_url value="http://www.libmng.com/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/072
+set name=info.upstream-url value="http://www.libmng.com/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/072
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/libneon/libneon.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libneon/libneon.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="The Neon WebDAV 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=http://www.webdav.org/neon/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/563
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.webdav.org/neon/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/libnet/libnet.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libnet/libnet.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/409
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/409
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license libnet.license license='BSD'
--- a/components/libpcap/libpcap.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libpcap/libpcap.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Packet capture 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=http://www.tcpdump.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/288
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.tcpdump.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/288
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/librsync/librsync.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/librsync/librsync.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="A library that implements the rsync remote-delta algorithm"
 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/245
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/245
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/libsigsegv/libsigsegv.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libsigsegv/libsigsegv.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -32,10 +32,10 @@
 set name=pkg.summary value="libsigsegv - handling page faults in user mode"
 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=http://www.gnu.org/software/libsigsegv/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/107
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/libsigsegv/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/107
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/include
--- a/components/libsndfile/libsndfile.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libsndfile/libsndfile.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2008/767/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2008/767/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license libsndfile.license license="LGPLv2.1"
--- a/components/libtool/libltdl.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libtool/libltdl.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="GNU libtool dlopen wrapper"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/gnu/libtool/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/557
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/gnu/libtool/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/libtool/libtool.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libtool/libtool.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="GNU libtool"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/gnu/libtool/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/557
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/gnu/libtool/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/libtorrent/libtorrent.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libtorrent/libtorrent.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/336
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/336
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license libtorrent.license license='GPLv2'
--- a/components/libusb/ugen/libusbugen.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libusb/ugen/libusbugen.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="libusb ugen plugin"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Libraries"
-set name=info.source_url value=http://opensolaris.org/
-set name=info.upstream_url value=http://libusb.sf.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2003/721
+set name=info.source-url value=http://opensolaris.org/
+set name=info.upstream-url value=http://libusb.sf.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2003/721
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/libusb/wrapper/libusb.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libusb/wrapper/libusb.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Sun wrapper library for libusb"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Libraries"
-set name=info.source_url value=http://opensolaris.org/
-set name=info.upstream_url value=http://libusb.sf.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2003/721
+set name=info.source-url value=http://opensolaris.org/
+set name=info.upstream-url value=http://libusb.sf.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2003/721
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/libxml2/libxml2-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libxml2/libxml2-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="The XML library - Python 2.6 bindings"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://xmlsoft.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/630
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://xmlsoft.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/630
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/libxml2/libxml2.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libxml2/libxml2.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="The XML 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=http://xmlsoft.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/630
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://xmlsoft.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/630
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=lib
 dir path=lib/$(MACH64)
--- a/components/libxslt/libxsl-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libxslt/libxsl-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="The XSLT library - Python 2.6 bindings"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://xmlsoft.org/XSLT
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2002/244
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://xmlsoft.org/XSLT
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/libxslt/libxslt.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/libxslt/libxslt.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="The XSLT 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=http://xmlsoft.org/XSLT
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2002/244
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://xmlsoft.org/XSLT
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/lighttpd/lighttpd.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/lighttpd/lighttpd.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,12 +28,12 @@
     value="The Lighttpd Web Server"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.upstream_url \
+set name=info.upstream-url \
     value=http://www.lighttpd.net/
-set name=info.source_url \
+set name=info.source-url \
     value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/191
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/191
 set name=org.opensolaris.consolidation \
     value=$(CONSOLIDATION)
 
--- a/components/links/links.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/links/links.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,11 +25,11 @@
 set name=pkg.fmri value=pkg:/web/browser/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Text based web browser"
 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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/LSARC/2008/322/
+set name=org.opensolaris.arc-caseid \
+	value=LSARC/2008/322/
 
 license links.license license='GPLv2'
 
--- a/components/logilab-astng/logilab-astng.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/logilab-astng/logilab-astng.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="logilab-astng - Python Abstract Syntax Tree New Generation"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.logilab.org/project/logilab-astng/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/299
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.logilab.org/project/logilab-astng/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/299
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/logilab-common/logilab-common.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/logilab-common/logilab-common.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,11 +29,11 @@
 set name=pkg.summary value="common python libraries for logilab applications"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url \
     value=http://www.logilab.org/project/logilab-common/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/298
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/298
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/lua/lua.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/lua/lua.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Lua Programming language"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.lua.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/013
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.lua.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/013
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr
--- a/components/m4/m4.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/m4/m4.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="GNU m4"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/m4/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/388
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/m4/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/388
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/make/make.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/make/make.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="A utility for directing compilation."
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/make/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/make/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/mc/mc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mc/mc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="The 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)
-set name=info.upstream_url value=http://www.midnight-commander.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/202
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.midnight-commander.org/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/202
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/meld/meld.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/meld/meld.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="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)
-set name=info.upstream_url value=http://meld.sourceforge.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/189/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://meld.sourceforge.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/189/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/memcached-java/memcached-java.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/memcached-java/memcached-java.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -32,11 +32,11 @@
 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=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/126
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/126
 
 license memcached-java.license license="BSD-like"
 
--- a/components/memcached/memcached.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/memcached/memcached.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 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=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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/067
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/067
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license memcached.license license='BSD'
--- a/components/mercurial/mercurial.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mercurial/mercurial.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -36,9 +36,9 @@
 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=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value=http://mercurial.selenic.com/
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2006/417
+set name=info.upstream-url value=http://mercurial.selenic.com/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/417
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license mercurial.copyright license='GPLv2+'
--- a/components/mpc/mpc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mpc/mpc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,11 +24,11 @@
 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=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
-set name=info.upstream_url value="http://www.multiprecision.org"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://www.multiprecision.org"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-	value=http://arc.opensolaris.org/caselog/PSARC/2011/255
+set name=org.opensolaris.arc-caseid \
+	value=PSARC/2011/255
 
 license mpc.license license="LGPLv2.1"
 
--- a/components/mpfr/mpfr.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mpfr/mpfr.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="GNU MPFR"
 set name=pkg.description value="The GNU Multiple Precision with IEEE Rounding Floating-Point Library"
 set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
-set name=info.upstream_url value="http://www.mpfr.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/655
+set name=info.upstream-url value="http://www.mpfr.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/655
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/mutt/mutt.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mutt/mutt.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -39,11 +39,11 @@
 set name=pkg.summary value="The Mutt E-Mail Client"
 set name=pkg.description value="Mutt is a small but very powerful text-based mail client for Unix operating systems."
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/135/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/135/
 
 license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
 
--- a/components/mysql-5-1/mysql-51.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mysql-5-1/mysql-51.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="MySQL 5.1 Database Management System"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/062
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/062
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/mysql
--- a/components/mysql-5-1/mysql-51lib.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mysql-5-1/mysql-51lib.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="MySQL 5.1 libraries"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/062
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/062
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/mysql
--- a/components/mysql-5-1/mysql-51test.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/mysql-5-1/mysql-51test.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
     value="MySQL 5.1 tests"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Databases
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/062
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/062
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/mysql
--- a/components/ncftp/ncftp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ncftp/ncftp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.fmri value=pkg:/network/ftp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="NcFTP - client application implementing FTP"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url value="http://www.ncftp.com/ncftp/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.upstream-url value="http://www.ncftp.com/ncftp/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license ncftp.license license='Artistic'
--- a/components/net-snmp/net-snmp-addons.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/net-snmp/net-snmp-addons.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,11 +24,11 @@
 set name=pkg.fmri value=pkg:/system/management/snmp/net-snmp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Net-SNMP addon libraries"
 set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
-set name=info.upstream_url value="http://www.net-snmp.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://www.net-snmp.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/355
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/355
 
 license COPYING license="BSD, BSD-like"
 
--- a/components/net-snmp/net-snmp-base.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/net-snmp/net-snmp-base.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,13 +25,13 @@
 
 set name=pkg.fmri value=pkg:/system/management/snmp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Net-SNMP Agent files and libraries"
-set name=info.upstream_url value="http://www.net-snmp.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://www.net-snmp.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
 
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/355
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/355
 
 license COPYING license="BSD, BSD-like"
 
--- a/components/net-snmp/net-snmp-documentation.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/net-snmp/net-snmp-documentation.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,13 +25,13 @@
 
 set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=pkg.summary value="Net-SNMP Agent manpages and html documentation files"
-set name=info.upstream_url value="http://www.net-snmp.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://www.net-snmp.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=pkg.fmri value=pkg:/system/management/snmp/net-snmp/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/355
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/355
 
 license COPYING license="BSD, BSD-like"
 
--- a/components/nethack/nethack.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/nethack/nethack.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
 set name=pkg.summary value="A single-player dungeon exploration game"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Games
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url \
     value=http://www.nethack.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/172
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/172
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license nethack.copyright license=Nethack
--- a/components/nmap/nmap.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/nmap/nmap.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="Network exploration tool and security / port scanner."
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://insecure.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/129
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://insecure.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/129
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/ntp/ntp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ntp/ntp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
 set name=pkg.summary value="Network Time Protocol Daemon v4"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Services
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.ntp.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/244
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.ntp.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/inet
--- a/components/open-fabrics/open-fabrics.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/open-fabrics/open-fabrics.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,9 +28,9 @@
     value="Oracle Solaris OpenFabrics userland libraries and applications"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=info.upstream_url value=http://ant.apache.org
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url value=htp://arc.opensolaris.org/caselog/PSARC/2010/346
+set name=info.upstream-url value=http://ant.apache.org
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=htp://arc.opensolaris.org/caselog/PSARC/2010/346
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=variant.opensolaris.zone value=global value=nonglobal
 
--- a/components/openexr/openexr.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/openexr/openexr.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
     value="OpenEXR header files and libraries used to read and write OpenEXR images"
 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=http://www.openexr.com/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/209
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.openexr.com/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/209
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="FIPS 140-2 Capable OpenSSL libraries"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Security"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.openssl.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/507
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.openssl.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/507
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 # Basic directories and a configuration file.
 dir path=etc
--- a/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,9 +29,9 @@
 set name=pkg.summary value="OpenSSL - a Toolkit for Secure Sockets Layer (SSL v2/v3) and Transport Layer (TLS v1) protocols and general purpose cryptographic library"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Security"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.openssl.org
-set name=opensolaris.arc_url \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.openssl.org
+set name=org.opensolaris.arc-caseid \
     value=http://sac.sfbay.sun.com/PSARC/2011/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 # Basic directories, links, and a configuration file.
--- a/components/openusb/openusb.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/openusb/openusb.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="A USB device management 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/018
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/018
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/p7zip/p7zip.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/p7zip/p7zip.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
     value="P7zip is a unix port of the 7-Zip utility.  It has support for numerous compression algorithms, including LZMA and LZMA2, as well as for various archive and compression file formats, including 7z, xz, bzip2, gzip, tar, zip (read-write) and cab, cpio, deb, lzh, rar, and rpm (read-only)."
 set name=pkg.summary value="The p7zip compression and archiving utility"
 set name=info.classification value=org.opensolaris.category.2008:System/Core
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://p7zip.sourceforge.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/617
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://p7zip.sourceforge.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/617
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr/lib/7z
 dir path=usr/lib/7z/Codecs
--- a/components/pam_pkcs11/pam_pkcs11.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/pam_pkcs11/pam_pkcs11.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="The OpenSC PKCS#11 PAM Login Tools"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Security"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.opensc-project.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/283
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.opensc-project.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/283
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=etc
--- a/components/patch/patch.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/patch/patch.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="The GNU Patch utility"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/GNU
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/patch/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2001/799
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/patch/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2001/799
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/pconsole/pconsole.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/pconsole/pconsole.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.description value="pconsole is an administrative tool for working with clusters of machines: it distributes the commands you type to each node in the cluster."
 set name=pkg.summary value="Parallel console"
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/606
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/606
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license pconsole.copyright license='GPLv2'
--- a/components/pcre/pcre.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/pcre/pcre.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,11 +27,11 @@
 set name=pkg.summary value="Perl-Compatible Regular Expressions"
 set name=pkg.description value="The PCRE library is a set of functions that implement regular expression pattern matching using almost the same syntax and semantics as Perl"
 set name=info.classification value="org.opensolaris.category.2008:Development/C"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/164
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/164
 
 dir path=usr
 dir path=usr/bin
--- a/components/perl512/perl-512.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl512/perl-512.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value=Perl
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Perl
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.perl.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2010/359
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.perl.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2010/359
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/perl5
--- a/components/perl_modules/DBI/DBI.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/DBI/DBI.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.summary value="Perl Database Independent Interface"
 set name=pkg.description value="The DBI is the standard database interface module for Perl."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2007/431
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2007/431
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 # perl 5.8.4
 depend fmri=library/perl-5/database-584 predicate=runtime/perl-584 \
--- a/components/perl_modules/DBI/DBI_512.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/DBI/DBI_512.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Perl Database Independent Interface"
 set name=pkg.description value="The DBI is the standard database interface module for Perl."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2007/431
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2007/431
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license DBI.license license='Artistic'
--- a/components/perl_modules/DBI/DBI_584.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/DBI/DBI_584.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Perl Database Independent Interface"
 set name=pkg.description value="The DBI is the standard database interface module for Perl."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2007/431
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2007/431
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license DBI.license license='Artistic'
--- a/components/perl_modules/net-ssleay/net-ssleay-512.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/net-ssleay/net-ssleay-512.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Perl"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/189
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license net-ssleay.copyright license='OpenSSL, SSLeay'
--- a/components/perl_modules/net-ssleay/net-ssleay-584.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/net-ssleay/net-ssleay-584.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Perl"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/189
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license net-ssleay.copyright license='OpenSSL, SSLeay'
--- a/components/perl_modules/net-ssleay/net-ssleay.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/net-ssleay/net-ssleay.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Net::SSLeay- Perl extension for using OpenSSL"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Perl"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/189
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 # perl 5.8.4
--- a/components/perl_modules/pmtools/pmtools.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/pmtools/pmtools.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="Perl module tools."
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Perl
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://search.cpan.org/dist/pmtools/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/121/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://search.cpan.org/dist/pmtools/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/121/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 legacy pkg=SUNWperl-pmtools desc="pmtools - Perl module tools (1.10)" \
     name="Perl module tools"
--- a/components/perl_modules/pmtools/pmtools_512.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/pmtools/pmtools_512.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Perl module tools."
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Perl
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://search.cpan.org/dist/pmtools/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/121/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://search.cpan.org/dist/pmtools/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/121/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/perl5
--- a/components/perl_modules/pmtools/pmtools_584.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/pmtools/pmtools_584.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Perl module tools."
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Perl
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://search.cpan.org/dist/pmtools/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/121/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://search.cpan.org/dist/pmtools/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/121/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/perl5
--- a/components/perl_modules/xml-parser/xml-parser-512.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/xml-parser/xml-parser-512.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
 set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2004/251
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2004/251
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license xml-parser.license license='Artistic'
--- a/components/perl_modules/xml-parser/xml-parser-584.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/xml-parser/xml-parser-584.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
 set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2004/251
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2004/251
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license xml-parser.license license='Artistic'
--- a/components/perl_modules/xml-parser/xml-parser.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/xml-parser/xml-parser.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,8 +28,8 @@
 set name=pkg.summary value="XML::Parser - A perl module for parsing XML documents"
 set name=pkg.description value="This module provides ways to parse XML documents. It is built on top of XML::Parser::Expat."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 # perl 5.8.4
 depend fmri=library/perl-5/xml-parser-584 predicate=runtime/perl-584 \
--- a/components/perl_modules/xml-simple/xml-simple-512.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/xml-simple/xml-simple-512.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
 set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2004/251
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2004/251
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license xml-simple.license license='Artistic'
--- a/components/perl_modules/xml-simple/xml-simple-584.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/xml-simple/xml-simple-584.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
 set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2004/251
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2004/251
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license xml-simple.license license='Artistic'
--- a/components/perl_modules/xml-simple/xml-simple.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/perl_modules/xml-simple/xml-simple.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,8 +25,8 @@
 set name=pkg.summary value="XML::Simple - Easy API to maintain XML (esp config files)"
 set name=pkg.description value="The XML::Simple module provides a simple API layer on top of an underlying XML parsing module (either XML::Parser or one of the SAX2 parser modules)."
 set name=info.classification value="org.opensolaris.category.2008:Development/Perl"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 # perl 5.8.4
 depend fmri=library/perl-5/xml-simple-584 predicate=runtime/perl-584 \
--- a/components/php-5_2/apache-php5.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/apache-php5.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,10 +24,10 @@
 set name=pkg.fmri value=pkg:/web/server/apache-22/module/[email protected],$(BUILD_VERSION)
 set name=pkg.summary value="PHP Server for Apache Web Server"
 set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source_url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
-set name=info.upstream_url value=http://www.php.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
+set name=info.upstream-url value=http://www.php.net/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license apache-php5.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
--- a/components/php-5_2/php-52.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-52.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -34,10 +34,10 @@
 set name=pkg.summary value="PHP Server"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.upstream_url value=http://www.php.net/
-set name=info.source_url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.upstream-url value=http://www.php.net/
+set name=info.source-url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-52.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
--- a/components/php-5_2/php-apc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-apc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="APC extension module for PHP"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source_url value=http://pecl.php.net/get/APC-3.0.19.tgz
-set name=info.upstream_url value=http://pecl.php.net/package/APC
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://pecl.php.net/get/APC-3.0.19.tgz
+set name=info.upstream-url value=http://pecl.php.net/package/APC
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-apc.license license='PHP'
--- a/components/php-5_2/php-doc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-doc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="PHP Server Documentation"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.upstream_url value=http://www.php.net/
-set name=info.source_url value=$(EXTERNAL_ARCHIVE_MIRROR)/php_manual_en_20090130.tar.gz
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.upstream-url value=http://www.php.net/
+set name=info.source-url value=$(EXTERNAL_ARCHIVE_MIRROR)/php_manual_en_20090130.tar.gz
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-doc.license license='PHP'
--- a/components/php-5_2/php-idn.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-idn.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.summary value="IDN extension module for PHP"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source_url value=http://pecl.php.net/get/idn-0.2.0.tgz
-set name=info.upstream_url value=http://pecl.php.net/package/idn
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://pecl.php.net/get/idn-0.2.0.tgz
+set name=info.upstream-url value=http://pecl.php.net/package/idn
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-idn.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
--- a/components/php-5_2/php-memcache.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-memcache.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Memcache extension module for PHP"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source_url value=http://pecl.php.net/get/memcache-2.2.5.tgz
-set name=info.upstream_url value=http://pecl.php.net/package/memcache
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://pecl.php.net/get/memcache-2.2.5.tgz
+set name=info.upstream-url value=http://pecl.php.net/package/memcache
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-memcache.license license='PHP, GPLv2, LGPLv2, Apache v2.0'
--- a/components/php-5_2/php-mysql.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-mysql.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.summary value="MySQL extension module for PHP"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.upstream_url value=http://www.php.net/
-set name=info.source_url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.upstream-url value=http://www.php.net/
+set name=info.source-url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-mysql.license license='PHP, LGPLv2'
--- a/components/php-5_2/php-pear.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-pear.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -33,10 +33,10 @@
 set name=pkg.summary value="PHP Extension and Application Repository"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source_url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
-set name=info.upstream_url value=http://pear.php.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://us.php.net/get/php-5.2.17.tar.gz/from/this/mirror
+set name=info.upstream-url value=http://pear.php.net/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-pear.license license='PHP, LGPLv2.1'
--- a/components/php-5_2/php-suhosin.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-suhosin.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.description value="PHP-Suhosin extension to secure PHP"
 set name=pkg.summary value="Suhosin extension module for PHP"
 set name=info.classification value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source_url value=http://download.suhosin.org/suhosin-0.9.29.tgz
-set name=info.upstream_url value=http://www.hardened-php.net/suhosin/index.html
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://download.suhosin.org/suhosin-0.9.29.tgz
+set name=info.upstream-url value=http://www.hardened-php.net/suhosin/index.html
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-suhosin.license license='PHP, Apache v2.0'
--- a/components/php-5_2/php-tcpwrap.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-tcpwrap.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,10 +25,10 @@
 set name=pkg.summary value="Tcpwrap extension module for PHP"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source_url value=http://pecl.php.net/get/tcpwrap-1.1.3.tgz
-set name=info.upstream_url value=http://pecl.php.net/package/tcpwrap
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://pecl.php.net/get/tcpwrap-1.1.3.tgz
+set name=info.upstream-url value=http://pecl.php.net/package/tcpwrap
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-tcpwrap.license license='PHP'
--- a/components/php-5_2/php-xdebug.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/php-5_2/php-xdebug.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="XDebug extension module for PHP"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source_url value=http://xdebug.org/files/xdebug-2.0.5.tgz
-set name=info.upstream_url value=http://xdebug.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/538
+set name=info.source-url value=http://xdebug.org/files/xdebug-2.0.5.tgz
+set name=info.upstream-url value=http://xdebug.org/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license php-xdebug.license license='PHP, Xdebug'
--- a/components/pinentry/pinentry.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/pinentry/pinentry.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="A small utility for entering passwords."
 set name=pkg.description value="A small collection of dialog programs that allow GnuPG to read passphrases and PIN numbers in a secure manner."
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.upstream_url value="http://www.gnupg.org/related_software/pinentry/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/397
+set name=info.upstream-url value="http://www.gnupg.org/related_software/pinentry/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/397
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/privoxy/privoxy.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/privoxy/privoxy.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -38,10 +38,10 @@
 set name=pkg.description value="Privoxy is a non-caching web proxy with advanced filtering capabilities for enhancing privacy, modifying web page data and HTTP headers, controlling access, and removing ads and other obnoxious Internet junk"
 set name=pkg.summary value="Privacy-enhancing, ad-removing web proxy"
 set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/433
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/433
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license privoxy.copyright license='GPLv2'
--- a/components/proftpd/proftpd.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/proftpd/proftpd.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
     value=pkg:/service/network/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="FTP Server and Utilities"
 set name=info.classification value="org.opensolaris.category.2008:System/Core"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value="http://www.proftpd.org/"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/088
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://www.proftpd.org/"
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/088
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=etc
--- a/components/psutils/psutils.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/psutils/psutils.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="PostScript utilities"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Printing
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://knackered.knackered.org/angus/psutils
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2007/316
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://knackered.knackered.org/angus/psutils
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2007/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/pv/pv.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/pv/pv.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/shell/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Pipe Viewer"
 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/350
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/350
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license pv.license license='Artistic'
--- a/components/pwgen/pwgen.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/pwgen/pwgen.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Easy to memorize password generator"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://sourceforge.net/projects/pwgen/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/453
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://sourceforge.net/projects/pwgen/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/453
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/pylint/pylint.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/pylint/pylint.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,11 +27,11 @@
 set name=pkg.summary value="pylint - python code static checker"
 set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/325
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/325
 
 dir path=usr
 dir path=usr/bin
--- a/components/python/cherrypy/cherrypy-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/cherrypy/cherrypy-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,12 +25,12 @@
 set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
 set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://www.cherrypy.org/"
+set name=info.upstream-url value="http://www.cherrypy.org/"
 set name=info.upstream value="CherryPy Team <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/259
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/259
 
 license cherrypy.copyright license=BSD
 
--- a/components/python/cherrypy/cherrypy.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/cherrypy/cherrypy.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,9 +25,9 @@
 set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
 set name=pkg.description value="CherryPy is a Pythonic, object-oriented HTTP framework"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://www.cherrypy.org/"
+set name=info.upstream-url value="http://www.cherrypy.org/"
 set name=info.upstream value="CherryPy Team <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=library/python-2/cherrypy-26 predicate=runtime/python-26 \
--- a/components/python/coverage/coverage-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/coverage/coverage-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,12 +25,12 @@
 set name=pkg.summary value="The coverage.py Python code coverage tool"
 set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://nedbatchelder.com/code/coverage/"
+set name=info.upstream-url value="http://nedbatchelder.com/code/coverage/"
 set name=info.upstream value="Ned Batchelder <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/260
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/260
 
 license coverage.copyright license=BSD
 # the packaging software treats the license= attribute as the key, so
--- a/components/python/coverage/coverage.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/coverage/coverage.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,9 +25,9 @@
 set name=pkg.summary value="The coverage.py Python code coverage tool"
 set name=pkg.description value="Coverage measures Python code coverage, typically during test execution."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://nedbatchelder.com/code/coverage/"
+set name=info.upstream-url value="http://nedbatchelder.com/code/coverage/"
 set name=info.upstream value="Ned Batchelder <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=library/python-2/coverage-26 predicate=runtime/python-26 \
--- a/components/python/ldtp/ldtp-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/ldtp/ldtp-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,11 +25,11 @@
 set name=pkg.summary value="Linux Desktop Testing Project"
 set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
 set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
-set name=info.upstream_url value="http://ldtp.freedesktop.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://ldtp.freedesktop.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/261
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/261
 
 license ldtp.copyright license=LGPLv2.1
 
--- a/components/python/ldtp/ldtp.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/ldtp/ldtp.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,8 +25,8 @@
 set name=pkg.summary value="Linux Desktop Testing Project"
 set name=pkg.description value="LDTP is a test automation framework that can be used to test and improve desktops and desktop applications."
 set name=info.classification value="org.opensolaris.category.2008:Development/Distribution Tools"
-set name=info.upstream_url value="http://ldtp.freedesktop.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://ldtp.freedesktop.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=system/desktop/ldtp-26 predicate=runtime/python-26 \
--- a/components/python/m2crypto/m2crypto-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/m2crypto/m2crypto-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,12 +24,12 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface for openssl"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://chandlerproject.org/Projects/MeTooCrypto"
+set name=info.upstream-url value="http://chandlerproject.org/Projects/MeTooCrypto"
 set name=info.upstream value="Heikki Toivonen <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/262
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/262
 
 license m2crypto.copyright license=BSD
 
--- a/components/python/m2crypto/m2crypto.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/m2crypto/m2crypto.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,9 +24,9 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface for openssl"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://chandlerproject.org/Projects/MeTooCrypto"
+set name=info.upstream-url value="http://chandlerproject.org/Projects/MeTooCrypto"
 set name=info.upstream value="Heikki Toivonen <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=library/python-2/m2crypto-26 predicate=runtime/python-26 \
--- a/components/python/mako/mako-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/mako/mako-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,12 +25,12 @@
 set name=pkg.summary value="Template library written in Python"
 set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://www.makotemplates.org/"
+set name=info.upstream-url value="http://www.makotemplates.org/"
 set name=info.upstream value="Mike Bayer <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/263
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/263
 
 license mako.copyright license=MIT
 
--- a/components/python/mako/mako.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/mako/mako.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,9 +25,9 @@
 set name=pkg.summary value="Template library written in Python"
 set name=pkg.description value="Mako is an embedded Python (i.e., Python Server Page) templating language."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://www.makotemplates.org/"
+set name=info.upstream-url value="http://www.makotemplates.org/"
 set name=info.upstream value="Mike Bayer <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=library/python-2/mako-26 predicate=runtime/python-26 \
--- a/components/python/ply/ply-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/ply/ply-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,12 +25,12 @@
 set name=pkg.summary value="Lex and yacc parsing tools for Python"
 set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="David Beazley <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/264
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/264
 
 license ply.copyright license=LGPLv2.1
 
--- a/components/python/ply/ply.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/ply/ply.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,9 +25,9 @@
 set name=pkg.summary value="Lex and yacc parsing tools for Python"
 set name=pkg.description value="PLY is an implementation of lex and yacc parsing tools for Python"
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="David Beazley <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=library/python-2/ply-26 predicate=runtime/python-26 \
--- a/components/python/pybonjour/pybonjour-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/pybonjour/pybonjour-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,12 +25,12 @@
 set name=pkg.summary value="Python bindings for bonjour / dns-sd"
 set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://code.google.com/p/pybonjour/"
+set name=info.upstream-url value="http://code.google.com/p/pybonjour/"
 set name=info.upstream value="Christopher Stawarz <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/265
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/265
 
 license pybonjour.copyright license=BSD
 
--- a/components/python/pybonjour/pybonjour.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/pybonjour/pybonjour.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,9 +25,9 @@
 set name=pkg.summary value="Python bindings for bonjour / dns-sd"
 set name=pkg.description value="Pybonjour provides a thin layer of Python bindings on top of bonjour."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://code.google.com/p/pybonjour/"
+set name=info.upstream-url value="http://code.google.com/p/pybonjour/"
 set name=info.upstream value="Christopher Stawarz <[email protected]>"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=library/python-2/pybonjour-26 predicate=runtime/python-26 \
--- a/components/python/pycups/pycups.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/pycups/pycups.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,9 +24,9 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python language bindings for CUPS"
 set name=info.classification value=org.opensolaris.category.2008:System/Printing
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://cyberelk.net/tim/software/pycups/
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2008/273/
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://cyberelk.net/tim/software/pycups/
+set name=org.opensolaris.arc-caseid value=PSARC/2008/273/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/python/pycurl/pycurl-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/pycurl/pycurl-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,11 +25,11 @@
 set name=pkg.summary value="Python bindings for libcurl"
 set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://pycurl.sourceforge.net/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://pycurl.sourceforge.net/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/266
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/266
 
 license pycurl.copyright license=MIT
 
--- a/components/python/pycurl/pycurl.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/pycurl/pycurl.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -25,8 +25,8 @@
 set name=pkg.summary value="Python bindings for libcurl"
 set name=pkg.description value="PycURL provides a thin layer of Python bindings on top of libcurl."
 set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://pycurl.sourceforge.net/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://pycurl.sourceforge.net/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 depend fmri=library/python-2/pycurl-26 predicate=runtime/python-26 \
--- a/components/python/pylxml/pylxml.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/pylxml/pylxml.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
     value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://lxml.de
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/579
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://lxml.de
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/579
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/python/pyopenssl/pyopenssl-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/pyopenssl/pyopenssl-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Python interface to the OpenSSL library"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://pyopenssl.sourceforge.net
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/176
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://pyopenssl.sourceforge.net
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/176
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/python/python26/python-26-tests.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/python26/python-26-tests.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Tests for the Python interpreter, libraries and utilities"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://python.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/043
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://python.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/python/python26/python-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/python26/python-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="The Python interpreter, libraries and utilities"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://python.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/043
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://python.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/python/python26/tkinter-26.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/python26/tkinter-26.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="Python bindings to tcl/tk"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://python.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/043
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://python.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/lib
--- a/components/python/python27/python-27-tests.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/python27/python-27-tests.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,12 +31,12 @@
 set name=pkg.summary value="The Python tests"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://python.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/514 \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/529 \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/XXX
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://python.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/514 \
+    value=PSARC/2009/529 \
+    value=PSARC/2011/XXX
 # PSARC 2008/514 Python interface to dlpi(7P)
 # PSARC 2009/529 Python interface to privileges(5) & rbac(5)
 
--- a/components/python/python27/python-27.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/python27/python-27.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,12 +27,12 @@
 set name=pkg.summary value="The Python interpreter, libraries and utilities"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://python.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/514 \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/529 \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/XXX
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://python.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/514 \
+    value=PSARC/2009/529 \
+    value=PSARC/2011/XXX
 # PSARC 2008/514 Python interface to dlpi(7P)
 # PSARC 2009/529 Python interface to privileges(5) & rbac(5)
 
--- a/components/python/python27/tkinter-27.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/python/python27/tkinter-27.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Python 2.7 bindings to tcl/tk"
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://python.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/XXX
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://python.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/XXX
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 #pkgdepend doesn't like python 2.7 yet
--- a/components/quagga/quagga.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/quagga/quagga.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,10 +31,10 @@
 set name=pkg.summary value="Quagga - Quagga Routing Software"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Administration and Configuration"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.quagga.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2005/571
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.quagga.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2005/571
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/quagga
--- a/components/quilt/quilt.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/quilt/quilt.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.fmri value=pkg:/developer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Quilt - tool to manage series of patches"
 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2008/653
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2008/653
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license quilt.license license='GPLv2'
--- a/components/rdiff-backup/rdiff-backup.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/rdiff-backup/rdiff-backup.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,11 +26,11 @@
 set name=pkg.fmri value=pkg:/backup/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Local/remote mirror and incremental backup utility"
 set name=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)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/272
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/272
 
 dir path=usr
 dir path=usr/bin
--- a/components/readline/readline.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/readline/readline.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,11 +31,11 @@
 set name=pkg.summary value="GNU readline provides interactive line-editing and history"
 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 \
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url \
     value=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/188
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/188
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/demo
--- a/components/rpm2cpio/rpm2cpio.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/rpm2cpio/rpm2cpio.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,9 +26,9 @@
 set name=pkg.summary value="Utilities for processing RPM archives"
 set name=info.classification \
     value="org.opensolaris.category.2008:System/Packaging"
-set name=info.upstream_url value=www.iagora.com/~espel/rpm2cpio
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/1999/555
+set name=info.upstream-url value=www.iagora.com/~espel/rpm2cpio
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/rsync/rsync.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/rsync/rsync.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,9 +29,9 @@
 set name=pkg.summary value="rsync - faster, flexible replacement for rcp"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2006/642
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/642
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/rtorrent/rtorrent.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/rtorrent/rtorrent.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/network/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="rtorrent - a BitTorrent client for ncurses"
 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/336
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/336
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license rtorrent.license license='GPLv2'
--- a/components/ruby/ruby-18.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/ruby/ruby-18.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,11 +26,11 @@
 set name=pkg.fmri value=pkg:/runtime/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Ruby & RubyGems"
 set name=info.classification value="org.opensolaris.category.2008:Development/Ruby"
-set name=info.upstream_url value=http://www.ruby-lang.org
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.ruby-lang.org
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/600
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/600
 
 dir path=usr
 dir path=usr/bin
--- a/components/samba/samba/samba.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/samba/samba/samba.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -24,9 +24,9 @@
 set name=pkg.fmri value=pkg:/service/network/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="samba - A Windows SMB/CIFS fileserver for UNIX"
 set name=info.classification value="org.opensolaris.category.2008:System/File System"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/PSARC/2009/682
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/682
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set pkg.linted=true
 
--- a/components/samba/samba30/libsmbclient.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/samba/samba30/libsmbclient.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -35,10 +35,10 @@
     value="A library that permits GPLv2 applications to manipulate CIFS/SMB network resources"
 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license mozldap.license license="LGPLv2.1 GPLv2"
--- a/components/sane-backends/sane-backends.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/sane-backends/sane-backends.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="SANE library and backends"
 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=http://www.sane-project.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/170
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.sane-project.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/sane.d
--- a/components/sane-frontends/sane-frontends.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/sane-frontends/sane-frontends.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="SANE frontends"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/Graphics and Imaging"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.sane-project.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/170
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.sane-project.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/sblim/sblim.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/sblim/sblim.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -33,10 +33,10 @@
 set name=pkg.description value="A WBEM services client in Java that includes an IETF RFC 2614 compliant SLP client for CIM service discovery"
 set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
 set name=pkg.summary value="sblim cim client for the java platform"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/025
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license sblim.copyright license='CPLv1.0'
--- a/components/screen/screen.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/screen/screen.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="GNU Screen"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/screen
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/413
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/screen
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/413
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=usr
--- a/components/sed/sed.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/sed/sed.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -32,10 +32,10 @@
     value="gsed - GNU implementation of sed, the Unix stream editor"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/sed/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/254
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/sed/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/254
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/slang/slang.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/slang/slang.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,11 +31,11 @@
 set name=pkg.summary value="Library designed to allow a developer to create robust multi-platform software"
 set name=pkg.description value="S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software."
 set name=info.classification value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/135/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/135/
 
 license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
 
--- a/components/slib/slib.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/slib/slib.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="GNU slib - a portable library for the programming language Scheme"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://people.csail.mit.edu/jaffer/SLIB
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/316
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://people.csail.mit.edu/jaffer/SLIB
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/slrn/slrn.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/slrn/slrn.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,12 +30,12 @@
     value="slrn is an text-based news client, i.e. a program that accesses a newsserver to read messages from the Internet News service (also known as 'Usenet')."
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url \
+set name=info.upstream-url \
     value=http://slrn.sourceforge.net/
-set name=info.source_url \
+set name=info.source-url \
     value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/639
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/639
 set name=org.opensolaris.consolidation \
     value=$(CONSOLIDATION)
 
--- a/components/snort/snort.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/snort/snort.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/diagnostic/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="snort - Network Intrusion and Protection Detector"
 set name=info.classification value="org.opensolaris.category.2008:Applications/Internet"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/256
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/256
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license snort.license license='GPLv2'
--- a/components/sox/sox.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/sox/sox.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
     value="Sound eXchange, the Swiss Army knife of audio manipulation."
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/Sound and Video"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://sox.sourceforge.net
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/445
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://sox.sourceforge.net
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/445
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/spawn-fcgi/spawn-fcgi.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/spawn-fcgi/spawn-fcgi.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Spawn-Fcgi utility"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.lighttpd.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/562
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.lighttpd.net/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/562
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/squid/squid.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/squid/squid.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Squid Web Proxy Cache"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.squid-cache.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2009/130
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.squid-cache.org/
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2009/130
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/squid
--- a/components/stdcxx/stdcxx.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/stdcxx/stdcxx.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,10 +30,10 @@
 set name=pkg.summary value="The Apache C++ Standard Library"
 set name=pkg.description value="An Open Source ISO/IEC:14882:2003 Compliant Implementation of the C++ Standard Library"
 set name=info.classification value="org.opensolaris.category.2008:Development/C++"
-set name=info.upstream_url value="http://stdcxx.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/549
+set name=info.upstream-url value="http://stdcxx.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/549
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/subversion/subversion-java.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/subversion/subversion-java.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -23,10 +23,10 @@
 set name=pkg.fmri value=pkg:/library/java/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Java bindings for the Subversion SCM"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value="http://subversion.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/563
+set name=info.upstream-url value="http://subversion.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/subversion/subversion-perl.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/subversion/subversion-perl.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.fmri value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl bindings for the Subversion SCM"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value="http://subversion.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/563
+set name=info.upstream-url value="http://subversion.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/subversion/subversion-python.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/subversion/subversion-python.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -23,10 +23,10 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python bindings for the Subversion SCM"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value="http://subversion.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/563
+set name=info.upstream-url value="http://subversion.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/subversion/subversion.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/subversion/subversion.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="Subversion source code management system"
 set name=pkg.description value="A full-featured version control and source code management system designed to be a better CVS"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value="http://subversion.apache.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/563
+set name=info.upstream-url value="http://subversion.apache.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=usr
--- a/components/sudo/sudo.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/sudo/sudo.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -30,8 +30,8 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/205
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/205
 
 dir path=etc
 dir path=etc/sudoers.d mode=0750 group=root
--- a/components/swig/swig.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/swig/swig.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="The Simplified and Interface Generator (swig)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.swig.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/475
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.swig.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/475
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/tcl/expect/expect.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tcl/expect/expect.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
     value="expect - Programmed dialogue with other interactive programs"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://expect.nist.gov/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/612
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://expect.nist.gov/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/612
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/tcl/tcl/tcl.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tcl/tcl/tcl.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="Tcl - portable scripting environment"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://prdownloads.sourceforge.net/tcl/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/317
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://prdownloads.sourceforge.net/tcl/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/317
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/tcl/tk/tk.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tcl/tk/tk.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="Tk - TCL GUI Toolkit"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://prdownloads.sourceforge.net/tk/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/317
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://prdownloads.sourceforge.net/tk/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/317
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/tcltls/tcltls.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tcltls/tcltls.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="Tcl binding to openssl toolkit"
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Other Languages"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://tls.sourceforge.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/266
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://tls.sourceforge.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/266
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/include
--- a/components/tcpdump/tcpdump.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tcpdump/tcpdump.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="network traffic sniffer"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.tcpdump.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2009/147
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.tcpdump.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2009/147
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/sbin
--- a/components/tcsh/tcsh.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tcsh/tcsh.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="C shell with file name completion and command line editing"
 set name=pkg.summary value="Tenex C-shell (tcsh)"
 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=http://www.tcsh.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/025
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.tcsh.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/texinfo/texinfo.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/texinfo/texinfo.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="Documentation system for on-line information and printed output"
 set name=pkg.description value="Texinfo is a documentation system that uses a single source file to produce both on-line information and printed output."
 set name=info.classification value="org.opensolaris.category.2008:Development/GNU"
-set name=info.upstream_url value="http://www.gnu.org/software/texinfo/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.upstream-url value="http://www.gnu.org/software/texinfo/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=lib
--- a/components/tidy/tidy.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tidy/tidy.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="The HTML Tidy 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=http://tidy.sourceforge.net/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/134
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://tidy.sourceforge.net/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/134
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/timezone/system-data-timezone.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/timezone/system-data-timezone.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,8 +29,8 @@
 set name=pkg.description value="Timezone definition files"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Core
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2001/015
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2001/015
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/tomcat/tomcat-examples.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tomcat/tomcat-examples.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -36,10 +36,10 @@
     value="Tomcat Servlet/JSP Container - example applications"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://tomcat.apache.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/711
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://tomcat.apache.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/711
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=var
 dir path=var/tomcat6
--- a/components/tomcat/tomcat.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/tomcat/tomcat.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -41,10 +41,10 @@
 set name=pkg.summary value="Tomcat Servlet/JSP Container"
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://tomcat.apache.org
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/711
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://tomcat.apache.org
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/711
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=lib
--- a/components/top/top.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/top/top.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
     value="provides a rolling display of top cpu using processes"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.unixtop.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/533
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.unixtop.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/533
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/trousers/trousers.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/trousers/trousers.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,11 +28,11 @@
     value="TCG Software Stack - software for accessing a TPM device"
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Security
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/725
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/725
 dir path=etc
 dir path=etc/security
 dir path=usr
--- a/components/unixodbc/unixodbc.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/unixodbc/unixodbc.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.summary value="The UnixODBC Subsystem and SDK"
 set name=pkg.description value="An Open Source implementation of the ODBC Standard providing a Library Framework for Software Development"
 set name=info.classification value="org.opensolaris.category.2008:Development/Databases"
-set name=info.upstream_url value="http://unixodbc.org/"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/LSARC/2007/684
+set name=info.upstream-url value="http://unixodbc.org/"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=LSARC/2007/684
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
 dir path=etc
--- a/components/unrar/unrar.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/unrar/unrar.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Rar archives extractor 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)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/756
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2008/756
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/unzip/unzip.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/unzip/unzip.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="Info-Zip (unzip)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities "
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/1999/555
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license info-zip.license license="Info-ZIP"
--- a/components/vim/gvim.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/vim/gvim.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,13 +29,13 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Editors \
     value="org.opensolaris.category.2008:System/Text Tools"
-set name=info.repository_url value=$(COMPONENT_HG_URL)
-set name=info.repository_changeset value=$(COMPONENT_HG_REV)
-set name=info.upstream_url value=http://www.vim.org/
+set name=info.repository-url value=$(COMPONENT_HG_URL)
+set name=info.repository-changeset value=$(COMPONENT_HG_REV)
+set name=info.upstream-url value=http://www.vim.org/
 set name=info.upstream value="[email protected]"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/267 \
-    value=http://arc.opensolaris.org/caselog/PSARC/2008/546
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/267 \
+    value=PSARC/2008/546
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 file $(MACH32)-gvim/src/gvim path=usr/bin/gvim
--- a/components/vim/vim-core.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/vim/vim-core.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,12 +31,12 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Editors \
     value="org.opensolaris.category.2008:System/Text Tools"
-set name=info.repository_url value=$(COMPONENT_HG_URL)
-set name=info.repository_changeset value=$(COMPONENT_HG_REV)
-set name=info.upstream_url value=http://www.vim.org/
+set name=info.repository-url value=$(COMPONENT_HG_URL)
+set name=info.repository-changeset value=$(COMPONENT_HG_REV)
+set name=info.upstream-url value=http://www.vim.org/
 set name=info.upstream value="[email protected]"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/267
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/267
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/vim/vim.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/vim/vim.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -31,12 +31,12 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Editors \
     value="org.opensolaris.category.2008:System/Text Tools"
-set name=info.repository_url value=$(COMPONENT_HG_URL)
-set name=info.repository_changeset value=$(COMPONENT_HG_REV)
-set name=info.upstream_url value=http://www.vim.org/
+set name=info.repository-url value=$(COMPONENT_HG_URL)
+set name=info.repository-changeset value=$(COMPONENT_HG_REV)
+set name=info.upstream-url value=http://www.vim.org/
 set name=info.upstream value="[email protected]"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/267
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/267
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 dir path=usr
--- a/components/wget/wget.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/wget/wget.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="wget - GNU wget"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.gnu.org/software/wget/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2000/488
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.gnu.org/software/wget/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=usr
--- a/components/which/which.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/which/which.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,10 +29,10 @@
 set name=pkg.summary value="GNU which"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.xs4all.nl/~carlo17/which/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/049
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.xs4all.nl/~carlo17/which/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/049
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/gnu
--- a/components/wireshark/tshark.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/wireshark/tshark.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="Command-line network protocol analyzer"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.wireshark.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/334
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.wireshark.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/security
--- a/components/wireshark/wireshark-common.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/wireshark/wireshark-common.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="Libraries and Tools used by Wireshark and TShark Network protocol analyzers"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.wireshark.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/334
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.wireshark.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/security
--- a/components/wireshark/wireshark.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/wireshark/wireshark.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -27,10 +27,10 @@
 set name=pkg.summary value="Graphical network protocol analyzer"
 set name=info.classification \
     value=org.opensolaris.category.2008:Applications/Internet
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.wireshark.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/334
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.wireshark.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
 dir path=etc/security
--- a/components/wxwidgets/wxwidgets.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/wxwidgets/wxwidgets.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/library/graphics/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="wxWidgets A cross-platform GUI toolkit"
 set name=info.classification value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=opensolaris.arc_url value=http://arc.opensolaris.org/caselog/LSARC/2008/476/
+set name=org.opensolaris.arc-caseid value=LSARC/2008/476/
 
 license wxwidgets.license license='wxWindows Library license'
 legacy pkg=SUNWwxwidgets desc="wxWidgets - A cross-platform GUI toolkit $(COMPONENT_VERSION)" \
--- a/components/xorriso/xorriso.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/xorriso/xorriso.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -26,10 +26,10 @@
 set name=pkg.fmri value=pkg:/media/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GNU xorriso"
 set name=info.classification value="org.opensolaris.category.2008:System/Media"
-set name=info.upstream_url value="http://scdbackup.sourceforge.net/xorriso"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2011/046
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://scdbackup.sourceforge.net/xorriso"
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2011/046
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license xorriso.license license="GPLv3"
--- a/components/zip/zip.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/zip/zip.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=pkg.summary value="Info-Zip (zip)"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream_url value=http://www.info-zip.org/Zip.html
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/1999/555
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=http://www.info-zip.org/Zip.html
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
 dir path=usr/bin
--- a/components/zlib/zlib.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/zlib/zlib.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -28,10 +28,10 @@
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=info.upstream_url value="http://www.zlib.net"
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2006/537
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value="http://www.zlib.net"
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2006/537
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 
 dir path=lib
 dir path=lib/$(MACH64)
--- a/components/zsh/zsh.p5m	Mon Aug 08 06:18:35 2011 -0700
+++ b/components/zsh/zsh.p5m	Mon Aug 08 10:30:52 2011 -0700
@@ -29,11 +29,11 @@
     value="The Z Shell (zsh) is a Bourne-like shell designed for interactive use, although it is also a powerful scripting language.  Many of the useful features of bash, ksh, and tcsh were incorporated into zsh, but many original features were added."
 set name=pkg.summary value="Z Shell (zsh)"
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream value="Zsh Development Group <[email protected]>"
-set name=info.upstream_url value=http://www.zsh.org/
-set name=opensolaris.arc_url \
-    value=http://arc.opensolaris.org/caselog/PSARC/2007/533
+set name=info.upstream-url value=http://www.zsh.org/
+set name=org.opensolaris.arc-caseid \
+    value=PSARC/2007/533
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr/lib/zsh
 dir path=usr/lib/zsh/$(COMPONENT_VERSION)
--- a/tools/python/pkglint/userland.py	Mon Aug 08 06:18:35 2011 -0700
+++ b/tools/python/pkglint/userland.py	Mon Aug 08 10:30:52 2011 -0700
@@ -359,9 +359,9 @@
 			engine.error( _("missing license action"),
 				msgid="%s%s.0" % (self.name, pkglint_id))
 
-		if 'opensolaris.arc_url' not in manifest:
-			engine.error( _("missing ARC data (opensolaris.arc_url)"),
+		if 'org.opensolaris.arc-caseid' not in manifest:
+			engine.error( _("missing ARC data (org.opensolaris.arc-caseid)"),
 				msgid="%s%s.0" % (self.name, pkglint_id))
 
 	component_check.pkglint_dest = _(
-		"license actions and iARC information are required if you deliver files.")
+		"license actions and ARC information are required if you deliver files.")
--- a/tools/userland-mangler	Mon Aug 08 06:18:35 2011 -0700
+++ b/tools/userland-mangler	Mon Aug 08 10:30:52 2011 -0700
@@ -106,8 +106,8 @@
 #
 # mangler.man.stability = (mangler.man.stability)
 # mangler.man.availability = (pkg.fmri)
-# mangler.man.source_url = (pkg.source_url)
-# mangler.man.upstream_url = (pkg.upstream_url)
+# mangler.man.source-url = (pkg.source-url)
+# mangler.man.upstream-url = (pkg.upstream-url)
 #
 def mangle_manpage(manifest, action, text):
 	# manpages must have a taxonomy defined
@@ -124,14 +124,14 @@
 		availability = fmri.pkg_name
 
 	community = None
-	if 'info.upstream_url' in manifest.attributes:
-		community = manifest.attributes['info.upstream_url']
+	if 'info.upstream-url' in manifest.attributes:
+		community = manifest.attributes['info.upstream-url']
 
 	source = None
-	if 'info.source_url' in manifest.attributes:
-		source = manifest.attributes['info.source_url']
-	elif 'info.repository_url' in manifest.attributes:
-		source = manifest.attributes['info.repository_url']
+	if 'info.source-url' in manifest.attributes:
+		source = manifest.attributes['info.source-url']
+	elif 'info.repository-url' in manifest.attributes:
+		source = manifest.attributes['info.repository-url']
 
 	# skip reference only pages
 	if so_re.match(text) is not None:
--- a/transforms/manifest-metadata-template	Mon Aug 08 06:18:35 2011 -0700
+++ b/transforms/manifest-metadata-template	Mon Aug 08 10:30:52 2011 -0700
@@ -24,8 +24,8 @@
 set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="XXX Summary XXX"
 set name=info.classification value="org.opensolaris.category.2008:XXX Classification XXX"
-set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
-set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'