Changes 9.0.2:

* Force the default wal_sync_method to be fdatasync on Linux
* Fix "too many KnownAssignedXids" error during Hot Standby replay
* Fix race condition in lock acquisition during Hot Standby
* Avoid unnecessary conflicts during Hot Standby
* 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 corner-case bug when streaming replication is enabled
  immediately after creating the master database cluster
* Fix persistent slowdown of autovacuum workers when multiple workers
  remain active for a long time
* Fix long-term memory leak in autovacuum launcher
* Avoid failure when trying to report an impending transaction
  wraparound condition from outside a transaction
* 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
* Add missing support in "DROP OWNED BY" for removing foreign data
  wrapper/server privileges belonging to a user
* Do not "inline" a SQL function with multiple OUT parameters
* Fix crash when inline-ing a set-returning function whose argument
  list contains a reference to an inline-able user function
* Behave correctly if ORDER BY, LIMIT, FOR UPDATE, or WITH is
  attached to the VALUES part of INSERT ... VALUES
* Make the OFF keyword unreserved
  This prevents problems with using off as a variable name in
  PL/pgSQL. That worked before 9.0, but was now broken because
  PL/pgSQL now treats all core reserved words as reserved.
* Fix constant-folding of COALESCE() expressions

6 files changed, 62 insertions, 89 deletions

diff --git a/databases/postgresql90/Makefile b/databases/postgresql90/Makefile
index c4b01a000a3..6e8a479e37f 100644
--- a/databases/postgresql90/Makefile
+++ b/databases/postgresql90/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/09/21 07:50:46 adam Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/19 09:53:26 adam Exp $
 
-PKGNAME=	postgresql90-${BASE_VERS}
+PKGNAME=	${DISTNAME:C/-/90-/}
 COMMENT=	Robust, next generation, object-relational DBMS
 
-DEPENDS+=	postgresql90-client>=${BASE_VERS}:../../databases/postgresql90-client
-DEPENDS+=	postgresql90-docs>=${BASE_VERS}:../../databases/postgresql90-docs
-DEPENDS+=	postgresql90-server>=${BASE_VERS}:../../databases/postgresql90-server
+DEPENDS+=	postgresql90-client>=${PKGVERSION_NOREV}:../../databases/postgresql90-client
+DEPENDS+=	postgresql90-docs>=${PKGVERSION_NOREV}:../../databases/postgresql90-docs
+DEPENDS+=	postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90-server
 
 META_PACKAGE=	yes
 
diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common
index 2161f2a0a20..a631019b0f3 100644
--- a/databases/postgresql90/Makefile.common
+++ b/databases/postgresql90/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2010/12/09 23:46:32 asau Exp $
+# $NetBSD: Makefile.common,v 1.5 2010/12/19 09:53:27 adam Exp $
 #
 # used by databases/postgresql90-adminpack/Makefile
 # used by databases/postgresql90-client/Makefile
+# used by databases/postgresql90-datatypes/Makefile
 # used by databases/postgresql90-dblink/Makefile
 # used by databases/postgresql90-docs/Makefile
 # used by databases/postgresql90-pgcrypto/Makefile
@@ -9,49 +10,33 @@
 # used by databases/postgresql90-plpython/Makefile
 # used by databases/postgresql90-pltcl/Makefile
 # used by databases/postgresql90-server/Makefile
+# used by databases/postgresql90-upgrade/Makefile
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
 #
 # 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/postgresql90/Makefile.mirrors"
-.include "../../databases/postgresql90/options.mk"
 
-DISTNAME?=	postgresql-${DIST_VERS}
-CATEGORIES+=	databases
-MASTER_SITES?=	${PGSQL_MIRRORS:=source/v${DIST_VERS}/}
+DISTNAME=	postgresql-9.0.2
+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+=	postgresql84-*
+CONFLICTS+=	postgresql[0-8][0-9]-*
 
 DISTINFO_FILE?=		${.CURDIR}/../postgresql90/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql90/files
 PATCHDIR?=		${.CURDIR}/../postgresql90/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-postgresql90 when updating version
-DIST_VERS?=		9.0.1
-BASE_VERS?=		${DIST_VERS}
-
-BUILDLINK_API_DEPENDS.postgresql90-client+=	postgresql90-client>=${BASE_VERS}
-
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
@@ -64,41 +49,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
 
@@ -109,8 +85,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)
@@ -128,29 +102,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/postgresql90/options.mk"
diff --git a/databases/postgresql90/distinfo b/databases/postgresql90/distinfo
index 69facb69d4b..6f421a4430b 100644
--- a/databases/postgresql90/distinfo
+++ b/databases/postgresql90/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.2 2010/10/07 15:53:54 adam Exp $
+$NetBSD: distinfo,v 1.3 2010/12/19 09:53:27 adam Exp $
 
-SHA1 (postgresql-9.0.1.tar.bz2) = 7adeb3c4b661115ec6eb4e5896edfee71f87245e
-RMD160 (postgresql-9.0.1.tar.bz2) = 5e4b31d9ff075099671ced015ac0272ae1c04543
-Size (postgresql-9.0.1.tar.bz2) = 13773951 bytes
+SHA1 (postgresql-9.0.2.tar.bz2) = 42a9518a2f11fa1d09a23bc628b00e992d3bcf4a
+RMD160 (postgresql-9.0.2.tar.bz2) = 3313b4bafe3af6282f68f198da7d50af4d5c01c4
+Size (postgresql-9.0.2.tar.bz2) = 14024244 bytes
 SHA1 (patch-aa) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-ab) = 6adfc53e325abe69582f1c7971f56144c697e9c1
 SHA1 (patch-ac) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
 SHA1 (patch-ad) = 64b24d389470ddb980b7a2bdb95e59a599812dfd
+SHA1 (patch-ae) = 1e6343aa520caa19a98b9e0b8c202d6e645ad3bc
 SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
 SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
 SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
-SHA1 (patch-an) = 787689c3b35ce94c5186eec47240c2b9545f72a1
+SHA1 (patch-an) = 0279365bc54ac2854a9b533cab93db481fd6f7df
 SHA1 (patch-ao) = 4d7c40d107d4c13c63ef2908d9a02be319863657
diff --git a/databases/postgresql90/options.mk b/databases/postgresql90/options.mk
index 2e8b08707c1..1a42d82ae1e 100644
--- a/databases/postgresql90/options.mk
+++ b/databases/postgresql90/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2010/12/11 16:16:37 asau Exp $
+# $NetBSD: options.mk,v 1.4 2010/12/19 09:53:27 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql90
-PKG_SUPPORTED_OPTIONS=	gssapi krb5 ldap pam xml
+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
@@ -41,5 +41,5 @@ CONFIGURE_ARGS+=	--with-pam
 ###
 .if !empty(PKG_OPTIONS:Mxml)
 .  include "../../textproc/libxml2/buildlink3.mk"
-CONFIGURE_ARGS+=        --with-libxml
+CONFIGURE_ARGS+=	--with-libxml
 .endif
diff --git a/databases/postgresql90/patches/patch-ae b/databases/postgresql90/patches/patch-ae
new file mode 100644
index 00000000000..945bd98f230
--- /dev/null
+++ b/databases/postgresql90/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1 2010/12/19 09:53:27 adam Exp $
+
+--- src/makefiles/Makefile.darwin.orig	2010-12-17 18:28:46.000000000 +0000
++++ src/makefiles/Makefile.darwin
+@@ -2,11 +2,7 @@ AROPT = crs
+  
+ DLSUFFIX = .so
+ 
+-ifdef PGXS
+-  BE_DLLLIBS = -bundle_loader $(bindir)/postgres
+-else
+-  BE_DLLLIBS = -bundle_loader $(top_builddir)/src/backend/postgres
+-endif
++BE_DLLLIBS = -bundle_loader $(bindir)/postgres
+ 
+ # Rule for building a shared library from a single .o file
+ %.so: %.o
diff --git a/databases/postgresql90/patches/patch-an b/databases/postgresql90/patches/patch-an
index 82b09d223f1..902c36da53f 100644
--- a/databases/postgresql90/patches/patch-an
+++ b/databases/postgresql90/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1.1.1 2010/09/21 07:50:46 adam Exp $
+$NetBSD: patch-an,v 1.2 2010/12/19 09:53:27 adam Exp $
 
---- src/interfaces/ecpg/test/Makefile.regress.orig	2010-07-05 18:54:38.000000000 +0000
+--- src/interfaces/ecpg/test/Makefile.regress.orig	2010-12-14 02:55:50.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) $(LDFLAGS_EX) $(LIBS) -o $@
-+	${LIBTOOL} --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $*.o $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
++	${LIBTOOL} --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $*.o $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
  
  %.c: %.pgc ../regression.h
  	$(ECPG) -o $@ -I$(srcdir) $<