Update postgresql80-related packages to 8.0.4. On updating from any

previous 8.0.x release, no dump-and-restore is necessary.  Changes
from version 8.0.3 include:

postgresql80-client:
     - Clarify comment for pgsql-hier-query option to note that it is
       considered buggy by PostgreSQL developers.
     * Make psql -f filename return a nonzero exit code when opening the
       file fails
     * Change pg_dump to handle inherited check constraints more reliably

postgresql80-server:
     * Fix error that allowed "VACUUM" to remove ctid chains too soon, and
       add more checking in code that follows ctid links
       This fixes a long-standing problem that could cause crashes in very
       rare circumstances.
     * Fix CHAR() to properly pad spaces to the specified length when
       using a multiple-byte character set (Yoshiyuki Asaba)
       In prior releases, the padding of CHAR() was incorrect because it
       only padded to the specified number of bytes without considering
       how many characters were stored.
     * Force a checkpoint before committing "CREATE DATABASE"
       This should fix recent reports of "index is not a btree" failures
       when a crash occurs shortly after "CREATE DATABASE".
     * Fix the sense of the test for read-only transaction in "COPY"
       The code formerly prohibited "COPY TO", where it should prohibit
       "COPY FROM".
     * Handle consecutive embedded newlines in "COPY" CSV-mode input
     * Fix date_trunc(week) for dates near year end
     * Fix planning problem with outer-join ON clauses that reference only
       the inner-side relation
     * Further fixes for x FULL JOIN y ON true corner cases
     * Fix overenthusiastic optimization of x IN (SELECT DISTINCT ...) and
       related cases
     * Fix mis-planning of queries with small LIMIT values due to poorly
       thought out "fuzzy" cost comparison
     * Make array_in and array_recv more paranoid about validating their
       OID parameter
     * Fix missing rows in queries like UPDATE a=... WHERE a... with GiST
       index on column a
     * Improve robustness of datetime parsing
     * Improve checking for partially-written WAL pages
     * Improve robustness of signal handling when SSL is enabled
     * Improve MIPS and M68K spinlock code
     * Don't try to open more than max_files_per_process files during
       postmaster startup
     * Various memory leakage fixes
     * Various portability improvements
     * Update timezone data files
     * Fix PL/PgSQL to handle var := var correctly when the variable is of
       pass-by-reference type

postgresql80-plperl:
     * Fix PL/Perl %_SHARED so it's actually shared

9 files changed, 23 insertions, 22 deletions

diff --git a/databases/postgresql80-client/Makefile b/databases/postgresql80-client/Makefile
index 1a29581b91d..2a900c689ab 100644
--- a/databases/postgresql80-client/Makefile
+++ b/databases/postgresql80-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2005/10/10 23:29:00 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2005/10/23 20:16:52 jlam Exp $
 
 PKGNAME=	postgresql80-client-${BASE_VERS}
-PKGREVISION=	3
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql80/Makefile.common"
@@ -16,7 +15,7 @@ CONFLICTS+=	postgresql80-lib-*
 CONFLICTS+=	postgresql80-docs-*
 
 # The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
-# NetBSD or DragonFly.
+# NetBSD (missing strerror_r) or DragonFly.
 #
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
 PGSQL_THREAD_SAFETY?=	no
diff --git a/databases/postgresql80-client/PLIST b/databases/postgresql80-client/PLIST
index 24191aba870..f4089e29fb3 100644
--- a/databases/postgresql80-client/PLIST
+++ b/databases/postgresql80-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2005/10/10 16:46:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/10/23 20:16:52 jlam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -556,6 +556,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/FAQ_QNX4
 ${PG_SUBPREFIX}share/doc/postgresql/FAQ_SCO
 ${PG_SUBPREFIX}share/doc/postgresql/FAQ_Solaris
 ${PG_SUBPREFIX}share/doc/postgresql/FAQ_brazilian
+${PG_SUBPREFIX}share/doc/postgresql/FAQ_chinese
 ${PG_SUBPREFIX}share/doc/postgresql/FAQ_czech
 ${PG_SUBPREFIX}share/doc/postgresql/FAQ_farsi
 ${PG_SUBPREFIX}share/doc/postgresql/FAQ_french
@@ -949,6 +950,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-8.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-10.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-11.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-2.html
@@ -958,9 +960,11 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-5.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-8.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-2.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql80-plperl/Makefile b/databases/postgresql80-plperl/Makefile
index 8c17fca80a9..3d0337b7148 100644
--- a/databases/postgresql80-plperl/Makefile
+++ b/databases/postgresql80-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2005/09/19 05:52:18 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/10/23 20:16:52 jlam Exp $
 
 PKGNAME=	postgresql80-plperl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql80-server>=${BASE_VERS}:../../databases/postgresql80-server
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index ddc5ffbd3af..926ac28dc72 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2005/10/10 23:29:00 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2005/10/23 20:16:52 jlam Exp $
 
 PKGNAME=	postgresql80-server-${BASE_VERS}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database server programs
 
 # mips has no TAS implementation
diff --git a/databases/postgresql80-server/PLIST b/databases/postgresql80-server/PLIST
index 9c00889c4af..d58a4c5a55a 100644
--- a/databases/postgresql80-server/PLIST
+++ b/databases/postgresql80-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2005/08/05 19:43:45 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/10/23 20:16:52 jlam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -146,6 +146,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Cayenne
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Cayman
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Chicago
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Chihuahua
+${PG_SUBPREFIX}share/postgresql/timezone/America/Coral_Harbour
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Cordoba
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Costa_Rica
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Cuiaba
@@ -363,6 +364,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/Australia/Adelaide
 ${PG_SUBPREFIX}share/postgresql/timezone/Australia/Brisbane
 ${PG_SUBPREFIX}share/postgresql/timezone/Australia/Broken_Hill
 ${PG_SUBPREFIX}share/postgresql/timezone/Australia/Canberra
+${PG_SUBPREFIX}share/postgresql/timezone/Australia/Currie
 ${PG_SUBPREFIX}share/postgresql/timezone/Australia/Darwin
 ${PG_SUBPREFIX}share/postgresql/timezone/Australia/Hobart
 ${PG_SUBPREFIX}share/postgresql/timezone/Australia/LHI
diff --git a/databases/postgresql80/Makefile b/databases/postgresql80/Makefile
index 17df7b1652c..e07bf07ee9a 100644
--- a/databases/postgresql80/Makefile
+++ b/databases/postgresql80/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2005/08/05 19:43:44 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/10/23 20:16:52 jlam Exp $
 
 PKGNAME=	postgresql80-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql80-client>=${BASE_VERS}nb2:../../databases/postgresql80-client
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 90c60be4838..6feb32a75aa 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/08/08 23:19:26 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/10/23 20:16:52 jlam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -32,7 +32,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql80/patches
 #
 # Note: Do not forget jdbc-postgresql when updating version
 #
-DIST_VERS?=		8.0.3
+DIST_VERS?=		8.0.4
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_DEPENDS.postgresql80-client+=	postgresql80-client>=${BASE_VERS}
diff --git a/databases/postgresql80/distinfo b/databases/postgresql80/distinfo
index 9574e69cba6..494b0756319 100644
--- a/databases/postgresql80/distinfo
+++ b/databases/postgresql80/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.9 2005/10/10 16:46:02 joerg Exp $
+$NetBSD: distinfo,v 1.10 2005/10/23 20:16:52 jlam Exp $
 
-SHA1 (postgresql-8.0.3.tar.bz2) = 45f9a739e414e617d1e5f43779046546ee1a0d3a
-RMD160 (postgresql-8.0.3.tar.bz2) = 62e6a28c0041a3f0d456efe1e985f03778e4bdfa
-Size (postgresql-8.0.3.tar.bz2) = 11069624 bytes
-SHA1 (hier-Pg8.0.3-0.5.5.diff.gz) = d054398f7d9c899dbeb033168ed84f4edbed0f1e
-RMD160 (hier-Pg8.0.3-0.5.5.diff.gz) = d43083bf10e58941fe546e38f6b453fe28d98721
-Size (hier-Pg8.0.3-0.5.5.diff.gz) = 30555 bytes
+SHA1 (postgresql-8.0.4.tar.bz2) = 19a83cc4bb61880c6078f1507cd876d582498220
+RMD160 (postgresql-8.0.4.tar.bz2) = 04d00f77a5139c654eb4d90cc4ee2a515ee1a15d
+Size (postgresql-8.0.4.tar.bz2) = 11102847 bytes
 SHA1 (patch-aa) = d681a5b2bb4dfce4e3db1490b97fed1b99ff445f
 SHA1 (patch-ab) = 1a80710d13723f2c8130d8235bb40c43af9d9ccd
 SHA1 (patch-ac) = 092d96fe2baafe8eef731b45a85d33fc40584044
diff --git a/databases/postgresql80/options.mk b/databases/postgresql80/options.mk
index 698a5096144..498b2a404a9 100644
--- a/databases/postgresql80/options.mk
+++ b/databases/postgresql80/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2005/10/23 20:16:52 jlam Exp $
 
 PKG_SUPPORTED_OPTIONS+=		pgsql-hier-query
 
@@ -14,7 +14,9 @@ CONFIGURE_ARGS+=        --with-pam
 
 ###
 ### Support for hierarchical queries with Oracle-like CONNECT BY syntax.
-### See http://gppl.moonbone.ru/README.html for details.
+### See http://gppl.moonbone.ru/README.html for details.  Note that use of
+### this patch is discouraged by PostgreSQL developers because it is
+### considered somewhat buggy and incomplete.
 ###
 .if !empty(PKG_OPTIONS:Mpgsql-hier-query)
 PATCH_SITES=		http://gppl.moonbone.ru/