Changes 8.3.16:

* Fix bugs in indexing of in-doubt HOT-updated tuples
* Fix multiple bugs in GiST index page split processing
* Fix possible buffer overrun in tsvector_concat()
* Fix crash in xml_recv when processing a "standalone" parameter
* Avoid possibly accessing off the end of memory in "ANALYZE" and in
  SJIS-2004 encoding conversion
* Fix race condition in relcache init file invalidation
* Fix memory leak at end of a GiST index scan
* Fix performance problem when constructing a large, lossy bitmap
* Fix array- and path-creating functions to ensure padding bytes are zeroes
* Work around gcc 4.6.0 bug that breaks WAL replay
* Fix dump bug for VALUES in a view
* Disallow SELECT FOR UPDATE/SHARE on sequences
  This operation doesn't work as expected and can lead to failures.
* Defend against integer overflow when computing size of a hash table
* Fix cases where "CLUSTER" might attempt to access already-removed
  TOAST data
* Fix portability bugs in use of credentials control messages for
  "peer" authentication
* Fix SSPI login when multiple roundtrips are required
* Fix typo in pg_srand48 seed initialization
* Avoid integer overflow when the sum of LIMIT and OFFSET values
  exceeds 2^63
* Add overflow checks to int4 and int8 versions of generate_series()
* Fix trailing-zero removal in to_char()
* Fix pg_size_pretty() to avoid overflow for inputs close to 2^63
* In pg_ctl, support silent mode for service registrations on Windows
* Fix psql's counting of script file line numbers during COPY from a
  different file
* more...

11 files changed, 44 insertions, 29 deletions

diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
index 36f50a4db9c..737fa3c87f7 100644
--- a/databases/postgresql83-client/Makefile
+++ b/databases/postgresql83-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2011/04/22 13:50:38 adam Exp $
+# $NetBSD: Makefile,v 1.24 2011/09/27 11:03:59 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-client-/}
 COMMENT=	PostgreSQL database client programs
@@ -29,8 +29,6 @@ CONFIGURE_ARGS+=	--enable-thread-safety
 .  endif
 .endif
 
-LIBS.SunOS+=	-lintl
-
 INSTALL_DIRS=	src/include
 INSTALL_DIRS+=	src/interfaces
 INSTALL_DIRS+=	src/bin
diff --git a/databases/postgresql83-client/PLIST b/databases/postgresql83-client/PLIST
index 1c9a229fa31..35a71d7f366 100644
--- a/databases/postgresql83-client/PLIST
+++ b/databases/postgresql83-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2011/04/22 13:50:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2011/09/27 11:03:59 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -1282,6 +1282,7 @@ share/doc/postgresql/html/release-8-2-19.html
 share/doc/postgresql/html/release-8-2-2.html
 share/doc/postgresql/html/release-8-2-20.html
 share/doc/postgresql/html/release-8-2-21.html
+share/doc/postgresql/html/release-8-2-22.html
 share/doc/postgresql/html/release-8-2-3.html
 share/doc/postgresql/html/release-8-2-4.html
 share/doc/postgresql/html/release-8-2-5.html
@@ -1297,6 +1298,7 @@ share/doc/postgresql/html/release-8-3-12.html
 share/doc/postgresql/html/release-8-3-13.html
 share/doc/postgresql/html/release-8-3-14.html
 share/doc/postgresql/html/release-8-3-15.html
+share/doc/postgresql/html/release-8-3-16.html
 share/doc/postgresql/html/release-8-3-2.html
 share/doc/postgresql/html/release-8-3-3.html
 share/doc/postgresql/html/release-8-3-4.html
diff --git a/databases/postgresql83-plperl/Makefile b/databases/postgresql83-plperl/Makefile
index cea01634415..93e8578b370 100644
--- a/databases/postgresql83-plperl/Makefile
+++ b/databases/postgresql83-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2011/08/14 08:18:12 obache Exp $
+# $NetBSD: Makefile,v 1.14 2011/09/27 11:04:00 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql83-server/PLIST b/databases/postgresql83-server/PLIST
index 28aa5a1a170..c3d8bbbfdee 100644
--- a/databases/postgresql83-server/PLIST
+++ b/databases/postgresql83-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2011/04/22 13:50:39 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/09/27 11:04:00 adam Exp $
 bin/postgres
 bin/postmaster
 lib/postgresql/ascii_and_mic.so
@@ -89,6 +89,7 @@ share/postgresql/timezone/Africa/Freetown
 share/postgresql/timezone/Africa/Gaborone
 share/postgresql/timezone/Africa/Harare
 share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Juba
 share/postgresql/timezone/Africa/Kampala
 share/postgresql/timezone/Africa/Khartoum
 share/postgresql/timezone/Africa/Kigali
@@ -203,10 +204,12 @@ share/postgresql/timezone/America/Juneau
 share/postgresql/timezone/America/Kentucky/Louisville
 share/postgresql/timezone/America/Kentucky/Monticello
 share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/Kralendijk
 share/postgresql/timezone/America/La_Paz
 share/postgresql/timezone/America/Lima
 share/postgresql/timezone/America/Los_Angeles
 share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Lower_Princes
 share/postgresql/timezone/America/Maceio
 share/postgresql/timezone/America/Managua
 share/postgresql/timezone/America/Manaus
diff --git a/databases/postgresql83/Makefile b/databases/postgresql83/Makefile
index 5f2f9a6144a..3489329cb3d 100644
--- a/databases/postgresql83/Makefile
+++ b/databases/postgresql83/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2011/04/22 13:43:14 obache Exp $
+# $NetBSD: Makefile,v 1.6 2011/09/27 11:03:59 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql83-client>=${PKGVERSION_NOREV}:../../databases/postgresql83-client
diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index 4ce49b81f85..cdd3e231357 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2011/04/22 13:50:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2011/09/27 11:03:59 adam Exp $
 #
 # used by databases/postgresql83-adminpack/Makefile
 # used by databases/postgresql83-client/Makefile
@@ -17,7 +17,7 @@
 
 .include "../../databases/postgresql83/Makefile.mirrors"
 
-DISTNAME=	postgresql-8.3.15
+DISTNAME=	postgresql-8.3.16
 CATEGORIES=	databases
 MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -28,8 +28,8 @@ LICENSE=	postgresql-license
 
 CONFLICTS+=	postgresql-[0-9]*
 CONFLICTS+=	postgresql7[0-9]-*
-CONFLICTS+=	postgresql8[0-2]-*
-CONFLICTS+=	postgresql8[4-9]-*
+CONFLICTS+=	postgresql8[0-24-9]-*
+CONFLICTS+=	postgresql9[0-9]-*
 
 DISTINFO_FILE?=		${.CURDIR}/../postgresql83/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql83/files
diff --git a/databases/postgresql83/distinfo b/databases/postgresql83/distinfo
index ec409ce2399..05e78205885 100644
--- a/databases/postgresql83/distinfo
+++ b/databases/postgresql83/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.17 2011/09/11 10:07:34 marino Exp $
+$NetBSD: distinfo,v 1.18 2011/09/27 11:03:59 adam Exp $
 
-SHA1 (postgresql-8.3.15.tar.bz2) = b20895aa66c15d5f394579aed50ce88c4018ecc0
-RMD160 (postgresql-8.3.15.tar.bz2) = 66c5f79083231f5afb7cb3b41637fc8eb7ae5225
-Size (postgresql-8.3.15.tar.bz2) = 14344586 bytes
-SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
-SHA1 (patch-ab) = 7bf5635b0b93c3c0d33acd4e122e102c92ce7b76
+SHA1 (postgresql-8.3.16.tar.bz2) = c8bda0f506c03d01054fac6dc2f1291cf7539c7e
+RMD160 (postgresql-8.3.16.tar.bz2) = 2e2c677defbb0631529a4b76a3adee006c288617
+Size (postgresql-8.3.16.tar.bz2) = 14348568 bytes
+SHA1 (patch-aa) = 6d5e9aa58975181d189060f8523c022aa6c82277
+SHA1 (patch-ab) = 1ba1bb53ca5a74d09fc2b7d07d98b0a0ffd57202
 SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
-SHA1 (patch-ad) = fb75df841bbcc25e840ed9c2fed59232d7189200
+SHA1 (patch-ad) = bbafd1f18408f7a0f5d1a6608860bf1353a93769
 SHA1 (patch-af) = fcb43276c1f3349f62acfc37ac0bd6ccaae96f29
 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
 SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
 SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841
 SHA1 (patch-ba) = db6be7665f19d2b2b707ffcaa04cb92b44544d61
+SHA1 (patch-src_interfaces_ecpg_ecpglib_Makefile) = 9107a858d4066f0c1e7ece8332d4b32ded718af1
diff --git a/databases/postgresql83/patches/patch-aa b/databases/postgresql83/patches/patch-aa
index d76150e419e..9b5f72f0ac3 100644
--- a/databases/postgresql83/patches/patch-aa
+++ b/databases/postgresql83/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.2 2009/02/07 17:55:42 adam Exp $
+$NetBSD: patch-aa,v 1.3 2011/09/27 11:03:59 adam Exp $
 
---- config/perl.m4.orig	2008-11-12 01:00:29.000000000 +0100
+--- config/perl.m4.orig	2011-09-22 22:06:36.000000000 +0000
 +++ config/perl.m4
-@@ -28,9 +28,7 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
+@@ -32,9 +32,7 @@ AC_DEFUN([PGAC_CHECK_PERL_CONFIGS],
  AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
  [AC_REQUIRE([PGAC_PATH_PERL])
  AC_MSG_CHECKING(for flags to link embedded Perl)
 -pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
 -pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
+-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
 +perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  AC_SUBST(perl_embed_ldflags)dnl
  if test -z "$perl_embed_ldflags" ; then
diff --git a/databases/postgresql83/patches/patch-ab b/databases/postgresql83/patches/patch-ab
index 7e6ec691fdd..3065f4ba60e 100644
--- a/databases/postgresql83/patches/patch-ab
+++ b/databases/postgresql83/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2009/02/07 17:55:42 adam Exp $
+$NetBSD: patch-ab,v 1.5 2011/09/27 11:03:59 adam Exp $
 
---- configure.orig	2009-01-30 03:59:28.000000000 +0100
+--- configure.orig	2011-09-22 22:06:36.000000000 +0000
 +++ configure
 @@ -1510,6 +1510,7 @@ case $host_os in
    darwin*) template=darwin ;;
@@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.4 2009/02/07 17:55:42 adam Exp $
  echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6
 -pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
 -pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
--perl_embed_ldflags=`echo X"$pgac_tmp1" | sed "s/^X//;s%$pgac_tmp2%%"`
+-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
 +perl_embed_ldflags=`$PERL -MExtUtils::Embed -e ldopts`
  if test -z "$perl_embed_ldflags" ; then
  	echo "$as_me:$LINENO: result: no" >&5
diff --git a/databases/postgresql83/patches/patch-ad b/databases/postgresql83/patches/patch-ad
index e7ba475b07e..ca332195343 100644
--- a/databases/postgresql83/patches/patch-ad
+++ b/databases/postgresql83/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2010/05/20 12:36:28 adam Exp $
+$NetBSD: patch-ad,v 1.5 2011/09/27 11:03:59 adam Exp $
 
 --- src/pl/plperl/GNUmakefile.orig	2010-05-20 07:51:50.000000000 +0000
 +++ src/pl/plperl/GNUmakefile
-@@ -53,9 +53,7 @@ PSQLDIR = $(bindir)
+@@ -55,9 +55,7 @@ PSQLDIR = $(bindir)
  include $(top_srcdir)/src/Makefile.shlib
  
  
diff --git a/databases/postgresql83/patches/patch-src_interfaces_ecpg_ecpglib_Makefile b/databases/postgresql83/patches/patch-src_interfaces_ecpg_ecpglib_Makefile
new file mode 100644
index 00000000000..58a3f74d956
--- /dev/null
+++ b/databases/postgresql83/patches/patch-src_interfaces_ecpg_ecpglib_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_interfaces_ecpg_ecpglib_Makefile,v 1.1 2011/09/27 11:04:21 adam Exp $
+
+--- src/interfaces/ecpg/ecpglib/Makefile.orig	2011-09-27 10:46:19.000000000 +0000
++++ src/interfaces/ecpg/ecpglib/Makefile
+@@ -34,7 +34,7 @@ ifneq ($(PORTNAME), win32)
+ OBJS += thread.o
+ endif
+ 
+-SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) -lm $(PTHREAD_LIBS)
++SHLIB_LINK = -L../pgtypeslib -lpgtypes $(libpq) $(filter -lintl -lm, $(LIBS)) $(PTHREAD_LIBS)
+ 
+ ifeq ($(PORTNAME), win32)
+ # Link to shfolder.dll instead of shell32.dll