Import sfw build 131 sfwnv_131
authorCyril Plisko <cyril.plisko@grigale.com>
Sat, 16 Jan 2010 18:11:20 +0200
changeset 5 d07534556b03
parent 4 834920bc5f09
child 6 1fb1123973f8
Import sfw build 131 Bugs Fixed ---------- 6818295 [nvb110] Mysql server core dump when running tests 'execution_constants' 6826438 Update S-Lang to version 2.2.2 6865279 guile-config configures with guile 6886529 fixed rrset-order is not enabled in BIND 9.6.1 as was the intention. 6891703 Tor should use newer release 6891913 deliver httpd conf file for PHP integration via FastCGI when mod_php can't be used 6893187 CVE-2009-2820 Web Interface of CUPS 1.4.1 is susceptible to Cross-Site Scripting and CRLF injection 6899209 Compile zend_execute.c with -W2,-Ainline:inc=100 for performance gains. 6900557 CVE-2009-3553 cupsd crash due to a pointer use-after-free flaw 6902877 [nvb127] subselect test generates crash of the server. 6902912 DNS Cache Poisoning 6903940 [nvb127] zlib extension not delivered 6905246 CUPS upgrade to 1.4.2 6905928 PostgreSQL 8.2, 8.3 Makefiles need some love 6907454 apache22 fcgid fails to load, daemon starts, stops and restarts ad nauseum 6908140 gpgconf and gpgme-config report incorrect pathnames 6908543 sfw updates expose new package dependencies 6908980 bad links for /usr/postgres/8.3/share/locale(s) in osol_128a for SUNWpostgr-83-libs 6909121 SFW METADATA files need updates for SUPPORT data 6909137 cups 1.4.2 does not deliver dbus notifier 6909139 Update PostgreSQL to 8.3.9 6909140 Update PostgreSQL to 8.2.15 6909141 Update PostgreSQL to 8.4.2 6909592 print/service-selector races with manifest-import 6910254 upgrade php to 5.2.12 6910945 Tomcat shouldn't give 404 when SUNWtcat-examples is not installed 6911455 gpgconf still reports wrong directory for libexec 6911767 back port 6.0 php dtrace to track object creation in php 5.2 6911775 Wireshark update to version 1.2.5 6912139 seek return value can be -1 within zlib streams 6912354 core dump while running ldap_next_reference functions 6912643 add libproxy support to 64-bit libneon 6913465 opensolaris b130 PHP problems with session_start();
usr/src/Makefile.targ
usr/src/cmd/ImageMagick/METADATA
usr/src/cmd/a2ps/METADATA
usr/src/cmd/acpidump/METADATA
usr/src/cmd/aget/METADATA
usr/src/cmd/apache/METADATA
usr/src/cmd/apache2-modperl/METADATA
usr/src/cmd/apache2/METADATA
usr/src/cmd/apache2/Makefile.sfw
usr/src/cmd/apache2/modules/METADATA.fcgid
usr/src/cmd/apache2/modules/METADATA.jk
usr/src/cmd/apache2/modules/METADATA.proxy-html
usr/src/cmd/apache2/modules/METADATA.security2
usr/src/cmd/apache2/modules/METADATA.sed
usr/src/cmd/apache2/modules/METADATA.xml2enc
usr/src/cmd/apache2/modules/Makefile.sfw
usr/src/cmd/apache2/modules/fcgid.conf
usr/src/cmd/apr-util/apr-util-1.3/METADATA
usr/src/cmd/apr/apr-1.3/METADATA
usr/src/cmd/areca/METADATA
usr/src/cmd/autoconf/METADATA
usr/src/cmd/autogen/METADATA
usr/src/cmd/automake/automake-1.10/METADATA
usr/src/cmd/automake/automake-1.9.6/METADATA
usr/src/cmd/awstats/METADATA
usr/src/cmd/bash/METADATA
usr/src/cmd/bcc/METADATA
usr/src/cmd/beanshell/METADATA
usr/src/cmd/bind/METADATA
usr/src/cmd/bind/Makefile.sfw
usr/src/cmd/bind/bind-9.6.1-P1.tar.gz
usr/src/cmd/bind/bind-9.6.1-P2.tar.gz
usr/src/cmd/binutils/METADATA
usr/src/cmd/bison/METADATA
usr/src/cmd/bonnieplus/METADATA
usr/src/cmd/bvi/METADATA
usr/src/cmd/bwm-ng/METADATA
usr/src/cmd/bzip2/METADATA
usr/src/cmd/cdrtools/METADATA
usr/src/cmd/cimserver/METADATA
usr/src/cmd/clisp/METADATA
usr/src/cmd/cmake/METADATA
usr/src/cmd/conflict/METADATA
usr/src/cmd/conman/METADATA
usr/src/cmd/convmv/METADATA
usr/src/cmd/coreutils/METADATA
usr/src/cmd/cups/METADATA
usr/src/cmd/cups/Patches/08-usb-hack.patch
usr/src/cmd/cups/Patches/13.cups-1.4.2-CVE-2009-3553.patch
usr/src/cmd/cups/Patches/14.dbus-glib.patch
usr/src/cmd/cups/Solaris/service-selector.xml
usr/src/cmd/cups/cups-1.4.1-source.tar.bz2
usr/src/cmd/cups/cups-1.4.2-source.tar.bz2
usr/src/cmd/cvs/METADATA
usr/src/cmd/diffstat/METADATA
usr/src/cmd/diffutils/METADATA
usr/src/cmd/dosbox/METADATA
usr/src/cmd/doxygen/METADATA
usr/src/cmd/dvd+rw-tools/METADATA
usr/src/cmd/dwdiff/METADATA
usr/src/cmd/ejabberd/METADATA
usr/src/cmd/elinks/METADATA
usr/src/cmd/emacs/METADATA
usr/src/cmd/epydoc/METADATA
usr/src/cmd/erlang/METADATA
usr/src/cmd/expect/METADATA
usr/src/cmd/fakeroot/METADATA
usr/src/cmd/fetchmail/METADATA
usr/src/cmd/flex/METADATA
usr/src/cmd/foomatic-db-engine/METADATA
usr/src/cmd/foomatic-db/METADATA
usr/src/cmd/foomatic-filters/METADATA
usr/src/cmd/foomatic-ppd/METADATA
usr/src/cmd/fping/METADATA
usr/src/cmd/freeipmi/METADATA
usr/src/cmd/gawk/METADATA
usr/src/cmd/gcc/METADATA
usr/src/cmd/gdb/METADATA
usr/src/cmd/gettext/METADATA
usr/src/cmd/ggrep/METADATA
usr/src/cmd/ghostscript/METADATA
usr/src/cmd/git/METADATA
usr/src/cmd/gm4/METADATA
usr/src/cmd/gmake/METADATA
usr/src/cmd/gnu-gperf/METADATA
usr/src/cmd/gnu-gs-fonts-other/METADATA
usr/src/cmd/gnu-gs-fonts-std/METADATA
usr/src/cmd/gnupg/METADATA
usr/src/cmd/gnupg/Makefile.sfw
usr/src/cmd/gocr/METADATA
usr/src/cmd/gpatch/METADATA
usr/src/cmd/gpgme/METADATA
usr/src/cmd/gpgme/Makefile.sfw
usr/src/cmd/grails/METADATA
usr/src/cmd/gsed/METADATA
usr/src/cmd/gtar/METADATA
usr/src/cmd/guile/METADATA
usr/src/cmd/guile/Makefile.sfw
usr/src/cmd/gutenprint/METADATA
usr/src/cmd/gvim/METADATA
usr/src/cmd/gzip/METADATA
usr/src/cmd/hal-cups-utils/METADATA
usr/src/cmd/hexedit/METADATA
usr/src/cmd/hplip/METADATA
usr/src/cmd/httping/METADATA
usr/src/cmd/idzebra/METADATA
usr/src/cmd/iftop/METADATA
usr/src/cmd/iozone/METADATA
usr/src/cmd/iperf/METADATA
usr/src/cmd/ipmitool/METADATA
usr/src/cmd/ircii/METADATA
usr/src/cmd/jedit/METADATA
usr/src/cmd/jruby/METADATA
usr/src/cmd/konkretcmpi/METADATA
usr/src/cmd/lablgtk/METADATA
usr/src/cmd/less/METADATA
usr/src/cmd/lftp/METADATA
usr/src/cmd/libtool/METADATA
usr/src/cmd/lighttpd14/METADATA
usr/src/cmd/links/METADATA
usr/src/cmd/logrotate/METADATA
usr/src/cmd/lua/METADATA
usr/src/cmd/mc/METADATA
usr/src/cmd/meld/METADATA
usr/src/cmd/mercurial/METADATA
usr/src/cmd/mrtg/METADATA
usr/src/cmd/mrxvt/METADATA
usr/src/cmd/mtx/METADATA
usr/src/cmd/mutt/METADATA
usr/src/cmd/mysql-5-0-jdbc/METADATA
usr/src/cmd/mysql-5-0/METADATA
usr/src/cmd/mysql-5-0/Makefile.sfw
usr/src/cmd/mysql-5-0/patches/configure.patch
usr/src/cmd/mysql-5-0/patches/xO4_optimization.patch
usr/src/cmd/mysql-5-1/METADATA
usr/src/cmd/mysql/METADATA
usr/src/cmd/nano/METADATA
usr/src/cmd/ncftp/METADATA
usr/src/cmd/net-snmp/METADATA
usr/src/cmd/nethack/METADATA
usr/src/cmd/nmap/METADATA
usr/src/cmd/ntpd/METADATA
usr/src/cmd/ocaml/METADATA
usr/src/cmd/openldap/METADATA
usr/src/cmd/openwsman/METADATA
usr/src/cmd/p7zip/METADATA
usr/src/cmd/patchutils/METADATA
usr/src/cmd/pconsole/METADATA
usr/src/cmd/pdsh/METADATA
usr/src/cmd/pen/METADATA
usr/src/cmd/perl-pmtools/METADATA
usr/src/cmd/perl510/METADATA
usr/src/cmd/php5/METADATA
usr/src/cmd/php5/Makefile.sfw
usr/src/cmd/php5/Solaris/php5.2.conf
usr/src/cmd/php5/config/extensions/memcache.ini
usr/src/cmd/php5/patches/php_6818228.patch
usr/src/cmd/php5/patches/php_6912354.patch
usr/src/cmd/php5/patches/php_dtrace.patch
usr/src/cmd/php5/patches/php_perf_avoid_setitimer.patch
usr/src/cmd/php5/patches/php_perf_zend_execute_inline.patch
usr/src/cmd/php5/php-5.2.11.tar.bz2
usr/src/cmd/php5/php-5.2.12.tar.bz2
usr/src/cmd/pinentry/METADATA
usr/src/cmd/postgres/libpgtcl/METADATA
usr/src/cmd/postgres/libpqxx/METADATA
usr/src/cmd/postgres/pgadmin/METADATA
usr/src/cmd/postgres/pgagent/METADATA
usr/src/cmd/postgres/pgbouncer/METADATA
usr/src/cmd/postgres/pmdbdpg/METADATA
usr/src/cmd/postgres/postgresql-8.2-jdbc/METADATA
usr/src/cmd/postgres/postgresql-8.2-tcl/METADATA
usr/src/cmd/postgres/postgresql-8.2/METADATA
usr/src/cmd/postgres/postgresql-8.2/Makefile.sfw
usr/src/cmd/postgres/postgresql-8.2/postgresql-8.2.14.tar.gz
usr/src/cmd/postgres/postgresql-8.2/postgresql-8.2.15.tar.gz
usr/src/cmd/postgres/postgresql-8.3-tcl/METADATA
usr/src/cmd/postgres/postgresql-8.3/METADATA
usr/src/cmd/postgres/postgresql-8.3/Makefile.sfw
usr/src/cmd/postgres/postgresql-8.3/postgresql-8.3.8.tar.gz
usr/src/cmd/postgres/postgresql-8.3/postgresql-8.3.9.tar.gz
usr/src/cmd/postgres/postgresql-8.4/METADATA
usr/src/cmd/postgres/postgresql-8.4/postgresql-8.4.1.tar.bz2
usr/src/cmd/postgres/postgresql-8.4/postgresql-8.4.2.tar.bz2
usr/src/cmd/postgres/postgresql-common/METADATA
usr/src/cmd/postgres/postgresql-jdbc/METADATA
usr/src/cmd/postgres/postgresql-upgrade/METADATA
usr/src/cmd/powerman/METADATA
usr/src/cmd/privoxy/METADATA
usr/src/cmd/procmail/METADATA
usr/src/cmd/psutils/METADATA
usr/src/cmd/pv/METADATA
usr/src/cmd/pwgen/METADATA
usr/src/cmd/pycups/METADATA
usr/src/cmd/pylint/METADATA
usr/src/cmd/quagga/METADATA
usr/src/cmd/quilt/METADATA
usr/src/cmd/rdiff-backup/METADATA
usr/src/cmd/rpm2cpio/METADATA
usr/src/cmd/rsync/METADATA
usr/src/cmd/rtorrent/METADATA
usr/src/cmd/ruby18/METADATA
usr/src/cmd/samba/METADATA
usr/src/cmd/sane-frontends/METADATA
usr/src/cmd/sblim-wbemcli/METADATA
usr/src/cmd/screen/METADATA
usr/src/cmd/ser/METADATA
usr/src/cmd/serweb/METADATA
usr/src/cmd/sg3_utils/METADATA
usr/src/cmd/shmux/METADATA
usr/src/cmd/simplewbem/METADATA
usr/src/cmd/slrn/METADATA
usr/src/cmd/snort/METADATA
usr/src/cmd/sox/METADATA
usr/src/cmd/spawn-fcgi/METADATA
usr/src/cmd/squid/METADATA
usr/src/cmd/stunnel/METADATA
usr/src/cmd/subversion/METADATA
usr/src/cmd/sudo/METADATA
usr/src/cmd/swig/METADATA
usr/src/cmd/sysbench/METADATA
usr/src/cmd/tcpdump/METADATA
usr/src/cmd/tcpdump/Makefile.sfw
usr/src/cmd/tcsh/METADATA
usr/src/cmd/texi2html/METADATA
usr/src/cmd/texinfo/METADATA
usr/src/cmd/tomcat/METADATA
usr/src/cmd/tomcat/Solaris/index.htm
usr/src/cmd/tomcat/Solaris/index.jsp
usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman
usr/src/cmd/tomcat/install-tomcat
usr/src/cmd/top/METADATA
usr/src/cmd/tor/METADATA
usr/src/cmd/tor/Patches/Makefile.in.patch
usr/src/cmd/tor/Patches/aes.c.patch
usr/src/cmd/tor/Patches/torrc.patch
usr/src/cmd/tor/tor-0.2.0.34.tar.gz
usr/src/cmd/tor/tor-0.2.1.20.tar.gz
usr/src/cmd/tree/METADATA
usr/src/cmd/unison/METADATA
usr/src/cmd/unrar/METADATA
usr/src/cmd/unzip/METADATA
usr/src/cmd/vim/METADATA
usr/src/cmd/vim/runtime.patch
usr/src/cmd/webalizer/METADATA
usr/src/cmd/webmin/METADATA
usr/src/cmd/wget/METADATA
usr/src/cmd/which/METADATA
usr/src/cmd/wireshark/METADATA
usr/src/cmd/wireshark/Patches/bug4284.patch
usr/src/cmd/wireshark/wireshark-1.2.4.tar.bz2
usr/src/cmd/wireshark/wireshark-1.2.5.tar.bz2
usr/src/cmd/zip/METADATA
usr/src/cmd/zsh/METADATA
usr/src/lib/aalib/METADATA
usr/src/lib/activation/METADATA
usr/src/lib/ant/METADATA
usr/src/lib/antlr/METADATA
usr/src/lib/antlr2/METADATA
usr/src/lib/cglib/METADATA
usr/src/lib/commons-collections/METADATA
usr/src/lib/curl/METADATA
usr/src/lib/dom4j/METADATA
usr/src/lib/drools/METADATA
usr/src/lib/fastcgi/METADATA
usr/src/lib/fftw2/METADATA
usr/src/lib/fftw3/METADATA
usr/src/lib/gd2/METADATA
usr/src/lib/gdbm/METADATA
usr/src/lib/glib/METADATA
usr/src/lib/gnump/METADATA
usr/src/lib/gtk+/METADATA
usr/src/lib/idn/METADATA
usr/src/lib/ilmbase/METADATA
usr/src/lib/imperius/METADATA
usr/src/lib/janino/METADATA
usr/src/lib/jarjar/METADATA
usr/src/lib/javamail/METADATA
usr/src/lib/jaxb/METADATA
usr/src/lib/jaxen-core/METADATA
usr/src/lib/jdom/METADATA
usr/src/lib/jdtcore/METADATA
usr/src/lib/jettison/METADATA
usr/src/lib/joda-time/METADATA
usr/src/lib/jrexx/METADATA
usr/src/lib/junit/METADATA
usr/src/lib/jxl/METADATA
usr/src/lib/lcms/METADATA
usr/src/lib/libassuan/METADATA
usr/src/lib/libconfuse/METADATA
usr/src/lib/libedit/METADATA
usr/src/lib/libevent/METADATA
usr/src/lib/libexpat/METADATA
usr/src/lib/libksba/METADATA
usr/src/lib/libmcrypt/METADATA
usr/src/lib/libmemcached/METADATA
usr/src/lib/libmng/METADATA
usr/src/lib/libneon/METADATA
usr/src/lib/libneon/Makefile.sfw
usr/src/lib/libnet/METADATA
usr/src/lib/libosip2/METADATA
usr/src/lib/libpcap/METADATA
usr/src/lib/librsync/METADATA
usr/src/lib/libsigsegv/METADATA
usr/src/lib/libsndfile/METADATA
usr/src/lib/libtorrent/METADATA
usr/src/lib/libusb/METADATA
usr/src/lib/libusbugen/METADATA
usr/src/lib/libxml2/METADATA
usr/src/lib/libxmlrpc-c/METADATA
usr/src/lib/libxslt/METADATA
usr/src/lib/libyaz/METADATA
usr/src/lib/log4j/METADATA
usr/src/lib/logilab-astng/METADATA
usr/src/lib/logilab-common/METADATA
usr/src/lib/memcached-java/METADATA
usr/src/lib/memcached/METADATA
usr/src/lib/mpfr/METADATA
usr/src/lib/mvel/METADATA
usr/src/lib/objectasm/METADATA
usr/src/lib/openexr/METADATA
usr/src/lib/openssl/METADATA
usr/src/lib/openssl/fips/openssl-fips/METADATA
usr/src/lib/openusb/METADATA
usr/src/lib/pam_pkcs11/METADATA
usr/src/lib/pcre/METADATA
usr/src/lib/perl_net_ssleay/METADATA
usr/src/lib/pmdbi/METADATA
usr/src/lib/pth/METADATA
usr/src/lib/pull-parser/METADATA
usr/src/lib/pyopenssl/METADATA
usr/src/lib/python26-pyopenssl/METADATA
usr/src/lib/pywbem/METADATA
usr/src/lib/qdox/METADATA
usr/src/lib/readline/METADATA
usr/src/lib/relaxngDatatype/METADATA
usr/src/lib/saaj/METADATA
usr/src/lib/sane-backends/METADATA
usr/src/lib/sblim/METADATA
usr/src/lib/slang/METADATA
usr/src/lib/slang/Makefile.sfw
usr/src/lib/slang/slang-2.1.3.tar.bz2
usr/src/lib/slang/slang-2.2.2.tar.bz2
usr/src/lib/slib/METADATA
usr/src/lib/snack/METADATA
usr/src/lib/sqlite3/METADATA
usr/src/lib/stdcxx4/METADATA
usr/src/lib/stringtemplate/METADATA
usr/src/lib/tcl/METADATA
usr/src/lib/tcltls/METADATA
usr/src/lib/tidy/METADATA
usr/src/lib/tk/METADATA
usr/src/lib/trousers/METADATA
usr/src/lib/trove/METADATA
usr/src/lib/unixodbc/METADATA
usr/src/lib/usb_ccid_ifd/METADATA
usr/src/lib/wiseman/METADATA
usr/src/lib/wxwidgets/METADATA
usr/src/lib/xom/METADATA
usr/src/lib/xpp3-min/METADATA
usr/src/lib/xsdlib/METADATA
usr/src/lib/xstream/METADATA
usr/src/lib/zlib/METADATA
usr/src/pkgdefs/SUNWapch22r-fcgid/prototype_com
usr/src/pkgdefs/SUNWbind/pkginfo.tmpl
usr/src/pkgdefs/SUNWbindc/pkginfo.tmpl
usr/src/pkgdefs/SUNWbindc/prototype_com
usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend
usr/src/pkgdefs/SUNWgnu-emacs-x/depend
usr/src/pkgdefs/SUNWlablgtk/depend
usr/src/pkgdefs/SUNWperl-net-ssleay/depend
usr/src/pkgdefs/SUNWphp52r-pear/prototype_com
usr/src/pkgdefs/SUNWphp52r/prototype_com
usr/src/pkgdefs/SUNWphp52u/prototype_com
usr/src/pkgdefs/SUNWpostgr-82-client/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-82-contrib/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-82-devel/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-82-docs/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-82-docs/prototype_com
usr/src/pkgdefs/SUNWpostgr-82-libs/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-82-pl/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-82-server/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-client/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-client/prototype_i386
usr/src/pkgdefs/SUNWpostgr-83-client/prototype_sparc
usr/src/pkgdefs/SUNWpostgr-83-contrib/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-devel/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-docs/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-docs/prototype_com
usr/src/pkgdefs/SUNWpostgr-83-libs/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_com
usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_i386
usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_sparc
usr/src/pkgdefs/SUNWpostgr-83-pl/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-server/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-83-server/prototype_i386
usr/src/pkgdefs/SUNWpostgr-83-server/prototype_sparc
usr/src/pkgdefs/SUNWpostgr-83-tests/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-client/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-contrib/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-devel/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-docs/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-docs/prototype_com
usr/src/pkgdefs/SUNWpostgr-84-libs/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-pl/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-server/pkginfo.tmpl
usr/src/pkgdefs/SUNWpostgr-84-tests/pkginfo.tmpl
usr/src/pkgdefs/SUNWsane-frontend/depend
usr/src/pkgdefs/SUNWslang/depend
usr/src/pkgdefs/SUNWslang/pkginfo.tmpl
usr/src/pkgdefs/SUNWslang/prototype_com
usr/src/pkgdefs/SUNWslang/prototype_i386
usr/src/pkgdefs/SUNWslang/prototype_sparc
usr/src/pkgdefs/SUNWslangr/pkginfo.tmpl
usr/src/pkgdefs/SUNWtcat-examples/Makefile
usr/src/pkgdefs/SUNWtcat-examples/pkginfo.tmpl
usr/src/pkgdefs/SUNWtcat-examples/prototype_com
usr/src/pkgdefs/SUNWtor-root/pkginfo.tmpl
usr/src/pkgdefs/SUNWtor/pkginfo.tmpl
usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl
usr/src/pkgdefs/SUNWwireshark/prototype_com
usr/src/pkgdefs/etc/exception_list_i386
usr/src/pkgdefs/etc/exception_list_sparc
usr/src/tools/metainfo.pl
usr/src/tools/post_process_so.ksh
--- a/usr/src/Makefile.targ	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/Makefile.targ	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.targ	1.2	09/10/07 SMI"
+#ident	"@(#)Makefile.targ	1.3	09/12/14 SMI"
 #
 # Makefile.targ, global build target definitions
 #
@@ -79,8 +79,9 @@
 # 
 # download:	$(SOURCE_ARCHIVES)
 
-meta-check:
-	@-$(METACHECK)
+# Uses :: syntax so that including Makefiles can augment this target.
+meta-check::
+	@$(METACHECK)
 
 component-hook:
 	@$(COMPONENT_HOOK)
--- a/usr/src/cmd/ImageMagick/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ImageMagick/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWimagick
 PROJECT_URL:      http://www.imagemagick.org
 SOURCE_DOWNLOAD:  ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.3.4-2.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/other
 OSR:              6390
 COMMENTS:         
--- a/usr/src/cmd/a2ps/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/a2ps/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWa2psr SUNWa2psu
 PROJECT_URL:      http://www.gnu.org/software/a2ps
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/a2ps/a2ps-4.13.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/a2ps
 OSR:              2161
 COMMENTS:         
--- a/usr/src/cmd/acpidump/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/acpidump/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWacpidump
 PROJECT_URL:		http://www.lesswatts.org/projects/acpi/utilities.php
 SOURCE_DOWNLOAD:	http://www.lesswatts.org/patches/linux_acpi/pmtools-20071116.tar.gz
-SUPPORT:		Community
+SUPPORT:		C
 BUGTRAQ:		solaris/utility/acpidump
 OSR:			11743
 COMMENTS:
--- a/usr/src/cmd/aget/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/aget/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWaget
 PROJECT_URL:      http://www.enderunix.org/aget/
 SOURCE_DOWNLOAD:  http://www.enderunix.org/aget/aget-0.4.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/aget
 OSR:              10898
 COMMENTS:
--- a/usr/src/cmd/apache/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWapchd SUNWapchr SUNWapchu
 PROJECT_URL:      http://www.apache.org/
 SOURCE_DOWNLOAD:  http://download.filehat.com/apache/httpd/apache_1.3.41.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/apache
 OSR:              10265
 COMMENTS:         
--- a/usr/src/cmd/apache2-modperl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2-modperl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWapch22u
 PROJECT_URL:      http://perl.apache.org/
 SOURCE_DOWNLOAD:  http://perl.apache.org/dist/mod_perl-2.0.4.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              10135
 COMMENTS:         
--- a/usr/src/cmd/apache2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWapch22d SUNWapch22r SUNWapch22u
 PROJECT_URL:      http://httpd.apache.org
 SOURCE_DOWNLOAD:  http://archive.apache.org/dist/httpd/httpd-2.2.14.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              7336
 COMMENTS:         
--- a/usr/src/cmd/apache2/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.34	09/09/01 SMI"	
+#ident	"@(#)Makefile.sfw	1.35	09/12/14 SMI"	
 #
 
 # This Makefile builds both 32 and 64 bit versions of 2 of the popular 
@@ -340,5 +340,8 @@
 clean-modules:
 	(cd modules && $(MAKE) -f Makefile.sfw clean)
 
+# augment the target to check check METADATA files in the modules directory too.
+meta-check::
+	@(cd modules && $(MAKE) -f Makefile.sfw meta-checks)
 
 include ../Makefile.targ
--- a/usr/src/cmd/apache2/modules/METADATA.fcgid	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/METADATA.fcgid	Sat Jan 16 18:11:20 2010 +0200
@@ -1,14 +1,13 @@
-NAME:           FCGID plugin for Apache Web Server Version 2.2
-PROGRAM:        mod_fcgid
+NAME:           mod_fcgid
 VERSION:        2.3.4
+DESCRIPTION:	FCGID plugin for Apache Web Server Version 2.2
 PACKAGE:        SUNWapch22m-fcgid SUNWapch22r-fcgid
 LICENSE:        Apache v2
-URL:            http://httpd.apache.org/mod_fcgid/
-SRC:            http://datadispensary.com/apache/httpd/mod_fcgid/mod_fcgid-2.3.4.tar.gz
-SUPPORT:        Community
+PROJECT_URL:     http://httpd.apache.org/mod_fcgid/
+SOURCE_DOWNLOAD: http://datadispensary.com/apache/httpd/mod_fcgid/mod_fcgid-2.3.4.tar.gz
+SUPPORT:        C
 BUGTRAQ:        solaris/utility/apache
 OSR:            12843
-OWNER:          [email protected]
 COMMENTS:
   fcgid.PR48021.patch
 	http://svn.apache.org/viewvc?view=revision&revision=826829
--- a/usr/src/cmd/apache2/modules/METADATA.jk	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/METADATA.jk	Sat Jan 16 18:11:20 2010 +0200
@@ -1,13 +1,12 @@
-NAME:           Tomcat Connector plugin for Apache Web Server Version 2.2
-PROGRAM:        mod_jk
+DESCRIPTION:    Tomcat Connector plugin for Apache Web Server Version 2.2
+NAME:           mod_jk
 VERSION:        1.2.28
 PACKAGE:        SUNWapch22m-jk SUNWapch22r-jk
 LICENSE:        Apache v2
-URL:            http://tomcat.apache.org/connectors-doc/
-SRC:            http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.28/tomcat-connectors-1.2.28-src.tar.gz
-SUPPORT:        Community
+PROJECT_URL:    http://tomcat.apache.org/connectors-doc/
+SOURCE_DOWNLOAD:  http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-1.2.28/tomcat-connectors-1.2.28-src.tar.gz
+SUPPORT:        C
 BUGTRAQ:        solaris/utility/apache
 OSR:            10146
-OWNER:          [email protected]
 COMMENTS:
 
--- a/usr/src/cmd/apache2/modules/METADATA.proxy-html	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/METADATA.proxy-html	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWapch22m-proxy-html SUNWapch22r-proxy-html
 PROJECT_URL:      http://apache.webthing.com/mod_proxy-html/
 SOURCE_DOWNLOAD:  http://apache.webthing.com/mod_proxy_html/mod_proxy_html.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              9712
 COMMENTS:
--- a/usr/src/cmd/apache2/modules/METADATA.security2	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/METADATA.security2	Sat Jan 16 18:11:20 2010 +0200
@@ -1,13 +1,12 @@
-NAME:           Mod Security plugin for Apache Web Server Version 2.2
-PROGRAM:        mod_security2
+NAME:           mod_security2
 VERSION:        2.5.9
+DESCRIPTION:    Mod Security plugin for Apache Web Server Version 2.2
 PACKAGE:        SUNWapch22m-security SUNWapch22r-security
 LICENSE:        GPL
-URL:            http://www.modsecurity.org/
-SRC:            http://www.modsecurity.org/download/modsecurity-apache_2.5.9.tar.gz
-SUPPORT:        Community
+PROJECT_URL:    http://www.modsecurity.org/
+SOURCE_DOWNLOAD:  http://www.modsecurity.org/download/modsecurity-apache_2.5.9.tar.gz
+SUPPORT:        C
 BUGTRAQ:        solaris/utility/apache
 OSR:            7704
-OWNER:          rahul
 COMMENTS:
 
--- a/usr/src/cmd/apache2/modules/METADATA.sed	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/METADATA.sed	Sat Jan 16 18:11:20 2010 +0200
@@ -1,14 +1,13 @@
-NAME:           sed filtering plugin for Apache Web Server Version 2.2
-PROGRAM:        mod_sed
+NAME:           mod_sed
 VERSION:        -
+DESCRIPTION:    sed filtering plugin for Apache Web Server Version 2.2
 PACKAGE:        SUNWapch22m-sed SUNWapch22r-sed
 LICENSE:        Apache v2
-URL:            http://httpd.apache.org/
-SRC:            http://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/filters/
-SUPPORT:        Community
+PROJECT_URL:    http://httpd.apache.org/
+SOURCE_DOWNLOAD:  http://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/filters/mod_sed.tar.gz
+SUPPORT:        C
 BUGTRAQ:        solaris/utility/apache
 OSR:            11514
-OWNER:          [email protected]
 COMMENTS:       mod_sed was developed inside Sun and donated to Apache community.
                 It was developed for apache 2.2. Apache community accepted it and
                 checked into trunk.
--- a/usr/src/cmd/apache2/modules/METADATA.xml2enc	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/METADATA.xml2enc	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWapch22m-xml2enc
 PROJECT_URL:      http://apache.webthing.com/mod_xml2enc/
 SOURCE_DOWNLOAD:  http://apache.webthing.com/mod_proxy_html/mod_proxy_html.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              9711
 COMMENTS: 	  Xml2enc is distributed with a choice of GPLv2 and Apache 2.0.
--- a/usr/src/cmd/apache2/modules/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile.sfw	1.12	09/11/26 SMI"
+# ident	"@(#)Makefile.sfw	1.13	09/12/14 SMI"
 #
 
 include ../apache.build.env
@@ -61,6 +61,12 @@
 tmp:
 	mkdir -p tmp
 
-include ../../Makefile.targ
+# this component has multiple metadata files, we need to validate all of them
+METADATA_FILES:sh = echo METADATA.*
 
-FRC:
+checked.%:	%
+	@$(PERL) $(SRC)/tools/metainfo.pl --file $< --validate
+
+meta-checks: $(METADATA_FILES:%=checked.%)
+
+include ../../Makefile.targ
--- a/usr/src/cmd/apache2/modules/fcgid.conf	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apache2/modules/fcgid.conf	Sat Jan 16 18:11:20 2010 +0200
@@ -7,8 +7,8 @@
 </IfDefine>
 
 <IfModule mod_fcgid.c>
-FcgidProcessTableFile %RUN_APACHE%/fcgid_shm
-FcgidIPCDir %RUN_APACHE%/fcgid.sock
+FcgidProcessTableFile /var/run/apache2/2.2/fcgid_shm
+FcgidIPCDir /var/run/apache2/2.2/fcgid.sock
 AddHandler fcgid-script .fcgi
 <Location /fcgid>
     SetHandler fcgid-script
--- a/usr/src/cmd/apr-util/apr-util-1.3/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apr-util/apr-util-1.3/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWapu13-ldap SUNWapu13dbd-mysql SUNWapu13dbd-pgsql SUNWapu13dbd-sqlite SUNWapu13dev SUNWapu13doc SUNWapu13lib
 PROJECT_URL:      http://apr.apache.org
 SOURCE_DOWNLOAD:  http://archive.apache.org/dist/apr/apr-util-1.3.9.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              9634
 COMMENTS:         
--- a/usr/src/cmd/apr/apr-1.3/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/apr/apr-1.3/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWapr13dev SUNWapr13doc SUNWapr13lib
 PROJECT_URL:      http://apr.apache.org
 SOURCE_DOWNLOAD:  http://archive.apache.org/dist/apr/apr-1.3.9.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              9635
 COMMENTS:         
--- a/usr/src/cmd/areca/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/areca/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:	GPLv2
 PROJECT_URL:		http://sourceforge.net/projects/areca/
 SOURCE_DOWNLOAD:	http://downloads.sourceforge.net/areca/areca-7.1.tar.gz
-SUPPORT:	Community
+SUPPORT:	C
 BUGTRAQ:	solaris/utility/areca
 OSR:		11737
 COMMENTS:
--- a/usr/src/cmd/autoconf/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/autoconf/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWaconf
 PROJECT_URL:      http://www.gnu.org/software/autoconf/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/autoconf/autoconf-2.63.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              10826
 COMMENTS:         
--- a/usr/src/cmd/autogen/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/autogen/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:        SUNWautogen
 PROJECT_URL:	http://www.gnu.org/software/autogen
 SOURCE_DOWNLOAD:	http://ftp.gnu.org/gnu/autogen/rel5.9/autogen-5.9.tar.gz
-SUPPORT:	Community
+SUPPORT:	C
 BUGTRAQ:	solaris/utility/autogen
 OSR:		10884
 COMMENTS:
--- a/usr/src/cmd/automake/automake-1.10/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/automake/automake-1.10/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-automake-110
 PROJECT_URL:      http://www.gnu.org/software/automake/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/pub/automake-1.10.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/automake
 OSR:              6495
 COMMENTS:         
--- a/usr/src/cmd/automake/automake-1.9.6/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/automake/automake-1.9.6/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-automake-19
 PROJECT_URL:      http://www.gnu.org/software/automake/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/pub/automake-1.9.6.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/automake
 OSR:              6495
 COMMENTS:         
--- a/usr/src/cmd/awstats/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/awstats/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWawstats
 PROJECT_URL:      http://awstats.sourceforge.net
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/awstats/awstats-6.9.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/awstats
 OSR:              8487
 COMMENTS:
--- a/usr/src/cmd/bash/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bash/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWbash
 PROJECT_URL:      http://www.gnu.org/software/bash/bash.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/bash/bash-4.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/bash
 OSR:              12655
 COMMENTS:
--- a/usr/src/cmd/bcc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bcc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWbcc
 PROJECT_URL:      http://homepage.ntlworld.com/robert.debath/
 SOURCE_DOWNLOAD:  http://homepage.ntlworld.com/robert.debath/dev86/Dev86src-0.16.17.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/other
 OSR:              6393
 COMMENTS:         
--- a/usr/src/cmd/beanshell/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/beanshell/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:	LGPL, SPL
 PROJECT_URL:	http://www.beanshell.org
 SOURCE_DOWNLOAD: http://tarballs.opensolaris.org/beanshell-2.0b4.tar.gz
-SUPPORT:	Community
+SUPPORT:	C
 BUGTRAQ:	solaris/utility/beanshell
 OSR:		10596
 COMMENTS:
--- a/usr/src/cmd/bind/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bind/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,11 @@
 NAME:		  bind
-VERSION:	  9.6.1-P1
+VERSION:	  9.6.1-P2
 DESCRIPTION:	  Berkeley Internet Name Domain server and utilities
 LICENSE:	  Other
 PACKAGE:	  SUNWbind SUNWbindc SUNWbindr
 PROJECT_URL:	  http://www.isc.org/software/bind
-SOURCE_DOWNLOAD:  http://ftp.isc.org/isc/bind9/9.6.1-P1/bind-9.6.1-P1.tar.gz
-SUPPORT:	  Managed
+SOURCE_DOWNLOAD:  http://ftp.isc.org/isc/bind9/9.6.1-P2/bind-9.6.1-P2.tar.gz
+SUPPORT:	  B
 BUGTRAQ:	  solaris/network/dns
 OSR:		  11725
 COMMENTS:
--- a/usr/src/cmd/bind/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bind/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -24,45 +24,58 @@
 # Use is subject to license terms.
 #
 
-#pragma ident	"@(#)Makefile.sfw	1.21	09/07/12 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.22	09/12/14 SMI"
 #
 
 VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 
 TARBALL =	$(VER).tar.gz
 
+#
+# Environment settings.
+#
+TARGET_ENV =	CC="$(CC)" CXX="$(CCC)"
+TARGET_ENV +=	PATH="$(SFW_PATH)"
+TARGET_ENV +=	LD_OPTIONS="-M $(SRC)/cmd/mapfile_noexstk"
+TARGET_ENV +=	LDFLAGS="-L$(ROOTLIB)/dns"
+TARGET_ENV +=   MAKE="$(CCSMAKE)"
+$(VER)/config.status:= \
+	TARGET_ENV += LD_LIBRARY_PATH="$(CFGLIB)/dns"
+
 # Ideally no patches should be required, where they are needed for a
 # release they should be incorporated or obsoleted in the next ISC
 # release.
 #
-# PATCHES:sh =	echo Patches/*.patch
+PATCHES:sh=	test -f Patches/*.patch && echo Patches/*.patch || echo ${VER}
 
 include ../Makefile.cmd
 
 # the ISC tarball is not /usr/bin/tar-friendly
 $(VER)/.patched:= UNPACKARCHIVE=$(GTAR) xfz
 
+# CONFIGARGS is printed by 'named -V' and logged at startup too.
 all: $(VER)/config.status
-	(cd $(VER); env - \
-	    LD_OPTIONS="-M $(SRC)/cmd/mapfile_noexstk" \
-	    PATH=$(SFW_PATH) \
-	    MAKE=$(CCSMAKE) \
-	    $(CCSMAKE) -e)
+	(cd $(VER); pwd;\
+	    env - $(TARGET_ENV) $(CCSMAKE) -e \
+	    CONFIGARGS='$(CONFIGURE_OPTIONS)')
 
+#
+# test & fulltest.  The latter configures IP addresses.
+#
 config_ip=$(POUND_SIGN)
 fulltest := config_ip = cd $(VER); $(SHELL) ./bin/tests/system/ifconfig.sh
 
 test fulltest: all
-	-$(config_ip) up 
-	-(cd $(VER); env \
+	-$(config_ip) up
+	-(cd $(VER); pwd; env \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(CCSMAKE) \
 	    $(CCSMAKE) -e test)
 	-$(config_ip) down
 
-
-
+#
 # Install binaries included in package into ROOT
+#
 install: all
 	$(SH) ./install-bind $(VER)
 
@@ -76,18 +89,14 @@
 CONFIGURE_OPTIONS +=	--enable-threads=yes
 CONFIGURE_OPTIONS +=	--enable-devpoll=yes
 CONFIGURE_OPTIONS +=	--disable-openssl-version-check
+CONFIGURE_OPTIONS +=	--enable-fixed-rrset
 
 # Configure BIND ready for compilation.
 # The openssl version check is disabled as we rely on dynamic SSL library
 # which is independent of BIND.
-$(VER)/config.status: $(VER)/.patched
-	(cd $(VER); env - \
-	    CC=$(CC) CXX=$(CCC) \
-	    LDFLAGS="-L${ROOT}/usr/lib/dns" \
-	    PATH=$(SFW_PATH) \
-	    MAKE=$(CCSMAKE) \
-            LD_LIBRARY_PATH=/usr/lib/dns \
-	    $(SHELL) ./configure $(CONFIGURE_OPTIONS) )
+$(VER)/config.status: $(VER)/$(SFW_STAMP_PATCHED)
+	(cd $(VER); pwd; env - $(TARGET_ENV) \
+		$(SHELL) ./configure $(CONFIGURE_OPTIONS) )
 
 clean:
 	-$(RM) -r ${VER}
Binary file usr/src/cmd/bind/bind-9.6.1-P1.tar.gz has changed
Binary file usr/src/cmd/bind/bind-9.6.1-P2.tar.gz has changed
--- a/usr/src/cmd/binutils/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/binutils/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWbinutils
 PROJECT_URL:      http://www.gnu.org/software/binutils/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/binutils/binutils-2.19.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              10451
 COMMENTS:         
--- a/usr/src/cmd/bison/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bison/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWbison
 PROJECT_URL:      http://www.gnu.org/software/bison
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/bison/bison-2.3.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              9806
 COMMENTS:         
--- a/usr/src/cmd/bonnieplus/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bonnieplus/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWbonnieplus
 PROJECT_URL:      http://www.coker.com.au/bonnie++
 SOURCE_DOWNLOAD:  http://www.coker.com.au/bonnie++/bonnie++-1.03c.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/bonnie++
 OSR:              8412
 COMMENTS:         
--- a/usr/src/cmd/bvi/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bvi/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWbvi
 PROJECT_URL:      http://bvi.sourceforge.net/
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/bvi/bvi-1.3.2.src.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/bvi
 OSR:              12007
 COMMENTS:         
--- a/usr/src/cmd/bwm-ng/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bwm-ng/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWbwm-ng
 PROJECT_URL:		http://www.gropp.org/?id=projects&sub=bwm-ng
 SOURCE_DOWNLOAD:	http://www.gropp.org/bwm-ng/bwm-ng-0.6.tar.gz
-SUPPORT:		Community
+SUPPORT:		C
 BUGTRAQ:		solaris/utility/bwm-ng
 OSR:			10971
 COMMENTS:
--- a/usr/src/cmd/bzip2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/bzip2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWbzip
 PROJECT_URL:      http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz
 SOURCE_DOWNLOAD:  http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/bzip
 OSR:              6532
 COMMENTS:         
--- a/usr/src/cmd/cdrtools/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/cdrtools/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmkcdr SUNWmkcd
 PROJECT_URL:      http://cdrecord.berlios.de/old/private/cdrecord.html
 SOURCE_DOWNLOAD:  ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.01.01a63.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/cdrtools
 OSR:              10050
 COMMENTS:         
--- a/usr/src/cmd/cimserver/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/cimserver/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWcimserverr SUNWcimserveru
 PROJECT_URL:      http://www.openpegasus.org/
 SOURCE_DOWNLOAD:  https://www.openpegasus.org//uploads/40/17276/pegasus-2.8.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/wbem/pegasus
 OSR:              8398
 COMMENTS:         
--- a/usr/src/cmd/clisp/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/clisp/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWclisp
 PROJECT_URL:      http://clisp.cons.org/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/clisp/release/2.47/clisp-2.47.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/clisp
 OSR:              10665
 COMMENTS:         
--- a/usr/src/cmd/cmake/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/cmake/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWcmake
 PROJECT_URL:      http://www.cmake.org
 SOURCE_DOWNLOAD:  http://www.cmake.org/files/v2.6/cmake-2.6.2.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/cmake
 OSR:              9804
 COMMENTS:         
--- a/usr/src/cmd/conflict/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/conflict/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWconflict
 PROJECT_URL:      http://invisible-island.net/conflict/conflict.html
 SOURCE_DOWNLOAD:  ftp://invisible-island.net/conflict/conflict-20040901.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/conflict
 OSR:              10547
 COMMENTS:         
--- a/usr/src/cmd/conman/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/conman/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:        SUNWconmanr SUNWconmanu
 SOURCE_DOWNLOAD: http://download.gna.org/conman/0.2.4.1/conman-0.2.4.1.tar.gz
 PROJECT_URL:    http://home.gna.org/conman/
-SUPPORT:        Community
+SUPPORT:        C
 BUGTRAQ:        solaris/utility/conman
 OSR:            9412
 COMMENTS:
--- a/usr/src/cmd/convmv/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/convmv/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWconvmv
 PROJECT_URL:      http://www.j3e.de/linux/convmv/
 SOURCE_DOWNLOAD:  http://www.j3e.de/linux/convmv/convmv-1.14.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/convmv
 OSR:              11155
 COMMENTS:         
--- a/usr/src/cmd/coreutils/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/coreutils/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-coreutils
 PROJECT_URL:      http://ftp.gnu.org/gnu/coreutils/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/coreutils/coreutils-7.4.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu-coreutils
 OSR:              11996
 COMMENTS:         
--- a/usr/src/cmd/cups/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/cups/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,11 @@
 NAME:             cups
-VERSION:          1.4.1
+VERSION:          1.4.2
 DESCRIPTION:      Common Unix Print System
 LICENSE:          CUPS, Aladdin, Unicode
 PACKAGE:          SUNWcupsr SUNWcupsu
 PROJECT_URL:      http://www.cups.org/
-SOURCE_DOWNLOAD:  http://ftp.easysw.com/pub/cups/1.4.1/cups-1.4.1-source.tar.bz2
-SUPPORT:          Managed
+SOURCE_DOWNLOAD:  http://ftp.easysw.com/pub/cups/1.4.2/cups-1.4.2-source.tar.bz2
+SUPPORT:          B
 BUGTRAQ:          solaris/print/cups
 OSR:              12856
 COMMENTS:         
--- a/usr/src/cmd/cups/Patches/08-usb-hack.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/cups/Patches/08-usb-hack.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -1,6 +1,5 @@
---- backend/usb-unix.c	Mon Aug 31 11:45:43 2009
-+++ backend/usb-unix.c	Thu Oct  1 15:26:12 2009
-
+--- backend/usb-unix.c.orig	Tue Sep 22 11:47:36 2009
++++ backend/usb-unix.c	Sat Nov 28 06:16:25 2009
 @@ -30,7 +30,11 @@
  
  #include <sys/select.h>
@@ -13,7 +12,7 @@
  /*
   * Local functions...
   */
-@@ -470,6 +470,8 @@
+@@ -470,6 +474,8 @@
      {
        for (i = 0, busy = 0; i < 8; i ++)
        {
@@ -22,7 +21,7 @@
  	sprintf(device, "/dev/usb/printer%d", i);
  
  	if ((fd = open(device, O_WRONLY | O_EXCL)) >= 0)
-@@ -489,6 +491,16 @@
+@@ -489,6 +495,16 @@
  	  device_uri[0] = '\0';
          }
  
@@ -39,12 +38,3 @@
          if (!strcmp(uri, device_uri))
  	{
  	 /*
-@@ -560,7 +572,7 @@
-  * 'side_cb()' - Handle side-channel requests...
-  */
- 
--static void
-+static int
- side_cb(int         print_fd,		/* I - Print file */
-         int         device_fd,		/* I - Device file */
-         int         snmp_fd,		/* I - SNMP socket (unused) */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cups/Patches/13.cups-1.4.2-CVE-2009-3553.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -0,0 +1,40 @@
+diff -up cups-1.4.2/scheduler/select.c.str3200 cups-1.4.2/scheduler/select.c
+--- scheduler/select.c.str3200	2009-07-15 00:07:52.000000000 +0100
++++ scheduler/select.c	2009-11-10 15:42:55.359665174 +0000
+@@ -454,7 +454,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+     if (fdptr->read_cb && event->filter == EVFILT_READ)
+       (*(fdptr->read_cb))(fdptr->data);
+ 
+-    if (fdptr->write_cb && event->filter == EVFILT_WRITE)
++    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
+       (*(fdptr->write_cb))(fdptr->data);
+ 
+     release_fd(fdptr);
+@@ -499,7 +499,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+ 	if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
+ 	  (*(fdptr->read_cb))(fdptr->data);
+ 
+-	if (fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
++	if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
+ 	  (*(fdptr->write_cb))(fdptr->data);
+ 
+ 	release_fd(fdptr);
+@@ -590,7 +590,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+       if (fdptr->read_cb && (pfd->revents & (POLLIN | POLLERR | POLLHUP)))
+         (*(fdptr->read_cb))(fdptr->data);
+ 
+-      if (fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
++      if (fdptr->use > 1 && fdptr->write_cb && (pfd->revents & (POLLOUT | POLLERR | POLLHUP)))
+         (*(fdptr->write_cb))(fdptr->data);
+ 
+       release_fd(fdptr);
+@@ -645,7 +645,7 @@ cupsdDoSelect(long timeout)		/* I - Time
+       if (fdptr->read_cb && FD_ISSET(fdptr->fd, &cupsd_current_input))
+         (*(fdptr->read_cb))(fdptr->data);
+ 
+-      if (fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
++      if (fdptr->use > 1 && fdptr->write_cb && FD_ISSET(fdptr->fd, &cupsd_current_output))
+         (*(fdptr->write_cb))(fdptr->data);
+ 
+       release_fd(fdptr);
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cups/Patches/14.dbus-glib.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -0,0 +1,11 @@
+--- config-scripts/cups-common.m4.orig	Mon Nov  9 15:04:22 2009
++++ config-scripts/cups-common.m4	Wed Dec  9 04:20:10 2009
+@@ -266,6 +266,8 @@
+ 				dbus_message_iter_init_append,
+ 				AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
+ 				`$PKGCONFIG --libs dbus-1`)
++			DBUS_NOTIFIER="dbus"
++			DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
+ 		else
+ 			AC_MSG_RESULT(no)
+ 		fi
--- a/usr/src/cmd/cups/Solaris/service-selector.xml	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/cups/Solaris/service-selector.xml	Sat Jan 16 18:11:20 2010 +0200
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
- Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  Use is subject to license terms.
 
  CDDL HEADER START
@@ -23,7 +23,7 @@
 
  CDDL HEADER END
 
-	ident	"@(#)service-selector.xml	1.1	09/10/23 SMI"
+	ident	"@(#)service-selector.xml	1.2	10/01/04 SMI"
 
 	NOTE:  This service manifest is not editable; its contents will
 	be overwritten by package or patch operations, including
@@ -57,6 +57,19 @@
 		<service_fmri value='svc:/system/filesystem/minimal' />
 	</dependency>
 
+	<!--
+	This dependency  is required  to ensure that the cups manifest has
+	been imported prior to selecting a default print service.
+	-->
+
+	<dependency
+		name='cups-manifest-import'
+		type='service'
+		grouping='optional_all'
+		restart_on='none'>
+		<service_fmri value='svc:/system/manifest-import' />
+	</dependency>
+
 	<exec_method
 		type='method'
 		name='start'
Binary file usr/src/cmd/cups/cups-1.4.1-source.tar.bz2 has changed
Binary file usr/src/cmd/cups/cups-1.4.2-source.tar.bz2 has changed
--- a/usr/src/cmd/cvs/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/cvs/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWcvs
 PROJECT_URL:      http://www.nongnu.org/cvs/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/cvs
 OSR:              9868
 COMMENTS:         
--- a/usr/src/cmd/diffstat/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/diffstat/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWdiffstat
 PROJECT_URL:      http://invisible-island.net/diffstat/
 SOURCE_DOWNLOAD:  ftp://invisible-island.net/diffstat/diffstat-1.45.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/diffstat
 OSR:              8382
 COMMENTS:         
--- a/usr/src/cmd/diffutils/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/diffutils/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-diffutils
 PROJECT_URL:      http://www.gnu.org/software/diffutils/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/diffutils/diffutils-2.8.7.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu-diffutils
 OSR:              2229
 COMMENTS:         
--- a/usr/src/cmd/dosbox/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/dosbox/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWdosbox
 PROJECT_URL:      http://www.dosbox.com/
 SOURCE_DOWNLOAD:  http://puzzle.dl.sourceforge.net/sourceforge/dosbox/dosbox-0.73.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/dosbox
 OSR:              8279
 COMMENTS:         
--- a/usr/src/cmd/doxygen/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/doxygen/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWdoxygen
 PROJECT_URL:      http://www.doxygen.org/
 SOURCE_DOWNLOAD:  http://ftp.stack.nl/pub/users/dimitri/doxygen-1.5.7.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/doxygen
 OSR:              9692
 COMMENTS:         
--- a/usr/src/cmd/dvd+rw-tools/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/dvd+rw-tools/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWdvdrw
 PROJECT_URL:      http://fy.chalmers.se/~appro/linux/DVD+RW
 SOURCE_DOWNLOAD:  http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-5.21.4.10.8.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/dvd+rw-tools
 OSR:              3691
 COMMENTS:         
--- a/usr/src/cmd/dwdiff/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/dwdiff/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWdwdiff
 PROJECT_URL:      http://os.ghalkes.nl/dwdiff.html
 SOURCE_DOWNLOAD:  http://os.ghalkes.nl/dist/dwdiff-1.5.2.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/dwdiff
 OSR:              10884
 COMMENTS:
--- a/usr/src/cmd/ejabberd/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ejabberd/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	SUNWejabberdr SUNWejabberdu
 PROJECT_URL:	http://www.ejabberd.im/
 SOURCE_DOWNLOAD:	http://www.process-one.net/downloads/ejabberd/2.0.5/ejabberd-2.0.5.tar.gz
-SUPPORT:	Community
+SUPPORT:	C
 BUGTRAQ:	solaris/utility/ejabberd
 OSR:		8475
 COMMENTS:	ejabberd configure script and makefiles assume Linux
--- a/usr/src/cmd/elinks/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/elinks/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWelinks
 PROJECT_URL:      http://elinks.or.cz/
 SOURCE_DOWNLOAD:  http://elinks.or.cz/download/elinks-0.11.6.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/elinks
 OSR:              10843
 COMMENTS:         
--- a/usr/src/cmd/emacs/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/emacs/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-emacs SUNWgnu-emacs-el SUNWgnu-emacs-gtk SUNWgnu-emacs-nox SUNWgnu-emacs-x
 PROJECT_URL:      http://www.gnu.org/software/emacs/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/emacs/emacs-23.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/emacs
 OSR:              13016
 COMMENTS:         
--- a/usr/src/cmd/epydoc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/epydoc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWepydoc
 PROJECT_URL:      http://sourceforge.net/projects/epydoc
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/epydoc/epydoc-3.0.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/epydoc
 OSR:              10594
 COMMENTS:         
--- a/usr/src/cmd/erlang/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/erlang/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWerlang SUNWerlang-doc
 PROJECT_URL:      http://www.erlang.org
 SOURCE_DOWNLOAD:  http://www.erlang.org/download/otp_src_R12B-1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/erlang
 OSR:              7720
 COMMENTS:         
--- a/usr/src/cmd/expect/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/expect/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWexpect
 PROJECT_URL:      http://expect.nist.gov/
 SOURCE_DOWNLOAD:  http://expect.nist.gov/old/expect-5.43.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/expect
 OSR:              7202
 COMMENTS:         
--- a/usr/src/cmd/fakeroot/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/fakeroot/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -4,8 +4,8 @@
 LICENSE:	 GPLv2
 PACKAGE:	 SUNWfakeroot
 PROJECT_URL:	 http://fakeroot.alioth.debian.org/
-SOURCE_DOWNLOAD: http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.11.tar.gz
-SUPPORT:         Community
+SOURCE_DOWNLOAD: http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot-1.11.tar.gz
+SUPPORT:         C
 BUGTRAQ:         solaris/utility/fakeroot
 OSR:		 9190
 COMMENTS:
--- a/usr/src/cmd/fetchmail/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/fetchmail/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWfetchmail
 PROJECT_URL:      http://fetchmail.berlios.de/
 SOURCE_DOWNLOAD:  http://prdownload.berlios.de/fetchmail/fetchmail-6.3.8.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/fetchmail
 OSR:              8301
 COMMENTS:         
--- a/usr/src/cmd/flex/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/flex/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWflexlex SUNWflexruntime
 PROJECT_URL:      http://flex.sourceforge.net
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/flex/flex-2.5.35.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              2232
 COMMENTS:         For future updates:
--- a/usr/src/cmd/foomatic-db-engine/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/foomatic-db-engine/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWfoomatic-db-enginer SUNWfoomatic-db-engineu
 PROJECT_URL:      http://www.linuxfoundation.org/en/OpenPrinting/Database/Foomatic
 SOURCE_DOWNLOAD:  http://www.openprinting.org/download/foomatic/foomatic-db-engine-3.0-20080903.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/foomatic
 OSR:              8231
 COMMENTS:         
--- a/usr/src/cmd/foomatic-db/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/foomatic-db/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWfoomatic-db
 PROJECT_URL:      http://www.linuxfoundation.org/en/OpenPrinting/Database/Foomatic
 SOURCE_DOWNLOAD:  http://www.openprinting.org/download/foomatic/foomatic-db-20080903.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/foomatic
 OSR:              8189
 COMMENTS:         
--- a/usr/src/cmd/foomatic-filters/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/foomatic-filters/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWffiltersr SUNWffiltersu
 PROJECT_URL:      http://www.linuxprinting.org/foomatic.html
 SOURCE_DOWNLOAD:  http://www.openprinting.org/download/foomatic/foomatic-filters-3.0.2.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/foomatic
 OSR:              8234
 COMMENTS:         
--- a/usr/src/cmd/foomatic-ppd/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/foomatic-ppd/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWfppd
 PROJECT_URL:      http://www.linuxfoundation.org/en/OpenPrinting/Database/Foomatic
 SOURCE_DOWNLOAD:  http://www.openprinting.org/download/foomatic/foomatic-filters-ppds-20080818.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/foomatic
 OSR:              9257
 COMMENTS:         
--- a/usr/src/cmd/fping/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/fping/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWfping SUNWfpingr
 PROJECT_URL:      http://fping.sourceforge.net/
 SOURCE_DOWNLOAD:  http://fping.sourceforge.net/download/fping-2.4b2_to.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/network/internet-utility
 OSR:              7762
 COMMENTS:         
--- a/usr/src/cmd/freeipmi/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/freeipmi/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWfreeipmir SUNWfreeipmiu
 PROJECT_URL:		http://www.gnu.org/software/freeipmi
 SOURCE_DOWNLOAD:	http://ftp.zresearch.com/pub/freeipmi/0.7.7/freeipmi-0.7.7.tar.gz
-SUPPORT:		Managed
+SUPPORT:		C
 BUGTRAQ:		solaris/utility/freeipmi
 OSR:			11593
 COMMENTS:
--- a/usr/src/cmd/gawk/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gawk/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgawk
 PROJECT_URL:      http://directory.fsf.org/project/gawk/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/gawk/gawk-3.1.5.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/text
 OSR:              10004
 COMMENTS:         
--- a/usr/src/cmd/gcc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gcc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgcc SUNWgccruntime
 PROJECT_URL:      http://gcc.gnu.org
 SOURCE_DOWNLOAD:  ftp://mirrors.laffeycomputer.com/pub/gcc.gnu.org/pub/gcc/releases/gcc-3.4.3/gcc-3.4.3.tar.gz
-SUPPORT:          Community
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              3211
 COMMENTS:         
--- a/usr/src/cmd/gdb/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gdb/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgdb
 PROJECT_URL:      http://www.gnu.org/software/gdb/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/gdb/gdb-6.8.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              10833
 COMMENTS:         
--- a/usr/src/cmd/gettext/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gettext/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-gettext
 PROJECT_URL:      http://www.gnu.org/software/gettext/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/gettext/gettext-0.16.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu-gettext
 OSR:              7675
 COMMENTS:         
--- a/usr/src/cmd/ggrep/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ggrep/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWggrp
 PROJECT_URL:      http://www.gnu.org/software/grep/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/grep/grep-2.5.4.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/ggrep
 OSR:              11139
 COMMENTS:         
--- a/usr/src/cmd/ghostscript/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ghostscript/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWghostscriptr SUNWghostscriptu
 PROJECT_URL:      http://ghostscript.com
 SOURCE_DOWNLOAD:  http://ghostscript.com/releases/ghostscript-8.64.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/ghostscript
 OSR:              7364
 COMMENTS:         
--- a/usr/src/cmd/git/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/git/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgit
 PROJECT_URL:      http://git.or.cz/
 SOURCE_DOWNLOAD:  http://kernel.org/pub/software/scm/git/git-1.5.6.5.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/git
 OSR:              8586
 COMMENTS:         
--- a/usr/src/cmd/gm4/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gm4/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgm4
 PROJECT_URL:      http://www.gnu.org/software/m4
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/m4/m4-1.4.12.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              10828
 COMMENTS:         
--- a/usr/src/cmd/gmake/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gmake/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgmake
 PROJECT_URL:      http://www.gnu.org/software/make/make.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/make/make-3.81.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gnu_compiler
 OSR:              2544
 COMMENTS:         
--- a/usr/src/cmd/gnu-gperf/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gnu-gperf/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-gperf
 PROJECT_URL:      http://www.gnu.org/software/gperf
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/gperf/gperf-3.0.3.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/gperf
 OSR:              8040
 COMMENTS:         
--- a/usr/src/cmd/gnu-gs-fonts-other/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gnu-gs-fonts-other/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgsfot
 PROJECT_URL:      http://sourceforge.net/projects/gs-fonts/
 SOURCE_DOWNLOAD:  http://softlayer.dl.sourceforge.net/sourceforge/gs-fonts/gnu-gs-fonts-other-6.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/ghostscript
 OSR:              1277
 COMMENTS:         
--- a/usr/src/cmd/gnu-gs-fonts-std/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gnu-gs-fonts-std/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgsfst
 PROJECT_URL:      http://sourceforge.net/projects/gs-fonts/
 SOURCE_DOWNLOAD:  http://softlayer.dl.sourceforge.net/sourceforge/gs-fonts/gnu-gs-fonts-std-6.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/ghostscript
 OSR:              1277
 COMMENTS:         
--- a/usr/src/cmd/gnupg/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gnupg/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnupg
 PROJECT_URL:      http://www.gnupg.org
 SOURCE_DOWNLOAD:  ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.13.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/solaris-crypto/gnupg
 OSR:              10507
 COMMENTS:         Needed by JDS
--- a/usr/src/cmd/gnupg/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gnupg/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.1	09/11/23 SMI"
+#ident	"@(#)Makefile.sfw	1.3	09/12/21 SMI"
 #
 
 include ../Makefile.cmd
@@ -43,7 +43,10 @@
 
 CONFIGURE_OPTIONS=--with-libassuan-prefix="$(SRC)/lib/libassuan/dist/usr" \
 	--with-pinentry-pgm=/usr/lib/pinentry \
-	--prefix=/usr
+	--prefix=/usr \
+	--libexecdir=/usr/bin \
+	--datadir=/usr/share \
+	--sysconfdir=/etc
 
 all: $(VER)/config.status
 	(cd $(VER); env - ROOT="$(ROOT)" $(CCSMAKE) MAKE=$(CCSMAKE))
--- a/usr/src/cmd/gocr/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gocr/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgocr
 PROJECT_URL:      http://jocr.sourceforge.net/
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/jocr/gocr-0.46.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/gocr
 OSR:              8908
 COMMENTS:         
--- a/usr/src/cmd/gpatch/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gpatch/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgpch
 PROJECT_URL:      http://www.gnu.org/software/patch/patch.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/patch/patch-2.5.9.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gpatch
 OSR:              6654
 COMMENTS:         
--- a/usr/src/cmd/gpgme/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gpgme/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnupg
 PROJECT_URL:      http://www.gnupg.org/related_software/gpgme/index.en.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.8.tar.bz2
-SUPPORT:          Community
-BUGTRAQ:          solaris/library/libgpgme
+SUPPORT:          C
+BUGTRAQ:          solaris/library/gpgme
 OSR:              10386
 COMMENTS:         Needed by parts of GnuPG and JDS
--- a/usr/src/cmd/gpgme/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gpgme/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.1	09/11/19 SMI"
+#ident	"@(#)Makefile.sfw	1.2	09/12/11 SMI"
 
 VER	=	$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 TARBALL =	$(VER).tar.bz2
@@ -39,7 +39,8 @@
 
 PATCHES:sh=echo Patches/*.patch
 
-CONFIGURE_OPTIONS=--disable-gpg-test \
+CONFIGURE_OPTIONS=--prefix=/usr \
+	--disable-gpg-test \
 	--disable-gpgsm-test \
 	--disable-gpgconf-test \
 	--without-pth-test \
--- a/usr/src/cmd/grails/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/grails/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgrails
 PROJECT_URL:      http://grails.org/
 SOURCE_DOWNLOAD:  http://dist.codehaus.org/grails-src-1.0.3.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/grails
 OSR:              9987
 COMMENTS:         
--- a/usr/src/cmd/gsed/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gsed/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgsed
 PROJECT_URL:      http://directory.fsf.org/project/sed/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/pub/gnu/sed/sed-4.2.1.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/editor
 OSR:              12497
 COMMENTS:         
--- a/usr/src/cmd/gtar/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gtar/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgtar
 PROJECT_URL:      http://directory.fsf.org/project/tar/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/tar/tar-1.22.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gtar
 OSR:              10261
 COMMENTS:         
--- a/usr/src/cmd/guile/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/guile/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWguile
 PROJECT_URL:    	http://www.gnu.org/software/guile
 SOURCE_DOWNLOAD:	http://ftp.gnu.org/pub/gnu/guile/guile-1.8.4.tar.gz
-SUPPORT:        	Community
+SUPPORT:        	C
 BUGTRAQ:        	solaris/utility/guile
 OSR:			8463
 COMMENTS:       	No notable modifications.
--- a/usr/src/cmd/guile/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/guile/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#  ident	"@(#)Makefile.sfw	1.3	09/08/23 SMI"
+#  ident	"@(#)Makefile.sfw	1.4	09/12/06 SMI"
 #
 
 VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -85,19 +85,17 @@
 	(cd $(VER); env - \
 	    CC=$(GCC) \
 	    PATH=$(SFW_PATH) \
+	    CPPFLAGS="-I/usr/include/gmp" \
 	    MAKE=$(CCSMAKE) \
-            LDFLAGS="-L$(ROOTLIB)" \
-	    CPPFLAGS="-I$(ROOTINCLUDE)/gmp -I$(ROOTINCLUDE)" \
 	    ./configure $(CONFIGURE_OPTIONS) )
 
 $(VER64)/config.status: $(VER64)/configure
 	(cd $(VER64);env - \
 	    CC=$(GCC64) \
 	    CFLAGS="-m64 " \
+	    CPPFLAGS="-m64 -I/usr/include/gmp" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(CCSMAKE) \
-	    LDFLAGS="-L$(ROOTLIB64)" \
-	    CPPFLAGS="-m64 -I$(ROOTINCLUDE)/gmp -I$(ROOTINCLUDE)" \
 	    $(SHELL) ./configure $(CONFIGURE_OPTIONS) )
 
 $(VER)/configure: $(TARBALL)
--- a/usr/src/cmd/gutenprint/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gutenprint/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgutenprint
 PROJECT_URL:      http://www.gutenprint.org
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/project/gimp-print/gutenprint-5.2/5.2.4/gutenprint-5.2.4.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/other
 OSR:              12705
 COMMENTS:         
--- a/usr/src/cmd/gvim/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gvim/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgvim
 PROJECT_URL:      http://www.vim.org
 SOURCE_DOWNLOAD:  ftp://ftp.vim.org/pub/vim/unix/vim72.tar.bz2/METADATA
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/vim
 OSR:              6372
 COMMENTS:         
--- a/usr/src/cmd/gzip/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/gzip/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgzip
 PROJECT_URL:      http://directory.fsf.org/GNU/gzip.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/gzip/gzip-1.3.5.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/gzip
 OSR:              5227
 COMMENTS:         
--- a/usr/src/cmd/hal-cups-utils/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/hal-cups-utils/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWhal-cups-utils SUNWhal-cups-utilsr
 PROJECT_URL:      http://fedorahosted.org/hal-cups-utils/
 SOURCE_DOWNLOAD:  http://fedorahosted.org/releases/h/a/hal-cups-utils/hal-cups-utils-0.6.19.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/hal-cups-utils
 OSR:              10503
 COMMENTS:         
--- a/usr/src/cmd/hexedit/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/hexedit/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWhexedit
 PROJECT_URL:      http://merd.sourceforge.net/pixel/hexedit.html
 SOURCE_DOWNLOAD:  http://merd.sourceforge.net/pixel/hexedit.1.2.12.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/hexedit
 OSR:              9962
 COMMENTS:         
--- a/usr/src/cmd/hplip/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/hplip/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWhpijs
 PROJECT_URL:      http://hplip.sf.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/hplip/hplip-3.9.8.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/hplip
 OSR:              8784
 COMMENTS:         
--- a/usr/src/cmd/httping/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/httping/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWhttping
 PROJECT_URL:      http://www.vanheusden.com/httping/
 SOURCE_DOWNLOAD:  http://www.vanheusden.com/httping/httping-1.3.0.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/httping
 OSR:              10674
 COMMENTS:         
--- a/usr/src/cmd/idzebra/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/idzebra/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWidzebra
 PROJECT_URL:      http://www.indexdata.dk/zebra
 SOURCE_DOWNLOAD:  http://ftp.indexdata.dk/pub/zebra/idzebra-2.0.40.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/idzebra
 OSR:              12191
 COMMENTS:         
--- a/usr/src/cmd/iftop/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/iftop/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWiftop
 PROJECT_URL:      http://www.ex-parrot.com/~pdw/iftop/
 SOURCE_DOWNLOAD:  http://www.ex-parrot.com/~pdw/iftop/download/iftop-0.17.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/iftop
 OSR:              10721
 COMMENTS:         
--- a/usr/src/cmd/iozone/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/iozone/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWiozone
 PROJECT_URL:      http://www.iozone.org
 SOURCE_DOWNLOAD:  ftp://tarballs.opensolaris.org/pub/iozone3_323.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/benchmarks/iozone
 OSR:              9085
 COMMENTS:         
--- a/usr/src/cmd/iperf/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/iperf/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWiperf
 PROJECT_URL:      http://sourceforge.net/projects/iperf
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/iperf/iperf-2.0.4.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/iperf
 OSR:              10883
 COMMENTS:         
--- a/usr/src/cmd/ipmitool/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ipmitool/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWipmi SUNWipmir
 PROJECT_URL:      http://ipmitool.sourceforge.net
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/ipmitool/ipmitool-1.8.10.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/ipmitool
 OSR:              10867
 COMMENTS:         
--- a/usr/src/cmd/ircii/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ircii/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWircii
 PROJECT_URL:      ftp://ircii.warped.com/pub/ircII/
 SOURCE_DOWNLOAD:  ftp://ircii.warped.com/pub/ircII/ircii-20060725.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/ircii
 OSR:              8120
 COMMENTS:         
--- a/usr/src/cmd/jedit/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/jedit/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	SUNWjedit
 PROJECT_URL:	http://www.jedit.org
 SOURCE_DOWNLOAD:	http://prdownloads.sourceforge.net/jedit/jedit4.3pre16source.tar.bz2
-SUPPORT:	Community
+SUPPORT:	C
 BUGTRAQ:	solaris/utility/jedit
 OSR:		12347
 COMMENTS:
--- a/usr/src/cmd/jruby/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/jruby/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjruby
 PROJECT_URL:      http://jruby.org
 SOURCE_DOWNLOAD:  http://dist.codehaus.org/jruby/jruby-src-1.1.3.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/jruby
 OSR:              9966
 COMMENTS:         
--- a/usr/src/cmd/konkretcmpi/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/konkretcmpi/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWkonkretcmpi
 PROJECT_URL:      http://konkretcmpi.org/
 SOURCE_DOWNLOAD:  http://konkretcmpi.org/konkretcmpi-0.8.7.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/konkretcmpi
 OSR:              10052
 COMMENTS:         
--- a/usr/src/cmd/lablgtk/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/lablgtk/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlablgtk
 PROJECT_URL:      http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html
 SOURCE_DOWNLOAD:  http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgtk-2.10.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/lablgtk
 OSR:              8441
 COMMENTS:         
--- a/usr/src/cmd/less/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/less/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWless
 PROJECT_URL:      http://www.greenwoodsoftware.com/less/
 SOURCE_DOWNLOAD:  http://www.greenwoodsoftware.com/less/less-436.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/less
 OSR:              8081
 COMMENTS:         
--- a/usr/src/cmd/lftp/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/lftp/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlftpr SUNWlftpu
 PROJECT_URL:      http://lftp.yar.ru/
 SOURCE_DOWNLOAD:  http://ftp.yars.free.net/pub/source/lftp/lftp-3.7.15.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/lftp
 OSR:              12244
 COMMENTS:         
--- a/usr/src/cmd/libtool/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/libtool/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibtool
 PROJECT_URL:      ftp://ftp.gnu.org/gnu/libtool/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/libtool/libtool-1.5.22.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/libtool
 OSR:              7768
 COMMENTS:         
--- a/usr/src/cmd/lighttpd14/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/lighttpd14/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlighttpd14r SUNWlighttpd14u
 PROJECT_URL:      http://www.lighttpd.net/
 SOURCE_DOWNLOAD:  http://www.lighttpd.net/download/lighttpd-1.4.23.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/lighttpd
 OSR:              8071
 COMMENTS:         
--- a/usr/src/cmd/links/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/links/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlinks
 PROJECT_URL:      http://links.sourceforge.net
 SOURCE_DOWNLOAD:  http://www.jikos.cz/~mikulas/links//download/links-1.00.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/links
 OSR:              8524
 COMMENTS:         
--- a/usr/src/cmd/logrotate/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/logrotate/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlogrotater SUNWlogrotateu
 PROJECT_URL:      http://www.sunfreeware.com/
 SOURCE_DOWNLOAD:  ftp://ftp.sunfreeware.com/pub/freeware/SOURCES/logrotate-3.7.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/logger
 OSR:              8589
 COMMENTS:         
--- a/usr/src/cmd/lua/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/lua/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlua
 PROJECT_URL:      http://www.lua.org
 SOURCE_DOWNLOAD:  http://www.lua.org/ftp/lua-5.1.4.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/lua
 OSR:              9587
 COMMENTS:         
--- a/usr/src/cmd/mc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-mc
 PROJECT_URL:      http://www.gnu.org/software/mc/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/mc/mc-4.6.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/mc
 OSR:              8056
 COMMENTS:         
--- a/usr/src/cmd/meld/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/meld/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmeld
 PROJECT_URL:      http://meld.sourceforge.net
 SOURCE_DOWNLOAD:  http://ftp.gnome.org/pub/gnome/sources/meld/1.2/meld-1.1.5.1.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/meld
 OSR:              8025
 COMMENTS:         
--- a/usr/src/cmd/mercurial/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mercurial/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmercurial
 PROJECT_URL:      http://www.selenic.com/mercurial/wiki/index.cgi/Mercurial
 SOURCE_DOWNLOAD:  http://www.selenic.com/mercurial/release/mercurial-1.3.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/hg
 OSR:              4629
 COMMENTS:         
--- a/usr/src/cmd/mrtg/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mrtg/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWmrtg
 PROJECT_URL:		http://oss.oetiker.ch/mrtg/index.en.html
 SOURCE_DOWNLOAD:	http://oss.oetiker.ch/mrtg/pub/mrtg-2.16.2.tar.gz
-SUPPORT:          	Managed
+SUPPORT:          	C
 BUGTRAQ:		solaris/utility/mrtg
 OSR:			10872
 COMMENTS:
--- a/usr/src/cmd/mrxvt/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mrxvt/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmrxvt
 PROJECT_URL:      http://materm.sourceforge.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/materm/mrxvt-0.5.4.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/mrxvt
 OSR:              10022
 COMMENTS:         
--- a/usr/src/cmd/mtx/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mtx/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmtx
 PROJECT_URL:      http://mtx.opensource-sw.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/mtx/mtx-1.3.11.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/mtx
 OSR:              9377
 COMMENTS:         
--- a/usr/src/cmd/mutt/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mutt/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmuttr SUNWmutt
 PROJECT_URL:      http://www.mutt.org/
 SOURCE_DOWNLOAD:  ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/mutt
 OSR:              8296
 COMMENTS:         
--- a/usr/src/cmd/mysql-5-0-jdbc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mysql-5-0-jdbc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmysql5jdbc
 PROJECT_URL:      http://dev.mysql.com/downloads/connector/j/5.1.html
 SOURCE_DOWNLOAD:  http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.5.zip
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/database/mysql
 OSR:              8946
 COMMENTS:         
--- a/usr/src/cmd/mysql-5-0/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mysql-5-0/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -4,8 +4,8 @@
 LICENSE:          GPLv2
 PACKAGE:          SUNWmysql5r SUNWmysql5u SUNWmysql5test
 PROJECT_URL:      http://www.mysql.org/
-SOURCE_DOWNLOAD:  http://dev.mysql.com/downloads/mysql/5.0.html 
-SUPPORT:          Community
+SOURCE_DOWNLOAD:  http://opensource.become.com/mysql/Downloads/MySQL-5.0/mysql-5.0.86.tar.gz
+SUPPORT:          C
 BUGTRAQ:          solaris/database/mysql
 OSR:              7205
 COMMENTS:         
--- a/usr/src/cmd/mysql-5-0/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mysql-5-0/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-#ident	"@(#)Makefile.sfw	1.10	09/09/03 SMI"
+#ident	"@(#)Makefile.sfw	1.11	09/12/11 SMI"
 
 
 VER=$(COMPONENT_VERSION:sh)
@@ -44,7 +44,7 @@
 
 # C++ common flags
 
-CXXCOMMONFLAGS= -DDBUG_OFF -DBIG_TABLES -DHAVE_RWLOCK_T -KPIC -DPIC -xO4 \
+CXXCOMMONFLAGS= -DDBUG_OFF -DBIG_TABLES -DHAVE_RWLOCK_T -KPIC -DPIC -xO4 -xmaxopt=4 \
 -xprefetch=auto -xprefetch_level=3 -mt -fns=no -fsimple=1 -xbuiltin=%all \
 -xlibmil -xlibmopt -norunpath
 
@@ -164,6 +164,7 @@
 	gpatch  $(MYSQL_DIR)/innobase/include/univ.i -i patches/inline.patch	
 	gpatch $(MYSQL_DIR)/scripts/mysql_config.sh -i patches/mysql_config.patch
 	gpatch $(MYSQL_DIR)/configure -i patches/configure.patch
+	gpatch $(MYSQL_DIR)/sql/sql_select.cc -i patches/xO4_optimization.patch
 	(cd $(MYSQL_DIR)/support-files; gpatch -p0 < ../../patches/federated_cnf.patch)
 	touch $(MYSQL_DIR)/configure
 	find $(MYSQL_DIR) -type d -exec /usr/bin/chmod 755 "{}" \;
@@ -177,6 +178,7 @@
 	gpatch  $(MYSQL_DIR_64)/innobase/include/univ.i -i patches/inline.patch
 	gpatch $(MYSQL_DIR_64)/scripts/mysql_config.sh -i patches/mysql_config.patch
 	gpatch $(MYSQL_DIR_64)/configure -i patches/configure.patch
+	gpatch $(MYSQL_DIR_64)/sql/sql_select.cc -i patches/xO4_optimization.patch
 	(cd $(MYSQL_DIR_64)/support-files; gpatch -p0 < ../../patches/federated_cnf.patch)
 	touch $(MYSQL_DIR_64)/configure
 	find $(MYSQL_DIR_64) -type d -exec /usr/bin/chmod 755 "{}" \;
--- a/usr/src/cmd/mysql-5-0/patches/configure.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mysql-5-0/patches/configure.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -1,25 +1,20 @@
-*** configure.orig	Fri Aug 28 10:16:59 2009
---- configure	Fri Aug 28 10:17:20 2009
-***************
-*** 43114,43133 ****
-  fi
-  
-  
-- case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu-$have_ndbcluster in
--   *solaris*-i?86-no-yes)
--   if $CC -xildon 2>&1 | grep "illegal option" >/dev/null
--   then
--     # This Solaris ld does not support -xildon
--     true
--   else
--     # ndb fail for whatever strange reason to link Sun Forte/x86
--     # unless using incremental linker
--     CXXFLAGS="$CXXFLAGS -xildon"
--   fi
--   ;;
--   *) ;;
-- esac
-  
-    if test X"$have_ndbcluster" = Xyes
-    then
---- 43114,43119 ----
+--- configure	2009-12-09 03:00:24.767750630 -0800
++++ configure.ORG	2009-12-09 02:59:44.987949318 -0800
+@@ -28449,6 +28449,8 @@
+ #if defined(__HP_cc) || defined (__HP_aCC) || defined (__hpux)
+ #pragma noinline
+ #endif
++int find_stack_direction (void);
++#pragma no_inline (find_stack_direction)
+  int find_stack_direction ()
+  {
+    static char *addr = 0;
+@@ -30507,6 +30509,8 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++int find_stack_direction (void);
++#pragma no_inline (find_stack_direction)
+ int
+ find_stack_direction ()
+ {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mysql-5-0/patches/xO4_optimization.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -0,0 +1,10 @@
+--- sql/sql_select.cc	2009-09-09 12:04:57.000000000 -0700
++++ sql/sql_select.cc.studio	2009-12-04 01:38:49.348664135 -0800
+@@ -73,6 +73,7 @@
+ 		      double record_count,double read_time);
+ static uint cache_record_length(JOIN *join,uint index);
+ static double prev_record_reads(JOIN *join,table_map found_ref);
++#pragma opt 2 (prev_record_reads)
+ static bool get_best_combination(JOIN *join);
+ static store_key *get_store_key(THD *thd,
+ 				KEYUSE *keyuse, table_map used_tables,
--- a/usr/src/cmd/mysql-5-1/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mysql-5-1/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmysql51r SUNWmysql51u SUNWmysql51lib SUNWmysql51test
 PROJECT_URL:      http://www.mysql.org/
 SOURCE_DOWNLOAD:  http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-5.1.30-dtrace.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/database/mysql
 OSR:              9502
 COMMENTS:         
--- a/usr/src/cmd/mysql/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/mysql/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmysqlr SUNWmysqlt SUNWmysqlu
 PROJECT_URL:      http://www.mysql.com/
 SOURCE_DOWNLOAD:  http://dev.mysql.com/get/Downloads/mysql-4.0.24.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/database/mysql
 OSR:              2234
 COMMENTS:         
--- a/usr/src/cmd/nano/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/nano/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-nano
 PROJECT_URL:      http://www.nano-editor.org/
 SOURCE_DOWNLOAD:  http://www.nano-editor.org/dist/v2.0/nano-2.0.9.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/nano
 OSR:              10923
 COMMENTS:         
--- a/usr/src/cmd/ncftp/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ncftp/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWncft
 PROJECT_URL:      http://www.ncftp.com/ncftp
 SOURCE_DOWNLOAD:  ftp://ftp.ncftp.com/ncftp/ncftp-3.2.2-src.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/ncftp-client
 OSR:              1443
 COMMENTS:         
--- a/usr/src/cmd/net-snmp/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/net-snmp/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -4,7 +4,7 @@
 LICENSE:         BSD
 PACKAGE:         SUNWnet-snmp-core SUNWnet-snmp-mgr SUNWnet-snmp-utils SUNWnet-snmp-addons SUNWnet-snmp-doc
 PROJECT_URL:     http://www.net-snmp.org
-SUPPORT:         Community
+SUPPORT:         B
 SOURCE_DOWNLOAD: http://ftp.ntua.gr/mirror/net-snmp/net-snmp-5.4.1.tar.gz
 OSR:             10793
 BUGTRAQ:         solaris/net-snmp/agent solaris/net-snmp/apps solaris/net-snmp/configure solaris/net-snmp/doc solaris/net-snmp/install solaris/net-snmp/library solaris/net-snmp/man-pages solaris/net-snmp/sdk-apps solaris/net-snmp/sdk-docs solaris/net-snmp/sdk-exampleapp solaris/net-snmp/security
--- a/usr/src/cmd/nethack/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/nethack/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWnethack SUNWnethackr
 PROJECT_URL:      http://www.nethack.org/
 SOURCE_DOWNLOAD:  http://softlayer.dl.sourceforge.net/sourceforge/nethack/nethack-343-src.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/nethack
 OSR:              8406
 COMMENTS:         
--- a/usr/src/cmd/nmap/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/nmap/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWnmap
 PROJECT_URL:      http://insecure.org/
 SOURCE_DOWNLOAD:  http://nmap.org/dist/nmap-4.75.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/network/nmap
 OSR:              5863
 COMMENTS:         
--- a/usr/src/cmd/ntpd/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ntpd/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:	BSD-LIKE
 PROJECT_URL:	http://www.ntp.org/
 SOURCE_DOWNLOAD:	http://archive.ntp.org/ntp4/ntp-dev/ntp-dev-4.2.5p172.tar.gz
-SUPPORT:	Full
+SUPPORT:	B
 BUGTRAQ:	solaris/network/ntp
 OSR:		6466
 COMMENTS:	
--- a/usr/src/cmd/ocaml/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ocaml/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWocaml
 PROJECT_URL:      http://caml.inria.fr/ocaml/
 SOURCE_DOWNLOAD:  http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.10.2.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/ocaml
 OSR:              9141
 COMMENTS:         
--- a/usr/src/cmd/openldap/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/openldap/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWopenldapr SUNWopenldapu
 PROJECT_URL:      http://www.openldap.org/
 SOURCE_DOWNLOAD:  ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.11.tgz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/ldap/openldap
 OSR:              9145
 COMMENTS:         
--- a/usr/src/cmd/openwsman/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/openwsman/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWopenwsmanu SUNWopenwsmanr
 PROJECT_URL:      http://www.openwsman.org/project/openwsman
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/openwsman/openwsman-2.1.0.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/wbem/openwsman
 OSR:              10608
 COMMENTS:         
--- a/usr/src/cmd/p7zip/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/p7zip/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWp7zip
 PROJECT_URL:      http://p7zip.sourceforge.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/p7zip/p7zip_4.55_src_all.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/p7zip
 OSR:              7163
 COMMENTS:         
--- a/usr/src/cmd/patchutils/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/patchutils/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpatchutils
 PROJECT_URL:      http://cyberelk.net/tim/patchutils
 SOURCE_DOWNLOAD:  http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.0.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/patchutils
 OSR:              10611
 COMMENTS:         
--- a/usr/src/cmd/pconsole/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pconsole/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpconsole
 PROJECT_URL:      http://www.ka.sara.nl/home/walter/pconsole/
 SOURCE_DOWNLOAD:  http://www.ka.sara.nl/home/walter/pconsole/pconsole-1.0.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/pconsole
 OSR:              9761
 COMMENTS:         
--- a/usr/src/cmd/pdsh/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pdsh/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWpdsh
 PROJECT_URL:	  http://sourceforge.net/projects/pdsh/
 SOURCE_DOWNLOAD:  http://nchc.dl.sourceforge.net/sourceforge/pdsh/pdsh-2.18.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/pdsh
 OSR:		  11533
 COMMENTS:	
--- a/usr/src/cmd/pen/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pen/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpen SUNWpenr
 PROJECT_URL:      http://siag.nu/pen/
 SOURCE_DOWNLOAD:  ftp://siag.nu/pub/pen/pen-0.18.0.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/network/pen
 OSR:              8543
 COMMENTS:         
--- a/usr/src/cmd/perl-pmtools/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/perl-pmtools/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWperl-pmtools
 PROJECT_URL:      http://search.cpan.org/dist/pmtools/
 SOURCE_DOWNLOAD:  http://search.cpan.org/CPAN/authors/id/M/ML/MLFISHER/pmtools-1.10.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/perl-pmtools
 OSR:              10512
 COMMENTS:
--- a/usr/src/cmd/perl510/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/perl510/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWperl510core SUNWperl510usr
 PROJECT_URL:      http://perl.com
 SOURCE_DOWNLOAD:  http://www.perl.com/CPAN/src/perl-5.10.0.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/perl
 OSR:              11317
 COMMENTS:
--- a/usr/src/cmd/php5/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/php5/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,14 +1,15 @@
 NAME:             php
-VERSION:          5.2.11
+VERSION:          5.2.12
 DESCRIPTION:      PHP Web scripting language
 LICENSE:          PHP
 PACKAGE:          SUNWphp52u SUNWphp52r SUNWphp52d SUNWphp52u-pear SUNWphp52r-pear SUNWphp52u-mysql SUNWphp52r-mysql SUNWphp52u-pgsql SUNWphp52r-pgsql SUNWapch22m-php52 SUNWapch22r-php52 SUNWphp52u-apc SUNWphp52r-apc SUNWphp52u-idn SUNWphp52r-idn SUNWphp52u-memcache SUNWphp52r-memcache SUNWphp52u-tcpwrap SUNWphp52r-tcpwrap SUNWphp52u-suhosin SUNWphp52r-suhosin SUNWphp52u-xdebug SUNWphp52r-xdebug
 PROJECT_URL:      http://www.php.net/
-SOURCE_DOWNLOAD:  http://www.php.net/get/php-5.2.11.tar.bz2
-SUPPORT:          Community
+SOURCE_DOWNLOAD:  ftp://tarballs.opensolaris.org/pub/php-5.2.12.tar.bz2
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/php
 OSR:              7242
 COMMENTS:         
+	download="http://us.php.net/get/php-5.2.12.tar.bz2/from/this/mirror"
 	LSARC: 2008/538 2009/124
 	MODIFICATIONS:
         Patch to build with apache 2.2 bundled within SFW
--- a/usr/src/cmd/php5/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/php5/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)Makefile.sfw	1.34	09/11/25 SMI"
+#pragma ident	"@(#)Makefile.sfw	1.37	09/12/23 SMI"
 
 PHP_REL=5.2
 #
@@ -306,7 +306,7 @@
 		--with-snmp=shared,$(ROOT)/usr \
 		--with-sqlite=shared \
 		--with-tidy=shared,$(ROOT)/usr \
-		--with-zlib=shared \
+		--with-zlib \
 		--without-tsrm-pthreads )
 
 	# Configuring fast/cgi source tree
@@ -332,7 +332,8 @@
 		gpatch -p1 -i ../patches/php_dl.c.patch && \
 		gpatch -p1 -i ../patches/php_6818228.patch && \
 		gpatch -p1 -i ../patches/php_6825797.patch && \
-		gpatch -p1 -i ../patches/php_perf_avoid_setitimer.patch && \
+		gpatch -p1 -i ../patches/php_6912354.patch && \
+		gpatch -p1 -i ../patches/php_perf_zend_execute_inline.patch && \
 		gpatch -p1 -i ../patches/php_perf_safe_address.patch && \
 		gpatch -p1 -i ../patches/php_run-tests.php.patch)
 	(cd $(PHP_DIR); env - $(PRECONF_ENVLINE) \
--- a/usr/src/cmd/php5/Solaris/php5.2.conf	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/php5/Solaris/php5.2.conf	Sat Jan 16 18:11:20 2010 +0200
@@ -18,10 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)php5.2.conf	1.3	08/10/10 SMI"
+#pragma ident	"@(#)php5.2.conf	1.4	09/12/23 SMI"
 
 # 
 # Cause PHP5 to work with Apache pre-fork MPM(32-bit) only.
@@ -51,3 +51,32 @@
 DirectoryIndex index.php
 DirectoryIndex index.php5
 </IfModule>
+
+<IfModule !mod_php5.c>
+<IfModule mod_fcgid.c>
+#
+# Cause the PHP interpreter to be invoked via FastCGI to handle files 
+# with a .php extension.
+#
+FcgidWrapper "/usr/php/5.2/bin/php-cgi" .php
+FcgidWrapper "/usr/php/5.2/bin/php-cgi" .php5
+
+FcgidCmdOptions /usr/php/5.2/bin/php-cgi \
+  InitialEnv PHP_FCGI_MAX_REQUESTS=10000 \
+  InitialEnv PHP_FCGI_CHILDREN=0 \
+  MaxRequestsPerProcess 10000
+
+# Match .php or .php5 files and enable execution via mod_fcgid
+<FilesMatch "\.php5?$">
+  SetHandler fcgid-script
+  Options +ExecCGI
+</FilesMatch>
+
+#
+# Add index.php to the list of files that will be served as directory
+# indexes.
+#
+DirectoryIndex index.php
+DirectoryIndex index.php5
+</IfModule>
+</IfModule>
--- a/usr/src/cmd/php5/config/extensions/memcache.ini	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/php5/config/extensions/memcache.ini	Sat Jan 16 18:11:20 2010 +0200
@@ -19,7 +19,7 @@
 ;
 ; CDDL HEADER END
 ;
-; Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+; Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 ; Use is subject to license terms.
 ;
 extension=memcache.so
@@ -28,7 +28,10 @@
 ;http://www.php.net/manual/en/memcache.ini.php
 
 ;Use memcache as a session handler by setting this value to memcache. 
-session.save_handler="memcache"
+;session.save_handler="memcache"
+
+;Use a comma separated list of server urls to use for storage:
+;session.save_path="udp://127.0.0.1:11211
 
 ;Controls which strategy to use when mapping keys to servers.
-memcache.hash_strategy="consistent"
+;memcache.hash_strategy="consistent"
--- a/usr/src/cmd/php5/patches/php_6818228.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/php5/patches/php_6818228.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -6,8 +6,8 @@
  
 -ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
 -                                      z_off_t offset, int whence));
-+ZEXTERN uLong ZEXPORT      gzseek OF((gzFile file,
-+                                      uLong offset, int whence));
++ZEXTERN int ZEXPORT      gzseek OF((gzFile file,
++                                      int offset, int whence));
  /*
        Sets the starting position for the next gzread or gzwrite on the
     given compressed file. The offset represents a number of bytes in the
@@ -16,7 +16,7 @@
  */
  
 -ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-+ZEXTERN uLong   ZEXPORT    gztell OF((gzFile file));
++ZEXTERN int ZEXPORT    gztell OF((gzFile file));
  /*
       Returns the starting position for the next gzread or gzwrite on the
     given compressed file. This position represents a number of bytes in the
@@ -25,7 +25,7 @@
  
  ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
 -                                          z_off_t len2));
-+                                          uLong len2));
++                                          int len2));
  /*
       Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
     and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
@@ -34,7 +34,7 @@
  */
  
 -ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-+ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, uLong len2));
++ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, int len2));
  
  /*
       Combine two CRC-32 check values into one.  For two sequences of bytes,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/php5/patches/php_6912354.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -0,0 +1,18 @@
+--- php-5.2.12/ext/ldap/ldap.c	2009-11-18 09:44:58.000000000 -0800
++++ php-5.2.12/ext/ldap/ldap.c	2009-12-21 11:13:14.000000000 -0800
+@@ -2009,6 +2009,7 @@
+ 		resultentry->id = Z_LVAL_PP(result);
+ 		zend_list_addref(resultentry->id);
+ 		resultentry->data = entry;
++		resultentry->ber = NULL;
+ 	}
+ }
+ /* }}} */
+@@ -2037,6 +2038,7 @@
+ 		resultentry_next->id = resultentry->id;
+ 		zend_list_addref(resultentry->id);
+ 		resultentry_next->data = entry_next;
++		resultentry_next->ber = NULL;
+ 	}
+ }
+ /* }}} */
--- a/usr/src/cmd/php5/patches/php_dtrace.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/php5/patches/php_dtrace.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -1,23 +1,141 @@
-diff -r 1f29d41a2d10 Zend/zend.c
---- a/Zend/zend.c	Wed Feb 25 07:34:36 2009 +0100
-+++ b/Zend/zend.c	Fri Mar 13 18:56:29 2009 +0100
-@@ -28,6 +28,7 @@
- #include "zend_exceptions.h"
- #include "zend_builtin_functions.h"
- #include "zend_ini.h"
-+#include "zend_dtrace.h"
- 
- #ifdef ZTS
- #   define GLOBAL_FUNCTION_TABLE    global_function_table
-@@ -562,6 +563,69 @@
- 
- void zend_init_opcodes_handlers(void);
- 
-+#if _DTRACE_VERSION && HAVE_SYS_SDT_H
+Index: php-5.2.12/Zend/zend_dtrace.d
+===================================================================
+--- php-5.2.12.orig/Zend/zend_dtrace.d		Thu Dec 17 18:45:36 2009
++++ php-5.2.12/Zend/zend_dtrace.d	Thu Dec 17 18:48:23 2009
+@@ -0,0 +1,39 @@
++/*
++   +----------------------------------------------------------------------+
++   | Zend Engine                                                          |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 2.00 of the Zend license,     |
++   | that is bundled with this package in the file LICENSE, and is        |
++   | available through the world-wide-web at the following url:           |
++   | http://www.zend.com/license/2_00.txt.                                |
++   | If you did not receive a copy of the Zend license and are unable to  |
++   | obtain it through the world-wide-web, please send a note to          |
++   | [email protected] so we can mail you a copy immediately.              |
++   +----------------------------------------------------------------------+
++   | Authors: David Soria Parra <[email protected]>                |
++   +----------------------------------------------------------------------+
++*/
++
++/* $Id: $ */
++
++provider php {
++	probe exception__caught(char *classname);
++	probe exception__thrown(char* classname);
++	probe request__startup(char* request_file, char* request_uri, char* request_method);
++	probe request__shutdown(char* request_file, char* request_uri, char* request_method);
++	probe compile__file__entry(char * compile_file, char *compile_file_translated);
++	probe compile__file__return(char *compile_file, char *compile_file_translated);
++	probe error(char *errormsg, char *request_file, int lineno);
++	probe execute__entry(char* request_file, int lineno);
++	probe execute__return(char* request_file, int lineno);
++	probe function__entry(char* function_name, char* request_file, int lineno, char* classname, char* scope);
++	probe function__return(char* function_name, char* request_file, int lineno, char* classname, char* scope);
++ 	probe object__create(char *classname, char* request_file, int lineno);
++ 	probe object__destroy(char *classname, char* request_file, int lineno);
++};
++
++/*#pragma D attributes Private/Private/Unknown provider php module
++#pragma D attributes Private/Private/Unknown provider php function
++#pragma D attributes Evolving/Evolving/Common provider php provider */
+Index: php-5.2.12/Zend/zend_dtrace.h
+===================================================================
+--- php-5.2.12.orig/Zend/zend_dtrace.h		Thu Dec 17 18:45:36 2009
++++ php-5.2.12/Zend/zend_dtrace.h	Thu Dec 17 18:48:23 2009
+@@ -0,0 +1,49 @@
++/*
++   +----------------------------------------------------------------------+
++   | Zend Engine                                                          |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 2.00 of the Zend license,     |
++   | that is bundled with this package in the file LICENSE, and is        |
++   | available through the world-wide-web at the following url:           |
++   | http://www.zend.com/license/2_00.txt.                                |
++   | If you did not receive a copy of the Zend license and are unable to  |
++   | obtain it through the world-wide-web, please send a note to          |
++   | [email protected] so we can mail you a copy immediately.              |
++   +----------------------------------------------------------------------+
++   | Authors: David Soria Parra <[email protected]>                |
++   +----------------------------------------------------------------------+
++*/
++
++/* $Id: $ */
++
++#ifndef	_ZEND_DTRACE_H
++#define	_ZEND_DTRACE_H
++
++#ifndef ZEND_WIN32
++# include <unistd.h>
++#endif
++
++#ifdef	__cplusplus
++extern "C" {
++#endif
++
++#ifdef HAVE_DTRACE
 +ZEND_API zend_op_array *(*zend_dtrace_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
 +ZEND_API void (*zend_dtrace_execute)(zend_op_array *op_array TSRMLS_DC);
 +ZEND_API void (*zend_dtrace_execute_internal)(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
 +
++ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC);
++ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC);
++ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC);
++ZEND_API char *dtrace_get_executed_filename(TSRMLS_D);
++#include <zend_dtrace_gen.h>
++
++#endif /* HAVE_DTRACE */
++
++#ifdef	__cplusplus
++}
++#endif
++
++#endif	/* _ZEND_DTRACE_H */
+Index: php-5.2.12/Zend/zend_dtrace.c
+===================================================================
+--- php-5.2.12.orig/Zend/zend_dtrace.c		Thu Dec 17 18:45:36 2009
++++ php-5.2.12/Zend/zend_dtrace.c	Thu Dec 17 18:48:23 2009
+@@ -0,0 +1,107 @@
++/*
++   +----------------------------------------------------------------------+
++   | Zend Engine                                                          |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1998-2009 Zend Technologies Ltd. (http://www.zend.com) |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 2.00 of the Zend license,     |
++   | that is bundled with this package in the file LICENSE, and is        |
++   | available through the world-wide-web at the following url:           |
++   | http://www.zend.com/license/2_00.txt.                                |
++   | If you did not receive a copy of the Zend license and are unable to  |
++   | obtain it through the world-wide-web, please send a note to          |
++   | [email protected] so we can mail you a copy immediately.              |
++   +----------------------------------------------------------------------+
++   | Authors: David Soria Parra <[email protected]>                |
++   +----------------------------------------------------------------------+
++*/
++
++/* $Id: $ */
++
++#include "zend.h"
++#include "zend_API.h"
++#include "zend_dtrace.h"
++
++#ifdef HAVE_DTRACE
++/* PHP DTrace probes {{{ */
++ZEND_API char *dtrace_get_executed_filename(TSRMLS_D)
++{
++	if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
++		return EG(current_execute_data)->op_array->filename;
++	} else {
++		return zend_get_executed_filename(TSRMLS_C);
++	}
++}
++
 +ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
 +{
 +	zend_op_array *res;
@@ -28,33 +146,42 @@
 +	return res;
 +}
 +
++/* We wrap the execute function to have fire the execute-entry/return and function-entry/return probes */
 +ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)
 +{
 +	int lineno;
 +	char *scope, *filename, *funcname, *classname;
 +	scope = filename = funcname = classname = NULL;
++
++	/* we need filename and lineno for both execute and function probes */
 +	if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()) {
-+		filename = zend_get_executed_filename(TSRMLS_C);
++		filename = dtrace_get_executed_filename(TSRMLS_C);
 +		lineno = zend_get_executed_lineno(TSRMLS_C);
 +	}
++
 +	if (DTRACE_FUNCTION_ENTRY_ENABLED() || DTRACE_FUNCTION_RETURN_ENABLED()) {
++		filename = dtrace_get_executed_filename(TSRMLS_C);
 +		classname = get_active_class_name(&scope TSRMLS_CC);
 +		funcname = get_active_function_name(TSRMLS_C);
-+		filename = zend_get_executed_filename(TSRMLS_C);
 +		lineno = zend_get_executed_lineno(TSRMLS_C);
 +	}
-+	if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname) {
++
++	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
++		DTRACE_EXECUTE_ENTRY(filename, lineno);
++	}
++
++	if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname != NULL) {
 +		DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname, scope);
 +	}
-+    
-+	DTRACE_EXECUTE_ENTRY(filename, lineno);
 +
 +	execute(op_array TSRMLS_CC);
 +
-+	DTRACE_EXECUTE_RETURN(filename, lineno);
++	if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) {
++		DTRACE_FUNCTION_RETURN(funcname, filename, lineno, classname, scope);
++	}
 +
-+	if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname) {
-+		DTRACE_FUNCTION_RETURN(funcname, filename, lineno, classname, scope);
++	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
++		DTRACE_EXECUTE_RETURN(filename, lineno);
 +	}
 +}
 +
@@ -63,304 +190,28 @@
 +	int lineno;
 +	char *filename;
 +	if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()) {
-+		filename = zend_get_executed_filename(TSRMLS_C);
++		filename = dtrace_get_executed_filename(TSRMLS_C);
 +		lineno = zend_get_executed_lineno(TSRMLS_C);
 +	}
 +
-+	DTRACE_EXECUTE_ENTRY(filename, lineno);
++	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
++		DTRACE_EXECUTE_ENTRY(filename, lineno);
++	}
 +
-+	zend_dtrace_execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);
++	execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);
 +
-+	DTRACE_EXECUTE_RETURN(filename, lineno);
++	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
++		DTRACE_EXECUTE_RETURN(filename, lineno);
++	}
 +}
 +
-+#endif
-+
- int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions)
- {
- #ifdef ZTS
-@@ -603,9 +667,15 @@
- 	zend_vspprintf = utility_functions->vspprintf_function;
- 	zend_getenv = utility_functions->getenv_function;
- 
-+#if _DTRACE_VERSION && HAVE_SYS_SDT_H
-+	zend_compile_file = dtrace_compile_file;
-+	zend_execute = dtrace_execute;
-+#else
- 	zend_compile_file = compile_file;
--	zend_compile_string = compile_string;
- 	zend_execute = execute;
-+#endif /* _DTRACE_VERSION && HAVE_SYS_SDT_H */
-+
-+	zend_compile_string = compile_string;
- 	zend_execute_internal = NULL;
- 	zend_throw_exception_hook = NULL;
- 
-@@ -919,6 +989,7 @@
- 	zval *orig_user_error_handler;
- 	zend_bool in_compilation;
- 	zend_class_entry *saved_class_entry;
-+	char dtrace_error_buffer[1024];
- 	TSRMLS_FETCH();
- 
- 	/* Obtain relevant filename and lineno */
-@@ -961,6 +1032,12 @@
- 
- 	va_start(args, format);
- 
-+	if(DTRACE_ERROR_ENABLED()) {
-+		vsprintf(&dtrace_error_buffer, format, args);
-+	}
-+	DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
-+
-+
- 	/* if we don't have a user defined error handler */
- 	if (!EG(user_error_handler)
- 		|| !(EG(user_error_handler_error_reporting) & type)) {
-diff -r 1f29d41a2d10 Zend/zend_dtrace.d
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/Zend/zend_dtrace.d	Fri Mar 13 18:56:29 2009 +0100
-@@ -0,0 +1,17 @@
-+provider php {
-+	probe exception__catched(char *classname);
-+	probe exception__thrown(char* classname);
-+	probe request__startup(char* request_file, char* request_uri, char* request_method);
-+	probe request__shutdown(char* request_file, char* request_uri, char* request_method);
-+	probe compile__file__entry(char * compile_file, char *compile_file_translated);
-+	probe compile__file__return(char *compile_file, char *compile_file_translated);
-+	probe error(char *errormsg, char *request_file, int lineno);
-+	probe execute__entry(char* request_file, int lineno);
-+	probe execute__return(char* request_file, int lineno);
-+	probe function__entry(char* function_name, char* request_file, int lineno, char* classname, char* scope);
-+	probe function__return(char* function_name, char* request_file, int lineno, char* classname, char* scope);
-+};
-+
-+#pragma D attributes Evolving/Evolving/Common provider php provider
-+#pragma D attributes Private/Private/Unknown provider php module
-+#pragma D attributes Private/Private/Unknown provider php function
-diff -r 1f29d41a2d10 Zend/zend_dtrace.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/Zend/zend_dtrace.h	Fri Mar 13 18:56:29 2009 +0100
-@@ -0,0 +1,216 @@
-+/*
-+ * Generated by dtrace(1M).
-+ */
-+
-+#ifndef	_ZEND_DTRACE_H
-+#define	_ZEND_DTRACE_H
-+
-+#include <unistd.h>
-+
-+#ifdef	__cplusplus
-+extern "C" {
-+#endif
-+
-+#if _DTRACE_VERSION && HAVE_SYS_SDT_H
++/* }}} */
++#endif /* HAVE_DTRACE */
 +
-+#define DTRACE_COMPILE_FILE_ENTRY(arg0, arg1) \
-+	__dtrace_php___compile__file__entry(arg0, arg1)
-+#ifndef	__sparc
-+#define DTRACE_COMPILE_FILE_ENTRY_ENABLED() \
-+	__dtraceenabled_php___compile__file__entry()
-+#else
-+#define DTRACE_COMPILE_FILE_ENTRY_ENABLED() \
-+	__dtraceenabled_php___compile__file__entry(0)
-+#endif
-+#define DTRACE_COMPILE_FILE_RETURN(arg0, arg1) \
-+	__dtrace_php___compile__file__return(arg0, arg1)
-+#ifndef	__sparc
-+#define DTRACE_COMPILE_FILE_RETURN_ENABLED() \
-+	__dtraceenabled_php___compile__file__return()
-+#else
-+#define DTRACE_COMPILE_FILE_RETURN_ENABLED() \
-+	__dtraceenabled_php___compile__file__return(0)
-+#endif
-+#define DTRACE_ERROR(arg0, arg1, arg2) \
-+	__dtrace_php___error(arg0, arg1, arg2)
-+#ifndef	__sparc
-+#define DTRACE_ERROR_ENABLED() \
-+	__dtraceenabled_php___error()
-+#else
-+#define DTRACE_ERROR_ENABLED() \
-+	__dtraceenabled_php___error(0)
-+#endif
-+#define DTRACE_EXCEPTION_CATCHED(arg0) \
-+	__dtrace_php___exception__catched(arg0)
-+#ifndef	__sparc
-+#define DTRACE_EXCEPTION_CATCHED_ENABLED() \
-+	__dtraceenabled_php___exception__catched()
-+#else
-+#define DTRACE_EXCEPTION_CATCHED_ENABLED() \
-+	__dtraceenabled_php___exception__catched(0)
-+#endif
-+#define DTRACE_EXCEPTION_THROWN(arg0) \
-+	__dtrace_php___exception__thrown(arg0)
-+#ifndef	__sparc
-+#define DTRACE_EXCEPTION_THROWN_ENABLED() \
-+	__dtraceenabled_php___exception__thrown()
-+#else
-+#define DTRACE_EXCEPTION_THROWN_ENABLED() \
-+	__dtraceenabled_php___exception__thrown(0)
-+#endif
-+#define DTRACE_EXECUTE_ENTRY(arg0, arg1) \
-+	__dtrace_php___execute__entry(arg0, arg1)
-+#ifndef	__sparc
-+#define DTRACE_EXECUTE_ENTRY_ENABLED() \
-+	__dtraceenabled_php___execute__entry()
-+#else
-+#define DTRACE_EXECUTE_ENTRY_ENABLED() \
-+	__dtraceenabled_php___execute__entry(0)
-+#endif
-+#define DTRACE_EXECUTE_RETURN(arg0, arg1) \
-+	__dtrace_php___execute__return(arg0, arg1)
-+#ifndef	__sparc
-+#define DTRACE_EXECUTE_RETURN_ENABLED() \
-+	__dtraceenabled_php___execute__return()
-+#else
-+#define DTRACE_EXECUTE_RETURN_ENABLED() \
-+	__dtraceenabled_php___execute__return(0)
-+#endif
-+#define DTRACE_FUNCTION_ENTRY(arg0, arg1, arg2, arg3, arg4) \
-+	__dtrace_php___function__entry(arg0, arg1, arg2, arg3, arg4)
-+#ifndef	__sparc
-+#define DTRACE_FUNCTION_ENTRY_ENABLED() \
-+	__dtraceenabled_php___function__entry()
-+#else
-+#define DTRACE_FUNCTION_ENTRY_ENABLED() \
-+	__dtraceenabled_php___function__entry(0)
-+#endif
-+#define DTRACE_FUNCTION_RETURN(arg0, arg1, arg2, arg3, arg4) \
-+	__dtrace_php___function__return(arg0, arg1, arg2, arg3, arg4)
-+#ifndef	__sparc
-+#define DTRACE_FUNCTION_RETURN_ENABLED() \
-+	__dtraceenabled_php___function__return()
-+#else
-+#define DTRACE_FUNCTION_RETURN_ENABLED() \
-+	__dtraceenabled_php___function__return(0)
-+#endif
-+#define DTRACE_REQUEST_SHUTDOWN(arg0, arg1, arg2) \
-+	__dtrace_php___request__shutdown(arg0, arg1, arg2)
-+#ifndef	__sparc
-+#define DTRACE_REQUEST_SHUTDOWN_ENABLED() \
-+	__dtraceenabled_php___request__shutdown()
-+#else
-+#define DTRACE_REQUEST_SHUTDOWN_ENABLED() \
-+	__dtraceenabled_php___request__shutdown(0)
-+#endif
-+#define DTRACE_REQUEST_STARTUP(arg0, arg1, arg2) \
-+	__dtrace_php___request__startup(arg0, arg1, arg2)
-+#ifndef	__sparc
-+#define DTRACE_REQUEST_STARTUP_ENABLED() \
-+	__dtraceenabled_php___request__startup()
-+#else
-+#define DTRACE_REQUEST_STARTUP_ENABLED() \
-+	__dtraceenabled_php___request__startup(0)
-+#endif
-+
-+
-+extern void __dtrace_php___compile__file__entry(char *, char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___compile__file__entry(void);
-+#else
-+extern int __dtraceenabled_php___compile__file__entry(long);
-+#endif
-+extern void __dtrace_php___compile__file__return(char *, char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___compile__file__return(void);
-+#else
-+extern int __dtraceenabled_php___compile__file__return(long);
-+#endif
-+extern void __dtrace_php___error(char *, char *, int);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___error(void);
-+#else
-+extern int __dtraceenabled_php___error(long);
-+#endif
-+extern void __dtrace_php___exception__catched(char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___exception__catched(void);
-+#else
-+extern int __dtraceenabled_php___exception__catched(long);
-+#endif
-+extern void __dtrace_php___exception__thrown(char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___exception__thrown(void);
-+#else
-+extern int __dtraceenabled_php___exception__thrown(long);
-+#endif
-+extern void __dtrace_php___execute__entry(char *, int);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___execute__entry(void);
-+#else
-+extern int __dtraceenabled_php___execute__entry(long);
-+#endif
-+extern void __dtrace_php___execute__return(char *, int);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___execute__return(void);
-+#else
-+extern int __dtraceenabled_php___execute__return(long);
-+#endif
-+extern void __dtrace_php___function__entry(char *, char *, int, char *, char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___function__entry(void);
-+#else
-+extern int __dtraceenabled_php___function__entry(long);
-+#endif
-+extern void __dtrace_php___function__return(char *, char *, int, char *, char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___function__return(void);
-+#else
-+extern int __dtraceenabled_php___function__return(long);
-+#endif
-+extern void __dtrace_php___request__shutdown(char *, char *, char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___request__shutdown(void);
-+#else
-+extern int __dtraceenabled_php___request__shutdown(long);
-+#endif
-+extern void __dtrace_php___request__startup(char *, char *, char *);
-+#ifndef	__sparc
-+extern int __dtraceenabled_php___request__startup(void);
-+#else
-+extern int __dtraceenabled_php___request__startup(long);
-+#endif
-+
-+#else
-+
-+#define DTRACE_COMPILE_FILE_ENTRY(arg0, arg1)
-+#define DTRACE_COMPILE_FILE_ENTRY_ENABLED() (0)
-+#define DTRACE_COMPILE_FILE_RETURN(arg0, arg1)
-+#define DTRACE_COMPILE_FILE_RETURN_ENABLED() (0)
-+#define DTRACE_ERROR(arg0, arg1, arg2)
-+#define DTRACE_ERROR_ENABLED() (0)
-+#define DTRACE_EXCEPTION_CATCHED(arg0)
-+#define DTRACE_EXCEPTION_CATCHED_ENABLED() (0)
-+#define DTRACE_EXCEPTION_THROWN(arg0)
-+#define DTRACE_EXCEPTION_THROWN_ENABLED() (0)
-+#define DTRACE_EXECUTE_ENTRY(arg0, arg1)
-+#define DTRACE_EXECUTE_ENTRY_ENABLED() (0)
-+#define DTRACE_EXECUTE_RETURN(arg0, arg1)
-+#define DTRACE_EXECUTE_RETURN_ENABLED() (0)
-+#define DTRACE_FUNCTION_ENTRY(arg0, arg1, arg2, arg3, arg4)
-+#define DTRACE_FUNCTION_ENTRY_ENABLED() (0)
-+#define DTRACE_FUNCTION_RETURN(arg0, arg1, arg2, arg3, arg4)
-+#define DTRACE_FUNCTION_RETURN_ENABLED() (0)
-+#define DTRACE_REQUEST_SHUTDOWN(arg0, arg1, arg2)
-+#define DTRACE_REQUEST_SHUTDOWN_ENABLED() (0)
-+#define DTRACE_REQUEST_STARTUP(arg0, arg1, arg2)
-+#define DTRACE_REQUEST_STARTUP_ENABLED() (0)
-+
-+#endif
-+
-+
-+#ifdef	__cplusplus
-+}
-+#endif
-+
-+#endif	/* _ZEND_DTRACE_H */
-diff -r 1f29d41a2d10 Zend/zend_dtrace_gen.php
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/Zend/zend_dtrace_gen.php	Fri Mar 13 18:56:29 2009 +0100
+Index: php-5.2.9/Zend/zend_dtrace_gen.php
+===================================================================
+--- php-5.2.9.orig/Zend/zend_dtrace_gen.php  Thu Apr 02 22:18:32 2009 +0200
++++ php-5.2.9/Zend/zend_dtrace_gen.php  Thu Apr 02 22:18:32 2009 +0200
 @@ -0,0 +1,32 @@
 +<?php
 +/*
@@ -388,15 +239,131 @@
 +
 +echo "renaming probe definitions\n";
 +$content = file_get_contents('zend_dtrace.h');
-+$content = str_replace('#define	PHP_', '#define DTRACE_', $content);
++$content = str_replace('#define        PHP_', '#define DTRACE_', $content);
 +$content = str_replace('PHP_STABILITY', 'DTRACE_STABILITY', $content);
 +$content = str_replace('PHP_TYPEDEFS', 'DTRACE_TYPEDEFS', $content);
 +$content = str_replace('#if _DTRACE_VERSION', '#if _DTRACE_VERSION && HAVE_SYS_SDT_H', $content);
 +file_put_contents('zend_dtrace.h', $content);
 +
-diff -r 1f29d41a2d10 Zend/zend_exceptions.c
---- a/Zend/zend_exceptions.c	Wed Feb 25 07:34:36 2009 +0100
-+++ b/Zend/zend_exceptions.c	Fri Mar 13 18:56:29 2009 +0100
+Index: php-5.2.11/Zend/zend.c
+===================================================================
+--- php-5.2.11.orig/Zend/zend.c	2009-11-02 02:59:10.971196190 +0100
++++ php-5.2.11/Zend/zend.c	2009-11-02 02:59:56.087087949 +0100
+@@ -28,6 +28,7 @@
+ #include "zend_exceptions.h"
+ #include "zend_builtin_functions.h"
+ #include "zend_ini.h"
++#include "zend_dtrace.h"
+ 
+ #ifdef ZTS
+ #   define GLOBAL_FUNCTION_TABLE    global_function_table
+@@ -603,10 +604,17 @@
+ 	zend_vspprintf = utility_functions->vspprintf_function;
+ 	zend_getenv = utility_functions->getenv_function;
+ 
++#if HAVE_DTRACE
++/* build with dtrace support */
++	zend_compile_file = dtrace_compile_file;
++	zend_execute = dtrace_execute;
++	zend_execute_internal = dtrace_execute_internal;
++#else
+ 	zend_compile_file = compile_file;
+-	zend_compile_string = compile_string;
+ 	zend_execute = execute;
+ 	zend_execute_internal = NULL;
++#endif /* HAVE_SYS_SDT_H */
++	zend_compile_string = compile_string;
+ 	zend_throw_exception_hook = NULL;
+ 
+ 	zend_init_opcodes_handlers();
+@@ -961,6 +970,15 @@
+ 
+ 	va_start(args, format);
+ 
++#ifdef HAVE_DTRACE
++	if(DTRACE_ERROR_ENABLED()) {
++		char *dtrace_error_buffer;
++		zend_vspprintf(&dtrace_error_buffer, 0, format, args);
++		DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
++		efree(dtrace_error_buffer);
++	}
++#endif /* HAVE_DTRACE */
++
+ 	/* if we don't have a user defined error handler */
+ 	if (!EG(user_error_handler)
+ 		|| !(EG(user_error_handler_error_reporting) & type)) {
+Index: php-5.2.12/Zend/zend_API.c
+===================================================================
+--- php-5.2.12.orig/Zend/zend_API.c.NEW2	Sat Sep  5 12:01:06 2009
++++ php-5.2.12/Zend/zend_API.c	Thu Dec 17 18:48:23 2009
+@@ -25,11 +25,16 @@
+ #include "zend_API.h"
+ #include "zend_modules.h"
+ #include "zend_constants.h"
++#include "zend_dtrace.h"
+ 
+ #ifdef HAVE_STDARG_H
+ #include <stdarg.h>
+ #endif
+ 
++#ifdef HAVE_DTRACE
++extern char* dtrace_get_executed_filename(TSRMLS_D);
++#endif
++
+ /* these variables are true statics/globals, and have to be mutex'ed on every access */
+ static int module_count=0;
+ ZEND_API HashTable module_registry;
+@@ -942,6 +947,17 @@
+ 		zend_error(E_ERROR, "Cannot instantiate %s %s", what, class_type->name);
+ 	}
+ 
++#ifdef HAVE_DTRACE
++	if (DTRACE_OBJECT_CREATE_ENABLED()) {
++		char *filename;
++		int lineno;
++
++		filename = dtrace_get_executed_filename(TSRMLS_C);
++		lineno = zend_get_executed_lineno(TSRMLS_C);
++		DTRACE_OBJECT_CREATE(class_type->name, filename, lineno);
++	}
++#endif /* HAVE_DTRACE */
++
+ 	zend_update_class_constants(class_type TSRMLS_CC);
+ 
+ 	Z_TYPE_P(arg) = IS_OBJECT;
+Index: php-5.2.12/Zend/zend_objects.c
+===================================================================
+--- php-5.2.12.orig/Zend/zend_objects.c	Mon Oct 12 10:09:11 2009
++++ php-5.2.12/Zend/zend_objects.c	Thu Dec 17 18:48:23 2009
+@@ -25,6 +25,7 @@
+ #include "zend_API.h"
+ #include "zend_interfaces.h"
+ #include "zend_exceptions.h"
++#include "zend_dtrace.h"
+ 
+ ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC)
+ {
+@@ -51,6 +52,16 @@
+ {
+ 	zend_function *destructor = object ? object->ce->destructor : NULL;
+ 
++#ifdef HAVE_DTRACE
++	if (DTRACE_OBJECT_DESTROY_ENABLED()) {
++		char *filename;
++		int lineno;
++
++		filename = dtrace_get_executed_filename(TSRMLS_C);
++		lineno = zend_get_executed_lineno(TSRMLS_C);
++		DTRACE_OBJECT_DESTROY(object->ce->name, filename, lineno);
++	}
++#endif /* HAVE_DTRACE */
+ 	if (destructor) {
+ 		zval *obj;
+ 		zval *old_exception;
+Index: php-5.2.11/Zend/zend_exceptions.c
+===================================================================
+--- php-5.2.11.orig/Zend/zend_exceptions.c	2009-11-02 02:59:10.970676604 +0100
++++ php-5.2.11/Zend/zend_exceptions.c	2009-11-02 02:59:56.084156777 +0100
 @@ -26,6 +26,7 @@
  #include "zend_builtin_functions.h"
  #include "zend_interfaces.h"
@@ -405,23 +372,26 @@
  
  zend_class_entry *default_exception_ce;
  zend_class_entry *error_exception_ce;
-@@ -34,6 +35,13 @@
+@@ -34,6 +35,15 @@
  
  void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
  {
-+	char *classname;
++#ifdef HAVE_DTRACE
 +	if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
++		char *classname;
 +		int name_len;
-+		zend_get_object_classname(exception, &classname, &name_len);
++		zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
++		DTRACE_EXCEPTION_THROWN(classname);
 +	}
-+	DTRACE_EXCEPTION_THROWN(classname);
++#endif /* HAVE_DTRACE */
 +
  	if (exception != NULL) {
  		if (EG(exception)) {
  			/* FIXME:  bail out? */
-diff -r 1f29d41a2d10 Zend/zend_execute.c
---- a/Zend/zend_execute.c	Wed Feb 25 07:34:36 2009 +0100
-+++ b/Zend/zend_execute.c	Fri Mar 13 18:56:29 2009 +0100
+Index: php-5.2.11/Zend/zend_execute.c
+===================================================================
+--- php-5.2.11.orig/Zend/zend_execute.c	2009-11-02 02:59:10.971029046 +0100
++++ php-5.2.11/Zend/zend_execute.c	2009-11-02 02:59:56.084688879 +0100
 @@ -35,6 +35,7 @@
  #include "zend_exceptions.h"
  #include "zend_interfaces.h"
@@ -430,36 +400,91 @@
  
  /* Virtual current working directory support */
  #include "tsrm_virtual_cwd.h"
-diff -r 1f29d41a2d10 Zend/zend_vm_def.h
---- a/Zend/zend_vm_def.h	Wed Feb 25 07:34:36 2009 +0100
-+++ b/Zend/zend_vm_def.h	Fri Mar 13 18:56:29 2009 +0100
-@@ -2227,6 +2227,9 @@
+Index: php-5.2.11/Zend/zend_vm_def.h
+===================================================================
+--- php-5.2.11.orig/Zend/zend_vm_def.h	2009-11-02 02:59:10.970584885 +0100
++++ php-5.2.11/Zend/zend_vm_def.h	2009-11-02 02:59:56.085971641 +0100
+@@ -2243,6 +2243,11 @@
  		ZEND_VM_CONTINUE(); /* CHECK_ME */
  	}
  	ce = Z_OBJCE_P(EG(exception));
 +
-+	DTRACE_EXCEPTION_CATCHED(ce->name);
++#ifdef HAVE_DTRACE
++	DTRACE_EXCEPTION_CAUGHT(ce->name);
++#endif /* HAVE_DTRACE */
++
+ 	if (ce != EX_T(opline->op1.u.var).class_entry) {
+ 		if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
+ 			if (opline->op1.u.EA.type) {
+Index: php-5.2.11/Zend/zend_vm_execute.h
+===================================================================
+--- php-5.2.11.orig/Zend/zend_vm_execute.h	2009-11-02 02:59:10.970794327 +0100
++++ php-5.2.11/Zend/zend_vm_execute.h	2009-11-02 02:59:56.095206861 +0100
+@@ -333,6 +333,11 @@
+ 		ZEND_VM_CONTINUE(); /* CHECK_ME */
+ 	}
+ 	ce = Z_OBJCE_P(EG(exception));
++
++#ifdef HAVE_DTRACE
++	DTRACE_EXCEPTION_CAUGHT(ce->name);
++#endif /* HAVE_DTRACE */
 +
  	if (ce != EX_T(opline->op1.u.var).class_entry) {
  		if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
  			if (opline->op1.u.EA.type) {
-diff -r 1f29d41a2d10 Zend/zend_vm_execute.h
---- a/Zend/zend_vm_execute.h	Wed Feb 25 07:34:36 2009 +0100
-+++ b/Zend/zend_vm_execute.h	Fri Mar 13 18:56:29 2009 +0100
-@@ -333,6 +333,9 @@
- 		ZEND_VM_CONTINUE(); /* CHECK_ME */
- 	}
- 	ce = Z_OBJCE_P(EG(exception));
+Index: php-5.2.11/main/main.c
+===================================================================
+--- php-5.2.11.orig/main/main.c	2009-11-02 02:59:10.970427110 +0100
++++ php-5.2.11/main/main.c	2009-11-02 02:59:56.083717631 +0100
+@@ -81,6 +81,7 @@
+ #include "zend_indent.h"
+ #include "zend_extensions.h"
+ #include "zend_ini.h"
++#include "zend_dtrace.h"
+ 
+ #include "php_content_types.h"
+ #include "php_ticks.h"
+@@ -1260,6 +1261,10 @@
+ {
+ 	int retval = SUCCESS;
+ 
++#ifdef HAVE_DTRACE
++	DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
++#endif /* HAVE_DTRACE */
 +
-+	DTRACE_EXCEPTION_CATCHED(ce->name);
+ #ifdef PHP_WIN32
+ 	PG(com_initialized) = 0;
+ #endif
+@@ -1534,6 +1539,10 @@
+ 		PG(com_initialized) = 0;
+ 	}
+ #endif
 +
- 	if (ce != EX_T(opline->op1.u.var).class_entry) {
- 		if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) {
- 			if (opline->op1.u.EA.type) {
-diff -r 1f29d41a2d10 acinclude.m4
---- a/acinclude.m4	Wed Feb 25 07:34:36 2009 +0100
-+++ b/acinclude.m4	Fri Mar 13 18:56:29 2009 +0100
-@@ -2854,3 +2854,48 @@
++#ifdef HAVE_DTRACE
++	DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
++#endif /* HAVE_DTRACE */
+ }
+ /* }}} */
+ 
+Index: php-5.2.11/main/php_config.h.in
+===================================================================
+--- php-5.2.11.orig/main/php_config.h.in	2009-11-02 02:59:10.000000000 +0100
++++ php-5.2.11/main/php_config.h.in	2009-11-02 03:00:26.911891334 +0100
+@@ -731,6 +731,9 @@
+ /* Define if you have the <sys/resource.h> header file.  */
+ #undef HAVE_SYS_RESOURCE_H
+ 
++/* Define to 1 if you have the <sys/sdt.h> header file. */
++#undef HAVE_SYS_SDT_H
++
+ /* Define if you have the <sys/select.h> header file.  */
+ #undef HAVE_SYS_SELECT_H
+ 
+Index: php-5.2.12/acinclude.m4
+===================================================================
+--- php-5.2.12/acinclude.m4.ORIG	Sat Nov 28 22:13:22 2009
++++ php-5.2.12/acinclude.m4	Thu Dec 17 18:48:10 2009
+@@ -2874,3 +2874,56 @@
    fi
  ])
  
@@ -476,8 +501,7 @@
 +  for src in $PHP_DTRACE_OBJS; do
 +    case [$]build_target in
 +      *)
-+        obj="$obj `dirname $src`/.libs/`basename $src | sed 's,\.lo$,.o,'` "
-+      ;;
++        obj="$obj `dirname $src`/.libs/`basename $src | sed 's,\.lo$,.o,'` " ;;
 +    esac
 +  done
 +
@@ -494,9 +518,9 @@
 +dnl
 +AC_DEFUN([PHP_ADD_DTRACE],[
 +   case "$3" in
-+    ""[)] ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
-+    /*[)] ac_srcdir=`echo "$3"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
-+    *[)] extdir=PHP_EXT_DIR($3); ac_srcdir="$abs_srcdir/$extdir/"; ac_bdir="$extdir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
++    ""[)] unset ac_bdir;;
++    /*[)] ac_bdir=$ac_srcdir;;
++    *[)] extdir=PHP_EXT_DIR($3); ac_bdir="$extdir/";;
 +    esac
 +  old_IFS=[$]IFS
 +  for ac_src in $2; do
@@ -508,16 +532,27 @@
 +    PHP_DTRACE_OBJS="[$]PHP_DTRACE_OBJS [$]ac_bdir[$]ac_obj.lo"
 +  done;
 +])
-diff -r 1f29d41a2d10 configure.in
---- a/configure.in	Wed Feb 25 07:34:36 2009 +0100
-+++ b/configure.in	Fri Mar 13 18:56:29 2009 +0100
-@@ -872,6 +872,21 @@
++
++dnl
++dnl Generate platform specific dtrace header
++dnl
++AC_DEFUN([PHP_INIT_DTRACE], [
++  dtrace -h -C -s $1 -o $2
++  $SED -ibak 's,PHP_,DTRACE_,g' $2
++])
++
+
+Index: php-5.2.12/configure.in
+===================================================================
+--- php-5.2.12/configure.in.ORIG	Wed Dec 16 04:45:18 2009
++++ php-5.2.12/configure.in	Thu Dec 17 18:48:23 2009
+@@ -882,6 +882,23 @@
    AC_DEFINE(HAVE_IPV6, 1, [Whether to enable IPv6 support])
  fi
  
 +dnl ## DTRACE CHECHKS
 +dnl ## this needs to be done before SAPI configureation
-+PHP_ARG_ENABLE(dtrace, whether to compile with DTrace support,
++PHP_ARG_ENABLE(dtrace, whether to enable DTrace support,
 +[  --enable-dtrace         Enable DTrace support], no, no)
 +
 +dnl ## DTRACE CHECHKS
@@ -525,15 +560,17 @@
 +if test "$PHP_DTRACE" = "yes"; then
 +  AC_CHECK_HEADERS([sys/sdt.h],
 +    [PHP_ADD_DTRACE([Zend/zend_dtrace.d], [main/main.c, Zend/zend_API.c \
-+       Zend/zend_execute.c Zend/zend_exceptions.c \
-+       Zend/zend.c])],
++       Zend/zend_execute.c Zend/zend_exceptions.c Zend/zend_objects.c \
++       Zend/zend_dtrace.c Zend/zend.c])
++     AC_DEFINE(HAVE_DTRACE, 1, [Whether to enable DTrace support])
++     PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h])],
 +    [])
 +fi
 +
  AC_MSG_CHECKING([how big to make fd sets])
  PHP_ARG_ENABLE(fd-setsize,,
  [  --enable-fd-setsize     Set size of descriptor sets], no, no)
-@@ -1198,6 +1213,7 @@
+@@ -1213,6 +1230,7 @@
  PHP_SUBST(PHP_CLI_TARGET)
  PHP_SUBST(PHP_SAPI_OBJS)
  PHP_SUBST(PHP_CLI_OBJS)
@@ -541,7 +578,16 @@
  PHP_SUBST(PHP_GLOBAL_OBJS)
  
  PHP_SUBST(PHP_MODULES)
-@@ -1419,6 +1435,13 @@
+@@ -1402,7 +1420,7 @@
+ PHP_ADD_SOURCES(Zend, \
+     zend_language_parser.c zend_language_scanner.c \
+     zend_ini_parser.c zend_ini_scanner.c \
+-    zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c \
++    zend_alloc.c zend_compile.c zend_constants.c zend_dynamic_array.c zend_dtrace.c \
+     zend_execute_API.c zend_highlight.c zend_llist.c \
+     zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
+@@ -1434,6 +1452,13 @@
  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
  PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend)
  
@@ -554,33 +600,3 @@
 +
  PHP_GEN_BUILD_DIRS
  PHP_GEN_GLOBAL_MAKEFILE
- 
-diff -r 1f29d41a2d10 main/main.c
---- a/main/main.c	Wed Feb 25 07:34:36 2009 +0100
-+++ b/main/main.c	Fri Mar 13 18:56:29 2009 +0100
-@@ -80,6 +80,7 @@
- #include "zend_indent.h"
- #include "zend_extensions.h"
- #include "zend_ini.h"
-+#include "zend_dtrace.h"
- 
- #include "php_content_types.h"
- #include "php_ticks.h"
-@@ -1249,6 +1250,8 @@
- {
- 	int retval = SUCCESS;
- 
-+    DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
-+
- #ifdef PHP_WIN32
- 	PG(com_initialized) = 0;
- #endif
-@@ -1522,6 +1525,8 @@
- 		PG(com_initialized) = 0;
- 	}
- #endif
-+
-+    DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
- }
- /* }}} */
- 
--- a/usr/src/cmd/php5/patches/php_perf_avoid_setitimer.patch	Sun Dec 20 15:22:13 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-Index: php-5.2.11/Zend/zend_execute_API.c
-===================================================================
---- php-5.2.11/Zend/zend_execute_API.c	(revision 290230)
-+++ php-5.2.11/Zend/zend_execute_API.c	(revision 290231)
-@@ -1511,7 +1511,7 @@
- 	}
- #else
- #	ifdef HAVE_SETITIMER
--	{
-+	if (EG(timeout_seconds)) {
- 		struct itimerval no_timeout;
- 
- 		no_timeout.it_value.tv_sec = no_timeout.it_value.tv_usec = no_timeout.it_interval.tv_sec = no_timeout.it_interval.tv_usec = 0;
-Index: php-5.2.11/main/main.c
-===================================================================
---- php-5.2.11/main/main.c	(revision 290235)
-+++ php-5.2.11/main/main.c	(revision 290236)
-@@ -205,12 +205,13 @@
-  */
- static PHP_INI_MH(OnUpdateTimeout)
- {
--	EG(timeout_seconds) = atoi(new_value);
- 	if (stage==PHP_INI_STAGE_STARTUP) {
- 		/* Don't set a timeout on startup, only per-request */
-+		EG(timeout_seconds) = atoi(new_value);
- 		return SUCCESS;
- 	}
- 	zend_unset_timeout(TSRMLS_C);
-+	EG(timeout_seconds) = atoi(new_value);
- 	zend_set_timeout(EG(timeout_seconds));
- 	return SUCCESS;
- }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/php5/patches/php_perf_zend_execute_inline.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -0,0 +1,15 @@
+--- php-5.2.11/configure.in.ORIG	Sun Nov  8 12:48:27 2009
++++ php-5.2.11/configure.in	Sun Nov  8 12:47:48 2009
+@@ -1435,7 +1435,11 @@
+ if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
+   flag=-O0
+ else
+-  flag=
++    if test "$SUNCC" = "yes"; then
++      flag=-W2,-Ainline:inc=100
++    else
++      flag=
++    fi
+ fi
+ 
+ PHP_ADD_SOURCES_X(Zend, zend_execute.c,,PHP_GLOBAL_OBJS,,$flag)
Binary file usr/src/cmd/php5/php-5.2.11.tar.bz2 has changed
Binary file usr/src/cmd/php5/php-5.2.12.tar.bz2 has changed
--- a/usr/src/cmd/pinentry/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pinentry/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	SUNWgnupg
 PROJECT_URL:	http://www.gnupg.org/related_software/pinentry/index.en.html
 SOURCE_DOWNLOAD: ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-0.7.6.tar.gz
-SUPPORT:	Community
+SUPPORT:	C
 BUGTRAQ:	solaris/solaris-crypto/gnupg
 OSR:		13036
 COMMENTS:	pinentry is a small collection of dialog programs that allow 
--- a/usr/src/cmd/postgres/libpgtcl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/libpgtcl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-tcl
 PROJECT_URL:      http://pgfoundry.org/projects/pgtcl/
 SOURCE_DOWNLOAD:  http://pgfoundry.org/frs/download.php/2151/libpgtcl-1.7.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              12907
 COMMENTS:         
--- a/usr/src/cmd/postgres/libpqxx/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/libpqxx/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-libpqxx
 PROJECT_URL:      http://pqxx.org/development/libpqxx/
 SOURCE_DOWNLOAD:  ftp://pqxx.org/software/libpqxx/libpqxx-3.0.2.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              12900
 COMMENTS:         
--- a/usr/src/cmd/postgres/pgadmin/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/pgadmin/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpgadmin3
 PROJECT_URL:      http://www.pgadmin.org
 SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/pgadmin3/release/v1.10.0/src/pgadmin3-1.10.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              11632
 COMMENTS:         
--- a/usr/src/cmd/postgres/pgagent/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/pgagent/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpgadmin3
 PROJECT_URL:      http://www.pgadmin.org
 SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/pgadmin3/release/pgagent/pgAgent-3.0.1-Source.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              12768
 COMMENTS:         This is part of pgadmin product. Now it is distributed in separate tarball.
--- a/usr/src/cmd/postgres/pgbouncer/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/pgbouncer/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpgbouncer-pg83-config SUNWpgbouncer-pg83-server
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  http://www.postgresql.org/pgbouncer-1.1.2.tgz
-SUPPORT:          Community
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7681
 COMMENTS:         
--- a/usr/src/cmd/postgres/pmdbdpg/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/pmdbdpg/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpmdbdpg
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  http://www.postgresql.org/DBD-Pg-1.49.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/database/postgres
 OSR:              7267
 COMMENTS:         
--- a/usr/src/cmd/postgres/postgresql-8.2-jdbc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.2-jdbc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-82-jdbc
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  http://www.postgresql.org/postgresql-jdbc-8.2-504.src.tar.gz
-SUPPORT:          Community
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7016
 COMMENTS:         
--- a/usr/src/cmd/postgres/postgresql-8.2-tcl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.2-tcl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-82-tcl
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  http://www.postgresql.org/pgtcl1.5.tar.gz
-SUPPORT:          Community
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7777
 COMMENTS:         
--- a/usr/src/cmd/postgres/postgresql-8.2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,11 @@
 NAME:             PostgreSQL
-VERSION:          8.2.14
+VERSION:          8.2.15
 DESCRIPTION:      PostgreSQL object-relational database system 
 LICENSE:          BSD
 PACKAGE:          SUNWpostgr-82-client SUNWpostgr-82-contrib SUNWpostgr-82-devel SUNWpostgr-82-docs SUNWpostgr-82-libs SUNWpostgr-82-pl SUNWpostgr-82-server SUNWpostgr-82-server-data-root
 PROJECT_URL:      http://www.postgresql.org/
-SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.2.14/postgresql-8.2.14.tar.gz
-SUPPORT:          Managed
+SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.2.15/postgresql-8.2.15.tar.gz
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              3442
 COMMENTS:         
--- a/usr/src/cmd/postgres/postgresql-8.2/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.2/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -23,29 +23,16 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile.sfw	1.23	09/09/08 SMI"
+# ident	"@(#)Makefile.sfw	1.24	09/12/18 SMI"
 #
 
 PGMAJVER=8.2
-PGMINVER=$(PGMAJVER).14
+PGMINVER=$(PGMAJVER).15
 VER=postgresql-$(PGMINVER)
 VER64=$(VER)-64
 
 HEADERS=$(ROOT)/usr/postgres/$(PGMAJVER)/include/server
 
-# SPARC_BLD is '#' for an Intel build.
-# INTEL_BLD is '#' for a Sparc build.
-POUND_SIGN:sh=                          echo \\043
-SPARC_BLD_1=    $(MACH:i386=$(POUND_SIGN))
-SPARC_BLD=      $(SPARC_BLD_1:sparc=)
-INTEL_BLD_1=    $(MACH:sparc=$(POUND_SIGN))
-INTEL_BLD=      $(INTEL_BLD_1:i386=)
-
-# DTRACE_BITS depends on the arch we are building for
-
-$(SPARC_BLD)DTRACE_BITS=64
-$(INTEL_BLD)DTRACE_BITS=32
-
 include ../../Makefile.cmd
 
 install: install32 install64
@@ -74,8 +61,7 @@
 	(cd $(VER); unset PROFILE || true; env \
 	    CC=$(CC) \
 	    "CFLAGS=$(CFLAGS) -xc99=none -xCC" \
-	    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib -M $(SRC)/cmd/mapfile_noexstk" \
-	    DTRACE_BITS=$(DTRACE_BITS) \
+	    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk" \
 	    INSTALL=/usr/ucb/install \
 	    DESTDIR=$(ROOT) \
 	    PATH=$(SFW_PATH) \
@@ -95,8 +81,7 @@
 		(cd $(VER64)/$$SRCDIR; unset PROFILE || true; env \
 		    CC=$(CC) \
 		    "CFLAGS=$(CFLAGS64)" \
-		    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64 -M $(SRC)/cmd/mapfile_noexstk" \
-		    DTRACE_BITS=$(DTRACE_BITS) \
+		    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64) -M $(SRC)/cmd/mapfile_noexstk" \
 		    INSTALL=/usr/ucb/install \
 		    DESTDIR=$(ROOT) \
 		    PATH=$(SFW_PATH) \
@@ -108,32 +93,27 @@
 pg32: $(VER)/config.status 
 	(cd $(VER); unset PROFILE || true; env \
 	    CC=$(CC) \
-	    "CFLAGS=$(CFLAGS) -xc99=none -xCC -D_SYS_VNODE_H" \
-	    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib -M $(SRC)/cmd/mapfile_noexstk" \
-	    DTRACE_BITS=$(DTRACE_BITS) \
+	    "CFLAGS=$(CFLAGS) -xc99=none -xCC" \
+	    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk" \
 	    INSTALL=/usr/ucb/install \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    $(GMAKE) all)
-	@find . -name core -exec rm -f {} \;
 
 pg64: $(VER64)/config.status 
 	(cd $(VER64); unset PROFILE || true; env \
 	    CC=$(CC) \
 	    "CFLAGS=$(CFLAGS64)" \
-	    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64 -M $(SRC)/cmd/mapfile_noexstk" \
-	    DTRACE_BITS=$(DTRACE_BITS) \
+	    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64) -M $(SRC)/cmd/mapfile_noexstk" \
 	    INSTALL=/usr/ucb/install \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    $(GMAKE) all)
-	@find . -name core -exec rm -f {} \;
 
 $(VER)/config.status: $(VER)/configure
 	(cd $(VER); env \
-	    CC=$(CC) "CFLAGS=-xc99=none -xCC -D_SYS_VNODE_H" \
+	    CC=$(CC) "CFLAGS=-xc99=none -xCC" \
 	    INSTALL=/usr/ucb/install \
-	    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    ./configure --prefix=/usr/postgres/$(PGMAJVER) \
@@ -159,9 +139,9 @@
 		--with-libedit-preferred \
 		--enable-thread-safety \
 		--enable-dtrace \
-		--with-includes=$(ROOT)/usr/include:$(ROOT)/usr/sfw/include:/usr/sfw/include:/usr/include/kerberosv5 \
+		--with-includes=$(ROOT)/usr/include:/usr/include/kerberosv5 \
 		--with-tclconfig=$(ROOT)/usr/lib \
-		--with-libs=$(ROOT)/lib:$(ROOT)/usr/lib:$(ROOT)/usr/sfw/lib:/usr/lib:/usr/sfw/lib)
+		--with-libs=$(ROOT)/lib:$(ROOT)/usr/lib)
 
 # We can't build a 64-bit server with the pl/perl option as there is
 # currently no 64-bit version of libperl.so on Solaris. So we can't
@@ -171,18 +151,18 @@
 	(cd $(VER64); env \
 	    CC=$(CC) "CFLAGS=$(CFLAGS64)" \
 	    INSTALL=/usr/ucb/install \
-	    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64" \
+	    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64)" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    ./configure --prefix=/usr/postgres/$(PGMAJVER) \
 		--exec-prefix=/usr/postgres/$(PGMAJVER) \
-		--bindir=/usr/postgres/$(PGMAJVER)/bin/64 \
-		--libexecdir=/usr/postgres/$(PGMAJVER)/bin/64 \
-		--sbindir=/usr/postgres/$(PGMAJVER)/bin/64 \
+		--bindir=/usr/postgres/$(PGMAJVER)/bin/$(MACH64) \
+		--libexecdir=/usr/postgres/$(PGMAJVER)/bin/$(MACH64) \
+		--sbindir=/usr/postgres/$(PGMAJVER)/bin/$(MACH64) \
 		--datadir=/usr/postgres/$(PGMAJVER)/share \
 		--sysconfdir=/usr/postgres/$(PGMAJVER)/etc \
 		--mandir=/usr/postgres/$(PGMAJVER)/man \
-		--libdir=/usr/postgres/$(PGMAJVER)/lib/64 \
+		--libdir=/usr/postgres/$(PGMAJVER)/lib/$(MACH64) \
 		--includedir=/usr/postgres/$(PGMAJVER)/include \
 		--sharedstatedir=/var/postgres/$(PGMAJVER) \
 		--localstatedir=/var/postgres/$(PGMAJVER) \
@@ -197,9 +177,9 @@
 		--enable-thread-safety \
 		--enable-dtrace \
 		--without-readline \
-		--with-includes=$(ROOT)/usr/include:$(ROOT)/usr/sfw/include:/usr/sfw/include:/usr/include/kerberosv5 \
+		--with-includes=$(ROOT)/usr/include:/usr/include/kerberosv5 \
 		--with-tclconfig=$(ROOT)/usr/lib \
-		--with-libs=$(ROOT)/lib/64:$(ROOT)/usr/lib/64:$(ROOT)/usr/sfw/lib/64:/usr/lib/64:/usr/sfw/lib/64)
+		--with-libs=$(ROOT)/lib/$(MACH64):$(ROOT)/usr/lib/$(MACH64))
 
 $(VER)/configure: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
@@ -254,8 +234,7 @@
 		(cd $(VER)/contrib/$$SRCDIR; unset PROFILE || true; env \
 		    CC=$(CC) \
 		    "CFLAGS=$(CFLAGS) -xc99=none -xCC" \
-		    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib -M $(SRC)/cmd/mapfile_noexstk" \
-		    DTRACE_BITS=$(DTRACE_BITS) \
+		    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk" \
 		    INSTALL=/usr/ucb/install \
 		    DESTDIR=$(ROOT) \
 		    PATH=$(SFW_PATH) \
@@ -297,8 +276,7 @@
 		(cd $(VER64)/contrib/$$SRCDIR; unset PROFILE || true; env \
 		    CC=$(CC) \
 		    "CFLAGS=$(CFLAGS64)" \
-		    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64 -M $(SRC)/cmd/mapfile_noexstk" \
-		    DTRACE_BITS=$(DTRACE_BITS) \
+		    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64) -M $(SRC)/cmd/mapfile_noexstk" \
 		    INSTALL=/usr/ucb/install \
 		    DESTDIR=$(ROOT) \
 		    PATH=$(SFW_PATH) \
Binary file usr/src/cmd/postgres/postgresql-8.2/postgresql-8.2.14.tar.gz has changed
Binary file usr/src/cmd/postgres/postgresql-8.2/postgresql-8.2.15.tar.gz has changed
--- a/usr/src/cmd/postgres/postgresql-8.3-tcl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.3-tcl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-83-tcl
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  http://www.postgresql.org/pgtcl1.5.tar.gz/METADATA
-SUPPORT:          Community
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7777
 COMMENTS:         
--- a/usr/src/cmd/postgres/postgresql-8.3/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.3/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,11 @@
 NAME:             PostgreSQL
-VERSION:          8.3.8
+VERSION:          8.3.9
 DESCRIPTION:      PostgreSQL object-relational database system
 PACKAGE:          SUNWpostgr-83-client SUNWpostgr-83-contrib SUNWpostgr-83-devel SUNWpostgr-83-docs SUNWpostgr-83-libs SUNWpostgr-83-pl SUNWpostgr-83-server-data-root SUNWpostgr-83-server SUNWpostgr-83-tests
 LICENSE:          BSD
 PROJECT_URL:      http://www.postgresql.org/
-SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.3.8/postgresql-8.3.8.tar.gz
-SUPPORT:          Managed
+SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.3.9/postgresql-8.3.9.tar.gz
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7777
 COMMENTS:
--- a/usr/src/cmd/postgres/postgresql-8.3/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.3/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -23,29 +23,16 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)Makefile.sfw	1.16	09/09/08 SMI"
+# ident	"@(#)Makefile.sfw	1.17	09/12/18 SMI"
 #
 
 PGMAJVER=8.3
-PGMINVER=$(PGMAJVER).8
+PGMINVER=$(PGMAJVER).9
 VER=postgresql-$(PGMINVER)
 VER64=$(VER)-64
 
 HEADERS=$(ROOT)/usr/postgres/$(PGMAJVER)/include/server
 
-# SPARC_BLD is '#' for an Intel build.
-# INTEL_BLD is '#' for a Sparc build.
-POUND_SIGN:sh=                          echo \\043
-SPARC_BLD_1=    $(MACH:i386=$(POUND_SIGN))
-SPARC_BLD=      $(SPARC_BLD_1:sparc=)
-INTEL_BLD_1=    $(MACH:sparc=$(POUND_SIGN))
-INTEL_BLD=      $(INTEL_BLD_1:i386=)
-
-# DTRACE_BITS depends on the arch we are building for
-
-$(SPARC_BLD)DTRACE_BITS=64
-$(INTEL_BLD)DTRACE_BITS=32
-
 include ../../Makefile.cmd
 
 # This will indirectly also do install32 and install64 upon which
@@ -84,9 +71,8 @@
 	rm -rf $(HEADERS)
 	(cd $(VER); unset PROFILE || true; env \
 	    CC=$(CC) \
-	    "CFLAGS=$(CFLAGS) -xc99=none -xCC -D_SYS_VNODE_H" \
-	    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib -M $(SRC)/cmd/mapfile_noexstk" \
-	    DTRACE_BITS=$(DTRACE_BITS) \
+	    "CFLAGS=$(CFLAGS) -xc99=none -xCC " \
+	    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk" \
 	    DESTDIR=$(ROOT) \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
@@ -106,8 +92,7 @@
 		(cd $(VER64)/$$SRCDIR; unset PROFILE || true; env \
 		    CC=$(CC) \
 		    "CFLAGS=$(CFLAGS64)" \
-		    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64 -M $(SRC)/cmd/mapfile_noexstk" \
-		    DTRACE_BITS=$(DTRACE_BITS) \
+		    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64) -M $(SRC)/cmd/mapfile_noexstk" \
 		    DESTDIR=$(ROOT) \
 		    PATH=$(SFW_PATH) \
 		    MAKE=$(GMAKE) \
@@ -118,29 +103,24 @@
 pg32: $(VER)/config.status 
 	(cd $(VER); unset PROFILE || true; env \
 	    CC=$(CC) \
-	    "CFLAGS=$(CFLAGS) -xc99=none -xCC -D_SYS_VNODE_H" \
-	    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib -M $(SRC)/cmd/mapfile_noexstk" \
-	    DTRACE_BITS=$(DTRACE_BITS) \
+	    "CFLAGS=$(CFLAGS) -xc99=none -xCC" \
+	    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    $(GMAKE) all)
-	@find . -name core -exec rm -f {} \;
 
 pg64: $(VER64)/config.status 
 	(cd $(VER64); unset PROFILE || true; env \
 	    CC=$(CC) \
 	    "CFLAGS=$(CFLAGS64)" \
-	    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64 -M $(SRC)/cmd/mapfile_noexstk" \
-	    DTRACE_BITS=$(DTRACE_BITS) \
+	    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64) -M $(SRC)/cmd/mapfile_noexstk" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    $(GMAKE) all)
-	@find . -name core -exec rm -f {} \;
 
 $(VER)/config.status: $(VER)/configure
 	(cd $(VER); env \
 	    CC=$(CC) "CFLAGS=-xc99=none -xCC" \
-	    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    ./configure --prefix=/usr/postgres/$(PGMAJVER) \
@@ -169,9 +149,9 @@
 		--with-gssapi \
 		--enable-thread-safety \
 		--enable-dtrace \
-		--with-includes=$(ROOT)/usr/include:$(ROOT)/usr/sfw/include:/usr/sfw/include \
+		--with-includes=$(ROOT)/usr/include \
 		--with-tclconfig=$(ROOT)/usr/lib \
-		--with-libs=$(ROOT)/lib:$(ROOT)/usr/lib:$(ROOT)/usr/sfw/lib:/usr/lib:/usr/sfw/lib)
+		--with-libs=$(ROOT)/lib:$(ROOT)/usr/lib)
 
 # We can't build a 64-bit server with the pl/perl option as there is
 # currently no 64-bit version of libperl.so on Solaris. So we can't
@@ -180,18 +160,18 @@
 $(VER64)/config.status: $(VER64)/configure
 	(cd $(VER64); env \
 	    CC=$(CC) "CFLAGS=$(CFLAGS64)" \
-	    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64" \
+	    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64)" \
 	    PATH=$(SFW_PATH) \
 	    MAKE=$(GMAKE) \
 	    ./configure --prefix=/usr/postgres/$(PGMAJVER) \
 		--exec-prefix=/usr/postgres/$(PGMAJVER) \
-		--bindir=/usr/postgres/$(PGMAJVER)/bin/64 \
-		--libexecdir=/usr/postgres/$(PGMAJVER)/bin/64 \
-		--sbindir=/usr/postgres/$(PGMAJVER)/bin/64 \
+		--bindir=/usr/postgres/$(PGMAJVER)/bin/$(MACH64) \
+		--libexecdir=/usr/postgres/$(PGMAJVER)/bin/$(MACH64) \
+		--sbindir=/usr/postgres/$(PGMAJVER)/bin/$(MACH64) \
 		--datadir=/usr/postgres/$(PGMAJVER)/share \
 		--sysconfdir=/usr/postgres/$(PGMAJVER)/etc \
 		--mandir=/usr/postgres/$(PGMAJVER)/man \
-		--libdir=/usr/postgres/$(PGMAJVER)/lib/64 \
+		--libdir=/usr/postgres/$(PGMAJVER)/lib/$(MACH64) \
 		--includedir=/usr/postgres/$(PGMAJVER)/include \
 		--sharedstatedir=/var/postgres/$(PGMAJVER) \
 		--localstatedir=/var/postgres/$(PGMAJVER) \
@@ -209,9 +189,9 @@
 		--enable-thread-safety \
 		--enable-dtrace \
 		--without-readline \
-		--with-includes=$(ROOT)/usr/include:$(ROOT)/usr/sfw/include:/usr/sfw/include \
+		--with-includes=$(ROOT)/usr/include \
 		--with-tclconfig=$(ROOT)/usr/lib \
-		--with-libs=$(ROOT)/lib/64:$(ROOT)/usr/lib/64:$(ROOT)/usr/sfw/lib/64:/usr/lib/64:/usr/sfw/lib/64)
+		--with-libs=$(ROOT)/lib/$(MACH64):$(ROOT)/usr/lib/$(MACH64))
 
 $(VER)/configure: $(VER).tar.gz
 	gzip -dc $(VER).tar.gz | tar xopf -
@@ -272,8 +252,7 @@
 		(cd $(VER)/contrib/$$SRCDIR; unset PROFILE || true; env \
 		    CC=$(CC) \
 		    "CFLAGS=$(CFLAGS) -xc99=none -xCC" \
-		    "LD_OPTIONS=-R/usr/sfw/lib -L/usr/sfw/lib -M $(SRC)/cmd/mapfile_noexstk" \
-		    DTRACE_BITS=$(DTRACE_BITS) \
+		    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk" \
 		    DESTDIR=$(ROOT) \
 		    PATH=$(SFW_PATH) \
 		    MAKE=$(GMAKE) \
@@ -287,8 +266,7 @@
 		(cd $(VER64)/contrib/$$SRCDIR; unset PROFILE || true; env \
 		    CC=$(CC) \
 		    "CFLAGS=$(CFLAGS64)" \
-		    "LD_OPTIONS=-R/usr/sfw/lib/64 -L/usr/sfw/lib/64 -M $(SRC)/cmd/mapfile_noexstk" \
-		    DTRACE_BITS=$(DTRACE_BITS) \
+		    "LD_OPTIONS=-L$(ROOT)/usr/lib/$(MACH64) -M $(SRC)/cmd/mapfile_noexstk" \
 		    DESTDIR=$(ROOT) \
 		    PATH=$(SFW_PATH) \
 		    MAKE=$(GMAKE) \
Binary file usr/src/cmd/postgres/postgresql-8.3/postgresql-8.3.8.tar.gz has changed
Binary file usr/src/cmd/postgres/postgresql-8.3/postgresql-8.3.9.tar.gz has changed
--- a/usr/src/cmd/postgres/postgresql-8.4/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-8.4/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,11 @@
 NAME:             postgresql
-VERSION:          8.4.1
+VERSION:          8.4.2
 DESCRIPTION:      PostgreSQL open source object-relational database system
 LICENSE:          BSD
 PACKAGE:          SUNWpostgr-84-client SUNWpostgr-84-server SUNWpostgr-84-libs SUNWpostgr-84-contrib SUNWpostgr-84-devel SUNWpostgr-84-docs SUNWpostgr-84-server-data-root SUNWpostgr-84-tests SUNWpostgr-84-pl
 PROJECT_URL:      http://www.postgresql.org/
-SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.4.1/postgresql-8.4.1.tar.bz2
-SUPPORT:          Managed
+SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.4.2/postgresql-8.4.2.tar.bz2
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              11631
 COMMENTS:         
Binary file usr/src/cmd/postgres/postgresql-8.4/postgresql-8.4.1.tar.bz2 has changed
Binary file usr/src/cmd/postgres/postgresql-8.4/postgresql-8.4.2.tar.bz2 has changed
--- a/usr/src/cmd/postgres/postgresql-common/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-common/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-common SUNWpostgr-common-root
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  file://Makefile.sfw
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              11631
 COMMENTS:         This package is built on the latest PostgreSQL version.
--- a/usr/src/cmd/postgres/postgresql-jdbc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-jdbc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-jdbc
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  http://www.postgresql.org/postgresql-jdbc-8.3-603.src.tar.gz
-SUPPORT:          Community
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7016
 COMMENTS:         
--- a/usr/src/cmd/postgres/postgresql-upgrade/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/postgres/postgresql-upgrade/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-upgrade
 PROJECT_URL:      http://www.postgresql.org/
 SOURCE_DOWNLOAD:  http://www.nowhere.org/pg81bin.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/database/postgres
 OSR:              3959
 COMMENTS:         
--- a/usr/src/cmd/powerman/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/powerman/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpowermanr SUNWpowermanu
 PROJECT_URL:      http://sourceforge.net/projects/powerman
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/powerman/powerman-2.3.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/powerman
 OSR:              10225
 COMMENTS:         
--- a/usr/src/cmd/privoxy/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/privoxy/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWprivoxyr SUNWprivoxyu
 PROJECT_URL:      http://www.privoxy.org/
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/ijbswa/privoxy-3.0.8-stable-src.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/network/internet-utility
 OSR:              8371
 COMMENTS:         
--- a/usr/src/cmd/procmail/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/procmail/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWprocmail
 PROJECT_URL:      http://www.procmail.org/
 SOURCE_DOWNLOAD:  ftp://ftp.procmail.net/pub/procmail/procmail-3.22.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/procmail
 OSR:              8299
 COMMENTS:         
--- a/usr/src/cmd/psutils/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/psutils/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpsutils
 PROJECT_URL:      http://knackered.knackered.org/angus/psutils
 SOURCE_DOWNLOAD:  ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/psutils
 OSR:              2215
 COMMENTS:         
--- a/usr/src/cmd/pv/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pv/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpipe-viewer
 PROJECT_URL:      http://www.ivarch.com/programs/pv.shtml
 SOURCE_DOWNLOAD:  http://pipeviewer.googlecode.com/files/pv-1.1.4.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/pv
 OSR:              11222
 COMMENTS:
--- a/usr/src/cmd/pwgen/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pwgen/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpwgen
 PROJECT_URL:      http://sourceforge.net/projects/pwgen/
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/pwgen/pwgen-2.06.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/pwgen
 OSR:              8127
 COMMENTS:         
--- a/usr/src/cmd/pycups/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pycups/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpycups
 PROJECT_URL:      http://cyberelk.net/tim/software/pycups/
 SOURCE_DOWNLOAD:  http://cyberelk.net/tim/data/pycups/pycups-1.9.46.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/print/pycups
 OSR:              8488
 COMMENTS:         
--- a/usr/src/cmd/pylint/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/pylint/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWpylint
 PROJECT_URL:		http://www.logilab.org/project/pylint/
 SOURCE_DOWNLOAD:	http://ftp.logilab.org/pub/pylint/pylint-0.18.0.tar.gz
-SUPPORT:		Community
+SUPPORT:		C
 BUGTRAQ:		solaris/utility/pylint
 OSR:			7345
 COMMENTS:
--- a/usr/src/cmd/quagga/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/quagga/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWquaggar SUNWquaggau
 PROJECT_URL:      http://www.quagga.net/
 SOURCE_DOWNLOAD:  http://www.quagga.net/download/quagga-0.99.8.tar.gz
-SUPPORT:          Full
+SUPPORT:          B
 BUGTRAQ:          solaris/network/quagga
 OSR:              6692
 COMMENTS:         
--- a/usr/src/cmd/quilt/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/quilt/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWquiltr SUNWquiltu
 PROJECT_URL:      http://savannah.nongnu.org/projects/quilt
 SOURCE_DOWNLOAD:  http://download.savannah.gnu.org/releases/quilt/quilt-0.47.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/quilt
 OSR:              9963
 COMMENTS:         
--- a/usr/src/cmd/rdiff-backup/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/rdiff-backup/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWrdiff-backup
 PROJECT_URL:      http://www.nongnu.org/rdiff-backup/
 SOURCE_DOWNLOAD:  http://download.savannah.gnu.org/releases/rdiff-backup/rdiff-backup-1.2.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/rdiff-backup
 OSR:              8372
 COMMENTS:         
--- a/usr/src/cmd/rpm2cpio/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/rpm2cpio/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWrpm
 PROJECT_URL:      http://www.rpm.org/max-rpm/s1-rpm-miscellania-rpm2cpio.html
 SOURCE_DOWNLOAD:  http://www.iagora.com/~espel/rpm2cpio.pl
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/rpm
 OSR:              0000
 COMMENTS:         
--- a/usr/src/cmd/rsync/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/rsync/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWrsync
 PROJECT_URL:      http://www.samba.org/rsync/
 SOURCE_DOWNLOAD:  ftp://ftp.samba.org/pub/rsync/rsync-3.0.6.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/rsync
 OSR:              9805
 COMMENTS:         
--- a/usr/src/cmd/rtorrent/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/rtorrent/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWrtorrent
 PROJECT_URL:		http://libtorrent.rakshasa.no/
 SOURCE_DOWNLOAD:	http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.2.tar.gz
-SUPPORT:		Community
+SUPPORT:		C
 BUGTRAQ:		solaris/utility/bittorrent
 OSR:			11083
 COMMENTS:
--- a/usr/src/cmd/ruby18/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ruby18/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWruby18u SUNWruby18r
 PROJECT_URL:      http://www.ruby-lang.org/
 SOURCE_DOWNLOAD:  ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.7-p174.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/ruby
 OSR:              7147
 COMMENTS:         
--- a/usr/src/cmd/samba/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/samba/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsmbar SUNWsmbau
 PROJECT_URL:      http://www.samba.org
 SOURCE_DOWNLOAD:  http://www.samba.org/samba/ftp/stable/samba-3.0.37.tar.gz
-SUPPORT:          Full
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/samba
 OSR:              11518
 COMMENTS:         
--- a/usr/src/cmd/sane-frontends/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/sane-frontends/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsane-frontend
 PROJECT_URL:      http://www.sane-project.org
 SOURCE_DOWNLOAD:  ftp://ftp.sane-project.org/pub/sane/sane-frontends-1.0.14/sane-frontends-1.0.14.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libsane
 OSR:              2753
 COMMENTS:         
--- a/usr/src/cmd/sblim-wbemcli/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/sblim-wbemcli/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsblimwbemcli
 PROJECT_URL:      http://sblim.wiki.sourceforge.net/Wbemcli
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/sblim/sblim-wbemcli-1.6.0.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/wbem/sblimwbemcli
 OSR:              10696
 COMMENTS:         
--- a/usr/src/cmd/screen/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/screen/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWscreen SUNWscreenrc
 PROJECT_URL:      http://www.gnu.org/software/screen
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/screen/screen-4.0.3.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/screen
 OSR:              8229
 COMMENTS:         
--- a/usr/src/cmd/ser/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/ser/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWserr SUNWseru
 PROJECT_URL:      http://www.iptel.org/ser
 SOURCE_DOWNLOAD:  http://ftp.iptel.org/pub/ser/0.8.12/src/ser-0.8.12.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/network/sip
 OSR:              2200
 COMMENTS:         
--- a/usr/src/cmd/serweb/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/serweb/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWserweb
 PROJECT_URL:      http://www.iptel.org/ser/serweb/
 SOURCE_DOWNLOAD:  http://www.iptel.org/ser/serweb/serweb_2004-01-04.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/network/sip
 OSR:              2240
 COMMENTS:         
--- a/usr/src/cmd/sg3_utils/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/sg3_utils/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsg3utilsr SUNWsg3utilsu
 PROJECT_URL:      http://sg.danny.cz/sg/sg3_utils.html
 SOURCE_DOWNLOAD:  http://sg.danny.cz/sg/p/sg3_utils-1.26.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/sg3utils
 OSR:              9744
 COMMENTS:         
--- a/usr/src/cmd/shmux/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/shmux/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWshmux
 PROJECT_URL:      http://web.taranis.org/shmux/
 SOURCE_DOWNLOAD:  http://web.taranis.org/shmux/dist/shmux-1.0.2.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/shmux
 OSR:              12263
 COMMENTS:
--- a/usr/src/cmd/simplewbem/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/simplewbem/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsimplewbem
 PROJECT_URL:      http://simplewbem.org/
 SOURCE_DOWNLOAD:  http://simplewbem.org/cimple-1.2.4.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/wbem/simplewbem
 OSR:              10053
 COMMENTS:         
--- a/usr/src/cmd/slrn/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/slrn/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWslrn
 PROJECT_URL:      http://slrn.sourceforge.net/
 SOURCE_DOWNLOAD:  ftp://space.mit.edu/pub/davis/slrn/slrn-0.9.9p1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/slrn
 OSR:              10083
 COMMENTS:         
--- a/usr/src/cmd/snort/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/snort/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:        	SUNWsnortr SUNWsnortu
 PROJECT_URL:    	http://www.snort.org
 SOURCE_DOWNLOAD:	http://www.snort.org/dl/snort-2.8.4.1.tar.gz
-SUPPORT:        	Managed
+SUPPORT:        	C
 BUGTRAQ:        	solaris/utility/snort
 OSR:            	10720
 COMMENTS:
--- a/usr/src/cmd/sox/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/sox/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsound-exchange
 PROJECT_URL:      http://sox.sourceforge.net
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/project/sox/sox/14.3.0/sox-14.3.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/audio/sox
 OSR:              9512
 COMMENTS:         
--- a/usr/src/cmd/spawn-fcgi/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/spawn-fcgi/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWspawn-fcgi
 PROJECT_URL:      http://www.lighttpd.net/
 SOURCE_DOWNLOAD:  http://www.lighttpd.net/download/spawn-fcgi-1.6.3.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/spawn-fcgi
 OSR:              8071
 COMMENTS:
--- a/usr/src/cmd/squid/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/squid/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsquidu SUNWsquidr
 PROJECT_URL:      http://www.squid-cache.org/
 SOURCE_DOWNLOAD:  http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE6.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/squid
 OSR:              7240
 COMMENTS:         
--- a/usr/src/cmd/stunnel/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/stunnel/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWstunnelr SUNWstunnelu
 PROJECT_URL:      http://www.stunnel.org/
 SOURCE_DOWNLOAD:  http://www.stunnel.org/download/stunnel/src/stunnel-4.25.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/stunnel
 OSR:              9258
 COMMENTS:         
--- a/usr/src/cmd/subversion/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/subversion/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsvn SUNWsvn-java SUNWsvn-perl SUNWsvn-python
 PROJECT_URL:      http://subversion.tigris.org/
 SOURCE_DOWNLOAD:  http://subversion.tigris.org/downloads/subversion-1.6.5.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/svn
 OSR:              4495
 COMMENTS:         
--- a/usr/src/cmd/sudo/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/sudo/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsudor SUNWsudou
 PROJECT_URL:      http://www.sudo.ws/
 SOURCE_DOWNLOAD:  http://www.sudo.ws/sudo/dist/sudo-1.7.0.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/sudo
 OSR:              11289
 COMMENTS:         
--- a/usr/src/cmd/swig/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/swig/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWswig
 PROJECT_URL:      http://www.swig.org
 SOURCE_DOWNLOAD:  http://www.swig.org/download.html/swig-1.3.35.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/swig
 OSR:              8935
 COMMENTS:         
--- a/usr/src/cmd/sysbench/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/sysbench/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWsysbench
 PROJECT_URL:		http://sysbench.sourceforge.net/
 SOURCE_DOWNLOAD:	http://superb-west.dl.sourceforge.net/sourceforge/sysbench/sysbench-0.4.12.tar.gz
-SUPPORT:		Community
+SUPPORT:		C
 BUGTRAQ:		solaris/benchmarks/sysbench
 OSR:			10627
 COMMENTS:
--- a/usr/src/cmd/tcpdump/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tcpdump/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:	BSD
 PROJECT_URL:	http://www.tcpdump.org
 SOURCE_DOWNLOAD:	http://www.tcpdump.org/release/tcpdump-4.0.0.tar.gz
-SUPPORT:	Community
+SUPPORT:	B
 BUGTRAQ:	solaris/utility/tcpdump
 OSR:		11267
 COMMENTS:
--- a/usr/src/cmd/tcpdump/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tcpdump/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.2	09/12/07 SMI"
+#ident	"@(#)Makefile.sfw	1.3	09/12/09 SMI"
 
 VER =		$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 TARBALL =	$(VER).tar.gz
@@ -32,6 +32,7 @@
 
 CONFIGURE_OPTIONS += --enable-ipv6=yes 
 CONFIGURE_OPTIONS += --with-user=nobody
+CONFIGURE_OPTIONS += --without-crypto
 PATCHES:sh	= echo Patches/*.patch
 
 all: $(VER)/config.status $(ROOTLIB)/libpcap.so
--- a/usr/src/cmd/tcsh/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tcsh/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtcsh
 PROJECT_URL:      http://www.tcsh.org
 SOURCE_DOWNLOAD:  ftp://ftp.astron.com/pub/tcsh/tcsh-6.17.00.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/tcsh
 OSR:              5276
 COMMENTS:         
--- a/usr/src/cmd/texi2html/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/texi2html/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtexi
 PROJECT_URL:      http://www.nongnu.org/texi2html/
 SOURCE_DOWNLOAD:  http://savannah.inetbridge.net/texi2html/texi2html-1.82.tar.bz2/METADATA
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/other
 OSR:              0000
 COMMENTS:         
--- a/usr/src/cmd/texinfo/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/texinfo/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtexi
 PROJECT_URL:      ftp://ftp.gnu.org/pub/gnu/texinfo
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.7.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/other
 OSR:              0000
 COMMENTS:         
--- a/usr/src/cmd/tomcat/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tomcat/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtcatr SUNWtcatu SUNWtcat-examples
 PROJECT_URL:      http://jakarta.apache.org/tomcat
 SOURCE_DOWNLOAD:  http://apache.ziply.com/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20-src.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/apache
 OSR:              6819
 COMMENTS:         
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/tomcat/Solaris/index.htm	Sat Jan 16 18:11:20 2010 +0200
@@ -0,0 +1,1 @@
+<meta HTTP-EQUIV="REFRESH" content="0; url=ROOT.example">
--- a/usr/src/cmd/tomcat/Solaris/index.jsp	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tomcat/Solaris/index.jsp	Sat Jan 16 18:11:20 2010 +0200
@@ -1,15 +1,1 @@
-<!--
-This file should redirect you to Apache Tomcat default home page which
-was on this system moved from default place $CATALINA_HOME/webapps/ROOT
-to $CATALINA_HOME/webapps/ROOT.example. This was done in order to allow
-deployment of custom ROOT web application while maintain upgrade ability
-via packaging system (without loosing data).
-
-Note that /var/tomcat6/webapps/ROOT.example directory is part of
-SUNWtcat-examples package.
-
-To deploy your ROOT application copy WAR file to
-$CATALINA_HOME/webapps/ROOT.war and remove directory
-$CATALINA_HOME/webapps/ROOT.
--->
-<meta HTTP-EQUIV="REFRESH" content="0; url=ROOT.example">
+<html><body><h1>Apache Tomcat (SUNWtcat-examples package not installed)</h1></body></html>
--- a/usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tomcat/Solaris/tomcat.1m.sunman	Sat Jan 16 18:11:20 2010 +0200
@@ -144,11 +144,14 @@
 .RS 4n
 Directory with default (ROOT) web application which is served when URL
 is requested without further path specifier (http://hostname/). After
-Tomcat package installation this directory is intentionally left empty
-with just index.jsp file. This JSP file redirects requester to Tomcat
-home page which is in ROOT.example/ directory. This shall allow
-better deployment of custom ROOT web application while maintain upgrade
-ability via packaging system (without loosing data).
+Tomcat packages installation this directory is intentionally left empty
+with just index.jsp and index.htm files. The HTML file redirects
+requester to Tomcat home page which is in ROOT.example/ directory (this
+file is part of SUNWtcat-examples package). The JSP file is default home 
+page which is shown when SUNWtcat-examples (and thus HTML file) is not
+installed. This shall allow better deployment of custom ROOT web
+application while maintain upgrade ability via packaging system (without
+loosing data).
 .RE
 
 .sp
--- a/usr/src/cmd/tomcat/install-tomcat	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tomcat/install-tomcat	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)install-tomcat	1.20	09/10/30 SMI"
+#ident	"@(#)install-tomcat	1.21	09/12/16 SMI"
 
 # functions - search for "START HERE" to find start of control flow
 
@@ -60,9 +60,11 @@
     ln -s ../../../usr/tomcat${VERSION}/docs docs
 
     # move default web application to different location and install
-    # redirect jsp page (for possible altering of ROOT web app)
+    # redirect html page (for possible altering of ROOT web app) and
+    # jsp file (as home page when SUNWtcat-examples is not installed).
     mv ROOT ROOT.example
     mkdir ROOT
+    _install N ${TOP}/Solaris/index.htm ${VARTOMCAT}/webapps/ROOT/index.htm 644
     _install N ${TOP}/Solaris/index.jsp ${VARTOMCAT}/webapps/ROOT/index.jsp 644
     
     # get rid of the MS-DOS files we don't need
--- a/usr/src/cmd/top/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/top/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtop
 PROJECT_URL:      http://www.unixtop.org/
 SOURCE_DOWNLOAD:  http://www.unixtop.org/dist/top-3.8beta1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/top
 OSR:              9922
 COMMENTS:         
--- a/usr/src/cmd/tor/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tor/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,11 @@
 NAME:		tor
-VERSION:	0.2.0.34
+VERSION:	0.2.1.20
 DESCRIPTION:	The Onion Router
 LICENSE:	BSD-LIKE
 PACKAGE:	SUNWtor SUNWtor-root
 PROJECT_URL:	http://www.torproject.org/
-SOURCE_DOWNLOAD: https://www.torproject.org/dist/tor-0.2.0.34.tar.gz
-SUPPORT:	Community
+SOURCE_DOWNLOAD: https://www.torproject.org/dist/tor-0.2.1.20.tar.gz
+SUPPORT:	C
 BUGTRAQ:	solaris/network/tor
 OSR:		11364
 COMMENTS:	Tor is free software and an open network that helps you defend 
--- a/usr/src/cmd/tor/Patches/Makefile.in.patch	Sun Dec 20 15:22:13 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-*** src/or/Makefile.in.old	Fri May  1 05:55:24 2009
---- src/or/Makefile.in	Fri May  1 05:55:34 2009
-***************
-*** 646,656 ****
-  	if test "x$$svkdir" = x ; then \
-  	  svkdir=$$HOME/.svk; \
-  	fi; \
-! 	if test -d ../../.svn && test -x "`which svn 2>&1;true`" ; then \
-  	  svn info ../.. |					\
-  	  sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
-  	     || true;						\
-! 	elif test -x "`which svk 2>&1;true`" && test -d $$svkdir/local; then \
-  	  location=../..;					\
-  	  rev=x;						\
-  	  while test x$$rev = xx; do				\
---- 646,656 ----
-  	if test "x$$svkdir" = x ; then \
-  	  svkdir=$$HOME/.svk; \
-  	fi; \
-! 	if test -d ../../.svn && test -x "`/usr/bin/which svn 2>&1;true`" ; then \
-  	  svn info ../.. |					\
-  	  sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
-  	     || true;						\
-! 	elif test -x "`/usr/bin/which svk 2>&1;true`" && test -d $$svkdir/local; then \
-  	  location=../..;					\
-  	  rev=x;						\
-  	  while test x$$rev = xx; do				\
--- a/usr/src/cmd/tor/Patches/aes.c.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tor/Patches/aes.c.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -1,6 +1,6 @@
---- src/common/aes.c.orig	Mon Sep 28 07:05:29 2009
-+++ src/common/aes.c	Mon Sep 28 07:09:05 2009
-@@ -25,9 +25,9 @@
+--- src/common/aes.c.save	Tue Dec 15 06:24:24 2009
++++ src/common/aes.c	Tue Dec 15 06:28:43 2009
+@@ -23,9 +23,9 @@
  #include "util.h"
  #include "log.h"
  
@@ -11,9 +11,9 @@
 + * via OpenSSL's EVP_EncryptUpdate function, using PKCS11 directly (Solaris only),
 + * or via the built-in AES implementation below. */
  
- /** Defined iff we're using openssl's AES functions for AES. */
+ /** Defined iff we're using OpenSSL's AES functions for AES. */
  #undef USE_OPENSSL_AES
-@@ -56,6 +56,17 @@
+@@ -54,6 +54,17 @@
  # define CPU_IS_ARM
  #endif
  
@@ -31,7 +31,7 @@
  /* Here we pick which to use, if none is force-defined.  See
   *      http://archives.seul.org/or/dev/Feb-2007/msg00045.html
   * for a summary of the most recent benchmarking results that led to this
-@@ -99,6 +110,10 @@
+@@ -97,6 +108,10 @@
  #ifdef USE_OPENSSL_EVP
  # include <openssl/evp.h>
  #endif
@@ -42,7 +42,7 @@
  
  /* Figure out which AES optimizations to use. */
  #ifdef USE_BUILTIN_AES
-@@ -147,6 +162,11 @@
+@@ -145,6 +160,11 @@
    int nr;
  #endif
  
@@ -54,7 +54,7 @@
  #if !defined(WORDS_BIGENDIAN) || defined(USE_RIJNDAEL_COUNTER_OPTIMIZATION)
  #define USING_COUNTER_VARS
    /** These four values, together, implement a 128-bit counter, with
-@@ -180,6 +200,61 @@
+@@ -178,6 +198,61 @@
  #define COUNTER(c, n) ((c)->counter ## n)
  #endif
  
@@ -116,7 +116,7 @@
  /**
   * Helper function: set <b>cipher</b>'s internal buffer to the encrypted
   * value of the current counter.
-@@ -213,7 +288,29 @@
+@@ -211,7 +286,29 @@
  #endif
  }
  
@@ -147,7 +147,7 @@
   * Return a newly allocated counter-mode AES128 cipher implementation.
   */
  aes_cnt_cipher_t*
-@@ -221,6 +318,11 @@
+@@ -219,6 +316,11 @@
  {
    aes_cnt_cipher_t* result = tor_malloc_zero(sizeof(aes_cnt_cipher_t));
  
@@ -159,7 +159,7 @@
    return result;
  }
  
-@@ -231,7 +333,48 @@
+@@ -229,7 +331,48 @@
  void
  aes_set_key(aes_cnt_cipher_t *cipher, const char *key, int key_bits)
  {
@@ -208,7 +208,7 @@
    const EVP_CIPHER *c;
    switch (key_bits) {
      case 128: c = EVP_aes_128_ecb(); break;
-@@ -240,6 +383,7 @@
+@@ -238,6 +381,7 @@
      default: tor_assert(0);
    }
    EVP_EncryptInit(&cipher->key, c, (const unsigned char*)key, NULL);
@@ -216,7 +216,7 @@
  #elif defined(USE_OPENSSL_AES)
    AES_set_encrypt_key((const unsigned char *)key, key_bits, &(cipher->key));
  #else
-@@ -246,6 +390,7 @@
+@@ -244,6 +388,7 @@
    cipher->nr = rijndaelKeySetupEnc(cipher->rk, (const unsigned char*)key,
                                     key_bits);
  #endif
@@ -224,7 +224,7 @@
  #ifdef USING_COUNTER_VARS
    cipher->counter0 = 0;
    cipher->counter1 = 0;
-@@ -255,8 +400,12 @@
+@@ -253,8 +398,12 @@
  #ifdef USING_COUNTER_BUFS
    memset(cipher->ctr_buf.buf, 0, sizeof(cipher->ctr_buf.buf));
  #endif
@@ -238,26 +238,26 @@
    _aes_fill_buf(cipher);
  }
  
-@@ -267,8 +416,18 @@
+@@ -265,8 +414,18 @@
  {
-   assert(cipher);
+   tor_assert(cipher);
  #ifdef USE_OPENSSL_EVP
 +#ifdef SOLARIS
 +  if (cipher->hSession == 0)
 +#endif
    EVP_CIPHER_CTX_cleanup(&cipher->key);
  #endif
++#if defined(SOLARIS)
++  if (cipher->hSession) {
++     (void) C_DestroyObject(cipher->hSession, cipher->hKey);
++     (void) C_CloseSession(cipher->hSession);
++  }
++#endif
 +
-+#if defined(SOLARIS)
-+	if (cipher->hSession) {
-+		(void) C_DestroyObject(cipher->hSession, cipher->hKey);
-+		(void) C_CloseSession(cipher->hSession);
-+	}
-+#endif
    memset(cipher, 0, sizeof(cipher));
    tor_free(cipher);
  }
-@@ -289,12 +448,22 @@
+@@ -287,12 +446,22 @@
  aes_crypt(aes_cnt_cipher_t *cipher, const char *input, size_t len,
            char *output)
  {
@@ -281,7 +281,7 @@
    if (PREDICT_UNLIKELY(!len)) return;
  
    while (1) {
-@@ -325,12 +494,21 @@
+@@ -323,12 +492,21 @@
  void
  aes_crypt_inplace(aes_cnt_cipher_t *cipher, char *data, size_t len)
  {
--- a/usr/src/cmd/tor/Patches/torrc.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tor/Patches/torrc.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -1,71 +1,42 @@
-*** src/config/torrc.sample.in-old	Tue Feb 26 11:56:28 2008
---- src/config/torrc.sample.in Fri May  1 06:27:19 2009
-***************
-*** 32,43 ****
-  ## We advise using "notice" in most cases, since anything more verbose
-  ## may provide sensitive information to an attacker who obtains the logs.
-  ##
-! ## Send all messages of level 'notice' or higher to @LOCALSTATEDIR@/log/tor/notices.log
-! #Log notice file @LOCALSTATEDIR@/log/tor/notices.log
-! ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
-! #Log debug file @LOCALSTATEDIR@/log/tor/debug.log
-  ## Use the system log instead of Tor's logfiles
-! #Log notice syslog
-  ## To send all messages to stderr:
-  #Log debug stderr
-  
---- 32,43 ----
-  ## We advise using "notice" in most cases, since anything more verbose
-  ## may provide sensitive information to an attacker who obtains the logs.
-  ##
-! ## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
-! #Log notice file @LOCALSTATEDIR@/log/tor/notices.log
-! ## Send every possible message to /var/log/tor/debug.log
-! Log debug file @LOCALSTATEDIR@/log/tor/debug.log
-  ## Use the system log instead of Tor's logfiles
-! Log notice syslog
-  ## To send all messages to stderr:
-  #Log debug stderr
-  
-***************
-*** 44,54 ****
-  ## Uncomment this to start the process in the background... or use
-  ## --runasdaemon 1 on the command line. This is ignored on Windows;
-  ## see the FAQ entry if you want Tor to run as an NT service.
-! #RunAsDaemon 1
-  
-  ## The directory for keeping all the keys/etc. By default, we store
-  ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-! #DataDirectory @LOCALSTATEDIR@/lib/tor
-  
-  ## The port on which Tor will listen for local connections from Tor
-  ## controller applications, as documented in control-spec.txt.
---- 44,54 ----
-  ## Uncomment this to start the process in the background... or use
-  ## --runasdaemon 1 on the command line. This is ignored on Windows;
-  ## see the FAQ entry if you want Tor to run as an NT service.
-! RunAsDaemon 1
-  
-  ## The directory for keeping all the keys/etc. By default, we store
-  ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-! DataDirectory @LOCALSTATEDIR@/lib/tor
-  
-  ## The port on which Tor will listen for local connections from Tor
-  ## controller applications, as documented in control-spec.txt.
-***************
-*** 93,99 ****
-  #ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com>
-  
-  ## Required: what port to advertise for Tor connections.
-! #ORPort 9001
-  ## If you need to listen on a port other than the one advertised
-  ## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment the
-  ## line below too. You'll need to do ipchains or other port forwarding
---- 93,99 ----
-  #ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com>
-  
-  ## Required: what port to advertise for Tor connections.
-! ORPort 9001
-  ## If you need to listen on a port other than the one advertised
-  ## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment the
-  ## line below too. You'll need to do ipchains or other port forwarding
+--- src/config/torrc.sample.in	Mon May 25 10:38:04 2009
++++ src/config/torrc.sample.in.new	Tue Dec 15 06:33:03 2009
+@@ -32,12 +32,12 @@
+ ## We advise using "notice" in most cases, since anything more verbose
+ ## may provide sensitive information to an attacker who obtains the logs.
+ ##
+-## Send all messages of level 'notice' or higher to @LOCALSTATEDIR@/log/tor/notices.log
++## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
+ #Log notice file @LOCALSTATEDIR@/log/tor/notices.log
+-## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
+-#Log debug file @LOCALSTATEDIR@/log/tor/debug.log
++## Send every possible message to /var/log/tor/debug.log
++Log debug file @LOCALSTATEDIR@/log/tor/debug.log
+ ## Use the system log instead of Tor's logfiles
+-#Log notice syslog
++Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
+ 
+@@ -44,11 +44,11 @@
+ ## Uncomment this to start the process in the background... or use
+ ## --runasdaemon 1 on the command line. This is ignored on Windows;
+ ## see the FAQ entry if you want Tor to run as an NT service.
+-#RunAsDaemon 1
++RunAsDaemon 1
+ 
+ ## The directory for keeping all the keys/etc. By default, we store
+ ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
+-#DataDirectory @LOCALSTATEDIR@/lib/tor
++DataDirectory @LOCALSTATEDIR@/lib/tor
+ 
+ ## The port on which Tor will listen for local connections from Tor
+ ## controller applications, as documented in control-spec.txt.
+@@ -79,7 +79,7 @@
+ ## See https://www.torproject.org/docs/tor-doc-relay for details.
+ 
+ ## Required: what port to advertise for incoming Tor connections.
+-#ORPort 9001
++ORPort 9001
+ ## If you want to listen on a port other than the one advertised
+ ## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment the
+ ## line below too. You'll need to do ipchains or other port forwarding
Binary file usr/src/cmd/tor/tor-0.2.0.34.tar.gz has changed
Binary file usr/src/cmd/tor/tor-0.2.1.20.tar.gz has changed
--- a/usr/src/cmd/tree/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/tree/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtree
 PROJECT_URL:      http://mama.indstate.edu/users/ice/tree/
 SOURCE_DOWNLOAD:  ftp://mama.indstate.edu/linux/tree/tree-1.5.2.1.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/tree
 OSR:              10094
 COMMENTS:         
--- a/usr/src/cmd/unison/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/unison/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWunison
 PROJECT_URL:      http://www.cis.upenn.edu/~bcpierce/unison
 SOURCE_DOWNLOAD:  http://www.seas.upenn.edu/~bcpierce/unison//download/releases/stable/unison-2.27.57.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/unison
 OSR:              8438
 COMMENTS:         
--- a/usr/src/cmd/unrar/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/unrar/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:         Other
 PROJECT_URL:     http://www.rarlabs.com/rar_add.htm
 SOURCE_DOWNLOAD: http://www.rarlab.com/rar/unrarsrc-3.8.5.tar.gz
-SUPPORT:         Community
+SUPPORT:         C
 BUGTRAQ:         solaris/utility/unrar
 OSR:             8236
 COMMENTS:
--- a/usr/src/cmd/unzip/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/unzip/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWunzip
 PROJECT_URL:      http://www.info-zip.org/
 SOURCE_DOWNLOAD:  http://softlayer.dl.sourceforge.net/sourceforge/infozip/unz553h.zip
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/zip
 OSR:              9470
 COMMENTS:         
--- a/usr/src/cmd/vim/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/vim/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWvim
 PROJECT_URL:      http://www.vim.org
 SOURCE_DOWNLOAD:  ftp://ftp.vim.org/pub/vim/unix/vim72.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/vim
 OSR:              6372
 COMMENTS:         
--- a/usr/src/cmd/vim/runtime.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/vim/runtime.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \09/12/07*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \10/01/05*\\a[%*\\d]:\ Entering\ directory\ `%f',
 diff -Nur runtime.patched/compiler/jikes.vim runtime/compiler/jikes.vim
 --- runtime.patched/compiler/jikes.vim	2004-06-07 07:32:36.000000000 -0700
 +++ runtime/compiler/jikes.vim	2009-01-28 08:23:44.000000000 -0800
--- a/usr/src/cmd/webalizer/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/webalizer/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWwebalizer
 PROJECT_URL:      http://www.webalizer.org
 SOURCE_DOWNLOAD:  ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.20-01-src.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/webalizer
 OSR:              9546
 COMMENTS:         
--- a/usr/src/cmd/webmin/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/webmin/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWwebminr SUNWwebminu
 PROJECT_URL:      http://www.webmin.com
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/webadmin/webmin-1.340.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/webmin
 OSR:              8031
 COMMENTS:         
--- a/usr/src/cmd/wget/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/wget/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWwgetr SUNWwgetu
 PROJECT_URL:      http://www.gnu.org/software/wget/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/wget/wget-1.12.tar.bz2
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/wget
 OSR:              12242
 COMMENTS:         
--- a/usr/src/cmd/which/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/which/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-which
 PROJECT_URL:      http://www.xs4all.nl/~carlo17/which/
 SOURCE_DOWNLOAD:  http://www.xs4all.nl/~carlo17/which/which-2.16.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/gnu-which
 OSR:              6186
 COMMENTS:         
--- a/usr/src/cmd/wireshark/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/wireshark/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,11 @@
 NAME:             wireshark
-VERSION:          1.2.4
+VERSION:          1.2.5
 DESCRIPTION:      Wireshark Network protocol analyzer
 LICENSE:          GPLv3
 PACKAGE:          SUNWwireshark SUNWwiresharkr
 PROJECT_URL:      http://www.wireshark.org/
-SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.4.tar.bz2
-SUPPORT:          Managed
+SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.5.tar.bz2
+SUPPORT:          C
 BUGTRAQ:          solaris/network/wireshark
 OSR:              12637
 COMMENTS:         
--- a/usr/src/cmd/wireshark/Patches/bug4284.patch	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/wireshark/Patches/bug4284.patch	Sat Jan 16 18:11:20 2010 +0200
@@ -19,15 +19,15 @@
  
  	/*
  	 * To repeat:
---- wiretap/wtap.c.orig	Fri Dec  4 04:40:55 2009
-+++ wiretap/wtap.c	Fri Dec  4 04:46:21 2009
-@@ -439,7 +439,10 @@
- 	{ "USB packets with Linux header and padding", "usb-linux-mmap" },
+--- wiretap/wtap.c.orig	Fri Dec 18 01:18:39 2009
++++ wiretap/wtap.c	Fri Dec 18 01:19:32 2009
+@@ -445,8 +445,10 @@
+ 	{ "Digital Private Signalling System No 1 Link Layer", "dpnss_link" },
  
- 	/* WTAP_ENCAP_GSM_UM */
--	{ "GSM Um Interface", "gsm_um" }
-+	{ "GSM Um Interface", "gsm_um" },
-+
+ 	/* WTAP_ENCAP_PACKETLOGGER */
+-	{ "PacketLogger", "packetlogger" }
++	{ "PacketLogger", "packetlogger" },
+ 
 +	/* WTAP_ENCAP_IPNET */
 +	{ "Solaris IPNET", "ipnet" }
  };
Binary file usr/src/cmd/wireshark/wireshark-1.2.4.tar.bz2 has changed
Binary file usr/src/cmd/wireshark/wireshark-1.2.5.tar.bz2 has changed
--- a/usr/src/cmd/zip/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/zip/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWzip
 PROJECT_URL:      http://www.info-zip.org/Zip.html
 SOURCE_DOWNLOAD:  ftp://tug.ctan.org/tex-archive/tools/zip/info-zip/src/zip232.tgz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/utility/zip
 OSR:              6357
 COMMENTS:         
--- a/usr/src/cmd/zsh/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/cmd/zsh/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWzsh
 PROJECT_URL:      http://www.zsh.org/
 SOURCE_DOWNLOAD:  ftp://ftp.zsh.org/pub/zsh-4.3.9.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/zsh
 OSR:              3712
 COMMENTS:         
--- a/usr/src/lib/aalib/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/aalib/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWaalib
 PROJECT_URL:      http://aa-project.sourceforge.net/aalib
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/aa-project/aalib-1.4rc5.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/aalib
 OSR:              10595
 COMMENTS:
--- a/usr/src/lib/activation/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/activation/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          CDDLv1.0, GPLv2
 PROJECT_URL:      https://glassfish.dev.java.net/javaee5/mail
 SOURCE_DOWNLOAD:  ftp://tarballs.opensolaris.org/pub/activation-1.1.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/activation
 OSR:              11546
 COMMENTS:
--- a/usr/src/lib/ant/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/ant/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWant
 PROJECT_URL:      http://ant.apache.org
 SOURCE_DOWNLOAD:  http://www.apache.org/dist/ant/source/apache-ant-1.7.1-src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/ant
 OSR:              10141
 COMMENTS:         
--- a/usr/src/lib/antlr/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/antlr/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWantlr
 PROJECT_URL:	  http://www.antlr.org/
 SOURCE_DOWNLOAD:  http://www.antlr.org/download/antlr-3.0.tar.gz
-SUPPORT:	  Community
+SUPPORT:	  C
 BUGTRAQ:	  solaris/java_classes/antlr
 OSR:		  10875
 COMMENTS:
--- a/usr/src/lib/antlr2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/antlr2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWantlr2
 PROJECT_URL:      http://www.antlr2.org/
 SOURCE_DOWNLOAD:  http://www.antlr2.org/download/antlr-2.7.7.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/antlr
 OSR:              10871
 COMMENTS:         
--- a/usr/src/lib/cglib/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/cglib/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          ASLv2.0
 PROJECT_URL:      http://cglib.sourceforge.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/cglib/cglib-src-2.2.jar
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/cglib
 OSR:              10879
 COMMENTS:
--- a/usr/src/lib/commons-collections/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/commons-collections/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	SUNWcommons-collections
 PROJECT_URL:	http://commons.apache.org/collections/
 SOURCE_DOWNLOAD:	http://bluedogfan.com/mirrors/apache/commons/collections/source/commons-collections-3.2.1-src.tar.gz
-SUPPORT:	Community
+SUPPORT:	C
 BUGTRAQ:	solaris/java_classes/commons-collections
 OSR:		11357
 COMMENTS:
--- a/usr/src/lib/curl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/curl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWcurl
 PROJECT_URL:      http://curl.haxx.se/
 SOURCE_DOWNLOAD:  http://curl.haxx.se/download/curl-7.19.5.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/curl
 OSR:              5739
 COMMENTS:         
--- a/usr/src/lib/dom4j/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/dom4j/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          BSD
 PROJECT_URL:      http://www.dom4j.org/
 SOURCE_DOWNLOAD:  http://nchc.dl.sourceforge.net/sourceforge/dom4j/dom4j-1.6.1.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/dom4j
 OSR:              10642
 COMMENTS:
--- a/usr/src/lib/drools/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/drools/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWdrools
 PROJECT_URL:	  http://www.jboss.org/drools/
 SOURCE_DOWNLOAD:  http://download.jboss.org/drools/release/4.0.7.19894.GA/drools-4.0.7-src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/drools
 OSR:		  10885
 COMMENTS:
--- a/usr/src/lib/fastcgi/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/fastcgi/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          Other
 PROJECT_URL:      http://www.fastcgi.com
 SOURCE_DOWNLOAD:  http://www.fastcgi.com/dist/fcgi-2.4.0.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 OSR:	          11091
 BUGTRAQ:          solaris/library/fcgi
 COMMENTS:        
--- a/usr/src/lib/fftw2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/fftw2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWfftw2
 PROJECT_URL:      http://www.fftw.org/
 SOURCE_DOWNLOAD:  http://fftw.org/fftw-2.1.5.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libfftw
 OSR:              9148
 COMMENTS:         
--- a/usr/src/lib/fftw3/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/fftw3/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWfftw3
 PROJECT_URL:      http://www.fftw.org/
 SOURCE_DOWNLOAD:  http://fftw.org/fftw-3.1.2.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libfftw
 OSR:              9344
 COMMENTS:         
--- a/usr/src/lib/gd2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/gd2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgd2
 PROJECT_URL:      http://www.libgd.org/
 SOURCE_DOWNLOAD:  http://www.libgd.org/releases/gd-2.0.34.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/gd2
 OSR:              10150
 COMMENTS:         
--- a/usr/src/lib/gdbm/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/gdbm/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-dbm
 PROJECT_URL:      http://www.gnu.org/software/gdbm/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/gdbm/gdbm-1.8.3.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libgdbm
 OSR:              10742
 COMMENTS:         
--- a/usr/src/lib/glib/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/glib/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWGlib
 PROJECT_URL:      http://www.gtk.org
 SOURCE_DOWNLOAD:  http://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libglib
 OSR:              1387
 COMMENTS:         
--- a/usr/src/lib/gnump/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/gnump/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-mp
 PROJECT_URL:      http://gmplib.org/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/gmp/gmp-4.3.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/gnump
 OSR:              7582
 COMMENTS:         
--- a/usr/src/lib/gtk+/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/gtk+/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWGtkr SUNWGtku
 PROJECT_URL:      http://www.gtk.org
 SOURCE_DOWNLOAD:  http://ftp.gnome.org/pub/gnome/sources/gtk+/1.2/gtk+-1.2.10.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libglib
 OSR:              1397
 COMMENTS:         
--- a/usr/src/lib/idn/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/idn/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-idn
 PROJECT_URL:      http://www.gnu.org/software/libidn/
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/libidn/libidn-1.9.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libidn
 OSR:              10903
 COMMENTS:         
--- a/usr/src/lib/ilmbase/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/ilmbase/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWilmbase
 PROJECT_URL:      http://www.openexr.com/
 SOURCE_DOWNLOAD:  http://download.savannah.nongnu.org/releases/openexr/ilmbase-1.0.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/openexr
 OSR:              8322
 COMMENTS:         
--- a/usr/src/lib/imperius/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/imperius/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWImperius
 PROJECT_URL:      http://incubator.apache.org/imperius
 SOURCE_DOWNLOAD:  http://svn.apache.org/viewvc/incubator/imperius/tags/release01-feb08-2009.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/imperius
 OSR:              9167
 COMMENTS:         
--- a/usr/src/lib/janino/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/janino/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjanino
 PROJECT_URL:      http://www.janino.net/
 SOURCE_DOWNLOAD:  http://www.janino.net/download/janino-2.5.10.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/janino
 OSR:              10855
 COMMENTS:         
--- a/usr/src/lib/jarjar/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jarjar/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          ASLv2.0
 PROJECT_URL:      http://code.google.com/p/jarjar/
 SOURCE_DOWNLOAD:  http://jarjar.googlecode.com/files/jarjar-src-1.0rc8.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/jarjar
 OSR:              10877
 COMMENTS:
--- a/usr/src/lib/javamail/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/javamail/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjavamail
 PROJECT_URL:      https://glassfish.dev.java.net/javaee5/mail/
 SOURCE_DOWNLOAD:  https://glassfish.dev.java.net/source/browse/glassfish/mail/?only_with_tag=JAVAMAIL-1_4_1/mail-1.4.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/javamail
 OSR:              11528
 COMMENTS:         
--- a/usr/src/lib/jaxb/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jaxb/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:	  CDDLv1.0,GPL v2
 PROJECT_URL:	  https://jaxb.dev.java.net
 SOURCE_DOWNLOAD:  https://jaxb.dev.java.net/2.1.11/jaxb-ri-2_1_11.src.zip
-SUPPORT:	  Community
+SUPPORT:	  C
 BUGTRAQ:	  solaris/java_classes/jaxb
 OSR:		  11590
 COMMENTS:
--- a/usr/src/lib/jaxen-core/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jaxen-core/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjaxen-core
 PROJECT_URL:      http://jaxen.codehaus.org
 SOURCE_DOWNLOAD:  http://dist.codehaus.org/jaxen/distributions/jaxen-1.1.1-src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/jaxen-core
 OSR:              10868
 COMMENTS:         
--- a/usr/src/lib/jdom/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jdom/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          Apache
 PROJECT_URL:      http://www.jdom.org/
 SOURCE_DOWNLOAD:  http://www.jdom.org/dist/binary/jdom-1.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/jdom
 OSR:              8892
 COMMENTS:
--- a/usr/src/lib/jdtcore/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jdtcore/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjdtcore
 PROJECT_URL:      http://help.eclipse.org/help32/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_int_core.htm
 SOURCE_DOWNLOAD:  http://archive.eclipse.org/eclipse/downloads/drops/R-3.1-200506271435/download.php?dropFile=/eclipse-sourceBuild-srcIncluded-3.2.2.zip
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/jdt.core
 OSR:              10869
 COMMENTS:         
--- a/usr/src/lib/jettison/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jettison/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjettison
 PROJECT_URL:      http://jettison.codehaus.org
 SOURCE_DOWNLOAD:  http://repository.codehaus.org/org/codehaus/jettison/jettison/1.0/jettison-1.0-sources.jar
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/jettison
 OSR:              6251
 COMMENTS:         
--- a/usr/src/lib/joda-time/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/joda-time/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjodatime
 PROJECT_URL:      http://joda-time.sourceforge.net/
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/joda-time/joda-time-1.5.1-src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/joda-time
 OSR:              10851
 COMMENTS:         
--- a/usr/src/lib/jrexx/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jrexx/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWjrexx
 PROJECT_URL:	  http://www.karneim.com/jrexx/
 SOURCE_DOWNLOAD:  http://transact.dl.sourceforge.net/sourceforge/jrexx/jrexx-1.1.1-src.zip
-SUPPORT:	  Community
+SUPPORT:	  C
 BUGTRAQ:	  solaris/java_classes/jrexx
 OSR:		  11560
 COMMENTS:
--- a/usr/src/lib/junit/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/junit/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWjunit
 PROJECT_URL:      http://sourceforge.net/projects/junit/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/junit/junit4.5.zip
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/junit
 OSR:              8495
 COMMENTS:         
--- a/usr/src/lib/jxl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/jxl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          LGPL
 PROJECT_URL:      http://asm.objectweb.org/
 SOURCE_DOWNLOAD:  http://softlayer.dl.sourceforge.net/sourceforge/jexcelapi/jexcelapi_2_4_2.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/jxlapi-jxl
 OSR:              10891
 COMMENTS:
--- a/usr/src/lib/lcms/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/lcms/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlcms
 PROJECT_URL:      http://www.littlecms.com/
 SOURCE_DOWNLOAD:  http://www.littlecms.com/lcms-1.17.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/lcms
 OSR:              7572
 COMMENTS:         
--- a/usr/src/lib/libassuan/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libassuan/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnupg
 PROJECT_URL:      http://www.gnupg.org/related_software/libraries.en.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-1.0.5.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libassuan
 OSR:              12328
 COMMENTS:         Needed by parts of GnuPG
--- a/usr/src/lib/libconfuse/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libconfuse/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibconfuse
 PROJECT_URL:	  http://www.nongnu.org/confuse/
 SOURCE_DOWNLOAD:  http://bzero.se/confuse/confuse-2.6.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libconfuse
 OSR:              10577
 COMMENTS:
--- a/usr/src/lib/libedit/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libedit/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpostgr-82-client SUNWpostgr-83-client
 PROJECT_URL:      http://www.thrysoee.dk/editline/
 SOURCE_DOWNLOAD:  http://www.thrysoee.dk/editline/libedit-20061228-2.10.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7362
 COMMENTS:         
--- a/usr/src/lib/libevent/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libevent/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibevent
 PROJECT_URL:      http://monkey.org/~provos/libevent/
 SOURCE_DOWNLOAD:  http://monkey.org/~provos/libevent-1.3e.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libevent
 OSR:              10152
 COMMENTS:         
--- a/usr/src/lib/libexpat/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libexpat/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlexpt
 PROJECT_URL:      http://expat.sourceforge.net
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libexpat
 OSR:              6651
 COMMENTS:         
--- a/usr/src/lib/libksba/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libksba/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnupg
 PROJECT_URL:      http://www.gnupg.org/related_software/libksba/index.en.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnupg.org/gcrypt/libksba/libksba-1.0.6.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libksba
 OSR:              12327
 COMMENTS:         Needed by parts of GnuPG
--- a/usr/src/lib/libmcrypt/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libmcrypt/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibmcrypt
 PROJECT_URL:      http://mcrypt.sourceforge.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/solaris-crypto/libmcrypt
 OSR:              8280
 COMMENTS:         
--- a/usr/src/lib/libmemcached/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libmemcached/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibmemcached
 PROJECT_URL:      http://tangent.org/552/libmemcached.html
 SOURCE_DOWNLOAD:  http://download.tangent.org/libmemcached-0.16.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/database/memcached
 OSR:              8079
 COMMENTS:         
--- a/usr/src/lib/libmng/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libmng/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibmng
 PROJECT_URL:      http://www.libmng.com/
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/libmng/libmng-1.0.10.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libmng
 OSR:              7571
 COMMENTS:         
--- a/usr/src/lib/libneon/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libneon/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWneon
 PROJECT_URL:      http://www.webdav.org/neon/
 SOURCE_DOWNLOAD:  http://webdav.org/neon/neon-0.29.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/svn
 OSR:              4499
 COMMENTS:         
--- a/usr/src/lib/libneon/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libneon/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -19,10 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.7	09/09/26 SMI"
+#ident	"@(#)Makefile.sfw	1.8	10/01/04 SMI"
 
 # This makefile is unusual, because it builds both 32 and 64 bit
 # versions of the library.  The builds occur in separate subdirs,
@@ -91,6 +91,20 @@
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_POSIX_C_SOURCE=200112L
 CPPFLAGS +=  -D__XOPEN_OR_POSIX
 
+CONFIGURE_COMMON_ARGS = --mandir=/usr/share/man \
+			--localstatedir=/var \
+			--enable-shared \
+			--disable-static \
+			--enable-webdav \
+			--enable-threadsafe-ssl=posix \
+			--enable-nls \
+			--disable-warnings \
+			--disable-ld-version-script \
+			--with-zlib \
+			--with-ssl=openssl \
+			--with-libproxy \
+			--with-libxml2
+
 install: all .WAIT install32 install64
 	INSTDIR=$(DESTDIR) TOP=$(TOP) $(SH) ./install-sfw
 	INSTDIR=$(DESTDIR) TOP=$(TOP) MACH64=$(MACH64) $(SH) ./install-sfw-64
@@ -120,19 +134,7 @@
 	    PATH=$(SFW_PATH) \
 	    "MAKE=$(GMAKE)" \
 	    "PKG_CONFIG_PATH=$(PKG_CONFIG_PATH_32)" \
-	    ./configure --prefix=/usr \
-	    --mandir=/usr/share/man \
-	    --enable-shared \
-	    --disable-static \
-	    --enable-webdav \
-	    --enable-threadsafe-ssl=posix \
-	    --enable-nls \
-	    --disable-warnings \
-	    --disable-ld-version-script \
-	    --with-zlib \
-	    --with-ssl=openssl \
-	    --with-libproxy \
-	    --with-libxml2 )
+	    ./configure --prefix=/usr $(CONFIGURE_COMMON_ARGS) )
 
 $(VER64)/config.status: $(VER64)/configure
 	( cd $(VER64); \
@@ -149,18 +151,7 @@
 	    ./configure --prefix=/usr \
 	    --bindir=/usr/bin/$(MACH64) \
 	    --libdir=/usr/lib/$(MACH64) \
-	    --mandir=/usr/share/man \
-	    --enable-shared \
-	    --disable-static \
-	    --enable-webdav \
-	    --enable-threadsafe-ssl=posix \
-	    --enable-nls \
-	    --disable-warnings \
-	    --disable-ld-version-script \
-	    --with-zlib \
-	    --with-ssl=openssl \
-	    --without-libproxy \
-	    --with-libxml2 )
+	    $(CONFIGURE_COMMON_ARGS) )
 
 $(VER)/configure: $(VER).tar.gz
 	mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
--- a/usr/src/lib/libnet/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libnet/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibnet
 PROJECT_URL:      http://www.packetfactory.net/libnet/
 SOURCE_DOWNLOAD:  http://www.packetfactory.net/libnet/dist/deprecated/libnet-1.1.2.1.tar.gz
-SUPPORT:          Full
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libnet
 OSR:              9387
 COMMENTS:         
--- a/usr/src/lib/libosip2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libosip2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:        	SUNWlibosip2
 PROJECT_URL:		http://www.gnu.org/software/osip/
 SOURCE_DOWNLOAD:	http://ftp.gnu.org/gnu/osip/libosip2-3.3.0.tar.gz
-SUPPORT:        	Community
+SUPPORT:        	C
 BUGTRAQ:        	solaris/library/libosip2
 OSR:            	10948
 COMMENTS:
--- a/usr/src/lib/libpcap/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libpcap/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibpcap
 PROJECT_URL:      http://www.tcpdump.org
 SOURCE_DOWNLOAD:  http://www.tcpdump.org/release/libpcap-1.0.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libpcap
 OSR:              9013
 COMMENTS:         
--- a/usr/src/lib/librsync/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/librsync/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibrsync
 PROJECT_URL:      http://librsync.sourceforge.net/
 SOURCE_DOWNLOAD:  http://softlayer.dl.sourceforge.net/sourceforge/librsync/librsync-0.9.7.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/librsync
 OSR:              8465
 COMMENTS:         
--- a/usr/src/lib/libsigsegv/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libsigsegv/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibsigsegv
 PROJECT_URL:      http://libsigsegv.sourceforge.net/
 SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.6.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libsigsegv
 OSR:              10677
 COMMENTS:         
--- a/usr/src/lib/libsndfile/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libsndfile/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibsndfile
 PROJECT_URL:      http://www.mega-nerd.com/libsndfile/
 SOURCE_DOWNLOAD:  http://www.mega-nerd.com/libsndfile/libsndfile-1.0.17.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libsndfile
 OSR:              10263
 COMMENTS:         
--- a/usr/src/lib/libtorrent/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libtorrent/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWlibtorrent
 PROJECT_URL:		http://libtorrent.rakshasa.no/
 SOURCE_DOWNLOAD:	http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.2.tar.gz
-SUPPORT:		Community
+SUPPORT:		C
 BUGTRAQ:		solaris/utility/bittorrent
 OSR:			11082
 COMMENTS:
--- a/usr/src/lib/libusb/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libusb/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibusb
 PROJECT_URL:      http://libusb.sf.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/libusb/libusb-1.0.0.tar.bz2/METADATA
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libusb
 OSR:              1930
 COMMENTS:         
--- a/usr/src/lib/libusbugen/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libusbugen/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibusbugen
 PROJECT_URL:      http://www.opensolaris.org/os/
 SOURCE_DOWNLOAD:  http://www.opensolaris.org/os/METADATA
-SUPPORT:          Full
+SUPPORT:          A
 BUGTRAQ:          solaris/library/libusb
 OSR:              1930
 COMMENTS:         
--- a/usr/src/lib/libxml2/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libxml2/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlxml-devel SUNWlxml SUNWlxml-python SUNWlxml-python26 SUNWlxmlr
 PROJECT_URL:      http://xmlsoft.org
 SOURCE_DOWNLOAD:  ftp://xmlsoft.org/libxml2/libxml2-2.7.6.tar.gz
-SUPPORT:          Full
+SUPPORT:          A
 BUGTRAQ:          solaris/library/libxml
 OSR:              8697
 COMMENTS:         "globals.patch" makes some private functions public.
--- a/usr/src/lib/libxmlrpc-c/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libxmlrpc-c/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibxmlrpc-c
 PROJECT_URL:      http://xmlrpc-c.sourceforge.net/
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/xmlrpc-c/xmlrpc-c-1.06.32.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libxmlrpc
 OSR:              10610
 COMMENTS:
--- a/usr/src/lib/libxslt/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libxslt/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlxsl-devel SUNWlxsl
 PROJECT_URL:      http://xmlsoft.org/XSLT
 SOURCE_DOWNLOAD:  ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libxslt
 OSR:              13049
 COMMENTS:         
--- a/usr/src/lib/libyaz/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/libyaz/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibyaz
 PROJECT_URL:      http://www.indexdata.dk/yaz
 SOURCE_DOWNLOAD:  http://ftp.indexdata.dk/pub/yaz/yaz-3.0.46.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/yaz
 OSR:              11329
 COMMENTS:         
--- a/usr/src/lib/log4j/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/log4j/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          ASLv2.0
 PROJECT_URL:      http://logging.apache.org/log4j/1.2/index.html
 SOURCE_DOWNLOAD:  http://www.apache.org/dyn/closer.cgi/logging/log4j/1.2.15/apache-log4j-1.2.15.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/log4j
 OSR:              10878
 COMMENTS:
--- a/usr/src/lib/logilab-astng/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/logilab-astng/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlogilab-astng
 PROJECT_URL: 	  http://www.logilab.org/project/logilab-astng
 SOURCE_DOWNLOAD:  http://ftp.logilab.org/pub/astng/logilab-astng-0.19.0.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/logilab-astng
 OSR:              7346
 COMMENTS:
--- a/usr/src/lib/logilab-common/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/logilab-common/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWlogilab-common
 PROJECT_URL:		http://www.logilab.org/project/logilab-common/
 SOURCE_DOWNLOAD:	http://ftp.logilab.org/pub/common/logilab-common-0.40.0.tar.gz
-SUPPORT:		Community
+SUPPORT:		C
 BUGTRAQ:		solaris/library/logilab-common
 OSR:			7347
 COMMENTS:
--- a/usr/src/lib/memcached-java/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/memcached-java/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmemcached-java
 PROJECT_URL:      http://whalin.com/memcached/
 SOURCE_DOWNLOAD:  http://img.whalin.com/memcached/jdk5/standard/java_memcached-release_2.0.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/database/memcached
 OSR:              10029
 COMMENTS:         
--- a/usr/src/lib/memcached/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/memcached/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmemcached
 PROJECT_URL:      http://www.danga.com/memcached/
 SOURCE_DOWNLOAD:  http://memcached.googlecode.com/files/memcached-1.4.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/database/memcached
 OSR:              10029
 COMMENTS:         
--- a/usr/src/lib/mpfr/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/mpfr/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-mpfr
 PROJECT_URL:      http://www.mpfr.org/
 SOURCE_DOWNLOAD:  http://www.mpfr.org/mpfr-current/mpfr-2.4.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libmpfr
 OSR:              8536
 COMMENTS:         
--- a/usr/src/lib/mvel/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/mvel/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWmvel
 PROJECT_URL:      http://mvel.codehaus.org/
 SOURCE_DOWNLOAD:  http://dist.codehaus.org/mvel/mvel-1.2.22-java1.5.0.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/mvel
 OSR:              10834
 COMMENTS:         
--- a/usr/src/lib/objectasm/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/objectasm/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWobjectasm
 PROJECT_URL:      http://asm.objectweb.org/
 SOURCE_DOWNLOAD:  http://download.forge.objectweb.org/asm/asm-3.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/objectweb
 OSR:              10853
 COMMENTS:         
--- a/usr/src/lib/openexr/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/openexr/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWopenexr
 PROJECT_URL:      http://www.openexr.com
 SOURCE_DOWNLOAD:  http://download.savannah.nongnu.org/releases/openexr/openexr-1.6.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/openexr
 OSR:              8311
 COMMENTS:         
--- a/usr/src/lib/openssl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/openssl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWopenssl-commands SUNWopenssl-include SUNWopenssl-libraries SUNWopenssl-man SUNWopensslr
 PROJECT_URL:		http://openssl.org
 SOURCE_DOWNLOAD:	http://openssl.org/source/openssl-0.9.8l.tar.gz
-SUPPORT:		Full
+SUPPORT:		A
 BUGTRAQ:		solaris/solaris-crypto/openssl
 OSR:			11726
 COMMENTS:
--- a/usr/src/lib/openssl/fips/openssl-fips/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/openssl/fips/openssl-fips/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWopenssl-fips-140 SUNWopenssl-fips-140-include
 PROJECT_URL:		http://openssl.org
 SOURCE_DOWNLOAD:	http://openssl.org/source/openssl-fips-1.2.tar.gz
-SUPPORT:		Full
+SUPPORT:		A
 BUGTRAQ:		solaris/solaris-crypto/openssl
 OSR:			11726
 COMMENTS:
--- a/usr/src/lib/openusb/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/openusb/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibopenusb
 PROJECT_URL:      http://openusb.sourceforge.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/openusb/libopenusb-1.0.1.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libopenusb
 OSR:              7150
 COMMENTS:         
--- a/usr/src/lib/pam_pkcs11/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/pam_pkcs11/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpampkcs11u SUNWpampkcs11r SUNWpampkcs11-docs
 PROJECT_URL:      http://www.opensc-project.org
 SOURCE_DOWNLOAD:  http://www.opensc-project.org/files/pam_pkcs11/pam_pkcs11-0.6.0.tar.gz
-SUPPORT:          Full
+SUPPORT:          A
 BUGTRAQ:          solaris/pam/pkcs11_scheme
 OSR:              6596
 COMMENTS:         
--- a/usr/src/lib/pcre/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/pcre/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpcre
 PROJECT_URL:      http://www.pcre.org/
 SOURCE_DOWNLOAD:  ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.8.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/pcre
 OSR:              6797
 COMMENTS:         
--- a/usr/src/lib/perl_net_ssleay/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/perl_net_ssleay/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:		SUNWperl-net-ssleay
 PROJECT_URL:		http://search.cpan.org/dist/Net-SSLeay
 SOURCE_DOWNLOAD:	http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Net-SSLeay-1.35.tar.gz
-SUPPORT:		Managed
+SUPPORT:		C
 BUGTRAQ:		solaris/solaris-crypto/openssl
 OSR:			11035
 COMMENTS:		No modifications.
--- a/usr/src/lib/pmdbi/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/pmdbi/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpmdbdpg
 PROJECT_URL:      http://dbi.perl.org/
 SOURCE_DOWNLOAD:  http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-1.58.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              6390
 COMMENTS:         
--- a/usr/src/lib/pth/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/pth/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpth
 PROJECT_URL:      http://www.gnu.org/software/pth
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/pth/pth-2.0.7.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/pth
 OSR:              12329
 COMMENTS:         Needed by parts of GnuPG
--- a/usr/src/lib/pull-parser/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/pull-parser/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          BSD-like
 PROJECT_URL:      http://www.extreme.indiana.edu/xgws/xsoap/xpp/
 SOURCE_DOWNLOAD:  http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tgz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/pull-parser
 OSR:              10880
 COMMENTS:
--- a/usr/src/lib/pyopenssl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/pyopenssl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -4,8 +4,8 @@
 LICENSE:          LGPLv2.1
 PACKAGE:          SUNWpython-pyopenssl
 PROJECT_URL:      http://pyopenssl.sourceforge.net
-SOURCE_DOWNLOAD:  http://kent.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-0.8.tar.gz
-SUPPORT:          Community
+SOURCE_DOWNLOAD:  http://kent.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-0.8.tar.gz/METADATA
+SUPPORT:          C
 BUGTRAQ:          solaris/solaris-crypto/openssl
 OSR:              8916
 COMMENTS:
--- a/usr/src/lib/python26-pyopenssl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/python26-pyopenssl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWpython26-pyopenssl
 PROJECT_URL:      http://sourceforge.net/projects/pyopenssl
 SOURCE_DOWNLOAD:  http://kent.dl.sourceforge.net/sourceforge/pyopenssl/pyOpenSSL-0.8.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/solaris-crypto/openssl
 OSR:              8916
 COMMENTS:         
--- a/usr/src/lib/pywbem/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/pywbem/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWpywbem
 PROJECT_URL:	  http://pywbem.sf.net
 SOURCE_DOWNLOAD:  http://kent.dl.sourceforge.net/sourceforge/pywbem/pywbem-0.7.0.tar.gz
-SUPPORT:	  Community
+SUPPORT:	  C
 BUGTRAQ:	  solaris/utility/pywbem
 OSR:              11501
 COMMENTS:	  A pure-Python library for performing operations using the WBEM
--- a/usr/src/lib/qdox/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/qdox/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWqdox
 PROJECT_URL:	  http://qdox.codehaus.org/
 SOURCE_DOWNLOAD:  http://repository.codehaus.org/com/thoughtworks/qdox/qdox/1.9/qdox-1.9-sources.jar
-SUPPORT:	  Community
+SUPPORT:	  C
 BUGTRAQ:	  solaris/java_classes/qdox
 OSR:		  11557
 COMMENTS:
--- a/usr/src/lib/readline/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/readline/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWgnu-readline
 PROJECT_URL:      http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/readline/readline-5.2.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/readline
 OSR:              6106
 COMMENTS:         
--- a/usr/src/lib/relaxngDatatype/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/relaxngDatatype/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWrelaxngDatatype
 PROJECT_URL:      http://www.thaiopensource.com/relaxng/pluggable-datatypes.html
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/relaxng/relaxngDatatype-1.0.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/relaxng-datatype
 OSR:              10852
 COMMENTS:         
--- a/usr/src/lib/saaj/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/saaj/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:         SUNWsaaj
 PROJECT_URL:     https://saaj.dev.java.net/
 SOURCE_DOWNLOAD: ftp://tarballs.opensolaris.org/pub/saaj-1.3.2.tar.gz
-SUPPORT:         Community
+SUPPORT:         C
 BUGTRAQ:         solaris/java_classes/saaj
 OSR:             11592
 COMMENTS:
--- a/usr/src/lib/sane-backends/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/sane-backends/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsane-backendr SUNWsane-backendu
 PROJECT_URL:      http://www.sane-project.org
 SOURCE_DOWNLOAD:  ftp://ftp.sane-project.org/pub/sane/sane-backends-1.0.19/sane-backends-1.0.19.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libsane
 OSR:              2753
 COMMENTS:         
--- a/usr/src/lib/sblim/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/sblim/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWSblimCimClient
 PROJECT_URL:      http://sblim.wiki.sourceforge.net/CimClient
 SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/sblim/sblim-cim-client-1.3.7-src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/wbem/sblimcimclient
 OSR:              10810
 COMMENTS:         
--- a/usr/src/lib/slang/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/slang/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -1,11 +1,12 @@
 NAME:             slang
-VERSION:          2.1.3
-DESCRIPTION:      library designed to allow a developer to create robust multi-platform software
+VERSION:          2.2.2
+DESCRIPTION:      Library designed to allow a developer to create robust multi-platform software
 LICENSE:          GPLv2
 PACKAGE:          SUNWslang SUNWslangr
 PROJECT_URL:      http://www.s-lang.org/
-SOURCE_DOWNLOAD:  ftp://space.mit.edu/pub/davis/slang/v2.1/slang-2.1.3.tar.bz2
-SUPPORT:          Managed
+SOURCE_DOWNLOAD:  ftp://space.mit.edu/pub/davis/slang/v2.2/slang-2.2.2.tar.bz2
+SUPPORT:          C
 BUGTRAQ:          solaris/utility/slang
 OSR:              9851
 COMMENTS:         
+	S-Lang is a multi-platform programmer's library designed to allow a developer to create robust multi-platform software.
--- a/usr/src/lib/slang/Makefile.sfw	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/slang/Makefile.sfw	Sat Jan 16 18:11:20 2010 +0200
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -16,13 +15,16 @@
 # 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 2008 Sun Microsystems, Inc.  All rights reserved.
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile.sfw	1.1	08/04/30 SMI"
+
+#ident	"@(#)Makefile.sfw	1.2	09/12/19 SMI"
 
 include ../Makefile.lib
 
@@ -30,52 +32,75 @@
 # Macros
 #
 
-VER = 2.1.3
-PROJECT = slang
+VER = $(COMPONENT_VERSION:sh)
+PROJECT = $(COMPONENT_NAME:sh)
 PROD = $(PROJECT)-$(VER)
 PROD64 = $(PROD)-64
 PKG = SUNW$(PROJECT)
 BZFILE = $(PROD).tar.bz2
 
 POST_PROCESS_BIN = $(SRC)/tools/post_process \
-	$(ROOT)/usr/bin/slsh
+	$(ROOTBIN)/slsh
 
 POST_PROCESS_LIB32 = $(SRC)/tools/post_process_so \
-	$(ROOT)/usr/lib/libslang.so.$(VER) \
-	$(ROOT)/usr/lib/slang/v2/modules/*.so
+	$(ROOTLIB)/libslang.so.$(VER) \
+	$(ROOTLIB)/slang/v2/modules/*.so
 
 POST_PROCESS_LIB64 = $(SRC)/tools/post_process_so \
-	$(ROOT)/usr/lib/$(MACH64)/libslang.so.$(VER) \
-	$(ROOT)/usr/lib/$(MACH64)/slang/v2/modules/*.so
+	$(ROOTLIB64)/libslang.so.$(VER) \
+	$(ROOTLIB64)/slang/v2/modules/*.so
 
 POST_PROCESS_MAN = $(SRC)/tools/sunman \
 	-n "$(PROJECT)" -p "$(PKG)" -s Volatile \
-	$(ROOT)/usr/share/man/man1/slsh.1
+	$(ROOTMAN1)/slsh.1
+
+# Options for configure script
+CONFIGURE_OPTIONS += --sysconfdir=$(CFGETC)/slsh
+CONFIGURE_OPTIONS += --with-pcre="$(ROOT)$(CFGPREFIX)"
+CONFIGURE_OPTIONS += --with-pcreinc="$(ROOTINCLUDE)/pcre"
+CONFIGURE_OPTIONS += --with-z="$(ROOT)$(CFGPREFIX)"
+
+#
+# Targets
+#
+
+all: all32 all64
+
+$(PROD)/configure $(PROD64)/configure: $(BZFILE)
+	$(MKDIR) -p tmp
+	/usr/bin/bzcat $^ | (cd tmp; $(TAR) xopf -)
+	$(MV) tmp/$(PROD) $(@D)
+	$(RMDIR) tmp
+	$(TOUCH) $@
+
+install: install32 install64
+
+clean:
+	-rm -rf $(PROD) $(PROD64)
+
+install_h:
 
 #
 # Targets (32-bit)
 #
 
 $(PROD)/config.status: $(PROD)/configure
-	(cd $(PROD); ./configure \
-	    --prefix=/usr \
-	    --sysconfdir=/etc/slsh \
+	(cd $(PROD); env - ./configure \
+	    $(CONFIGURE_OPTIONS) \
 	    CC="$(CC)" \
 	    CFLAGS="$(CFLAGS) $(C99_DISABLE) $(XREGSFLAG)" \
 	    LDFLAGS="$(LDFLAGS.lib) \
-		-L$(ROOT)/usr/lib \
 		-M $(SRC)/cmd/mapfile_noexstk \
 		-z ignore" \
 	    MAKE=$(CCSMAKE))
 
 all32: $(PROD)/config.status
-	(cd $(PROD); $(CCSMAKE) MAKE=$(CCSMAKE))
+	(cd $(PROD); env - $(CCSMAKE) MAKE=$(CCSMAKE))
 
 install32: all32
-	(cd $(PROD); $(CCSMAKE) install \
+	(cd $(PROD); env - $(CCSMAKE) -e install \
 	    MAKE=$(CCSMAKE) \
-	    DESTDIR="$(ROOT)" \
-	    INSTALL=/usr/bin/ginstall)
+	    DESTDIR="$(ROOT)")
 	$(POST_PROCESS_BIN)
 	$(POST_PROCESS_LIB32)
 	$(POST_PROCESS_MAN)
@@ -85,52 +110,26 @@
 #
 
 $(PROD64)/config.status: $(PROD64)/configure
-	(cd $(PROD64); ./configure \
-	    --prefix=/usr \
-	    --sysconfdir=/etc/slsh \
-	    --libdir=/usr/lib/$(MACH64) \
+	(cd $(PROD64); env - ./configure \
+	    $(CONFIGURE_OPTIONS) \
+	    --libdir=$(CFGLIB64) \
 	    CC="$(CC64)" \
 	    CFLAGS="$(CFLAGS64) $(C99_DISABLE) $(XREGSFLAG)" \
 	    LDFLAGS="$(CFLAGS64) $(LDFLAGS.lib) \
-		-L$(ROOT)/usr/lib \
-		-L$(ROOT)/usr/lib/$(MACH64) \
-		-L/usr/sfw/lib/$(MACH64) \
-		-R/usr/sfw/lib/$(MACH64) \
 		-M $(SRC)/cmd/mapfile_noexstk \
 		-z ignore" \
 	    MAKE=$(CCSMAKE))
 
 all64: $(PROD64)/config.status
-	(cd $(PROD64); $(CCSMAKE) MAKE=$(CCSMAKE))
+	(cd $(PROD64); env - $(CCSMAKE) MAKE=$(CCSMAKE))
 
 install64: all64
-	(cd $(PROD64); $(CCSMAKE) install \
+	(cd $(PROD64); env - $(CCSMAKE) -e install \
 	    MAKE=$(CCSMAKE) \
-	    DESTDIR="`/bin/pwd`/.install" \
-	    INSTALL=/usr/bin/ginstall)
-	$(MKDIR) -p $(ROOT)/usr/lib/$(MACH64)
-	(cd $(PROD64)/.install/usr/lib/$(MACH64); $(TAR) cpf - .) | \
-	    (cd $(ROOT)/usr/lib/$(MACH64); $(TAR) xpf -)
+	    DESTDIR="`/bin/pwd`/.install")
+	$(MKDIR) -p $(ROOTLIB64)
+	(cd $(PROD64)/.install/$(CFGLIB64); $(TAR) cpf - .) | \
+	    (cd $(ROOTLIB64); $(TAR) xpf -)
 	$(POST_PROCESS_LIB64)
 
-#
-# Targets
-#
-
-$(PROD)/configure $(PROD64)/configure: $(BZFILE)
-	$(MKDIR) -p tmp
-	/usr/bin/bzcat $^ | (cd tmp; $(TAR) xopf -)
-	$(MV) tmp/$(PROD) $(@D)
-	/usr/bin/rmdir tmp
-	$(TOUCH) $@
-
-all: all32 all64
-
-install: install32 install64
-
-clean:
-	-rm -rf $(PROD) $(PROD64)
-
-install_h:
-
 include ../Makefile.targ
Binary file usr/src/lib/slang/slang-2.1.3.tar.bz2 has changed
Binary file usr/src/lib/slang/slang-2.2.2.tar.bz2 has changed
--- a/usr/src/lib/slib/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/slib/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWslib
 PROJECT_URL:      http://www.swiss.ai.mit.edu/~jaffer/SLIB
 SOURCE_DOWNLOAD:  http://groups.csail.mit.edu/mac/ftpdir/scm/slib-3b1.zip
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/slib
 OSR:              8419
 COMMENTS:         
--- a/usr/src/lib/snack/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/snack/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsnack
 PROJECT_URL:      http://www.speech.kth.se/snack/
 SOURCE_DOWNLOAD:  http://www.speech.kth.se/snack/dist/snack-2.2.10.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libsnack
 OSR:              9115
 COMMENTS:         
--- a/usr/src/lib/sqlite3/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/sqlite3/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWsqlite3 SUNWsqlite3docs SUNWsqlite3tcl
 PROJECT_URL:      http://sqlite.org/download.html
 SOURCE_DOWNLOAD:  http://sqlite.org/sqlite-3.6.17.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/database/sqlite3
 OSR:              7854
 COMMENTS:         
--- a/usr/src/lib/stdcxx4/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/stdcxx4/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWlibstdcxx4
 PROJECT_URL:      http://stdcxx.apache.org/
 SOURCE_DOWNLOAD:  http://www.apache.org/dist/stdcxx/stdcxx-4.2.1.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libstdcxx
 OSR:              7432
 COMMENTS:
--- a/usr/src/lib/stringtemplate/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/stringtemplate/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWstringtemplate
 PROJECT_URL:	  http://www.stringtemplate.org/
 SOURCE_DOWNLOAD:  http://www.stringtemplate.org/download/stringtemplate-3.2.tar.gz
-SUPPORT:	  Community
+SUPPORT:	  C
 BUGTRAQ:          solaris/java_classes/stringtemplate
 OSR:		  10876
 COMMENTS:
--- a/usr/src/lib/tcl/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/tcl/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWTcl
 PROJECT_URL:      http://www.tcl.tk
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/tcl/tcl8.4.18-src.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libtcl
 OSR:              9895
 COMMENTS:         
--- a/usr/src/lib/tcltls/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/tcltls/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtcltls
 PROJECT_URL:      http://tls.sourceforge.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/tls/tls1.6-src.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libtls
 OSR:              8869
 COMMENTS:         
--- a/usr/src/lib/tidy/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/tidy/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtidy
 PROJECT_URL:      http://tidy.sourceforge.net/
 SOURCE_DOWNLOAD:  http://tidy.sourceforge.net/tidy-1.0.0.tar.gz
-SUPPORT:          Managed
+SUPPORT:          C
 BUGTRAQ:          solaris/library/tidy
 OSR:              5741
 COMMENTS:         
--- a/usr/src/lib/tk/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/tk/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWTk
 PROJECT_URL:      http://www.tcl.tk
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/tk/tk8.4.18-src.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libtk
 OSR:              6519
 COMMENTS:         
--- a/usr/src/lib/trousers/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/trousers/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWtss SUNWtss-root
 PROJECT_URL:      http://trousers.sourceforge.net/
 SOURCE_DOWNLOAD:  http://superb-west.dl.sourceforge.net/sourceforge/trousers/trousers-0.3.2.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/solaris-crypto/tss
 OSR:              9998
 COMMENTS:         
--- a/usr/src/lib/trove/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/trove/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:	  SUNWtrove
 PROJECT_URL:	  http://www.trove4j.sourceforge.net/
 SOURCE_DOWNLOAD:  http://ftp.heanet.ie/disk1/sourceforge/t/tr/trove4j/trove-2.0.4.tar.gz
-SUPPORT:	  Community
+SUPPORT:	  C
 BUGTRAQ:	  solaris/java_classes/trove
 OSR:		  11558
 COMMENTS:	  
--- a/usr/src/lib/unixodbc/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/unixodbc/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWunixodbcr SUNWunixodbc
 PROJECT_URL:      http://unixodbc.org/
 SOURCE_DOWNLOAD:  http://www.unixodbc.org/unixODBC-2.2.14.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/unixodbc
 OSR:              5444
 COMMENTS:         
--- a/usr/src/lib/usb_ccid_ifd/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/usb_ccid_ifd/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWusbccid
 PROJECT_URL:      http://www.musclecard.com/
 SOURCE_DOWNLOAD:  https://alioth.debian.org/frs/download.php/116/mcardapplet-0.9.10.tar.gz/METADATA
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/libusb
 OSR:              6629
 COMMENTS:         
--- a/usr/src/lib/wiseman/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/wiseman/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:       	  SUNWwisemanu SUNWwisemanr
 PROJECT_URL:      https://wiseman.dev.java.net
 SOURCE_DOWNLOAD:  ftp://tarballs.opensolaris.org/pub/wiseman-1.0.tar.bz2
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/wiseman
 OSR:              10652
 COMMENTS:
--- a/usr/src/lib/wxwidgets/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/wxwidgets/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWwxwidgets SUNWwxwidgets-devel
 PROJECT_URL:      http://www.wxwidgets.org
 SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/wxwindows/wxGTK-2.8.10.tar.gz
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/library/wxwidgets
 OSR:              9254
 COMMENTS:         
--- a/usr/src/lib/xom/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/xom/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          LGPLv2.1
 PROJECT_URL:      http://www.xom.nu
 SOURCE_DOWNLOAD:  ftp://tarballs.opensolaris.org/pub/xom-1.1-all-src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/xom
 OSR:              10881
 COMMENTS:
--- a/usr/src/lib/xpp3-min/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/xpp3-min/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWxpp3min
 PROJECT_URL:      http://www.extreme.indiana.edu/xgws/xsoap/xpp/
 SOURCE_DOWNLOAD:  http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-1.1.4c_src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/xpp3_min
 OSR:              10870
 COMMENTS:         
--- a/usr/src/lib/xsdlib/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/xsdlib/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          ASLv1.1
 PROJECT_URL:      http://vmgump.apache.org/gump/public/msv/xsdlib/index.html
 SOURCE_DOWNLOAD:  https://msv.dev.java.net/files/documents/61/132421/xsdlib.20090415.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/xsdlib
 OSR:              10854
 COMMENTS:
--- a/usr/src/lib/xstream/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/xstream/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 LICENSE:          BSD
 PROJECT_URL:      http://xstream.codehaus.org
 SOURCE_DOWNLOAD:  http://repository.codehaus.org/com/thoughtworks/xstream/xstream-distribution/1.3/xstream-distribution-1.3-src.zip
-SUPPORT:          Community
+SUPPORT:          C
 BUGTRAQ:          solaris/java_classes/xstream
 OSR:              10193
 COMMENTS:
--- a/usr/src/lib/zlib/METADATA	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/lib/zlib/METADATA	Sat Jan 16 18:11:20 2010 +0200
@@ -5,7 +5,7 @@
 PACKAGE:          SUNWzlibr SUNWzlib
 PROJECT_URL:      http://www.zlib.net
 SOURCE_DOWNLOAD:  http://www.zlib.net/zlib-1.2.3.tar.gz
-SUPPORT:          Managed
+SUPPORT:          B
 BUGTRAQ:          solaris/library/libz
 OSR:              5831
 COMMENTS:         
--- a/usr/src/pkgdefs/SUNWapch22r-fcgid/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWapch22r-fcgid/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)prototype_com	1.6	09/11/13 SMI"
+# ident	"@(#)prototype_com	1.7	09/12/14 SMI"
 #
 # SUNWapch22r-fcgid
 #
@@ -35,7 +35,6 @@
 d none etc 755 root sys
 d none etc/apache2 0755 root bin
 d none etc/apache2/2.2 0755 root bin
-d none etc/apache2/2.2/samples-conf.d 0755 root bin
 d none etc/apache2/2.2/conf.d 0755 root bin
 e renamenew etc/apache2/2.2/conf.d/fcgid.conf 0644 root bin
 
--- a/usr/src/pkgdefs/SUNWbind/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWbind/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.7	09/07/12 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/14 SMI"
 
 #
 # This required package information file describes characteristics of the
@@ -40,7 +40,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="BIND DNS Name server (9.6.1)"
+DESC="BIND DNS Name server (9.6.1-P2)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWbindc/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWbindc/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.1	09/07/12 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/14 SMI"
 
 #
 # This required package information file describes characteristics of the
@@ -40,7 +40,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="BIND DNS tools (9.6.1)"
+DESC="BIND DNS tools (9.6.1-P2)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWbindc/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWbindc/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 #
 
-#pragma ident	"@(#)prototype_com	1.1	09/07/12 SMI"
+#pragma ident	"@(#)prototype_com	1.2	09/12/14 SMI"
 
 #
 # This file was auto-generated.  Refer to Makefile target prototype_com.new.
@@ -54,9 +54,9 @@
 f none usr/lib/dns/libbind9.so.50.0.3 555 root bin
 s none usr/lib/dns/libbind9.so.50=libbind9.so.50.0.3
 s none usr/lib/dns/libbind9.so=libbind9.so.50.0.3
-f none usr/lib/dns/libdns.so.50.2.0 555 root bin
-s none usr/lib/dns/libdns.so.50=libdns.so.50.2.0
-s none usr/lib/dns/libdns.so=libdns.so.50.2.0
+f none usr/lib/dns/libdns.so.53.0.0 555 root bin
+s none usr/lib/dns/libdns.so.53=libdns.so.53.0.0
+s none usr/lib/dns/libdns.so=libdns.so.53.0.0
 f none usr/lib/dns/libisc.so.50.1.1 555 root bin
 s none usr/lib/dns/libisc.so.50=libisc.so.50.1.1
 s none usr/lib/dns/libisc.so=libisc.so.50.1.1
--- a/usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-gtk/depend	Sat Jan 16 18:11:20 2010 +0200
@@ -17,7 +17,7 @@
 #
 # CDDL HEADER END
 #
-#  ident	"@(#)depend	1.3	09/10/29 SMI"
+#  ident	"@(#)depend	1.4	09/12/14 SMI"
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -62,6 +62,7 @@
 P SUNWjpg       jpeg - The Independent JPEG Groups JPEG software
 P SUNWlibatk    GNOME accesibility toolkit libraries
 P SUNWlibmsr    Math & Microtasking Libraries (Root)
+P SUNWlibms	Math & Microtasking Libraries (Usr)
 P SUNWlibrsvg   SVG-format scalable graphics support library
 P SUNWmlib      mediaLib - Shared Libraries
 P SUNWpango     GNOME core text and font handling libraries
@@ -72,3 +73,4 @@
 P SUNWxwplt     X Window System platform software
 P SUNWxwxft     Xft (X Freetype) Library
 P SUNWzlibr     The Zip compression library (Root)
+P SUNWzlib	The Zip compression library
--- a/usr/src/pkgdefs/SUNWgnu-emacs-x/depend	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWgnu-emacs-x/depend	Sat Jan 16 18:11:20 2010 +0200
@@ -17,7 +17,7 @@
 #
 # CDDL HEADER END
 #
-#  ident	"@(#)depend	1.2	09/10/29 SMI"
+#  ident	"@(#)depend	1.3	09/12/14 SMI"
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -61,6 +61,7 @@
 P SUNWgtk2      GTK+ - GIMP toolkit libraries
 P SUNWjpg       jpeg - The Independent JPEG Groups JPEG software
 P SUNWlibmsr    Math & Microtasking Libraries (Root)
+P SUNWlibms	Math & Microtasking Libraries (Usr)
 P SUNWlibrsvg   SVG-format scalable graphics support library
 P SUNWmlib      mediaLib - Shared Libraries
 P SUNWpng       Portable Network Graphics library
@@ -69,3 +70,4 @@
 P SUNWxwplt     X Window System platform software
 P SUNWxwxft     Xft (X Freetype) Library
 P SUNWzlibr     The Zip compression library (Root)
+P SUNWzlib	The Zip compression library
--- a/usr/src/pkgdefs/SUNWlablgtk/depend	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWlablgtk/depend	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)depend	1.3	09/05/21 SMI"
+#ident	"@(#)depend	1.4	09/12/14 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -62,6 +62,7 @@
 P SUNWfreetype2		FreeType2 Font library
 P SUNWfontconfig	Fontconfig library
 P SUNWlxmlr	The XML library (Root)
+P SUNWlxml	The XML library
 P SUNWmlib	mediaLib shared libraries
 P SUNWxorg-clientlibs	X.Org Foundation X Client Libraries
 P SUNWxwice	X Window System Inter-Client Exchange (ICE) Components
@@ -75,3 +76,4 @@
 P SUNWlibgnomecanvas	GNOME canvas library
 P SUNWlibart	GNOME library for high-performace 2D graphics
 P SUNWlibglade	GNOME library for loading GLADE interfaces at runtime
+P SUNWzlib	The Zip compression library
--- a/usr/src/pkgdefs/SUNWperl-net-ssleay/depend	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWperl-net-ssleay/depend	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)depend	1.1	09/06/03 SMI"
+# ident	"@(#)depend	1.2	09/12/09 SMI"
 #
 
 #
@@ -57,3 +57,4 @@
 P SUNWopenssl-libraries	OpenSSL Libraries (Usr)
 P SUNWperl584core Perl 5.8.4 programming language (core)
 P SUNWzlibr	The Zip compression library (Root)
+P SUNWzlib	The Zip compression library
--- a/usr/src/pkgdefs/SUNWphp52r-pear/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWphp52r-pear/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)prototype_com	1.3	09/09/30 SMI"
+#pragma ident	"@(#)prototype_com	1.4	09/12/18 SMI"
 
 # SUNWphp52r-pear
 #
@@ -150,6 +150,7 @@
 f none var/php/5.2/pear/doc/XML_Util/examples/example2.php 0644 root bin
 f none var/php/5.2/pear/OS/Guess.php 0644 root bin
 f none var/php/5.2/pear/PEAR.php 0644 root bin
+f none var/php/5.2/pear/PEAR5.php 0644 root bin
 f none var/php/5.2/pear/PEAR/Autoloader.php 0644 root bin
 f none var/php/5.2/pear/PEAR/Builder.php 0644 root bin
 f none var/php/5.2/pear/PEAR/ChannelFile.php 0644 root bin
--- a/usr/src/pkgdefs/SUNWphp52r/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWphp52r/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)prototype_com	1.8	09/11/12 SMI"
+#pragma ident	"@(#)prototype_com	1.9	09/12/23 SMI"
 
 # SUNWphp52r
 #
@@ -55,4 +55,3 @@
 e renamenew etc/php/5.2/conf.d/snmp.ini 0644 root bin
 e renamenew etc/php/5.2/conf.d/sqlite.ini 0644 root bin
 e renamenew etc/php/5.2/conf.d/tidy.ini 0644 root bin
-e renamenew etc/php/5.2/conf.d/zlib.ini 0644 root bin
--- a/usr/src/pkgdefs/SUNWphp52u/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWphp52u/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)prototype_com	1.11	09/11/12 SMI"
+#pragma ident	"@(#)prototype_com	1.13	09/12/23 SMI"
 
 # SUNWphp52u
 #
@@ -101,9 +101,10 @@
 f none usr/php/5.2/include/php/Zend/zend_config.nw.h 0444 root bin
 f none usr/php/5.2/include/php/Zend/zend_config.w32.h 0444 root bin
 f none usr/php/5.2/include/php/Zend/zend_constants.h 0444 root bin
+f none usr/php/5.2/include/php/Zend/zend_dtrace.h 0444 root bin
+f none usr/php/5.2/include/php/Zend/zend_dtrace_gen.h 0444 root bin
 f none usr/php/5.2/include/php/Zend/zend_dynamic_array.h 0444 root bin
 f none usr/php/5.2/include/php/Zend/zend_errors.h 0444 root bin
-f none usr/php/5.2/include/php/Zend/zend_dtrace.h 0444 root bin
 f none usr/php/5.2/include/php/Zend/zend_exceptions.h 0444 root bin
 f none usr/php/5.2/include/php/Zend/zend_execute.h 0444 root bin
 f none usr/php/5.2/include/php/Zend/zend_extensions.h 0444 root bin
@@ -359,7 +360,6 @@
 f none usr/php/5.2/modules/snmp.so 0555 root bin
 f none usr/php/5.2/modules/sqlite.so 0555 root bin
 f none usr/php/5.2/modules/tidy.so 0555 root bin
-f none usr/php/5.2/modules/zlib.so 0555 root bin
 f none usr/php/5.2/samples/scripts/configure-sun-webserver 0555 root bin
 f none usr/share/man/man1/php.1 0444 root bin
 s none usr/php/bin=./5.2/bin
--- a/usr/src/pkgdefs/SUNWpostgr-82-client/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-client/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.10	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.14 client tools"
+DESC="PostgreSQL 8.2.15 client tools"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-82-contrib/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-contrib/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.10	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.14 community contributed tools not part of core product"
+DESC="PostgreSQL 8.2.15 community contributed tools not part of core product"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-82-devel/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-devel/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.10	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.14 development tools and header files"
+DESC="PostgreSQL 8.2.15 development tools and header files"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-82-docs/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-docs/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.10	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.14 documentation and man pages"
+DESC="PostgreSQL 8.2.15 documentation and man pages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-82-docs/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-docs/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.11	09/09/08 SMI"
+#ident	"@(#)prototype_com	1.12	09/12/10 SMI"
 #
 # SUNWpostgr-82-docs
 #
@@ -1000,7 +1000,7 @@
 f none usr/postgres/8.2/doc/html/release-8-0-13.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-1-9.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-2-4.html 0444 root bin
-f none usr/postgres/8.2/doc/html/x71219.html 0444 root bin
+f none usr/postgres/8.2/doc/html/x71223.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-2-5.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-1-10.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-7-3-20.html 0444 root bin
@@ -1034,3 +1034,7 @@
 f none usr/postgres/8.2/doc/html/release-8-0-22.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-1-18.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-2-14.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-7-4-27.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-0-23.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-1-19.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-2-15.html 0444 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-82-libs/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-libs/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.10	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.14 client libraries"
+DESC="PostgreSQL 8.2.15 client libraries"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-82-pl/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-pl/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.10	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.14 additional Perl, Python & TCL server procedural languages"
+DESC="PostgreSQL 8.2.15 additional Perl, Python & TCL server procedural languages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-82-server/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-82-server/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.10	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.14 database server"
+DESC="PostgreSQL 8.2.15 database server"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-client/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-client/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.7	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 client tools"
+DESC="PostgreSQL 8.3.9 client tools"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-client/prototype_i386	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-client/prototype_i386	Sat Jan 16 18:11:20 2010 +0200
@@ -18,10 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_i386	1.1	08/03/29 SMI"
+#ident	"@(#)prototype_i386	1.2	09/12/10 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -45,6 +45,7 @@
 # SUNWpostgr-83-client
 #
 d none usr/postgres/8.3/bin/amd64 755 root bin
+s none usr/postgres/8.3/bin/64=amd64
 f none usr/postgres/8.3/bin/amd64/clusterdb 555 root bin
 f none usr/postgres/8.3/bin/amd64/createdb 555 root bin
 f none usr/postgres/8.3/bin/amd64/createlang 555 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-83-client/prototype_sparc	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-client/prototype_sparc	Sat Jan 16 18:11:20 2010 +0200
@@ -18,10 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_sparc	1.1	08/03/29 SMI"
+#ident	"@(#)prototype_sparc	1.2	09/12/10 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -45,6 +45,7 @@
 # SUNWpostgr-83-client
 #
 d none usr/postgres/8.3/bin/sparcv9 755 root bin
+s none usr/postgres/8.3/bin/64=sparcv9
 f none usr/postgres/8.3/bin/sparcv9/clusterdb 555 root bin
 f none usr/postgres/8.3/bin/sparcv9/createdb 555 root bin
 f none usr/postgres/8.3/bin/sparcv9/createlang 555 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-83-contrib/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-contrib/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.7	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 community contributed tools not part of core product"
+DESC="PostgreSQL 8.3.9 community contributed tools not part of core product"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-devel/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-devel/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.7	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 development tools and header files"
+DESC="PostgreSQL 8.3.9 development tools and header files"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-docs/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-docs/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.7	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 documentation and man pages"
+DESC="PostgreSQL 8.3.9 documentation and man pages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-docs/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-docs/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.8	09/09/04 SMI"
+#ident	"@(#)prototype_com	1.9	09/12/10 SMI"
 #
 # SUNWpostgr-83-docs
 #
@@ -2075,3 +2075,8 @@
 f none usr/postgres/8.3/doc/html/release-8-1-18.html 0444 root bin
 f none usr/postgres/8.3/doc/html/release-8-2-14.html 0444 root bin
 f none usr/postgres/8.3/doc/html/release-8-3-8.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-7-4-27.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-0-23.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-1-19.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-2-15.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-3-9.html 0444 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-83-libs/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-libs/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.7	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 client libraries"
+DESC="PostgreSQL 8.3.9 client libraries"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -18,10 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.3	08/06/09 SMI"
+#ident	"@(#)prototype_com	1.4	09/12/18 SMI"
 #
 # SUNWpostgr-83-libs
 #
@@ -90,6 +90,7 @@
 d none usr/postgres/8.3/share/locale/pt_BR 755 root other
 d none usr/postgres/8.3/share/locale/pt_BR/LC_MESSAGES 755 root other
 f none usr/postgres/8.3/share/locale/pt_BR/LC_MESSAGES/libpq.mo 644 root other
+d none usr/postgres/8.3/share/locale/ro 755 root other
 d none usr/postgres/8.3/share/locale/ru 755 root other
 d none usr/postgres/8.3/share/locale/ru/LC_MESSAGES 755 root other
 f none usr/postgres/8.3/share/locale/ru/LC_MESSAGES/libpq.mo 644 root other
--- a/usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_i386	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_i386	Sat Jan 16 18:11:20 2010 +0200
@@ -18,10 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_i386	1.2	08/06/09 SMI"
+#ident	"@(#)prototype_i386	1.3	09/12/10 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -46,7 +46,6 @@
 #
 d none usr/postgres/8.3/lib/amd64 755 root bin
 s none usr/postgres/8.3/lib/64=amd64
-s none usr/postgres/8.3/bin/64=amd64
 f none usr/postgres/8.3/lib/amd64/libecpg_compat.so.3.0 555 root bin
 s none usr/postgres/8.3/lib/amd64/libecpg_compat.so=libecpg_compat.so.3.0
 s none usr/postgres/8.3/lib/amd64/libecpg_compat.so.3=libecpg_compat.so.3.0
--- a/usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_sparc	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-libs/prototype_sparc	Sat Jan 16 18:11:20 2010 +0200
@@ -18,10 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_sparc	1.2	08/06/09 SMI"
+#ident	"@(#)prototype_sparc	1.3	09/12/18 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -46,7 +46,6 @@
 #
 d none usr/postgres/8.3/lib/sparcv9 755 root bin
 s none usr/postgres/8.3/lib/64=sparcv9
-s none usr/postgres/8.3/bin/64=sparcv9
 f none usr/postgres/8.3/lib/sparcv9/libecpg_compat.so.3.0 555 root bin
 s none usr/postgres/8.3/lib/sparcv9/libecpg_compat.so=libecpg_compat.so.3.0
 s none usr/postgres/8.3/lib/sparcv9/libecpg_compat.so.3=libecpg_compat.so.3.0
--- a/usr/src/pkgdefs/SUNWpostgr-83-pl/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-pl/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.7	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 additional Perl, Python & TCL server procedural languages"
+DESC="PostgreSQL 8.3.9 additional Perl, Python & TCL server procedural languages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-server/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-server/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.7	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 database server"
+DESC="PostgreSQL 8.3.9 database server"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-83-server/prototype_i386	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-server/prototype_i386	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_i386	1.2	09/01/08 SMI"
+#ident	"@(#)prototype_i386	1.3	09/12/10 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -45,6 +45,7 @@
 # SUNWpostgr-83-server
 #
 d none usr/postgres/8.3/bin/amd64 755 root bin 555 root bin
+s none usr/postgres/8.3/bin/64=amd64
 f none usr/postgres/8.3/bin/amd64/initdb 555 root bin
 f none usr/postgres/8.3/bin/amd64/pg_controldata 555 root bin
 f none usr/postgres/8.3/bin/amd64/pg_ctl 555 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-83-server/prototype_sparc	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-server/prototype_sparc	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_sparc	1.2	09/01/08 SMI"
+#ident	"@(#)prototype_sparc	1.3	09/12/10 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -45,6 +45,7 @@
 # SUNWpostgr-83-server
 #
 d none usr/postgres/8.3/bin/sparcv9 755 root bin 555 root bin
+s none usr/postgres/8.3/bin/64=sparcv9
 f none usr/postgres/8.3/bin/sparcv9/initdb 555 root bin
 f none usr/postgres/8.3/bin/sparcv9/pg_controldata 555 root bin
 f none usr/postgres/8.3/bin/sparcv9/pg_ctl 555 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-83-tests/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-83-tests/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.6	09/09/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.7	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.8 functional regression tests"
+DESC="PostgreSQL 8.3.9 functional regression tests"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-client/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-client/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 client tools"
+DESC="PostgreSQL 8.4.2 client tools"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-contrib/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-contrib/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 community contributed tools not part of core product"
+DESC="PostgreSQL 8.4.2 community contributed tools not part of core product"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-devel/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-devel/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 development tools and header files"
+DESC="PostgreSQL 8.4.2 development tools and header files"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-docs/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-docs/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 documentation and man pages"
+DESC="PostgreSQL 8.4.2 documentation and man pages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-docs/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-docs/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.1	09/10/13 SMI"
+#ident	"@(#)prototype_com	1.2	09/12/18 SMI"
 #
 # SUNWpostgr-84-docs
 #
@@ -162,9 +162,7 @@
 f none usr/postgres/8.4/doc/html/contrib.html 0444 root bin
 f none usr/postgres/8.4/doc/html/creating-cluster.html 0444 root bin
 f none usr/postgres/8.4/doc/html/cube.html 0444 root bin
-f none usr/postgres/8.4/doc/html/cvs-tree.html 0444 root bin
 f none usr/postgres/8.4/doc/html/cvs.html 0444 root bin
-f none usr/postgres/8.4/doc/html/cvsup.html 0444 root bin
 f none usr/postgres/8.4/doc/html/database-roles.html 0444 root bin
 f none usr/postgres/8.4/doc/html/datatype-binary.html 0444 root bin
 f none usr/postgres/8.4/doc/html/datatype-bit.html 0444 root bin
@@ -294,6 +292,7 @@
 f none usr/postgres/8.4/doc/html/gist-intro.html 0444 root bin
 f none usr/postgres/8.4/doc/html/gist-recovery.html 0444 root bin
 f none usr/postgres/8.4/doc/html/gist.html 0444 root bin
+f none usr/postgres/8.4/doc/html/git.html 0444 root bin
 f none usr/postgres/8.4/doc/html/high-availability.html 0444 root bin
 f none usr/postgres/8.4/doc/html/history.html 0444 root bin
 f none usr/postgres/8.4/doc/html/hstore.html 0444 root bin
@@ -1180,3 +1179,9 @@
 f none usr/postgres/8.4/man/man5/vacuum.5sql 0444 root bin
 f none usr/postgres/8.4/man/man5/values.5sql 0444 root bin
 f none usr/postgres/8.4/man/man5/with.5sql 0444 root bin
+f none usr/postgres/8.4/doc/html/release-7-4-27.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-0-23.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-1-19.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-2-15.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-3-9.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-4-2.html 0444 root bin
--- a/usr/src/pkgdefs/SUNWpostgr-84-libs/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-libs/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 client libraries"
+DESC="PostgreSQL 8.4.2 client libraries"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-pl/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-pl/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 additional Perl, Python & TCL server procedural languages"
+DESC="PostgreSQL 8.4.2 additional Perl, Python & TCL server procedural languages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-server/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-server/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 database server"
+DESC="PostgreSQL 8.4.2 database server"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWpostgr-84-tests/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWpostgr-84-tests/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	09/10/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/10 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +36,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.1 functional regression tests"
+DESC="PostgreSQL 8.4.2 functional regression tests"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWsane-frontend/depend	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWsane-frontend/depend	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 #
 # CDDL HEADER END
 #
-#ident	"@(#)depend	1.3	09/05/21 SMI"
+#ident	"@(#)depend	1.4	09/12/14 SMI"
 
 #
 # This package information file defines software dependencies associated
@@ -54,7 +54,8 @@
 P SUNWsane-backendr	SANE library and backends
 P SUNWgnome-img-editor	The Gimp image editor
 P SUNWxwplt		X Window System platform software
-P SUNWlibmsr		Math & Microtasking Libraries (Root)
+P SUNWlibmsr	Math & Microtasking Libraries (Root)
+P SUNWlibms	Math & Microtasking Libraries (Usr)
 P SUNWmlib		mediaLib - Shared Libraries
 P SUNWfontconfig	Fontconfig library
 P SUNWxorg-clientlibs	X.Org Foundation X Client Libraries
--- a/usr/src/pkgdefs/SUNWslang/depend	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWslang/depend	Sat Jan 16 18:11:20 2010 +0200
@@ -1,6 +1,3 @@
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
@@ -21,7 +18,13 @@
 #
 # CDDL HEADER END
 #
-#ident	"@(#)depend	1.2	08/08/04 SMI"
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"@(#)depend	1.3	09/12/19 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -54,3 +57,4 @@
 P SUNWzlib	The Zip compression library
 P SUNWslangr	S-Lang Library (root)
 P SUNWlibmsr	Math & Microtasking Libraries (Root)
+P SUNWlibms	Math & Microtasking Libraries (Usr)
--- a/usr/src/pkgdefs/SUNWslang/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWslang/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,10 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	08/04/30 SMI"
+
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/19 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -30,7 +32,7 @@
 # and package architecture.
 #
 PKG="SUNWslang"
-NAME="S-Lang Library (2.1.3)"
+NAME="S-Lang Library"
 ARCH="ISA"
 VERSION="SFWVERS,REV=0.0.0"
 SUNW_PRODNAME="SunOS"
@@ -38,7 +40,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="S-Lang Library (2.1.3)"
+DESC="S-Lang Library (2.2.2)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWslang/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWslang/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,10 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.1	08/04/30 SMI"
+
+#ident	"@(#)prototype_com	1.2	09/12/19 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -50,21 +52,27 @@
 f none usr/include/slang.h 0644 root bin
 f none usr/include/slcurses.h 0644 root bin
 d none usr/lib 0755 root bin
-f none usr/lib/libslang.so.2.1.3 0644 root bin
-s none usr/lib/libslang.so.2=libslang.so.2.1.3
-s none usr/lib/libslang.so=libslang.so.2.1.3
+f none usr/lib/libslang.so.2.2.2 0644 root bin
+s none usr/lib/libslang.so.2=libslang.so.2.2.2
+s none usr/lib/libslang.so=libslang.so.2.2.2
+d none usr/lib/pkgconfig 0755 root other
+f none usr/lib/pkgconfig/slang.pc 0644 root bin
 d none usr/lib/slang 0755 root bin
 d none usr/lib/slang/v2 0755 root bin
 d none usr/lib/slang/v2/modules 0755 root bin
 f none usr/lib/slang/v2/modules/fcntl-module.so 0644 root bin
+f none usr/lib/slang/v2/modules/fork-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/iconv-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/pcre-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/png-module.so 0644 root bin
+f none usr/lib/slang/v2/modules/rand-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/select-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/slsmg-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/socket-module.so 0644 root bin
+f none usr/lib/slang/v2/modules/sysconf-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/termios-module.so 0644 root bin
 f none usr/lib/slang/v2/modules/varray-module.so 0644 root bin
+f none usr/lib/slang/v2/modules/zlib-module.so 0644 root bin
 d none usr/share 755 root sys
 d none usr/share/doc 755 root other
 d none usr/share/doc/slang 0755 root bin
@@ -85,6 +93,8 @@
 f none usr/share/doc/slsh/html/slshfun-5.html 0644 root bin
 f none usr/share/doc/slsh/html/slshfun-6.html 0644 root bin
 f none usr/share/doc/slsh/html/slshfun-7.html 0644 root bin
+f none usr/share/doc/slsh/html/slshfun-8.html 0644 root bin
+f none usr/share/doc/slsh/html/slshfun-9.html 0644 root bin
 f none usr/share/doc/slsh/html/slshfun.html 0644 root bin
 d none usr/share/man 0755 root bin
 d none usr/share/man/man1 0755 root bin
@@ -96,6 +106,8 @@
 f none usr/share/slsh/cmaps/cool.map 0644 root bin
 f none usr/share/slsh/cmaps/copper.map 0644 root bin
 f none usr/share/slsh/cmaps/drywet.map 0644 root bin
+f none usr/share/slsh/cmaps/ds9b.map 0644 root bin
+f none usr/share/slsh/cmaps/ds9sls.map 0644 root bin
 f none usr/share/slsh/cmaps/gebco.map 0644 root bin
 f none usr/share/slsh/cmaps/globe.map 0644 root bin
 f none usr/share/slsh/cmaps/gray.map 0644 root bin
@@ -115,15 +127,20 @@
 f none usr/share/slsh/cmaps/wysiwyg.map 0644 root bin
 f none usr/share/slsh/cmdopt.sl 0644 root bin
 f none usr/share/slsh/fcntl.sl 0644 root bin
+f none usr/share/slsh/fork.sl 0644 root bin
 f none usr/share/slsh/glob.sl 0644 root bin
 d none usr/share/slsh/help 0755 root bin
 f none usr/share/slsh/help/arrayfuns.hlp 0644 root bin
 f none usr/share/slsh/help/cmdopt.hlp 0644 root bin
+f none usr/share/slsh/help/forkfuns.hlp 0644 root bin
 f none usr/share/slsh/help/glob.hlp 0644 root bin
 f none usr/share/slsh/help/onigfuns.hlp 0644 root bin
 f none usr/share/slsh/help/pcrefuns.hlp 0644 root bin
 f none usr/share/slsh/help/pngfuns.hlp 0644 root bin
+f none usr/share/slsh/help/print.hlp 0644 root bin
+f none usr/share/slsh/help/process.hlp 0644 root bin
 f none usr/share/slsh/help/profile.hlp 0644 root bin
+f none usr/share/slsh/help/randfuns.hlp 0644 root bin
 f none usr/share/slsh/help/readascii.hlp 0644 root bin
 f none usr/share/slsh/help/require.hlp 0644 root bin
 f none usr/share/slsh/help/sockfuns.hlp 0644 root bin
@@ -134,7 +151,9 @@
 f none usr/share/slsh/pcre.sl 0644 root bin
 f none usr/share/slsh/png.sl 0644 root bin
 f none usr/share/slsh/print.sl 0644 root bin
+f none usr/share/slsh/process.sl 0644 root bin
 f none usr/share/slsh/profile.sl 0644 root bin
+f none usr/share/slsh/rand.sl 0644 root bin
 f none usr/share/slsh/readascii.sl 0644 root bin
 f none usr/share/slsh/require.sl 0644 root bin
 d none usr/share/slsh/rline 0755 root bin
@@ -160,5 +179,7 @@
 f none usr/share/slsh/socket.sl 0644 root bin
 f none usr/share/slsh/stkcheck.sl 0644 root bin
 f none usr/share/slsh/structfuns.sl 0644 root bin
+f none usr/share/slsh/sysconf.sl 0644 root bin
 f none usr/share/slsh/termios.sl 0644 root bin
 f none usr/share/slsh/varray.sl 0644 root bin
+f none usr/share/slsh/zlib.sl 0644 root bin
--- a/usr/src/pkgdefs/SUNWslang/prototype_i386	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWslang/prototype_i386	Sat Jan 16 18:11:20 2010 +0200
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,10 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_i386	1.1	08/04/30 SMI"
+
+#ident	"@(#)prototype_i386	1.2	09/12/19 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -40,18 +42,24 @@
 !include prototype_com
 
 d none usr/lib/amd64 0755 root bin
-f none usr/lib/amd64/libslang.so.2.1.3 0644 root bin
-s none usr/lib/amd64/libslang.so.2=libslang.so.2.1.3
-s none usr/lib/amd64/libslang.so=libslang.so.2.1.3
+f none usr/lib/amd64/libslang.so.2.2.2 0644 root bin
+s none usr/lib/amd64/libslang.so.2=libslang.so.2.2.2
+s none usr/lib/amd64/libslang.so=libslang.so.2.2.2
+d none usr/lib/amd64/pkgconfig 0755 root other
+f none usr/lib/amd64/pkgconfig/slang.pc 0644 root bin
 d none usr/lib/amd64/slang 0755 root bin
 d none usr/lib/amd64/slang/v2 0755 root bin
 d none usr/lib/amd64/slang/v2/modules 0755 root bin
 f none usr/lib/amd64/slang/v2/modules/fcntl-module.so 0644 root bin
+f none usr/lib/amd64/slang/v2/modules/fork-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/iconv-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/pcre-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/png-module.so 0644 root bin
+f none usr/lib/amd64/slang/v2/modules/rand-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/select-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/slsmg-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/socket-module.so 0644 root bin
+f none usr/lib/amd64/slang/v2/modules/sysconf-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/termios-module.so 0644 root bin
 f none usr/lib/amd64/slang/v2/modules/varray-module.so 0644 root bin
+f none usr/lib/amd64/slang/v2/modules/zlib-module.so 0644 root bin
--- a/usr/src/pkgdefs/SUNWslang/prototype_sparc	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWslang/prototype_sparc	Sat Jan 16 18:11:20 2010 +0200
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,10 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_sparc	1.1	08/04/30 SMI"
+
+#ident	"@(#)prototype_sparc	1.2	09/12/19 SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -40,18 +42,24 @@
 !include prototype_com
 
 d none usr/lib/sparcv9 0755 root bin
-f none usr/lib/sparcv9/libslang.so.2.1.3 0644 root bin
-s none usr/lib/sparcv9/libslang.so.2=libslang.so.2.1.3
-s none usr/lib/sparcv9/libslang.so=libslang.so.2.1.3
+f none usr/lib/sparcv9/libslang.so.2.2.2 0644 root bin
+s none usr/lib/sparcv9/libslang.so.2=libslang.so.2.2.2
+s none usr/lib/sparcv9/libslang.so=libslang.so.2.2.2
+d none usr/lib/sparcv9/pkgconfig 0755 root other
+f none usr/lib/sparcv9/pkgconfig/slang.pc 0644 root bin
 d none usr/lib/sparcv9/slang 0755 root bin
 d none usr/lib/sparcv9/slang/v2 0755 root bin
 d none usr/lib/sparcv9/slang/v2/modules 0755 root bin
 f none usr/lib/sparcv9/slang/v2/modules/fcntl-module.so 0644 root bin
+f none usr/lib/sparcv9/slang/v2/modules/fork-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/iconv-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/pcre-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/png-module.so 0644 root bin
+f none usr/lib/sparcv9/slang/v2/modules/rand-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/select-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/slsmg-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/socket-module.so 0644 root bin
+f none usr/lib/sparcv9/slang/v2/modules/sysconf-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/termios-module.so 0644 root bin
 f none usr/lib/sparcv9/slang/v2/modules/varray-module.so 0644 root bin
+f none usr/lib/sparcv9/slang/v2/modules/zlib-module.so 0644 root bin
--- a/usr/src/pkgdefs/SUNWslangr/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWslangr/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -1,4 +1,3 @@
-#
 #
 # CDDL HEADER START
 #
@@ -19,10 +18,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.1	08/04/30 SMI"
+
+#ident	"@(#)pkginfo.tmpl	1.2	09/12/19 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -30,7 +32,7 @@
 # and package architecture.
 #
 PKG="SUNWslangr"
-NAME="S-Lang Library (2.1.3) (root)"
+NAME="S-Lang Library (root)"
 ARCH="ISA"
 VERSION="SFWVERS,REV=0.0.0"
 SUNW_PRODNAME="SunOS"
@@ -38,7 +40,7 @@
 SUNW_PKGTYPE="root"
 MAXINST="1000"
 CATEGORY="system"
-DESC="S-Lang Library (2.1.3) (root)"
+DESC="S-Lang Library (2.2.2) (root)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWtcat-examples/Makefile	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWtcat-examples/Makefile	Sat Jan 16 18:11:20 2010 +0200
@@ -23,12 +23,12 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)Makefile	1.1	09/10/30 SMI"
+#ident	"@(#)Makefile	1.2	09/12/16 SMI"
 #
 
 include ../Makefile.com
 
-DATAFILES= 
+DATAFILES= i.renamenew
 
 .KEEP_STATE:
 
--- a/usr/src/pkgdefs/SUNWtcat-examples/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWtcat-examples/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)pkginfo.tmpl	1.2	09/11/03 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	09/12/16 SMI"
 #
 
 #
@@ -44,7 +44,7 @@
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
-CLASSES="none"
+CLASSES="none renamenew"
 BASEDIR=/
 SUNW_PKGVERS="1.0"
 SUNW_PKG_ALLZONES="false"
--- a/usr/src/pkgdefs/SUNWtcat-examples/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWtcat-examples/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.1	09/10/30 SMI"
+#ident	"@(#)prototype_com	1.2	09/12/16 SMI"
 #
 
 # This required package information file contains a list of package contents.
@@ -38,6 +38,7 @@
 
 # packaging files
 i pkginfo
+i i.renamenew
 i copyright
 i depend
 #
@@ -399,3 +400,5 @@
 f none var/tomcat6/webapps/ROOT.example/favicon.ico 0644 root bin
 f none var/tomcat6/webapps/ROOT.example/build.xml 0644 root bin
 f none var/tomcat6/webapps/ROOT.example/index.jsp 0644 root bin
+d none var/tomcat6/webapps/ROOT 0755 root bin
+f renamenew var/tomcat6/webapps/ROOT/index.htm 0644 root bin
--- a/usr/src/pkgdefs/SUNWtor-root/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWtor-root/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)pkginfo.tmpl	1.1	09/05/14 SMI"
+#pragma ident	"@(#)pkginfo.tmpl	1.2	09/12/16 SMI"
 #
 
 # This required package information file describes characteristics of the
@@ -38,7 +38,7 @@
 SUNW_PKGTYPE="root"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Tor 0.2.0.34 (Root)"
+DESC="Tor 0.2.1.20 (Root)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWtor/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWtor/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -21,7 +21,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"@(#)pkginfo.tmpl	1.1	09/05/14 SMI"
+#pragma ident	"@(#)pkginfo.tmpl	1.2	09/12/16 SMI"
 #
 
 # This required package information file describes characteristics of the
@@ -38,7 +38,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Tor - The Onion Router 0.2.0.34"
+DESC="Tor - The Onion Router 0.2.1.20"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Sat Jan 16 18:11:20 2010 +0200
@@ -24,7 +24,7 @@
 # Use is subject to license terms.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.8	09/12/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	09/12/18 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -40,7 +40,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Wireshark - Network protocol analyzer (1.2.4)"
+DESC="Wireshark - Network protocol analyzer (1.2.5)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/prototype_com	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/SUNWwireshark/prototype_com	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)prototype_com	1.8	09/12/04 SMI"
+#ident	"@(#)prototype_com	1.9	09/12/18 SMI"
 #
 
 # This required package information file contains a list of package contents.
@@ -58,25 +58,25 @@
 s none usr/lib/libwsutil.so=libwsutil.so.0.0.0
 d none usr/lib/wireshark 0755 root bin
 d none usr/lib/wireshark/plugins 0755 root bin
-d none usr/lib/wireshark/plugins/1.2.4 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.4/asn1.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/coseventcomm.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/cosnaming.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/docsis.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/ethercat.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/gryphon.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/irda.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/m2m.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/mate.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/opcua.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/parlay.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/profinet.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/sercosiii.so 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.4/stats_tree.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/tango.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/unistim.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/wimax.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.4/wimaxasncp.so 0555 root bin
+d none usr/lib/wireshark/plugins/1.2.5 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.5/asn1.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/coseventcomm.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/cosnaming.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/docsis.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/ethercat.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/gryphon.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/irda.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/m2m.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/mate.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/opcua.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/parlay.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/profinet.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/sercosiii.so 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.5/stats_tree.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/tango.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/unistim.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/wimax.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.5/wimaxasncp.so 0555 root bin
 d none usr/sbin 0755 root bin
 f none usr/sbin/capinfos 0555 root bin
 f none usr/sbin/dumpcap 0555 root bin
--- a/usr/src/pkgdefs/etc/exception_list_i386	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/etc/exception_list_i386	Sat Jan 16 18:11:20 2010 +0200
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)exception_list_i386	1.19	09/10/13 SMI"
+# ident	"@(#)exception_list_i386	1.20	09/12/10 SMI"
 #
 # Exception List for protocmp
 #
@@ -48,6 +48,7 @@
 usr/lib/64							i386
 usr/postgres/8.2/bin/64						i386
 usr/postgres/8.2/lib/64						i386
+usr/postgres/8.3/bin/64                                         i386
 usr/postgres/8.4/bin/64						i386
 etc/user_attr							i386
 etc/security/auth_attr						i386
--- a/usr/src/pkgdefs/etc/exception_list_sparc	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/pkgdefs/etc/exception_list_sparc	Sat Jan 16 18:11:20 2010 +0200
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"@(#)exception_list_sparc	1.21	09/10/13 SMI"
+# ident	"@(#)exception_list_sparc	1.22	09/12/10 SMI"
 #
 # Exception List for protocmp
 #
@@ -48,6 +48,7 @@
 usr/lib/64							sparc
 usr/postgres/8.2/bin/64						sparc
 usr/postgres/8.2/lib/64						sparc
+usr/postgres/8.3/bin/64                                         sparc
 usr/postgres/8.4/bin/64						sparc
 etc/user_attr							sparc
 etc/security/auth_attr						sparc
--- a/usr/src/tools/metainfo.pl	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/tools/metainfo.pl	Sat Jan 16 18:11:20 2010 +0200
@@ -22,7 +22,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)metainfo.pl	1.5	09/10/07 SMI"
+#ident	"@(#)metainfo.pl	1.6	09/12/10 SMI"
 #
 # Fix the attributes of paths in the proto area to match the packaging
 #
@@ -51,7 +51,7 @@
 	while (<$FH>) {
 		my $entry = ();
 
-		if (/^(.+):\s+(\S.+)\s*$/) {
+		if (/^(.+):\s+(\S.*)\s*$/) {
 			$entry->{line} = $.;
 			$entry->{key} = $1;
 			$entry->{value} = $2;
@@ -108,7 +108,7 @@
 			'PACKAGE' => '^((SUNW[A-Za-z0-9_\-]+)\s*)+$',
 			'PROJECT_URL' => '^\S+://\S+$',
 			'SOURCE_DOWNLOAD' => '^\S+://\S+$',
-			'SUPPORT' => '^(Community|Managed|Full)$',
+			'SUPPORT' => '^(A|B|C)$',
 			'BUGTRAQ' => '^(\S+/\S+/\S+\s?)+$',
 			'OSR' => '^\d+$', 'COMMENTS' => '.*');
 
@@ -215,8 +215,9 @@
 			$exit_code = 1;
 		} elsif (defined($entry)) {
 			if ($entry->{value} eq 'unknown') {
-				printf STDERR ("$METADATA: WARNING: Line %d: '%s' needs a real value\n",
+				printf STDERR ("$METADATA: ERROR: Line %d: '%s' needs a real value\n",
 					$entry->{line}, $key);
+				$exit_code = 1;
 			} elsif ($entry->{value} !~ /$required_fields{$key}/) {
 				printf STDERR ("$METADATA: ERROR: Line %d: '%s' value '%s' has invalid format\n",
 					$entry->{line}, $key, $entry->{value});
@@ -226,8 +227,10 @@
 	}
 
 	foreach (split(/,\s+/, ($contents{'LICENSE'})->{value})) {
-		(validate_license($_)) &&
-			printf STDERR ("$METADATA: WARNING: unknown license type '$_'\n");
+		if (validate_license($_)) {
+			printf STDERR ("$METADATA: ERROR: unknown license type '$_'\n");
+			$exit_code = 1;
+		}
 	}
 	foreach (split(/ /, ($contents{'PACKAGE'})->{value})) {
 		my $pkgname = $_;
@@ -252,7 +255,10 @@
 	}
 
 	my $src = basename(get_value('SOURCE_DOWNLOAD'));
-	(-f $src) || printf STDERR ("$METADATA: WARNING: SOURCE_DOWNLOAD entry ($src) doesn't refer to a source archive\n");
+	if (! -f $src) {
+		printf STDERR ("$METADATA: ERROR: SOURCE_DOWNLOAD entry ($src) doesn't refer to a source archive\n");
+		$exit_code = 1;
+	}
 }
 
 
--- a/usr/src/tools/post_process_so.ksh	Sun Dec 20 15:22:13 2009 +0200
+++ b/usr/src/tools/post_process_so.ksh	Sat Jan 16 18:11:20 2010 +0200
@@ -23,7 +23,7 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"@(#)post_process_so.ksh	1.5	09/03/12 SMI"
+#ident	"@(#)post_process_so.ksh	1.6	09/12/19 SMI"
 
 progname=`basename $0`
 
@@ -91,7 +91,7 @@
 		# skip files with no runpath
 		continue
 	fi
-	newrpath=`echo ${rpath} | sed -e s,${ROOT},,`
+	newrpath=`echo ${rpath} | sed -e s,${ROOT},,g`
 	newrpath=`echo ${newrpath} | nawk -F: '
 	BEGIN {first=1;} \
 	{ \