7037821 Userland migration of data from Makefile to manifest may have been a little overzealous
authorRich Burridge <rich.burridge@oracle.com>
Mon, 05 Dec 2011 11:48:52 -0800
changeset 609 775168282b2f
parent 608 bef78732195b
child 610 b8bf722379b3
7037821 Userland migration of data from Makefile to manifest may have been a little overzealous
components/a2ps/Makefile
components/a2ps/a2ps.p5m
components/aalib/Makefile
components/acpidump/Makefile
components/acpidump/acpidump.p5m
components/ant/Makefile
components/ant/ant.p5m
components/apache2-modules/mod_dtrace/Makefile
components/apache2-modules/mod_dtrace/apache-dtrace.p5m
components/apache2-modules/mod_fcgid/Makefile
components/apache2-modules/mod_fcgid/apache-fcgid.p5m
components/apache2-modules/mod_jk/Makefile
components/apache2-modules/mod_jk/apache-jk.p5m
components/apache2-modules/mod_perl/Makefile
components/apache2-modules/mod_perl/apache-perl.p5m
components/apache2-modules/mod_proxy_html/Makefile
components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m
components/apache2-modules/mod_security2/Makefile
components/apache2-modules/mod_security2/apache-security.p5m
components/apache2/Makefile
components/apache2/apache-22.p5m
components/apache2/apache-sed.p5m
components/apache2/documentation.p5m
components/apr-util/Makefile
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/Makefile
components/apr/apr-13-doc.p5m
components/apr/apr-13.p5m
components/autoconf/Makefile
components/autoconf/autoconf.p5m
components/autogen/Makefile
components/autogen/autogen.p5m
components/automake/automake-1.10/Makefile
components/automake/automake-1.10/automake.p5m
components/automake/automake-1.9.6/Makefile
components/automake/automake-1.9.6/automake.p5m
components/bash/bash.p5m
components/bcc/Makefile
components/bcc/bcc.p5m
components/berkeleydb/Makefile
components/berkeleydb/berkeleydb.p5m
components/bind/Makefile
components/bind/bind.p5m
components/binutils/Makefile
components/binutils/binutils.p5m
components/bison/Makefile
components/bison/bison-runtime.p5m
components/bison/bison.p5m
components/bzip2/Makefile
components/bzip2/bzip2.p5m
components/cdrtools/cdrtools.p5m
components/convmv/Makefile
components/convmv/convmv.p5m
components/coreutils/Makefile
components/coreutils/coreutils.p5m
components/curl/Makefile
components/curl/curl.p5m
components/cvs/Makefile
components/cvs/cvs.p5m
components/diffutils/Makefile
components/diffutils/diffutils.p5m
components/doxygen/Makefile
components/doxygen/doxygen.p5m
components/ejabberd/Makefile
components/ejabberd/ejabberd.p5m
components/elinks/Makefile
components/elinks/elinks.p5m
components/emacs/Makefile
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/Makefile
components/erlang/erlang-doc.p5m
components/erlang/erlang.p5m
components/fastcgi/Makefile
components/fastcgi/fcgi-doc.p5m
components/fastcgi/fcgi.p5m
components/flex/Makefile
components/flex/flex.p5m
components/flex/flexruntime.p5m
components/foomatic/db-engine/Makefile
components/foomatic/db/Makefile
components/foomatic/filters/Makefile
components/foomatic/fppd/Makefile
components/fping/Makefile
components/fping/fping.p5m
components/gawk/Makefile
components/gawk/gawk.p5m
components/gcc3/Makefile
components/gcc3/gcc-3-runtime.p5m
components/gcc3/gcc-3.p5m
components/gcc45/Makefile
components/gcc45/gcc-45-runtime.p5m
components/gcc45/gcc-45.p5m
components/gd2/Makefile
components/gd2/gd2.p5m
components/gettext/Makefile
components/gettext/gettext.p5m
components/ggrep/Makefile
components/ggrep/gnu-grep.p5m
components/ghostscript/Makefile
components/ghostscript/ghostscript.p5m
components/git/Makefile
components/git/git.p5m
components/gnu-gs-fonts-other/Makefile
components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m
components/gnu-gs-fonts-std/Makefile
components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m
components/gnump/Makefile
components/gnump/gmp.p5m
components/gnupg/gnupg.p5m
components/gnuplot/gnuplot.p5m
components/gnupth/Makefile
components/gnupth/gnupth.p5m
components/gperf/Makefile
components/gperf/gperf.p5m
components/gpgme/gpgme.p5m
components/graphviz/Makefile
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/Makefile
components/gtar/gtar.p5m
components/guile/Makefile
components/guile/guile.p5m
components/gutenprint/Makefile
components/gutenprint/gutenprint.p5m
components/gzip/Makefile
components/gzip/gzip.p5m
components/hal-cups-utils/Makefile
components/hal-cups-utils/hal-cups-utils.p5m
components/hexedit/Makefile
components/hexedit/hexedit.p5m
components/hplip/Makefile
components/hplip/hplip.p5m
components/ilmbase/ilmbase.p5m
components/imagemagick/Makefile
components/imagemagick/imagemagick.p5m
components/iperf/Makefile
components/ipmitool/Makefile
components/ircii/Makefile
components/ircii/ircii.p5m
components/isc-dhcp/Makefile
components/isc-dhcp/dhcp.p5m
components/junit/Makefile
components/junit/junit.p5m
components/lcms/lcms.p5m
components/less/Makefile
components/less/less.p5m
components/libassuan/libassuan.p5m
components/libevent/Makefile
components/libevent/libevent.p5m
components/libexpat/Makefile
components/libexpat/expat.p5m
components/libidn/libidn.p5m
components/libksba/libksba.p5m
components/libmng/Makefile
components/libmng/libmng.p5m
components/libneon/Makefile
components/libneon/libneon.p5m
components/libpcap/Makefile
components/libpcap/libpcap.p5m
components/libsigsegv/Makefile
components/libsigsegv/libsigsegv.p5m
components/libtool/Makefile
components/libtool/libltdl.p5m
components/libtool/libtool.p5m
components/libusb/ugen/Makefile
components/libusb/ugen/libusbugen.p5m
components/libusb/wrapper/Makefile
components/libusb/wrapper/libusb.p5m
components/libxml2/Makefile
components/libxml2/libxml2-26.p5m
components/libxml2/libxml2.p5m
components/libxslt/Makefile
components/libxslt/libxsl-26.p5m
components/libxslt/libxslt.p5m
components/lighttpd/Makefile
components/lighttpd/lighttpd.p5m
components/logilab-astng/Makefile
components/logilab-astng/logilab-astng.p5m
components/logilab-common/Makefile
components/logilab-common/logilab-common.p5m
components/lua/Makefile
components/lua/lua.p5m
components/m4/Makefile
components/m4/m4.p5m
components/make/Makefile
components/make/make.p5m
components/mc/Makefile
components/mc/mc.p5m
components/meld/Makefile
components/meld/meld.p5m
components/mercurial/Makefile
components/mercurial/mercurial.p5m
components/mpc/Makefile
components/mpc/mpc.p5m
components/mpfr/Makefile
components/mpfr/mpfr.p5m
components/ncftp/Makefile
components/ncftp/ncftp.p5m
components/net-snmp/Makefile
components/net-snmp/net-snmp-addons.p5m
components/net-snmp/net-snmp-base.p5m
components/net-snmp/net-snmp-documentation.p5m
components/nethack/Makefile
components/nethack/nethack.p5m
components/nmap/Makefile
components/nmap/nmap.p5m
components/ntp/Makefile
components/ntp/ntp.p5m
components/open-fabrics/Makefile
components/open-fabrics/open-fabrics.p5m
components/openexr/openexr.p5m
components/openldap/Makefile
components/openldap/openldap.p5m
components/openssl/openssl-0.9.8-fips-140/Makefile
components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m
components/openssl/openssl-1.0.0/Makefile
components/openssl/openssl-1.0.0/openssl-1.0.0.p5m
components/p7zip/Makefile
components/p7zip/p7zip.p5m
components/pam_pkcs11/Makefile
components/pam_pkcs11/pam_pkcs11.p5m
components/patch/Makefile
components/patch/patch.p5m
components/pcre/Makefile
components/perl512/Makefile
components/perl512/perl-512.p5m
components/perl_modules/net-ssleay/Makefile
components/perl_modules/pmtools/Makefile
components/perl_modules/pmtools/pmtools.p5m
components/perl_modules/pmtools/pmtools_512.p5m
components/perl_modules/pmtools/pmtools_584.p5m
components/php-5_2/APC-zts/Makefile
components/php-5_2/APC/Makefile
components/php-5_2/Makefile
components/php-5_2/apache-php5.p5m
components/php-5_2/idn-zts/Makefile
components/php-5_2/idn/Makefile
components/php-5_2/memcache-zts/Makefile
components/php-5_2/memcache/Makefile
components/php-5_2/php-52.p5m
components/php-5_2/php-doc.p5m
components/php-5_2/php-mysql.p5m
components/php-5_2/tcpwrap-zts/Makefile
components/php-5_2/tcpwrap/Makefile
components/pinentry/pinentry.p5m
components/proftpd/Makefile
components/proftpd/proftpd.p5m
components/psutils/Makefile
components/psutils/psutils.p5m
components/pwgen/Makefile
components/pwgen/pwgen.p5m
components/python/cherrypy/Makefile
components/python/cherrypy/cherrypy-26.p5m
components/python/cherrypy/cherrypy.p5m
components/python/coverage/Makefile
components/python/coverage/coverage-26.p5m
components/python/coverage/coverage.p5m
components/python/ldtp/Makefile
components/python/ldtp/ldtp-26.p5m
components/python/ldtp/ldtp.p5m
components/python/m2crypto/Makefile
components/python/m2crypto/m2crypto-26.p5m
components/python/m2crypto/m2crypto.p5m
components/python/mako/Makefile
components/python/mako/mako-26.p5m
components/python/mako/mako.p5m
components/python/pybonjour/Makefile
components/python/pybonjour/pybonjour-26.p5m
components/python/pybonjour/pybonjour.p5m
components/python/pycups/Makefile
components/python/pycups/pycups.p5m
components/python/pycurl/Makefile
components/python/pycurl/pycurl-26.p5m
components/python/pycurl/pycurl.p5m
components/python/pylxml/Makefile
components/python/pylxml/pylxml.p5m
components/python/pyopenssl/Makefile
components/python/pyopenssl/pyopenssl-26.p5m
components/python/python26/Makefile
components/python/python26/python-26-tests.p5m
components/python/python26/python-26.p5m
components/python/python26/tkinter-26.p5m
components/python/python27/Makefile
components/python/python27/python-27-tests.p5m
components/python/python27/python-27.p5m
components/python/python27/tkinter-27.p5m
components/quagga/Makefile
components/quagga/quagga.p5m
components/quilt/Makefile
components/readline/Makefile
components/readline/readline.p5m
components/rpm2cpio/Makefile
components/rpm2cpio/rpm2cpio.p5m
components/rsync/Makefile
components/ruby/Makefile
components/ruby/ruby-18.p5m
components/samba/mozldap/Makefile
components/sane-backends/Makefile
components/sane-backends/sane-backends.p5m
components/sane-frontends/Makefile
components/sane-frontends/sane-frontends.p5m
components/sblim/Makefile
components/screen/Makefile
components/screen/screen.p5m
components/sed/Makefile
components/sed/sed.p5m
components/slib/Makefile
components/slib/slib.p5m
components/slrn/Makefile
components/slrn/slrn.p5m
components/sox/Makefile
components/sox/sox.p5m
components/spawn-fcgi/Makefile
components/spawn-fcgi/spawn-fcgi.p5m
components/squid/Makefile
components/squid/squid.p5m
components/stdcxx/Makefile
components/stdcxx/stdcxx.p5m
components/subversion/Makefile
components/subversion/subversion-java.p5m
components/subversion/subversion-perl.p5m
components/subversion/subversion-python.p5m
components/subversion/subversion.p5m
components/swig/Makefile
components/swig/swig.p5m
components/tcl/expect/Makefile
components/tcl/expect/expect.p5m
components/tcl/tcl/Makefile
components/tcl/tcl/tcl.p5m
components/tcl/tk/Makefile
components/tcl/tk/tk.p5m
components/tcltls/Makefile
components/tcltls/tcltls.p5m
components/tcpdump/Makefile
components/tcpdump/tcpdump.p5m
components/tcsh/Makefile
components/tcsh/tcsh.p5m
components/texinfo/Makefile
components/texinfo/texinfo.p5m
components/tidy/Makefile
components/tidy/tidy.p5m
components/tomcat/Makefile
components/tomcat/tomcat-examples.p5m
components/tomcat/tomcat.p5m
components/top/Makefile
components/top/top.p5m
components/trousers/Makefile
components/unixodbc/Makefile
components/unixodbc/unixodbc.p5m
components/vim/gvim.p5m
components/vim/vim-core.p5m
components/vim/vim.p5m
components/wget/Makefile
components/wget/wget.p5m
components/which/Makefile
components/which/which.p5m
components/wireshark/Makefile
components/wireshark/tshark.p5m
components/wireshark/wireshark-common.p5m
components/wireshark/wireshark.p5m
components/wxwidgets/Makefile
components/xorriso/Makefile
components/xorriso/xorriso.p5m
components/zip/Makefile
components/zip/zip.p5m
components/zlib/Makefile
components/zlib/zlib.p5m
components/zsh/Makefile
components/zsh/zsh.p5m
--- a/components/a2ps/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/a2ps/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		a2ps
 COMPONENT_VERSION=	4.14
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/a2ps/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:365abbbe4b7128bf70dad16d06e23c5701874852
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/a2ps/$(COMPONENT_ARCHIVE)
--- a/components/a2ps/a2ps.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/a2ps/a2ps.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2004/262
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/aalib/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/aalib/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 HUMAN_VERSION=		1.4rc5
 IPS_COMPONENT_VERSION =	1.4.5
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://aa-project.sourceforge.net/aalib
+COMPONENT_PROJECT_URL=	http://aa-project.sourceforge.net/aalib/
 COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(HUMAN_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:a23269e950a249d2ef93625837cace45ddbce03b
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/aa-project/$(COMPONENT_ARCHIVE)
--- a/components/acpidump/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/acpidump/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		pmtools
 COMPONENT_VERSION=	20071116
 IPS_COMPONENT_VERSION=	0.2007.11.16
+COMPONENT_PROJECT_URL=	http://www.lesswatts.org/projects/acpi/utilities.php
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:997612de90eee65c3974a07b9eee68cfeb077abd
--- a/components/acpidump/acpidump.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/acpidump/acpidump.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/458
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/ant/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ant/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		apache-ant
 COMPONENT_VERSION=	1.7.1
+COMPONENT_PROJECT_URL=	http://ant.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:8a468d3ce1e84739a78f779770416a8bd502eaf5
--- a/components/ant/ant.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ant/ant.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2002/232
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/apache2-modules/mod_dtrace/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_dtrace/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 COMPONENT_NAME=		mod_dtrace
 COMPONENT_VERSION=	0.3.1
 COMPONENT_SRC=		src
+COMPONENT_PROJECT_URL=	http://prefetch.net/projects/apache_modtrace/
 
 include ../../../make-rules/justmake.mk
 include ../../../make-rules/ips.mk
--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
     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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/090
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/apache2-modules/mod_fcgid/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_fcgid/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		mod_fcgid
 COMPONENT_VERSION=	2.3.6
+COMPONENT_PROJECT_URL=	http://httpd.apache.org/mod_fcgid/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:018245896f331909e896685ab3ca86b163846e4d
--- a/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_fcgid/apache-fcgid.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/600
--- a/components/apache2-modules/mod_jk/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_jk/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		tomcat-connectors
 COMPONENT_VERSION=	1.2.28
+COMPONENT_PROJECT_URL=	http://tomcat.apache.org/connectors-doc/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:0e022e242d88f4d42cbbfa42883d02e14ad16929
--- a/components/apache2-modules/mod_jk/apache-jk.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/090
--- a/components/apache2-modules/mod_perl/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_perl/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		mod_perl
 COMPONENT_VERSION=	2.0.4
+COMPONENT_PROJECT_URL=	http://perl.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:65299a16ec414a690a48a2bbe63acaa3c6bb897b
-COMPONENT_ARCHIVE_URL=	http://perl.apache.org/dist/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)dist/$(COMPONENT_ARCHIVE)
 
 CONFIGURE_DEFAULT_DIRS=no
 
--- a/components/apache2-modules/mod_perl/apache-perl.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_perl/apache-perl.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/586
--- a/components/apache2-modules/mod_proxy_html/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_proxy_html/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,12 +24,13 @@
 
 COMPONENT_NAME=		mod_proxy_html
 COMPONENT_VERSION=	3.1.1
+COMPONENT_PROJECT_URL=	http://apache.webthing.com/mod_proxy_html/
 COMPONENT_SRC=		$(COMPONENT_NAME)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-$(COMPONENT_VERSION).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:d36398151994f308ce36bacab09beb8165bf01a7
 # Original archive from community didn't contain name in its version.
 # Therefore we created special Userland copy with version info.
-COMPONENT_ARCHIVE_URL=	http://apache.webthing.com/mod_proxy_html/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/justmake.mk
--- a/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_proxy_html/apache-proxy_html.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/553
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/apache2-modules/mod_security2/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_security2/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		modsecurity-apache
 COMPONENT_VERSION=	2.5.9
+COMPONENT_PROJECT_URL=	http://www.modsecurity.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:875919332a918956371fe8e2f7e46d88081857cf
-COMPONENT_ARCHIVE_URL=	http://www.modsecurity.org/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/configure.mk
--- a/components/apache2-modules/mod_security2/apache-security.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2-modules/mod_security2/apache-security.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/090
--- a/components/apache2/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		httpd
 COMPONENT_VERSION=	2.2.20
+COMPONENT_PROJECT_URL=	http://httpd.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:5e670636e17286b7ae5ade5b7f5e21e686559e5a
--- a/components/apache2/apache-22.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2/apache-22.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/565
--- a/components/apache2/apache-sed.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2/apache-sed.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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=info.upstream-url value="$(COMPONENT_PROJECT_URL)/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	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apache2/documentation.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/565
--- a/components/apr-util/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr-util/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		apr-util
 COMPONENT_VERSION=	1.3.9
+COMPONENT_PROJECT_URL=	http://apr.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:fd2a76352353e6bc2f7cc7da80e2ab3842795199
--- a/components/apr-util/apr-util-13-apr-ldap.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr-util/apr-util-13-apr-ldap.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/541
--- a/components/apr-util/apr-util-13-dbd-mysql.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr-util/apr-util-13-dbd-mysql.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/541
--- a/components/apr-util/apr-util-13-dbd-sqlite.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr-util/apr-util-13-dbd-sqlite.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/541
--- a/components/apr-util/apr-util-13-doc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr-util/apr-util-13-doc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/541
--- a/components/apr-util/apr-util-13.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr-util/apr-util-13.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/541
--- a/components/apr/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		apr
 COMPONENT_VERSION=	1.3.9
+COMPONENT_PROJECT_URL=	http://apr.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3ad0099ee9fb684e118590bf0acf937639e00611
--- a/components/apr/apr-13-doc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr/apr-13-doc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/541
--- a/components/apr/apr-13.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/apr/apr-13.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/541
--- a/components/autoconf/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/autoconf/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		autoconf
 COMPONENT_VERSION=	2.63
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/autoconf/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:d42eebd3d342925116c3cb942e9320d5803fcb1a
--- a/components/autoconf/autoconf.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/autoconf/autoconf.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/424
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/autogen/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/autogen/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		autogen
 COMPONENT_VERSION=	5.9
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/autogen/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:00510cd07be7a35591bac7bf1f6f78bf607d193d
--- a/components/autogen/autogen.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/autogen/autogen.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/315
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/automake/automake-1.10/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/automake/automake-1.10/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		automake
 COMPONENT_VERSION=	1.10
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/automake/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:69dc02b083b9a609b28fc4db129fef6a83ed2339
--- a/components/automake/automake-1.10/automake.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/automake/automake-1.10/automake.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/automake/automake-1.9.6/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/automake/automake-1.9.6/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		automake
 COMPONENT_VERSION=	1.9.6
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/automake/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:2c35431cba9ba94cbeea3b6f5dab405eaab8ec2a
--- a/components/automake/automake-1.9.6/automake.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/automake/automake-1.9.6/automake.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/293
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/bash/bash.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bash/bash.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/bcc/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bcc/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		bcc
 COMPONENT_VERSION=	0.16.17
+COMPONENT_PROJECT_URL=	http://homepage.ntlworld.com/robert.debath/dev86/
 COMPONENT_SRC=		dev86-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	Dev86src-$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:0bfe55c7a5e11d72f19f26cb0383178605951c72
-COMPONENT_ARCHIVE_URL=	http://homepage.ntlworld.com/robert.debath/dev86/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk
--- a/components/bcc/bcc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bcc/bcc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,8 +28,7 @@
 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://homepage.ntlworld.com/robert.debath/dev86/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/336
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/berkeleydb/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/berkeleydb/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		db
 COMPONENT_VERSION=	5.1.25
+COMPONENT_PROJECT_URL=	http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:1a216821957ce910a269bf9916bf49aba0f08b4d
--- a/components/berkeleydb/berkeleydb.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/berkeleydb/berkeleydb.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -34,8 +34,7 @@
     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 \
-    value=http://www.oracle.com/technetwork/database/berkeleydb/overview/index.html
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2010/300
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/bind/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bind/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 IPS_COMPONENT_VERSION=	9.6.3.5.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_PROJECT_URL=	"http://www.isc.org/software/bind"
+COMPONENT_PROJECT_URL=	http://www.isc.org/software/bind/
 
 # hash from: sha1sum $(COMPONENT_ARCHIVE) | sed 's/\(.[^ ]*\).*/sha1:\1/'
 COMPONENT_ARCHIVE_HASH=	sha1:6d9873a66dda3ef43c1db9a1082ad428722f7d69
--- a/components/bind/bind.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bind/bind.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
 	value=PSARC/2009/308
--- a/components/binutils/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/binutils/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		binutils
 COMPONENT_VERSION=	2.19
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/binutils/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
--- a/components/binutils/binutils.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/binutils/binutils.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/656/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/bison/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bison/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		bison
 COMPONENT_VERSION=	2.3
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/bison/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:4df84c2c5971946111ff1982fb830b3c78d7c57e
--- a/components/bison/bison-runtime.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bison/bison-runtime.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/bison/bison.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bison/bison.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/289
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/bzip2/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bzip2/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		bzip2
 COMPONENT_VERSION=	1.0.6
+COMPONENT_PROJECT_URL=	http://www.bzip.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3f89f861209ce81a6bab1fd1998c0ef311712002
-COMPONENT_ARCHIVE_URL=	http://www.bzip.org/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk
--- a/components/bzip2/bzip2.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/bzip2/bzip2.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -33,7 +33,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/cdrtools/cdrtools.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/cdrtools/cdrtools.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2006/089
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/convmv/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/convmv/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		convmv
 COMPONENT_VERSION=	1.14
+COMPONENT_PROJECT_URL=	http://www.j3e.de/linux/convmv/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:e6261eed4771014e84ffe68aac8041c02fb1834d
-COMPONENT_ARCHIVE_URL=	http://www.j3e.de/linux/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk
--- a/components/convmv/convmv.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/convmv/convmv.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,8 +30,7 @@
 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.j3e.de/linux/convmv/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/024
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/coreutils/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/coreutils/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		coreutils
 COMPONENT_VERSION=	8.5
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/coreutils/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:939144f16d05691753a87134436dd2bb8ea89851
--- a/components/coreutils/coreutils.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/coreutils/coreutils.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2010/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/curl/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/curl/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_PROJECT_URL=  http://curl.haxx.se/
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:af8182165d7a0d16b97e2c2936ed92f3ba5c868c
-COMPONENT_ARCHIVE_URL=  http://curl.haxx.se/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/curl/curl.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/curl/curl.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/165
--- a/components/cvs/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/cvs/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		cvs
 COMPONENT_VERSION=	1.12.13
+COMPONENT_PROJECT_URL=	http://www.nongnu.org/cvs/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:93a8dacc6ff0e723a130835713235863f1f5ada9
--- a/components/cvs/cvs.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/cvs/cvs.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/128
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/diffutils/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/diffutils/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		diffutils
 COMPONENT_VERSION=	2.8.7
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/diffutils/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:b05cfdd651137d46d97872dd646db0dd92077f0d
--- a/components/diffutils/diffutils.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/diffutils/diffutils.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/doxygen/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/doxygen/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		doxygen
 COMPONENT_VERSION=	1.5.7.1
+COMPONENT_PROJECT_URL=	http://www.stack.nl/~dimitri/doxygen/index.html
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).src.tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:aecb0c453f76e900eb2aa8132ad063215005fca3
--- a/components/doxygen/doxygen.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/doxygen/doxygen.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,8 +30,7 @@
 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://www.stack.nl/~dimitri/doxygen/index.html
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/612/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/ejabberd/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ejabberd/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,6 +29,7 @@
 
 COMPONENT_NAME=		ejabberd
 COMPONENT_VERSION=	2.1.8
+COMPONENT_PROJECT_URL=	http://www.ejabberd.im/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3f8ecc944e0719577bfc45a68e974b1945ffa296
--- a/components/ejabberd/ejabberd.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ejabberd/ejabberd.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/340
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/elinks/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/elinks/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		elinks
 COMPONENT_VERSION=	0.11.7
+COMPONENT_PROJECT_URL=	http://elinks.or.cz/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54
-COMPONENT_ARCHIVE_URL=	http://elinks.or.cz/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/elinks/elinks.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/elinks/elinks.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/028
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/emacs/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/emacs/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		emacs
 COMPONENT_VERSION=	23.1
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/emacs/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:5f2d5dfcc17e7627ea752f675c605fe37c9c145c
--- a/components/emacs/gnu-emacs-gtk.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/emacs/gnu-emacs-gtk.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/494
--- a/components/emacs/gnu-emacs-lisp.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/emacs/gnu-emacs-lisp.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/494
--- a/components/emacs/gnu-emacs-no-x11.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/emacs/gnu-emacs-no-x11.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/494
--- a/components/emacs/gnu-emacs-x11.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/emacs/gnu-emacs-x11.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/494
--- a/components/emacs/gnu-emacs.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/emacs/gnu-emacs.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/494
--- a/components/erlang/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/erlang/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -31,24 +31,25 @@
 COMPONENT_VERSION_MICRO=	5
 # IPS_COMPONENT_VERSION needs update whenever this is changed
 COMPONENT_VERSION=	R$(COMPONENT_VERSION_MAJOR)$(COMPONENT_VERSION_MINOR)-$(COMPONENT_VERSION_MICRO)
+COMPONENT_PROJECT_URL=	http://www.erlang.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:6c45509acf70d35d5def2cbefd86ada093c1ac3a
-COMPONENT_ARCHIVE_URL=	http://www.erlang.org/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 # manpages
 COMPONENT_NAME_1=	otp_doc_man
 COMPONENT_SRC_1=	$(COMPONENT_NAME_1)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE_1=	$(COMPONENT_SRC_1).tar.gz
 COMPONENT_ARCHIVE_HASH_1=	sha1:ae7036bd2afc9d1fca97f0de2eca84f56656def8
-COMPONENT_ARCHIVE_URL_1=	http://www.erlang.org/download/$(COMPONENT_ARCHIVE_1)
+COMPONENT_ARCHIVE_URL_1=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE_1)
 
 # HTML documentation
 COMPONENT_NAME_2=	otp_doc_html
 COMPONENT_SRC_2=	$(COMPONENT_NAME_2)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE_2=	$(COMPONENT_SRC_2).tar.gz
 COMPONENT_ARCHIVE_HASH_2=	sha1:0bd369d02051e01bac58c9b8665bd3538e116f51
-COMPONENT_ARCHIVE_URL_2=	http://www.erlang.org/download/$(COMPONENT_ARCHIVE_2)
+COMPONENT_ARCHIVE_URL_2=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE_2)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/erlang/erlang-doc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/erlang/erlang-doc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/210
--- a/components/erlang/erlang.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/erlang/erlang.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/210
--- a/components/fastcgi/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/fastcgi/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		fcgi
 COMPONENT_VERSION=	2.4.0
+COMPONENT_PROJECT_URL=	http://www.fastcgi.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:2329404159e8b8315e524b9eaf1de763202c6e6a
-COMPONENT_ARCHIVE_URL=	http://www.fastcgi.com/dist/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)dist/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/fastcgi/fcgi-doc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/fastcgi/fcgi-doc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/014
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/fastcgi/fcgi.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/fastcgi/fcgi.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/014
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/flex/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/flex/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		flex
 COMPONENT_VERSION=	2.5.35
+COMPONENT_PROJECT_URL=	http://flex.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:c507095833aaeef2d6502e12638e54bf7ad2f24a
--- a/components/flex/flex.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/flex/flex.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -24,7 +24,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/289/
--- a/components/flex/flexruntime.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/flex/flexruntime.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -24,7 +24,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/289/
--- a/components/foomatic/db-engine/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/foomatic/db-engine/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:1545c98b4ec57271b9df3d65f7691c59bca94ccd
 COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic
+COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic/
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/configure.mk
--- a/components/foomatic/db/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/foomatic/db/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:fe0fa874a4556dd32fb803b613a47f7c13076184
 COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic
+COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic/
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/configure.mk
--- a/components/foomatic/filters/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/foomatic/filters/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:31528f3bf0e933b7aac745471c31463023b40eec
 COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic
+COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic/
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/configure.mk
--- a/components/foomatic/fppd/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/foomatic/fppd/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:2a955af43f52cd7d8b3a158e68c825f90feba790
 COMPONENT_ARCHIVE_URL=	$(EXTERNAL_ARCHIVE_MIRROR)/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic
+COMPONENT_PROJECT_URL=	http://www.linuxfoundation.org/collaborate/workgroups/openprinting/database/foomatic/
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/ips.mk
--- a/components/fping/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/fping/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,10 +28,11 @@
 COMPONENT_NAME=		fping
 COMPONENT_VERSION=	2.4b2_to
 IPS_COMPONENT_VERSION=	2.4.2
+COMPONENT_PROJECT_URL=	http://fping.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_NAME).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:9318f2ec4b389cd74ca32f561fea95f9528f16a3
-COMPONENT_ARCHIVE_URL=	http://fping.sourceforge.net/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/fping/fping.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/fping/fping.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/160
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gawk/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gawk/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		gawk
 COMPONENT_VERSION=	3.1.5
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/gawk/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:6cb385b4bc33780a5a4288b787523cbd4a30a900
--- a/components/gawk/gawk.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gawk/gawk.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/594
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gcc3/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gcc3/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		gcc
 COMPONENT_VERSION=	3.4.3
+COMPONENT_PROJECT_URL=	http://gcc.gnu.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 # unfortunately we have our own "special" tarball and not the community version, so use that.
--- a/components/gcc3/gcc-3-runtime.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gcc3/gcc-3-runtime.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.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
--- a/components/gcc3/gcc-3.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gcc3/gcc-3.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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.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
--- a/components/gcc45/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gcc45/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		gcc
 COMPONENT_VERSION=	4.5.2
+COMPONENT_PROJECT_URL=	http://gcc.gnu.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:4fdd2d709b15e993f32dbf81412f48dc377e32be
--- a/components/gcc45/gcc-45-runtime.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gcc45/gcc-45-runtime.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     value="org.opensolaris.category.2008:Development/Fortran" \
     value="org.opensolaris.category.2008:Development/GNU" \
     value="org.opensolaris.category.2008:Development/Objective C"
-set name=info.upstream-url value="http://gnu.gcc.org"
+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=org.opensolaris.arc-caseid value=PSARC/2011/256
--- a/components/gcc45/gcc-45.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gcc45/gcc-45.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
     value="org.opensolaris.category.2008:Development/Fortran" \
     value="org.opensolaris.category.2008:Development/GNU" \
     value="org.opensolaris.category.2008:Development/Objective C"
-set name=info.upstream-url value="http://gcc.gnu.org"
+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=org.opensolaris.arc-caseid value=PSARC/2011/256
--- a/components/gd2/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gd2/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 # this is the hash of the payload because it appears to be re-compressed
 # periodically causing it to have a new hash value.
 COMPONENT_ARCHIVE_HASH= sha1:eaa077067945956930f6d9258e130f1e043d9b39
-COMPONENT_ARCHIVE_URL=  http://www.libgd.org/releases/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)releases/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/gd2/gd2.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gd2/gd2.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/166
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gettext/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gettext/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		gettext
 COMPONENT_VERSION=	0.16.1
 IPS_PKG_NAME=		text/gnu-gettext
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/gettext/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:8642f4346dfd6a18ecd883329e150bfe9e0886c3
--- a/components/gettext/gettext.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gettext/gettext.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/635
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
@@ -1664,6 +1664,7 @@
 file path=usr/share/man/man1/ngettext.1
 legacy pkg=SUNWgnu-gettext \
     desc="GNU gettext - message handling utilities" \
+
     name="GNU gettext"
 license gettext.license license=GPLv2
 link path=usr/bin/ggettext target=../gnu/bin/gettext facet.compat.gnulinks=true
--- a/components/ggrep/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ggrep/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		grep
 COMPONENT_VERSION=	2.5.4
+COMPONENT_PROJECT_URL=	http://gnu.org/software/grep/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:9bbd4f02b18bb264e0fcb17293b6f0445c8694d2
--- a/components/ggrep/gnu-grep.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ggrep/gnu-grep.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/ghostscript/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ghostscript/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,10 +25,11 @@
 
 COMPONENT_NAME=         ghostscript
 COMPONENT_VERSION=      9.00
+COMPONENT_PROJECT_URL=	http://ghostscript.com/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:96e75675efa0f00813f1608ba2c3833f4103ba19
-COMPONENT_ARCHIVE_URL=  http://ghostscript.com/releases/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)releases/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/ips.mk
--- a/components/ghostscript/ghostscript.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ghostscript/ghostscript.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 set name=pkg.fmri value=pkg:/print/filter/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="GPL Ghostscript"
 set name=info.classification value="org.opensolaris.category.2008:System/Printing "
-set name=info.upstream-url value=http://ghostscript.com/
+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/2010/010
--- a/components/git/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/git/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		git
 COMPONENT_VERSION=	1.7.3.2
+COMPONENT_PROJECT_URL=	http://git-scm.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:cd8d806752aa6f5716cf193585024a002e098bf4
--- a/components/git/git.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/git/git.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/360
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gnu-gs-fonts-other/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnu-gs-fonts-other/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 
 COMPONENT_NAME=         gnu-gs-fonts-other
 COMPONENT_VERSION=      6.0
+COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/gs-fonts/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:7263e2bf12202b39517db600819956a832e42a75
--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gnu-gs-fonts-std/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnu-gs-fonts-std/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 
 COMPONENT_NAME=         gnu-gs-fonts-std
 COMPONENT_VERSION=      6.0
+COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/gs-fonts/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:cdad2f3752c513fe1cfb0eeaf6661753e2cc182c
--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2010/010
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gnump/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnump/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 
 COMPONENT_NAME=         gmp
 COMPONENT_VERSION=      4.3.2
+COMPONENT_PROJECT_URL=	http://gmplib.org/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:223c3c89ad98c62e5b8335a75ef37e8241f9bbb0
--- a/components/gnump/gmp.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnump/gmp.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/634
--- a/components/gnupg/gnupg.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnupg/gnupg.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/397
--- a/components/gnuplot/gnuplot.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnuplot/gnuplot.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 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)
--- a/components/gnupth/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnupth/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 COMPONENT_NAME=		pth
 COMPONENT_VERSION=	2.0.7
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://www.gnu.org/software/pth
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/pth/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:9a71915c89ff2414de69fe104ae1016d513afeee
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/pth/$(COMPONENT_ARCHIVE)
--- a/components/gnupth/gnupth.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gnupth/gnupth.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/397
--- a/components/gperf/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gperf/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		gperf
 COMPONENT_VERSION=	3.0.3
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/gperf/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3c535d2727eb0dca10ca87cefa03720a8280c7a2
--- a/components/gperf/gperf.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gperf/gperf.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/123
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gpgme/gpgme.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gpgme/gpgme.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/397
--- a/components/graphviz/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		graphviz
 COMPONENT_VERSION=	2.28.0
+COMPONENT_PROJECT_URL=	http://www.graphviz.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:4725d88a13e071ee22e632de551d4a55ca08ee7d
-COMPONENT_ARCHIVE_URL=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)pub/graphviz/stable/SOURCES/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/graphviz/graphviz-java.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-java.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-lua.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-lua.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-ocaml.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-ocaml.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-perl-512.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-perl-512.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-php.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-php.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-python-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-python-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-ruby.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-ruby.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-sharp.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-sharp.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz-tcl.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz-tcl.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/graphviz/graphviz.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/graphviz/graphviz.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/269
--- a/components/gtar/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gtar/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		tar
 COMPONENT_VERSION=	1.26
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/tar/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:70f298c3cd997b694864c55e6d8655324c87a0cc
--- a/components/gtar/gtar.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gtar/gtar.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/guile/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/guile/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		guile
 COMPONENT_VERSION=	1.8.4
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/guile/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:1e80fe242acfde2bfa39fd1e8409a8f010e24e2b
--- a/components/guile/guile.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/guile/guile.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/315
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gutenprint/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gutenprint/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		gutenprint
 COMPONENT_VERSION=	5.2.4
+COMPONENT_PROJECT_URL=	http://www.gutenprint.org/software/gutenprint/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:ae680314650dd9a52df5fd11cd0282cc6f9662e6
--- a/components/gutenprint/gutenprint.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gutenprint/gutenprint.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/469
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/gzip/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gzip/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		gzip
 COMPONENT_VERSION=	1.3.5
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/gzip/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:843272609b9bff1bdf2770a28d498d6519901e73
--- a/components/gzip/gzip.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/gzip/gzip.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/hal-cups-utils/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/hal-cups-utils/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		hal-cups-utils
 COMPONENT_VERSION=	0.6.19
+COMPONENT_PROJECT_URL=	http://fedorahosted.org/hal-cups-utils/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:14f79f1e8614d4f4a96d9a910ed79f554fbbaaa0
--- a/components/hal-cups-utils/hal-cups-utils.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/hal-cups-utils/hal-cups-utils.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/240
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/hexedit/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/hexedit/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		hexedit
 COMPONENT_VERSION=	1.2.12
+COMPONENT_PROJECT_URL=	http://merd.sourceforge.net/pixel/hexedit.html
 COMPONENT_SRC=		$(COMPONENT_NAME)
 COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(COMPONENT_VERSION).src.tgz
 COMPONENT_ARCHIVE_HASH=	sha1:fee89e390945045fe6b74b5f07600a8e664c8b21
--- a/components/hexedit/hexedit.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/hexedit/hexedit.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
     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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/629
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/hplip/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/hplip/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 
 COMPONENT_NAME=         hplip
 COMPONENT_VERSION=      3.10.9
+COMPONENT_PROJECT_URL=	http://hplipopensource.com/hplip-web/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:5e145eafefbc5122bbe98345f2984fc0a55e5787
--- a/components/hplip/hplip.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/hplip/hplip.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2004/262
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/ilmbase/ilmbase.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ilmbase/ilmbase.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/209
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/imagemagick/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/imagemagick/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -32,6 +32,7 @@
 COMPONENT_VERSION=		6.3.4
 COMPONENT_SUBVERSION=	2
 HUMAN_VERSION=			$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
+COMPONENT_PROJECT_URL=		http://www.imagemagick.org/
 COMPONENT_SRC=			$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=		$(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:516bb273afb007fb08f15c2747862d819a94d391
--- a/components/imagemagick/imagemagick.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/imagemagick/imagemagick.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2007/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/iperf/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/iperf/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_NAME=		iperf
 COMPONENT_VERSION=	2.0.4
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/iperf
+COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/iperf/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:78b6b78789eccf42b5deb783bd8a92469d1383e1
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/iperf/$(COMPONENT_ARCHIVE)
--- a/components/ipmitool/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ipmitool/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_NAME=		ipmitool
 COMPONENT_VERSION=	1.8.11
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://ipmitool.sourceforge.net
+COMPONENT_PROJECT_URL=	http://ipmitool.sourceforge.net/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:4cb6ff3736fd3e166abc5303d6373672327a5db1
 COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/ipmitool/files/ipmitool/1.8.11/$(COMPONENT_ARCHIVE)
--- a/components/ircii/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ircii/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		ircii
 COMPONENT_VERSION=	20060725
 IPS_COMPONENT_VERSION=  0.2006.7.25
+COMPONENT_PROJECT_URL=	http://www.eterna.com.au/ircii/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:421996726cd06b6659857b8e61195d614a68d8c6
--- a/components/ircii/ircii.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ircii/ircii.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/373
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/isc-dhcp/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/isc-dhcp/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		dhcp
 COMPONENT_VERSION=	4.1
+COMPONENT_PROJECT_URL=	http://www.isc.org/software/dhcp/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-ESV-R3
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:6fc5ad06b1192c76edb1a35980fcf070a393c075
--- a/components/isc-dhcp/dhcp.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/isc-dhcp/dhcp.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2011/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
--- a/components/junit/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/junit/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		junit
 COMPONENT_VERSION=	4.5
+COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/junit/
 COMPONENT_SRC=		$(COMPONENT_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).zip
 COMPONENT_ARCHIVE_HASH=	sha1:75d642adaf15091c7ca9ed54f0f2f058bd9ec653
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/junit/files/junit/4.5/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/junit/4.5/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/ant.mk
--- a/components/junit/junit.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/junit/junit.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -34,7 +34,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/633
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/lcms/lcms.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/lcms/lcms.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/071
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/less/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/less/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		less
 COMPONENT_VERSION=	436
+COMPONENT_PROJECT_URL=	http://www.greenwoodsoftware.com/less/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:f78998a1a79a7e1962c901dd41bdc3d1c2005471
-COMPONENT_ARCHIVE_URL=	http://www.greenwoodsoftware.com/less/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/less/less.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/less/less.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libassuan/libassuan.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libassuan/libassuan.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/397
--- a/components/libevent/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libevent/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		libevent
 COMPONENT_VERSION=	1.4.14b
 IPS_COMPONENT_VERSION=	1.4.14.2
+COMPONENT_PROJECT_URL=	http://monkey.org/~provos/libevent/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-stable
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:4a834364c28ad652ddeb00b5f83872506eede7d4
--- a/components/libevent/libevent.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libevent/libevent.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/580
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libexpat/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libexpat/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		expat
 COMPONENT_VERSION=	2.0.1
+COMPONENT_PROJECT_URL=	http://expat.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:663548c37b996082db1f2f2c32af060d7aa15c2d
--- a/components/libexpat/expat.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libexpat/expat.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2007/378
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libidn/libidn.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libidn/libidn.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/167
--- a/components/libksba/libksba.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libksba/libksba.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/397
--- a/components/libmng/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libmng/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		libmng
 COMPONENT_VERSION=	1.0.10
+COMPONENT_PROJECT_URL=	http://www.libmng.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:78ad516a1de79d00de720bf2a7c9afea2c896b09
--- a/components/libmng/libmng.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libmng/libmng.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/072
--- a/components/libneon/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libneon/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME = neon
 COMPONENT_VERSION = 0.29.5
+COMPONENT_PROJECT_URL=	http://www.webdav.org/neon/
 COMPONENT_SRC = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH = sha1:46e85922b2dad60f50393e7d8d4075c880c7e03e
-COMPONENT_ARCHIVE_URL = http://webdav.org/neon/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL = $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/libneon/libneon.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libneon/libneon.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2006/563
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libpcap/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libpcap/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		libpcap
 COMPONENT_VERSION=	1.1.1
+COMPONENT_PROJECT_URL=	http://www.tcpdump.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:18581af5e78a40b7b2c9a6cd8ce40e7cb1cd9c63
-COMPONENT_ARCHIVE_URL=	http://www.tcpdump.org/release/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)release/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/libpcap/libpcap.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libpcap/libpcap.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/288
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libsigsegv/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libsigsegv/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		libsigsegv
 COMPONENT_VERSION=	2.6
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/libsigsegv/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:15ca1dd9574012b8c4c4d2bf6ba945546114b0b5
--- a/components/libsigsegv/libsigsegv.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libsigsegv/libsigsegv.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -33,7 +33,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/107
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libtool/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libtool/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		libtool
 COMPONENT_VERSION=	1.5.22
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/libtool/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:17353e66aeaac80ae188ea0a3a90609550ce3254
--- a/components/libtool/libltdl.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libtool/libltdl.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libtool/libtool.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libtool/libtool.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/557
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libusb/ugen/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libusb/ugen/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 COMPONENT_NAME=		libusbugen
 COMPONENT_VERSION=	0.1.8
 IPS_COMPONENT_VERSION=	0.5.11
+COMPONENT_PROJECT_URL=	http://libusb.sf.net/
 COMPONENT_SRC=		src
 
 include $(WS_TOP)/make-rules/justmake.mk
--- a/components/libusb/ugen/libusbugen.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libusb/ugen/libusbugen.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2003/721
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libusb/wrapper/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libusb/wrapper/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 COMPONENT_NAME=		libusb
 COMPONENT_VERSION=	0.1.8
 IPS_COMPONENT_VERSION=	0.5.11
+COMPONENT_PROJECT_URL=	http://libusb.sf.net/
 COMPONENT_SRC=		src
 
 include $(WS_TOP)/make-rules/justmake.mk
--- a/components/libusb/wrapper/libusb.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libusb/wrapper/libusb.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2003/721
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libxml2/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libxml2/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		libxml2
 COMPONENT_VERSION=	2.7.6
+COMPONENT_PROJECT_URL=	http://xmlsoft.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:b0f6bf8408e759ac4b8b9650005ee8adea911e1d
--- a/components/libxml2/libxml2-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libxml2/libxml2-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/630
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libxml2/libxml2.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libxml2/libxml2.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/630
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libxslt/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libxslt/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		libxslt
 COMPONENT_VERSION=	1.1.26
+COMPONENT_PROJECT_URL=	http://xmlsoft.org/XSLT/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:69f74df8228b504a87e2b257c2d5238281c65154
--- a/components/libxslt/libxsl-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libxslt/libxsl-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/libxslt/libxslt.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/libxslt/libxslt.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2002/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/lighttpd/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/lighttpd/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		lighttpd
 COMPONENT_VERSION=	1.4.23
+COMPONENT_PROJECT_URL=	http://www.lighttpd.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:37f8b4827d7a1f69812d8185fcecf72277020876
-COMPONENT_ARCHIVE_URL=	http://www.lighttpd.net/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 LIGHTTPD_INSTALLDIR=/usr/lighttpd/1.4
 
--- a/components/lighttpd/lighttpd.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/lighttpd/lighttpd.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,8 +28,7 @@
     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 \
-    value=http://www.lighttpd.net/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url \
     value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
--- a/components/logilab-astng/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/logilab-astng/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		logilab-astng
 COMPONENT_VERSION=	0.19.0
+COMPONENT_PROJECT_URL=	http://www.logilab.org/project/logilab-astng/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:87fe682ec98599c0088f228ba94cb50a7ed99466
--- a/components/logilab-astng/logilab-astng.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/logilab-astng/logilab-astng.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/299
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/logilab-common/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/logilab-common/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		logilab-common
 COMPONENT_VERSION=	0.40.0
+COMPONENT_PROJECT_URL=	http://www.logilab.org/project/logilab-common/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:4020a550c083f9c4cffdf9bc95f5d957b25ba95b
--- a/components/logilab-common/logilab-common.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/logilab-common/logilab-common.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,8 +30,7 @@
 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-common/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/298
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/lua/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/lua/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		lua
 COMPONENT_VERSION=	5.1.4
+COMPONENT_PROJECT_URL=	http://www.lua.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:2b11c8e60306efb7f0734b747588f57995493db7
-COMPONENT_ARCHIVE_URL=	http://www.lua.org/ftp/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)ftp/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/justmake.mk
--- a/components/lua/lua.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/lua/lua.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/013
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/m4/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/m4/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		m4
 COMPONENT_VERSION=	1.4.12
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/m4/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:013ca38511e17835dc1a1381cbe8e39179637a49
--- a/components/m4/m4.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/m4/m4.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/388
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/make/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/make/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		make
 COMPONENT_VERSION=	3.81
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/make/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:cd4fa5a3184176492bf0799593a8f250a728210c
--- a/components/make/make.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/make/make.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/mc/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mc/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		mc
 COMPONENT_VERSION=	4.7.5.2
+COMPONENT_PROJECT_URL=	http://www.midnight-commander.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:b7034e2b7bfed63e6a37d6be9f03d10f59f62dec
-COMPONENT_ARCHIVE_URL=	http://www.midnight-commander.org/downloads/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)downloads/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/mc/mc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mc/mc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/202
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/meld/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/meld/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 
 COMPONENT_NAME=		meld
 COMPONENT_VERSION=	1.4.0
+COMPONENT_PROJECT_URL=	http://meld.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:91e12464c44146cb1e30295c88530ebf33be1374
--- a/components/meld/meld.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/meld/meld.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/189/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/mercurial/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mercurial/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		mercurial
 COMPONENT_VERSION=	1.8.4
+COMPONENT_PROJECT_URL=	http://mercurial.selenic.com/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:25c4f9b1ad1c5c8ef94ca5b120c9af6bdfd23bdc
--- a/components/mercurial/mercurial.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mercurial/mercurial.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -36,7 +36,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 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)
--- a/components/mpc/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mpc/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		mpc
 COMPONENT_VERSION=	0.9
+COMPONENT_PROJECT_URL=	http://www.multiprecision.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:229722d553030734d49731844abfef7617b64f1a
-COMPONENT_ARCHIVE_URL=	http://www.multiprecision.org/mpc/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)mpc/download/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/mpc/mpc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mpc/mpc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Multiprecision complex data type evaluation library"
 set name=info.classification value="org.opensolaris.category.2008:Development/High Performance Computing"
-set name=info.upstream-url value="http://www.multiprecision.org"
+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=org.opensolaris.arc-caseid \
--- a/components/mpfr/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mpfr/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,10 +28,11 @@
 
 COMPONENT_NAME=         mpfr
 COMPONENT_VERSION=      2.4.2
+COMPONENT_PROJECT_URL=	http://www.mpfr.org/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:d2c3504bd0318dda8332ca80523659e9779c367c
-COMPONENT_ARCHIVE_URL=  http://www.mpfr.org/$(COMPONENT_NAME)-$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)$(COMPONENT_SRC)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/mpfr/mpfr.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/mpfr/mpfr.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/655
--- a/components/ncftp/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ncftp/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		ncftp
 COMPONENT_VERSION=	3.2.3
+COMPONENT_PROJECT_URL=	http://www.ncftp.com/ncftp/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:7d58ce15662a2aeeb0b564f98c2beea2f6e54a0b
--- a/components/ncftp/ncftp.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ncftp/ncftp.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.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
--- a/components/net-snmp/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/net-snmp/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		net-snmp
 COMPONENT_VERSION=	5.4.1
+COMPONENT_PROJECT_URL=	http://www.net-snmp.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:ac5ba033c10d53d3057415121f8c4936c643c208
--- a/components/net-snmp/net-snmp-addons.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/net-snmp/net-snmp-addons.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -24,7 +24,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
--- a/components/net-snmp/net-snmp-base.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/net-snmp/net-snmp-base.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 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"
--- a/components/net-snmp/net-snmp-documentation.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/net-snmp/net-snmp-documentation.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 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)
--- a/components/nethack/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/nethack/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,6 +29,7 @@
 
 COMPONENT_NAME=		nethack
 COMPONENT_VERSION=	3.4.3
+COMPONENT_PROJECT_URL=	http://www.nethack.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-343-src.tgz
 COMPONENT_ARCHIVE_HASH=	sha1:c26537093c38152bc0fbcec20468d975b35f59fd
--- a/components/nethack/nethack.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/nethack/nethack.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,8 +29,7 @@
 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 \
-    value=http://www.nethack.org/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/172
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/nmap/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/nmap/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=         nmap
 COMPONENT_VERSION=      5.51
+COMPONENT_PROJECT_URL=	http://insecure.org/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH= sha1:bad24e4d332b293d08d8ce38583fefa176e9198d
--- a/components/nmap/nmap.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/nmap/nmap.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2007/129
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
--- a/components/ntp/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ntp/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -30,6 +30,7 @@
 COMPONENT_VERSION=	4.2.5
 HUMAN_VERSION=		$(COMPONENT_VERSION)p$(COMPONENT_PATCH_VERSION)
 IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION).$(COMPONENT_PATCH_VERSION)
+COMPONENT_PROJECT_URL=	http://www.ntp.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:ff032582d66314ff2556a368162fd1fd15fbf9a6
--- a/components/ntp/ntp.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ntp/ntp.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/244
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/open-fabrics/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/open-fabrics/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,8 @@
 
 COMPONENT_VERSION=1.5.3
 
+COMPONENT_PROJECT_URL=	http://www.openfabrics.org/
+
 # for now, everything with a Makefile should be built
 SUBDIRS =	$(shell echo */Makefile | sed -e 's;/Makefile;;g')
 
--- a/components/open-fabrics/open-fabrics.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/open-fabrics/open-fabrics.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
     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://www.openfabrics.org/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url \
     value=http://www.openfabrics.org/downloads/ibutils/ibutils-1.5.7.tar.gz \
     value=http://www.openfabrics.org/downloads/libibverbs/libibverbs-1.1.4-1.22.g7257cd3.tar.gz \
--- a/components/openexr/openexr.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/openexr/openexr.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/209
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/openldap/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/openldap/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,6 +29,7 @@
 
 COMPONENT_NAME=		openldap
 COMPONENT_VERSION=	2.4.25
+COMPONENT_PROJECT_URL=	http://www.openldap.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:56efaf3656cc68d3b5be66422c0c89f0104d7183
--- a/components/openldap/openldap.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/openldap/openldap.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -44,7 +44,7 @@
 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.openldap.org/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2010/180
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=etc
--- a/components/openssl/openssl-0.9.8-fips-140/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/openssl/openssl-0.9.8-fips-140/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,10 +29,11 @@
 # libraries. However, we use the FIPS canister version for the IPS package.
 COMPONENT_VERSION =	0.9.8q
 IPS_COMPONENT_VERSION = 1.2
+COMPONENT_PROJECT_URL=	http://www.openssl.org/
 COMPONENT_SRC =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:12b6859698ca299fa0cba594686c25d5c01e410d
-COMPONENT_ARCHIVE_URL =	http://www.openssl.org/source/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 
 # Apply the patch on SPARC only. Must put this before including prep.mk as
 # mentioned in there.
--- a/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/openssl/openssl-0.9.8-fips-140/openssl-0.9.8-fips-140.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/507
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/openssl/openssl-1.0.0/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/openssl/openssl-1.0.0/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,10 +29,11 @@
 # Version for IPS. It is easier to do it manually than convert the letter to a
 # number while taking into account that there might be no letter at all.
 IPS_COMPONENT_VERSION = 1.0.0.5
+COMPONENT_PROJECT_URL=	http://www.openssl.org/
 COMPONENT_SRC =		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:235eb68e5a31b0f7a23bc05f52d7a39c596e2e69
-COMPONENT_ARCHIVE_URL =	http://www.openssl.org/source/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL =	$(COMPONENT_PROJECT_URL)source/$(COMPONENT_ARCHIVE)
 
 # Architecture-specific patches
 EXTRA_PATCHES.i386 = $(PATCH_DIR)/openssl-1.0.0d-aesni-v4.i386-patch
--- a/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/openssl/openssl-1.0.0/openssl-1.0.0.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=http://sac.sfbay.sun.com/PSARC/2011/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/p7zip/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/p7zip/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,6 +29,7 @@
 
 COMPONENT_NAME=		p7zip
 COMPONENT_VERSION=	9.20.1
+COMPONENT_PROJECT_URL=	http://p7zip.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)_src_all.tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:1cd567e043ee054bf08244ce15f32cb3258306b7
--- a/components/p7zip/p7zip.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/p7zip/p7zip.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/617
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/pam_pkcs11/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/pam_pkcs11/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		pam_pkcs11
 COMPONENT_VERSION=	0.6.0
+COMPONENT_PROJECT_URL=	http://www.opensc-project.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:eef40325afc426e5364f0d9762a8e0aded34a6c2
-COMPONENT_ARCHIVE_URL=	http://www.opensc-project.org/files/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/pam_pkcs11/pam_pkcs11.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/pam_pkcs11/pam_pkcs11.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2006/283
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/patch/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/patch/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 
 COMPONENT_NAME=		patch
 COMPONENT_VERSION=	2.5.9
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/patch/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:9a69f7191576549255f046487da420989d2834a6
--- a/components/patch/patch.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/patch/patch.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2001/799
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/pcre/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/pcre/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:229e6585ec816fbb7081a6b3d29daf1e048f362f
 COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/pcre/files/pcre/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=  http://pcre.org
+COMPONENT_PROJECT_URL=  http://pcre.org/
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
--- a/components/perl512/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/perl512/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -31,6 +31,7 @@
 COMPONENT_NAME=		perl
 COMPONENT_VERSION=	5.12.3
 PERL_VERSION=		5.12
+COMPONENT_PROJECT_URL=	http://www.perl.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:86d77c6cbc7a60068dc14c88ffd0729324d1174f
--- a/components/perl512/perl-512.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/perl512/perl-512.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2010/359
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/perl_modules/net-ssleay/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/perl_modules/net-ssleay/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 COMPONENT_VERSION=	1.36
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_PROJECT_URL=	http://search.cpan.org/dist/Net-SSLeay
+COMPONENT_PROJECT_URL=	http://search.cpan.org/dist/Net-SSLeay/
 COMPONENT_ARCHIVE_HASH=	sha1:e8cfb6355a596471518356a29bfe53ab2011c685
 COMPONENT_ARCHIVE_URL=	http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/$(COMPONENT_ARCHIVE)
 
--- a/components/perl_modules/pmtools/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/perl_modules/pmtools/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		pmtools
 COMPONENT_VERSION=	1.10
+COMPONENT_PROJECT_URL=	http://search.cpan.org/dist/pmtools/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:9be28391ea83c47b6a6ffd9d2e6466cf86f33f57
--- a/components/perl_modules/pmtools/pmtools.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/perl_modules/pmtools/pmtools.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/121/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/perl_modules/pmtools/pmtools_512.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/perl_modules/pmtools/pmtools_512.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/121/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/perl_modules/pmtools/pmtools_584.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/perl_modules/pmtools/pmtools_584.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/121/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/php-5_2/APC-zts/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/APC-zts/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:58d90ab757e606c878be3449a738016a08061dfd
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/APC
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/APC/
 
 PATCH_DIR = ../APC/patches
 
--- a/components/php-5_2/APC/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/APC/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:58d90ab757e606c878be3449a738016a08061dfd
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/APC
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/APC/
 
 include ../extensions.mk
 
--- a/components/php-5_2/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -121,6 +121,8 @@
 #			[paths already correct and some things don't exist.]
 #               looks like i DO NEED the pear patches
 
+COMPONENT_PROJECT_URL=	http://www.php.net/
+
 PKG_PROTO_DIRS += APC/build/prototype/$(MACH)
 PKG_PROTO_DIRS += APC-zts/build/prototype/$(MACH)
 PKG_PROTO_DIRS += idn/build/prototype/$(MACH)
--- a/components/php-5_2/apache-php5.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/apache-php5.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2008/538
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/php-5_2/idn-zts/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/idn-zts/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:39406c22ac86d7f30e47261a08fb93cea5dc3f39
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/idn
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/idn/
 
 PATCH_DIR = ../idn/patches
 
--- a/components/php-5_2/idn/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/idn/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:39406c22ac86d7f30e47261a08fb93cea5dc3f39
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/idn
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/idn/
 
 include ../extensions.mk
 
--- a/components/php-5_2/memcache-zts/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/memcache-zts/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:6bc7d8fc9c9b9a247316e35d0cac3fe9dd37b68c
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/memcache
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/memcache/
 
 include ../extensions-zts.mk
 
--- a/components/php-5_2/memcache/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/memcache/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:6bc7d8fc9c9b9a247316e35d0cac3fe9dd37b68c
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/memcache
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/memcache/
 
 include ../extensions.mk
 
--- a/components/php-5_2/php-52.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/php-52.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -34,7 +34,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 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
--- a/components/php-5_2/php-doc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/php-doc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 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
--- a/components/php-5_2/php-mysql.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/php-mysql.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 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
--- a/components/php-5_2/tcpwrap-zts/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/tcpwrap-zts/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:23cbfdc8ea9ff1e64814d52a14bbd365b1e16cf7
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/tcpwrap
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/tcpwrap/
 
 PATCH_DIR = ../tcpwrap/patches
 
--- a/components/php-5_2/tcpwrap/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/php-5_2/tcpwrap/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:23cbfdc8ea9ff1e64814d52a14bbd365b1e16cf7
 COMPONENT_ARCHIVE_URL=	http://pecl.php.net/get/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=	http://pecl.php.net/package/tcpwrap
+COMPONENT_PROJECT_URL=	http://pecl.php.net/package/tcpwrap/
 
 include ../extensions.mk
 
--- a/components/pinentry/pinentry.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/pinentry/pinentry.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/397
--- a/components/proftpd/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/proftpd/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,6 +29,7 @@
 COMPONENT_VERSION=	1.3.3
 COMPONENT_SUBVERSION=	g
 HUMAN_VERSION=		$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
+COMPONENT_PROJECT_URL=	http://www.proftpd.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:11c2951526476d9f52307aa714851463aa76aa61
--- a/components/proftpd/proftpd.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/proftpd/proftpd.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/088
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/psutils/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/psutils/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,6 +25,7 @@
 
 COMPONENT_NAME=		psutils
 COMPONENT_VERSION=	p17
+COMPONENT_PROJECT_URL=	http://knackered.knackered.org/angus/psutils/
 COMPONENT_SRC=		$(COMPONENT_NAME)
 COMPONENT_ARCHIVE=	$(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:6f1ecb5846cffb644826a02bd9153fe5d6387a9b
--- a/components/psutils/psutils.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/psutils/psutils.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2007/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/pwgen/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/pwgen/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		pwgen
 COMPONENT_VERSION=	2.06
+COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/pwgen/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:43dc4fbe6c3bdf96ae24b20d44c4a4584df93d8e
-COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/pwgen/files/pwgen/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)	
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/pwgen/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)	
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/pwgen/pwgen.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/pwgen/pwgen.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/453
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/cherrypy/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/cherrypy/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		CherryPy
 COMPONENT_VERSION=	3.1.2
+COMPONENT_PROJECT_URL=	http://www.cherrypy.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:a94aedfd0e675858dbcc32dd250c23d285ee9b88
--- a/components/python/cherrypy/cherrypy-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/cherrypy/cherrypy-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="CherryPy Team <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/cherrypy/cherrypy.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/cherrypy/cherrypy.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="CherryPy Team <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/coverage/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/coverage/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		coverage
 COMPONENT_VERSION=	3.5
+COMPONENT_PROJECT_URL=	http://nedbatchelder.com/code/coverage/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:aa0f40e7e79bc81ea4a33ee7fc5ba66db7633321
--- a/components/python/coverage/coverage-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/coverage/coverage-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Ned Batchelder <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/coverage/coverage.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/coverage/coverage.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Ned Batchelder <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/ldtp/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/ldtp/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 COMPONENT_VERSION=      2.1.1
 COMPONENT_MAJOR_VERSION=2.x
 COMPONENT_MINOR_VERSION=2.1.x
+COMPONENT_PROJECT_URL=	http://ldtp.freedesktop.org/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:5439809806a8dd7e33c95617fb0cbed35d111974
--- a/components/python/ldtp/ldtp-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/ldtp/ldtp-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
--- a/components/python/ldtp/ldtp.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/ldtp/ldtp.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
--- a/components/python/m2crypto/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/m2crypto/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		M2Crypto
 COMPONENT_VERSION=	0.21.1
+COMPONENT_PROJECT_URL=	http://chandlerproject.org/Projects/MeTooCrypto/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3c7135b952092e4f2eee7a94c5153319cccba94e
--- a/components/python/m2crypto/m2crypto-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/m2crypto/m2crypto-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Heikki Toivonen <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/m2crypto/m2crypto.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/m2crypto/m2crypto.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -24,7 +24,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python interface 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Heikki Toivonen <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/mako/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/mako/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,10 +26,11 @@
 
 COMPONENT_NAME=		Mako
 COMPONENT_VERSION=	0.4.1
+COMPONENT_PROJECT_URL=	http://www.makotemplates.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:a4e30660794aab5224e0c776d03c45f3c8b5fa7e
-COMPONENT_ARCHIVE_URL=	http://www.makotemplates.org/downloads/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)downloads/$(COMPONENT_ARCHIVE)
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/setup.py.mk
--- a/components/python/mako/mako-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/mako/mako-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Mike Bayer <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/mako/mako.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/mako/mako.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Mike Bayer <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/pybonjour/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pybonjour/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		pybonjour
 COMPONENT_VERSION=	1.1.1
+COMPONENT_PROJECT_URL=	http://code.google.com/p/pybonjour/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:92cabd14e04c5f62ce067c47c2057ee3d424d29b
--- a/components/python/pybonjour/pybonjour-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pybonjour/pybonjour-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Christopher Stawarz <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/pybonjour/pybonjour.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pybonjour/pybonjour.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="Christopher Stawarz <[email protected]>"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/pycups/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pycups/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		pycups
 COMPONENT_VERSION=	1.9.46
+COMPONENT_PROJECT_URL=	http://cyberelk.net/tim/software/pycups/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:fe387368b105f025c50a7e67e5634abaa8ff845e
--- a/components/python/pycups/pycups.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pycups/pycups.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/273/
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 dir path=usr
--- a/components/python/pycurl/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pycurl/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,10 +26,11 @@
 
 COMPONENT_NAME=		pycurl
 COMPONENT_VERSION=	7.19.0
+COMPONENT_PROJECT_URL=	http://pycurl.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3fb59eca1461331bb9e9e8d6fe3b23eda961a416
-COMPONENT_ARCHIVE_URL=	http://pycurl.sourceforge.net/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 IPS_COMPONENT_VERSION=  7.19.0.1
 
--- a/components/python/pycurl/pycurl-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pycurl/pycurl-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
--- a/components/python/pycurl/pycurl.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pycurl/pycurl.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
--- a/components/python/pylxml/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pylxml/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		lxml
 COMPONENT_VERSION=	2.1.2
+COMPONENT_PROJECT_URL=	http://lxml.de/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:5354b3dd5f0bd16589da9970e0da7df60aaaa2f5
-COMPONENT_ARCHIVE_URL=	http://lxml.de/files/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)files/$(COMPONENT_ARCHIVE)
 
 # disable optimization to prevent the Studio compilers from spinning
 studio_OPT.i386.32 =
--- a/components/python/pylxml/pylxml.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pylxml/pylxml.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/579
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/pyopenssl/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pyopenssl/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		pyOpenSSL
 COMPONENT_VERSION=	0.11
+COMPONENT_PROJECT_URL=	http://pyopenssl.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:92b550853626d2959c44abb72944b83403427497
--- a/components/python/pyopenssl/pyopenssl-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/pyopenssl/pyopenssl-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/176
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/python26/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python26/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,10 +26,11 @@
 
 COMPONENT_NAME=		Python
 COMPONENT_VERSION=	2.6.4
+COMPONENT_PROJECT_URL=	http://python.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:bee572680d1966501247cb2b26e0e51f94d1cd13
-COMPONENT_ARCHIVE_URL=	http://python.org/ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
--- a/components/python/python26/python-26-tests.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python26/python-26-tests.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/python26/python-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python26/python-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/python26/tkinter-26.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python26/tkinter-26.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/043
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/python/python27/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python27/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		Python
 COMPONENT_VERSION=	2.7.1
+COMPONENT_PROJECT_URL=	http://python.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:fbe1894322ff91b80726e269c97454f4129fc2a3
-COMPONENT_ARCHIVE_URL=	http://python.org/ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include $(WS_TOP)/make-rules/prep.mk
 include $(WS_TOP)/make-rules/configure.mk
--- a/components/python/python27/python-27-tests.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python27/python-27-tests.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/514 \
     value=PSARC/2009/529 \
--- a/components/python/python27/python-27.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python27/python-27.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/514 \
     value=PSARC/2009/529 \
--- a/components/python/python27/tkinter-27.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/python/python27/tkinter-27.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/XXX
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/quagga/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/quagga/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,10 +28,11 @@
 COMPONENT_NAME=		quagga
 COMPONENT_VERSION=	0.99.8
 IPS_COMPONENT_VERSION=	$(COMPONENT_VERSION)
+COMPONENT_PROJECT_URL=	http://www.quagga.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:9576d0ac266d173d2a90b8c6f72da8c6b43583d7
-COMPONENT_ARCHIVE_URL=	http://www.quagga.net/download/attic/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/attic/$(COMPONENT_ARCHIVE)
 PATCH_LEVEL = 0
 
 # without this we bus error on sparc. Until the code in all of Quagga
--- a/components/quagga/quagga.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/quagga/quagga.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,7 +32,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2005/571
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/quilt/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/quilt/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_NAME=		quilt
 COMPONENT_VERSION=	0.47
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://savannah.nongnu.org/projects/quilt
+COMPONENT_PROJECT_URL=	http://savannah.nongnu.org/projects/quilt/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:028dadd5ab60b1df12edd18af600e59fe0a83525
 COMPONENT_ARCHIVE_URL=	http://download.savannah.gnu.org/releases/quilt/$(COMPONENT_ARCHIVE)
--- a/components/readline/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/readline/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		readline
 COMPONENT_VERSION=	5.2
+COMPONENT_PROJECT_URL=	http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:18f3412c73068509d5f491b7b4535aeaf9522834
--- a/components/readline/readline.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/readline/readline.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -32,8 +32,7 @@
 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://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/188
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/rpm2cpio/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/rpm2cpio/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -31,6 +31,7 @@
 #
 COMPONENT_NAME=		rpm2cpio
 COMPONENT_VERSION=	0.5.11
+COMPONENT_PROJECT_URL=	http://www.iagora.com/~espel/rpm2cpio/
 COMPONENT_SRC=		src
 
 include ../../make-rules/prep.mk
--- a/components/rpm2cpio/rpm2cpio.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/rpm2cpio/rpm2cpio.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/rsync/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/rsync/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_NAME=		rsync
 COMPONENT_VERSION=	3.0.8
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://rsync.samba.org
+COMPONENT_PROJECT_URL=	http://rsync.samba.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:10e80173c7e9ed8b8a4dc9e8fdab08402da5f08d
 COMPONENT_ARCHIVE_URL=	http://rsync.samba.org/ftp/rsync/src/$(COMPONENT_ARCHIVE)
--- a/components/ruby/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ruby/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		ruby
 COMPONENT_VERSION=	1.8.7
 COMPONENT_PATCH_VERSION=	334
+COMPONENT_PROJECT_URL=	http://www.ruby-lang.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-p$(COMPONENT_PATCH_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:4311ce257f2e54f247bfe07b48e799d293d041f2
--- a/components/ruby/ruby-18.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/ruby/ruby-18.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set name=org.opensolaris.arc-caseid \
--- a/components/samba/mozldap/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/samba/mozldap/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 COMPONENT_NAME=		mozldap
 COMPONENT_VERSION=	6.0.7
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	https://wiki.mozilla.org/LDAP_C_SDK
+COMPONENT_PROJECT_URL=	https://wiki.mozilla.org/LDAP_C_SDK/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:6ddf73fe45b9b916423c06aaf46fe58680b4e02f
 COMPONENT_ARCHIVE_URL=	ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
--- a/components/sane-backends/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sane-backends/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		sane-backends
 COMPONENT_VERSION=	1.0.19
+COMPONENT_PROJECT_URL=	http://www.sane-project.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:3ff8eefa8f32e72dcdbaa4bf20fe125df90144d5
--- a/components/sane-backends/sane-backends.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sane-backends/sane-backends.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/sane-frontends/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sane-frontends/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		sane-frontends
 COMPONENT_VERSION=	1.0.14
+COMPONENT_PROJECT_URL=	http://www.sane-project.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:063e11df3e32d7a43161fd37026a4dc601d5482d
--- a/components/sane-frontends/sane-frontends.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sane-frontends/sane-frontends.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/170
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/sblim/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sblim/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_NAME=		cim-client
 COMPONENT_VERSION=	1.3.7
 COMPONENT_SRC=		$(COMPONENT_NAME)
-COMPONENT_PROJECT_URL=	http://sblim.wiki.sourceforge.net/CimClient
+COMPONENT_PROJECT_URL=	http://sblim.wiki.sourceforge.net/CimClient/
 COMPONENT_ARCHIVE=	sblim-$(COMPONENT_NAME)-$(COMPONENT_VERSION)-src.zip
 COMPONENT_ARCHIVE_HASH=	sha1:6cb6e75b98439e31f32fc5f16f0002f2b1601b50
 COMPONENT_ARCHIVE_URL=	http://downloads.sourceforge.net/sblim/$(COMPONENT_ARCHIVE)
--- a/components/screen/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/screen/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		screen
 COMPONENT_VERSION=	4.0.3
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/screen/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:7bc6e2f0959ffaae6f52d698c26c774e7dec3545
--- a/components/screen/screen.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/screen/screen.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/413
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/sed/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sed/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		sed
 COMPONENT_VERSION=	4.2.1
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/sed/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:502f5fa9aff891f0383baaeb1958b66dbc4b05c8
--- a/components/sed/sed.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sed/sed.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -33,7 +33,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/254
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/slib/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/slib/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -31,6 +31,7 @@
 
 COMPONENT_NAME=		slib
 COMPONENT_VERSION=	3b1
+COMPONENT_PROJECT_URL=	http://people.csail.mit.edu/jaffer/SLIB/
 COMPONENT_SRC=		$(COMPONENT_NAME)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-$(COMPONENT_VERSION).zip
 COMPONENT_ARCHIVE_HASH=	sha1:e3342e4cb1e728bb3133449654b10b538ed8b043
--- a/components/slib/slib.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/slib/slib.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/316
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/slrn/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/slrn/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,6 +29,7 @@
 COMPONENT_VERSION=	0.9.9
 COMPONENT_SUBVERSION=	p1
 HUMAN_VERSION=		$(COMPONENT_VERSION)$(COMPONENT_SUBVERSION)
+COMPONENT_PROJECT_URL=	http://slrn.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:f14d88eda39b78bd2f098f211d4a1c363c0fe924
--- a/components/slrn/slrn.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/slrn/slrn.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,8 +31,7 @@
     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 \
-    value=http://slrn.sourceforge.net/
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url \
     value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
--- a/components/sox/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sox/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		sox
 COMPONENT_VERSION=	14.3.0
+COMPONENT_PROJECT_URL=	http://sox.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:34b8e991ba8511fa9683e9e9d356fb7f4179d03c
--- a/components/sox/sox.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/sox/sox.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/445
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/spawn-fcgi/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/spawn-fcgi/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=		spawn-fcgi
 COMPONENT_VERSION=	1.6.3
+COMPONENT_PROJECT_URL=	http://www.lighttpd.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:2b97ea57d9d79745fe8d6051d830fa507b421169
-COMPONENT_ARCHIVE_URL=	http://www.lighttpd.net/download/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/spawn-fcgi/spawn-fcgi.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/spawn-fcgi/spawn-fcgi.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/562
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/squid/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/squid/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,10 +29,11 @@
 
 COMPONENT_NAME=         squid
 COMPONENT_VERSION=      3.1.8
+COMPONENT_PROJECT_URL=	http://www.squid-cache.org/
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:1b3e14e653a77462607aefa7931605a5e24829b9
-COMPONENT_ARCHIVE_URL=  http://www.squid-cache.org/Versions/v3/3.1/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)Versions/v3/3.1/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/squid/squid.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/squid/squid.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2009/130
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/stdcxx/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/stdcxx/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		stdcxx
 COMPONENT_VERSION=	4.2.1
+COMPONENT_PROJECT_URL=	http://stdcxx.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://stdcxx.apache.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
--- a/components/stdcxx/stdcxx.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/stdcxx/stdcxx.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/549
--- a/components/subversion/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/subversion/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,6 +29,7 @@
 
 COMPONENT_NAME=		subversion
 COMPONENT_VERSION=	1.6.16
+COMPONENT_PROJECT_URL=	http://subversion.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:e957da04252d4d7e0fff72fdcf72c715bfbaa393
--- a/components/subversion/subversion-java.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/subversion/subversion-java.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -23,7 +23,7 @@
 set name=pkg.fmri value=pkg:/library/java/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Java bindings for the Subversion SCM"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value="http://subversion.apache.org/"
+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/2006/563
--- a/components/subversion/subversion-perl.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/subversion/subversion-perl.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 set name=pkg.fmri value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Perl bindings for the Subversion SCM"
 set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value="http://subversion.apache.org/"
+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/2006/563
--- a/components/subversion/subversion-python.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/subversion/subversion-python.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -23,7 +23,7 @@
 set name=pkg.fmri value=pkg:/library/python-2/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Python 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2006/563
--- a/components/subversion/subversion.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/subversion/subversion.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2006/563
--- a/components/swig/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/swig/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		swig
 COMPONENT_VERSION=	1.3.35
+COMPONENT_PROJECT_URL=	http://www.swig.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:f5d61ba31f440846b5e2a4077da26dd5d347fa61
--- a/components/swig/swig.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/swig/swig.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/475
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tcl/expect/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcl/expect/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		expect
 COMPONENT_VERSION=	5.45
+COMPONENT_PROJECT_URL=	http://expect.nist.gov/
 COMPONENT_SRC=		$(COMPONENT_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:e634992cab35b7c6931e1f21fbb8f74d464bd496
--- a/components/tcl/expect/expect.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcl/expect/expect.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/612
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tcl/tcl/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcl/tcl/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,10 +27,11 @@
 
 COMPONENT_NAME=         tcl
 COMPONENT_VERSION=      8.5.9
+COMPONENT_PROJECT_URL=	http://prdownloads.sourceforge.net/tcl/
 COMPONENT_SRC=          $(COMPONENT_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC)-src.tar.gz
 COMPONENT_ARCHIVE_HASH= sha1:ae87c5e58ba20760d9bc77117d219bbf1b6a5557
-COMPONENT_ARCHIVE_URL=  http://prdownloads.sourceforge.net/tcl/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=  $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../../make-rules/prep.mk
 include ../../../make-rules/configure.mk
--- a/components/tcl/tcl/tcl.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcl/tcl/tcl.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/317
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tcl/tk/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcl/tk/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		tk
 COMPONENT_VERSION=	8.5.9
+COMPONENT_PROJECT_URL=	http://prdownloads.sourceforge.net/tk/
 COMPONENT_SRC=		$(COMPONENT_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:161a133e0b653d5fdf6fcff47bdbf768d73f3238
--- a/components/tcl/tk/tk.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcl/tk/tk.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/317
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tcltls/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcltls/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		tls
 COMPONENT_VERSION=	1.6
+COMPONENT_PROJECT_URL=	http://tls.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:badee4d0a096e9951ffc1f82a6530f78b2404a2c
--- a/components/tcltls/tcltls.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcltls/tcltls.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/266
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tcpdump/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcpdump/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		tcpdump
 COMPONENT_VERSION=	4.1.1
+COMPONENT_PROJECT_URL=	http://www.tcpdump.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:8f356cbc781192ecb527623d68db90e06aa9d4b9
-COMPONENT_ARCHIVE_URL=	http://www.tcpdump.org/release/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)release/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/tcpdump/tcpdump.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcpdump/tcpdump.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/147
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tcsh/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcsh/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		tcsh
 COMPONENT_VERSION=	6.17.00
+COMPONENT_PROJECT_URL=	http://www.tcsh.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:9bf67d5ce1b406178e9ba535ecd34553fe0d4d36
--- a/components/tcsh/tcsh.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tcsh/tcsh.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/025
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/texinfo/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/texinfo/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		texinfo
 COMPONENT_VERSION=	4.7
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/texinfo/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:c0e7d2d40b4fa12278fd1da4fd57159289799504
--- a/components/texinfo/texinfo.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/texinfo/texinfo.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -27,7 +27,7 @@
 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.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
--- a/components/tidy/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tidy/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		tidy
 COMPONENT_VERSION=	1.0.0
+COMPONENT_PROJECT_URL=	http://tidy.sourceforge.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:305704f7569b9e0abea81033f609f9a19dbbcfe2
--- a/components/tidy/tidy.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tidy/tidy.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/134
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tomcat/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tomcat/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		apache-tomcat
 COMPONENT_VERSION=	6.0.33
+COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:437db0ba55c6e398fe3af73c4fa5eed3c4666842
--- a/components/tomcat/tomcat-examples.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tomcat/tomcat-examples.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -37,7 +37,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/711
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/tomcat/tomcat.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/tomcat/tomcat.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -42,7 +42,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/711
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/top/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/top/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		top
 COMPONENT_VERSION=	3.8beta1
+COMPONENT_PROJECT_URL=	http://www.unixtop.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:d3f911f8cd64d21a8beb7eb3694923b40d2532e2
-COMPONENT_ARCHIVE_URL=	http://www.unixtop.org/dist/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)dist/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/top/top.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/top/top.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2008/533
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/trousers/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/trousers/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,9 +27,9 @@
 COMPONENT_VERSION=	0.3.6
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/trousers/files/trousers
+COMPONENT_PROJECT_URL=	http://sourceforge.net/projects/trousers/files/trousers/
 COMPONENT_ARCHIVE_HASH=	sha1:1bb65fe1a031f9606d871562ead35fa5909ae584
-COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/unixodbc/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/unixodbc/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 COMPONENT_PROJECT_URL=	http://unixodbc.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:b2839b5210906e3ee286a4b621f177db9c7be7a8
-COMPONENT_ARCHIVE_URL=	http://www.unixodbc.org/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/unixodbc/unixodbc.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/unixodbc/unixodbc.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
     value=LSARC/2007/684
--- a/components/vim/gvim.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/vim/gvim.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="[email protected]"
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/267 \
--- a/components/vim/vim-core.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/vim/vim-core.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -33,7 +33,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="[email protected]"
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/267
--- a/components/vim/vim.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/vim/vim.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -33,7 +33,7 @@
     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.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.upstream value="[email protected]"
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/267
--- a/components/wget/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/wget/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		wget
 COMPONENT_VERSION=	1.12
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/wget/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:1a059b3736ef908b68acac91670f9df576d1a061
--- a/components/wget/wget.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/wget/wget.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2000/488
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/which/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/which/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,6 +24,7 @@
 
 COMPONENT_NAME=		which
 COMPONENT_VERSION=	2.16
+COMPONENT_PROJECT_URL=	http://www.xs4all.nl/~carlo17/which/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:247804c95e91583020b4d57ccb517a2997041bd5
--- a/components/which/which.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/which/which.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -30,7 +30,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/049
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/wireshark/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/wireshark/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -24,10 +24,11 @@
 
 COMPONENT_NAME=		wireshark
 COMPONENT_VERSION=	1.4.10
+COMPONENT_PROJECT_URL=	http://www.wireshark.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:ae7c560cbb8f87d464ecf56ba4d72f1cd542f3a6
-COMPONENT_ARCHIVE_URL=	http://www.wireshark.org/download/src/all-versions/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)download/src/all-versions/$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/wireshark/tshark.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/wireshark/tshark.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/wireshark/wireshark-common.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/wireshark/wireshark-common.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/wireshark/wireshark.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/wireshark/wireshark.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/wxwidgets/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/wxwidgets/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:56cc7f6622dd6f2fecd43fc210dc1c6cb155b37f
 COMPONENT_ARCHIVE_URL=	http://prdownloads.sourceforge.net/wxwindows/$(COMPONENT_ARCHIVE)
-COMPONENT_PROJECT_URL=  http://www.wxwidgets.org
+COMPONENT_PROJECT_URL=  http://www.wxwidgets.org/
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
--- a/components/xorriso/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/xorriso/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -25,7 +25,7 @@
 COMPONENT_NAME=         xorriso
 COMPONENT_VERSION=      0.6.0
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=  http://scdbackup.sourceforge.net/xorriso
+COMPONENT_PROJECT_URL=  http://scdbackup.sourceforge.net/xorriso/
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:038b829cab3a4b3255e24937b3def6ad70098500
 COMPONENT_ARCHIVE_URL=  http://scdbackup.sourceforge.net/$(COMPONENT_ARCHIVE)
--- a/components/xorriso/xorriso.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/xorriso/xorriso.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -26,7 +26,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2011/046
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/zip/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/zip/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -26,6 +26,7 @@
 
 COMPONENT_NAME=		zip
 COMPONENT_VERSION=	3.0
+COMPONENT_PROJECT_URL=	http://www.info-zip.org/Zip.html
 COMPONENT_SRC=		$(COMPONENT_NAME)30
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	sha1:c9f4099ecf2772b53c2dd4a8e508064ce015d182
--- a/components/zip/zip.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/zip/zip.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -29,7 +29,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
--- a/components/zlib/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/zlib/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -27,6 +27,7 @@
 
 COMPONENT_NAME=		zlib
 COMPONENT_VERSION=	1.2.3
+COMPONENT_PROJECT_URL=	http://www.zlib.net/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:60faeaaf250642db5c0ea36cd6dcc9f99c8f3902
--- a/components/zlib/zlib.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/zlib/zlib.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -28,7 +28,7 @@
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2006/537
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
--- a/components/zsh/Makefile	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/zsh/Makefile	Mon Dec 05 11:48:52 2011 -0800
@@ -28,6 +28,7 @@
 
 COMPONENT_NAME=		zsh
 COMPONENT_VERSION=	4.3.12
+COMPONENT_PROJECT_URL=	http://www.zsh.org/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	sha1:8fd7a6d841770c8b12cf3ae8229dd857ecdbad93
--- a/components/zsh/zsh.p5m	Fri Dec 02 16:56:03 2011 -0800
+++ b/components/zsh/zsh.p5m	Mon Dec 05 11:48:52 2011 -0800
@@ -31,7 +31,7 @@
 set name=info.classification value=org.opensolaris.category.2008:System/Shells
 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=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/533
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)