Changes 9.0.4:

* fix build issues on HP-UX and Itanium
* update time zone files for recent time zone changes
* change SQLSTATE for Hot Standby warnings
* prevent bgwriter hang during recovery
* prevent recursive composite type creation
* disallow dropping tables whose triggers are still pending
* allow use of "replication" as a user name
* prevent a crash during GEQO planning
* improve join plans for tables with missing statistics
* fix error with SELECT FOR UPDATE in a subselect
* close PL/python array slice memory leak
* allow SSL connections for users with no home directory
* allow building PostgreSQL 9.0 with 64-bit MinGW

16 files changed, 40 insertions, 53 deletions

diff --git a/databases/postgresql90-adminpack/Makefile b/databases/postgresql90-adminpack/Makefile
index b9f44073bf6..81d663cd96e 100644
--- a/databases/postgresql90-adminpack/Makefile
+++ b/databases/postgresql90-adminpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/09 08:48:17 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/22 08:10:23 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-adminpack-/}
 COMMENT=	Admin pack module for pgAdmin management
@@ -9,11 +9,9 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
+BUILD_MAKE_FLAGS=	PGXS=1
 
 BUILD_DIRS=		contrib/adminpack
-BUILD_MAKE_FLAGS=	PGXS=1
 REQD_DIRS+=		${PG_SUBPREFIX}share/doc/postgresql/contrib
 REQD_DIRS+=		${PG_SUBPREFIX}share/postgresql/contrib
 
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index ea5be0d0168..90ee35b8574 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/02/09 08:48:17 adam Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/22 08:10:23 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-client-/}
 COMMENT=	PostgreSQL database client programs
@@ -89,8 +89,8 @@ post-wrapper:
 .endif
 
 post-install:
-	set -e; for file in ${PGXS_FILES}; do				\
-		${INSTALL_DATA} ${WRKSRC}/$$file ${DEST_PGXS}/$$file;	\
-	done
+.for file in ${PGXS_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DEST_PGXS}/${file}
+.endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql90-datatypes/Makefile b/databases/postgresql90-datatypes/Makefile
index a3efe69f3db..d544642e4f4 100644
--- a/databases/postgresql90-datatypes/Makefile
+++ b/databases/postgresql90-datatypes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/09 08:48:18 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/22 08:10:23 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-datatypes-/}
 COMMENT=	PostgreSQL data types support modules
@@ -9,8 +9,6 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 CONFIGURE_ARGS+=	--with-ossp-uuid
 BUILD_MAKE_FLAGS=	PGXS=1
 # because global pg_config.h is included, we have to define this
@@ -24,7 +22,6 @@ BUILD_DIRS+=		contrib/ltree
 BUILD_DIRS+=		contrib/lo
 BUILD_DIRS+=		contrib/uuid-ossp
 BUILD_DIRS+=		contrib/unaccent
-
 REQD_DIRS+=		${PG_SUBPREFIX}lib/postgresql
 REQD_DIRS+=		${PG_SUBPREFIX}share/postgresql/contrib
 
diff --git a/databases/postgresql90-dblink/Makefile b/databases/postgresql90-dblink/Makefile
index 4feb8482f32..f14fb5ac3c8 100644
--- a/databases/postgresql90-dblink/Makefile
+++ b/databases/postgresql90-dblink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/09 08:48:18 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/22 08:10:24 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-dblink-/}
 COMMENT=	Dblink module for remote database connections
@@ -9,8 +9,6 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 CONFIGURE_ARGS+=	--with-openssl
 BUILD_MAKE_FLAGS=	PGXS=1
 
diff --git a/databases/postgresql90-docs/PLIST b/databases/postgresql90-docs/PLIST
index e29ded38e00..ec5cc35a184 100644
--- a/databases/postgresql90-docs/PLIST
+++ b/databases/postgresql90-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/02/09 08:48:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/22 08:10:24 adam Exp $
 ${PG_SUBPREFIX}man/man1/clusterdb.1
 ${PG_SUBPREFIX}man/man1/createdb.1
 ${PG_SUBPREFIX}man/man1/createlang.1
@@ -882,6 +882,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-18.html
 ${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-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-5.html
@@ -896,6 +897,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-11.html
 ${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-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-4.html
@@ -912,10 +914,12 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-4.html
 ${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.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.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql90-fuzzystrmatch/Makefile b/databases/postgresql90-fuzzystrmatch/Makefile
index 60e27c5eacc..4494a856a59 100644
--- a/databases/postgresql90-fuzzystrmatch/Makefile
+++ b/databases/postgresql90-fuzzystrmatch/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2011/02/16 12:22:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2011/04/22 08:10:24 adam Exp $
 
-PKGNAME=        ${DISTNAME:C/-/90-fuzzystrmatch-/}
+PKGNAME=	${DISTNAME:C/-/90-fuzzystrmatch-/}
 COMMENT=	PostgreSQL fuzzystrmatch contribution
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../databases/postgresql90/Makefile.common"
-
-INSTALL_DIRS+=	contrib/fuzzystrmatch
+DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-server
 
-BUILD_DIRS=	${INSTALL_DIRS}
+.include "../../databases/postgresql90/Makefile.common"
 
-USE_LIBTOOL=	yes
+BUILD_DIRS=		contrib/fuzzystrmatch
+BUILD_MAKE_FLAGS=	USE_PGXS=1
 
+.include "../../databases/postgresql90-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql90-fuzzystrmatch/PLIST b/databases/postgresql90-fuzzystrmatch/PLIST
index 6697222b392..ab61be7a9e3 100644
--- a/databases/postgresql90-fuzzystrmatch/PLIST
+++ b/databases/postgresql90-fuzzystrmatch/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/03/28 21:37:55 zafer Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/04/22 08:10:24 adam Exp $
+lib/postgresql/fuzzystrmatch.so
 share/postgresql/contrib/fuzzystrmatch.sql
 share/postgresql/contrib/uninstall_fuzzystrmatch.sql
-lib/postgresql/fuzzystrmatch.so
diff --git a/databases/postgresql90-monitoring/Makefile b/databases/postgresql90-monitoring/Makefile
index fdd05139178..3cc6344236b 100644
--- a/databases/postgresql90-monitoring/Makefile
+++ b/databases/postgresql90-monitoring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/02/09 08:48:18 adam Exp $
+# $NetBSD: Makefile,v 1.5 2011/04/22 08:10:24 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-monitoring-/}
 COMMENT=	PostgreSQL monitoring tools
@@ -9,8 +9,6 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 BUILD_MAKE_FLAGS=	PGXS=1
 
 BUILD_DIRS+=		contrib/auto_explain
diff --git a/databases/postgresql90-pgcrypto/Makefile b/databases/postgresql90-pgcrypto/Makefile
index da4015163a4..80bdb8594a3 100644
--- a/databases/postgresql90-pgcrypto/Makefile
+++ b/databases/postgresql90-pgcrypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/09 08:48:18 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/22 08:10:24 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-pgcrypto-/}
 COMMENT=	Module providing cryptographic functions for PostgreSQL
@@ -9,8 +9,6 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 CONFIGURE_ARGS+=	--with-zlib
 BUILD_MAKE_FLAGS=	PGXS=1
 
diff --git a/databases/postgresql90-plperl/Makefile b/databases/postgresql90-plperl/Makefile
index aa97bfb9cde..25d92621053 100644
--- a/databases/postgresql90-plperl/Makefile
+++ b/databases/postgresql90-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/09 08:48:19 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/22 08:10:24 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-plperl-/}
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
@@ -9,8 +9,6 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 USE_TOOLS+=		perl
 PERL5_CONFIGURE=	no
 CONFIGURE_ARGS+=	--with-perl
diff --git a/databases/postgresql90-plpython/Makefile b/databases/postgresql90-plpython/Makefile
index 8d0b64e554b..97caa81177e 100644
--- a/databases/postgresql90-plpython/Makefile
+++ b/databases/postgresql90-plpython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/09 08:48:19 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/22 08:10:24 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-plpython-/}
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
@@ -9,13 +9,11 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ENV+=		PYTHON="${PYTHONBIN}"
+BUILD_MAKE_FLAGS=	PGXS=1
 
 BUILD_DIRS=		src/pl/plpython
-BUILD_MAKE_FLAGS=	PGXS=1
 
 .include "../../databases/postgresql90-client/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/databases/postgresql90-pltcl/Makefile b/databases/postgresql90-pltcl/Makefile
index 8432f416514..ef4247934af 100644
--- a/databases/postgresql90-pltcl/Makefile
+++ b/databases/postgresql90-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/09 08:48:19 adam Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/22 08:10:24 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-pltcl-/}
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
@@ -9,8 +9,6 @@ DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-
 
 .include "../../databases/postgresql90/Makefile.common"
 
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 CONFIGURE_ARGS+=	--with-tcl
 CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 9f932e6c4b9..07915a269c7 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/02/09 08:48:19 adam Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/22 08:10:24 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-server-/}
 COMMENT=	PostgreSQL database server programs
@@ -10,10 +10,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../../databases/postgresql90/Makefile.common"
 
-# Use shlibtool (invoked as "$(LIBTOOL)") to build modules.
-#USE_LIBTOOL=		yes
-#PKG_LIBTOOL=		${PKG_SHLIBTOOL}
-
 CONFIGURE_ARGS+=	--with-openssl
 
 INSTALL_DIRS=	src/backend
diff --git a/databases/postgresql90-server/PLIST b/databases/postgresql90-server/PLIST
index 7fc667e1a46..3a1d1ee0e4a 100644
--- a/databases/postgresql90-server/PLIST
+++ b/databases/postgresql90-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/02/09 08:48:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/22 08:10:24 adam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.so
@@ -216,6 +216,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Mazatlan
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mendoza
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Menominee
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Merida
+${PG_SUBPREFIX}share/postgresql/timezone/America/Metlakatla
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mexico_City
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Miquelon
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Moncton
@@ -228,6 +229,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/New_York
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Nipigon
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Nome
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Noronha
+${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/Beulah
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/Center
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/New_Salem
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Ojinaga
@@ -254,6 +256,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Santo_Domingo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Sao_Paulo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Scoresbysund
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Shiprock
+${PG_SUBPREFIX}share/postgresql/timezone/America/Sitka
 ${PG_SUBPREFIX}share/postgresql/timezone/America/St_Barthelemy
 ${PG_SUBPREFIX}share/postgresql/timezone/America/St_Johns
 ${PG_SUBPREFIX}share/postgresql/timezone/America/St_Kitts
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index 1568a696297..15d1e5c0a53 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2011/02/16 06:35:30 manu Exp $
+# $NetBSD: Makefile.common,v 1.11 2011/04/22 08:10:23 adam Exp $
 #
 # used by databases/postgresql90-adminpack/Makefile
 # used by databases/postgresql90-client/Makefile
@@ -23,13 +23,14 @@
 
 .include "../../databases/postgresql90/Makefile.mirrors"
 
-DISTNAME=	postgresql-9.0.3
+DISTNAME=	postgresql-9.0.4
 CATEGORIES=	databases
 MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	adam@NetBSD.org
 HOMEPAGE=	http://www.postgresql.org/
+LICENSE=	postgresql-license
 
 CONFLICTS+=	postgresql-[0-9]*
 CONFLICTS+=	postgresql[0-8][0-9]-*
diff --git a/databases/postgresql90/distinfo b/databases/postgresql90/distinfo
index 153fea618a5..69f8dd6dc60 100644
--- a/databases/postgresql90/distinfo
+++ b/databases/postgresql90/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/02/28 07:40:56 adam Exp $
+$NetBSD: distinfo,v 1.6 2011/04/22 08:10:23 adam Exp $
 
-SHA1 (postgresql-9.0.3.tar.bz2) = ea7b4729427f668cbf36184efbc58fd828a2d3ab
-RMD160 (postgresql-9.0.3.tar.bz2) = 9f5e0584018265282a75be8597fb7ac51ccaa23a
-Size (postgresql-9.0.3.tar.bz2) = 14040705 bytes
+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 (patch-aa) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-ab) = 6adfc53e325abe69582f1c7971f56144c697e9c1
 SHA1 (patch-ac) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5