15863968 Auto-generation of Userland gate list - Phase 1.
authorRich Burridge <rich.burridge@oracle.com>
Tue, 13 Nov 2012 08:19:05 -0800
changeset 1048 e82fa02a4d16
parent 1047 55d0c4c3878b
child 1049 9044ed4c5da9
15863968 Auto-generation of Userland gate list - Phase 1.
components/acpidump/Makefile
components/ant/Makefile
components/apache2-modules/mod_jk/Makefile
components/apache2-modules/mod_security2/Makefile
components/apache2/Makefile
components/berkeleydb/Makefile
components/common/Makefile
components/erlang/Makefile
components/fastcgi/Makefile
components/gd2/Makefile
components/gnump/Makefile
components/isc-dhcp/Makefile
components/ksh93/Makefile
components/libconfuse/Makefile
components/libexpat/Makefile
components/libneon/Makefile
components/libusb/ugen/Makefile
components/libusb/wrapper/Makefile
components/meta-packages/history/Makefile
components/ntp/Makefile
components/open-fabrics/Makefile
components/openssl/openssl-0.9.8-fips-140/Makefile
components/openusb/Makefile
components/php-5_2/Makefile
components/php-5_3/Makefile
components/php-common/Makefile
components/python/pylxml/Makefile
components/tcltls/Makefile
components/tomcat/Makefile
components/wxwidgets/Makefile
make-rules/component-report
tools/gen-components
transforms/report
--- a/components/acpidump/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/acpidump/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -25,11 +25,12 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		pmtools
+COMPONENT_NAME=		acpidump
 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_SRC_NAME=	pmtools
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:91751774976e39f6237efd0326eb35196a9346220b92ad35894a33283e872748
--- a/components/ant/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/ant/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -25,10 +25,11 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		apache-ant
+COMPONENT_NAME=		ant
 COMPONENT_VERSION=	1.8.4
 COMPONENT_PROJECT_URL=	http://ant.apache.org/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	apache-ant
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
     sha256:5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1
--- a/components/apache2-modules/mod_jk/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/apache2-modules/mod_jk/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,10 +22,11 @@
 #
 include ../../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		tomcat-connectors
+COMPONENT_NAME=		mod_jk
 COMPONENT_VERSION=	1.2.28
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/connectors-doc/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
+COMPONENT_SRC_NAME=	tomcat-connectors
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:898fddced320754121b53b3292d1d20a31bebc6733d5aeb92367143f8941fe6f
--- a/components/apache2-modules/mod_security2/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/apache2-modules/mod_security2/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,10 +22,11 @@
 #
 include ../../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		modsecurity-apache
+COMPONENT_NAME=		mod_security2
 COMPONENT_VERSION=	2.5.9
 COMPONENT_PROJECT_URL=	http://www.modsecurity.org/
-COMPONENT_SRC=		$(COMPONENT_NAME)_$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	modsecurity-apache
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:02352221ea268f8ae9aae5b84507f51eba2a67c0f7d2efd5cc88e85f1f394056
--- a/components/apache2/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/apache2/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,10 +22,11 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		httpd
+COMPONENT_NAME=		apache2
 COMPONENT_VERSION=	2.2.23
 COMPONENT_PROJECT_URL=	http://httpd.apache.org/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	httpd
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:227c85a5c57f2edae0c5c54c68ccc127f06f6e7cff5340efa00de04f463fa3a4
--- a/components/berkeleydb/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/berkeleydb/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -27,10 +27,11 @@
 
 PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
 
-COMPONENT_NAME=		db
+COMPONENT_NAME=		berkeleydb
 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_SRC_NAME=	db
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:72eac5fcae4b51b0f1edc727c0368407f29b42e3f2f50ebc31a282d0d6c0a617
--- a/components/common/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/common/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -20,13 +20,13 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 # There isn't anything really to do here
-COMPONENT_NAME=		gnu
+COMPONENT_NAME=		gnu-common
 COMPONENT_VERSION=	0.5.11
 
 include ../../make-rules/prep.mk
--- a/components/erlang/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/erlang/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -27,14 +27,15 @@
 
 PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
 
-COMPONENT_NAME=		otp_src
+COMPONENT_NAME=			erlang
 COMPONENT_VERSION_MAJOR=	12
 COMPONENT_VERSION_MINOR=	B
 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_SRC_NAME=	otp_src
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)_$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:6ec3f344dd626bd83494fcad66db98a03f930a039b2a1499313d1a5a57aadda7
--- a/components/fastcgi/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/fastcgi/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -25,10 +25,11 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		fcgi
+COMPONENT_NAME=		fastcgi
 COMPONENT_VERSION=	2.4.0
 COMPONENT_PROJECT_URL=	http://www.fastcgi.com/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	fcgi
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9
--- a/components/gd2/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/gd2/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,9 +22,10 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=         gd
+COMPONENT_NAME=		gd2
 COMPONENT_VERSION=      2.0.35
-COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	gd
+COMPONENT_SRC=          $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://www.libgd.org/
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 # this is the hash of the payload because it appears to be re-compressed
--- a/components/gnump/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/gnump/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -26,10 +26,11 @@
 
 PATH=$(dir $(CC)):/usr/bin:/usr/gnu/bin
 
-COMPONENT_NAME=         gmp
+COMPONENT_NAME=		gnump
 COMPONENT_VERSION=      4.3.2
 COMPONENT_PROJECT_URL=	http://gmplib.org/
-COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	gmp
+COMPONENT_SRC=          $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
     sha256:7be3ad1641b99b17f6a8be6a976f1f954e997c41e919ad7e0c418fe848c13c97
--- a/components/isc-dhcp/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/isc-dhcp/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,10 +22,11 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		dhcp
+COMPONENT_NAME=		isc-dhcp
 COMPONENT_VERSION=	4.1-ESV-R7
 IPS_COMPONENT_VERSION=	4.1.0.7
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	dhcp
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_PROJECT_URL=	http://www.isc.org/software/dhcp/
 COMPONENT_ARCHIVE_URL=  \
--- a/components/ksh93/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/ksh93/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -33,10 +33,11 @@
 # This flag controls the prep.mk behaviour to patch each archive individually
 PATCH_EACH_ARCHIVE = 1
 
-COMPONENT_NAME = INIT
+COMPONENT_NAME = ksh93
+COMPONENT_SRC_NAME = INIT
 COMPONENT_VERSION = 2011-02-08
-COMPONENT_SRC = $(COMPONENT_NAME).$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE =	$(COMPONENT_NAME).$(COMPONENT_VERSION).tgz
+COMPONENT_SRC = $(COMPONENT_SRC_NAME).$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH = \
     sha256:d692d476fe4bb933e7b6459c0cc99a2e9f428bfd81a495ed4201ec197e070f57
 COMPONENT_ARCHIVE_URL = http://www2.research.att.com/~gsf/download/tgz/$(COMPONENT_ARCHIVE) 
--- a/components/libconfuse/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/libconfuse/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,9 +22,10 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		confuse
+COMPONENT_NAME=		libconfuse
 COMPONENT_VERSION=	2.6
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	confuse
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.nongnu.org/confuse/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
--- a/components/libexpat/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/libexpat/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -25,10 +25,11 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		expat
+COMPONENT_NAME=		libexpat
 COMPONENT_VERSION=	2.1.0
 COMPONENT_PROJECT_URL=	http://expat.sourceforge.net/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	expat
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86
--- a/components/libneon/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/libneon/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,10 +22,11 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME = neon
+COMPONENT_NAME = libneon
 COMPONENT_VERSION = 0.29.6
 COMPONENT_PROJECT_URL=	http://www.webdav.org/neon/
-COMPONENT_SRC = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME = neon
+COMPONENT_SRC = $(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH = \
     sha256:9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43
--- a/components/libusb/ugen/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/libusb/ugen/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,7 +22,7 @@
 #
 include ../../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		libusbugen
+COMPONENT_NAME=		libusb-ugen
 COMPONENT_VERSION=	0.1.8
 IPS_COMPONENT_VERSION=	0.5.11
 COMPONENT_PROJECT_URL=	http://libusb.sf.net/
--- a/components/libusb/wrapper/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/libusb/wrapper/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,7 +22,7 @@
 #
 include ../../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		libusb
+COMPONENT_NAME=		libusb-wrapper
 COMPONENT_VERSION=	0.1.8
 IPS_COMPONENT_VERSION=	0.5.11
 COMPONENT_PROJECT_URL=	http://libusb.sf.net/
--- a/components/meta-packages/history/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/meta-packages/history/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -32,6 +32,8 @@
 PKGLINT =	/usr/bin/pkglint
 PKGMOGRIFY =	/usr/bin/pkgmogrify
 
+COMPONENT_NAME=		"Package History"
+
 CANONICAL_MANIFESTS =	$(wildcard *.p5m)
 ARCH_MANIFESTS =	$(wildcard *.p5m.$(MACH))
 GENERATED_ARCH_MANIFESTS =	$(ARCH_MANIFESTS:%.p5m.$(MACH)=%.p5m)
--- a/components/ntp/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/ntp/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -25,13 +25,14 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		ntp-dev
+COMPONENT_NAME=		ntp
 COMPONENT_PATCH_VERSION=	200
 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_SRC_NAME=	ntp-dev
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(HUMAN_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:97eeb4e90fba1ae3210e13574a4b3df715957cb9895264c6a455ee97dec87611
--- a/components/open-fabrics/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/open-fabrics/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -26,6 +26,7 @@
 
 LD_Z_IGNORE =
 
+COMPONENT_NAME=	open-fabrics
 COMPONENT_VERSION=1.5.3
 
 COMPONENT_PROJECT_URL=	http://www.openfabrics.org/
--- a/components/openssl/openssl-0.9.8-fips-140/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/openssl/openssl-0.9.8-fips-140/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -26,13 +26,14 @@
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin
 
-COMPONENT_NAME =	openssl
+COMPONENT_NAME =	openssl-fips-140
 # Note that this is the OpenSSL version that is used to build FIPS-140 certified
 # 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_SRC_NAME =	openssl
+COMPONENT_SRC =		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE =	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:d522b3e8a2b48e83ba1e142d7205eaca01358a137bb58e8d64583574e697ffd7
--- a/components/openusb/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/openusb/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,9 +22,10 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		libopenusb
+COMPONENT_NAME=		openusb
 COMPONENT_VERSION=	1.0.1
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	libopenusb
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://openusb.sourceforge.net/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
--- a/components/php-5_2/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/php-5_2/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -114,6 +114,8 @@
 #			[paths already correct and some things don't exist.]
 #               looks like i DO NEED the pear patches
 
+COMPONENT_NAME=		php
+COMPONENT_VERSION=	5.2.17
 COMPONENT_PROJECT_URL=	http://www.php.net/
 
 PKG_PROTO_DIRS += APC/build/prototype/$(MACH)
--- a/components/php-5_3/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/php-5_3/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -114,6 +114,8 @@
 #			[paths already correct and some things don't exist.]
 #               looks like i DO NEED the pear patches
 
+COMPONENT_NAME=		php
+COMPONENT_VERSION=	5.3.14
 COMPONENT_PROJECT_URL=	http://www.php.net/
 
 PKG_PROTO_DIRS += APC/build/prototype/$(MACH)
--- a/components/php-common/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/php-common/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,7 +22,7 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		php
+COMPONENT_NAME=		php-common
 # This version # based on the version # of Solaris
 COMPONENT_VERSION=	11.1
 COMPONENT_PROJECT_URL=	http://www.php.net/
--- a/components/python/pylxml/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/python/pylxml/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,10 +22,11 @@
 #
 include ../../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		lxml
+COMPONENT_NAME=		pylxml
 COMPONENT_VERSION=	2.3.3
 COMPONENT_PROJECT_URL=	http://lxml.de/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	lxml
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:2a3ca34f63b062ee8e059ca2460ac18040ec9622f0a31e143383f0db944ceb36
--- a/components/tcltls/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/tcltls/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -22,10 +22,11 @@
 #
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		tls
+COMPONENT_NAME=		tcltls
 COMPONENT_VERSION=	1.6
 COMPONENT_PROJECT_URL=	http://tls.sourceforge.net/
-COMPONENT_SRC=		$(COMPONENT_NAME)$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	tls
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)-src.tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3
--- a/components/tomcat/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/tomcat/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -25,10 +25,11 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		apache-tomcat
+COMPONENT_NAME=		tomcat
 COMPONENT_VERSION=	6.0.35
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-src
+COMPONENT_SRC_NAME=	apache-tomcat
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
--- a/components/wxwidgets/Makefile	Mon Nov 12 23:00:39 2012 -0800
+++ b/components/wxwidgets/Makefile	Tue Nov 13 08:19:05 2012 -0800
@@ -23,9 +23,10 @@
 
 include ../../make-rules/shared-macros.mk
 
-COMPONENT_NAME=		wxGTK
+COMPONENT_NAME=		wxwidgets
 COMPONENT_VERSION=	2.8.12
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_SRC_NAME=	wxGTK
+COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
     sha256:13cf89f2c29bcb90bb56a31ac1af10f23003d3d43c3e4b24991518f5dc4e5abe
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make-rules/component-report	Tue Nov 13 08:19:05 2012 -0800
@@ -0,0 +1,44 @@
+
+PKG_REPORTS=$(CANONICAL_MANIFESTS:%.p5m=$(BUILD_DIR)/%.pkg-report)
+
+HGWEB_BASE_URL = http://userland.us.oracle.com/hg/file/tip/
+ARIA_BASE_URL = http://people.us.oracle.com/pls/oracle/find_person?p_string=
+ARC_BASE_URL = http://psarc.us.oracle.com/
+
+REPORT_TRANSFORMS = $(WS_TOP)/transforms/report
+CDIR=$(COMPONENT_DIR:$(WS_TOP)/%=%)
+
+component-report:	$(BUILD_DIR)/component-report
+
+$(BUILD_DIR)/component-report:	$(BUILD_DIR)/package-info
+	@echo "<tr>" >[email protected]
+	@echo "<td><a href='$(COMPONENT_PROJECT_URL)'>$(COMPONENT_NAME)</a></td>" >>[email protected]
+	@echo "<td><a href='$(COMPONENT_ARCHIVE_URL)'>$(COMPONENT_VERSION)</a></td>" >>[email protected]
+	@echo "<td><a href='$(HGWEB_BASE_URL)$(CDIR)'>$(CDIR)</a></td>" >>[email protected]
+	@echo "<td>" >>[email protected] ; for pkg in $(PACKAGE) ; do \
+             echo "$$pkg<br>" >>[email protected] ; \
+	 done ; echo "</td>" >>[email protected]
+	@echo "<td>" >>[email protected] ; for arc in $(ARC_CASE) ; do \
+             echo "<a href='$(ARC_BASE_URL)$$arc'>$$arc</a><br>" >>[email protected] ; \
+	 done ; echo "</td>" >>[email protected]
+	@echo "<td>" >>[email protected] ; for license in $(LICENSE) ; do \
+	     echo "$$license<br>" >>[email protected] ; \
+	 done ; echo "</td>" >>[email protected]
+	@echo "</tr>" >>[email protected]
+
+$(BUILD_DIR)/package-info:	$(PKG_REPORTS)
+	@cat $(PKG_REPORTS) | sort -u >[email protected]
+
+$(BUILD_DIR)/component-info:	$(PKG_REPORTS)
+	@echo "COMPONENT_NAME=\"$(COMPONENT_NAME)\"" >[email protected]
+	@echo "COMPONENT_VERSION=\"$(COMPONENT_VERSION)\"" >>[email protected]
+	@echo "COMPONENT_PROJECT_URL=\"$(COMPONENT_PROJECT_URL)\"" >>[email protected]
+	@echo "COMPONENT_ARCHIVE_URL=\"$(COMPONENT_ARCHIVE_URL)\"" >>[email protected]
+	@echo "COMPONENT_DIR=\"$(CDIR)\"" >>[email protected]
+
+$(BUILD_DIR)/%.pkg-report:	%.p5m $(BUILD_DIR)
+	@$(PKGMOGRIFY) $(PKG_OPTIONS) -P [email protected] $< \
+		$(REPORT_TRANSFORMS) >/dev/null
+
+include $(BUILD_DIR)/package-info
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/gen-components	Tue Nov 13 08:19:05 2012 -0800
@@ -0,0 +1,184 @@
+#!/usr/bin/python
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2012, Oracle and/or it's affiliates.  All rights reserved.
+#
+#
+# gen_components.py
+# A simple program to generate (on stdout) the component.html web page 
+# found at: http://userland.us.oracle.com/components.html
+#
+
+import getopt
+import os
+import sys
+
+debug = False
+
+# Initial HTML for the generated web page.
+preamble = """
+<html>
+<head>
+    <style type='text/css' media='screen'>
+        @import '/css/demo_table.css';
+        @import '/css/ColVis.css';
+        @import '/css/ColReorder.css';
+
+            tr.even:hover,  tr.even:hover td.sorting_1 ,
+            tr.odd:hover,  tr.odd:hover td.sorting_1 {
+                            background-color: gold;
+            }
+
+    </style>
+    <script type='text/javascript' src='js/jquery.js'></script>
+    <script type='text/javascript' src='js/jquery.dataTables.js'></script>
+    <script type='text/javascript' src='js/ColReorder.js'></script>
+    <script type='text/javascript' src='js/ColVis.js'></script>
+
+    <script>
+        $(document).ready(function() {
+            $('#components').dataTable({
+                "sDom": 'C<"clear">Rlfrtip',
+                bPaginate: true,
+                bFilter: true,
+                bSort: true,
+                iDisplayLength: -1,
+                aLengthMenu: [ [ 10, 50, -1], [ 10, 50, 'All'] ]
+            });
+        });
+    </script>
+</head>
+<body>
+
+<h1>Userland Components</h1>
+<p>
+<table align='center' id='components'>
+<thead>
+<tr>
+    <th>Component</th>
+    <th>Version</th>
+    <th>Gate Path</th>
+    <th>Package(s)</th>
+    <th>ARC Case(s)</th>
+    <th>License(s)</th>
+</tr>
+</thead>
+<tbody>
+"""
+
+# Final HTML for the generated web page.
+postamble = """
+</tr>
+</tbody>
+</table>
+</body>
+</html>
+"""
+
+# Return a sorted list of the directories containing one or more .p5m files.
+def find_p5m_dirs(workspace):
+    p5m_dirs = []
+    for dir, _, files in os.walk(workspace + "/components"):
+        for file in files:
+            if file.endswith(".p5m"):
+                p5m_dirs.append(dir)
+
+    return sorted(list(set(p5m_dirs)))
+
+# Write out the initial HTML for the components.html web page.
+def write_preamble():
+    print preamble
+
+# Generate an HTML table entry for all the information for the component
+# in the given directory. This generates a file called 'component-report'
+# under the components build directory.
+def gen_reports(workspace, component_dir):
+    if debug:
+        print >> sys.stderr, "Processing %s" % component_dir
+
+    makefiles = "-f Makefile -f %s/make-rules/component-report" % workspace
+    targets = "clean component-hook"
+    cmd = "cd %s; gmake COMPONENT_HOOK='gmake %s component-report' %s" % \
+        (component_dir, makefiles, targets)
+
+    lines = os.popen(cmd).readlines()
+
+# Collect all the .../build/component-report files and write them to stdout.
+def write_reports(p5m_dirs):
+    for p5m_dir in p5m_dirs:
+        report = "%s/build/component-report" % p5m_dir
+        if debug:
+            print >> sys.stderr, "Reading %s" % report
+        try:
+            fin = open(report, 'r')
+            lines = fin.readlines()
+            fin.close()
+            sys.stdout.writelines(lines)
+        except:
+            if debug:
+                print >> sys.stderr, "Unable to read: %s" % report
+
+# Write out the final HTML for the components.html web page.
+def write_postamble():
+    print postamble
+
+# Write out a usage message showing valid options to this script.
+def usage():
+    print  >> sys.stderr, \
+"""
+Usage: 
+      update_man_pages.py [OPTION...]
+
+-d, --debug
+      Turn on debugging
+
+-w --workspace
+      Location of the Userland workspace
+"""
+
+    sys.exit(1)
+
+
+if __name__ == "__main__":
+    workspace = os.getenv('WS_TOP')
+
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "dw:",
+            [ "debug", "workspace=" ])
+    except getopt.GetoptError, err:
+        print str(err)
+        usage()
+
+    for opt, arg in opts:
+        if opt in [ "-w", "--workspace" ]:
+            workspace = arg
+        elif opt in [ "-d", "--debug" ]:
+            debug = True
+        else:
+            assert False, "unknown option"
+ 
+    write_preamble()
+    p5m_dirs = find_p5m_dirs(workspace)
+    for p5m_dir in p5m_dirs:
+        gen_reports(workspace, p5m_dir)
+    write_reports(p5m_dirs)
+    write_postamble()
+    sys.exit(0)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/transforms/report	Tue Nov 13 08:19:05 2012 -0800
@@ -0,0 +1,7 @@
+
+<transform set name=pkg.fmri value=pkg:/(.*)@(.*),.* -> \
+	print PACKAGE += "%<1>@%<2>" >
+<transform set name=org.opensolaris.arc-caseid value=(.*) -> \
+	print ARC_CASE += "%<1>" >
+
+<transform license license=(.*) -> print LICENSE += "%<1>" >