Import sfw build 156 sfwnv_156
authorCyril Plisko <cyril.plisko@grigale.com>
Thu, 06 Jan 2011 02:11:13 -0800
changeset 60 0d167ac031c9
parent 59 dc54bd28e81b
child 61 2b866601157f
Import sfw build 156 Bugs Fixed ---------- 6883557 SUNWperl510core package dependency not captured 6883568 SUNWperl510usr: relative path to perl interpreter set 6958372 CVE-2010-0540 CSRF issue in CUPS 6958373 CVE-2010-1748 CUPS information leak 6968983 curlbuild.h does not support sparc gcc builds 6993285 EOF epydoc PSARC/2010/421 6994958 CVE-2010-2941 CUPS IPP parsing memory management issues 7001836 Wireshark update to version 1.2.13 7003497 Upgrade libidn to 1.19 7003520 remove SUNWa2ps* from sfw 7004273 fix CVE-2010-4180 and CVE-2010-4252 in OpenSSL 7004783 CUPS upgrade to 1.4.5 7006121 Update fetchmail to version 6.3.19 7006264 perl 5.10 tests fail on sparc 7007140 perl can lie about the compiler used 7007183 remove text from SUNWgit copyright file 7007858 webminsetup looking for SMF manifest in wrong directory since EMI moved it
usr/src/Targetdirs
usr/src/cmd/Makefile
usr/src/cmd/a2ps/METADATA
usr/src/cmd/a2ps/Makefile.sfw
usr/src/cmd/a2ps/Patches/configure.patch
usr/src/cmd/a2ps/Patches/sheets.map.patch
usr/src/cmd/a2ps/Solaris/a2ps.fd
usr/src/cmd/a2ps/a2ps-4.13.tar.gz
usr/src/cmd/a2ps/sunman-stability
usr/src/cmd/cups/METADATA
usr/src/cmd/cups/Makefile.sfw
usr/src/cmd/cups/Patches/00-man.patch
usr/src/cmd/cups/Patches/01-cups-config.patch
usr/src/cmd/cups/Patches/03-cups.pc.patch
usr/src/cmd/cups/Patches/07-scf-active.patch
usr/src/cmd/cups/Patches/11-ldap-ssl.patch
usr/src/cmd/cups/Patches/12-base-tx.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/Patches/15.cups-1.4.2-CVE-2010-0393.patch
usr/src/cmd/cups/Patches/16.cups-1.4.2-CVE-2010-0302.patch
usr/src/cmd/cups/Patches/17.svc-manifest-restarter.patch
usr/src/cmd/cups/cups-1.4.2-source.tar.bz2
usr/src/cmd/cups/cups-1.4.5-source.tar.bz2
usr/src/cmd/epydoc/METADATA
usr/src/cmd/epydoc/Makefile.sfw
usr/src/cmd/epydoc/epydoc-3.0.1.tar.gz
usr/src/cmd/epydoc/install-sfw
usr/src/cmd/epydoc/sunman-stability
usr/src/cmd/fetchmail/METADATA
usr/src/cmd/fetchmail/fetchmail-6.3.18.tar.bz2
usr/src/cmd/fetchmail/fetchmail-6.3.19.tar.bz2
usr/src/cmd/foomatic-filters/Makefile.sfw
usr/src/cmd/perl510/Makefile.sfw
usr/src/cmd/perl510/config.sh.i386
usr/src/cmd/perl510/config.sh.sparc
usr/src/cmd/vim/runtime.patch
usr/src/cmd/webmin/misc/setup-post.sh
usr/src/cmd/wireshark/METADATA
usr/src/cmd/wireshark/wireshark-1.2.12.tar.bz2
usr/src/cmd/wireshark/wireshark-1.2.13.tar.bz2
usr/src/lib/curl/Solaris/diffs/curlbuild.h.2.diff
usr/src/lib/idn/METADATA
usr/src/lib/idn/Makefile.in.0.diff
usr/src/lib/idn/Makefile.sfw
usr/src/lib/idn/install-sfw
usr/src/lib/idn/install-sfw-64
usr/src/lib/idn/libidn-1.19.tar.gz
usr/src/lib/idn/libidn-1.9.tar.gz
usr/src/lib/openssl/METADATA
usr/src/lib/openssl/Makefile.com
usr/src/lib/openssl/openssl-0.9.8p.tar.gz
usr/src/lib/openssl/openssl-0.9.8q.tar.gz
usr/src/pkgdefs/Makefile
usr/src/pkgdefs/SUNWa2psr/Makefile
usr/src/pkgdefs/SUNWa2psr/copyright
usr/src/pkgdefs/SUNWa2psr/pkginfo.tmpl
usr/src/pkgdefs/SUNWa2psr/prototype_com
usr/src/pkgdefs/SUNWa2psr/prototype_i386
usr/src/pkgdefs/SUNWa2psr/prototype_sparc
usr/src/pkgdefs/SUNWa2psu/Makefile
usr/src/pkgdefs/SUNWa2psu/copyright
usr/src/pkgdefs/SUNWa2psu/depend
usr/src/pkgdefs/SUNWa2psu/pkginfo.tmpl
usr/src/pkgdefs/SUNWa2psu/prototype_com
usr/src/pkgdefs/SUNWa2psu/prototype_i386
usr/src/pkgdefs/SUNWa2psu/prototype_sparc
usr/src/pkgdefs/SUNWcupsu/prototype_com
usr/src/pkgdefs/SUNWepydoc/Makefile
usr/src/pkgdefs/SUNWepydoc/copyright
usr/src/pkgdefs/SUNWepydoc/depend
usr/src/pkgdefs/SUNWepydoc/pkginfo.tmpl
usr/src/pkgdefs/SUNWepydoc/prototype_com
usr/src/pkgdefs/SUNWepydoc/prototype_i386
usr/src/pkgdefs/SUNWepydoc/prototype_sparc
usr/src/pkgdefs/SUNWfetchmail/pkginfo.tmpl
usr/src/pkgdefs/SUNWgit/copyright
usr/src/pkgdefs/SUNWgnu-idn/copyright
usr/src/pkgdefs/SUNWgnu-idn/pkginfo.tmpl
usr/src/pkgdefs/SUNWgnu-idn/prototype_com
usr/src/pkgdefs/SUNWgnu-idn/prototype_i386
usr/src/pkgdefs/SUNWgnu-idn/prototype_sparc
usr/src/pkgdefs/SUNWopenssl-fips-140-include/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenssl-fips-140/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenssl-include/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenssl-libraries/pkginfo.tmpl
usr/src/pkgdefs/SUNWopenssl-man/pkginfo.tmpl
usr/src/pkgdefs/SUNWopensslr/pkginfo.tmpl
usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl
usr/src/pkgdefs/SUNWwireshark/prototype_com
usr/src/tools/exception_list.check-deps
usr/src/tools/protofix.pl
--- a/usr/src/Targetdirs	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/Targetdirs	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Targetdirs	1.261	10/11/22 SMI"
+# ident	"@(#)Targetdirs	1.262	10/12/09 SMI"
 #
 
 #
@@ -320,11 +320,6 @@
 	/usr/lib/pam_pkcs11 \
 	/usr/lib/pkgconfig \
 	/usr/lib/python2.4 \
-	/usr/lib/python2.4/site-packages \
-	/usr/lib/python2.4/site-packages/epydoc \
-	/usr/lib/python2.4/site-packages/epydoc/docwriter \
-	/usr/lib/python2.4/site-packages/epydoc/markup \
-	/usr/lib/python2.4/site-packages/epydoc/test \
 	/usr/lib/python2.4/vendor-packages \
 	/usr/lib/python2.4/vendor-packages/64 \
 	/usr/lib/python2.4/vendor-packages/hgext \
@@ -888,13 +883,6 @@
 	/usr/share/doc/doxygen-1.5.7.1 \
 	/usr/share/doc/elinks \
 	/usr/share/doc/erlang \
-	/usr/share/doc/epydoc \
-	/usr/share/doc/epydoc/api \
-	/usr/share/doc/epydoc/doctest \
-	/usr/share/doc/epydoc/examples \
-	/usr/share/doc/epydoc/examples/grouped \
-	/usr/share/doc/epydoc/examples/included \
-	/usr/share/doc/epydoc/examples/listed \
 	/usr/share/doc/fastcgi \
 	/usr/share/doc/fastcgi/fastcgi-prog-guide \
 	/usr/share/doc/fastcgi/fastcgi-whitepaper \
--- a/usr/src/cmd/Makefile	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/Makefile	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.194	10/10/27 SMI"
+# ident	"@(#)Makefile	1.196	10/12/09 SMI"
 #
 
 #
@@ -41,7 +41,6 @@
 COMMON_SUBDIRS= \
 	gcc \
 	binutils \
-	a2ps \
 	aget \
 	apr/apr-1.3 \
 	apr-util/apr-util-1.3 \
@@ -79,7 +78,6 @@
 	ejabberd \
 	elinks \
 	emacs \
-	epydoc \
 	erlang \
 	expect \
 	fakeroot \
@@ -249,7 +247,6 @@
 samba:		cups
 pycups:		cups
 hal-cups-utils:		cups pycups
-a2ps:	psutils ImageMagick
 foomatic-ppd:	gutenprint
 foomatic-db-engine:	foomatic-db
 apr-util/apr-util-1.3: apr/apr-1.3 mysql-5-1
--- a/usr/src/cmd/a2ps/METADATA	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             a2ps
-VERSION:          4.13
-DESCRIPTION:      Format files for printing on a PostScript printer
-LICENSE:          GPLv2
-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:          B
-BUGTRAQ:          solaris/print/a2ps
-OSR:              2161
-COMMENTS:         
--- a/usr/src/cmd/a2ps/Makefile.sfw	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile.sfw	1.12	08/02/09 SMI"
-
-#
-# Note: psutils (SUNWpsutils) must be installed before building a2ps
-#
-
-VER=a2ps-4.13
-TARBALL=$(VER).tar.gz
-
-include ../Makefile.cmd
-
-SFW_PATH="$(SPRO_VROOT)/bin:/usr/sfw/bin:/usr/ccs/bin:/usr/bin:$(PATH)"
-
-all: $(VER)/config.status
-	(cd $(VER); env \
-	    "CC=$(CC) -xc99=%all" \
-	    "CXX=$(CCC)" \
-	    CFLAGS="$(CFLAGS)" \
-	    LD_LIBRARY_PATH=/usr/sfw/lib \
-	    LD_OPTIONS="-L$(ROOT)/usr/sfw/lib -L/usr/sfw/lib -R/usr/sfw/lib" \
-	    PATH=$(SFW_PATH) \
-	    $(MAKE) )
-	@find . -name core -exec rm -f {} \;
-
-# Leave in symlinks for compatibility
-COMPAT= a2ps card composeglyphs fixnt fixps ogonkify pdiff psmandup \
-  psset texi2dvi4a2ps
-
-COMPATLINKS =	$(COMPAT:%=$(ROOTSFWBIN)/%)
-$(COMPATLINKS):
-	$(RM) $@; $(SYMLINK) ../../bin/$(@F) $@
-
-ROOTETCLPFD = $(ROOTETC)/lp/fd
-FILTERDEFS =	a2ps.fd
-ROOTFILTERDEFS = $(FILTERDEFS:%=$(ROOTETCLPFD)/%)
-
-$(ROOTETCLPFD)/%:	Solaris/%
-	$(INS.file)
-
-install: all $(COMPATLINKS) $(ROOTFILTERDEFS)
-	# install the bits in the proto area
-	cd $(VER); env SRC=$(SRC) DESTDIR=$(ROOT) \
-		MANSCRIPT=$(SRC)/cmd/a2ps/sunman-stability \
-		$(MAKE) install
-	# fix the proto area
-	$(SRC)/tools/protofix --pkg SUNWa2psr --pkg SUNWa2psu --perm
-	# clean up the turds
-	$(RM) -f $(ROOT)/usr/lib/liba2ps.a $(ROOT)/usr/lib/liba2ps.la \
-		 $(ROOT)/a2ps.el $(ROOT)/a2ps-print.el
-
-check: $(VER)/config.status
-	(cd $(VER); env \
-	    PATH=$(SFW_PATH) \
-	    $(MAKE) check)
-
-$(VER)/config.status: $(VER)/configure
-	(cd $(VER); env \
-	    "CC=$(CC) -xc99=%all" \
-	    "CXX=$(CCC)" \
-	    CFLAGS="$(CFLAGS)" \
-	    INSTALL="$(SRC)/tools/install-proto" \
-	    LD_OPTIONS="-L$(ROOT)/usr/sfw/lib -L/usr/sfw/lib -R/usr/sfw/lib" \
-	    EMACS=no \
-	    PATH=$(SFW_PATH) \
-	    MAKE=$(MAKE) \
-	    ./configure \
-			--with-medium=letter \
-			--enable-shared \
-			--sysconfdir=/etc/gnu \
-			--prefix=/usr \
-			--mandir=/usr/share/man \
-			--infodir=/usr/share/info \
-			)
-
-#
-# Patches applied:
-#  1. sheets.map.patch
-#     Fix so a2ps delegates conversion of tiff, gif and pdf files correctly.
-#     The changes are due to the differences between the output from 
-#     Sun's 'file' and from GNU 'file' utility for these file types.
-#  2. configure.patch
-#     Patch 'configure' so it uses a fontpath=/usr/sfw/share/ghostscript/fonts
-#
-
-$(VER)/configure: $(TARBALL)
-	gzip -dc $(TARBALL) | tar xopf -
-	/usr/bin/gpatch -p0 < Patches/configure.patch
-	/usr/bin/gpatch -p0 < Patches/sheets.map.patch
-	touch $(VER)/configure
-
-clean:
-	-rm -rf $(VER)
-
-include ../Makefile.targ
--- a/usr/src/cmd/a2ps/Patches/configure.patch	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-*** a2ps-4.13/configure.orig	Thu Feb 24 09:54:14 2000
---- a2ps-4.13/configure	Wed Nov  7 18:35:04 2007
-***************
-*** 7650,7658 ****
---- 7650,7660 ----
-  int
-  main()
-  {
-+ #if 0
-  extern int _nl_msg_cat_cntr;
-  			       return _nl_msg_cat_cntr
-    ;
-+ #endif
-    return 0;
-  }
-  EOF
-***************
-*** 8404,8410 ****
-  # Try to find some PostScript fonts.
-  # Find out if ghostscript is installed
-  ac_psfont_path=
-! for ac_dir in /usr/local/ghostscript/fonts \
-    /usr/local/share/ghostscript/fonts;
-  do
-    if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
---- 8406,8414 ----
-  # Try to find some PostScript fonts.
-  # Find out if ghostscript is installed
-  ac_psfont_path=
-! for ac_dir in \
-!   /usr/sfw/share/ghostscript/fonts \
-!   /usr/local/ghostscript/fonts \
-    /usr/local/share/ghostscript/fonts;
-  do
-    if test "cd $ac_dir 2>/dev/null && echo *.afm"; then
--- a/usr/src/cmd/a2ps/Patches/sheets.map.patch	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-*** a2ps-4.13/sheets/sheets.map.orig	Wed May 12 15:37:37 2004
---- a2ps-4.13/sheets/sheets.map	Wed May 12 15:48:45 2004
-***************
-*** 237,242 ****
---- 237,243 ----
-  # GIF Images
-  gif:	/*.gif/i
-  	<GIF image*>
-+ 	<GIF file*>
-  
-  # Haskell programs
-  haskell:
-***************
-*** 326,331 ****
---- 327,333 ----
-  # PDF documents
-  pdf:	/*.pdf/i
-  	<PDF document*>
-+ 	<* (PDF) *>
-  
-  # Perl files
-  perl:	/*.p[ml]/
-***************
-*** 338,343 ****
---- 340,346 ----
-  # PNG files
-  png:	/*.png/i
-  	<PNG image*>
-+ 	<PNG file*>
-  
-  # Portable Object (Gettext)
-  po:	/*.po/
-***************
-*** 474,481 ****
-  	<*vtcl*>
-  
-  # TIFF images
-! tiff:	/.tif/i  /.tiff/i
-  	<TIFF image*>
-  
-  # tk files
-  tk:	/*.tk/
---- 477,485 ----
-  	<*vtcl*>
-  
-  # TIFF images
-! tiff:	/*.tif/i  /*.tiff/i
-  	<TIFF image*>
-+ 	<TIFF file*>
-  
-  # tk files
-  tk:	/*.tk/
--- a/usr/src/cmd/a2ps/Solaris/a2ps.fd	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)a2ps.fd	1.4	07/06/08 SMI"
-
-Input types: any
-Output types: postscript
-Printer types: any
-Printers: any
-Filter type: slow
-Command: /usr/bin/a2ps -q -c -B -o- -1
-Options: PAGES * = -a*
-Options: LENGTH * = -L*
-Options: MODES group = -2
-Options: MODES group\=\([2-9]\) = -\1
-Options: MODES portrait = -R
-Options: MODES landscape = -r
-Options: MODES media\=\(.*\) = -M\1
-Options: MODES columns\=\([1-9]\) = --columns=\1
-Options: MODES pstitle\=\(\'.*\'\) = -t\1
-Options: MODES header\=\(\'.*\'\) = -b\1
Binary file usr/src/cmd/a2ps/a2ps-4.13.tar.gz has changed
--- a/usr/src/cmd/a2ps/sunman-stability	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE	ATTRIBUTE VALUE\
-=\
-Availability	print/lp/filter/a2ps \
-=\
-Interface Stability	External\
-.TE \
-.PP\
-.SH NOTES\
-Source for a2ps is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/usr/src/cmd/cups/METADATA	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/METADATA	Thu Jan 06 02:11:13 2011 -0800
@@ -1,10 +1,10 @@
 NAME:             cups
-VERSION:          1.4.2
+VERSION:          1.4.5
 DESCRIPTION:      Common Unix Print System
 LICENSE:          CUPS, GPLv2, LGPLv2.1, Aladdin, Unicode
 PACKAGE:          SUNWcupsr SUNWcupsu
 PROJECT_URL:      http://www.cups.org/
-SOURCE_DOWNLOAD:  http://ftp.easysw.com/pub/cups/1.4.2/cups-1.4.2-source.tar.bz2
+SOURCE_DOWNLOAD:  http://ftp.easysw.com/pub/cups/1.4.5/cups-1.4.5-source.tar.bz2
 SUPPORT:          B
 BUGTRAQ:          solaris/print/cups
 OSR:              12856
--- a/usr/src/cmd/cups/Makefile.sfw	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Makefile.sfw	Thu Jan 06 02:11:13 2011 -0800
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.13	10/04/22 SMI"
+#ident	"@(#)Makefile.sfw	1.14	10/12/07 SMI"
 
 include ../Makefile.cmd
 
@@ -60,6 +60,7 @@
 TARGET_ENV += 	PATH="$(SFW_PATH)"
 TARGET_ENV += 	MAKE="$(CCSMAKE)"
 TARGET_ENV += 	"ac_cv_search_getifaddrs=no"
+TARGET_ENV += 	"ac_cv_func_statfs=no"
 
 all:=		TARGET = all
 install:=	TARGET = install
--- a/usr/src/cmd/cups/Patches/00-man.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Patches/00-man.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -1,5 +1,5 @@
---- Makedefs.in.orig	Sat Aug  8 00:12:56 2009
-+++ Makedefs.in	Sat Aug  8 00:14:49 2009
+--- Makedefs.in.orig	Fri Apr 23 11:56:34 2010
++++ Makedefs.in	Tue Dec  7 00:56:35 2010
 @@ -259,7 +259,7 @@
  #
  
@@ -11,16 +11,16 @@
  	echo Compiling $<...
 @@ -277,7 +277,7 @@
  	echo Compiling $<...
- 	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+ 	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
  
 -.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
 +.man.1 .man.1cups .man.1m .man.3 .man.5 .man.7 .man.8:
  	echo Linking $<...
  	$(RM) $@
  	$(LN) $< $@
---- man/Makefile.orig	Sat Aug  8 00:16:52 2009
-+++ man/Makefile	Sat Aug  8 00:20:37 2009
-@@ -127,10 +127,10 @@
+--- man/Makefile.orig	Tue Jun 22 14:42:44 2010
++++ man/Makefile	Tue Dec  7 00:56:35 2010
+@@ -126,10 +126,10 @@
  #
  
  install-data: all
--- a/usr/src/cmd/cups/Patches/01-cups-config.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Patches/01-cups-config.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -1,11 +1,11 @@
---- cups-config.in.orig	Mon Aug 31 22:59:56 2009
-+++ cups-config.in	Mon Aug 31 23:01:31 2009
+--- cups-config.in.orig	Tue Jun 15 17:49:01 2010
++++ cups-config.in	Tue Dec  7 01:48:35 2010
 @@ -113,7 +113,7 @@
  	    ;;
  	--libs)
  	    if test $static = no; then
--	        libs="-lcups $LIBS";
-+	        libs="-lcups";
+-	        libs="@EXTLINKCUPS@ $LIBS";
++	        libs="@EXTLINKCUPS@"
   	        if test $image = yes; then
-  	            libs="-lcupsimage $libs"
+  	            libs="@EXTLINKCUPSIMAGE@ $libs"
  		fi
--- a/usr/src/cmd/cups/Patches/03-cups.pc.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Patches/03-cups.pc.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -1,8 +1,8 @@
 Index: Makefile
 ===================================================================
---- Makefile.orig	Mon Aug 31 23:08:53 2009
-+++ Makefile	Mon Aug 31 23:10:48 2009
-@@ -242,7 +242,10 @@
+--- Makefile.orig	Fri Apr 23 11:56:34 2010
++++ Makefile	Tue Dec  7 01:16:04 2010
+@@ -237,7 +237,10 @@
  		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps; \
  		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \
  	fi
@@ -45,12 +45,12 @@
 
 Index: configure.in
 ===================================================================
---- configure.in.orig	Mon Aug 31 23:13:22 2009
-+++ configure.in	Mon Aug 31 23:14:05 2009
+--- configure.in.orig	Tue Jun 22 14:42:44 2010
++++ configure.in	Mon Dec  6 03:26:15 2010
 @@ -71,7 +71,7 @@
  	  man/client.conf.man man/cups-deviced.man man/cups-driverd.man
  	  man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
- 	  man/cupsd.conf.man man/drv.man man/lpoptions.man
+ 	  man/cupsd.conf.man man/lpoptions.man
 -	  templates/header.tmpl
 +	  templates/header.tmpl cups.pc
  	  $LANGFILES)
--- a/usr/src/cmd/cups/Patches/07-scf-active.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Patches/07-scf-active.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -9,9 +9,9 @@
  CUPSDLIBS	=	@CUPSDLIBS@
  CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
  CXXLIBS		=	@CXXLIBS@
---- cups/http.c.orig	Wed Jul  1 08:23:28 2009
-+++ cups/http.c	Mon Aug 31 23:17:04 2009
-@@ -381,7 +381,35 @@
+--- cups/http.c.orig	Mon Aug  9 23:15:55 2010
++++ cups/http.c	Tue Dec  7 01:16:04 2010
+@@ -396,7 +396,35 @@
    return (httpConnectEncrypt(host, port, HTTP_ENCRYPT_IF_REQUESTED));
  }
  
@@ -47,7 +47,7 @@
  /*
   * 'httpConnectEncrypt()' - Connect to a HTTP server using encryption.
   */
-@@ -445,6 +473,10 @@
+@@ -460,6 +488,10 @@
    if (!host)
      return (NULL);
  
--- a/usr/src/cmd/cups/Patches/11-ldap-ssl.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Patches/11-ldap-ssl.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -1,11 +1,11 @@
---- scheduler/dirsvc.c.orig	Sat Aug  8 01:01:29 2009
-+++ scheduler/dirsvc.c	Sat Aug  8 01:05:00 2009
-@@ -1332,7 +1332,7 @@
+--- scheduler/dirsvc.c.orig	Fri Apr 23 11:56:34 2010
++++ scheduler/dirsvc.c	Mon Dec  6 20:58:17 2010
+@@ -1335,7 +1335,7 @@
  #  if defined(HAVE_LDAP_SSL) && defined (HAVE_MOZILLA_LDAP)
-       if (ldap_ssl && ((rc == LDAP_SERVER_DOWN) || (rc == LDAP_CONNECT_ERROR)))
-       {
--        ssl_err = PORT_GetError();
-+        ssl_err = rc;
-         if (ssl_err != 0)
-           cupsdLogMessage(CUPSD_LOG_ERROR,
-                           "LDAP SSL error %d: %s",
+     if (ldap_ssl && (rc == LDAP_SERVER_DOWN || rc == LDAP_CONNECT_ERROR))
+     {
+-      ssl_err = PORT_GetError();
++      ssl_err = rc;
+       if (ssl_err != 0)
+         cupsdLogMessage(CUPSD_LOG_ERROR, "LDAP SSL error %d: %s", ssl_err,
+                         ldapssl_err2string(ssl_err));
--- a/usr/src/cmd/cups/Patches/12-base-tx.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Patches/12-base-tx.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -89,11 +89,11 @@
  UNINSTALL_LANGUAGES=""
 Index: config.h.in
 ===================================================================
---- config.h.in	(revision 8857)
-+++ config.h.in	(working copy)
-@@ -611,7 +611,17 @@
- 
- #undef HAVE_TCPD_H
+--- config.h.in.orig	Thu Aug 12 21:11:46 2010
++++ config.h.in	Tue Dec  7 01:30:14 2010
+@@ -665,7 +665,17 @@
+ #undef HAVE_SYS_STATVFS_H
+ #undef HAVE_SYS_VFS_H
  
 +/*
 + * Do we have Solaris Trusted Extensions support?
@@ -111,9 +111,9 @@
  /*
 Index: scheduler/ipp.c
 ===================================================================
---- scheduler/ipp.c	(revision 8801)
-+++ scheduler/ipp.c	(working copy)
-@@ -853,7 +853,52 @@
+--- scheduler/ipp.c.orig	Wed Oct  6 13:07:44 2010
++++ scheduler/ipp.c	Tue Dec  7 01:30:14 2010
+@@ -856,7 +856,52 @@
    return (0);
  }
  
@@ -166,7 +166,7 @@
  /*
   * 'accept_jobs()' - Accept print jobs to a printer.
   */
-@@ -1345,6 +1390,17 @@
+@@ -1361,6 +1406,17 @@
  		  filetype, filetype ? filetype->super : "none",
  		  filetype ? filetype->type : "none");
  
@@ -184,7 +184,7 @@
   /*
    * Check remote printing to non-shared printer...
    */
-@@ -1562,6 +1618,19 @@
+@@ -1620,6 +1676,19 @@
      return (NULL);
    }
  
@@ -204,7 +204,7 @@
    job->dtype   = printer->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT |
                                    CUPS_PRINTER_REMOTE);
    job->attrs   = con->request;
-@@ -3682,6 +3751,15 @@
+@@ -3761,6 +3830,15 @@
      return;
    }
  
@@ -220,7 +220,7 @@
   /*
    * See if the job has been completed...
    */
-@@ -4050,6 +4128,16 @@
+@@ -4129,6 +4207,16 @@
      return;
    }
  
@@ -237,7 +237,7 @@
   /*
    * See if the job is owned by the requesting user...
    */
-@@ -6294,6 +6382,16 @@
+@@ -6389,6 +6477,16 @@
  	send_ipp_status(con, IPP_NOT_FOUND, _("Job %d not found!"), jobid);
  	return;
        }
@@ -254,7 +254,7 @@
      }
      else
        job = NULL;
-@@ -6820,6 +6918,15 @@
+@@ -6936,6 +7034,15 @@
      return;
    }
  
@@ -270,7 +270,7 @@
   /*
    * Copy attributes...
    */
-@@ -7029,6 +7136,14 @@
+@@ -7156,6 +7263,14 @@
  
      cupsdLoadJob(job);
  
@@ -285,7 +285,7 @@
      if (!job->attrs)
      {
        cupsdLogMessage(CUPSD_LOG_DEBUG2, "get_jobs: No attributes for job %d!",
-@@ -8085,6 +8200,15 @@
+@@ -8212,6 +8327,15 @@
      return;
    }
  
@@ -301,7 +301,7 @@
   /*
    * See if the job is owned by the requesting user...
    */
-@@ -8339,6 +8463,14 @@
+@@ -8466,6 +8590,14 @@
                        _("Job #%d does not exist!"), jobid);
        return;
      }
@@ -316,7 +316,7 @@
      else
      {
       /*
-@@ -8361,6 +8493,27 @@
+@@ -8488,6 +8620,27 @@
      return;
    }
  
@@ -344,7 +344,7 @@
   /*
    * Now move the job or jobs...
    */
-@@ -9184,6 +9337,16 @@
+@@ -9318,6 +9471,16 @@
      return;
    }
  
@@ -361,7 +361,7 @@
   /*
    * See if job is "held"...
    */
-@@ -9410,6 +9573,15 @@
+@@ -9544,6 +9707,15 @@
      return;
    }
  
@@ -377,7 +377,7 @@
   /*
    * See if job is in any of the "completed" states...
    */
-@@ -9765,6 +9937,15 @@
+@@ -9899,6 +10071,15 @@
      return;
    }
  
@@ -393,7 +393,7 @@
    printer = cupsdFindDest(job->dest);
  
   /*
-@@ -10341,6 +10522,15 @@
+@@ -10488,6 +10669,15 @@
      return;
    }
  
@@ -409,7 +409,7 @@
   /*
    * See if the job has been completed...
    */
-@@ -10678,7 +10868,6 @@
+@@ -10825,7 +11015,6 @@
   /*
    * Return a list of attributes that can be set via Set-Printer-Attributes.
    */
@@ -417,7 +417,7 @@
    if ((attr = ippFindAttribute(con->request, "printer-location",
                                 IPP_TAG_TEXT)) != NULL)
    {
-@@ -11421,6 +11610,11 @@
+@@ -11584,6 +11773,11 @@
  
    strlcpy(username, get_username(con), userlen);
  
@@ -431,9 +431,9 @@
    */
 Index: scheduler/printers.c
 ===================================================================
---- scheduler/printers.c	(revision 8857)
-+++ scheduler/printers.c	(working copy)
-@@ -912,7 +912,93 @@
+--- scheduler/printers.c.orig	Wed Sep 22 11:35:07 2010
++++ scheduler//printers.c	Tue Dec  7 01:30:14 2010
+@@ -1011,7 +1011,93 @@
    p->users     = NULL;
  }
  
@@ -529,8 +529,8 @@
   */
 Index: scheduler/job.c
 ===================================================================
---- scheduler/job.c	(revision 8801)
-+++ scheduler/job.c	(working copy)
+--- scheduler/job.c.orig	Sat Oct 16 21:13:56 2010
++++ scheduler/job.c	Tue Dec  7 01:30:14 2010
 @@ -911,8 +911,14 @@
      }
    }
@@ -571,7 +571,7 @@
    job->sheets     = ippFindAttribute(job->attrs, "job-media-sheets-completed",
                                       IPP_TAG_INTEGER);
    job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -3767,6 +3783,18 @@
+@@ -3977,6 +3993,18 @@
    if (!cupsdLoadJob(job))
      return;
  
@@ -592,9 +592,9 @@
  
 Index: scheduler/printers.h
 ===================================================================
---- scheduler/printers.h	(revision 8857)
-+++ scheduler/printers.h	(working copy)
-@@ -148,6 +148,8 @@
+--- scheduler/printers.h.orig	Tue Mar 30 15:07:33 2010
++++ scheduler/printers.h	Tue Dec  7 01:30:14 2010
+@@ -151,6 +151,8 @@
  			                const char *username);
  extern void		cupsdFreePrinterUsers(cupsd_printer_t *p);
  extern void		cupsdFreeQuotas(cupsd_printer_t *p);
@@ -618,9 +618,9 @@
  typedef struct cupsd_joblog_s		/**** Job log message ****/
 Index: scheduler/client.c
 ===================================================================
---- scheduler/client.c	(revision 8857)
-+++ scheduler/client.c	(working copy)
-@@ -84,7 +84,12 @@
+--- scheduler/client.c.orig	Sat Oct 16 21:13:56 2010
++++ scheduler/client.c	Tue Dec  7 01:30:14 2010
+@@ -90,7 +90,12 @@
  #  include <tcpd.h>
  #endif /* HAVE_TCPD_H */
  
@@ -633,7 +633,7 @@
  /*
   * Local functions...
   */
-@@ -117,7 +122,40 @@
+@@ -123,7 +128,40 @@
  				   struct stat *filestats);
  static void		write_pipe(cupsd_client_t *con);
  
@@ -674,7 +674,7 @@
  /*
   * 'cupsdAcceptClient()' - Accept a new client.
   */
-@@ -385,6 +423,21 @@
+@@ -391,6 +429,21 @@
    }
  #endif /* HAVE_TCPD_H */
  
@@ -696,7 +696,7 @@
  #ifdef AF_INET6
    if (con->http.hostaddr->addr.sa_family == AF_INET6)
      cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAcceptClient: %d from %s:%d (IPv6)",
-@@ -674,6 +727,12 @@
+@@ -680,6 +733,12 @@
      }
    }
  
--- a/usr/src/cmd/cups/Patches/13.cups-1.4.2-CVE-2009-3553.patch	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-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);
-
--- a/usr/src/cmd/cups/Patches/14.dbus-glib.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/cups/Patches/14.dbus-glib.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -1,6 +1,6 @@
---- 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 @@
+--- config-scripts/cups-common.m4.orig	Thu Nov 11 12:11:32 2010
++++ config-scripts/cups-common.m4	Tue Dec  7 01:48:35 2010
+@@ -283,6 +283,8 @@
  				dbus_message_iter_init_append,
  				AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
  				`$PKGCONFIG --libs dbus-1`)
--- a/usr/src/cmd/cups/Patches/15.cups-1.4.2-CVE-2010-0393.patch	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-Index: cups/globals.c
-===================================================================
---- cups/globals.c	Thu May 14 14:18:35 2009
-+++ cups/globals.c	Fri Feb 26 02:49:05 2010
-@@ -38,20 +38,44 @@
- static void
- cups_env_init(_cups_globals_t *g)	/* I - Global data */
- {
--  if ((g->cups_datadir = getenv("CUPS_DATADIR")) == NULL)
--    g->cups_datadir = CUPS_DATADIR;
-+#ifdef HAVE_GETEUID
-+  if ((geteuid() != getuid() && getuid()) || getegid() != getgid())
-+#else
-+  if (!getuid())
-+#endif /* HAVE_GETEUID */
-+  {
-+   /*
-+    * When running setuid/setgid, don't allow environment variables to override
-+    * the directories...
-+    */
- 
--  if ((g->cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
--    g->cups_serverbin = CUPS_SERVERBIN;
--
--  if ((g->cups_serverroot = getenv("CUPS_SERVERROOT")) == NULL)
-+    g->cups_datadir    = CUPS_DATADIR;
-+    g->cups_serverbin  = CUPS_SERVERBIN;
-     g->cups_serverroot = CUPS_SERVERROOT;
-+    g->cups_statedir   = CUPS_STATEDIR;
-+    g->localedir       = CUPS_LOCALEDIR;
-+  }
-+  else
-+  {
-+   /*
-+    * Allow directories to be overridden by environment variables.
-+    */
- 
--  if ((g->cups_statedir = getenv("CUPS_STATEDIR")) == NULL)
--    g->cups_statedir = CUPS_STATEDIR;
-+    if ((g->cups_datadir = getenv("CUPS_DATADIR")) == NULL)
-+      g->cups_datadir = CUPS_DATADIR;
- 
--  if ((g->localedir = getenv("LOCALEDIR")) == NULL)
--    g->localedir = CUPS_LOCALEDIR;
-+    if ((g->cups_serverbin = getenv("CUPS_SERVERBIN")) == NULL)
-+      g->cups_serverbin = CUPS_SERVERBIN;
-+
-+    if ((g->cups_serverroot = getenv("CUPS_SERVERROOT")) == NULL)
-+      g->cups_serverroot = CUPS_SERVERROOT;
-+
-+    if ((g->cups_statedir = getenv("CUPS_STATEDIR")) == NULL)
-+      g->cups_statedir = CUPS_STATEDIR;
-+
-+    if ((g->localedir = getenv("LOCALEDIR")) == NULL)
-+      g->localedir = CUPS_LOCALEDIR;
-+  }
- }
- 
- 
-Index: systemv/lppasswd.c
-===================================================================
---- systemv/lppasswd.c	Wed Jul 11 14:46:42 2007
-+++ systemv/lppasswd.c	Fri Feb 26 02:49:05 2010
-@@ -31,9 +31,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- 
--#include <cups/string.h>
--#include <cups/cups.h>
--#include <cups/i18n.h>
-+#include <cups/globals.h>
- #include <cups/md5.h>
- 
- #ifndef WIN32
-@@ -79,7 +77,6 @@
- 		groupline[17],		/* Group from line */
- 		md5line[33],		/* MD5-sum from line */
- 		md5new[33];		/* New MD5 sum */
--  const char	*root;			/* CUPS server root directory */
-   char		passwdmd5[1024],	/* passwd.md5 file */
- 		passwdold[1024],	/* passwd.old file */
- 		passwdnew[1024];	/* passwd.tmp file */
-@@ -88,6 +85,7 @@
-   int		flag;			/* Password check flags... */
-   int		fd;			/* Password file descriptor */
-   int		error;			/* Write error */
-+  _cups_globals_t *cg = _cupsGlobals();    /* Global data */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Signal action */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET*/
-@@ -113,19 +111,12 @@
- 
-  /*
-   * Find the server directory...
--  *
--  * We use the CUPS_SERVERROOT environment variable when we are running
--  * as root or when lppasswd is not setuid...
-   */
- 
--  if ((root = getenv("CUPS_SERVERROOT")) == NULL ||
--      (getuid() != geteuid() && getuid()))
--    root = CUPS_SERVERROOT;
-+  snprintf(passwdmd5, sizeof(passwdmd5), "%s/passwd.md5", cg->cups_serverroot);
-+  snprintf(passwdold, sizeof(passwdold), "%s/passwd.old", cg->cups_serverroot);
-+  snprintf(passwdnew, sizeof(passwdnew), "%s/passwd.new", cg->cups_serverroot);
- 
--  snprintf(passwdmd5, sizeof(passwdmd5), "%s/passwd.md5", root);
--  snprintf(passwdold, sizeof(passwdold), "%s/passwd.old", root);
--  snprintf(passwdnew, sizeof(passwdnew), "%s/passwd.new", root);
--
-  /*
-   * Find the default system group...
-   */
--- a/usr/src/cmd/cups/Patches/16.cups-1.4.2-CVE-2010-0302.patch	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- scheduler/select.c.orig	Tue Mar  9 20:37:58 2010
-+++ scheduler/select.c	Tue Mar  9 20:38:19 2010
-@@ -454,7 +454,8 @@
-     if (fdptr->read_cb && event->filter == EVFILT_READ)
-       (*(fdptr->read_cb))(fdptr->data);
- 
--    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE)
-+    if (fdptr->use > 1 && fdptr->write_cb && event->filter == EVFILT_WRITE &&
-+	!cupsArrayFind(cupsd_inactive_fds, fdptr))
-       (*(fdptr->write_cb))(fdptr->data);
- 
-     release_fd(fdptr);
-@@ -499,7 +500,9 @@
- 	if (fdptr->read_cb && (event->events & (EPOLLIN | EPOLLERR | EPOLLHUP)))
- 	  (*(fdptr->read_cb))(fdptr->data);
- 
--	if (fdptr->use > 1 && fdptr->write_cb && (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)))
-+	if (fdptr->use > 1 && fdptr->write_cb &&
-+	     (event->events & (EPOLLOUT | EPOLLERR | EPOLLHUP)) &&
-+	     !cupsArrayFind(cupsd_inactive_fds, fdptr))
- 	  (*(fdptr->write_cb))(fdptr->data);
- 
- 	release_fd(fdptr);
--- a/usr/src/cmd/cups/Patches/17.svc-manifest-restarter.patch	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-diff -ur init/cups.xml.in cups-1.4.2/init/cups.xml.in
---- init/cups.xml.in	Thu Jul 31 10:16:48 2008
-+++ init/cups.xml.in	Tue Jun 29 04:43:51 2010
-@@ -116,6 +116,10 @@
-     type='service'
-     version='1'>
- 
-+    <restarter>
-+        <service_fmri value='svc:/network/inetd:default' />
-+    </restarter>
-+
-     <dependency
-         name='filesystem_minimal'
-         grouping='require_all'
-@@ -155,10 +159,6 @@
-         timeout_seconds='60' />
- 
-     <instance name='default' enabled='false' >
--        <restarter>
--            <service_fmri value='svc:/network/inetd:default' />
--        </restarter>
--
-         <dependency
-             name='cupsd'
-             grouping='require_all'
Binary file usr/src/cmd/cups/cups-1.4.2-source.tar.bz2 has changed
Binary file usr/src/cmd/cups/cups-1.4.5-source.tar.bz2 has changed
--- a/usr/src/cmd/epydoc/METADATA	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-NAME:             epydoc
-VERSION:          3.0.1
-DESCRIPTION:      automatic api documentation generation for python
-LICENSE:          MIT
-PACKAGE:          SUNWepydoc
-PROJECT_URL:      http://sourceforge.net/projects/epydoc
-SOURCE_DOWNLOAD:  http://downloads.sourceforge.net/epydoc/epydoc-3.0.1.tar.gz
-SUPPORT:          C
-BUGTRAQ:          solaris/utility/epydoc
-OSR:              10594
-COMMENTS:         
--- a/usr/src/cmd/epydoc/Makefile.sfw	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-# 
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile.sfw	1.4	09/12/03 SMI"
-#
-
-APP = $(COMPONENT_NAME:sh)
-VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
-TARBALL = $(VER).tar.gz
-
-include ../Makefile.cmd
-
-install: $(VER)/setup.py
-	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
-		$(SRC)/tools/protofix --pkg $$pkg --perm --write; \
-	done
-	env PYTHON=$(PYTHON24) PKGDIR=$(VER) $(SHELL) ./install-sfw
-	# apply the file attributes from the packaging
-	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
-		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
-	done
-
-$(VER)/setup.py: $(TARBALL)
-	gzip -dc $(TARBALL) | tar xopf -
-	touch $(VER)/setup.py
-
-clean:
-	-rm -rf $(VER)
-
-include ../Makefile.targ
Binary file usr/src/cmd/epydoc/epydoc-3.0.1.tar.gz has changed
--- a/usr/src/cmd/epydoc/install-sfw	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-#!/usr/bin/ksh93
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)install-sfw	1.3	10/01/08 SMI"
-#
-
-set -o errexit 
-
-PREFIX=${ROOT}/usr
-BINDIR=${PREFIX}/bin
-SHAREDIR=${PREFIX}/share
-MAN1DIR=${SHAREDIR}/man/man1
-PYTHONDIR=${PREFIX}/lib/python2.4/site-packages
-
-MANSCRIPT=../sunman-stability
-source ${SRC}/tools/install.subr
-
-cd ${PKGDIR}
-
-# executable script
-_install P scripts/apirst2html.py ${BINDIR}/apirst2html.py 555
-_install P scripts/epydoc ${BINDIR}/epydoc 555
-_install P scripts/epydocgui ${BINDIR}/epydocgui 555
-
-# python module 
-for i in `find epydoc -type f`
-do
-	_install P ${i} ${PYTHONDIR}/${i} 444
-done 
-
-# document
-for i in `cd doc;find . -type f`
-do
-	_install N doc/${i} ${SHAREDIR}/doc/epydoc/${i} 444
-done 
-
-#man page
-_install M man/epydoc.1 ${MAN1DIR}/epydoc.1 444
-_install M man/epydocgui.1 ${MAN1DIR}/epydocgui.1 444
-
-exit 0
--- a/usr/src/cmd/epydoc/sunman-stability	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-1i\
-'\\" t\
-\.\\"\
-\.\\" Modified for Solaris to to add the Solaris stability classification,\
-\.\\" and to add a note about source availability.\
-\.\\"\ 
-$a\
-\.\\" Begin Sun update\
-.SH ATTRIBUTES\
-See\
-.BR attributes (5)\
-for descriptions of the following attributes:\
-.sp\
-.TS\
-box;\
-cbp-1 | cbp-1\
-l | l .\
-ATTRIBUTE TYPE	ATTRIBUTE VALUE\
-=\
-Availability	developer/documentation-tool/epydoc \
-=\
-Interface Stability	Uncommitted \
-.TE \
-.PP\
-.SH NOTES\
-Source for epydoc is available on http://opensolaris.org.\
-\.\\" End Sun update
--- a/usr/src/cmd/fetchmail/METADATA	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/fetchmail/METADATA	Thu Jan 06 02:11:13 2011 -0800
@@ -1,10 +1,10 @@
 NAME:             fetchmail
-VERSION:          6.3.18
+VERSION:          6.3.19
 DESCRIPTION:      fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
 LICENSE:          GPLv2
 PACKAGE:          SUNWfetchmail
 PROJECT_URL:      http://fetchmail.berlios.de/
-SOURCE_DOWNLOAD:  http://download.berlios.de/fetchmail/fetchmail-6.3.18.tar.bz2
+SOURCE_DOWNLOAD:  http://download.berlios.de/fetchmail/fetchmail-6.3.19.tar.bz2
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/fetchmail
 OSR:              8301
Binary file usr/src/cmd/fetchmail/fetchmail-6.3.18.tar.bz2 has changed
Binary file usr/src/cmd/fetchmail/fetchmail-6.3.19.tar.bz2 has changed
--- a/usr/src/cmd/foomatic-filters/Makefile.sfw	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/foomatic-filters/Makefile.sfw	Thu Jan 06 02:11:13 2011 -0800
@@ -19,10 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.10	08/02/09 SMI"
+#ident	"@(#)Makefile.sfw	1.11	10/12/03 SMI"
 #
 
 VER=foomatic-filters-3.0.2
@@ -55,7 +54,7 @@
 	    PATH=$(SFW_PATH) \
 	    "LD_OPTIONS=-L/usr/sfw/lib -R/usr/sfw/lib" \
 	    CONFIG_SHELL=/bin/bash \
-	    A2PS=$(ROOT)/usr/bin/a2ps \
+	    A2PS=/usr/bin/a2ps \
 	    MAKE="$(CCSMAKE) SHELL=/bin/bash" \
 	./configure --sysconfdir=/etc/sfw \
 		    --prefix=/usr/lib/lp \
--- a/usr/src/cmd/perl510/Makefile.sfw	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/perl510/Makefile.sfw	Thu Jan 06 02:11:13 2011 -0800
@@ -20,11 +20,10 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)Makefile.sfw	1.1	09/08/06 SMI"
+#ident	"@(#)Makefile.sfw	1.2	10/12/20 SMI"
 
 VER =           $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 TARBALL=$(VER).tar.gz
@@ -59,9 +58,10 @@
 	    PATH=$(SFW_PATH) \
 	    DESTDIR=${ROOT} \
 	    MAKE=$(GMAKE) \
-	    $(GMAKE) install;\
-	    $(SRC)/tools/protofix --pkg SUNWperl510core --perm ;\
-	    $(SRC)/tools/protofix --pkg SUNWperl510usr --perm ;)
+	    $(GMAKE) install)
+	$(SRC)/tools/protofix --pkg SUNWperl510core --perm --bang
+	$(SRC)/tools/protofix --pkg SUNWperl510usr --perm --bang
+
 
 config: $(VER)/config.sh
 	(cd $(VER); env - \
@@ -77,6 +77,8 @@
 	(cd $(VER) &&	\
 		cp -f ../config.sh.$(MACH) ./config.sh && \
 		gpatch -p0 < ../atinc.patch) 
+	chmod u+w $(VER)/config.sh
+	echo "ccversion='`$(CC) -V 2>&1 | grep -v usage:`'" >> $(VER)/config.sh
 
 clean:
 	$(RM) -r $(VER)
--- a/usr/src/cmd/perl510/config.sh.i386	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/perl510/config.sh.i386	Thu Jan 06 02:11:13 2011 -0800
@@ -21,11 +21,10 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)config.sh.i386	1.2	09/09/03 SMI"
+#ident	"@(#)config.sh.i386	1.3	10/12/20 SMI"
 #
 #
 # This file was produced by running the Configure script. It holds all the
@@ -88,7 +87,6 @@
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='cc'
 ccsymbols=''
-ccversion='Sun C 5.9 SunOS_i386 Patch 124868-07 2008/10/07'
 cf_by='perl-bugs'
 cf_email='[email protected]'
 cf_time=''
@@ -558,7 +556,7 @@
 doublesize='8'
 drand01='drand48()'
 drand48_r_proto='0'
-dynamic_ext='B ByteLoader Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+dynamic_ext='attrs B Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap threads threads/shared Hash/Util/FieldHash'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -758,7 +756,7 @@
 ivdformat='"lld"'
 ivsize='8'
 ivtype='long long'
-known_extensions='B ByteLoader Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+known_extensions='attrs B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap threads threads/shared Hash/Util/FieldHash'
 ksh=''
 ld='cc'
 lddlflags='-G'
--- a/usr/src/cmd/perl510/config.sh.sparc	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/perl510/config.sh.sparc	Thu Jan 06 02:11:13 2011 -0800
@@ -21,10 +21,9 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)config.sh.sparc	1.1	09/08/06 SMI"
+#ident	"@(#)config.sh.sparc	1.2	10/12/20 SMI"
 #
 # This file was produced by running the Configure script. It holds all the
 # definitions figured out by Configure. Should you modify one of these values,
@@ -86,7 +85,6 @@
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='cc'
 ccsymbols=''
-ccversion='Sun C 5.9 SunOS_sparc Patch 124867-08 2008/10/07'
 cf_by='perl-bugs'
 cf_email='[email protected]'
 cf_time='Thu Jun 11 09:40:41 PDT 2009'
@@ -556,7 +554,7 @@
 doublesize='8'
 drand01='drand48()'
 drand48_r_proto='0'
-dynamic_ext='B ByteLoader Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+dynamic_ext='attrs B Compress/Raw/Zlib Cwd Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize XS/APItest XS/Typemap threads threads/shared Hash/Util/FieldHash'
 eagain='EAGAIN'
 ebcdic='undef'
 echo='echo'
@@ -756,7 +754,7 @@
 ivdformat='"lld"'
 ivsize='8'
 ivtype='long long'
-known_extensions='B ByteLoader Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'
+known_extensions='attrs B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/Peek Devel/PPPort Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util Math/BigInt/FastCalc MIME/Base64 NDBM_File ODBM_File Opcode PerlIO/encoding PerlIO/scalar PerlIO/via POSIX re SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap threads threads/shared Hash/Util/FieldHash'
 ksh=''
 ld='cc'
 lddlflags='-G'
--- a/usr/src/cmd/vim/runtime.patch	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/vim/runtime.patch	Thu Jan 06 02:11:13 2011 -0800
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \10/12/07*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \10/12/20*\\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/webmin/misc/setup-post.sh	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/webmin/misc/setup-post.sh	Thu Jan 06 02:11:13 2011 -0800
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)setup-post.sh	1.5	06/03/18 SMI"
+#ident	"@(#)setup-post.sh	1.6	10/12/20 SMI"
 #
 # setup-post.sh
 #
@@ -79,7 +78,7 @@
 		chmod 755 $config_dir/start $config_dir/stop $config_dir/restart
 
 		svccfg delete application/management/webmin > /dev/null 2>&1
-		svccfg import /var/svc/manifest/application/management/webmin.xml
+		svccfg import /lib/svc/manifest/application/management/webmin.xml
 	fi  # "$real_os_version" -ge "10"
     fi  # "$real_os_version" -ge "9"
 
--- a/usr/src/cmd/wireshark/METADATA	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/cmd/wireshark/METADATA	Thu Jan 06 02:11:13 2011 -0800
@@ -1,10 +1,10 @@
 NAME:             wireshark
-VERSION:          1.2.12
+VERSION:          1.2.13
 DESCRIPTION:      Wireshark Network protocol analyzer
 LICENSE:          GPLv2, GPLv3, BSD
 PACKAGE:          SUNWwireshark SUNWwiresharkr
 PROJECT_URL:      http://www.wireshark.org/
-SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.12.tar.bz2
+SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.13.tar.bz2
 SUPPORT:          C
 BUGTRAQ:          solaris/network/wireshark
 OSR:              12637
Binary file usr/src/cmd/wireshark/wireshark-1.2.12.tar.bz2 has changed
Binary file usr/src/cmd/wireshark/wireshark-1.2.13.tar.bz2 has changed
--- a/usr/src/lib/curl/Solaris/diffs/curlbuild.h.2.diff	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/curl/Solaris/diffs/curlbuild.h.2.diff	Thu Jan 06 02:11:13 2011 -0800
@@ -1,5 +1,5 @@
---- include/curl/curlbuild.h	2010-08-11 14:36:29.000000000 -0700
-+++ include/curl/curlbuild.h	2010-08-18 12:20:10.375872738 -0700
+--- include/curl/curlbuild.h	2010-10-12 15:04:32.000000000 -0700
++++ include/curl/curlbuild.h	2010-12-02 10:18:42.364070201 -0800
 @@ -496,6 +496,45 @@
  #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
  
@@ -46,3 +46,52 @@
  /*    KEEP MSVC THE PENULTIMATE ENTRY    */
  /* ===================================== */
  
+@@ -527,6 +566,40 @@
+ /* ===================================== */
+ 
+ #elif defined(__GNUC__)
++#  if defined(sun) || defined(__sun) || defined(__sun__)
++#  include <stdint.h>
++#  include <sys/types.h>
++#  include <sys/socket.h>
++#  define CURL_TYPEOF_CURL_OFF_T off_t
++#  define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
++#  define CURL_SIZEOF_CURL_SOCKLEN_T 4
++#  if defined(__x86_64__) || defined(__sparcv9)
++#     define CURL_SIZEOF_CURL_OFF_T 8
++#     define CURL_SIZEOF_LONG 8
++#     define CURL_FORMAT_CURL_OFF_T  "ld"
++#     define CURL_FORMAT_CURL_OFF_TU "lu"
++#     define CURL_FORMAT_OFF_T       "%ld"
++#     define CURL_SUFFIX_CURL_OFF_T L
++#     define CURL_SUFFIX_CURL_OFF_TU UL
++#  else /* (__i386__) || (__sparc) */
++#     define CURL_SIZEOF_LONG 4
++#     if _FILE_OFFSET_BITS == 64 && _LARGEFILE_SOURCE != 0
++#        define CURL_SIZEOF_CURL_OFF_T 8
++#        define CURL_FORMAT_CURL_OFF_T  "lld"
++#        define CURL_FORMAT_CURL_OFF_TU "llu"
++#        define CURL_FORMAT_OFF_T       "%lld"
++#        define CURL_SUFFIX_CURL_OFF_T LL
++#        define CURL_SUFFIX_CURL_OFF_TU ULL
++#    else
++#        define CURL_SIZEOF_CURL_OFF_T 4
++#        define CURL_FORMAT_CURL_OFF_T  "ld"
++#        define CURL_FORMAT_CURL_OFF_TU "lu"
++#        define CURL_FORMAT_OFF_T       "%ld"
++#        define CURL_SUFFIX_CURL_OFF_T L
++#        define CURL_SUFFIX_CURL_OFF_TU UL
++#     endif
++#  endif
++#  else /* !((sun) || (__sun) || (__sun__)) */
+ #  if defined(__i386__) || defined(__ppc__)
+ #    define CURL_SIZEOF_LONG           4
+ #    define CURL_TYPEOF_CURL_OFF_T     long long
+@@ -550,6 +623,7 @@
+ #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
+ #  define CURL_PULL_SYS_TYPES_H      1
+ #  define CURL_PULL_SYS_SOCKET_H     1
++#  endif /* ((sun) || (__sun) || (__sun__)) */
+ 
+ #else
+ #  error "Unknown non-configure build target!"
--- a/usr/src/lib/idn/METADATA	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/idn/METADATA	Thu Jan 06 02:11:13 2011 -0800
@@ -1,11 +1,21 @@
 NAME:             libidn
-VERSION:          1.9
+VERSION:          1.19
 DESCRIPTION:      used for internationalized domain names
 LICENSE:          GPLv3, LGPLv2
 PACKAGE:          SUNWgnu-idn
 PROJECT_URL:      http://www.gnu.org/software/libidn/
-SOURCE_DOWNLOAD:  ftp://ftp.gnu.org/gnu/libidn/libidn-1.9.tar.gz
+SOURCE_DOWNLOAD:  http://ftp.gnu.org/gnu/libidn/libidn-1.19.tar.gz
 SUPPORT:          B
 BUGTRAQ:          solaris/library/libidn
 OSR:              10903
 COMMENTS:         
+
+================================================================
+
+Additional TLD tables can/must be downloaded from:
+
+http://developer.berlios.de/projects/tldchk/
+
+The current version of the TLD database is 0.7, which has been
+delivered starting with libidn version 1.9.
+
--- a/usr/src/lib/idn/Makefile.in.0.diff	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/idn/Makefile.in.0.diff	Thu Jan 06 02:11:13 2011 -0800
@@ -1,39 +1,13 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)Makefile.in.0.diff	1.1	09/03/11 SMI"
-#
---- doc/Makefile.in	2008-07-01 09:15:35.000000000 -0700
-+++ doc/Makefile.in	2009-03-09 12:45:11.498210576 -0700
-@@ -712,10 +712,8 @@
- 		&& exit 0; \
+--- doc/Makefile.in	2010-05-22 04:29:07.000000000 -0700
++++ doc/Makefile.in	2010-11-30 10:05:27.172181211 -0800
+@@ -1041,10 +1041,8 @@
+ 	        && { if test -f $@; then exit 0; else break; fi; }; \
  	      exit 1;; \
  	  esac; \
 -	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  doc/Makefile
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+-	$(am__cd) $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu doc/Makefile
 +	done;
 +
  .PRECIOUS: Makefile
--- a/usr/src/lib/idn/Makefile.sfw	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/idn/Makefile.sfw	Thu Jan 06 02:11:13 2011 -0800
@@ -19,40 +19,130 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.6	09/03/23 SMI"
+# ident	"@(#)Makefile.sfw	1.7	10/11/30 SMI"
 
 #
 # This makefile builds both 32 and 64 bit versions of the library.
 # Builds occur in separate directories.
 #
 
-VER=libidn-1.9
+RELNUM=$(COMPONENT_VERSION:sh)
+VER=libidn-$(RELNUM)
 VER64=$(VER)-64
 
-LARGEFILES=	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+include ../Makefile.lib
+
+LARGEFILES = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 PREFIX = /usr
+PICFLAG = -KPIC -DPIC
+COMPAT_VERSION = 5
+TEST32OUT = $(SRC)/lib/idn/test-32-$(MACH).out
+TEST64OUT = $(SRC)/lib/idn/test-64-$(MACH64).out
+TEST_LD_LIBRARY_PATH_32=$(ROOT)/$(PREFIX)/lib
+TEST_LD_LIBRARY_PATH_64=$(ROOT)/$(PREFIX)/lib/$(MACH64)
+TEST_GNU_PATH = /usr/gnu/bin
 
-include ../Makefile.lib
+OPTIM_i386 = -xO3
+OPTIM_sparc = -xO4
+OPTIM = $(OPTIM_$(MACH))
+
+CFLAGS_GENERIC = -xc99=%all -features=extinl,extensions -xbuiltin=%none -xcsi \
+		 -xinline=%auto \
+		 -xustr=ascii_utf16_ushort -xalias_level=std \
+		 -xthreadvar=%all -mt -D_REENTRANT -D__EXTENSIONS__=1 \
+		 -xF $(LARGEFILES) -D_XOPEN_SOURCE=600 -D_XPG6 \
+		 -D_POSIX_PTHREAD_SEMANTICS -D_POSIX_C_SOURCE=200112L \
+		 -D__XOPEN_OR_POSIX -D_STRICT_STDC -D_STRICT_STDC__ \
+		 -D_STDC_C99 -D__C99FEATURES__ -D_ISOC99_SOURCE -DNDEBUG \
+		 $(PICFLAG) -z combreloc -z redlocsym -z ignore -z rescan \
+		 $(OPTIM) -s
+CFLAGS_i386 = -xregs=no%frameptr -xarch=generic
+CFLAGS_sparc = -xmemalign=8i
+CFLAGS_sparc += -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2
+FLAGS_32 = -m32
+FLAGS_64 = -m64
+CFLAGS = $(CFLAGS_GENERIC) $(CFLAGS_$(MACH))
+
+CCFLAGS_GENERIC = -features=anachronisms,except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic \
+		  -instances=global -template=geninlinefuncs -verbose=template \
+		  -xlang=c99 -xbuiltin=%none -xinline=%auto -xlibmil \
+		  -xustr=ascii_utf16_ushort -xlibmopt \
+		  -z combreloc -z redlocsym -z ignore -z rescan \
+		  -xldscope=symbolic -xalias_level=compatible $(PICFLAG) \
+		  -xF=%none -xthreadvar=%all -mt -D_REENTRANT -DNDEBUG \
+		  -D__EXTENSIONS__ $(LARGEFILES) \
+		  -D_XPG5 -D_XOPEN_SOURCE=500 -D_POSIX_PTHREAD_SEMANTICS \
+		  -Qoption ccfe -features=gcc -Qoption ccfe -features=zla \
+		  $(OPTIM) -s
+CXXFLAGS_sparc = -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2
+CXXFLAGS_sparc += -xbuiltin=%none -xmemalign=8i $(PICFLAG) -xO4 -s
+CXXFLAGS_i386 = -xregs=no%frameptr -s -xbuiltin=%none $(PICFLAG)
+CCFLAGS = $(CCFLAGS_GENERIC) $(CXXFLAGS_$(MACH))
+
+CPPFLAGS_GENERIC = -I$(ROOT)/usr/include
+
+LD_OPTIONS_GENERIC = -M $(SRC)/cmd/mapfile_noexstk
+LD_OPTIONS_GENERIC += -z combreloc -z redlocsym -z ignore -z rescan
+LD_OPTIONS_GENERIC += -z absexec
+
+# We need to do this because libtool adds wrong paths to RPATH.
+LDFLAGS = -L$(PREFIX)/lib -R$(PREFIX)/lib -s
+LDFLAGS += -z ignore -z combreloc -z redlocsym
+
+EXTRA_LDFLAGS64 = -L$(PREFIX)/lib/$(MACH64)
+EXTRA_LDFLAGS64 += -R$(PREFIX)/lib/$(MACH64) -s
+EXTRA_LDFLAGS64 += -z ignore -z combreloc -z redlocsym -z rescan
+
+LD_32 = $(CC) $(FLAGS_32) $(CFLAGS_GENERIC) $(CFLAGS) $(XREGSFLAG) $(LDFLAGS)
+LD_64 = $(CC64) $(FLAGS_64) $(CFLAGS_GENERIC) $(CFLAGS64) $(XREGSFLAG64) \
+	$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)
+
+CONFIGURE_OPTIONS = --localstatedir=/var \
+		    --includedir=$(CFGPREFIX)/include/idn \
+		    --enable-shared \
+		    --disable-static \
+		    --disable-csharp \
+		    --disable-rpath \
+		    --disable-valgrind-tests \
+		    --enable-tld \
+		    --enable-nls \
+		    --disable-gtk-doc \
+		    --enable-java \
+		    --with-libiconv-prefix=$(PREFIX) \
+		    --with-libintl-prefix=$(PREFIX) \
+		    --with-html-dir=$(PREFIX)/share/doc \
+		    --with-pic
 
 all: real-all
 
 all32: $(VER)/config.status
-	(cd $(VER); env "CFLAGS=$(CFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+	(cd $(VER); env - \
+	    CC=$(CC) CXX=$(CCC) \
+	    "CPPFLAGS=$(CPPFLAGS)" \
+	    "CFLAGS=$(FLAGS_32) $(CFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+	    "CXXFLAGS=$(FLAGS_32) $(CCFLAGS)" \
+	    "LD_OPTIONS=$(LD_OPTIONS_GENERIC)" \
+	    "LDFLAGS=$(LDFLAGS)" \
+	    "LD=$(LD_32)" \
 	    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
 	    PATH=$(SFW_PATH) \
 	    "MAKE=$(GMAKE)" $(GMAKE) -e) 
 
 all64: $(VER64)/config.status
-	(cd $(VER64); env "CFLAGS=$(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
+	(cd $(VER64); env - \
+	    "CC=$(CC64)" \
+	    "CXX=$(CCC64)" \
+	    "CFLAGS=$(FLAGS_64) $(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
+	    "CXXFLAGS=$(FLAGS_64) $(CCFLAGS)" \
+	    "LD_OPTIONS=$(LD_OPTIONS_GENERIC)" \
+	    "LDFLAGS=$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
+	    "LD=$(LD_64)" \
 	    "LD_OPTIONS=-M $(SRC)/cmd/mapfile_noexstk -z ignore" \
 	    PATH=$(SFW_PATH) \
 	    "MAKE=$(GMAKE)" $(GMAKE) -e) 
 
-COMPAT_VERSION=	5
-
 # lint stuff
 LIBRARY=libidn.a
 LINTOUT=        lint.out
@@ -60,8 +150,8 @@
 LINTFLAGS64=	-I../Solaris -I./lib -I./src $(CCBITS64) $(LARGEFILES)
 
 install: all
-	$(SH) ./install-sfw
-	MACH64=$(MACH64) $(SH) ./install-sfw-64
+	VERS=$(VER) $(SH) ./install-sfw
+	VERS=$(VER64) MACH64=$(MACH64) $(SH) ./install-sfw-64
 
 real-all: all32 all64 lint32 lint64
 
@@ -69,41 +159,37 @@
 
 $(VER)/config.status: $(VER)/configure
 	(cd $(VER) ; \
-	    env "CC=$(CC)" "CFLAGS=$(CPPFLAGS) $(CFLAGS)" \
-	    "CPP=$(CC) $(CFLAGS) $(CPPFLAGS) -E" \
-	    "CXX=$(CCC)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS)" \
-	    "CXXCPP=$(CCC) $(CPPFLAGS) $(CCFLAGS) -E" \
+	    env - "CC=$(CC)" \
+	    "CFLAGS=$(FLAGS_32) $(CFLAGS) $(XREGSFLAG) $(LARGEFILES)" \
+	    "LD=$(LD_32)" \
+	    "CPP=$(CC) $(FLAGS_32) $(CFLAGS) $(CPPFLAGS) $(LARGEFILES) -E" \
+	    "CXX=$(CCC)" \
+	    "CXXFLAGS=$(CPPFLAGS) $(FLAGS_32) $(LARGEFILES) $(CCFLAGS)" \
+	    "CXXCPP=$(CCC) $(CPPFLAGS) $(FLAGS_32) $(CCFLAGS) -E" \
 	    "CXXLDFLAGS=$(LDFLAGS)" \
-	    "CXXLD=$(CCC) $(LDFLAGS)" \
+	    "CXXLD=$(CCC) $(CCFLAGS) $(FLAGS_32) $(LDFLAGS)" \
+	    "LDFLAGS=$(LDFLAGS)" \
 	    AUTOMAKE="/usr/bin/automake-1.10" \
 	    PATH=$(SFW_PATH) \
 	    "MAKE=$(GMAKE)" \
 	    "INSTALL=$(GINSTALL) -c " \
 	    "ACLOCAL=/usr/bin/aclocal-1.10" \
 	    ./configure --prefix=$(CFGPREFIX) \
-	    --includedir=$(CFGPREFIX)/include/idn \
-	    --localstatedir=/var \
-	    --enable-shared \
-	    --disable-static \
-	    --disable-csharp \
-	    --disable-valgrind-tests \
-	    --enable-tld \
-	    --disable-gtk-doc \
-	    --enable-java \
-	    --with-libiconv-prefix=$(PREFIX) \
-	    --with-libintl-prefix=$(PREFIX) \
-	    --with-html-dir=$(PREFIX)/share/doc \
-	    --with-pic)
+	    $(CONFIGURE_OPTIONS) )
 
 $(VER64)/config.status: $(VER64)/configure
 	(cd $(VER64) ; \
-	    env "CC=$(CC64)" "CFLAGS=$(CPPFLAGS) $(CFLAGS64)" \
-	    "CPP=$(CC64) $(CFLAGS64) $(CPPFLAGS) -E" \
-	    "CXX=$(CCC64)" "CXXFLAGS=$(CPPFLAGS) $(CCFLAGS64)" \
-	    "CXXCPP=$(CCC64) $(CPPFLAGS) $(CCFLAGS64) -E" \
-	    "CXXLDFLAGS=$(LDFLAGS)" \
-	    "CXXLD=$(CCC64) $(LDFLAGS)" \
-	    "CXXLINKLIB=$(CCC64) $(LDFLAGS)" \
+	    env - "CC=$(CC64)" \
+	    "CFLAGS=$(FLAGS_64) $(CFLAGS64) $(XREGSFLAG64) $(LARGEFILES)" \
+	    "LD=$(LD_64)" \
+	    "CPP=$(CC64) $(FLAGS_64) $(CFLAGS64) $(CPPFLAGS) $(LARGEFILES) -E" \
+	    "CXX=$(CCC64)" \
+	    "CXXFLAGS=$(CPPFLAGS) $(FLAGS_64) $(LARGEFILES) $(CCFLAGS64)" \
+	    "CXXCPP=$(CCC64) $(CPPFLAGS) $(FLAGS_64) $(CCFLAGS64) -E" \
+	    "CXXLDFLAGS=$(EXTRA_LDFLAGS64)" \
+	    "LDFLAGS=$(EXTRA_LDFLAGS64)" \
+	    "CXXLD=$(CCC64) $(FLAGS_64) $(CCFLAGS64) $(EXTRA_LDFLAGS64)" \
+	    "CXXLINKLIB=$(CCC64) $(CCFLAGS64) $(FLAGS_64) $(EXTRA_LDFLAGS64)" \
 	    AUTOMAKE="/usr/bin/automake-1.10" \
 	    "MACH64=$(MACH64)" \
 	    PATH=$(SFW_PATH) \
@@ -114,19 +200,7 @@
 	    --bindir=$(CFGPREFIX)/bin/$(MACH64) \
 	    --libdir=$(CFGPREFIX)/lib/$(MACH64) \
 	    --libexecdir=$(CFGPREFIX)/libexec/$(MACH64) \
-	    --includedir=$(CFGPREFIX)/include/idn \
-	    --localstatedir=/var \
-	    --enable-shared \
-	    --disable-static \
-	    --disable-csharp \
-	    --disable-valgrind-tests \
-	    --enable-tld \
-	    --disable-gtk-doc \
-	    --enable-java \
-	    --with-libiconv-prefix=$(PREFIX) \
-	    --with-libintl-prefix=$(PREFIX) \
-	    --with-html-dir=$(PREFIX)/share/doc \
-	    --with-pic)
+	    $(CONFIGURE_OPTIONS) )
 
 $(VER)/configure: $(VER).tar.gz
 	mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
@@ -136,6 +210,10 @@
 	    gunzip tld-0.7.tar.gz ; \
 	    tar xvf tld-0.7.tar ; \
 	    rm -f tld-0.7.tar ; \
+	    find ./tld -type f -name "*.tld" -exec chmod 0644 {} + ; \
+	    find ./tld -type f -name "*.tld" -exec touch -acm {} + ; \
+	    find ./tld/templates -type f -exec chmod 0644 {} + ; \
+	    find ./tld/templates -type f -exec touch -acm {} + ; \
 	    cd ../.. )
 	find $(VER) -type d -exec chmod go+rx {} +
 	( cd $(VER) ; \
@@ -143,6 +221,10 @@
 	    touch configure ; \
 	    chmod 0755 configure ; \
 	    cd .. )
+	( cd $(VER)/lib ; \
+	    touch -acm gen-tld-tables.pl ; \
+	    touch -acm gen-unicode-tables.pl; \
+	    touch -acm gen-stringprep-tables.pl )
 
 $(VER64)/configure: $(VER).tar.gz
 	mkdir -p tmp; gzip -dc $(VER).tar.gz | (cd tmp; tar xopf -)
@@ -152,6 +234,10 @@
 	    gunzip tld-0.7.tar.gz ; \
 	    tar xvf tld-0.7.tar ; \
 	    rm -f tld-0.7.tar ; \
+	    find ./tld -type f -name "*.tld" -exec chmod 0644 {} + ; \
+	    find ./tld -type f -name "*.tld" -exec touch -acm {} + ; \
+	    find ./tld/templates -type f -exec chmod 0644 {} + ; \
+	    find ./tld/templates -type f -exec touch -acm {} + ; \
 	    cd ../.. )
 	find $(VER64) -type d -exec chmod go+rx {} +
 	( cd $(VER64) ; \
@@ -159,6 +245,10 @@
 	    touch configure ; \
 	    chmod 0755 configure ; \
 	    cd .. )
+	( cd $(VER64)/lib ; \
+	    touch -acm gen-tld-tables.pl ; \
+	    touch -acm gen-unicode-tables.pl; \
+	    touch -acm gen-stringprep-tables.pl )
 
 clean:
 	-rm -rf $(VER)
@@ -172,6 +262,23 @@
 	(cd $(VER64); \
 		$(LINT64.c) -o $(LIBNAME) ../llib-lidn > $(LINTOUT) 2>&1)
 
+test32: $(VER)/config.status
+	( cd $(VER) ; \
+	    env - \
+	    "SHELL=/bin/bash" \
+	    "PATH=$(TEST_GNU_PATH):$(SFW_PATH)" \
+	    "LD_LIBRARY_PATH=$(TEST_LD_LIBRARY_PATH_32)" \
+	    $(GMAKE) check > $(TEST32OUT) 2>&1 )
+
+test64: $(VER64)/config.status
+	( cd $(VER64) ; \
+	    env - \
+	    "SHELL=/bin/bash" \
+	    "PATH=$(TEST_GNU_PATH):$(SFW_PATH)" \
+	    "LD_LIBRARY_PATH=$(TEST_LD_LIBRARY_PATH_64)" \
+	    $(GMAKE) check > $(TEST64OUT) 2>&1 )
+
 install_h:
 
 include ../Makefile.targ
+
--- a/usr/src/lib/idn/install-sfw	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/idn/install-sfw	Thu Jan 06 02:11:13 2011 -0800
@@ -20,12 +20,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)install-sfw	1.3	09/09/21 SMI"
-
-VERS=libidn-1.9
+# ident	"@(#)install-sfw	1.4	10/11/30 SMI"
 
 PREFIX=${ROOT}/usr
 BINDIR=${PREFIX}/bin
@@ -95,7 +92,7 @@
 _install M doc/man/tld_get_z.3 ${MAN3DIR}/tld_get_z.3 0444
 _install M doc/man/tld_strerror.3 ${MAN3DIR}/tld_strerror.3 0444
 
-_install N java/libidn-1.9.jar ${JAVADIR}/libidn-1.9.jar 0644
+_install N java/libidn-1.19.jar ${JAVADIR}/libidn-1.19.jar 0644
 
 _install N doc/tld/ac.tld ${DOCDIR}/tld/ac.tld 0644
 _install N doc/tld/at.tld ${DOCDIR}/tld/at.tld 0644
@@ -164,27 +161,35 @@
 _install N lib/tld.h ${INCDIR}/tld.h 0644
 _install N lib/idn-int.h ${INCDIR}/idn-int.h 0644
 
-_install D lib/.libs/libidn.so.11.5.38 ${LIBDIR}/libidn.so.11.5.38 0755
-_install L libidn.so.11.5.38 ${LIBDIR}/libidn.so.11
-_install L libidn.so.11.5.38 ${LIBDIR}/libidn.so
+_install D lib/.libs/libidn.so.11.6.2 ${LIBDIR}/libidn.so.11.6.2 0755
+_install L libidn.so.11.6.2 ${LIBDIR}/libidn.so.11
+_install L libidn.so.11.6.2 ${LIBDIR}/libidn.so
 
 _install N ../llib-lidn ${LIBDIR}/llib-lidn 0644
 _install N llib-lidn.ln ${LIBDIR}/llib-lidn.ln 0644
 
 _install N libidn.pc ${PKGCONFIGDIR}/libidn.pc 0644
 
-_install N po/da.gmo ${LOCALEDIR}/da/LC_MESSAGES/libidn.mo 0644
-_install N po/de.gmo ${LOCALEDIR}/de/LC_MESSAGES/libidn.mo 0644
-_install N po/eo.gmo ${LOCALEDIR}/eo/LC_MESSAGES/libidn.mo 0644
-_install N po/fr.gmo ${LOCALEDIR}/fr/LC_MESSAGES/libidn.mo 0644
-_install N po/it.gmo ${LOCALEDIR}/it/LC_MESSAGES/libidn.mo 0644
-_install N po/ja.gmo ${LOCALEDIR}/ja/LC_MESSAGES/libidn.mo 0644
-_install N po/nl.gmo ${LOCALEDIR}/nl/LC_MESSAGES/libidn.mo 0644
-_install N po/pl.gmo ${LOCALEDIR}/pl/LC_MESSAGES/libidn.mo 0644
-_install N po/ro.gmo ${LOCALEDIR}/ro/LC_MESSAGES/libidn.mo 0644
-_install N po/rw.gmo ${LOCALEDIR}/rw/LC_MESSAGES/libidn.mo 0644
-_install N po/sr.gmo ${LOCALEDIR}/sr/LC_MESSAGES/libidn.mo 0644
-_install N po/vi.gmo ${LOCALEDIR}/vi/LC_MESSAGES/libidn.mo 0644
-_install N po/zh_CN.gmo ${LOCALEDIR}/zh_CN/LC_MESSAGES/libidn.mo 0644
+_install N "po/[email protected]" ${LOCALEDIR}/en/LC_MESSAGES/libidn.mo 0644
+
+for file in \
+    "cs" \
+    "da" \
+    "de" \
+    "eo" \
+    "fi" \
+    "fr" \
+    "id" \
+    "it" \
+    "ja" \
+    "nl" \
+    "pl" \
+    "ro" \
+    "sr" \
+    "vi" \
+    "zh_CN" 
+do
+    _install N po/${file}.gmo  ${LOCALEDIR}/${file}/LC_MESSAGES/libidn.mo 0644
+done
 
 
--- a/usr/src/lib/idn/install-sfw-64	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/idn/install-sfw-64	Thu Jan 06 02:11:13 2011 -0800
@@ -20,12 +20,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)install-sfw-64	1.2	09/03/11 SMI"
+# ident	"@(#)install-sfw-64	1.3	10/11/30 SMI"
 #
-VERS=libidn-1.9-64
 
 PREFIX=${ROOT}/usr
 LIBDIR=${PREFIX}/lib/${MACH64}
@@ -35,9 +33,9 @@
 
 cd ${VERS}
 
-_install D lib/.libs/libidn.so.11.5.38 ${LIBDIR}/libidn.so.11.5.38 0755
-_install L libidn.so.11.5.38 ${LIBDIR}/libidn.so.11
-_install L libidn.so.11.5.38 ${LIBDIR}/libidn.so
+_install D lib/.libs/libidn.so.11.6.2 ${LIBDIR}/libidn.so.11.6.2 0755
+_install L libidn.so.11.6.2 ${LIBDIR}/libidn.so.11
+_install L libidn.so.11.6.2 ${LIBDIR}/libidn.so
 
 _install N llib-lidn.ln ${LIBDIR}/llib-lidn.ln 0644
 
Binary file usr/src/lib/idn/libidn-1.19.tar.gz has changed
Binary file usr/src/lib/idn/libidn-1.9.tar.gz has changed
--- a/usr/src/lib/openssl/METADATA	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/openssl/METADATA	Thu Jan 06 02:11:13 2011 -0800
@@ -1,10 +1,10 @@
 NAME:			openssl
-VERSION:		0.9.8p
+VERSION:		0.9.8q
 DESCRIPTION:		Toolkit for SSL/TLS and general purpose cryptographic library.
 LICENSE:		OpenSSL, SSLeay
 PACKAGE:		SUNWopenssl-commands SUNWopenssl-include SUNWopenssl-libraries SUNWopenssl-man SUNWopensslr
 PROJECT_URL:		http://openssl.org
-SOURCE_DOWNLOAD:	https://www.openssl.org/source/openssl-0.9.8p.tar.gz
+SOURCE_DOWNLOAD:	https://www.openssl.org/source/openssl-0.9.8q.tar.gz
 SUPPORT:		A
 BUGTRAQ:		solaris/solaris-crypto/openssl
 OSR:			11726
--- a/usr/src/lib/openssl/Makefile.com	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/lib/openssl/Makefile.com	Thu Jan 06 02:11:13 2011 -0800
@@ -23,13 +23,14 @@
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-# ident	"@(#)Makefile.com	1.4	10/09/23 SMI"
+# ident	"@(#)Makefile.com	1.5	10/12/06 SMI"
 
 METAINFO_FILE = ../METADATA
 VER = $(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
 VER64 =$(VER)-64
 
 TARBALL = ../$(VER).tar.gz
+UNPACKARCHIVE=$(GTAR) -oxzpf
 
 GPATCH_FLAGS = -p1
 
Binary file usr/src/lib/openssl/openssl-0.9.8p.tar.gz has changed
Binary file usr/src/lib/openssl/openssl-0.9.8q.tar.gz has changed
--- a/usr/src/pkgdefs/Makefile	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/Makefile	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile	1.286	10/10/27 SMI"
+# ident	"@(#)Makefile	1.288	10/12/09 SMI"
 #
 
 #
@@ -37,8 +37,6 @@
 	SUNWacpidump
 
 COMMON_SUBDIRS= \
-	SUNWa2psr \
-	SUNWa2psu \
 	SUNWaalib \
 	SUNWaconf \
 	SUNWactivation \
@@ -106,7 +104,6 @@
 	SUNWelinks \
 	SUNWerlang \
 	SUNWerlang-doc \
-	SUNWepydoc \
 	SUNWexpect \
 	SUNWfcgi \
 	SUNWfcgi-doc \
--- a/usr/src/pkgdefs/SUNWa2psr/Makefile	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile	1.4	07/12/14 SMI"
-#
-
-include ../Makefile.com
-
-DATAFILES = depend i.preserve
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWa2psr/copyright	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
-Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-Copyright (c) 1995, 96, 97, 98, 99 Akim Demaille, Miguel Santana
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-YOU MUST OBSERVE ANY AUTHORS' CONDITIONS WITH RESPECT TO
-INDIVIDUAL COMPONENTS PROVIDED WITHIN THIS CODE.  SUPPORT
-FOR THE TECHNOLOGIES AND DOCUMENTATION IS NOT PROVIDED 
-BY SUN MICROSYSTEMS, INC.
-
-THE TECHNOLOGIES AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT TECHNICAL 
-SUPPORT OR WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
-
--- a/usr/src/pkgdefs/SUNWa2psr/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident	"@(#)pkginfo.tmpl	1.6	10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWa2psr"
-NAME="a2ps - GNU Any to PostScript filter (root)"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="a2ps - GNU Any to PostScript filter (root) 4.13b"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none preserve"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWa2psr/prototype_com	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_com	1.4	07/06/08 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
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-i i.preserve
-# source locations relative to the prototype file
-#
-# SUNWa2psr - a2ps GNU Any to PostScript filter root files
-#
-d none etc 755 root sys
-d none etc/gnu 755 root bin
-e preserve etc/gnu/a2ps.cfg 644 root bin
-e preserve etc/gnu/a2ps-site.cfg 644 root bin
-d none etc/lp 775 lp lp
-d none etc/lp/fd 755 root lp
-f none etc/lp/fd/a2ps.fd 444 root lp
-
--- a/usr/src/pkgdefs/SUNWa2psr/prototype_i386	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_i386	1.3	06/03/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
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWa2psr - a2ps GNU Any to PostScript filter root files
-#
-#
--- a/usr/src/pkgdefs/SUNWa2psr/prototype_sparc	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_sparc	1.3	06/03/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
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWa2psr - a2ps GNU Any to PostScript filter root files
-#
-#
--- a/usr/src/pkgdefs/SUNWa2psu/Makefile	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile	1.3	06/03/18 SMI"
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWa2psu/copyright	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
------------------------------------------------------------------------
-
-Copyright (c) 1988, 89, 90, 91, 92, 93 Miguel Santana
-Copyright (c) 1995, 96, 97, 98, 99 Akim Demaille, Miguel Santana
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-
-YOU MUST OBSERVE ANY AUTHORS' CONDITIONS WITH RESPECT TO
-INDIVIDUAL COMPONENTS PROVIDED WITHIN THIS CODE.  SUPPORT
-FOR THE TECHNOLOGIES AND DOCUMENTATION IS NOT PROVIDED 
-BY SUN MICROSYSTEMS, INC.
-
-THE TECHNOLOGIES AND DOCUMENTATION ARE PROVIDED "AS IS" WITHOUT TECHNICAL 
-SUPPORT OR WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
-
--- a/usr/src/pkgdefs/SUNWa2psu/depend	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"@(#)depend	1.6	06/10/11 SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWckr	Core Solaris Kernel (Root)
-P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-P SUNWgcmn	Common GNU package
-P SUNWbash	GNU Bourne-Again shell (bash)
-P SUNWa2psr	a2ps GNU Any to PostScript filter (root)
-P SUNWpsutils	PostScript utilities"
-P SUNWimagick	Image Manipulation Utilities and Libraries
-P SUNWlibms	Math & Microtasking Libraries (Usr)
-P SUNWlibmsr	Math & Microtasking Libraries (Root)
-P SUNWperl584core	Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWa2psu/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident	"@(#)pkginfo.tmpl	1.6	10/07/22 SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWa2psu"
-NAME="a2ps - GNU Any to PostScript filter (user)"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-MAXINST="1000"
-CATEGORY="system"
-DESC="a2ps - GNU Any to PostScript filter (user) 4.13b"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWa2psu/prototype_com	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,391 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_com	1.8	07/12/12 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
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWa2psu  - a2ps GNU Any to PostScript filter user files
-#
-
-d none usr 0755 root sys
-d none usr/bin 0755 root bin
-f none usr/bin/a2ps 0555 root bin
-f none usr/bin/card 0555 root bin
-f none usr/bin/composeglyphs 0555 root bin
-f none usr/bin/fixnt 0555 root bin
-f none usr/bin/fixps 0555 root bin
-f none usr/bin/ogonkify 0555 root bin
-f none usr/bin/pdiff 0555 root bin
-f none usr/bin/psmandup 0555 root bin
-f none usr/bin/psset 0555 root bin
-f none usr/bin/texi2dvi4a2ps 0555 root bin
-d none usr/include 0755 root bin
-f none usr/include/liba2ps.h 0444 root bin
-d none usr/lib 0755 root bin
-s none usr/lib/liba2ps.so=liba2ps.so.1.0.0
-s none usr/lib/liba2ps.so.1=liba2ps.so.1.0.0
-f none usr/lib/liba2ps.so.1.0.0 0444 root bin
-d none usr/share 0755 root sys
-d none usr/share/a2ps 0755 root root
-f none usr/share/a2ps/README 0444 root bin
-d none usr/share/a2ps/afm 0755 root root
-f none usr/share/a2ps/afm/fonts.map 0444 root bin
-f none usr/share/a2ps/afm/make_fonts_map.sh 0555 root bin
-f none usr/share/a2ps/afm/pbkd.afm 0444 root bin
-f none usr/share/a2ps/afm/pbkdi.afm 0444 root bin
-f none usr/share/a2ps/afm/pbkl.afm 0444 root bin
-f none usr/share/a2ps/afm/pbkli.afm 0444 root bin
-f none usr/share/a2ps/afm/pcfont.afm 0444 root bin
-f none usr/share/a2ps/afm/pcrb.afm 0444 root bin
-f none usr/share/a2ps/afm/pcrbo.afm 0444 root bin
-f none usr/share/a2ps/afm/pcrr.afm 0444 root bin
-f none usr/share/a2ps/afm/pcrro.afm 0444 root bin
-f none usr/share/a2ps/afm/phvb.afm 0444 root bin
-f none usr/share/a2ps/afm/phvbo.afm 0444 root bin
-f none usr/share/a2ps/afm/phvbon.afm 0444 root bin
-f none usr/share/a2ps/afm/phvbrn.afm 0444 root bin
-f none usr/share/a2ps/afm/phvr.afm 0444 root bin
-f none usr/share/a2ps/afm/phvro.afm 0444 root bin
-f none usr/share/a2ps/afm/phvron.afm 0444 root bin
-f none usr/share/a2ps/afm/phvrrn.afm 0444 root bin
-f none usr/share/a2ps/afm/pncb.afm 0444 root bin
-f none usr/share/a2ps/afm/pncbi.afm 0444 root bin
-f none usr/share/a2ps/afm/pncr.afm 0444 root bin
-f none usr/share/a2ps/afm/pncri.afm 0444 root bin
-f none usr/share/a2ps/afm/pplb.afm 0444 root bin
-f none usr/share/a2ps/afm/pplbi.afm 0444 root bin
-f none usr/share/a2ps/afm/pplr.afm 0444 root bin
-f none usr/share/a2ps/afm/pplri.afm 0444 root bin
-f none usr/share/a2ps/afm/psyr.afm 0444 root bin
-f none usr/share/a2ps/afm/ptmb.afm 0444 root bin
-f none usr/share/a2ps/afm/ptmbi.afm 0444 root bin
-f none usr/share/a2ps/afm/ptmi.afm 0444 root bin
-f none usr/share/a2ps/afm/ptmr.afm 0444 root bin
-f none usr/share/a2ps/afm/pzcmi.afm 0444 root bin
-f none usr/share/a2ps/afm/pzdr.afm 0444 root bin
-d none usr/share/a2ps/encoding 0755 root root
-f none usr/share/a2ps/encoding/ascii.edf 0444 root bin
-f none usr/share/a2ps/encoding/encoding.map 0444 root bin
-f none usr/share/a2ps/encoding/hp.edf 0444 root bin
-f none usr/share/a2ps/encoding/ibm-cp437.edf 0444 root bin
-f none usr/share/a2ps/encoding/ibm-cp850.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso1.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso10.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso13.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso15.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso2.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso3.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso4.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso5.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso7.edf 0444 root bin
-f none usr/share/a2ps/encoding/iso9.edf 0444 root bin
-f none usr/share/a2ps/encoding/koi8.edf 0444 root bin
-f none usr/share/a2ps/encoding/mac.edf 0444 root bin
-f none usr/share/a2ps/encoding/ms-cp1250.edf 0444 root bin
-d none usr/share/a2ps/fonts 0755 root root
-f none usr/share/a2ps/fonts/pcfont.pfa 0444 root bin
-d none usr/share/a2ps/ppd 0755 root root
-f none usr/share/a2ps/ppd/README 0444 root bin
-f none usr/share/a2ps/ppd/level1.ppd 0444 root bin
-f none usr/share/a2ps/ppd/level2.ppd 0444 root bin
-d none usr/share/a2ps/ps 0755 root root
-f none usr/share/a2ps/ps/a2ps.hdr 0444 root bin
-f none usr/share/a2ps/ps/base.ps 0444 root bin
-f none usr/share/a2ps/ps/bold.pro 0444 root bin
-f none usr/share/a2ps/ps/bw.pro 0444 root bin
-f none usr/share/a2ps/ps/color.hdr 0444 root bin
-f none usr/share/a2ps/ps/color.pro 0444 root bin
-f none usr/share/a2ps/ps/diff.pro 0444 root bin
-f none usr/share/a2ps/ps/ehandler.ps 0444 root bin
-f none usr/share/a2ps/ps/fixed.pro 0444 root bin
-f none usr/share/a2ps/ps/gray.pro 0444 root bin
-f none usr/share/a2ps/ps/gray2.pro 0444 root bin
-f none usr/share/a2ps/ps/matrix.pro 0444 root bin
-f none usr/share/a2ps/ps/ul.pro 0444 root bin
-d none usr/share/a2ps/sheets 0755 root root
-f none usr/share/a2ps/sheets/68000.ssh 0444 root bin
-f none usr/share/a2ps/sheets/a2psrc.ssh 0444 root bin
-f none usr/share/a2ps/sheets/ada.ssh 0444 root bin
-f none usr/share/a2ps/sheets/asn1.ssh 0444 root bin
-f none usr/share/a2ps/sheets/autoconf.ssh 0444 root bin
-f none usr/share/a2ps/sheets/awk.ssh 0444 root bin
-f none usr/share/a2ps/sheets/b.ssh 0444 root bin
-f none usr/share/a2ps/sheets/bc.ssh 0444 root bin
-f none usr/share/a2ps/sheets/c.ssh 0444 root bin
-f none usr/share/a2ps/sheets/caml.ssh 0444 root bin
-f none usr/share/a2ps/sheets/card.ssh 0444 root bin
-f none usr/share/a2ps/sheets/chlog.ssh 0444 root bin
-f none usr/share/a2ps/sheets/cidl.ssh 0444 root bin
-f none usr/share/a2ps/sheets/claire.ssh 0444 root bin
-f none usr/share/a2ps/sheets/clisp.ssh 0444 root bin
-f none usr/share/a2ps/sheets/coqv.ssh 0444 root bin
-f none usr/share/a2ps/sheets/cpp.ssh 0444 root bin
-f none usr/share/a2ps/sheets/csh.ssh 0444 root bin
-f none usr/share/a2ps/sheets/cxx.ssh 0444 root bin
-f none usr/share/a2ps/sheets/dc_shell.ssh 0444 root bin
-f none usr/share/a2ps/sheets/eiffel.ssh 0444 root bin
-f none usr/share/a2ps/sheets/elisp.ssh 0444 root bin
-f none usr/share/a2ps/sheets/eps.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for-fixed.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for-free.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for77-fixed.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for77-free.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for77kwds.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for90-fixed.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for90-free.ssh 0444 root bin
-f none usr/share/a2ps/sheets/for90kwds.ssh 0444 root bin
-f none usr/share/a2ps/sheets/fortran.ssh 0444 root bin
-f none usr/share/a2ps/sheets/gmake.ssh 0444 root bin
-f none usr/share/a2ps/sheets/gnuc.ssh 0444 root bin
-f none usr/share/a2ps/sheets/haskell.ssh 0444 root bin
-f none usr/share/a2ps/sheets/html.ssh 0444 root bin
-f none usr/share/a2ps/sheets/idl.ssh 0444 root bin
-f none usr/share/a2ps/sheets/initora.ssh 0444 root bin
-f none usr/share/a2ps/sheets/is5rul.ssh 0444 root bin
-f none usr/share/a2ps/sheets/java.ssh 0444 root bin
-f none usr/share/a2ps/sheets/js.ssh 0444 root bin
-f none usr/share/a2ps/sheets/lace.ssh 0444 root bin
-f none usr/share/a2ps/sheets/lex.ssh 0444 root bin
-f none usr/share/a2ps/sheets/lout.ssh 0444 root bin
-f none usr/share/a2ps/sheets/mail.ssh 0444 root bin
-f none usr/share/a2ps/sheets/make.ssh 0444 root bin
-f none usr/share/a2ps/sheets/maple.ssh 0444 root bin
-f none usr/share/a2ps/sheets/matlab4.ssh 0444 root bin
-f none usr/share/a2ps/sheets/mib.ssh 0444 root bin
-f none usr/share/a2ps/sheets/mly.ssh 0444 root bin
-f none usr/share/a2ps/sheets/modula2.ssh 0444 root bin
-f none usr/share/a2ps/sheets/modula3.ssh 0444 root bin
-f none usr/share/a2ps/sheets/o2c.ssh 0444 root bin
-f none usr/share/a2ps/sheets/oberon.ssh 0444 root bin
-f none usr/share/a2ps/sheets/objc.ssh 0444 root bin
-f none usr/share/a2ps/sheets/ocaml.ssh 0444 root bin
-f none usr/share/a2ps/sheets/octave.ssh 0444 root bin
-f none usr/share/a2ps/sheets/oracle.ssh 0444 root bin
-f none usr/share/a2ps/sheets/pascal.ssh 0444 root bin
-f none usr/share/a2ps/sheets/perl.ssh 0444 root bin
-f none usr/share/a2ps/sheets/plsql.ssh 0444 root bin
-f none usr/share/a2ps/sheets/pov.ssh 0444 root bin
-f none usr/share/a2ps/sheets/ppd.ssh 0444 root bin
-f none usr/share/a2ps/sheets/pre.ssh 0444 root bin
-f none usr/share/a2ps/sheets/pretex.ssh 0444 root bin
-f none usr/share/a2ps/sheets/prolog.ssh 0444 root bin
-f none usr/share/a2ps/sheets/promela.ssh 0444 root bin
-f none usr/share/a2ps/sheets/ps.ssh 0444 root bin
-f none usr/share/a2ps/sheets/python.ssh 0444 root bin
-f none usr/share/a2ps/sheets/rexx.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sather.ssh 0444 root bin
-f none usr/share/a2ps/sheets/scheme.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sdl88.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sed.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sh.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sheets.map 0444 root bin
-f none usr/share/a2ps/sheets/shell.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sml.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sql.ssh 0444 root bin
-f none usr/share/a2ps/sheets/sql92.ssh 0444 root bin
-f none usr/share/a2ps/sheets/ssh.ssh 0444 root bin
-f none usr/share/a2ps/sheets/symbols.ssh 0444 root bin
-f none usr/share/a2ps/sheets/tcl.ssh 0444 root bin
-f none usr/share/a2ps/sheets/tclx.ssh 0444 root bin
-f none usr/share/a2ps/sheets/tcsh.ssh 0444 root bin
-f none usr/share/a2ps/sheets/tex.ssh 0444 root bin
-f none usr/share/a2ps/sheets/texinfo.ssh 0444 root bin
-f none usr/share/a2ps/sheets/texscript.ssh 0444 root bin
-f none usr/share/a2ps/sheets/tiger.ssh 0444 root bin
-f none usr/share/a2ps/sheets/tk.ssh 0444 root bin
-f none usr/share/a2ps/sheets/udiff.ssh 0444 root bin
-f none usr/share/a2ps/sheets/unity.ssh 0444 root bin
-f none usr/share/a2ps/sheets/vba.ssh 0444 root bin
-f none usr/share/a2ps/sheets/verilog.ssh 0444 root bin
-f none usr/share/a2ps/sheets/vhdl.ssh 0444 root bin
-f none usr/share/a2ps/sheets/vrml.ssh 0444 root bin
-f none usr/share/a2ps/sheets/vtcl.ssh 0444 root bin
-f none usr/share/a2ps/sheets/wdiff.ssh 0444 root bin
-f none usr/share/a2ps/sheets/xs.ssh 0444 root bin
-f none usr/share/a2ps/sheets/yacc.ssh 0444 root bin
-f none usr/share/a2ps/sheets/zsh.ssh 0444 root bin
-d none usr/share/info 0755 root bin
-f none usr/share/info/a2ps.info 0444 root bin
-f none usr/share/info/a2ps.info-1 0444 root bin
-f none usr/share/info/a2ps.info-2 0444 root bin
-f none usr/share/info/a2ps.info-3 0444 root bin
-f none usr/share/info/a2ps.info-4 0444 root bin
-f none usr/share/info/a2ps.info-5 0444 root bin
-f none usr/share/info/a2ps.info-6 0444 root bin
-f none usr/share/info/ogonkify.info 0444 root bin
-f none usr/share/info/regex.info 0444 root bin
-f none usr/share/info/regex.info-1 0444 root bin
-f none usr/share/info/regex.info-2 0444 root bin
-f none usr/share/info/regex.info-3 0444 root bin
-d none usr/share/locale 0755 root other
-d none usr/share/locale/ca 0755 root other
-d none usr/share/locale/ca/LC_MESSAGES 0755 root other
-f none usr/share/locale/ca/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/cs 0755 root other
-d none usr/share/locale/cs/LC_MESSAGES 0755 root other
-f none usr/share/locale/cs/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/da 0755 root other
-d none usr/share/locale/da/LC_MESSAGES 0755 root other
-f none usr/share/locale/da/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/de 0755 root other
-d none usr/share/locale/de/LC_MESSAGES 0755 root other
-f none usr/share/locale/de/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/es 0755 root other
-d none usr/share/locale/es/LC_MESSAGES 0755 root other
-f none usr/share/locale/es/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/et 0755 root other
-d none usr/share/locale/et/LC_MESSAGES 0755 root other
-f none usr/share/locale/et/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/fr 0755 root other
-d none usr/share/locale/fr/LC_MESSAGES 0755 root other
-f none usr/share/locale/fr/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/it 0755 root other
-d none usr/share/locale/it/LC_MESSAGES 0755 root other
-f none usr/share/locale/it/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/ko 0755 root other
-d none usr/share/locale/ko/LC_MESSAGES 0755 root other
-f none usr/share/locale/ko/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/nl 0755 root other
-d none usr/share/locale/nl/LC_MESSAGES 0755 root other
-f none usr/share/locale/nl/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/no 0755 root other
-d none usr/share/locale/no/LC_MESSAGES 0755 root other
-f none usr/share/locale/no/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/pl 0755 root other
-d none usr/share/locale/pl/LC_MESSAGES 0755 root other
-f none usr/share/locale/pl/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/pt 0755 root other
-d none usr/share/locale/pt/LC_MESSAGES 0755 root other
-f none usr/share/locale/pt/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/ru 0755 root other
-d none usr/share/locale/ru/LC_MESSAGES 0755 root other
-f none usr/share/locale/ru/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/sl 0755 root other
-d none usr/share/locale/sl/LC_MESSAGES 0755 root other
-f none usr/share/locale/sl/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/sv 0755 root other
-d none usr/share/locale/sv/LC_MESSAGES 0755 root other
-f none usr/share/locale/sv/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/locale/tr 0755 root other
-d none usr/share/locale/tr/LC_MESSAGES 0755 root other
-f none usr/share/locale/tr/LC_MESSAGES/a2ps.mo 644 root bin
-d none usr/share/man 0755 root bin
-d none usr/share/man/man1 0755 root bin
-f none usr/share/man/man1/a2ps.1 0444 root bin
-f none usr/share/man/man1/card.1 0444 root bin
-f none usr/share/man/man1/fixps.1 0444 root bin
-f none usr/share/man/man1/ogonkify.1 0444 root bin
-f none usr/share/man/man1/pdiff.1 0444 root bin
-f none usr/share/man/man1/psmandup.1 0444 root bin
-f none usr/share/man/man1/psset.1 0444 root bin
-f none usr/share/man/man1/texi2dvi4a2ps.1 0444 root bin
-d none usr/share/ogonkify 0755 root root
-f none usr/share/ogonkify/README 0444 root bin
-f none usr/share/ogonkify/adobe.enc 0444 root bin
-d none usr/share/ogonkify/afm 0755 root root
-f none usr/share/ogonkify/afm/pcrb-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/pcrbo-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/pcrr-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/pcrro-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/phvb-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/phvbo-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/phvr-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/phvro-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/ptmb-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/ptmbi-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/ptmr-o.afm 0444 root bin
-f none usr/share/ogonkify/afm/ptmri-o.afm 0444 root bin
-f none usr/share/ogonkify/allchars.ps 0444 root bin
-f none usr/share/ogonkify/ascii.enc 0444 root bin
-f none usr/share/ogonkify/compose.ps 0444 root bin
-f none usr/share/ogonkify/cp1250.enc 0444 root bin
-d none usr/share/ogonkify/fonts 0755 root root
-f none usr/share/ogonkify/fonts/pcrb-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/pcrbo-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/pcrr-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/pcrro-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/phvb-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/phvbo-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/phvr-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/phvro-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/ptmb-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/ptmbi-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/ptmr-o.pfa 0444 root bin
-f none usr/share/ogonkify/fonts/ptmri-o.pfa 0444 root bin
-f none usr/share/ogonkify/helper.ps 0444 root bin
-f none usr/share/ogonkify/hp.enc 0444 root bin
-f none usr/share/ogonkify/ibmpc.enc 0444 root bin
-f none usr/share/ogonkify/latin1.enc 0444 root bin
-f none usr/share/ogonkify/latin2.enc 0444 root bin
-f none usr/share/ogonkify/latin3.enc 0444 root bin
-f none usr/share/ogonkify/latin4.enc 0444 root bin
-f none usr/share/ogonkify/latin5.enc 0444 root bin
-f none usr/share/ogonkify/latin6.enc 0444 root bin
-f none usr/share/ogonkify/latin7.enc 0444 root bin
-f none usr/share/ogonkify/latin9.enc 0444 root bin
-f none usr/share/ogonkify/mac.enc 0444 root bin
-f none usr/share/ogonkify/ogonki.enc 0444 root bin
-f none usr/share/ogonkify/pcrb-o.ps 0444 root bin
-f none usr/share/ogonkify/pcrbo-o.ps 0444 root bin
-f none usr/share/ogonkify/pcrr-o.ps 0444 root bin
-f none usr/share/ogonkify/pcrro-o.ps 0444 root bin
-f none usr/share/ogonkify/phvb-o.ps 0444 root bin
-f none usr/share/ogonkify/phvbo-o.ps 0444 root bin
-f none usr/share/ogonkify/phvr-o.ps 0444 root bin
-f none usr/share/ogonkify/phvro-o.ps 0444 root bin
-f none usr/share/ogonkify/printenc.ps 0444 root bin
-f none usr/share/ogonkify/ptmb-o.ps 0444 root bin
-f none usr/share/ogonkify/ptmbi-o.ps 0444 root bin
-f none usr/share/ogonkify/ptmr-o.ps 0444 root bin
-f none usr/share/ogonkify/ptmri-o.ps 0444 root bin
-#
-# compatibility links
-#
-d none usr/sfw 0755 root bin
-d none usr/sfw/bin 0755 root bin
-s none usr/sfw/bin/a2ps=../../bin/a2ps
-s none usr/sfw/bin/card=../../bin/card
-s none usr/sfw/bin/composeglyphs=../../bin/composeglyphs
-s none usr/sfw/bin/fixnt=../../bin/fixnt
-s none usr/sfw/bin/fixps=../../bin/fixps
-s none usr/sfw/bin/ogonkify=../../bin/ogonkify
-s none usr/sfw/bin/pdiff=../../bin/pdiff
-s none usr/sfw/bin/psmandup=../../bin/psmandup
-s none usr/sfw/bin/psset=../../bin/psset
-s none usr/sfw/bin/texi2dvi4a2ps=../../bin/texi2dvi4a2ps
--- a/usr/src/pkgdefs/SUNWa2psu/prototype_i386	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_i386	1.3	06/03/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
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWa2psu  - a2ps GNU Any to PostScript filter user files
-#
-#
--- a/usr/src/pkgdefs/SUNWa2psu/prototype_sparc	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_sparc	1.3	06/03/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
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWa2psu  - a2ps GNU Any to PostScript filter user files
-#
-#
--- a/usr/src/pkgdefs/SUNWcupsu/prototype_com	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWcupsu/prototype_com	Thu Jan 06 02:11:13 2011 -0800
@@ -20,10 +20,10 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_com	1.9	09/11/05 SMI"
+#
+# ident	"@(#)prototype_com	1.10	10/12/08 SMI"
 #
 
 i pkginfo
@@ -485,6 +485,147 @@
 f none usr/share/cups/templates/help-header.tmpl 0444 root bin
 f none usr/share/cups/templates/help-printable.tmpl 0444 root bin
 f none usr/share/cups/templates/help-trailer.tmpl 0444 root bin
+d none usr/share/cups/templates/id 0755 root bin
+f none usr/share/cups/templates/id/add-class.tmpl 0444 root bin
+f none usr/share/cups/templates/id/add-printer.tmpl 0444 root bin
+f none usr/share/cups/templates/id/add-rss-subscription.tmpl 0444 root bin
+f none usr/share/cups/templates/id/admin.tmpl 0444 root bin
+f none usr/share/cups/templates/id/choose-device.tmpl 0444 root bin
+f none usr/share/cups/templates/id/choose-make.tmpl 0444 root bin
+f none usr/share/cups/templates/id/choose-model.tmpl 0444 root bin
+f none usr/share/cups/templates/id/choose-serial.tmpl 0444 root bin
+f none usr/share/cups/templates/id/choose-uri.tmpl 0444 root bin
+f none usr/share/cups/templates/id/class-added.tmpl 0444 root bin
+f none usr/share/cups/templates/id/class-confirm.tmpl 0444 root bin
+f none usr/share/cups/templates/id/class-deleted.tmpl 0444 root bin
+f none usr/share/cups/templates/id/class-jobs-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/class-modified.tmpl 0444 root bin
+f none usr/share/cups/templates/id/class.tmpl 0444 root bin
+f none usr/share/cups/templates/id/classes-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/classes.tmpl 0444 root bin
+f none usr/share/cups/templates/id/command.tmpl 0444 root bin
+f none usr/share/cups/templates/id/edit-config.tmpl 0444 root bin
+f none usr/share/cups/templates/id/error-op.tmpl 0444 root bin
+f none usr/share/cups/templates/id/error.tmpl 0444 root bin
+f none usr/share/cups/templates/id/header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/help-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/help-printable.tmpl 0444 root bin
+f none usr/share/cups/templates/id/help-trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/id/job-cancel.tmpl 0444 root bin
+f none usr/share/cups/templates/id/job-hold.tmpl 0444 root bin
+f none usr/share/cups/templates/id/job-move.tmpl 0444 root bin
+f none usr/share/cups/templates/id/job-moved.tmpl 0444 root bin
+f none usr/share/cups/templates/id/job-release.tmpl 0444 root bin
+f none usr/share/cups/templates/id/job-restart.tmpl 0444 root bin
+f none usr/share/cups/templates/id/jobs-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/jobs.tmpl 0444 root bin
+f none usr/share/cups/templates/id/list-available-printers.tmpl 0444 root bin
+f none usr/share/cups/templates/id/modify-class.tmpl 0444 root bin
+f none usr/share/cups/templates/id/modify-printer.tmpl 0444 root bin
+f none usr/share/cups/templates/id/norestart.tmpl 0444 root bin
+f none usr/share/cups/templates/id/option-boolean.tmpl 0444 root bin
+f none usr/share/cups/templates/id/option-conflict.tmpl 0444 root bin
+f none usr/share/cups/templates/id/option-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/option-pickmany.tmpl 0444 root bin
+f none usr/share/cups/templates/id/option-pickone.tmpl 0444 root bin
+f none usr/share/cups/templates/id/option-trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/id/pager.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-accept.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-added.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-configured.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-confirm.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-default.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-deleted.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-jobs-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-modified.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-purge.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-reject.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-start.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer-stop.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printer.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printers-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/printers.tmpl 0444 root bin
+f none usr/share/cups/templates/id/restart.tmpl 0444 root bin
+f none usr/share/cups/templates/id/samba-export.tmpl 0444 root bin
+f none usr/share/cups/templates/id/samba-exported.tmpl 0444 root bin
+f none usr/share/cups/templates/id/search.tmpl 0444 root bin
+f none usr/share/cups/templates/id/set-printer-options-header.tmpl 0444 root bin
+f none usr/share/cups/templates/id/set-printer-options-trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/id/subscription-added.tmpl 0444 root bin
+f none usr/share/cups/templates/id/subscription-canceled.tmpl 0444 root bin
+f none usr/share/cups/templates/id/test-page.tmpl 0444 root bin
+f none usr/share/cups/templates/id/trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/id/users.tmpl 0444 root bin
+d none usr/share/cups/templates/it 0755 root bin
+f none usr/share/cups/templates/it/add-class.tmpl 0444 root bin
+f none usr/share/cups/templates/it/add-printer.tmpl 0444 root bin
+f none usr/share/cups/templates/it/add-rss-subscription.tmpl 0444 root bin
+f none usr/share/cups/templates/it/admin.tmpl 0444 root bin
+f none usr/share/cups/templates/it/choose-device.tmpl 0444 root bin
+f none usr/share/cups/templates/it/choose-make.tmpl 0444 root bin
+f none usr/share/cups/templates/it/choose-model.tmpl 0444 root bin
+f none usr/share/cups/templates/it/choose-serial.tmpl 0444 root bin
+f none usr/share/cups/templates/it/choose-uri.tmpl 0444 root bin
+f none usr/share/cups/templates/it/class-added.tmpl 0444 root bin
+f none usr/share/cups/templates/it/class-confirm.tmpl 0444 root bin
+f none usr/share/cups/templates/it/class-deleted.tmpl 0444 root bin
+f none usr/share/cups/templates/it/class-jobs-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/class-modified.tmpl 0444 root bin
+f none usr/share/cups/templates/it/class.tmpl 0444 root bin
+f none usr/share/cups/templates/it/classes-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/classes.tmpl 0444 root bin
+f none usr/share/cups/templates/it/command.tmpl 0444 root bin
+f none usr/share/cups/templates/it/edit-config.tmpl 0444 root bin
+f none usr/share/cups/templates/it/error-op.tmpl 0444 root bin
+f none usr/share/cups/templates/it/error.tmpl 0444 root bin
+f none usr/share/cups/templates/it/help-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/help-printable.tmpl 0444 root bin
+f none usr/share/cups/templates/it/help-trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/it/job-cancel.tmpl 0444 root bin
+f none usr/share/cups/templates/it/job-hold.tmpl 0444 root bin
+f none usr/share/cups/templates/it/job-move.tmpl 0444 root bin
+f none usr/share/cups/templates/it/job-moved.tmpl 0444 root bin
+f none usr/share/cups/templates/it/job-release.tmpl 0444 root bin
+f none usr/share/cups/templates/it/job-restart.tmpl 0444 root bin
+f none usr/share/cups/templates/it/jobs-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/jobs.tmpl 0444 root bin
+f none usr/share/cups/templates/it/list-available-printers.tmpl 0444 root bin
+f none usr/share/cups/templates/it/modify-class.tmpl 0444 root bin
+f none usr/share/cups/templates/it/modify-printer.tmpl 0444 root bin
+f none usr/share/cups/templates/it/norestart.tmpl 0444 root bin
+f none usr/share/cups/templates/it/option-boolean.tmpl 0444 root bin
+f none usr/share/cups/templates/it/option-conflict.tmpl 0444 root bin
+f none usr/share/cups/templates/it/option-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/option-pickmany.tmpl 0444 root bin
+f none usr/share/cups/templates/it/option-pickone.tmpl 0444 root bin
+f none usr/share/cups/templates/it/option-trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/it/pager.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-accept.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-added.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-configured.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-confirm.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-default.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-deleted.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-jobs-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-modified.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-purge.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-reject.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-start.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer-stop.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printer.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printers-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/printers.tmpl 0444 root bin
+f none usr/share/cups/templates/it/restart.tmpl 0444 root bin
+f none usr/share/cups/templates/it/samba-export.tmpl 0444 root bin
+f none usr/share/cups/templates/it/samba-exported.tmpl 0444 root bin
+f none usr/share/cups/templates/it/search.tmpl 0444 root bin
+f none usr/share/cups/templates/it/set-printer-options-header.tmpl 0444 root bin
+f none usr/share/cups/templates/it/set-printer-options-trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/it/subscription-added.tmpl 0444 root bin
+f none usr/share/cups/templates/it/subscription-canceled.tmpl 0444 root bin
+f none usr/share/cups/templates/it/test-page.tmpl 0444 root bin
+f none usr/share/cups/templates/it/trailer.tmpl 0444 root bin
+f none usr/share/cups/templates/it/users.tmpl 0444 root bin
 d none usr/share/cups/templates/ja 0755 root bin
 f none usr/share/cups/templates/ja/add-class.tmpl 0444 root bin
 f none usr/share/cups/templates/ja/add-printer.tmpl 0444 root bin
@@ -782,7 +923,6 @@
 f none usr/share/doc/cups/help/man-cupsenable.html 0444 root bin
 f none usr/share/doc/cups/help/man-cupstestdsc.html 0444 root bin
 f none usr/share/doc/cups/help/man-cupstestppd.html 0444 root bin
-f none usr/share/doc/cups/help/man-drv.html 0444 root bin
 f none usr/share/doc/cups/help/man-filter.html 0444 root bin
 f none usr/share/doc/cups/help/man-lp.html 0444 root bin
 f none usr/share/doc/cups/help/man-lpadmin.html 0444 root bin
@@ -845,6 +985,7 @@
 f none usr/share/doc/cups/images/cups-postscript-chain.png 0444 root bin
 f none usr/share/doc/cups/images/cups-raster-chain.png 0444 root bin
 f none usr/share/doc/cups/images/cups.png 0444 root bin
+f none usr/share/doc/cups/images/generic.png 0444 root bin
 f none usr/share/doc/cups/images/left.gif 0444 root bin
 f none usr/share/doc/cups/images/raster.png 0444 root bin
 f none usr/share/doc/cups/images/right.gif 0444 root bin
@@ -853,6 +994,10 @@
 f none usr/share/doc/cups/images/unsel.gif 0444 root bin
 f none usr/share/doc/cups/images/wait.gif 0444 root bin
 f none usr/share/doc/cups/index.html 0444 root bin
+d none usr/share/doc/cups/id 0755 root bin
+f none usr/share/doc/cups/id/index.html 0444 root bin
+d none usr/share/doc/cups/it 0755 root bin
+f none usr/share/doc/cups/it/index.html 0444 root bin
 d none usr/share/doc/cups/ja 0755 root bin
 f none usr/share/doc/cups/ja/index.html 0444 root bin
 d none usr/share/doc/cups/pl 0755 root bin
@@ -887,6 +1032,8 @@
 f none usr/share/locale/fi/cups_fi.po 0444 root other
 d none usr/share/locale/fr 0755 root other
 f none usr/share/locale/fr/cups_fr.po 0444 root other
+d none usr/share/locale/id 0755 root other
+f none usr/share/locale/id/cups_id.po 0444 root bin
 d none usr/share/locale/it 0755 root other
 f none usr/share/locale/it/cups_it.po 0444 root other
 d none usr/share/locale/ja 0755 root other
@@ -961,6 +1108,5 @@
 f none usr/share/man/man5/subscriptions.conf.5 0444 root bin
 d none usr/share/man/man7 0755 root bin
 f none usr/share/man/man7/backend.7 0444 root bin
-f none usr/share/man/man7/drv.7 0444 root bin
 f none usr/share/man/man7/filter.7 0444 root bin
 f none usr/share/man/man7/notifier.7 0444 root bin
--- a/usr/src/pkgdefs/SUNWepydoc/Makefile	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)Makefile	1.1	09/04/26 SMI"
-#
-
-include ../Makefile.com
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWepydoc/copyright	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-Copyright (C) 2006 Edward Loper <[email protected]>
-
-Epydoc is governed by the MIT open-source license:
-
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and any associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    The software is provided "as is", without warranty of any
-    kind, express or implied, including but not limited to the
-    warranties of merchantability, fitness for a particular purpose
-    and noninfringement. In no event shall the authors or copyright
-    holders be liable for any claim, damages or other liability,
-    whether in an action of contract, tort or otherwise, arising from,
-    out of or in connection with the software or the use or other
-    dealings in the software.
-
--- a/usr/src/pkgdefs/SUNWepydoc/depend	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)depend	1.1	09/04/26 SMI"
-#
-
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWckr	Core Solaris Kernel (Root)
-P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-P SUNWPython	The Python interpreter, libraries and utilities
--- a/usr/src/pkgdefs/SUNWepydoc/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-#
-#ident	"@(#)pkginfo.tmpl	1.2	10/07/22 SMI"
-#
-
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWepydoc"
-NAME="epydoc"
-ARCH="ISA"
-VERSION="SFWVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="epydoc - Python API documentation generation tool (3.0.1)"
-VENDOR="COMPANY"
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="false"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWepydoc/prototype_com	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,424 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)prototype_com	1.3	09/04/28 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
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-# source locations relative to the prototype file
-#
-# SUNWepydoc
-#
-d none usr 0755 root sys
-
-d none usr/bin 0755 root bin
-f none usr/bin/apirst2html.py 0555 root bin
-f none usr/bin/epydoc 0555 root bin
-f none usr/bin/epydocgui 0555 root bin
-
-d none usr/lib 0755 root bin
-d none usr/lib/python2.4 0755 root bin
-d none usr/lib/python2.4/site-packages 0755 root bin
-d none usr/lib/python2.4/site-packages/epydoc 0755 root bin
-f none usr/lib/python2.4/site-packages/epydoc/__init__.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/apidoc.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/checker.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/cli.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/compat.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docbuilder.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docintrospecter.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docparser.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docstringparser.py 0444 root bin
-d none usr/lib/python2.4/site-packages/epydoc/docwriter 0755 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/__init__.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/dotgraph.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/html.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/html_colorize.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/html_css.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/html_help.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/latex.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/plaintext.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/docwriter/xlink.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/gui.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/log.py 0444 root bin
-d none usr/lib/python2.4/site-packages/epydoc/markup 0755 root bin
-f none usr/lib/python2.4/site-packages/epydoc/markup/__init__.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/markup/doctest.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/markup/epytext.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/markup/javadoc.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/markup/plaintext.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/markup/pyval_repr.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/markup/restructuredtext.py 0444 root bin
-d none usr/lib/python2.4/site-packages/epydoc/test 0755 root bin
-f none usr/lib/python2.4/site-packages/epydoc/test/__init__.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/test/util.py 0444 root bin
-f none usr/lib/python2.4/site-packages/epydoc/util.py 0444 root bin
-
-d none usr/share 0755 root sys
-d none usr/share/doc 0755 root other
-d none usr/share/doc/epydoc 0755 root other
-d none usr/share/doc/epydoc/api 0755 root bin
-f none usr/share/doc/epydoc/api/bug-index.html 0444 root bin
-f none usr/share/doc/epydoc/api/class-tree.html 0444 root bin
-f none usr/share/doc/epydoc/api/crarr.png 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc-log.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.APIDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.ClassDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.ClassMethodDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.DocIndex-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.DottedName-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.DottedName.InvalidDottedName-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.GenericValueDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.ModuleDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.NamespaceDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.PropertyDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.RoutineDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.StaticMethodDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.ValueDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc.VariableDoc-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.apidoc._Sentinel-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.checker-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.checker-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.checker.DocChecker-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.cli-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.cli-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.cli.ConsoleLogger-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.cli.HTMLLogger-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.cli.TerminalController-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.cli.UnifiedProgressConsoleLogger-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.compat-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.compat-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.css 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docbuilder-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docbuilder-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docbuilder.BuildOptions-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docbuilder._ProgressEstimator-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docintrospecter-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docintrospecter-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docintrospecter._DevNull-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docparser-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docparser-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docparser.ParseError-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docstringparser-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docstringparser-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docstringparser.DocstringField-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.dotgraph-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.dotgraph-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.dotgraph.DotGraph-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.dotgraph.DotGraphEdge-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.dotgraph.DotGraphNode-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.dotgraph.DotGraphUmlClassNode-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.dotgraph.DotGraphUmlModuleNode-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html.HTMLWriter-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html._HTMLDocstringLinker-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html_colorize-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html_colorize-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html_colorize.PythonSourceColorizer-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html_css-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html_css-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html_help-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.html_help-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.latex-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.latex-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.latex.LatexWriter-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.latex.LatexWriter._LatexDocstringLinker-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.plaintext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.plaintext-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.plaintext.PlaintextWriter-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.xlink-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.xlink-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.xlink.ApiLinkReader-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.xlink.DocUrlGenerator-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.xlink.UrlGenerator-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.xlink.UrlGenerator.IndexAmbiguous-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.docwriter.xlink.VoidUrlGenerator-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.gui-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.gui-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.gui.EpydocGUI-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.gui.GUILogger-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.log-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.log-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.log.Logger-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.log.SimpleLogger-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.ConcatenatedDocstring-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.DocstringLinker-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.Field-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.ParseError-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.ParsedDocstring-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.doctest-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.doctest-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.doctest.DoctestColorizer-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.doctest.HTMLDoctestColorizer-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.doctest.LaTeXDoctestColorizer-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.doctest.XMLDoctestColorizer-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext.ColorizingError-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext.Element-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext.ParsedEpytextDocstring-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext.StructuringError-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext.Token-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.epytext.TokenizationError-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.javadoc-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.javadoc-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.javadoc.ParsedJavadocDocstring-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.plaintext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.plaintext-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.plaintext.ParsedPlaintextDocstring-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.pyval_repr-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.pyval_repr-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.pyval_repr.ColorizedPyvalRepr-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.pyval_repr.PyvalColorizer-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.pyval_repr._ColorizerState-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.pyval_repr._Linebreak-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.pyval_repr._Maxlines-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext.OptimizedReporter-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext.ParsedRstDocstring-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext._DocumentPseudoWriter-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext._EpydocHTMLTranslator-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext._EpydocLaTeXTranslator-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext._EpydocReader-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext._SplitFieldsTranslator-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext._SummaryExtractor-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext._TermsExtractor-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.markup.restructuredtext.dotgraph-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.test-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.test-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.test.util-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.test.util-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.util-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.util-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/api/epydoc.util.RunSubprocessError-class.html 0444 root bin
-f none usr/share/doc/epydoc/api/frames.html 0444 root bin
-f none usr/share/doc/epydoc/api/help.html 0444 root bin
-f none usr/share/doc/epydoc/api/identifier-index.html 0444 root bin
-f none usr/share/doc/epydoc/api/index.html 0444 root bin
-f none usr/share/doc/epydoc/api/module-tree.html 0444 root bin
-f none usr/share/doc/epydoc/api/redirect.html 0444 root bin
-f none usr/share/doc/epydoc/api/term-index.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.apidoc-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.checker-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.cli-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.compat-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docbuilder-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docintrospecter-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docparser-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docstringparser-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.dotgraph-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.html-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.html_colorize-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.html_css-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.html_help-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.latex-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.plaintext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.docwriter.xlink-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.gui-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.log-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.markup-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.markup.doctest-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.markup.epytext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.markup.javadoc-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.markup.plaintext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.markup.pyval_repr-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.markup.restructuredtext-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.test-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.test.util-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-epydoc.util-module.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc-everything.html 0444 root bin
-f none usr/share/doc/epydoc/api/toc.html 0444 root bin
-f none usr/share/doc/epydoc/api/todo-index.html 0444 root bin
-f none usr/share/doc/epydoc/configfile.html 0444 root bin
-f none usr/share/doc/epydoc/custom.css 0444 root bin
-f none usr/share/doc/epydoc/docstrings.html 0444 root bin
-d none usr/share/doc/epydoc/doctest 0755 root bin
-f none usr/share/doc/epydoc/doctest/apidoc.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/docbuilder.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/docintrospecter.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/docparser.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/encoding.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/epytext.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/index.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/javadoc.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/plaintext.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/pyval_repr.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/restructuredtext.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/zope2.html 0444 root bin
-f none usr/share/doc/epydoc/doctest/zope3.html 0444 root bin
-f none usr/share/doc/epydoc/docutils.css 0444 root bin
-f none usr/share/doc/epydoc/epydoc-man.html 0444 root bin
-f none usr/share/doc/epydoc/epydoc.css 0444 root bin
-f none usr/share/doc/epydoc/epydoc.html 0444 root bin
-f none usr/share/doc/epydoc/epydoc_gui.png 0444 root bin
-f none usr/share/doc/epydoc/epydoc_guiconfig.png 0444 root bin
-f none usr/share/doc/epydoc/epydocgui-man.html 0444 root bin
-f none usr/share/doc/epydoc/epytext.html 0444 root bin
-f none usr/share/doc/epydoc/epytextintro.html 0444 root bin
-d none usr/share/doc/epydoc/examples 0755 root bin
-f none usr/share/doc/epydoc/examples/class-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/crarr.png 0444 root bin
-f none usr/share/doc/epydoc/examples/epydoc.css 0444 root bin
-f none usr/share/doc/epydoc/examples/epytext_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/epytext_example-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/frames.html 0444 root bin
-d none usr/share/doc/epydoc/examples/grouped 0755 root bin
-f none usr/share/doc/epydoc/examples/grouped/class-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/crarr.png 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/epydoc.css 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/frames.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/help.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/identifier-index.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/index.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Animal-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Bird-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Bug-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Fish-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Human-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Mammal-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Primate-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/inh_example.Programmer-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/module-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/redirect.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/toc-everything.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/toc-inh_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/grouped/toc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/help.html 0444 root bin
-f none usr/share/doc/epydoc/examples/identifier-index.html 0444 root bin
-d none usr/share/doc/epydoc/examples/included 0755 root bin
-f none usr/share/doc/epydoc/examples/included/class-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/crarr.png 0444 root bin
-f none usr/share/doc/epydoc/examples/included/epydoc.css 0444 root bin
-f none usr/share/doc/epydoc/examples/included/frames.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/help.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/identifier-index.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/index.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Animal-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Bird-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Bug-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Fish-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Human-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Mammal-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Primate-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/inh_example.Programmer-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/module-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/redirect.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/toc-everything.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/toc-inh_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/included/toc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/index.html 0444 root bin
-d none usr/share/doc/epydoc/examples/listed 0755 root bin
-f none usr/share/doc/epydoc/examples/listed/class-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/crarr.png 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/epydoc.css 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/frames.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/help.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/identifier-index.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/index.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Animal-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Bird-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Bug-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Fish-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Human-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Mammal-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Primate-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/inh_example.Programmer-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/module-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/redirect.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/toc-everything.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/toc-inh_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/listed/toc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/module-tree.html 0444 root bin
-f none usr/share/doc/epydoc/examples/redirect.html 0444 root bin
-f none usr/share/doc/epydoc/examples/sre-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/sre-pysrc.html 0444 root bin
-f none usr/share/doc/epydoc/examples/sre.Scanner-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/sre_constants.error-class.html 0444 root bin
-f none usr/share/doc/epydoc/examples/term-index.html 0444 root bin
-f none usr/share/doc/epydoc/examples/toc-epytext_example-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/toc-everything.html 0444 root bin
-f none usr/share/doc/epydoc/examples/toc-sre-module.html 0444 root bin
-f none usr/share/doc/epydoc/examples/toc.html 0444 root bin
-f none usr/share/doc/epydoc/faq.html 0444 root bin
-f none usr/share/doc/epydoc/fields.html 0444 root bin
-f none usr/share/doc/epydoc/future.html 0444 root bin
-f none usr/share/doc/epydoc/history.html 0444 root bin
-f none usr/share/doc/epydoc/home.thumbnail.png 0444 root bin
-f none usr/share/doc/epydoc/index.html 0444 root bin
-f none usr/share/doc/epydoc/index.thumbnail.png 0444 root bin
-f none usr/share/doc/epydoc/installing.html 0444 root bin
-f none usr/share/doc/epydoc/license.html 0444 root bin
-f none usr/share/doc/epydoc/manual-docstring.html 0444 root bin
-f none usr/share/doc/epydoc/manual-epytext.html 0444 root bin
-f none usr/share/doc/epydoc/manual-fields.html 0444 root bin
-f none usr/share/doc/epydoc/manual-install.html 0444 root bin
-f none usr/share/doc/epydoc/manual-othermarkup.html 0444 root bin
-f none usr/share/doc/epydoc/manual-reference.html 0444 root bin
-f none usr/share/doc/epydoc/manual-usage.html 0444 root bin
-f none usr/share/doc/epydoc/othermarkup.html 0444 root bin
-f none usr/share/doc/epydoc/pycon-epydoc.html 0444 root bin
-f none usr/share/doc/epydoc/pysrc.thumbnail.png 0444 root bin
-f none usr/share/doc/epydoc/relatedprojects.html 0444 root bin
-f none usr/share/doc/epydoc/sflogo.png 0444 root bin
-f none usr/share/doc/epydoc/stylesheet.html 0444 root bin
-f none usr/share/doc/epydoc/uml.thumbnail.png 0444 root bin
-f none usr/share/doc/epydoc/using.html 0444 root bin
-f none usr/share/doc/epydoc/whatsnew.html 0444 root bin
-
-d none usr/share/man 755 root bin
-d none usr/share/man/man1 755 root bin
-f none usr/share/man/man1/epydoc.1 444 root bin
-f none usr/share/man/man1/epydocgui.1 444 root bin
--- a/usr/src/pkgdefs/SUNWepydoc/prototype_i386	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_i386	1.1	09/04/26 SMI"
-#
-
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWepydoc
-#
--- a/usr/src/pkgdefs/SUNWepydoc/prototype_sparc	Thu Dec 16 05:01:41 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"@(#)prototype_sparc	1.1	09/04/26 SMI"
-#
-
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWepydoc
-#
--- a/usr/src/pkgdefs/SUNWfetchmail/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWfetchmail/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)pkginfo.tmpl	1.8	10/10/14 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/12/10 SMI"
 #
 
 #
@@ -38,7 +38,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Fetchmail Mail Retrieval and Forwarding Utility (6.3.18)"
+DESC="Fetchmail Mail Retrieval and Forwarding Utility (6.3.19)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgit/copyright	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgit/copyright	Thu Jan 06 02:11:13 2011 -0800
@@ -8,26 +8,6 @@
 chooses the other license.
 
 --------------------------------------------------------------------------------
- Note that the only valid version of the GPL as far as this project
- is concerned is _this_ particular version of the license (ie v2, not
- v2.2 or v3.x or whatever), unless explicitly otherwise stated.
-
- HOWEVER, in order to allow a migration to GPLv3 if that seems like
- a good idea, I also ask that people involved with the project make
- their preferences known. In particular, if you trust me to make that
- decision, you might note so in your copyright message, ie something
- like
-
-	This file is licensed under the GPL v2, or a later version
-	at the discretion of Linus.
-
-  might avoid issues. But we can also just decide to synchronize and
-  contact all copyright holders on record if/when the occasion arises.
-
-			Linus Torvalds
-
-----------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
@@ -367,76 +347,3 @@
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
---------------------------------------------------------------------------------
-* Copyright (C) 2000-2002 Michael R. Elkins 
-* Copyright (C) 2002-2004 Oswald Buddenhagen 
-* Copyright (C) 2004 Theodore Y. Ts'o 
-* Original Copyright (c) 2005 Junio C Hamano
-* Copyright 2005, Lukas Sandstrom 
-* Copyright (C) 2005 Linus Torvalds
-* Copyright (C) 2006 Linus Torvalds
-* Copyright (c) 2005, 2006 Rene Scharfe
-* Copyright (c) 2006 Shawn O. Pearce
-* Copyright (C) 2006 Ryan Anderson
-* Copyright (c) 2006 Franck Bui-Huu
-* Copyright (C) 2005 Junio C Hamano
-* Copyright (c) 2006, Junio C Hamano
-* Copyright (c) 2007 Junio C Hamano
-* Copyright (c) 2006 Kristian Ogsberg 
-* Copyright (C) Johannes Schindelin, 2005
-* Copyright (C) 2006 Johannes Schindelin
-* Copyright (C) 2007 Johannes E. Schindelin
-* Copyright (c) 2007 James Bowes
-* Copyright (C) 2007 Shawn Bohrer
-* Copyright (c) 2007 Thomas Harning Jr
-* Copyright (c) 2005, 2006 Linus Torvalds and Junio C Hamano
-* Copyright (c) 2007 Carlos Rica 
-* Copyright (C) 2006 Mike McCormack
-* Copyright 2006 Jon Loeliger
-* Copyright (c) 2007 by Nicolas Pitre 
-* Copyright (C) 2007 by Nicolas Pitre, licensed under the GPL version 2.
-* Copyright (C) 2006 Christian Couder
-* Copyright (C) Eric Biederman, 2005
-* Rewritten for GIT by Nicolas Pitre , (C) 2005-2007
-Copyright The Open University UK - 2006
-This tool is copyright (c) 2005, Martin Langhoff.
-This tool is copyright (c) 2005, Matthias Urlichs.
-Copyright 2005, Ryan Anderson 
-Copyright 2002,2005 Greg Kroah-Hartman 
-Copyright (C) 2006, Eric Wong 
-Copyright 2006 by Petr Baudis [email protected]
-Copyright (c) 1997-8 Graham Barr . All rights reserved.
-Copyright (C) 2003  Davide Libenzi
-Copyright (C) 2003-2006 Davide Libenzi, Johannes E. Schindelin
-Copyright 2006, 2007 Shawn Pearce, et. al.
-Copyright (C) 2006, 2007 Shawn Pearce
-Copyright (C) 2005 Paul Mackerras 
-Copyright (c) 2007 Santi B??jar, based on t4013 by Junio C Hamano
-Copyright (C) 2006 Carl D. Worth 
-Copyright (C) 2006 Martin Waitz 
-Copyright (c) 2005 Jon Seymour
-Copyright (c) 2005 Fredrik Kuivinen
-Copyright (c) 2007 Johannes Sixt
-Copyright (c) 2007 Christian Couder
-Copyright (c) 2007 Andy Parkins
-Copyright (c) 2007 Michael Spang
-Copyright (c) 2007 Lars Hjemli
-Copyright (c) 2006 Eric Wong
-Copyright (c) 2007 Eric Wong
-Copyright (c) 2007 David D. Kilzer
-Copyright (c) Robin Rosenberg
-Copyright (c) 2007 Frank Lichtenheld
-Copyright (c) 2007 Jakub Narebski
-Copyright (c) 1996-1999 by Internet Software Consortium.
-Copyright (C) 2005-2006 Paul Mackerras.  All rights reserved.
-Copyright: 2007 Simon Hausmann 
-Copyright (C) 2006 Hewlett-Packard Development Company, L.P.
-Copyright (C) 2007 Aneesh Kumar K.V 
-Copyright: 2007 Simon Hausmann 
-Copyright (C)2007 Stelian Pop 
-Copyright (c) 2007 Andy Parkins
-Copyright (c) 2006 Josh England
-This tool is copyright (c) 2006, Sean Estabrooks.
-Copyright (C) YEAR Free Software Foundation, Inc.
-Copyright (c) 1997-8 Graham Barr . All rights reserved.
---------------------------------------------------------------------------------
--- a/usr/src/pkgdefs/SUNWgnu-idn/copyright	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgnu-idn/copyright	Thu Jan 06 02:11:13 2011 -0800
@@ -3,10 +3,20 @@
 only the General Public License version 3 (GPLv3) at this time for any
 software where a choice of GPL license versions is made available with
 the language indicating that GPLv3 or any later version may be used.
+
+Oracle elects to use only the GNU Lesser General Public License version
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
+where a choice of LGPL/GPL license versions are made available with the
+language indicating that LGPLv2.1/GPLv2 or any later version may be
+used, or where a choice of which version of the LGPL/GPL is applied is
+unspecified.  Unless specifically stated otherwise, where a choice
+exists between another license and either the GPL or the LGPL, Oracle
+chooses the other license.
+
 --------------------------------------------------------------------
 
 Libidn README -- Important introductory notes.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Simon Josefsson
+Copyright (C) 2002-2010 Simon Josefsson
 See the end for copying conditions.
 
 Libidn is a package for internationalized string handling based on the
@@ -18,11 +28,11 @@
 
 The C library (libidn.a), C# library (Libidn.dll) and Java library
 (libidn-*.jar) are licensed under the GNU Lesser General Public
-License version 2.1.  See the file COPYING.LIB.
+License version 2.1 or later.  See the file COPYING.LIB.
 
 The command line tool, self tests, examples, and other auxilliary
-files, are licensed under the GNU General Public License version 3.0.
-See the file COPYING.
+files, are licensed under the GNU General Public License version 3.0
+or later.  See the file COPYING.
 
 Libidn will not be stable without your help.  Report bugs, proof read
 the manual, or make a monetary donation.
@@ -31,7 +41,7 @@
 invited to join our mailing list [email protected], see
 <http://lists.gnu.org/mailman/listinfo/help-libidn>.
 
-For more information, see <http://josefsson.org/libidn/>.
+For more information, see <http://www.gnu.org/software/libidn/>.
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
--- a/usr/src/pkgdefs/SUNWgnu-idn/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgnu-idn/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)pkginfo.tmpl	1.2	10/07/22 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/11/30 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -35,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="IDN - The Internationalized Domains Library (0.6.8)"
+DESC="IDN - The Internationalized Domains Library (1.19)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWgnu-idn/prototype_com	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgnu-idn/prototype_com	Thu Jan 06 02:11:13 2011 -0800
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_com	1.5	09/09/21 SMI"
+# ident	"@(#)prototype_com	1.6	10/12/02 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
@@ -55,9 +54,9 @@
 f none usr/include/idn/stringprep.h 0644 root bin
 f none usr/include/idn/tld.h 0644 root bin
 d none usr/lib 0755 root bin
-f none usr/lib/libidn.so.11.5.38 0755 root bin
-s none usr/lib/libidn.so.11=libidn.so.11.5.38
-s none usr/lib/libidn.so=libidn.so.11.5.38
+f none usr/lib/libidn.so.11.6.2 0755 root bin
+s none usr/lib/libidn.so.11=libidn.so.11.6.2
+s none usr/lib/libidn.so=libidn.so.11.6.2
 f none usr/lib/llib-lidn 0644 root bin
 f none usr/lib/llib-lidn.ln 0644 root bin
 d none usr/lib/pkgconfig 0755 root other
@@ -129,20 +128,32 @@
 f none usr/share/doc/idn/tld/tm.tld 0644 root other
 d none usr/share/lib 0755 root sys
 d none usr/share/lib/idn 0755 root sys
-f none usr/share/lib/idn/libidn-1.9.jar 0644 root bin
+f none usr/share/lib/idn/libidn-1.19.jar 0644 root bin
 d none usr/share/locale 755 root other
+d none usr/share/locale/cs 0755 root other
+d none usr/share/locale/cs/LC_MESSAGES 0755 root other
+f none usr/share/locale/cs/LC_MESSAGES/libidn.mo 0644 root other
 d none usr/share/locale/da 0755 root other
 d none usr/share/locale/da/LC_MESSAGES 0755 root other
 f none usr/share/locale/da/LC_MESSAGES/libidn.mo 0644 root other
 d none usr/share/locale/de 755 root other
 d none usr/share/locale/de/LC_MESSAGES 755 root other
 f none usr/share/locale/de/LC_MESSAGES/libidn.mo 0644 root other
+d none usr/share/locale/en 0755 root other
+d none usr/share/locale/en/LC_MESSAGES 0755 root other
+f none usr/share/locale/en/LC_MESSAGES/libidn.mo 0644 root other
 d none usr/share/locale/eo 0755 root other
 d none usr/share/locale/eo/LC_MESSAGES  0755 root other
 f none usr/share/locale/eo/LC_MESSAGES/libidn.mo 0644 root other
+d none usr/share/locale/fi 755 root other
+d none usr/share/locale/fi/LC_MESSAGES 755 root other
+f none usr/share/locale/fi/LC_MESSAGES/libidn.mo 0644 root other
 d none usr/share/locale/fr 755 root other
 d none usr/share/locale/fr/LC_MESSAGES 755 root other
 f none usr/share/locale/fr/LC_MESSAGES/libidn.mo 0644 root other
+d none usr/share/locale/id 755 root other
+d none usr/share/locale/id/LC_MESSAGES 755 root other
+f none usr/share/locale/id/LC_MESSAGES/libidn.mo 0644 root other
 d none usr/share/locale/it 755 root other
 d none usr/share/locale/it/LC_MESSAGES 755 root other
 f none usr/share/locale/it/LC_MESSAGES/libidn.mo 0644 root other
@@ -158,9 +169,6 @@
 d none usr/share/locale/ro 0755 root other
 d none usr/share/locale/ro/LC_MESSAGES 0755 root other
 f none usr/share/locale/ro/LC_MESSAGES/libidn.mo 0644 root other
-d none usr/share/locale/rw 0755 root other
-d none usr/share/locale/rw/LC_MESSAGES 0755 root other
-f none usr/share/locale/rw/LC_MESSAGES/libidn.mo 0644 root other
 d none usr/share/locale/sr 0755 root other
 d none usr/share/locale/sr/LC_MESSAGES 0755 root other
 f none usr/share/locale/sr/LC_MESSAGES/libidn.mo 0644 root other
--- a/usr/src/pkgdefs/SUNWgnu-idn/prototype_i386	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgnu-idn/prototype_i386	Thu Jan 06 02:11:13 2011 -0800
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_i386	1.2	09/03/11 SMI"
+# ident	"@(#)prototype_i386	1.3	10/11/30 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,8 +49,8 @@
 #
 d none usr/lib/amd64 0755 root bin
 d none usr/lib/amd64/pkgconfig 0755 root other
-f none usr/lib/amd64/libidn.so.11.5.38 0755 root bin
-s none usr/lib/amd64/libidn.so.11=libidn.so.11.5.38
-s none usr/lib/amd64/libidn.so=libidn.so.11.5.38
+f none usr/lib/amd64/libidn.so.11.6.2 0755 root bin
+s none usr/lib/amd64/libidn.so.11=libidn.so.11.6.2
+s none usr/lib/amd64/libidn.so=libidn.so.11.6.2
 f none usr/lib/amd64/llib-lidn.ln 0644 root bin
 f none usr/lib/amd64/pkgconfig/libidn.pc 0644 root bin
--- a/usr/src/pkgdefs/SUNWgnu-idn/prototype_sparc	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWgnu-idn/prototype_sparc	Thu Jan 06 02:11:13 2011 -0800
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_sparc	1.3	09/03/16 SMI"
+# ident	"@(#)prototype_sparc	1.4	10/11/30 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,8 +49,8 @@
 #
 d none usr/lib/sparcv9 0755 root bin
 d none usr/lib/sparcv9/pkgconfig 0755 root other
-f none usr/lib/sparcv9/libidn.so.11.5.38 0755 root bin
-s none usr/lib/sparcv9/libidn.so.11=libidn.so.11.5.38
-s none usr/lib/sparcv9/libidn.so=libidn.so.11.5.38
+f none usr/lib/sparcv9/libidn.so.11.6.2 0755 root bin
+s none usr/lib/sparcv9/libidn.so.11=libidn.so.11.6.2
+s none usr/lib/sparcv9/libidn.so=libidn.so.11.6.2
 f none usr/lib/sparcv9/llib-lidn.ln 0644 root bin
 f none usr/lib/sparcv9/pkgconfig/libidn.pc 0644 root bin
--- a/usr/src/pkgdefs/SUNWopenssl-fips-140-include/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140-include/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.7	10/11/18 SMI"
+# ident	"@(#)pkginfo.tmpl	1.8	10/12/06 SMI"
 #
 
 #
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="FIPS Capable OpenSSL C/C++ header files for development of OpenSSL applications (0.9.8p)"
+DESC="FIPS Capable OpenSSL C/C++ header files for development of OpenSSL applications (0.9.8q)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenssl-fips-140/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWopenssl-fips-140/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.7	10/11/18 SMI"
+# ident	"@(#)pkginfo.tmpl	1.8	10/12/06 SMI"
 #
 
 #
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="root"
 MAXINST="1000"
 CATEGORY="system"
-DESC="FIPS 140-2 Capable OpenSSL libraries (0.9.8p) (Root)"
+DESC="FIPS 140-2 Capable OpenSSL libraries (0.9.8q) (Root)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenssl-include/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWopenssl-include/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.9	10/11/18 SMI"
+# ident	"@(#)pkginfo.tmpl	1.10	10/12/06 SMI"
 #
 
 #
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="OpenSSL C/C++ header files for development of OpenSSL applications (0.9.8p)"
+DESC="OpenSSL C/C++ header files for development of OpenSSL applications (0.9.8q)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenssl-libraries/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWopenssl-libraries/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.9	10/11/18 SMI"
+# ident	"@(#)pkginfo.tmpl	1.10	10/12/06 SMI"
 #
 
 #
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="OpenSSL Libraries (0.9.8p) (Usr)"
+DESC="OpenSSL Libraries (0.9.8q) (Usr)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopenssl-man/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWopenssl-man/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.9	10/11/18 SMI"
+# ident	"@(#)pkginfo.tmpl	1.10	10/12/06 SMI"
 #
 
 #
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="OpenSSL Manual Pages (0.9.8p)"
+DESC="OpenSSL Manual Pages (0.9.8q)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWopensslr/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWopensslr/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)pkginfo.tmpl	1.10	10/11/18 SMI"
+# ident	"@(#)pkginfo.tmpl	1.11	10/12/06 SMI"
 #
 
 #
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="root"
 MAXINST="1000"
 CATEGORY="system"
-DESC="OpenSSL Libraries (0.9.8p) (Root)"
+DESC="OpenSSL Libraries (0.9.8q) (Root)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Thu Jan 06 02:11:13 2011 -0800
@@ -23,7 +23,7 @@
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.15	10/10/26 SMI"
+#ident	"@(#)pkginfo.tmpl	1.16	10/11/25 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -39,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Wireshark - Network protocol analyzer (1.2.12)"
+DESC="Wireshark - Network protocol analyzer (1.2.13)"
 VENDOR="COMPANY"
 HOTLINE="Please contact your local service provider"
 EMAIL=""
--- a/usr/src/pkgdefs/SUNWwireshark/prototype_com	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/pkgdefs/SUNWwireshark/prototype_com	Thu Jan 06 02:11:13 2011 -0800
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_com	1.14	10/10/26 SMI"
+#ident	"@(#)prototype_com	1.15	10/11/25 SMI"
 #
 
 # This required package information file contains a list of package contents.
@@ -57,25 +57,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.12 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.12/asn1.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/coseventcomm.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/cosnaming.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/docsis.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/ethercat.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/gryphon.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/irda.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/m2m.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/mate.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/opcua.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/parlay.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/profinet.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/sercosiii.so 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.12/stats_tree.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/tango.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/unistim.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/wimax.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.12/wimaxasncp.so 0555 root bin
+d none usr/lib/wireshark/plugins/1.2.13 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.13/asn1.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/coseventcomm.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/cosnaming.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/docsis.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/ethercat.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/gryphon.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/irda.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/m2m.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/mate.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/opcua.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/parlay.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/profinet.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/sercosiii.so 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.13/stats_tree.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/tango.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/unistim.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/wimax.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.13/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/tools/exception_list.check-deps	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/tools/exception_list.check-deps	Thu Jan 06 02:11:13 2011 -0800
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#pragma ident	"@(#)exception_list.check-deps	1.22	10/07/26 SMI"
+#pragma ident	"@(#)exception_list.check-deps	1.23	10/12/20 SMI"
 #
 # These execptions are here and marked KNOWN so that new things (and updates)
 # can be caught more easily. They are not necessarily ok, and while some should
@@ -92,15 +92,6 @@
 #
 SUNWocaml:NotInPkg:*:/usr/lib/ocaml:KNOWN:
 #
-SUNWperl510core:PerlPath:*:*:KNOWN:
-SUNWperl510core:NotInDepend:/usr/perl5/5.10.0/lib/Math/BigInt/Trace.pm:*:KNOWN:
-SUNWperl510core:NotInDepend:/usr/perl5/5.10.0/lib/Math/BigFloat/Trace.pm:*:KNOWN:
-SUNWperl510core:NotInPkg:/usr/perl5/5.10.0/lib/File/DosGlob.pm:/usr/perl5/5.10.0/lib/File/perl:KNOWN:
-SUNWperl510core:NotInPkg:/usr/perl5/5.10.0/lib/Class/ISA.pm:/usr/local/bin/perl:KNOWN:
-#
-SUNWperl510usr:PerlPath:*:*:KNOWN:
-SUNWperl510usr:NotInPkg:/usr/perl5/5.10.0/lib/version.pm:/usr/perl5/5.10.0/lib/perl:KNOWN:
-SUNWperl510usr:NotInPkg:/usr/perl5/5.10.0/lib/ExtUtils/xsubpp:/usr/perl5/5.10.0/lib/ExtUtils/miniperl:KNOWN:
 #
 SUNWperl-pmtools:PerlPath:*:*:KNOWN:
 #
--- a/usr/src/tools/protofix.pl	Thu Dec 16 05:01:41 2010 -0800
+++ b/usr/src/tools/protofix.pl	Thu Jan 06 02:11:13 2011 -0800
@@ -19,22 +19,26 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)protofix.pl	1.4	09/09/24 SMI"
+#ident	"@(#)protofix.pl	1.5	10/12/20 SMI"
 #
 # Fix the attributes of paths in the proto area to match the packaging
 #
 
 use Getopt::Long;
 use Cwd;
+use File::Copy;
 
 my ($root_dir, $src_dir, $mach) = ($ENV{'ROOT'}, $ENV{'SRC'}, $ENV{'MACH'});
+my ($PERL, $PYTHON) = ($ENV{'PERL'}, $ENV{'PYTHON'});
 my (%PKGENV, %entries, @packages, $fix_perm, $fix_user, $fix_group) = ();
-my ($manscript, $write_perm) = ();
+my ($manscript, $write_perm, $fix_bang) = ();
 my $exit_code = 0;
 
+defined($PERL) || ($PERL = '/usr/perl5/5.10.0/bin/perl');        # fallback to this version of perl
+defined($PYTHON) || ($PYTHON = '/usr/bin/python2.6');   # fallback to this version of python
+
 sub read_pkginfo {
 	local ($pkg, $file) = @_;
 	my $lineno = 0;
@@ -141,6 +145,19 @@
 	close ($FH);
 }
 
+sub file_type {
+        local ($path) = @_;
+
+        open(FH, "/bin/file $path|");
+        my $line = <FH>;
+        close(FH);
+
+        ($line =~ /usr\/bin\/env script/) && ($line = 'perl script');
+
+        return($line);
+}
+
+
 #
 # Execution begins here
 #
@@ -148,7 +165,8 @@
 GetOptions('root' => \$root_dir, 'src' => \$src_dir, 'mach' => \$mach,
 	   'package|pkg=s' => \@packages, 'permission|perm' => \$fix_perm,
 	   'user' => \$fix_user, 'group' => \$fix_group,
-	   'manscript=s' => \$manscript, 'write' => \$write_perm);
+	   'manscript=s' => \$manscript, 'write' => \$write_perm,
+	   'bang' => \$fix_bang);
 
 @packages = split(/,/, join(',', @packages));	# split comma seperated lists
 
@@ -230,6 +248,35 @@
 
 		chown($uid, $gid, $path);
 	}
+	if ($fix_bang == 1) {
+		my $type = file_type($path);
+		if ($type =~ / .*script/) {
+			my $IFH, $OFH;
+			my $origpath = $path . ".orig";
+
+			copy($path, $origpath) || die("$progname: copy($path, $origpath): $!\n");
+			open($IFH, "<$origpath") || die("$progname: open(<$origpath): $!\n");
+			my $perm = $entries{$path}->{perm};
+
+			chmod($perm | 0222, $path);
+
+			open($OFH, ">$path") || die("$progname: open(>$path): $!\n");
+
+			while (<$IFH>) {
+				if ($. == 1) {
+					(s|^#!.*perl|#!${PERL}|g);
+					(s|^#!.*python[\d\.]*|#!${PYTHON}|g);
+				}
+				print($OFH "$_");
+			}
+
+			close($IFH);
+			close($OFH);
+			chmod($perm, $path);
+			unlink($origpath) || die("$progname: unlink($origpath): $!\n");
+		}
+	}
+
 }
 
 exit $exit_code;