Changes 9.0.5:

* Fix catalog cache invalidation after a "VACUUM FULL" or "CLUSTER"
  on a system catalog
* Fix incorrect order of operations during sinval reset processing,
  and ensure that TOAST OIDs are preserved in system catalogs
* 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
* Protect pg_stat_reset_shared() against NULL input
* Fix possible failure when a recovery conflict deadlock is detected
  within a sub-transaction
* Avoid spurious conflicts while recycling btree index pages during
  hot standby
* Shut down WAL receiver if it's still running at end of recovery
* Fix race condition in relcache init file invalidation
* Fix memory leak at end of a GiST index scan
* Fix memory leak when encoding conversion has to be done on incoming
  command strings and "LISTEN" is active
* Fix incorrect memory accounting (leading to possible memory bloat)
  in tuplestores supporting holdable cursors and plpgsql's RETURN
  NEXT command
* Fix trigger WHEN conditions when both BEFORE and AFTER triggers exist
* more...

11 files changed, 73 insertions, 29 deletions

diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index 90ee35b8574..6a565525715 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/04/22 08:10:23 adam Exp $
+# $NetBSD: Makefile,v 1.8 2011/09/27 11:04:42 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-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/postgresql90-client/PLIST b/databases/postgresql90-client/PLIST
index b56f99a1c5a..8f2cfb4eb8d 100644
--- a/databases/postgresql90-client/PLIST
+++ b/databases/postgresql90-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/02/09 08:48:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/09/27 11:04:42 adam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -509,31 +509,38 @@ ${PG_SUBPREFIX}include/sqlca.h
 ${PG_SUBPREFIX}include/sqlda-compat.h
 ${PG_SUBPREFIX}include/sqlda-native.h
 ${PG_SUBPREFIX}include/sqlda.h
+${PG_SUBPREFIX}lib/libecpg.a
 ${PG_SUBPREFIX}lib/libecpg.so
 ${PG_SUBPREFIX}lib/libecpg.so.6
 ${PG_SUBPREFIX}lib/libecpg.so.6.2
-${PG_SUBPREFIX}lib/libecpg.a
+${PG_SUBPREFIX}lib/libecpg_compat.a
 ${PG_SUBPREFIX}lib/libecpg_compat.so
 ${PG_SUBPREFIX}lib/libecpg_compat.so.3
 ${PG_SUBPREFIX}lib/libecpg_compat.so.3.2
-${PG_SUBPREFIX}lib/libecpg_compat.a
 ${PG_SUBPREFIX}lib/libpgport.a
+${PG_SUBPREFIX}lib/libpgtypes.a
 ${PG_SUBPREFIX}lib/libpgtypes.so
 ${PG_SUBPREFIX}lib/libpgtypes.so.3
 ${PG_SUBPREFIX}lib/libpgtypes.so.3.1
-${PG_SUBPREFIX}lib/libpgtypes.a
+${PG_SUBPREFIX}lib/libpq.a
 ${PG_SUBPREFIX}lib/libpq.so
 ${PG_SUBPREFIX}lib/libpq.so.5
 ${PG_SUBPREFIX}lib/libpq.so.5.3
-${PG_SUBPREFIX}lib/libpq.a
 ${PG_SUBPREFIX}lib/postgresql/pgxs/config/install-sh
 ${PG_SUBPREFIX}lib/postgresql/pgxs/src/Makefile.global
 ${PG_SUBPREFIX}lib/postgresql/pgxs/src/Makefile.port
 ${PG_SUBPREFIX}lib/postgresql/pgxs/src/Makefile.shlib
 ${PG_SUBPREFIX}lib/postgresql/pgxs/src/makefiles/pgxs.mk
 ${PG_SUBPREFIX}lib/postgresql/pgxs/src/nls-global.mk
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/ecpglib6-9.0.mo
 ${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/initdb-9.0.mo
 ${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/pg_resetxlog-9.0.mo
 ${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/pgscripts-9.0.mo
 ${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/psql-9.0.mo
 ${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/ecpg-9.0.mo
@@ -591,6 +598,7 @@ ${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pg_resetxlog-9.0.mo
 ${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo
 ${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/psql-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/ecpglib6-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/initdb-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/libpq5-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_config-9.0.mo
@@ -599,7 +607,19 @@ ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/psql-9.0.mo
 ${PG_SUBPREFIX}share/locale/nb/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/ecpglib6-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/initdb-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/libpq5-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/pg_controldata-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/pg_ctl-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/pg_dump-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/pg_resetxlog-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/psql-9.0.mo
 ${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo
 ${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.0.mo
 ${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo
@@ -619,6 +639,7 @@ ${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/pgscripts-9.0.mo
 ${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/initdb-9.0.mo
 ${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/libpq5-9.0.mo
 ${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/pg_config-9.0.mo
+${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/pg_controldata-9.0.mo
 ${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/pg_ctl-9.0.mo
 ${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/pg_resetxlog-9.0.mo
 ${PG_SUBPREFIX}share/locale/sv/LC_MESSAGES/initdb-9.0.mo
@@ -660,6 +681,7 @@ ${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/ecpglib6-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/initdb-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo
@@ -668,5 +690,6 @@ ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_ctl-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.0.mo
 ${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo
+${PG_SUBPREFIX}share/locale/zh_TW/LC_MESSAGES/psql-9.0.mo
 ${PG_SUBPREFIX}share/postgresql/pg_service.conf.sample
 ${PG_SUBPREFIX}share/postgresql/psqlrc.sample
diff --git a/databases/postgresql90-docs/PLIST b/databases/postgresql90-docs/PLIST
index ec5cc35a184..59a7e46c6c8 100644
--- a/databases/postgresql90-docs/PLIST
+++ b/databases/postgresql90-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/04/22 08:10:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/09/27 11:04:42 adam Exp $
 ${PG_SUBPREFIX}man/man1/clusterdb.1
 ${PG_SUBPREFIX}man/man1/createdb.1
 ${PG_SUBPREFIX}man/man1/createlang.1
@@ -883,6 +883,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-19.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-20.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-21.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-22.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-5.html
@@ -898,6 +899,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-13.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-14.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-15.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-4.html
@@ -915,11 +917,13 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-5.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-8.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-9-0-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-9-0-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-9-0-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-9-0-4.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-9-0-5.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-9-0.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql90-plperl/Makefile b/databases/postgresql90-plperl/Makefile
index a16ac0472a3..541aa312f3a 100644
--- a/databases/postgresql90-plperl/Makefile
+++ b/databases/postgresql90-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2011/08/14 08:18:12 obache Exp $
+# $NetBSD: Makefile,v 1.6 2011/09/27 11:04:42 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql90-plperl/PLIST b/databases/postgresql90-plperl/PLIST
index 4e7a39dbe38..b8b09d88148 100644
--- a/databases/postgresql90-plperl/PLIST
+++ b/databases/postgresql90-plperl/PLIST
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2011/02/09 08:48:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/09/27 11:04:42 adam Exp $
 lib/postgresql/plperl.so
+share/locale/cs/LC_MESSAGES/plperl-9.0.mo
 share/locale/de/LC_MESSAGES/plperl-9.0.mo
 share/locale/es/LC_MESSAGES/plperl-9.0.mo
 share/locale/fr/LC_MESSAGES/plperl-9.0.mo
 share/locale/it/LC_MESSAGES/plperl-9.0.mo
 share/locale/ja/LC_MESSAGES/plperl-9.0.mo
+share/locale/ko/LC_MESSAGES/plperl-9.0.mo
+share/locale/pl/LC_MESSAGES/plperl-9.0.mo
 share/locale/pt_BR/LC_MESSAGES/plperl-9.0.mo
 share/locale/ro/LC_MESSAGES/plperl-9.0.mo
 share/locale/tr/LC_MESSAGES/plperl-9.0.mo
 share/locale/zh_CN/LC_MESSAGES/plperl-9.0.mo
+share/locale/zh_TW/LC_MESSAGES/plperl-9.0.mo
diff --git a/databases/postgresql90-plpython/PLIST b/databases/postgresql90-plpython/PLIST
index 6b1b66daf92..8f4df96bdac 100644
--- a/databases/postgresql90-plpython/PLIST
+++ b/databases/postgresql90-plpython/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.4 2011/02/09 08:48:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/09/27 11:04:42 adam Exp $
 lib/postgresql/plpython.so
 lib/postgresql/plpython2.so
+share/locale/cs/LC_MESSAGES/plpython-9.0.mo
 share/locale/de/LC_MESSAGES/plpython-9.0.mo
 share/locale/es/LC_MESSAGES/plpython-9.0.mo
 share/locale/fr/LC_MESSAGES/plpython-9.0.mo
 share/locale/it/LC_MESSAGES/plpython-9.0.mo
 share/locale/ja/LC_MESSAGES/plpython-9.0.mo
+share/locale/ko/LC_MESSAGES/plpython-9.0.mo
+share/locale/pl/LC_MESSAGES/plpython-9.0.mo
 share/locale/pt_BR/LC_MESSAGES/plpython-9.0.mo
 share/locale/ro/LC_MESSAGES/plpython-9.0.mo
 share/locale/tr/LC_MESSAGES/plpython-9.0.mo
 share/locale/zh_CN/LC_MESSAGES/plpython-9.0.mo
+share/locale/zh_TW/LC_MESSAGES/plpython-9.0.mo
diff --git a/databases/postgresql90-pltcl/PLIST b/databases/postgresql90-pltcl/PLIST
index 70f6d24db2d..7ef99048c59 100644
--- a/databases/postgresql90-pltcl/PLIST
+++ b/databases/postgresql90-pltcl/PLIST
@@ -1,15 +1,19 @@
-@comment $NetBSD: PLIST,v 1.4 2011/02/09 08:48:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/09/27 11:04:42 adam Exp $
 bin/pltcl_delmod
 bin/pltcl_listmod
 bin/pltcl_loadmod
 lib/postgresql/pltcl.so
-share/postgresql/unknown.pltcl
+share/locale/cs/LC_MESSAGES/pltcl-9.0.mo
 share/locale/de/LC_MESSAGES/pltcl-9.0.mo
 share/locale/es/LC_MESSAGES/pltcl-9.0.mo
 share/locale/fr/LC_MESSAGES/pltcl-9.0.mo
 share/locale/it/LC_MESSAGES/pltcl-9.0.mo
 share/locale/ja/LC_MESSAGES/pltcl-9.0.mo
+share/locale/ko/LC_MESSAGES/pltcl-9.0.mo
+share/locale/pl/LC_MESSAGES/pltcl-9.0.mo
 share/locale/pt_BR/LC_MESSAGES/pltcl-9.0.mo
 share/locale/ro/LC_MESSAGES/pltcl-9.0.mo
 share/locale/tr/LC_MESSAGES/pltcl-9.0.mo
 share/locale/zh_CN/LC_MESSAGES/pltcl-9.0.mo
+share/locale/zh_TW/LC_MESSAGES/pltcl-9.0.mo
+share/postgresql/unknown.pltcl
diff --git a/databases/postgresql90-server/PLIST b/databases/postgresql90-server/PLIST
index 3a1d1ee0e4a..c845c41bbc0 100644
--- a/databases/postgresql90-server/PLIST
+++ b/databases/postgresql90-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/04/22 08:10:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/09/27 11:04:42 adam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.so
@@ -31,6 +31,7 @@ ${PG_SUBPREFIX}lib/postgresql/utf8_and_sjis2004.so
 ${PG_SUBPREFIX}lib/postgresql/utf8_and_uhc.so
 ${PG_SUBPREFIX}lib/postgresql/utf8_and_win.so
 ${PG_SUBPREFIX}share/examples/rc.d/pgsql
+${PG_SUBPREFIX}share/locale/cs/LC_MESSAGES/plpgsql-9.0.mo
 ${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/plpgsql-9.0.mo
 ${PG_SUBPREFIX}share/locale/de/LC_MESSAGES/postgres-9.0.mo
 ${PG_SUBPREFIX}share/locale/es/LC_MESSAGES/plpgsql-9.0.mo
@@ -41,6 +42,9 @@ ${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/plpgsql-9.0.mo
 ${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/plpgsql-9.0.mo
 ${PG_SUBPREFIX}share/locale/ja/LC_MESSAGES/postgres-9.0.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/plpgsql-9.0.mo
+${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/postgres-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/plpgsql-9.0.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/postgres-9.0.mo
 ${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/plpgsql-9.0.mo
 ${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo
 ${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo
@@ -88,6 +92,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/Africa/Freetown
 ${PG_SUBPREFIX}share/postgresql/timezone/Africa/Gaborone
 ${PG_SUBPREFIX}share/postgresql/timezone/Africa/Harare
 ${PG_SUBPREFIX}share/postgresql/timezone/Africa/Johannesburg
+${PG_SUBPREFIX}share/postgresql/timezone/Africa/Juba
 ${PG_SUBPREFIX}share/postgresql/timezone/Africa/Kampala
 ${PG_SUBPREFIX}share/postgresql/timezone/Africa/Khartoum
 ${PG_SUBPREFIX}share/postgresql/timezone/Africa/Kigali
@@ -202,10 +207,12 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Juneau
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Kentucky/Louisville
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Kentucky/Monticello
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Knox_IN
+${PG_SUBPREFIX}share/postgresql/timezone/America/Kralendijk
 ${PG_SUBPREFIX}share/postgresql/timezone/America/La_Paz
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Lima
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Los_Angeles
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Louisville
+${PG_SUBPREFIX}share/postgresql/timezone/America/Lower_Princes
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Maceio
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Managua
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Manaus
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index 15d1e5c0a53..915e2393380 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2011/04/22 08:10:23 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2011/09/27 11:04:42 adam Exp $
 #
 # used by databases/postgresql90-adminpack/Makefile
 # used by databases/postgresql90-client/Makefile
@@ -23,7 +23,7 @@
 
 .include "../../databases/postgresql90/Makefile.mirrors"
 
-DISTNAME=	postgresql-9.0.4
+DISTNAME=	postgresql-9.0.5
 CATEGORIES=	databases
 MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -34,6 +34,7 @@ LICENSE=	postgresql-license
 
 CONFLICTS+=	postgresql-[0-9]*
 CONFLICTS+=	postgresql[0-8][0-9]-*
+CONFLICTS+=	postgresql9[1-9]-*
 
 DISTINFO_FILE?=		${.CURDIR}/../../databases/postgresql90/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../../databases/postgresql90/files
diff --git a/databases/postgresql90/distinfo b/databases/postgresql90/distinfo
index 69f8dd6dc60..1ae84b8c616 100644
--- a/databases/postgresql90/distinfo
+++ b/databases/postgresql90/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.6 2011/04/22 08:10:23 adam Exp $
+$NetBSD: distinfo,v 1.7 2011/09/27 11:04:42 adam Exp $
 
-SHA1 (postgresql-9.0.4.tar.bz2) = 5c4ebc2abbbc63ce2973974a7d020e7d14a01e73
-RMD160 (postgresql-9.0.4.tar.bz2) = 0f11efb7634b9acb2080d07771c0355a3bf96fa4
-Size (postgresql-9.0.4.tar.bz2) = 14040871 bytes
+SHA1 (postgresql-9.0.5.tar.bz2) = 1c71be5b1a7d519eff33bb60768776f47b44acf3
+RMD160 (postgresql-9.0.5.tar.bz2) = c5f4f37808f7e24d91a6c95d41fc89330624e26f
+Size (postgresql-9.0.5.tar.bz2) = 14344752 bytes
 SHA1 (patch-aa) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-ab) = 6adfc53e325abe69582f1c7971f56144c697e9c1
 SHA1 (patch-ac) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
-SHA1 (patch-ad) = 64b24d389470ddb980b7a2bdb95e59a599812dfd
+SHA1 (patch-ad) = 378dce5ea08c4344018824a7e44867f31e876c9a
 SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
 SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
diff --git a/databases/postgresql90/patches/patch-ad b/databases/postgresql90/patches/patch-ad
index fd6ebf67a56..12a2c7a7501 100644
--- a/databases/postgresql90/patches/patch-ad
+++ b/databases/postgresql90/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2010/09/21 07:50:46 adam Exp $
+$NetBSD: patch-ad,v 1.2 2011/09/27 11:04:42 adam Exp $
 
---- src/pl/plperl/GNUmakefile.orig	2010-09-21 07:39:30.000000000 +0000
+--- src/pl/plperl/GNUmakefile.orig	2011-09-22 22:00:48.000000000 +0000
 +++ src/pl/plperl/GNUmakefile
 @@ -54,7 +54,6 @@ PSQLDIR = $(bindir)
  
@@ -9,13 +9,13 @@ $NetBSD: patch-ad,v 1.1.1.1 2010/09/21 07:50:46 adam Exp $
 -plperl.o: perlchunks.h plperl_opmask.h
  
  plperl_opmask.h: plperl_opmask.pl
- 	$(PERL) $< $@
-@@ -62,7 +61,7 @@ plperl_opmask.h: plperl_opmask.pl
- perlchunks.h: $(PERLCHUNKS) 
+ 	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
+@@ -64,7 +63,7 @@ perlchunks.h: $(PERLCHUNKS)
+ 	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
  	$(PERL) $(srcdir)/text2macro.pl --strip='^(\#.*|\s*)$$' $^ > $@
  
 -all: all-lib
 +all: perlchunks.h plperl_opmask.h all-lib
  
  SPI.c: SPI.xs
- 	$(PERL) $(perl_privlibexp)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
+ 	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi