--- a/usr/src/cmd/postgres/postgresql-8.2/METADATA	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.2/METADATA	Wed May 26 22:56:24 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             PostgreSQL
-VERSION:          8.2.15
+VERSION:          8.2.17
 DESCRIPTION:      PostgreSQL object-relational database system 
 LICENSE:          BSD
 PACKAGE:          SUNWpostgr-82-client SUNWpostgr-82-contrib SUNWpostgr-82-devel SUNWpostgr-82-docs SUNWpostgr-82-libs SUNWpostgr-82-pl SUNWpostgr-82-server SUNWpostgr-82-server-data-root
 PROJECT_URL:      http://www.postgresql.org/
-SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.2.15/postgresql-8.2.15.tar.gz
+SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.2.17/postgresql-8.2.17.tar.gz
 SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              3442

--- a/usr/src/cmd/postgres/postgresql-8.2/Makefile.sfw	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.2/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
@@ -20,14 +20,13 @@
 #
 
 #
-# Copyright 2010 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.25	10/01/08 SMI"
+# ident	"@(#)Makefile.sfw	1.26	10/05/14 SMI"
 #
 
 PGMAJVER=8.2
-PGMINVER=$(PGMAJVER).15
+PGMINVER=$(PGMAJVER).17
 VER=postgresql-$(PGMINVER)
 VER64=$(VER)-64
 

Binary file usr/src/cmd/postgres/postgresql-8.2/postgresql-8.2.15.tar.gz has changed

Binary file usr/src/cmd/postgres/postgresql-8.2/postgresql-8.2.17.tar.gz has changed

--- a/usr/src/cmd/postgres/postgresql-8.3/METADATA	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.3/METADATA	Wed May 26 22:56:24 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             PostgreSQL
-VERSION:          8.3.9
+VERSION:          8.3.11
 DESCRIPTION:      PostgreSQL object-relational database system
 PACKAGE:          SUNWpostgr-83-client SUNWpostgr-83-contrib SUNWpostgr-83-devel SUNWpostgr-83-docs SUNWpostgr-83-libs SUNWpostgr-83-pl SUNWpostgr-83-server-data-root SUNWpostgr-83-server SUNWpostgr-83-tests
 LICENSE:          BSD
 PROJECT_URL:      http://www.postgresql.org/
-SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.3.9/postgresql-8.3.9.tar.gz
+SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.3.11/postgresql-8.3.11.tar.gz
 SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              7777

--- a/usr/src/cmd/postgres/postgresql-8.3/Makefile.sfw	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.3/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
@@ -20,14 +20,13 @@
 #
 
 #
-# Copyright 2010 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	"@(#)Makefile.sfw	1.18	10/01/08 SMI"
+# ident	"@(#)Makefile.sfw	1.19	10/05/14 SMI"
 #
 
 PGMAJVER=8.3
-PGMINVER=$(PGMAJVER).9
+PGMINVER=$(PGMAJVER).11
 VER=postgresql-$(PGMINVER)
 VER64=$(VER)-64
 

Binary file usr/src/cmd/postgres/postgresql-8.3/postgresql-8.3.11.tar.gz has changed

Binary file usr/src/cmd/postgres/postgresql-8.3/postgresql-8.3.9.tar.gz has changed

--- a/usr/src/cmd/postgres/postgresql-8.4/METADATA	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.4/METADATA	Wed May 26 22:56:24 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             postgresql
-VERSION:          8.4.2
+VERSION:          8.4.4
 DESCRIPTION:      PostgreSQL open source object-relational database system
 LICENSE:          BSD
 PACKAGE:          SUNWpostgr-84-client SUNWpostgr-84-server SUNWpostgr-84-libs SUNWpostgr-84-contrib SUNWpostgr-84-devel SUNWpostgr-84-docs SUNWpostgr-84-server-data-root SUNWpostgr-84-tests SUNWpostgr-84-pl
 PROJECT_URL:      http://www.postgresql.org/
-SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.4.2/postgresql-8.4.2.tar.bz2
+SOURCE_DOWNLOAD:  ftp://ftp.postgresql.org/pub/source/v8.4.4/postgresql-8.4.4.tar.bz2
 SUPPORT:          B
 BUGTRAQ:          solaris/database/postgres
 OSR:              11631

--- a/usr/src/cmd/postgres/postgresql-8.4/Makefile.sfw	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/postgres/postgresql-8.4/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2010 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.2	10/01/08 SMI"
+#ident	"@(#)Makefile.sfw	1.3	10/05/14 SMI"
 #
 
 include ../../Makefile.cmd

Binary file usr/src/cmd/postgres/postgresql-8.4/postgresql-8.4.2.tar.bz2 has changed

Binary file usr/src/cmd/postgres/postgresql-8.4/postgresql-8.4.4.tar.bz2 has changed

--- a/usr/src/cmd/vim/runtime.patch	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/vim/runtime.patch	Wed May 26 22:56:24 2010 -0700
@@ -3101,7 +3101,7 @@
 +      \%f:%l:%c:\ %m,
        \%f:%l:\ %m,
        \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-       \10/05/11*\\a[%*\\d]:\ Entering\ directory\ `%f',
+       \10/05/25*\\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	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/cmd/wireshark/METADATA	Wed May 26 22:56:24 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             wireshark
-VERSION:          1.2.6
+VERSION:          1.2.8
 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.6.tar.bz2
+SOURCE_DOWNLOAD:  http://media-2.cacetech.com/wireshark/src/wireshark-1.2.8.tar.bz2
 SUPPORT:          C
 BUGTRAQ:          solaris/network/wireshark
 OSR:              12637

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

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

--- a/usr/src/lib/curl/METADATA	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/METADATA	Wed May 26 22:56:24 2010 -0700
@@ -1,10 +1,10 @@
 NAME:             curl
-VERSION:          7.20.0
+VERSION:          7.20.1
 DESCRIPTION:      Command line URL transfer program
 LICENSE:          CURL
 PACKAGE:          SUNWcurl
 PROJECT_URL:      http://curl.haxx.se/
-SOURCE_DOWNLOAD:  http://curl.haxx.se/download/curl-7.20.0.tar.gz
+SOURCE_DOWNLOAD:  http://curl.haxx.se/download/curl-7.20.1.tar.gz
 SUPPORT:          B
 BUGTRAQ:          solaris/library/curl
 OSR:              5739

--- a/usr/src/lib/curl/Makefile.sfw	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
@@ -22,7 +22,7 @@
 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
-#ident	"@(#)Makefile.sfw	1.11	10/04/15 SMI"
+#ident	"@(#)Makefile.sfw	1.12	10/04/28 SMI"
 #
 # This makefile builds both 32 and 64 bit versions of the library.
 # Builds occur in separate directories.
@@ -80,6 +80,8 @@
 	    "LD_OPTIONS=$(LD_OPTIONS)" \
 	    "LDFLAGS=$(LDFLAGS)" \
 	    PATH=$(SFW_PATH) \
+	    "SHELL=$(SHELL)" \
+	    "CONFIG_SHELL=$(SHELL)" \
 	    "MAKE=$(CCSMAKE)" $(CCSMAKE) -e) 
 
 # if we do not add $($(MACH64)_XARCH), CXX will assume that it's linking
@@ -89,6 +91,8 @@
 	    "LD_OPTIONS=$(LD_OPTIONS)" \
 	    "LDFLAGS=$(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
 	    PATH=$(SFW_PATH) \
+	    "SHELL=$(SHELL)" \
+	    "CONFIG_SHELL=$(SHELL)" \
 	    "MAKE=$(CCSMAKE)" $(CCSMAKE) -e) 
 
 COMPAT_VERSION=	5
@@ -143,6 +147,8 @@
 	    "CXXLDFLAGS=$(LDFLAGS)" \
 	    "CXXLD=$(CCC) $(LDFLAGS)" \
 	    PATH=$(SFW_PATH) \
+	    "SHELL=$(SHELL)" \
+	    "CONFIG_SHELL=$(SHELL)" \
 	    "INSTALL=$(GINSTALL)" \
 	    "MAKE=$(CCSMAKE)" \
 	    ./configure --prefix=$(PREFIX) \
@@ -173,6 +179,8 @@
 	    "CXXLINKLIB=$(CCC64) $(EXTRA_LDFLAGS64) $($(MACH64)_XARCH)" \
 	    "MACH64=$(MACH64)" \
 	    PATH=$(SFW_PATH) \
+	    "SHELL=$(SHELL)" \
+	    "CONFIG_SHELL=$(SHELL)" \
 	    "INSTALL=$(GINSTALL)" \
 	    "MAKE=$(CCSMAKE)" \
 	    ./configure --prefix=$(PREFIX) \

--- a/usr/src/lib/curl/Solaris/curl-config	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Solaris/curl-config	Wed May 26 22:56:24 2010 -0700
@@ -27,7 +27,7 @@
 #
 # Modified to conform to Solaris installation paths conventions.
 #
-# ident	"@(#)curl-config	1.5	10/02/18 SMI"
+# ident	"@(#)curl-config	1.6	10/04/28 SMI"
 #
 prefix=/usr
 exec_prefix=${prefix}
@@ -94,7 +94,7 @@
 	done
 	;;
     --version)
-	echo libcurl 7.20.0
+	echo libcurl 7.20.1
 	exit 0
 	;;
 
@@ -106,20 +106,20 @@
 	# dash as that's used for things like version 1.2.3-CVS
 	cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
         checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
-        numuppercase=`echo 071400 | tr 'a-f' 'A-F'`
+        numuppercase=`echo 071401 | tr 'a-f' 'A-F'`
         nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
 
 	if test "$nownum" -ge "$checknum"; then
 	  # silent success
 	  exit 0
 	else
-	  echo "requested version $checkfor is newer than existing 7.20.0"
+	  echo "requested version $checkfor is newer than existing 7.20.1"
 	  exit 1
 	fi
 	;;
 
     --vernum)
-	echo 071400
+	echo 071401
 	exit 0
 	;;
 

--- a/usr/src/lib/curl/Solaris/curl-config-64	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Solaris/curl-config-64	Wed May 26 22:56:24 2010 -0700
@@ -27,7 +27,7 @@
 #
 # Modified to conform to Solaris installation paths conventions.
 #
-# ident	"@(#)curl-config-64	1.5	10/02/18 SMI"
+# ident	"@(#)curl-config-64	1.6	10/04/28 SMI"
 #
 prefix=/usr
 exec_prefix=${prefix}
@@ -94,7 +94,7 @@
 	done
 	;;
     --version)
-	echo libcurl 7.20.0
+	echo libcurl 7.20.1
 	exit 0
 	;;
 
@@ -106,20 +106,20 @@
 	# dash as that's used for things like version 1.2.3-CVS
 	cpatch=`echo $checkfor | cut -d. -f3 | cut -d- -f1`
         checknum=`echo "$cmajor*256*256 + $cminor*256 + ${cpatch:-0}" | bc`
-        numuppercase=`echo 071400 | tr 'a-f' 'A-F'`
+        numuppercase=`echo 071401 | tr 'a-f' 'A-F'`
         nownum=`echo "obase=10; ibase=16; $numuppercase" | bc`
 
 	if test "$nownum" -ge "$checknum"; then
 	  # silent success
 	  exit 0
 	else
-	  echo "requested version $checkfor is newer than existing 7.20.0"
+	  echo "requested version $checkfor is newer than existing 7.20.1"
 	  exit 1
 	fi
 	;;
 
     --vernum)
-	echo 071400
+	echo 071401
 	exit 0
 	;;
 

--- a/usr/src/lib/curl/Solaris/diffs/Makefile.in.1.diff	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Solaris/diffs/Makefile.in.1.diff	Wed May 26 22:56:24 2010 -0700
@@ -1,6 +1,6 @@
---- lib/Makefile.in	2010-02-09 01:35:12.000000000 -0800
-+++ lib/Makefile.in	2010-02-18 07:58:17.955749066 -0800
-@@ -342,7 +342,7 @@
+--- lib/Makefile.in	2010-03-31 23:56:24.000000000 -0700
++++ lib/Makefile.in	2010-04-23 11:04:44.426035257 -0700
+@@ -341,7 +341,7 @@
  @USE_EMBEDDED_ARES_TRUE@           -I$(top_builddir)/ares         \
  @USE_EMBEDDED_ARES_TRUE@           -I$(top_srcdir)/ares
  
@@ -9,7 +9,7 @@
  
  #
  # Bumping of SONAME conditionally may seem like a weird thing to do, and yeah
-@@ -353,7 +353,7 @@
+@@ -352,7 +352,7 @@
  #
  # This conditional soname bump SHOULD be removed at next "proper" bump.
  #

--- a/usr/src/lib/curl/Solaris/diffs/Makefile.in.3.diff	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Solaris/diffs/Makefile.in.3.diff	Wed May 26 22:56:24 2010 -0700
@@ -1,6 +1,6 @@
---- tests/server/Makefile.in	2010-02-04 13:42:22.000000000 -0800
-+++ tests/server/Makefile.in	2010-02-18 07:59:36.882323096 -0800
-@@ -161,7 +161,7 @@
+--- tests/server/Makefile.in	2010-03-31 23:56:26.000000000 -0700
++++ tests/server/Makefile.in	2010-04-23 11:09:20.989332874 -0700
+@@ -202,7 +202,7 @@
  LDFLAGS = @LDFLAGS@
  LIBCURL_LIBS = @LIBCURL_LIBS@
  LIBOBJS = @LIBOBJS@

--- a/usr/src/lib/curl/Solaris/diffs/configure.0.diff	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Solaris/diffs/configure.0.diff	Wed May 26 22:56:24 2010 -0700
@@ -1,47 +1,11 @@
---- configure	2010-02-04 13:42:19.000000000 -0800
-+++ configure	2010-02-18 08:53:28.907210846 -0800
+--- configure	2010-03-31 23:56:23.000000000 -0700
++++ configure	2010-04-23 11:03:16.259371217 -0700
 @@ -1,4 +1,4 @@
 -#! /bin/sh
-+#!/bin/bash
++#!/bin/ksh93
  # Guess values for system-dependent variables and create Makefiles.
  # Generated by GNU Autoconf 2.65 for curl -.
  #
-@@ -274,7 +274,7 @@
- fi
- fi
- fi
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- export SHELL
- # Unset more variables known to interfere with behavior of common tools.
- CLICOLOR_FORCE= GREP_OPTIONS=
-@@ -565,7 +565,7 @@
- 
- 
- # Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
-+SHELL=${CONFIG_SHELL-/bin/bash}
- 
- case X$lt_ECHO in
- X*--fallback-echo)
-@@ -649,7 +649,7 @@
-       elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
- 	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-         # If we have ksh, try running configure again with it.
--        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/bash}
-         export ORIGINAL_CONFIG_SHELL
-         CONFIG_SHELL=/bin/ksh
-         export CONFIG_SHELL
-@@ -691,7 +691,7 @@
- 	  if test "$prev" != 'sed 50q "$0"'; then
- 	    echo_test_string=`eval $prev`
- 	    export echo_test_string
--	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/bash}} "$0" ${1+"$@"}
- 	  else
- 	    # Oops.  We lost completely, so just stick with echo.
- 	    ECHO=echo
 @@ -1969,6 +1969,13 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -112,7 +76,25 @@
  int main (void)
  {
  static int test_array [1 - 2 * !(($2) <= $ac_mid)];
-@@ -2766,7 +2801,7 @@
+@@ -2081,10 +2116,15 @@
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $4
+-static long int longval () { return $2; }
+-static unsigned long int ulongval () { return $2; }
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
++#include <sys/types.h>
++#include <stdint.h>
++#include <inttypes.h>
++#include <sys/socket.h>
++static long int longval () { return $2; }
++static unsigned long int ulongval () { return $2; }
+ int main (void)
+ {
+ 
+@@ -2766,7 +2806,7 @@
  
  
  
@@ -121,13 +103,10 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
  $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-@@ -3194,13 +3229,6 @@
-   as_fn_error "ar not found in PATH. Cannot continue without ar." "$LINENO" 5
- fi
+@@ -3197,10 +3237,6 @@
  
--
--
--
+ 
+ 
 -if test -f ${srcdir}/include/curl/curlbuild.h; then
 -  rm -f ${srcdir}/include/curl/curlbuild.h
 -fi
@@ -135,34 +114,16 @@
  VERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)"/\1/p' ${srcdir}/include/curl/curlver.h`
  am__api_version="1.9"
  ac_aux_dir=
-@@ -3464,7 +3492,7 @@
+@@ -3464,7 +3500,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
 -SHELL = /bin/sh
-+SHELL = /bin/bash
++SHELL = /bin/ksh93
  all:
  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  _ACEOF
-@@ -4660,7 +4688,7 @@
-     for i in 1 2 3 4 5 6; do
-       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-       # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
-+      # Solaris 8's {/usr,}/bin/bash.
-       touch sub/conftst$i.h
-     done
-     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-@@ -7959,7 +7987,7 @@
-       for i in 1 2 3 4 5 6 7 8 ; do
-         teststring=$teststring$teststring
-       done
--      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/bash}}
-       # If test is not a shell built-in, we'll probably end up computing a
-       # maximum length that is only half of the actual maximum length, but
-       # we can't tell.
-@@ -9191,8 +9219,8 @@
+@@ -9191,8 +9227,8 @@
        case $lt_cv_prog_gnu_ld in
        yes*) LD="${LD-ld} -m elf64_sparc" ;;
        *)
@@ -173,34 +134,27 @@
  	fi
  	;;
        esac
-@@ -13582,7 +13610,7 @@
+@@ -13582,7 +13618,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
 -SHELL = /bin/sh
-+SHELL = /bin/bash
++SHELL = /bin/ksh93
  all:
  	@echo '@@@%%%=$(MAKE)=@@@%%%'
  _ACEOF
-@@ -18847,7 +18875,7 @@
-         GSSAPI_LIBS=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
-      elif test "$GSSAPI_ROOT" != "yes"; then
-         GSSAPI_INCS="-I$GSSAPI_ROOT/include"
--        GSSAPI_LIBS="-lgssapi"
-+        GSSAPI_LIBS="-lgss"
-      fi
-   fi
- 
-@@ -18968,13 +18996,13 @@
-         LIBS="$LIBS $gss_libs"
-      elif test "$GSSAPI_ROOT" != "yes"; then
-         LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
--        LIBS="$LIBS -lgssapi"
-+        LIBS="$LIBS -lgss"
-      else
--        LIBS="$LIBS -lgssapi"
-+        LIBS="$LIBS -lgss"
-      fi
+@@ -19072,15 +19108,15 @@
+            LIBS="$LIBS $gss_libs"
+         elif test "$GSSAPI_ROOT" != "yes"; then
+            LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
+-           LIBS="$LIBS -lgssapi"
++           LIBS="$LIBS -lgss"
+         else
+-           LIBS="$LIBS -lgssapi"
++           LIBS="$LIBS -lgss"
+         fi
+         ;;
+      esac
    else
       LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
 -     LIBS="$LIBS -lgssapi"
@@ -208,7 +162,7 @@
    fi
  else
    CPPFLAGS="$save_CPPFLAGS"
-@@ -19000,7 +19028,7 @@
+@@ -19106,7 +19142,7 @@
          if test x$cross_compiling != xyes; then
              PKGTEST="yes"
      fi
@@ -217,7 +171,7 @@
      LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
      ;;
    off)
-@@ -22104,20 +22132,11 @@
+@@ -22210,20 +22246,12 @@
  
  
  
@@ -232,7 +186,7 @@
 -
 +curl_preprocess_callconv=""
  
--        #
+         #
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_socklen_t data type" >&5
  $as_echo_n "checking for curl_socklen_t data type... " >&6; }
 -  curl_typeof_curl_socklen_t="unknown"
@@ -240,7 +194,7 @@
    for arg1 in int SOCKET; do
      for arg2 in 'struct sockaddr' void; do
        for t in socklen_t int size_t 'unsigned int' long 'unsigned long' void; do
-@@ -35019,7 +35038,6 @@
+@@ -35126,7 +35154,6 @@
    case $ac_config_target in
      "lib/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS lib/curl_config.h" ;;
      "src/curl_config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/curl_config.h" ;;

--- a/usr/src/lib/curl/Solaris/diffs/curlbuild.h.2.diff	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Solaris/diffs/curlbuild.h.2.diff	Wed May 26 22:56:24 2010 -0700
@@ -1,10 +1,10 @@
---- include/curl/curlbuild.h	2010-02-09 02:08:03.000000000 -0800
-+++ include/curl/curlbuild.h	2010-02-18 08:03:03.083778547 -0800
-@@ -497,6 +497,45 @@
+--- include/curl/curlbuild.h	2010-04-14 07:56:19.000000000 -0700
++++ include/curl/curlbuild.h	2010-04-23 11:07:49.683851283 -0700
+@@ -496,6 +496,45 @@
  #  define CURL_SIZEOF_CURL_SOCKLEN_T 4
  
  /* ===================================== */
-+/*    SunPro Compilers                   */
++/*    Sun Studio Compilers                   */
 +/* ===================================== */
 +
 +#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)

--- a/usr/src/lib/curl/Solaris/libcurl.pc	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/Solaris/libcurl.pc	Wed May 26 22:56:24 2010 -0700
@@ -18,11 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"@(#)libcurl.pc	1.5	10/02/18 SMI"
+# ident	"@(#)libcurl.pc	1.6	10/04/28 SMI"
 #
 prefix=/usr
 exec_prefix=${prefix}
@@ -34,7 +32,7 @@
 Name: libcurl
 URL: http://curl.haxx.se/
 Description: Library to transfer files with ftp, http, etc.
-Version: 7.20.0
+Version: 7.20.1
 Libs: -L${libdir} -lc -lcurl -lgss -lidn -lsocket -lnsl -lz -lssl -lcrypto
 Libs.private: -lidn -lssl -lcrypto -lsldap -lldap -lgss -lssl -lcrypto -lsocket -lnsl -lc -lz
 Cflags: -I${includedir}

Binary file usr/src/lib/curl/curl-7.20.0.tar.gz has changed

Binary file usr/src/lib/curl/curl-7.20.1.tar.gz has changed

--- a/usr/src/lib/curl/install-sfw	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/install-sfw	Wed May 26 22:56:24 2010 -0700
@@ -19,13 +19,9 @@
 #
 # CDDL HEADER END
 #
-#
-# Copyright 2010 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.5	10/02/23 SMI"
-
-# VERS=curl-7.20.0
+# ident	"@(#)install-sfw	1.6	10/04/28 SMI"
 
 PREFIX=${ROOT}/usr
 LIBDIR=${PREFIX}/lib

--- a/usr/src/lib/curl/install-sfw-64	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/install-sfw-64	Wed May 26 22:56:24 2010 -0700
@@ -19,13 +19,9 @@
 #
 # CDDL HEADER END
 #
-#
-# Copyright 2010 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.5	10/02/23 SMI"
-
-# VERS=curl-7.20.0-64
+# ident	"@(#)install-sfw-64	1.6	10/04/28 SMI"
 
 PREFIX=${ROOT}/usr
 LIBDIR=${PREFIX}/lib/${MACH64}	# MACH64 passed in by makefile

--- a/usr/src/lib/curl/llib-lcurl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/llib-lcurl	Wed May 26 22:56:24 2010 -0700
@@ -20,11 +20,11 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"@(#)llib-lcurl	1.1	07/08/30 SMI"
+#pragma ident	"@(#)llib-lcurl	1.2	10/04/28 SMI"
 
 /* LINTLIBRARY */
 /* PROTOLIB1 */

--- a/usr/src/lib/curl/postprocess-pkgconfig-64	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/curl/postprocess-pkgconfig-64	Wed May 26 22:56:24 2010 -0700
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/ksh93
 #
 # CDDL HEADER START
 #
@@ -20,10 +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  "@(#)postprocess-pkgconfig-64 1.2     09/03/04 SMI"
+# ident	"@(#)postprocess-pkgconfig-64	1.3	10/04/28 SMI"
+#
 
 if [ $# != 1 ] ; then
 	echo "Usage: `basename $0` <input-file>"

--- a/usr/src/lib/lcms/Makefile.sfw	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/lib/lcms/Makefile.sfw	Wed May 26 22:56:24 2010 -0700
@@ -21,7 +21,7 @@
 #
 # Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-#ident	"@(#)Makefile.sfw	1.6	10/04/26 SMI"
+#ident	"@(#)Makefile.sfw	1.7	10/05/10 SMI"
 
 #
 # This makefile builds both 32 and 64 bit versions of the library.
@@ -56,11 +56,15 @@
 OPTIM_i386 = -xO3
 OPTIM_sparc= -xO4
 OPTIM = $(OPTIM_$(MACH))
+COPTFLAG = $(OPTIM)
+COPTFLAG64 = $(OPTIM)
+CCOPTFLAG = $(OPTIM)
+CCOPTFLAG64 = $(OPTIM)
 
 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 \
+		  -xlang=c99 -xbuiltin=%none -xinline=%auto \
+		  -xustr=ascii_utf16_ushort \
 		  -z combreloc -z redlocsym -z ignore -z rescan -z absexec \
 		  -DPIC -KPIC \
 		  -xF=%none -xthreadvar=%all -mt -D_REENTRANT -DNDEBUG \
@@ -69,7 +73,7 @@
 		  $(OPTIM) -s 
 
 CFLAGS_GENERIC = -xc99=%all -features=extinl,extensions -xustr=ascii_utf16_ushort
-CFLAGS_GENERIC += -xbuiltin=%none -xinline=%auto -xlibmil
+CFLAGS_GENERIC += -xbuiltin=%none -xinline=%auto
 CFLAGS_GENERIC += -z combreloc -z redlocsym -z ignore -z rescan -z absexec
 CFLAGS_GENERIC += -DPIC -KPIC -xF=%none -xthreadvar=%all
 CFLAGS_GENERIC += -mt -D_REENTRANT -DNDEBUG -D__EXTENSIONS__

--- a/usr/src/pkgdefs/SUNWcurl/Makefile	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/Makefile	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# ident "@(#)Makefile 1.1     07/08/30 SMI"
+# ident	"@(#)Makefile	1.2	10/04/28 SMI"
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../Makefile.com

--- a/usr/src/pkgdefs/SUNWcurl/copyright	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/copyright	Wed May 26 22:56:24 2010 -0700
@@ -3,7 +3,7 @@
 
 COPYRIGHT AND PERMISSION NOTICE
  
-Copyright (c) 1996 - 2007, Daniel Stenberg, <[email protected]>.
+Copyright (c) 1996 - 2010, Daniel Stenberg, <[email protected]>.
  
 All rights reserved.
  

--- a/usr/src/pkgdefs/SUNWcurl/depend	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/depend	Wed May 26 22:56:24 2010 -0700
@@ -1,6 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # CDDL HEADER START
 #
@@ -21,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-#ident	"@(#)depend	1.2	08/12/04 SMI"
+#ident	"@(#)depend	1.3	10/04/28 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:

--- a/usr/src/pkgdefs/SUNWcurl/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2010 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	"@(#)pkginfo.tmpl	1.4	10/02/23 SMI"
+# ident	"@(#)pkginfo.tmpl	1.5	10/04/28 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="CURL - The C-URL Wrappers Library (7.20.0)"
+DESC="CURL - The C-URL Wrappers Library (7.20.1)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWcurl/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 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.2	08/09/22 SMI"
+# ident	"@(#)prototype_com	1.3	10/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

--- a/usr/src/pkgdefs/SUNWcurl/prototype_i386	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/prototype_i386	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 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.1     07/08/30 SMI"
+# ident	"@(#)prototype_i386	1.2	10/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

--- a/usr/src/pkgdefs/SUNWcurl/prototype_sparc	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWcurl/prototype_sparc	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 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.1     07/08/30 SMI"
+# ident	"@(#)prototype_sparc	1.2	10/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

--- a/usr/src/pkgdefs/SUNWpostgr-82-client/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-client/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -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	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.15 client tools"
+DESC="PostgreSQL 8.2.17 client tools"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-82-contrib/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-contrib/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -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	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.15 community contributed tools not part of core product"
+DESC="PostgreSQL 8.2.17 community contributed tools not part of core product"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-82-devel/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-devel/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -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	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.15 development tools and header files"
+DESC="PostgreSQL 8.2.17 development tools and header files"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-82-docs/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-docs/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -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	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.15 documentation and man pages"
+DESC="PostgreSQL 8.2.17 documentation and man pages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-82-docs/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-docs/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -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.12	09/12/10 SMI"
+#ident	"@(#)prototype_com	1.13	10/05/14 SMI"
 #
 # SUNWpostgr-82-docs
 #
@@ -1000,7 +999,7 @@
 f none usr/postgres/8.2/doc/html/release-8-0-13.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-1-9.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-2-4.html 0444 root bin
-f none usr/postgres/8.2/doc/html/x71223.html 0444 root bin
+f none usr/postgres/8.2/doc/html/x71234.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-2-5.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-1-10.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-7-3-20.html 0444 root bin
@@ -1038,3 +1037,11 @@
 f none usr/postgres/8.2/doc/html/release-8-0-23.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-1-19.html 0444 root bin
 f none usr/postgres/8.2/doc/html/release-8-2-15.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-7-4-28.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-7-4-29.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-0-24.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-0-25.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-1-20.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-1-21.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-2-16.html 0444 root bin
+f none usr/postgres/8.2/doc/html/release-8-2-17.html 0444 root bin

--- a/usr/src/pkgdefs/SUNWpostgr-82-libs/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-libs/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -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	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.15 client libraries"
+DESC="PostgreSQL 8.2.17 client libraries"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-82-pl/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-pl/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -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	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.15 additional Perl, Python & TCL server procedural languages"
+DESC="PostgreSQL 8.2.17 additional Perl, Python & TCL server procedural languages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-82-server/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-82-server/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -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	"@(#)pkginfo.tmpl	1.11	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.12	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.2.15 database server"
+DESC="PostgreSQL 8.2.17 database server"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-client/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-client/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 client tools"
+DESC="PostgreSQL 8.3.11 client tools"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-contrib/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-contrib/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 community contributed tools not part of core product"
+DESC="PostgreSQL 8.3.11 community contributed tools not part of core product"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-devel/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-devel/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 development tools and header files"
+DESC="PostgreSQL 8.3.11 development tools and header files"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-docs/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-docs/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 documentation and man pages"
+DESC="PostgreSQL 8.3.11 documentation and man pages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-docs/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-docs/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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/12/10 SMI"
+#ident	"@(#)prototype_com	1.10	10/05/14 SMI"
 #
 # SUNWpostgr-83-docs
 #
@@ -2080,3 +2079,13 @@
 f none usr/postgres/8.3/doc/html/release-8-1-19.html 0444 root bin
 f none usr/postgres/8.3/doc/html/release-8-2-15.html 0444 root bin
 f none usr/postgres/8.3/doc/html/release-8-3-9.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-7-4-28.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-7-4-29.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-0-24.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-0-25.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-1-20.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-1-21.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-2-16.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-2-17.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-3-10.html 0444 root bin
+f none usr/postgres/8.3/doc/html/release-8-3-11.html 0444 root bin

--- a/usr/src/pkgdefs/SUNWpostgr-83-libs/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-libs/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 client libraries"
+DESC="PostgreSQL 8.3.11 client libraries"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-pl/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-pl/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 additional Perl, Python & TCL server procedural languages"
+DESC="PostgreSQL 8.3.11 additional Perl, Python & TCL server procedural languages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-server/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-server/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.8	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.9	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 database server"
+DESC="PostgreSQL 8.3.11 database server"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-83-tests/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-83-tests/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)pkginfo.tmpl	1.7	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.8	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.3.9 functional regression tests"
+DESC="PostgreSQL 8.3.11 functional regression tests"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-client/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-client/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 client tools"
+DESC="PostgreSQL 8.4.4 client tools"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-client/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-client/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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	"@(#)prototype_com	1.1	09/10/13 SMI"
+#ident	"@(#)prototype_com	1.2	10/05/14 SMI"
 #
 # SUNWpostgr-84-client
 #
@@ -65,6 +64,7 @@
 f none usr/share/locale/fr/LC_MESSAGES/pgscripts-8.4.mo 644 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/pg_dump-8.4.mo 644 root other
 f none usr/share/locale/it/LC_MESSAGES/pgscripts-8.4.mo 644 root other
 d none usr/share/locale/ja 755 root other
 d none usr/share/locale/ja/LC_MESSAGES 755 root other
@@ -91,3 +91,7 @@
 d none usr/share/locale/tr/LC_MESSAGES 755 root other
 f none usr/share/locale/tr/LC_MESSAGES/pg_dump-8.4.mo 644 root other
 f none usr/share/locale/tr/LC_MESSAGES/pgscripts-8.4.mo 644 root other
+d none usr/share/locale/zh_CN 755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pg_dump-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pgscripts-8.4.mo 644 root other

--- a/usr/src/pkgdefs/SUNWpostgr-84-contrib/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-contrib/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 community contributed tools not part of core product"
+DESC="PostgreSQL 8.4.4 community contributed tools not part of core product"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-devel/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-devel/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 development tools and header files"
+DESC="PostgreSQL 8.4.4 development tools and header files"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-devel/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-devel/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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	"@(#)prototype_com	1.1	09/10/13 SMI"
+#ident	"@(#)prototype_com	1.2	10/05/14 SMI"
 #
 # SUNWpostgr-84-devel
 #
@@ -601,3 +600,6 @@
 d none usr/share/locale/tr 755 root other
 d none usr/share/locale/tr/LC_MESSAGES 755 root other
 f none usr/share/locale/tr/LC_MESSAGES/pg_config-8.4.mo 644 root other
+d none usr/share/locale/zh_CN 755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pg_config-8.4.mo 644 root other

--- a/usr/src/pkgdefs/SUNWpostgr-84-docs/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-docs/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 documentation and man pages"
+DESC="PostgreSQL 8.4.4 documentation and man pages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-docs/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-docs/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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	"@(#)prototype_com	1.2	09/12/18 SMI"
+#ident	"@(#)prototype_com	1.3	10/05/14 SMI"
 #
 # SUNWpostgr-84-docs
 #
@@ -1185,3 +1184,15 @@
 f none usr/postgres/8.4/doc/html/release-8-2-15.html 0444 root bin
 f none usr/postgres/8.4/doc/html/release-8-3-9.html 0444 root bin
 f none usr/postgres/8.4/doc/html/release-8-4-2.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-7-4-28.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-7-4-29.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-0-24.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-0-25.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-1-20.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-1-21.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-2-16.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-2-17.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-3-10.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-3-11.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-4-3.html 0444 root bin
+f none usr/postgres/8.4/doc/html/release-8-4-4.html 0444 root bin

--- a/usr/src/pkgdefs/SUNWpostgr-84-libs/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-libs/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 client libraries"
+DESC="PostgreSQL 8.4.4 client libraries"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-libs/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-libs/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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	"@(#)prototype_com	1.1	09/10/13 SMI"
+#ident	"@(#)prototype_com	1.2	10/05/14 SMI"
 #
 # SUNWpostgr-84-libs
 #
@@ -77,6 +76,10 @@
 d none usr/share/locale/tr/LC_MESSAGES 755 root other
 f none usr/share/locale/tr/LC_MESSAGES/ecpg-8.4.mo 644 root other
 f none usr/share/locale/tr/LC_MESSAGES/ecpglib6-8.4.mo 644 root other
+d none usr/share/locale/zh_CN 755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/ecpg-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/ecpglib6-8.4.mo 644 root other
 d none usr/share/man 755 root bin 
 d none usr/share/man/man5 755 root bin
 f none usr/share/man/man5/postgres_84.5 444 root bin

--- a/usr/src/pkgdefs/SUNWpostgr-84-pl/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-pl/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 additional Perl, Python & TCL server procedural languages"
+DESC="PostgreSQL 8.4.4 additional Perl, Python & TCL server procedural languages"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-pl/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-pl/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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	"@(#)prototype_com	1.1	09/10/13 SMI"
+#ident	"@(#)prototype_com	1.2	10/05/14 SMI"
 #
 # SUNWpostgr-84-pl
 #
@@ -80,3 +79,8 @@
 f none usr/share/locale/tr/LC_MESSAGES/plperl-8.4.mo 644 root other
 f none usr/share/locale/tr/LC_MESSAGES/plpython-8.4.mo 644 root other
 f none usr/share/locale/tr/LC_MESSAGES/pltcl-8.4.mo 644 root other
+d none usr/share/locale/zh_CN 755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/plperl-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/plpython-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pltcl-8.4.mo 644 root other

--- a/usr/src/pkgdefs/SUNWpostgr-84-server/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-server/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 database server"
+DESC="PostgreSQL 8.4.4 database server"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-84-server/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-server/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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	"@(#)prototype_com	1.1	09/10/13 SMI"
+#ident	"@(#)prototype_com	1.2	10/05/14 SMI"
 #
 # SUNWpostgr-84-server
 #
@@ -201,3 +200,11 @@
 f none usr/share/locale/tr/LC_MESSAGES/pg_ctl-8.4.mo 644 root other
 f none usr/share/locale/tr/LC_MESSAGES/pg_resetxlog-8.4.mo 644 root other
 f none usr/share/locale/tr/LC_MESSAGES/postgres-8.4.mo 644 root other
+d none usr/share/locale/zh_CN 755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/initdb-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pg_controldata-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pg_ctl-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/plpgsql-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/postgres-8.4.mo 644 root other

--- a/usr/src/pkgdefs/SUNWpostgr-84-tests/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-84-tests/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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.2	09/12/10 SMI"
+#ident	"@(#)pkginfo.tmpl	1.3	10/05/14 SMI"
 #
 # This required package information file describes characteristics of the
 # package, such as package abbreviation, full package name, package version,
@@ -36,7 +35,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="PostgreSQL 8.4.2 functional regression tests"
+DESC="PostgreSQL 8.4.4 functional regression tests"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWpostgr-common/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWpostgr-common/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -18,10 +18,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	"@(#)prototype_com	1.1	09/10/13 SMI"
+#ident	"@(#)prototype_com	1.2	10/05/14 SMI"
 #
 # SUNWpostgr-common
 #
@@ -84,3 +83,7 @@
 d none usr/share/locale/tr/LC_MESSAGES 755 root other
 f none usr/share/locale/tr/LC_MESSAGES/libpq5-8.4.mo 644 root other
 f none usr/share/locale/tr/LC_MESSAGES/psql-8.4.mo 644 root other
+d none usr/share/locale/zh_CN 755 root other
+d none usr/share/locale/zh_CN/LC_MESSAGES 755 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/libpq5-8.4.mo 644 root other
+f none usr/share/locale/zh_CN/LC_MESSAGES/psql-8.4.mo 644 root other

--- a/usr/src/pkgdefs/SUNWwireshark/copyright	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwireshark/copyright	Wed May 26 22:56:24 2010 -0700
@@ -7,7 +7,7 @@
 is applied is otherwise unspecified.
 ====================================================================
 
-Copyright 1998-2009 Gerald Combs <[email protected]> and contributors.
+Copyright 1998-2010 Gerald Combs <[email protected]> and contributors.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

--- a/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwireshark/pkginfo.tmpl	Wed May 26 22:56:24 2010 -0700
@@ -20,11 +20,10 @@
 #
 
 #
-# Copyright 2010 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.10	10/01/28 SMI"
+#ident	"@(#)pkginfo.tmpl	1.11	10/05/13 SMI"
 #
 #
 # This required package information file describes characteristics of the
@@ -40,7 +39,7 @@
 SUNW_PKGTYPE="usr"
 MAXINST="1000"
 CATEGORY="system"
-DESC="Wireshark - Network protocol analyzer (1.2.6)"
+DESC="Wireshark - Network protocol analyzer (1.2.8)"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""

--- a/usr/src/pkgdefs/SUNWwireshark/prototype_com	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/pkgdefs/SUNWwireshark/prototype_com	Wed May 26 22:56:24 2010 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2010 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	"@(#)prototype_com	1.10	10/01/28 SMI"
+#ident	"@(#)prototype_com	1.11	10/05/13 SMI"
 #
 
 # This required package information file contains a list of package contents.
@@ -58,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.6 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.6/asn1.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/coseventcomm.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/cosnaming.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/docsis.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/ethercat.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/gryphon.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/irda.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/m2m.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/mate.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/opcua.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/parlay.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/profinet.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/sercosiii.so 0755 root bin
-f none usr/lib/wireshark/plugins/1.2.6/stats_tree.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/tango.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/unistim.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/wimax.so 0555 root bin
-f none usr/lib/wireshark/plugins/1.2.6/wimaxasncp.so 0555 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/sbin 0755 root bin
 f none usr/sbin/capinfos 0555 root bin
 f none usr/sbin/dumpcap 0555 root bin
@@ -123,6 +122,7 @@
 f none usr/share/wireshark/diameter/gqpolicy.xml 0444 root bin
 f none usr/share/wireshark/diameter/imscxdx.xml 0444 root bin
 f none usr/share/wireshark/diameter/mobileipv4.xml 0444 root bin
+f none usr/share/wireshark/diameter/mobileipv6.xml 0444 root bin
 f none usr/share/wireshark/diameter/nasreq.xml 0444 root bin
 f none usr/share/wireshark/diameter/sip.xml 0444 root bin
 f none usr/share/wireshark/diameter/sunping.xml 0444 root bin

--- a/usr/src/tools/unpack-archive.sh	Thu May 20 09:24:15 2010 -0700
+++ b/usr/src/tools/unpack-archive.sh	Wed May 26 22:56:24 2010 -0700
@@ -19,15 +19,14 @@
 #
 # CDDL HEADER END
 #
-# 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	"@(#)unpack-archive.sh	1.2	09/04/27 SMI"
+#ident	"@(#)unpack-archive.sh	1.3	10/05/06 SMI"
 #
 # Common script to unpack various source archives
 #
-FIND=${FIND:-/bin/find}
-XARGS=${XARGS:-/bin/xargs}
+FIND=${FIND:-/usr/bin/gfind}
+XARGS=${XARGS:-/usr/bin/gxargs}
 CHMOD=${CHMOD:-/bin/chmod}
 
 case "${1}" in
@@ -59,6 +58,6 @@
 /bin/sh -c "${COMMAND}"
 
 if [ $# -eq 2 -a -d "${2}" ] ; then
-	${FIND} ${2} -type d | ${XARGS} ${CHMOD} 0755
-	${FIND} ${2} -type f | ${XARGS} ${CHMOD} a+r
+	${FIND} ${2} -type d -print0 | ${XARGS} -0 ${CHMOD} 0755
+	${FIND} ${2} -type f -print0 | ${XARGS} -0 ${CHMOD} a+r
 fi