--- a/usr/src/cmd/gnuplot/METADATA	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/gnuplot/METADATA	Sat Jun 26 23:31:21 2010 -0700
@@ -1,12 +1,12 @@
 NAME:             gnuplot
-VERSION:          4.2.6
+VERSION:          4.4.0
 DESCRIPTION:      utility for portable command-line driven interactive data and function plotting
 LICENSE:          Other
 PACKAGE:          SUNWgnuplot
 PROJECT_URL:      http://gnuplot.info
-SOURCE_DOWNLOAD:  ftp://tarballs.opensolaris.org/pub/gnuplot-4.2.6.tar.gz
+SOURCE_DOWNLOAD:  ftp://tarballs.opensolaris.org/pub/gnuplot-4.4.0.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/gnuplot
 OSR:              12371
 COMMENTS:
-download=http://sourceforge.net/projects/gnuplot/files/gnuplot/4.2.6/gnuplot-4.2.6.tar.gz/download
+download=http://sourceforge.net/projects/gnuplot/files/gnuplot/4.4.0/gnuplot-4.4.0.tar.gz/download

--- a/usr/src/cmd/gnuplot/Makefile.sfw	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/gnuplot/Makefile.sfw	Sat Jun 26 23:31:21 2010 -0700
@@ -19,11 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)Makefile.sfw	1.1	10/01/04 SMI"
+#ident	"@(#)Makefile.sfw	1.2	10/04/23 SMI"
 
 
 VER=$(COMPONENT_NAME:sh)-$(COMPONENT_VERSION:sh)
@@ -75,8 +74,8 @@
 
 $(VER)/configure: $(VER).tar.gz
 	$(GTAR) zxpf $(VER).tar.gz --no-same-owner
-	patch $(VER)/src/wxterminal/wxt_gui.cpp < wxt_gui.cpp.diff
 	patch $(VER)/term/gd.trm < arial.diff
+	patch $(VER)/src/syscfg.h < syscfg.h.diff
 	touch $(VER)/configure
 
 clean:

--- a/usr/src/cmd/gnuplot/arial.diff	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/gnuplot/arial.diff	Sat Jun 26 23:31:21 2010 -0700
@@ -1,13 +1,13 @@
 --- gd.trm.old
 +++ gd.trm
-@@ -929,7 +929,11 @@
+@@ -978,7 +978,11 @@
  	if (external_default)
- 	    png_state.ttffont = gp_strdup(external_default);
+ 		png_state.ttffont = gp_strdup(external_default);
  	else	/* Might as well try some plausible font; it's no worse than failing immediately */
 +#ifndef sun
- 	    png_state.ttffont = gp_strdup("arial");
+ 		png_state.ttffont = gp_strdup("arial");
 +#else /* sun */
-+	    png_state.ttffont = gp_strdup("LiberationSans-Regular");
++		png_state.ttffont = gp_strdup("LiberationSans-Regular");
 +#endif /* sun */
  
  	free(png_state.default_ttffont);

Binary file usr/src/cmd/gnuplot/gnuplot-4.2.6.tar.gz has changed

Binary file usr/src/cmd/gnuplot/gnuplot-4.4.0.tar.gz has changed

--- a/usr/src/cmd/gnuplot/install-sfw	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/gnuplot/install-sfw	Sat Jun 26 23:31:21 2010 -0700
@@ -20,20 +20,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # install objects in the proto area, since it would
 # really like to install locally, but that doesn't scale.
 #
 
-#ident	"@(#)install-sfw	1.1	10/01/04 SMI"
+#ident	"@(#)install-sfw	1.2	10/04/23 SMI"
 
 PREFIX=${ROOT}/usr
 BINDIR=${PREFIX}/bin
-EXECDIR=${PREFIX}/lib/gnuplot/4.2
+EXECDIR=${PREFIX}/lib/gnuplot/4.4
 SHAREDIR=${PREFIX}/share
-HELPDIR=${SHAREDIR}/gnuplot/4.2
+HELPDIR=${SHAREDIR}/gnuplot/4.4
 POSTSCRIPTDIR=${HELPDIR}/PostScript
 EMACSDIR=${SHAREDIR}/emacs/site-lisp
 INFODIR=${PREFIX}/share/info
@@ -97,6 +96,7 @@
 _install N demo/all.dem ${DEMODIR}/all.dem 444
 _install N demo/animate.dem ${DEMODIR}/animate.dem 444
 _install N demo/animate2.dem ${DEMODIR}/animate2.dem 444
+_install N demo/approximate.dem ${DEMODIR}/approximate.dem 444
 _install N demo/arrowstyle.dat ${DEMODIR}/arrowstyle.dat 444
 _install N demo/arrowstyle.dem ${DEMODIR}/arrowstyle.dem 444
 _install N demo/asciimat.dat ${DEMODIR}/asciimat.dat 444
@@ -107,22 +107,32 @@
 _install N demo/binary2 ${DEMODIR}/binary2 444
 _install N demo/binary3 ${DEMODIR}/binary3 444
 _install N demo/bivariat.dem ${DEMODIR}/bivariat.dem 444
+_install N demo/bldg.png ${DEMODIR}/bldg.png 444
 _install N demo/blutux.rgb ${DEMODIR}/blutux.rgb 444
 _install N demo/borders.dem ${DEMODIR}/borders.dem 444
 _install N demo/candlesticks.dat ${DEMODIR}/candlesticks.dat 444
 _install N demo/candlesticks.dem ${DEMODIR}/candlesticks.dem 444
 _install N demo/charset.dem ${DEMODIR}/charset.dem 444
+_install N demo/circles.dem ${DEMODIR}/circles.dem 444
+_install N demo/cities.dat ${DEMODIR}/cities.dat 444
+_install N demo/cities.dem ${DEMODIR}/cities.dem 444
 _install N demo/clip14in.dat ${DEMODIR}/clip14in.dat 444
+_install N demo/colorscheme.dem ${DEMODIR}/colorscheme.dem 444
 _install N demo/colorwheel.dem ${DEMODIR}/colorwheel.dem 444
 _install N demo/contours.dem ${DEMODIR}/contours.dem 444
 _install N demo/controls.dem ${DEMODIR}/controls.dem 444
 _install N demo/ctg-y2.dat ${DEMODIR}/ctg-y2.dat 444
 _install N demo/dashcolor.dem ${DEMODIR}/dashcolor.dem 444
 _install N demo/datastrings.dem ${DEMODIR}/datastrings.dem 444
+_install N demo/delaunay-edges.dat ${DEMODIR}/delaunay-edges.dat 444
 _install N demo/demo.edf ${DEMODIR}/demo.edf 444
 _install N demo/density.fnc ${DEMODIR}/density.fnc 444
+_install N demo/dgrid3d.dem ${DEMODIR}/dgrid3d.dem 444
 _install N demo/discrete.dem ${DEMODIR}/discrete.dem 444
 _install N demo/electron.dem ${DEMODIR}/electron.dem 444
+_install N demo/ellipse.dem ${DEMODIR}/ellipse.dem 444
+_install N demo/empty-circles.dat ${DEMODIR}/empty-circles.dat 444
+_install N demo/enhanced_utf8.dem ${DEMODIR}/enhanced_utf8.dem 444
 _install N demo/enhancedtext.dem ${DEMODIR}/enhancedtext.dem 444
 _install N demo/epslatex.dem ${DEMODIR}/epslatex.dem 444
 _install N demo/fillbetween.dem ${DEMODIR}/fillbetween.dem 444
@@ -131,25 +141,35 @@
 _install N demo/finance.dat ${DEMODIR}/finance.dat 444
 _install N demo/finance.dem ${DEMODIR}/finance.dem 444
 _install N demo/fit.dem ${DEMODIR}/fit.dem 444
+_install N demo/fit3.dat ${DEMODIR}/fit3.dat 444
 _install N demo/fontfile.dem ${DEMODIR}/fontfile.dem 444
 _install N demo/fontfile_latex.dem ${DEMODIR}/fontfile_latex.dem 444
 _install N demo/glass.dat ${DEMODIR}/glass.dat 444
+_install N demo/gnu-valley ${DEMODIR}/gnu-valley 444
 _install N demo/gnuplot.cfg ${DEMODIR}/gnuplot.cfg 444
 _install N demo/gnuplot.rot ${DEMODIR}/gnuplot.rot 444
+_install N demo/gpdemos.tcl ${DEMODIR}/gpdemos.tcl 555
 _install N demo/heatmaps.dem ${DEMODIR}/heatmaps.dem 444
 _install N demo/hemisphr.dat ${DEMODIR}/hemisphr.dat 444
 _install N demo/hexa.fnc ${DEMODIR}/hexa.fnc 444
 _install N demo/hidden.dem ${DEMODIR}/hidden.dem 444
 _install N demo/hidden2.dem ${DEMODIR}/hidden2.dem 444
+_install N demo/histerror.dat ${DEMODIR}/histerror.dat 444
 _install N demo/histograms.dem ${DEMODIR}/histograms.dem 444
 _install N demo/histograms2.dem ${DEMODIR}/histograms2.dem 444
+_install N demo/histopt.dat ${DEMODIR}/histopt.dat 444
 _install N demo/image.dem ${DEMODIR}/image.dem 444
+_install N demo/image2.dem ${DEMODIR}/image2.dem 444
+_install N demo/imageNaN.dem ${DEMODIR}/imageNaN.dem 444
 _install N demo/immigration.dat ${DEMODIR}/immigration.dat 444
+_install N demo/iterate.dem ${DEMODIR}/iterate.dem 444
 _install N demo/key.dem ${DEMODIR}/key.dem 444
 _install N demo/klein.dat ${DEMODIR}/klein.dat 444
 _install N demo/labelplot.pdb ${DEMODIR}/labelplot.pdb 444
 _install N demo/layout.dem ${DEMODIR}/layout.dem 444
 _install N demo/lcdemo.dat ${DEMODIR}/lcdemo.dat 444
+_install N demo/lena-keypoints.bin ${DEMODIR}/lena-keypoints.bin 444
+_install N demo/lena.rgb ${DEMODIR}/lena.rgb 444
 _install N demo/line.fnc ${DEMODIR}/line.fnc 444
 _install N demo/macros.dem ${DEMODIR}/macros.dem 444
 _install N demo/margins.dem ${DEMODIR}/margins.dem 444
@@ -160,9 +180,12 @@
 _install N demo/mouselab_2.dem ${DEMODIR}/mouselab_2.dem 444
 _install N demo/mouselabels.dem ${DEMODIR}/mouselabels.dem 444
 _install N demo/mousevariables.dem ${DEMODIR}/mousevariables.dem 444
+_install N demo/multiaxis.dem ${DEMODIR}/multiaxis.dem 444
 _install N demo/multimsh.dem ${DEMODIR}/multimsh.dem 444
+_install N demo/multipalette.dem ${DEMODIR}/multipalette.dem 444
 _install N demo/multiplt.dem ${DEMODIR}/multiplt.dem 444
 _install N demo/nearmap.csv ${DEMODIR}/nearmap.csv 444
+_install N demo/optimize.dat ${DEMODIR}/optimize.dat 444
 _install N demo/param.dem ${DEMODIR}/param.dem 444
 _install N demo/pm3d.dem ${DEMODIR}/pm3d.dem 444
 _install N demo/pm3dcolors.dem ${DEMODIR}/pm3dcolors.dem 444
@@ -173,11 +196,14 @@
 _install N demo/prob.dem ${DEMODIR}/prob.dem 444
 _install N demo/prob2.dem ${DEMODIR}/prob2.dem 444
 _install N demo/rainbow.dem ${DEMODIR}/rainbow.dem 444
+_install N demo/random-points ${DEMODIR}/random-points 444
 _install N demo/random.dem ${DEMODIR}/random.dem 444
 _install N demo/rectangle.dem ${DEMODIR}/rectangle.dem 444
 _install N demo/reflect.fnc ${DEMODIR}/reflect.fnc 444
 _install N demo/rgb_variable.dat ${DEMODIR}/rgb_variable.dat 444
 _install N demo/rgb_variable.dem ${DEMODIR}/rgb_variable.dem 444
+_install N demo/rgbalpha.dem ${DEMODIR}/rgbalpha.dem 444
+_install N demo/running_avg.dem ${DEMODIR}/running_avg.dem 444
 _install N demo/scatter.dem ${DEMODIR}/scatter.dem 444
 _install N demo/scatter2.bin ${DEMODIR}/scatter2.bin 444
 _install N demo/scatter2.dat ${DEMODIR}/scatter2.dat 444
@@ -185,6 +211,7 @@
 _install N demo/simple.dem ${DEMODIR}/simple.dem 444
 _install N demo/sine.bin ${DEMODIR}/sine.bin 444
 _install N demo/singulr.dem ${DEMODIR}/singulr.dem 444
+_install N demo/smooth.dem ${DEMODIR}/smooth.dem 444
 _install N demo/sound.par ${DEMODIR}/sound.par 444
 _install N demo/sound2.par ${DEMODIR}/sound2.par 444
 _install N demo/soundvel.dat ${DEMODIR}/soundvel.dat 444
@@ -204,6 +231,8 @@
 _install N demo/tics.dem ${DEMODIR}/tics.dem 444
 _install N demo/timedat.dat ${DEMODIR}/timedat.dat 444
 _install N demo/timedat.dem ${DEMODIR}/timedat.dem 444
+_install N demo/transparent.dem ${DEMODIR}/transparent.dem 444
+_install N demo/transparent_solids.dem ${DEMODIR}/transparent_solids.dem 444
 _install N demo/triangle.dat ${DEMODIR}/triangle.dat 444
 _install N demo/using.bin ${DEMODIR}/using.bin 444
 _install N demo/using.dat ${DEMODIR}/using.dat 444
@@ -216,4 +245,5 @@
 _install N demo/world.dem ${DEMODIR}/world.dem 444
 _install N demo/world2.dem ${DEMODIR}/world2.dem 444
 _install S ../rundemo ${DEMODIR}/rundemo 555
+_install S ../runtcldemo ${DEMODIR}/runtcldemo 555
 exit 0

--- a/usr/src/cmd/gnuplot/rundemo	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/gnuplot/rundemo	Sat Jun 26 23:31:21 2010 -0700
@@ -20,11 +20,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)rundemo	1.1	10/01/04 SMI"
+#ident	"@(#)rundemo	1.2	10/04/23 SMI"
 
 # Unfortunately, the gnuplot demo wants run in the
 # /usr/demo/gnuplot directory.  While there it wants to read and
@@ -34,9 +33,9 @@
 # This will allow us to run the gnuplot demo from any directory.
 #
 # If the environment variable $GNUPLOT_DEMO_SAVE_FILES is set to y,
-# which is the default, then we will save any new files that get
-# created back to the current directory.  This can also be
-# accomplished by "rundemo -save-files".
+# then we will save any new files that get created back to the
+# current directory.  This can also be accomplished by
+# "rundemo -save-files".
 #
 # There are two font files that are not included.  Set
 # corresponding environment variables for sfrm1000.pfb and
@@ -68,6 +67,9 @@
     $GNUPLOT_DEMO_DIR/*.rgb \
     $GNUPLOT_DEMO_DIR/*.rot \
     $GNUPLOT_DEMO_DIR/binary[123] \
+    $GNUPLOT_DEMO_DIR/bldg.png \
+    $GNUPLOT_DEMO_DIR/gnu-valley \
+    $GNUPLOT_DEMO_DIR/random-points \
     $GNUPLOT_DEMO_P052003L_PFB \
     $GNUPLOT_DEMO_P052023L_PFB \
     $GNUPLOT_DEMO_CMMI10_PFB \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gnuplot/runtcldemo	Sat Jun 26 23:31:21 2010 -0700
@@ -0,0 +1,133 @@
+#!/bin/sh
+
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+#ident	"@(#)runtcldemo	1.1	10/04/23 SMI"
+
+# Unfortunately, the gnuplot demo wants run in the
+# /usr/demo/gnuplot directory.  While there it wants to read and
+# create files.  But ordinary users can't create files there.  So
+# we will create a temporary directory, put in symlinks to the
+# gnuplot data files, and run the gnuplot command from there.
+# This will allow us to run the gnuplot demo from any directory.
+#
+# If the environment variable $GNUPLOT_DEMO_SAVE_FILES is set to y,
+# then we will save any new files that get created back to the
+# current directory.  This can also be accomplished by
+# "runtcldemo -save-files".
+#
+# There are two font files that are not included.  Set
+# corresponding environment variables for sfrm1000.pfb and
+# cmmi10.pfb if running the demo fontfile_latex.dem.
+#
+# One easy way to run the gnuplot demo is "runtcldemo"
+
+GNUPLOT_DEMO_DIR="${GNUPLOT_DEMO_DIR:-/usr/demo/gnuplot}"
+GNUPLOT_DEMO_PROGRAM="${GNUPLOT_DEMO_PROGRAM:-./gpdemos.tcl}"
+GNUPLOT_DEMO_GSFONTS="${GNUPLOT_DEMO_GSFONTS:-/usr/share/ghostscript/fonts}"
+GNUPLOT_DEMO_P052003L_PFB="${GNUPLOT_DEMO_P052003L_PFB:-$GNUPLOT_DEMO_GSFONTS/p052003l.pfb}"
+GNUPLOT_DEMO_P052023L_PFB="${GNUPLOT_DEMO_P052023L_PFB:-$GNUPLOT_DEMO_GSFONTS/p052023l.pfb}"
+GNUPLOT_DEMO_TMPDIR="/tmp/gnuplot_demo_`logname`_$$"
+GNUPLOT_DEMO_LIST="$GNUPLOT_DEMO_DIR/*.bin \
+    $GNUPLOT_DEMO_DIR/*.cfg \
+    $GNUPLOT_DEMO_DIR/*.cor \
+    $GNUPLOT_DEMO_DIR/*.csv \
+    $GNUPLOT_DEMO_DIR/*.dat \
+    $GNUPLOT_DEMO_DIR/*.dem \
+    $GNUPLOT_DEMO_DIR/*.edf \
+    $GNUPLOT_DEMO_DIR/*.fnc \
+    $GNUPLOT_DEMO_DIR/*.inc \
+    $GNUPLOT_DEMO_DIR/*.par \
+    $GNUPLOT_DEMO_DIR/*.pdb \
+    $GNUPLOT_DEMO_DIR/*.r3d \
+    $GNUPLOT_DEMO_DIR/*.rgb \
+    $GNUPLOT_DEMO_DIR/*.rot \
+    $GNUPLOT_DEMO_DIR/binary[123] \
+    $GNUPLOT_DEMO_DIR/bldg.png \
+    $GNUPLOT_DEMO_DIR/gnu-valley \
+    $GNUPLOT_DEMO_DIR/random-points \
+    $GNUPLOT_DEMO_DIR/gpdemos.tcl \
+    $GNUPLOT_DEMO_P052003L_PFB \
+    $GNUPLOT_DEMO_P052023L_PFB \
+    $GNUPLOT_DEMO_CMMI10_PFB \
+    $GNUPLOT_DEMO_SFRM1000_PFB"
+GNUPLOT_DEMO_SAVE_FILES=${GNUPLOT_DEMO_SAVE_FILES:-n}
+
+if [ "x$1" = "x-save-files" ]
+then
+	GNUPLOT_DEMO_SAVE_FILES="y"
+	shift
+
+elif [ "x$1" = "x-delete-files" ]
+then
+	GNUPLOT_DEMO_SAVE_FILES="n"
+	shift
+fi
+
+# if we are interrupted or terminated, remove the temporary
+# directory we will create.
+
+if [ "$GNUPLOT_DEMO_SAVE_FILES" = "y" ]
+then
+	trap "find $GNUPLOT_DEMO_TMPDIR -type f -a -exec cp -p {} . \; ; rm -rf $GNUPLOT_DEMO_TMPDIR; exit 1" INT TERM
+else
+	trap "rm -rf $GNUPLOT_DEMO_TMPDIR; exit 1" INT TERM
+fi
+
+# Create a writeable temporary directory to run the demo from.
+
+mkdir $GNUPLOT_DEMO_TMPDIR
+chmod u+rwx $GNUPLOT_DEMO_TMPDIR
+
+# Make symlinks in that directory to the demo sources
+
+for GNUPLOT_DEMO_FILE in $GNUPLOT_DEMO_LIST
+do
+	ln -s $GNUPLOT_DEMO_FILE $GNUPLOT_DEMO_TMPDIR
+done
+
+# Run the gnuplot demo in that directory.
+
+(cd $GNUPLOT_DEMO_TMPDIR;
+    exec $GNUPLOT_DEMO_PROGRAM $*)
+
+# Save the gnuplot exit status
+
+GNUPLOT_DEMO_EXITSTATUS="$?"
+
+# If desired save any new files that got created in the temporary
+# directory
+
+if [ "$GNUPLOT_DEMO_SAVE_FILES" = "y" ]
+then
+	find $GNUPLOT_DEMO_TMPDIR -type f -exec cp -p {} . \;
+fi
+
+# Remove the temporary directory
+
+rm -rf $GNUPLOT_DEMO_TMPDIR
+
+# exit with the exit status from the gnuplot command
+
+exit $GNUPLOT_DEMO_EXITSTATUS

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/gnuplot/syscfg.h.diff	Sat Jun 26 23:31:21 2010 -0700
@@ -0,0 +1,10 @@
+--- syscfg.h.old
++++ syscfg.h
+@@ -425,7 +425,7 @@
+ #endif
+ 
+ /* May or may not fix a problem reported for Sun Studio compilers */
+-#if defined(__SUNPRO_CC) && !defined(bool)
++#if defined(__SUNPRO_CC) && !defined __cplusplus && !defined(bool)
+ #define bool unsigned char
+ #endif

--- a/usr/src/cmd/gnuplot/wxt_gui.cpp.diff	Fri Jun 11 23:41:07 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
---- wxt_gui.cpp.old
-+++ wxt_gui.cpp
-@@ -442,16 +442,16 @@
- /* toolbar event : Help */
- void wxtFrame::OnHelp( wxCommandEvent& WXUNUSED( event ) )
- {
--	wxMessageBox( wxString(wxT("You are using an interactive terminal "\
--		"based on wxWidgets for the interface, Cairo "\
--		"for the drawing facilities, and Pango for the text layouts.\n"\
--		"Please note that toolbar icons in the terminal "\
--		"don't reflect the whole range of mousing "\
--		"possibilities in the terminal.\n"\
--		"Hit 'h' in the plot window "\
--		"and a help message for mouse commands "\
--		"will appear in the gnuplot console.\n"\
--		"See also 'help mouse'.\n")),
-+	wxMessageBox( wxString(wxT("You are using an interactive terminal ")
-+		wxT("based on wxWidgets for the interface, Cairo ")
-+		wxT("for the drawing facilities, and Pango for the text layouts.\n")
-+		wxT("Please note that toolbar icons in the terminal ")
-+		wxT("don't reflect the whole range of mousing ")
-+		wxT("possibilities in the terminal.\n")
-+		wxT("Hit 'h' in the plot window ")
-+		wxT("and a help message for mouse commands ")
-+		wxT("will appear in the gnuplot console.\n")
-+		wxT("See also 'help mouse'.\n")),
- 		wxT("wxWidgets terminal help"), wxOK | wxICON_INFORMATION, this );
- }
- 
-@@ -1223,7 +1223,7 @@
- 	: wxDialog(parent, -1, wxT("Terminal configuration"), wxDefaultPosition, wxDefaultSize,
-                    wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
- {
--/* 	wxStaticBox *sb = new wxStaticBox( this, wxID_ANY, _T("&Explanation"),
-+/*	wxStaticBox *sb = new wxStaticBox( this, wxID_ANY, wxT("&Explanation"),
- 		wxDefaultPosition, wxDefaultSize );
- 	wxStaticBoxSizer *wrapping_sizer = new wxStaticBoxSizer( sb, wxVERTICAL );
- 	wxStaticText *text1 = new wxStaticText(this, wxID_ANY,
-@@ -1240,13 +1240,13 @@
- 	pConfig->Read(wxT("hinting"),&hinting_setting);
- 
- 	wxCheckBox *check1 = new wxCheckBox (this, wxID_ANY,
--		_T("Put the window at the top of your desktop after each plot (raise)"),
-+		wxT("Put the window at the top of your desktop after each plot (raise)"),
- 		wxDefaultPosition, wxDefaultSize, 0, wxGenericValidator(&raise_setting));
- 	wxCheckBox *check2 = new wxCheckBox (this, wxID_ANY,
--		_T("Don't quit until all windows are closed (persist)"),
-+		wxT("Don't quit until all windows are closed (persist)"),
- 		wxDefaultPosition, wxDefaultSize, 0, wxGenericValidator(&persist_setting));
- 	wxCheckBox *check3 = new wxCheckBox (this, wxID_ANY,
--		_T("Replace 'q' by <ctrl>+'q' and <space> by <ctrl>+<space> (ctrl)"),
-+		wxT("Replace 'q' by <ctrl>+'q' and <space> by <ctrl>+<space> (ctrl)"),
- 		wxDefaultPosition, wxDefaultSize, 0, wxGenericValidator(&ctrl_setting));
- 
- 	wxString choices[3];
-@@ -1255,7 +1255,7 @@
- 	choices[2] = wxT("Antialiasing and oversampling");
- 
- 	wxStaticBox *sb2 = new wxStaticBox( this, wxID_ANY,
--		_T("Rendering options (applied to the next plot)"),
-+		wxT("Rendering options (applied to the next plot)"),
- 		wxDefaultPosition, wxDefaultSize );
- 	wxStaticBoxSizer *box_sizer2 = new wxStaticBoxSizer( sb2, wxVERTICAL );
- 

--- a/usr/src/cmd/gocr/METADATA	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/gocr/METADATA	Sat Jun 26 23:31:21 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             gocr
-VERSION:          0.46
+VERSION:          0.48
 DESCRIPTION:      GOCR,Optical Character Recognition program
 LICENSE:          GPLv2
 PACKAGE:          SUNWgocr
 PROJECT_URL:      http://jocr.sourceforge.net/
-SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/jocr/gocr-0.46.tar.gz
+SOURCE_DOWNLOAD:  http://prdownloads.sourceforge.net/jocr/gocr-0.48.tar.gz
 SUPPORT:          C
 BUGTRAQ:          solaris/utility/gocr
 OSR:              8908

Binary file usr/src/cmd/gocr/gocr-0.46.tar.gz has changed

Binary file usr/src/cmd/gocr/gocr-0.48.tar.gz has changed

--- a/usr/src/cmd/samba/Makefile.sfw	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/samba/Makefile.sfw	Sat Jun 26 23:31:21 2010 -0700
@@ -20,7 +20,7 @@
 #
 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.36	10/06/07 SMI"
+#ident	"@(#)Makefile.sfw	1.37	10/06/18 SMI"
 
 SAMBAVER=samba-3.0.37
 
@@ -109,7 +109,8 @@
 $(SAMBAVER)/source/configure.in: $(SAMBAVER).tar.gz
 	gzip -dc $(SAMBAVER).tar.gz | gtar xopf -
 	find $(SAMBAVER) -type d | xargs chmod 755
-	(cd $(SAMBAVER) ; gpatch -p1 < ../swat.c-diff \
+	(cd $(SAMBAVER) ; gpatch -p1 < ../samba-3.0.37-CVE-2010-2063.patch \
+	 ; gpatch -p1 < ../swat.c-diff \
 	 ; gpatch -p1 < ../configure.in-diff \
 	 ; gpatch -p1 < ../makefile.in-diff \
 	 ; gpatch -p1 < ../login_cache-diff \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/samba/samba-3.0.37-CVE-2010-2063.patch	Sat Jun 26 23:31:21 2010 -0700
@@ -0,0 +1,38 @@
+diff --git a/source/smbd/process.c b/source/smbd/process.c
+index e861e16..6499bc7 100644
+--- a/source/smbd/process.c
++++ b/source/smbd/process.c
+@@ -1159,6 +1159,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
+ {
+ 	static char *orig_inbuf;
+ 	static char *orig_outbuf;
++	static int orig_size;
+ 	int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
+ 	unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
+ 	char *inbuf2, *outbuf2;
+@@ -1178,6 +1179,13 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
+ 		/* this is the first part of the chain */
+ 		orig_inbuf = inbuf;
+ 		orig_outbuf = outbuf;
++		orig_size = size;
++	}
++
++	/* Validate smb_off2 */
++	if ((smb_off2 < smb_wct - 4) || orig_size < (smb_off2 + 4 - smb_wct)) {
++		exit_server_cleanly("Bad chained packet");
++		return -1;
+ 	}
+ 
+ 	/*
+@@ -1192,6 +1200,11 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
+ 	SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf));
+ 	SCVAL(outbuf,smb_vwv0,smb_com2);
+ 
++	if (outsize <= smb_wct) {
++		exit_server_cleanly("Bad chained packet");
++		return -1;
++	}
++
+ 	/* remember how much the caller added to the chain, only counting stuff
+ 		after the parameter words */
+ 	chain_size += outsize - smb_wct;

--- a/usr/src/cmd/vim/runtime.patch	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch	Sat Jun 26 23:31:21 2010 -0700
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \10/06/10*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \10/06/21*\\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/wireshark/METADATA	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/cmd/wireshark/METADATA	Sat Jun 26 23:31:21 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             wireshark
-VERSION:          1.2.8
+VERSION:          1.2.9
 DESCRIPTION:      Wireshark Network protocol analyzer
 LICENSE:          GPLv3
 PACKAGE:          SUNWwireshark SUNWwiresharkr
 PROJECT_URL:      http://www.wireshark.org/
-SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.8.tar.bz2
+SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.9.tar.bz2
 SUPPORT:          C
 BUGTRAQ:          solaris/network/wireshark
 OSR:              12637

--- a/usr/src/cmd/wireshark/Patches/bug4367.patch	Fri Jun 11 23:41:07 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- gtk/capture_file_dlg.c.orig	Wed Jan 27 08:10:52 2010
-+++ gtk/capture_file_dlg.c	Thu Mar 18 05:35:45 2010
-@@ -337,10 +337,6 @@
-     /* make the preview widget sensitive */
-     gtk_widget_set_sensitive(prev, have_preview);
- 
--    /* make the open/save/... dialog button sensitive */
--
--    gtk_dialog_set_response_sensitive(file_sel, GTK_RESPONSE_ACCEPT, have_preview);
--
-     /* do the actual preview */
-     if(have_preview)
-         preview_do(prev, wth);

Binary file usr/src/cmd/wireshark/wireshark-1.2.8.tar.bz2 has changed

Binary file usr/src/cmd/wireshark/wireshark-1.2.9.tar.bz2 has changed

--- a/usr/src/pkgdefs/SUNWgnuplot/depend	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/pkgdefs/SUNWgnuplot/depend	Sat Jun 26 23:31:21 2010 -0700
@@ -1,6 +1,5 @@
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -21,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-#ident	"@(#)depend	1.2	10/01/15 SMI"
+#ident	"@(#)depend	1.3	10/04/30 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -47,7 +46,7 @@
 P SUNWcnetr             Core Solaris Network Infrastructure (Root)
 P SUNWcsd               Core Solaris Devices
 P SUNWcsl               Core Solaris Libraries
-P SUNWcslr              core software for a specific instruction-set architecture
+P SUNWcslr              Core Solaris Libraries (Root)
 P SUNWcsr               Core Solaris, (Root)
 P SUNWcsu               Core Solaris, (Usr)
 P SUNWfontconfig        Fontconfig library
@@ -58,12 +57,17 @@
 P SUNWgtk2              GTK+ - GIMP toolkit libraries
 P SUNWjpg               jpeg - The Independent JPEG Groups JPEG software
 P SUNWkvm               Core Architecture, (Kvm)
+P SUNWlexpt             libexpat - XML parser library
 P SUNWlibC              Sun Workshop Compilers Bundled libC
 P SUNWlibatk            GNOME accesibility toolkit libraries
 P SUNWlibms             Math & Microtasking Libraries (Usr)
+P SUNWlua               Lua Programming language
+P SUNWmlib              mediaLib - Shared Libraries
 P SUNWpango             GNOME core text and font handling libraries
 P SUNWpng               Portable Network Graphics library
+P SUNWTk                Tk - TCL GUI Toolkit
 P SUNWwxwidgets         wxWidgets - A cross-platform GUI toolkit (2.8.9)
 P SUNWxorg-clientlibs   X Window System client libraries based on X.Org Foundation open source release
 P SUNWxwplt             X Window System platform software
+P SUNWxwxft             Xft (X Freetype) Library
 P SUNWzlib              The Zip compression library

--- a/usr/src/pkgdefs/SUNWgnuplot/pkginfo.tmpl	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/pkgdefs/SUNWgnuplot/pkginfo.tmpl	Sat Jun 26 23:31:21 2010 -0700
@@ -19,11 +19,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.1	10/01/04 SMI"
+#ident	"@(#)pkginfo.tmpl	1.2	10/04/23 SMI"
 
 #
 # This required package information file describes characteristics of the
@@ -39,7 +38,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="gnuplot - command-driven interactive function plotting program (4.2.6)"
+DESC="gnuplot - command-driven interactive function plotting program (4.4.0)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWgnuplot/prototype_com	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/pkgdefs/SUNWgnuplot/prototype_com	Sat Jun 26 23:31:21 2010 -0700
@@ -19,11 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)prototype_com	1.1	10/01/04 SMI"
+#ident	"@(#)prototype_com	1.2	10/04/23 SMI"
 
 #
 # This required package information file contains a list of package contents.
@@ -59,6 +58,7 @@
 f none usr/demo/gnuplot/all.dem 444 root bin
 f none usr/demo/gnuplot/animate.dem 444 root bin
 f none usr/demo/gnuplot/animate2.dem 444 root bin
+f none usr/demo/gnuplot/approximate.dem 444 root bin
 f none usr/demo/gnuplot/arrowstyle.dat 444 root bin
 f none usr/demo/gnuplot/arrowstyle.dem 444 root bin
 f none usr/demo/gnuplot/asciimat.dat 444 root bin
@@ -69,22 +69,32 @@
 f none usr/demo/gnuplot/binary2 444 root bin
 f none usr/demo/gnuplot/binary3 444 root bin
 f none usr/demo/gnuplot/bivariat.dem 444 root bin
+f none usr/demo/gnuplot/bldg.png 444 root bin
 f none usr/demo/gnuplot/blutux.rgb 444 root bin
 f none usr/demo/gnuplot/borders.dem 444 root bin
 f none usr/demo/gnuplot/candlesticks.dat 444 root bin
 f none usr/demo/gnuplot/candlesticks.dem 444 root bin
 f none usr/demo/gnuplot/charset.dem 444 root bin
+f none usr/demo/gnuplot/circles.dem 444 root bin
+f none usr/demo/gnuplot/cities.dat 444 root bin
+f none usr/demo/gnuplot/cities.dem 444 root bin
 f none usr/demo/gnuplot/clip14in.dat 444 root bin
+f none usr/demo/gnuplot/colorscheme.dem 444 root bin
 f none usr/demo/gnuplot/colorwheel.dem 444 root bin
 f none usr/demo/gnuplot/contours.dem 444 root bin
 f none usr/demo/gnuplot/controls.dem 444 root bin
 f none usr/demo/gnuplot/ctg-y2.dat 444 root bin
 f none usr/demo/gnuplot/dashcolor.dem 444 root bin
 f none usr/demo/gnuplot/datastrings.dem 444 root bin
+f none usr/demo/gnuplot/delaunay-edges.dat 444 root bin
 f none usr/demo/gnuplot/demo.edf 444 root bin
 f none usr/demo/gnuplot/density.fnc 444 root bin
+f none usr/demo/gnuplot/dgrid3d.dem 444 root bin
 f none usr/demo/gnuplot/discrete.dem 444 root bin
 f none usr/demo/gnuplot/electron.dem 444 root bin
+f none usr/demo/gnuplot/ellipse.dem 444 root bin
+f none usr/demo/gnuplot/empty-circles.dat 444 root bin
+f none usr/demo/gnuplot/enhanced_utf8.dem 444 root bin
 f none usr/demo/gnuplot/enhancedtext.dem 444 root bin
 f none usr/demo/gnuplot/epslatex.dem 444 root bin
 f none usr/demo/gnuplot/fillbetween.dem 444 root bin
@@ -93,25 +103,35 @@
 f none usr/demo/gnuplot/finance.dat 444 root bin
 f none usr/demo/gnuplot/finance.dem 444 root bin
 f none usr/demo/gnuplot/fit.dem 444 root bin
+f none usr/demo/gnuplot/fit3.dat 444 root bin
 f none usr/demo/gnuplot/fontfile.dem 444 root bin
 f none usr/demo/gnuplot/fontfile_latex.dem 444 root bin
 f none usr/demo/gnuplot/glass.dat 444 root bin
+f none usr/demo/gnuplot/gnu-valley 444 root bin
 f none usr/demo/gnuplot/gnuplot.cfg 444 root bin
 f none usr/demo/gnuplot/gnuplot.rot 444 root bin
+f none usr/demo/gnuplot/gpdemos.tcl 555 root bin
 f none usr/demo/gnuplot/heatmaps.dem 444 root bin
 f none usr/demo/gnuplot/hemisphr.dat 444 root bin
 f none usr/demo/gnuplot/hexa.fnc 444 root bin
 f none usr/demo/gnuplot/hidden.dem 444 root bin
 f none usr/demo/gnuplot/hidden2.dem 444 root bin
+f none usr/demo/gnuplot/histerror.dat 444 root bin
 f none usr/demo/gnuplot/histograms.dem 444 root bin
 f none usr/demo/gnuplot/histograms2.dem 444 root bin
+f none usr/demo/gnuplot/histopt.dat 444 root bin
 f none usr/demo/gnuplot/image.dem 444 root bin
+f none usr/demo/gnuplot/image2.dem 444 root bin
+f none usr/demo/gnuplot/imageNaN.dem 444 root bin
 f none usr/demo/gnuplot/immigration.dat 444 root bin
+f none usr/demo/gnuplot/iterate.dem 444 root bin
 f none usr/demo/gnuplot/key.dem 444 root bin
 f none usr/demo/gnuplot/klein.dat 444 root bin
 f none usr/demo/gnuplot/labelplot.pdb 444 root bin
 f none usr/demo/gnuplot/layout.dem 444 root bin
 f none usr/demo/gnuplot/lcdemo.dat 444 root bin
+f none usr/demo/gnuplot/lena-keypoints.bin 444 root bin
+f none usr/demo/gnuplot/lena.rgb 444 root bin
 f none usr/demo/gnuplot/line.fnc 444 root bin
 f none usr/demo/gnuplot/macros.dem 444 root bin
 f none usr/demo/gnuplot/margins.dem 444 root bin
@@ -122,9 +142,12 @@
 f none usr/demo/gnuplot/mouselab_2.dem 444 root bin
 f none usr/demo/gnuplot/mouselabels.dem 444 root bin
 f none usr/demo/gnuplot/mousevariables.dem 444 root bin
+f none usr/demo/gnuplot/multiaxis.dem 444 root bin
 f none usr/demo/gnuplot/multimsh.dem 444 root bin
+f none usr/demo/gnuplot/multipalette.dem 444 root bin
 f none usr/demo/gnuplot/multiplt.dem 444 root bin
 f none usr/demo/gnuplot/nearmap.csv 444 root bin
+f none usr/demo/gnuplot/optimize.dat 444 root bin
 f none usr/demo/gnuplot/param.dem 444 root bin
 f none usr/demo/gnuplot/pm3d.dem 444 root bin
 f none usr/demo/gnuplot/pm3dcolors.dem 444 root bin
@@ -135,12 +158,16 @@
 f none usr/demo/gnuplot/prob.dem 444 root bin
 f none usr/demo/gnuplot/prob2.dem 444 root bin
 f none usr/demo/gnuplot/rainbow.dem 444 root bin
+f none usr/demo/gnuplot/random-points 444 root bin
 f none usr/demo/gnuplot/random.dem 444 root bin
 f none usr/demo/gnuplot/rectangle.dem 444 root bin
 f none usr/demo/gnuplot/reflect.fnc 444 root bin
 f none usr/demo/gnuplot/rgb_variable.dat 444 root bin
 f none usr/demo/gnuplot/rgb_variable.dem 444 root bin
+f none usr/demo/gnuplot/rgbalpha.dem 444 root bin
 f none usr/demo/gnuplot/rundemo 555 root bin
+f none usr/demo/gnuplot/runtcldemo 555 root bin
+f none usr/demo/gnuplot/running_avg.dem 444 root bin
 f none usr/demo/gnuplot/scatter.dem 444 root bin
 f none usr/demo/gnuplot/scatter2.bin 444 root bin
 f none usr/demo/gnuplot/scatter2.dat 444 root bin
@@ -148,6 +175,7 @@
 f none usr/demo/gnuplot/simple.dem 444 root bin
 f none usr/demo/gnuplot/sine.bin 444 root bin
 f none usr/demo/gnuplot/singulr.dem 444 root bin
+f none usr/demo/gnuplot/smooth.dem 444 root bin
 f none usr/demo/gnuplot/sound.par 444 root bin
 f none usr/demo/gnuplot/sound2.par 444 root bin
 f none usr/demo/gnuplot/soundvel.dat 444 root bin
@@ -167,6 +195,8 @@
 f none usr/demo/gnuplot/tics.dem 444 root bin
 f none usr/demo/gnuplot/timedat.dat 444 root bin
 f none usr/demo/gnuplot/timedat.dem 444 root bin
+f none usr/demo/gnuplot/transparent.dem 444 root bin
+f none usr/demo/gnuplot/transparent_solids.dem 444 root bin
 f none usr/demo/gnuplot/triangle.dat 444 root bin
 f none usr/demo/gnuplot/using.bin 444 root bin
 f none usr/demo/gnuplot/using.dat 444 root bin
@@ -180,28 +210,28 @@
 f none usr/demo/gnuplot/world2.dem 444 root bin
 d none usr/lib 755 root bin
 d none usr/lib/gnuplot 755 root bin
-d none usr/lib/gnuplot/4.2 755 root bin
-f none usr/lib/gnuplot/4.2/gnuplot_x11 555 root bin
+d none usr/lib/gnuplot/4.4 755 root bin
+f none usr/lib/gnuplot/4.4/gnuplot_x11 555 root bin
 d none usr/share 755 root sys
 d none usr/share/man 755 root bin
 d none usr/share/man/man1 755 root bin
 f none usr/share/man/man1/gnuplot.1 444 root bin
 d none usr/share/gnuplot 755 root bin
-d none usr/share/gnuplot/4.2 755 root bin
-f none usr/share/gnuplot/4.2/gnuplot.gih 444 root bin
+d none usr/share/gnuplot/4.4 755 root bin
+f none usr/share/gnuplot/4.4/gnuplot.gih 444 root bin
 d none usr/share/info 755 root bin
 f none usr/share/info/gnuplot.info 444 root bin
-d none usr/share/gnuplot/4.2/PostScript 755 root bin
-f none usr/share/gnuplot/4.2/PostScript/8859-15.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/8859-1.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/8859-2.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/cp1250.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/cp437.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/cp850.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/cp852.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/koi8r.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/koi8u.ps 444 root bin
-f none usr/share/gnuplot/4.2/PostScript/prologue.ps 444 root bin
+d none usr/share/gnuplot/4.4/PostScript 755 root bin
+f none usr/share/gnuplot/4.4/PostScript/8859-15.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/8859-1.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/8859-2.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/cp1250.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/cp437.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/cp850.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/cp852.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/koi8r.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/koi8u.ps 444 root bin
+f none usr/share/gnuplot/4.4/PostScript/prologue.ps 444 root bin
 d none usr/share/emacs 755 root bin
 d none usr/share/emacs/site-lisp 755 root bin
 f none usr/share/emacs/site-lisp/gnuplot-gui.el 444 root bin

--- a/usr/src/pkgdefs/SUNWgocr/pkginfo.tmpl	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/pkgdefs/SUNWgocr/pkginfo.tmpl	Sat Jun 26 23:31:21 2010 -0700
@@ -20,10 +20,9 @@
 # CDDL HEADER END
 #
 #
-# 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	"@(#)pkginfo.tmpl	1.1	09/04/08 SMI"	
+#ident	"@(#)pkginfo.tmpl	1.2	10/06/18 SMI"	
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -31,7 +30,7 @@
 #
 PKG="SUNWgocr"
 NAME="GOCR is an open source Optical Character Recognition program"
-DESC="GOCR converts scanned images of text back to text files. (version 0.46)"
+DESC="GOCR converts scanned images of text back to text files. (version 0.48)"
 ARCH="ISA"
 VERSION="SFWVERS,REV=0.0.0"
 SUNW_PRODNAME="SunOS"

--- a/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Sat Jun 26 23:31:21 2010 -0700
@@ -23,7 +23,7 @@
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)pkginfo.tmpl	1.11	10/05/13 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/06/18 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.8)"
+DESC="Wireshark - Network protocol analyzer (1.2.9)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWwireshark/prototype_com	Fri Jun 11 23:41:07 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwireshark/prototype_com	Sat Jun 26 23:31:21 2010 -0700
@@ -22,7 +22,7 @@
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)prototype_com	1.11	10/05/13 SMI"
+#ident	"@(#)prototype_com	1.12	10/06/18 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.8 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.8/asn1.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/coseventcomm.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/cosnaming.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/docsis.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/ethercat.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/gryphon.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/irda.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/m2m.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/mate.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/opcua.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/parlay.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/profinet.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/sercosiii.so 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.8/stats_tree.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/tango.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/unistim.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/wimax.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.8/wimaxasncp.so 0555 root bin
+d none usr/lib/wireshark/plugins/1.2.9 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.9/asn1.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/coseventcomm.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/cosnaming.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/docsis.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/ethercat.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/gryphon.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/irda.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/m2m.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/mate.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/opcua.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/parlay.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/profinet.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/sercosiii.so 0755 root bin
+f none usr/lib/wireshark/plugins/1.2.9/stats_tree.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/tango.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/unistim.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/wimax.so 0555 root bin
+f none usr/lib/wireshark/plugins/1.2.9/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