Changes 8.4.6:

* Force the default wal_sync_method to be fdatasync on Linux
* Fix assorted bugs in WAL replay logic for GIN indexes
* Fix recovery from base backup when the starting checkpoint WAL
  record is not in the same WAL segment as its redo point
* Fix persistent slowdown of autovacuum workers when multiple workers
  remain active for a long time
* Add support for detecting register-stack overrun on IA64
* Add a check for stack overflow in copyObject()
* Fix detection of page splits in temporary GiST indexes
* Fix error checking during early connection processing
* Improve efficiency of window functions
* Avoid memory leakage while "ANALYZE"'ing complex index expressions
* Ensure an index that uses a whole-row Var still depends on its table
* Do not "inline" a SQL function with multiple OUT parameters
* Behave correctly if ORDER BY, LIMIT, FOR UPDATE, or WITH is
  attached to the VALUES part of INSERT ... VALUES
* Fix constant-folding of COALESCE() expressions
* Fix postmaster crash when connection acceptance (accept() or one of
  the calls made immediately after it) fails, and the postmaster was
  compiled with GSSAPI support
* Fix missed unlink of temporary files when log_temp_files is active
* Add print functionality for InhRelation nodes
* Fix incorrect calculation of distance from a point to a horizontal
  line segment
* Fix incorrect calculation of transaction status in ecpg
* Fix PL/pgSQL's handling of "simple" expressions to not fail in
  recursion or error-recovery cases
* Fix PL/Python's handling of set-returning functions
* Fix bug in "contrib/cube"'s GiST picksplit algorithm
* Don't emit "identifier will be truncated" notices in
  "contrib/dblink" except when creating new connections
* Fix potential coredump on missing public key in "contrib/pgcrypto"
* Fix memory leak in "contrib/xml2"'s XPath query functions
* Update time zone data files to tzdata release 2010o for DST law
  changes in Fiji and Samoa; also historical corrections for Hong
  Kong.

6 files changed, 55 insertions, 87 deletions

diff --git a/databases/postgresql84/Makefile b/databases/postgresql84/Makefile
index d3136f07ecb..a61c49f295e 100644
--- a/databases/postgresql84/Makefile
+++ b/databases/postgresql84/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/07/29 06:26:17 adam Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/19 09:53:41 adam Exp $
 
-PKGNAME=	postgresql84-${BASE_VERS}
+PKGNAME=	${DISTNAME:C/-/84-/}
 COMMENT=	Robust, next generation, object-relational DBMS
 
-DEPENDS+=	postgresql84-client>=${BASE_VERS}:../../databases/postgresql84-client
-DEPENDS+=	postgresql84-server>=${BASE_VERS}:../../databases/postgresql84-server
+DEPENDS+=	postgresql84-client>=${PKGVERSION_NOREV}:../../databases/postgresql84-client
+DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-server
 
 META_PACKAGE=	yes
 
diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common
index ed2777b632d..c51bc713f98 100644
--- a/databases/postgresql84/Makefile.common
+++ b/databases/postgresql84/Makefile.common
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.common,v 1.9 2010/12/09 23:46:32 asau Exp $
+# $NetBSD: Makefile.common,v 1.10 2010/12/19 09:53:41 adam Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
+# used by databases/postgresql84-dblink/Makefile
+# used by databases/postgresql84-pgcrypto/Makefile
 # used by databases/postgresql84-plperl/Makefile
 # used by databases/postgresql84-plpython/Makefile
 # used by databases/postgresql84-pltcl/Makefile
@@ -12,42 +14,28 @@
 #
 # The PostgreSQL package naming scheme, aside from the obvious piecewise
 # packages, is as follows:
-#
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
 .include "../../databases/postgresql84/Makefile.mirrors"
-.include "../../databases/postgresql84/options.mk"
 
-DISTNAME?=	postgresql-${DIST_VERS}
-CATEGORIES+=	databases
-MASTER_SITES?=	${PGSQL_MIRRORS:=source/v${DIST_VERS}/}
+DISTNAME=	postgresql-8.4.6
+CATEGORIES=	databases
+MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	adam@NetBSD.org
-HOMEPAGE?=	http://www.postgresql.org/
+HOMEPAGE=	http://www.postgresql.org/
 
 CONFLICTS+=	postgresql-[0-9]*
-CONFLICTS+=	postgresql73-*
-CONFLICTS+=	postgresql74-*
-CONFLICTS+=	postgresql80-*
-CONFLICTS+=	postgresql81-*
-CONFLICTS+=	postgresql82-*
-CONFLICTS+=	postgresql83-*
+CONFLICTS+=	postgresql7[0-9]-*
+CONFLICTS+=	postgresql8[0-3]-*
+CONFLICTS+=	postgresql9[0-9]-*
 
 DISTINFO_FILE?=		${.CURDIR}/../postgresql84/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql84/files
 PATCHDIR?=		${.CURDIR}/../postgresql84/patches
 
-# Version numbering scheme:
-# DIST_VERS		version number on the postgresql distfile
-# BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
-# Note: Do not forget jdbc-postgresql84 when updating version
-DIST_VERS?=		8.4.5
-BASE_VERS?=		${DIST_VERS}
-
-BUILDLINK_API_DEPENDS.postgresql84-client+=	postgresql84-client>=${BASE_VERS}
-
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
@@ -60,41 +48,32 @@ PG_TEMPLATE.IRIX=	irix5
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
-PG_SUBPREFIX=		# empty
-.if empty(PG_SUBPREFIX)
-PG_PREFIX=		${PREFIX}
-PLIST_SUBST+=		PG_SUBPREFIX=
-.else
-PG_PREFIX=		${PREFIX}/${PG_SUBPREFIX}
-BUILD_DEFS+=		PG_SUBPREFIX
-PLIST_SUBST+=		PG_SUBPREFIX=${PG_SUBPREFIX}/
-BUILDLINK_PASSTHRU_DIRS+=	${PG_PREFIX}
-.endif
-PG_DATA_DIR=		${PG_PREFIX}/share/postgresql
-PG_DOC_DIR=		${PG_PREFIX}/share/doc/postgresql
-PG_LOCALE_DIR=		${PG_PREFIX}/${PKGLOCALEDIR}/locale
-PG_ETC_DIR=		${PKG_SYSCONFDIR:S/^${PREFIX}\//${PG_PREFIX}\//}
-
 GNU_CONFIGURE=		yes
-GNU_CONFIGURE_PREFIX=	${PG_PREFIX}
-CONFIGURE_ARGS+=	--sysconfdir=${PG_ETC_DIR}
-CONFIGURE_ARGS+=	--datadir=${PG_DATA_DIR}
-CONFIGURE_ARGS+=	--localedir=${PG_LOCALE_DIR}
-CONFIGURE_ARGS+=	--with-docdir=${PG_DOC_DIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/postgresql
 CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
-CONFIGURE_ARGS+=	--without-readline
-CONFIGURE_ARGS+=	--without-zlib
-CONFIGURE_ARGS+=	--enable-nls
 
+CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-tcl
+CONFIGURE_ARGS+=	--without-zlib
 
 # Enable Bonjour on Mac OS X
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=	--with-bonjour
 .endif
 
+# PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
+# This also limits the size of a tuple.  The valid values are powers
+# of 2 up to 32768, and the default size is 8196.  Please don't change
+# this value unless you know what you are doing.
+BUILD_DEFS+=	PGSQL_BLCKSZ
+.if defined(PGSQL_BLCKSZ)
+CONFIGURE_ARGS+=	--with-blocksize=${PGSQL_BLCKSZ}
+.endif
+
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
@@ -105,8 +84,6 @@ USE_LIBLTDL?=		yes
 .endif
 USE_LIBLTDL?=		no
 
-FILES_SUBST+=		PG_PREFIX=${PG_PREFIX:Q}
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 .if !defined(META_PACKAGE)
@@ -124,29 +101,10 @@ post-extract:
 		${WRKSRC}/src/backend/port/dynloader/dragonfly.c
 	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
 		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
-	cp ${WRKSRC}/src/include/port/freebsd.h	\
+	cp ${WRKSRC}/src/include/port/freebsd.h \
 		${WRKSRC}/src/include/port/dragonfly.h
 	cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
 		${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
 
-# PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
-# This also limits the size of a tuple.  The valid values are powers
-# of 2 up to 32768, and the default size is 8196 (hardcoded in the
-# PostgreSQL sources).  Please don't change this value unless you know
-# what you are doing.
-BUILD_DEFS+=	PGSQL_BLCKSZ
-
-.if defined(PGSQL_BLCKSZ)
-.PHONY: pgsql-blcksz
-pre-configure: pgsql-blcksz
-pgsql-blcksz:
-	for file in ${WRKSRC}/src/include/pg_config_manual.h; do	\
-		${SED} -e "/^#define[ 	]*BLCKSZ[ 	]*/s/^\(#define[ 	]*BLCKSZ\).*/\1	${PGSQL_BLCKSZ}/" $$file > $$file.new; \
-		${MV} -f $$file.new $$file;				\
-	done
-.endif
-
-
-# Help to generate PLIST
-PRINT_PLIST_AWK+=	{$$0 = "$${PG_SUBPREFIX}" $$0;}
+.include "../../databases/postgresql84/options.mk"
diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo
index 00123b30ef6..a56877e18d9 100644
--- a/databases/postgresql84/distinfo
+++ b/databases/postgresql84/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2010/10/07 15:53:22 adam Exp $
+$NetBSD: distinfo,v 1.8 2010/12/19 09:53:41 adam Exp $
 
-SHA1 (postgresql-8.4.5.tar.bz2) = 6e6213c3a93b86c2a6eda1e76fd73881e48af09b
-RMD160 (postgresql-8.4.5.tar.bz2) = 5dc9b2a894c4b09af5a83a98527ebd5dff9a52b3
-Size (postgresql-8.4.5.tar.bz2) = 14114152 bytes
+SHA1 (postgresql-8.4.6.tar.bz2) = 17cef72e99cea533caab28a463a082b523a423f7
+RMD160 (postgresql-8.4.6.tar.bz2) = 62b21be252c532d62e6096a5e8280e3728c8f504
+Size (postgresql-8.4.6.tar.bz2) = 14130201 bytes
 SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
 SHA1 (patch-ab) = 3cf9c7f0f812d2e41681281538c3f707cec232c3
 SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
@@ -11,5 +11,5 @@ SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
 SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
 SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
-SHA1 (patch-an) = a1e7f421a101cf9ccddcaf3ce17aa1847cf76310
-SHA1 (patch-ao) = 81e2ecb62e78e7f5103314db03b7cbb367ee9f10
+SHA1 (patch-an) = 62fd4c0f9594381f85ce84954e88efc9048b7cb9
+SHA1 (patch-ao) = 045a25457da09aff30ac93f1c299064c9f6079a8
diff --git a/databases/postgresql84/options.mk b/databases/postgresql84/options.mk
index a15127173b0..3d1c0c1ab10 100644
--- a/databases/postgresql84/options.mk
+++ b/databases/postgresql84/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2010/11/03 14:36:40 adam Exp $
+# $NetBSD: options.mk,v 1.5 2010/12/19 09:53:41 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql84
-PKG_SUPPORTED_OPTIONS=	gssapi krb5 ldap pam
+PKG_SUPPORTED_OPTIONS=	gssapi kerberos ldap pam xml
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--with-gssapi
 ###
 ### Kerberos5 authentication for the PostgreSQL backend.
 ###
-.if !empty(PKG_OPTIONS:Mkrb5)
+.if !empty(PKG_OPTIONS:Mkerberos)
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-krb5
 .endif
@@ -35,3 +35,11 @@ CONFIGURE_ARGS+=	--with-ldap
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
+
+###
+### XML support for the PostgreSQL backend.
+###
+.if !empty(PKG_OPTIONS:Mxml)
+.  include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libxml
+.endif
diff --git a/databases/postgresql84/patches/patch-an b/databases/postgresql84/patches/patch-an
index 062eb0fb3f9..67f712d6ab1 100644
--- a/databases/postgresql84/patches/patch-an
+++ b/databases/postgresql84/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1.1.1 2009/07/29 06:26:19 adam Exp $
+$NetBSD: patch-an,v 1.2 2010/12/19 09:53:41 adam Exp $
 
---- src/interfaces/ecpg/test/Makefile.regress.orig	2007-01-21 10:19:06.000000000 +0100
+--- src/interfaces/ecpg/test/Makefile.regress.orig	2010-12-14 02:59:19.000000000 +0000
 +++ src/interfaces/ecpg/test/Makefile.regress
-@@ -8,7 +8,7 @@ override LIBS := -lecpg -lpgtypes $(filt
- ECPG = ../../preproc/ecpg --regression -I$(srcdir)/../../include
+@@ -9,7 +9,7 @@ ECPG = ../../preproc/ecpg --regression -
  
  %: %.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
-+	${LIBTOOL} --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $*.o $(LDFLAGS) $(LIBS) -o $@
++	${LIBTOOL} --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $*.o $(LDFLAGS) $(LIBS) -o $@
  
  %.c: %.pgc ../regression.h
  	$(ECPG) -o $@ -I$(srcdir) $<
diff --git a/databases/postgresql84/patches/patch-ao b/databases/postgresql84/patches/patch-ao
index 516f58e0d1a..65176422e58 100644
--- a/databases/postgresql84/patches/patch-ao
+++ b/databases/postgresql84/patches/patch-ao
@@ -1,3 +1,5 @@
+$NetBSD: patch-ao,v 1.2 2010/12/19 09:53:41 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 @@