Changes 8.4.9:

* 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
* Make pg_options_to_table return NULL for an option with no value
* Avoid possibly accessing off the end of memory in "ANALYZE" and in
  SJIS-2004 encoding conversion
* Prevent intermittent hang in interactions of startup process with
  bgwriter process
* Fix race condition in relcache init file invalidation
* Fix memory leak at end of a GiST index scan
* Fix incorrect memory accounting (leading to possible memory bloat)
  in tuplestores supporting holdable cursors and plpgsql's RETURN
  NEXT command
* Fix performance problem when constructing a large, lossy bitmap
* Fix join selectivity estimation for unique columns
* Fix nested PlaceHolderVar expressions that appear only in
  sub-select target lists
* Allow nested EXISTS queries to be optimized properly
* Fix array- and path-creating functions to ensure padding bytes are zeroes
* Fix "EXPLAIN" to handle gating Result nodes within inner-indexscan subplans
* 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.
* Fix "VACUUM" so that it always updates pg_class.reltuples/relpages
* more...

11 files changed, 44 insertions, 40 deletions

diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index c572fd4fb69..e44ccc95db2 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/04/22 13:01:30 adam Exp $
+# $NetBSD: Makefile,v 1.15 2011/09/27 11:04:30 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-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/postgresql84-client/PLIST b/databases/postgresql84-client/PLIST
index ee8f0210a17..a500d64f53c 100644
--- a/databases/postgresql84-client/PLIST
+++ b/databases/postgresql84-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/04/22 13:01:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2011/09/27 11:04:30 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -1313,6 +1313,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
@@ -1328,6 +1329,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
@@ -1345,6 +1347,7 @@ share/doc/postgresql/html/release-8-4-5.html
 share/doc/postgresql/html/release-8-4-6.html
 share/doc/postgresql/html/release-8-4-7.html
 share/doc/postgresql/html/release-8-4-8.html
+share/doc/postgresql/html/release-8-4-9.html
 share/doc/postgresql/html/release-8-4.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/resources.html
@@ -1753,6 +1756,16 @@ share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo
 share/locale/ko/LC_MESSAGES/pgscripts-8.4.mo
 share/locale/ko/LC_MESSAGES/psql-8.4.mo
 share/locale/nb/LC_MESSAGES/pg_config-8.4.mo
+share/locale/pl/LC_MESSAGES/ecpg-8.4.mo
+share/locale/pl/LC_MESSAGES/ecpglib6-8.4.mo
+share/locale/pl/LC_MESSAGES/initdb-8.4.mo
+share/locale/pl/LC_MESSAGES/libpq5-8.4.mo
+share/locale/pl/LC_MESSAGES/pg_config-8.4.mo
+share/locale/pl/LC_MESSAGES/pg_controldata-8.4.mo
+share/locale/pl/LC_MESSAGES/pg_ctl-8.4.mo
+share/locale/pl/LC_MESSAGES/pg_dump-8.4.mo
+share/locale/pl/LC_MESSAGES/pg_resetxlog-8.4.mo
+share/locale/pl/LC_MESSAGES/pgscripts-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/ecpg-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo
diff --git a/databases/postgresql84-plperl/Makefile b/databases/postgresql84-plperl/Makefile
index 46b6629dc50..10f7ead4430 100644
--- a/databases/postgresql84-plperl/Makefile
+++ b/databases/postgresql84-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2011/08/14 08:18:12 obache Exp $
+# $NetBSD: Makefile,v 1.9 2011/09/27 11:04:30 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql84-plperl/PLIST b/databases/postgresql84-plperl/PLIST
index 3e8390cb3ff..8d2f4151c4e 100644
--- a/databases/postgresql84-plperl/PLIST
+++ b/databases/postgresql84-plperl/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2011/02/15 08:14:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/09/27 11:04:30 adam Exp $
 lib/postgresql/plperl.so
 share/locale/de/LC_MESSAGES/plperl-8.4.mo
 share/locale/es/LC_MESSAGES/plperl-8.4.mo
 share/locale/fr/LC_MESSAGES/plperl-8.4.mo
 share/locale/it/LC_MESSAGES/plperl-8.4.mo
 share/locale/ja/LC_MESSAGES/plperl-8.4.mo
+share/locale/pl/LC_MESSAGES/plperl-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/plperl-8.4.mo
 share/locale/tr/LC_MESSAGES/plperl-8.4.mo
 share/locale/zh_CN/LC_MESSAGES/plperl-8.4.mo
diff --git a/databases/postgresql84-pltcl/PLIST b/databases/postgresql84-pltcl/PLIST
index 19ea756b7fb..ebab0624d8f 100644
--- a/databases/postgresql84-pltcl/PLIST
+++ b/databases/postgresql84-pltcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/02/15 08:14:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/09/27 11:04:30 adam Exp $
 bin/pltcl_delmod
 bin/pltcl_listmod
 bin/pltcl_loadmod
@@ -8,6 +8,7 @@ share/locale/es/LC_MESSAGES/pltcl-8.4.mo
 share/locale/fr/LC_MESSAGES/pltcl-8.4.mo
 share/locale/it/LC_MESSAGES/pltcl-8.4.mo
 share/locale/ja/LC_MESSAGES/pltcl-8.4.mo
+share/locale/pl/LC_MESSAGES/pltcl-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/pltcl-8.4.mo
 share/locale/tr/LC_MESSAGES/pltcl-8.4.mo
 share/locale/zh_CN/LC_MESSAGES/pltcl-8.4.mo
diff --git a/databases/postgresql84-server/PLIST b/databases/postgresql84-server/PLIST
index 61a948cf3b8..35c17111704 100644
--- a/databases/postgresql84-server/PLIST
+++ b/databases/postgresql84-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/04/22 13:01:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/09/27 11:04:30 adam Exp $
 bin/postgres
 bin/postmaster
 lib/postgresql/ascii_and_mic.so
@@ -41,6 +41,8 @@ share/locale/ja/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/ja/LC_MESSAGES/postgres-8.4.mo
 share/locale/ko/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/ko/LC_MESSAGES/postgres-8.4.mo
+share/locale/pl/LC_MESSAGES/plpgsql-8.4.mo
+share/locale/pl/LC_MESSAGES/postgres-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo
 share/locale/ro/LC_MESSAGES/plpgsql-8.4.mo
@@ -87,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
@@ -201,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/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common
index a644ff0ceeb..752d00ac9a4 100644
--- a/databases/postgresql84/Makefile.common
+++ b/databases/postgresql84/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2011/09/20 21:40:58 hans Exp $
+# $NetBSD: Makefile.common,v 1.15 2011/09/27 11:04:30 adam Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
@@ -19,7 +19,7 @@
 
 .include "../../databases/postgresql84/Makefile.mirrors"
 
-DISTNAME=	postgresql-8.4.8
+DISTNAME=	postgresql-8.4.9
 CATEGORIES=	databases
 MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo
index 0205d12b008..6807d65b1a0 100644
--- a/databases/postgresql84/distinfo
+++ b/databases/postgresql84/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.13 2011/09/14 15:55:26 hans Exp $
+$NetBSD: distinfo,v 1.14 2011/09/27 11:04:30 adam Exp $
 
-SHA1 (postgresql-8.4.8.tar.bz2) = f4936de8b8a31f5579e094c928df9612fffe62b5
-RMD160 (postgresql-8.4.8.tar.bz2) = ad4c81e7f22ed3018ff4f37e1e6ad54ce1a5fd4e
-Size (postgresql-8.4.8.tar.bz2) = 14136376 bytes
-SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
-SHA1 (patch-ab) = a273a453e88e54467028c2a45e63bbbb304e227a
+SHA1 (postgresql-8.4.9.tar.bz2) = 7b6bbd72db0f63ea55890427ab6c7a40e7c7ff1b
+RMD160 (postgresql-8.4.9.tar.bz2) = 469acc1d1358c48334896fb8fa84de1d287183d5
+Size (postgresql-8.4.9.tar.bz2) = 14275979 bytes
+SHA1 (patch-aa) = 72437773d67939c8d8c8e9a99caf430590fd726f
+SHA1 (patch-ab) = aa46d88c8a72edaf95880de48474ea484d6d2bf5
 SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
 SHA1 (patch-ad) = fb75df841bbcc25e840ed9c2fed59232d7189200
 SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
 SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
 SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
-SHA1 (patch-ao) = 045a25457da09aff30ac93f1c299064c9f6079a8
+SHA1 (patch-ao) = b098032408fc951865966710554667a249db6320
 SHA1 (patch-ba) = 2cc374fdf4351a4c03ecad30fb99d2aff2cf0bdf
 SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1
diff --git a/databases/postgresql84/patches/patch-aa b/databases/postgresql84/patches/patch-aa
index b3866f94add..b06b2352141 100644
--- a/databases/postgresql84/patches/patch-aa
+++ b/databases/postgresql84/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/07/29 06:26:18 adam Exp $
+$NetBSD: patch-aa,v 1.2 2011/09/27 11:04:30 adam Exp $
 
---- config/perl.m4.orig	2008-11-12 01:00:29.000000000 +0100
+--- config/perl.m4.orig	2011-09-22 22:03:52.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/postgresql84/patches/patch-ab b/databases/postgresql84/patches/patch-ab
index dd6d995af60..c9ebbd631c3 100644
--- a/databases/postgresql84/patches/patch-ab
+++ b/databases/postgresql84/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2011/01/20 12:38:49 markd Exp $
+$NetBSD: patch-ab,v 1.3 2011/09/27 11:04:30 adam Exp $
 
---- configure.orig	2009-06-27 02:14:46.000000000 +0200
+--- configure.orig	2011-09-22 22:03:52.000000000 +0000
 +++ configure
 @@ -2053,6 +2053,7 @@ case $host_os in
    darwin*) template=darwin ;;
@@ -16,21 +16,8 @@ $NetBSD: patch-ab,v 1.2 2011/01/20 12:38:49 markd 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
  echo "${ECHO_T}no" >&6; }
-@@ -18537,10 +18536,10 @@ done
- 
- fi
- 
--# Some versions of libedit contain strlcpy(); so disregard that library while
-+# Some versions of libedit and libroken contain strlcpy(); so disregard that library while
- # checking for these standard libc functions.
- pgac_save_LIBS="$LIBS"
--LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
-+LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g' -e 's/-lgssapi//g' -e 's/-lkrb5//g'`
- 
- 
- 
diff --git a/databases/postgresql84/patches/patch-ao b/databases/postgresql84/patches/patch-ao
index 65176422e58..f04735edeb9 100644
--- a/databases/postgresql84/patches/patch-ao
+++ b/databases/postgresql84/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.2 2010/12/19 09:53:41 adam Exp $
+$NetBSD: patch-ao,v 1.3 2011/09/27 11:04:30 adam Exp $
 
 --- contrib/dblink/dblink.c.orig	2010-08-01 14:56:33.000000000 +0200
 +++ contrib/dblink/dblink.c	2010-08-01 14:56:47.000000000 +0200
-@@ -58,7 +58,7 @@
+@@ -59,7 +59,7 @@
  #include "utils/array.h"
  #include "utils/builtins.h"
  #include "utils/dynahash.h"