Upgrade PostgreSQL to the latest version 8.4.0.

Initial diff (for rc and beta) from simon@

ok mbalmer@, simon@
commitski jasper@

BE CAREFULL: it's a major upgrade !
You MUST dump/restore all your data for this upgrade.

databases/postgresql/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.120 2009/03/18 14:34:10 pea Exp $
+# $OpenBSD: Makefile,v 1.121 2009/07/21 19:43:45 pea Exp $
 
 COMMENT-main=	PostgreSQL RDBMS (client)
 COMMENT-server=	PostgreSQL RDBMS (server)
 COMMENT-docs=	PostgreSQL RDBMS documentation
 COMMENT-contrib=PostgreSQL RDBMS contributions
 
-VERSION=	8.3.7
+VERSION=	8.4.0
 DISTNAME=	postgresql-${VERSION}
 PKGNAME-main=	postgresql-client-${VERSION}
 PKGNAME-server=	postgresql-server-${VERSION}
@@ -13,10 +13,10 @@ PKGNAME-docs=	postgresql-docs-${VERSION}
 PKGNAME-contrib=postgresql-contrib-${VERSION}
 
 CATEGORIES=	databases
-SHARED_LIBS=	ecpg		7.0 \
+SHARED_LIBS=	ecpg		7.1 \
-		ecpg_compat	4.0 \
+		ecpg_compat	4.1 \
-		pgtypes		4.0 \
+		pgtypes		4.1 \
-		pq		5.1
+		pq		5.2
 
 HOMEPAGE=	http://www.postgresql.org/
 
@@ -57,7 +57,7 @@ CONFIGURE_ARGS=	--disable-rpath --with-openssl=/usr \
 		--enable-integer-datetimes \
 		--includedir="${PREFIX}/include/postgresql" \
 		--datadir="${PREFIX}/share/postgresql" \
-		--with-docdir="${PREFIX}/share/doc/postgresql" \
+		--docdir="${PREFIX}/share/doc/postgresql" \
 		--with-includes="${INCLUDES}" \
 		--with-libraries="${LOCALBASE}/lib" \
 		--with-openssl \
@@ -121,7 +121,7 @@ NO_REGRESS=	Yes
 DOCS=	${WRKSRC}/COPYRIGHT ${WRKSRC}/HISTORY \
 	${WRKSRC}/INSTALL ${WRKSRC}/README \
 	${WRKSRC}/doc/README.mb.big5 ${WRKSRC}/doc/README.mb.jp \
-	${WRKSRC}/doc/FAQ ${WRKSRC}/doc/FAQ_DEV ${WRKSRC}/doc/TODO
+	${WRKSRC}/doc/TODO
 
 post-build:
 	cd ${WRKBUILD}/contrib && exec ${SETENV} ${MAKE_ENV} \

databases/postgresql/distinfo

@@ -1,5 +1,5 @@
-MD5 (postgresql-8.3.7.tar.gz) = bjbztN0nrgw1I3bqn4Q94g==
+MD5 (postgresql-8.4.0.tar.gz) = A9WFvPRMcN+UqbVC5rdrlQ==
-RMD160 (postgresql-8.3.7.tar.gz) = giNm0YBlKKoCqV+ML1WmzOLtMkY=
+RMD160 (postgresql-8.4.0.tar.gz) = w3rA++HWbvZM5wqv44D4q6fXY0U=
-SHA1 (postgresql-8.3.7.tar.gz) = FkmeggthWu+L2PeBEVQ00MJW98g=
+SHA1 (postgresql-8.4.0.tar.gz) = zhfdoqUUUtJ/d/ezAEkAV7XRWRY=
-SHA256 (postgresql-8.3.7.tar.gz) = O767S2AHRAmJvciL3nP2A0xTrNpwDriKxddJpHks0k8=
+SHA256 (postgresql-8.4.0.tar.gz) = g1j0ReYn1z1ZdVD+7DPd+T5dDMuwPi5LD4tubsgm97k=
-SIZE (postgresql-8.3.7.tar.gz) = 17613234
+SIZE (postgresql-8.4.0.tar.gz) = 17113839

databases/postgresql/patches/patch-configure

@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.7 2008/07/18 06:57:30 brad Exp $
---- configure.orig	Sun Jun  8 20:38:40 2008
-+++ configure	Sun Jul  6 22:32:09 2008
-@@ -7107,7 +7107,7 @@ fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_com_err" = no; then
--  for ac_lib in krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' com_err; do
-+  for ac_lib in krb5 'krb5 -lcrypto -ldes -lasn1 -lroken' 'com_err -lssl -lcrypto' ; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */

databases/postgresql/patches/patch-src_Makefile_shlib

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_shlib,v 1.6 2006/05/24 11:18:29 bernd Exp $
+$OpenBSD: patch-src_Makefile_shlib,v 1.7 2009/07/21 19:43:45 pea Exp $
---- src/Makefile.shlib.orig	Sat Dec  3 21:16:39 2005
+--- src/Makefile.shlib.orig	Mon Jan  5 10:27:19 2009
-+++ src/Makefile.shlib	Wed May 24 11:01:21 2006
++++ src/Makefile.shlib	Sun May 31 11:58:20 2009
-@@ -119,7 +119,7 @@ endif
+@@ -154,7 +154,7 @@ ifeq ($(PORTNAME), openbsd)
- 
- ifeq ($(PORTNAME), openbsd)
    ifdef ELF_SYSTEM
--    LINK.shared		= $(COMPILER) -shared -Wl,-x,-soname,$(soname)
+     LINK.shared		= $(COMPILER) -shared
-+    LINK.shared		= $(COMPILER) -shared -Wl,-x
+     ifdef soname
+-      LINK.shared	+= -Wl,-x,-soname,$(soname)
++      LINK.shared	+= -Wl,-x
+     endif
      SHLIB_LINK		+= -lc
    else
-     LINK.shared		= $(LD) -x -Bshareable -Bforcearchive

databases/postgresql/patches/patch-src_interfaces_ecpg_compatlib_Makefile

@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_interfaces_ecpg_compatlib_Makefile,v 1.3 2008/03/24 17:26:12 simon Exp $
+$OpenBSD: patch-src_interfaces_ecpg_compatlib_Makefile,v 1.4 2009/07/21 19:43:45 pea Exp $
---- src/interfaces/ecpg/compatlib/Makefile.orig	Fri Oct  5 03:51:40 2007
+--- src/interfaces/ecpg/compatlib/Makefile.orig	Thu Jan  1 18:24:02 2009
-+++ src/interfaces/ecpg/compatlib/Makefile	Tue Nov 27 15:37:12 2007
++++ src/interfaces/ecpg/compatlib/Makefile	Sun May 31 11:59:15 2009
 @@ -14,8 +14,8 @@ top_builddir = ../../../..
  include $(top_builddir)/src/Makefile.global
  
  NAME= ecpg_compat
 -SO_MAJOR_VERSION= 3
--SO_MINOR_VERSION= 0
+-SO_MINOR_VERSION= 1
 +SO_MAJOR_VERSION= ${LIBecpg_compat_MAJOR}
 +SO_MINOR_VERSION= ${LIBecpg_compat_MINOR}
- DLTYPE= library
  
  override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
+ 	-I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS)

databases/postgresql/patches/patch-src_interfaces_ecpg_ecpglib_Makefile

@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_interfaces_ecpg_ecpglib_Makefile,v 1.3 2008/03/24 17:26:12 simon Exp $
+$OpenBSD: patch-src_interfaces_ecpg_ecpglib_Makefile,v 1.4 2009/07/21 19:43:45 pea Exp $
---- src/interfaces/ecpg/ecpglib/Makefile.orig	Fri Oct  5 03:51:40 2007
+--- src/interfaces/ecpg/ecpglib/Makefile.orig	Sat Feb  7 18:17:34 2009
-+++ src/interfaces/ecpg/ecpglib/Makefile	Tue Nov 27 15:38:02 2007
++++ src/interfaces/ecpg/ecpglib/Makefile	Sun May 31 11:59:50 2009
 @@ -14,8 +14,8 @@ top_builddir = ../../../..
  include $(top_builddir)/src/Makefile.global
  
  NAME= ecpg
 -SO_MAJOR_VERSION= 6
--SO_MINOR_VERSION= 0
+-SO_MINOR_VERSION= 1
 +SO_MAJOR_VERSION= ${LIBecpg_MAJOR}
 +SO_MINOR_VERSION= ${LIBecpg_MINOR}
- DLTYPE= library
  
  override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
+ 	-I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)

databases/postgresql/patches/patch-src_interfaces_ecpg_pgtypeslib_Makefile

@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_interfaces_ecpg_pgtypeslib_Makefile,v 1.4 2008/03/24 17:26:12 simon Exp $
+$OpenBSD: patch-src_interfaces_ecpg_pgtypeslib_Makefile,v 1.5 2009/07/21 19:43:45 pea Exp $
---- src/interfaces/ecpg/pgtypeslib/Makefile.orig	Fri Oct  5 03:51:40 2007
+--- src/interfaces/ecpg/pgtypeslib/Makefile.orig	Thu Jan  1 18:24:02 2009
-+++ src/interfaces/ecpg/pgtypeslib/Makefile	Tue Nov 27 15:38:30 2007
++++ src/interfaces/ecpg/pgtypeslib/Makefile	Sun May 31 12:00:20 2009
 @@ -14,8 +14,8 @@ top_builddir = ../../../..
  include $(top_builddir)/src/Makefile.global
  
  NAME= pgtypes
 -SO_MAJOR_VERSION= 3
--SO_MINOR_VERSION= 0
+-SO_MINOR_VERSION= 1
 +SO_MAJOR_VERSION= ${LIBpgtypes_MAJOR}
 +SO_MINOR_VERSION= ${LIBpgtypes_MINOR}
- DLTYPE= library
  
  override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
+ 	-I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS)

databases/postgresql/patches/patch-src_interfaces_libpq_Makefile

@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_interfaces_libpq_Makefile,v 1.5 2008/07/18 06:57:30 brad Exp $
+$OpenBSD: patch-src_interfaces_libpq_Makefile,v 1.6 2009/07/21 19:43:45 pea Exp $
---- src/interfaces/libpq/Makefile.orig	Wed Apr 16 10:21:22 2008
+--- src/interfaces/libpq/Makefile.orig	Mon Jan  5 10:27:19 2009
-+++ src/interfaces/libpq/Makefile	Sun Jul  6 22:32:09 2008
++++ src/interfaces/libpq/Makefile	Sun May 31 12:00:52 2009
 @@ -16,8 +16,8 @@ include $(top_builddir)/src/Makefile.global
  
  # shared library parameters
  NAME= pq
 -SO_MAJOR_VERSION= 5
--SO_MINOR_VERSION= 1
+-SO_MINOR_VERSION= 2
 +SO_MAJOR_VERSION= ${LIBpq_MAJOR}
 +SO_MINOR_VERSION= ${LIBpq_MINOR}
- DLTYPE= library
  
- override CPPFLAGS :=  -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
+ override CPPFLAGS :=  -DFRONTEND -DUNSAFE_STAT_OK -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port -I$(top_srcdir)/src/port
+ ifneq ($(PORTNAME), win32)

databases/postgresql/pkg/PLIST-contrib

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-contrib,v 1.4 2008/07/18 06:57:30 brad Exp $
+@comment $OpenBSD: PLIST-contrib,v 1.5 2009/07/21 19:43:45 pea Exp $
 @conflict postgresql-uuid-*
 @pkgpath devel/uuid,-pgsql
 @bin bin/oid2name
@@ -6,22 +6,25 @@
 @bin bin/vacuumlo
 lib/postgresql/_int.so
 lib/postgresql/adminpack.so
+lib/postgresql/auto_explain.so
 lib/postgresql/autoinc.so
+lib/postgresql/btree_gin.so
 lib/postgresql/btree_gist.so
 lib/postgresql/chkpass.so
+lib/postgresql/citext.so
 lib/postgresql/cube.so
 lib/postgresql/dblink.so
 lib/postgresql/earthdistance.so
 lib/postgresql/fuzzystrmatch.so
 lib/postgresql/hstore.so
 lib/postgresql/insert_username.so
-lib/postgresql/int_aggregate.so
 lib/postgresql/isn.so
 lib/postgresql/lo.so
 lib/postgresql/ltree.so
 lib/postgresql/moddatetime.so
 lib/postgresql/pg_buffercache.so
 lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_stat_statements.so
 lib/postgresql/pg_trgm.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgrowlocks.so
@@ -38,8 +41,10 @@ share/postgresql/contrib/
 share/postgresql/contrib/_int.sql
 share/postgresql/contrib/adminpack.sql
 share/postgresql/contrib/autoinc.sql
+share/postgresql/contrib/btree_gin.sql
 share/postgresql/contrib/btree_gist.sql
 share/postgresql/contrib/chkpass.sql
+share/postgresql/contrib/citext.sql
 share/postgresql/contrib/cube.sql
 share/postgresql/contrib/dblink.sql
 share/postgresql/contrib/dict_int.sql
@@ -56,6 +61,7 @@ share/postgresql/contrib/moddatetime.sql
 share/postgresql/contrib/pageinspect.sql
 share/postgresql/contrib/pg_buffercache.sql
 share/postgresql/contrib/pg_freespacemap.sql
+share/postgresql/contrib/pg_stat_statements.sql
 share/postgresql/contrib/pg_trgm.sql
 share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/pgrowlocks.sql
@@ -70,8 +76,10 @@ share/postgresql/contrib/timetravel.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/uninstall__int.sql
 share/postgresql/contrib/uninstall_adminpack.sql
+share/postgresql/contrib/uninstall_btree_gin.sql
 share/postgresql/contrib/uninstall_btree_gist.sql
 share/postgresql/contrib/uninstall_chkpass.sql
+share/postgresql/contrib/uninstall_citext.sql
 share/postgresql/contrib/uninstall_cube.sql
 share/postgresql/contrib/uninstall_dblink.sql
 share/postgresql/contrib/uninstall_dict_int.sql
@@ -86,6 +94,7 @@ share/postgresql/contrib/uninstall_ltree.sql
 share/postgresql/contrib/uninstall_pageinspect.sql
 share/postgresql/contrib/uninstall_pg_buffercache.sql
 share/postgresql/contrib/uninstall_pg_freespacemap.sql
+share/postgresql/contrib/uninstall_pg_stat_statements.sql
 share/postgresql/contrib/uninstall_pg_trgm.sql
 share/postgresql/contrib/uninstall_pgcrypto.sql
 share/postgresql/contrib/uninstall_pgrowlocks.sql

databases/postgresql/pkg/PLIST-docs

@@ -1,7 +1,5 @@
-@comment $OpenBSD: PLIST-docs,v 1.40 2009/03/18 14:34:10 pea Exp $
+@comment $OpenBSD: PLIST-docs,v 1.41 2009/07/21 19:43:45 pea Exp $
 share/doc/postgresql/COPYRIGHT
-share/doc/postgresql/FAQ
-share/doc/postgresql/FAQ_DEV
 share/doc/postgresql/HISTORY
 share/doc/postgresql/INSTALL
 share/doc/postgresql/README
@@ -29,7 +27,6 @@ share/doc/postgresql/html/app-droplang.html
 share/doc/postgresql/html/app-dropuser.html
 share/doc/postgresql/html/app-ecpg.html
 share/doc/postgresql/html/app-initdb.html
-share/doc/postgresql/html/app-ipcclean.html
 share/doc/postgresql/html/app-pg-ctl.html
 share/doc/postgresql/html/app-pg-dumpall.html
 share/doc/postgresql/html/app-pgconfig.html
@@ -47,6 +44,8 @@ share/doc/postgresql/html/applevel-consistency.html
 share/doc/postgresql/html/arrays.html
 share/doc/postgresql/html/auth-methods.html
 share/doc/postgresql/html/auth-pg-hba-conf.html
+share/doc/postgresql/html/auth-username-maps.html
+share/doc/postgresql/html/auto-explain.html
 share/doc/postgresql/html/backup-dump.html
 share/doc/postgresql/html/backup-file.html
 share/doc/postgresql/html/backup.html
@@ -57,6 +56,7 @@ share/doc/postgresql/html/bki-format.html
 share/doc/postgresql/html/bki-structure.html
 share/doc/postgresql/html/bki.html
 share/doc/postgresql/html/bookindex.html
+share/doc/postgresql/html/btree-gin.html
 share/doc/postgresql/html/btree-gist.html
 share/doc/postgresql/html/bug-reporting.html
 share/doc/postgresql/html/catalog-pg-aggregate.html
@@ -67,7 +67,6 @@ share/doc/postgresql/html/catalog-pg-attrdef.html
 share/doc/postgresql/html/catalog-pg-attribute.html
 share/doc/postgresql/html/catalog-pg-auth-members.html
 share/doc/postgresql/html/catalog-pg-authid.html
-share/doc/postgresql/html/catalog-pg-autovacuum.html
 share/doc/postgresql/html/catalog-pg-cast.html
 share/doc/postgresql/html/catalog-pg-class.html
 share/doc/postgresql/html/catalog-pg-constraint.html
@@ -76,6 +75,8 @@ share/doc/postgresql/html/catalog-pg-database.html
 share/doc/postgresql/html/catalog-pg-depend.html
 share/doc/postgresql/html/catalog-pg-description.html
 share/doc/postgresql/html/catalog-pg-enum.html
+share/doc/postgresql/html/catalog-pg-foreign-data-wrapper.html
+share/doc/postgresql/html/catalog-pg-foreign-server.html
 share/doc/postgresql/html/catalog-pg-index.html
 share/doc/postgresql/html/catalog-pg-inherits.html
 share/doc/postgresql/html/catalog-pg-language.html
@@ -99,10 +100,12 @@ share/doc/postgresql/html/catalog-pg-ts-dict.html
 share/doc/postgresql/html/catalog-pg-ts-parser.html
 share/doc/postgresql/html/catalog-pg-ts-template.html
 share/doc/postgresql/html/catalog-pg-type.html
+share/doc/postgresql/html/catalog-pg-user-mapping.html
 share/doc/postgresql/html/catalogs-overview.html
 share/doc/postgresql/html/catalogs.html
 share/doc/postgresql/html/charset.html
 share/doc/postgresql/html/chkpass.html
+share/doc/postgresql/html/citext.html
 share/doc/postgresql/html/client-authentication-problems.html
 share/doc/postgresql/html/client-authentication.html
 share/doc/postgresql/html/client-interfaces.html
@@ -116,7 +119,6 @@ share/doc/postgresql/html/contrib-dblink-cancel-query.html
 share/doc/postgresql/html/contrib-dblink-close.html
 share/doc/postgresql/html/contrib-dblink-connect-u.html
 share/doc/postgresql/html/contrib-dblink-connect.html
-share/doc/postgresql/html/contrib-dblink-current-query.html
 share/doc/postgresql/html/contrib-dblink-disconnect.html
 share/doc/postgresql/html/contrib-dblink-error-message.html
 share/doc/postgresql/html/contrib-dblink-exec.html
@@ -241,6 +243,8 @@ share/doc/postgresql/html/functions-srf.html
 share/doc/postgresql/html/functions-string.html
 share/doc/postgresql/html/functions-subquery.html
 share/doc/postgresql/html/functions-textsearch.html
+share/doc/postgresql/html/functions-trigger.html
+share/doc/postgresql/html/functions-window.html
 share/doc/postgresql/html/functions-xml.html
 share/doc/postgresql/html/functions.html
 share/doc/postgresql/html/fuzzystrmatch.html
@@ -303,6 +307,10 @@ share/doc/postgresql/html/infoschema-domain-udt-usage.html
 share/doc/postgresql/html/infoschema-domains.html
 share/doc/postgresql/html/infoschema-element-types.html
 share/doc/postgresql/html/infoschema-enabled-roles.html
+share/doc/postgresql/html/infoschema-foreign-data-wrapper-options.html
+share/doc/postgresql/html/infoschema-foreign-data-wrappers.html
+share/doc/postgresql/html/infoschema-foreign-server-options.html
+share/doc/postgresql/html/infoschema-foreign-servers.html
 share/doc/postgresql/html/infoschema-information-schema-catalog-name.html
 share/doc/postgresql/html/infoschema-key-column-usage.html
 share/doc/postgresql/html/infoschema-parameters.html
@@ -328,6 +336,8 @@ share/doc/postgresql/html/infoschema-table-privileges.html
 share/doc/postgresql/html/infoschema-tables.html
 share/doc/postgresql/html/infoschema-triggers.html
 share/doc/postgresql/html/infoschema-usage-privileges.html
+share/doc/postgresql/html/infoschema-user-mapping-options.html
+share/doc/postgresql/html/infoschema-user-mappings.html
 share/doc/postgresql/html/infoschema-view-column-usage.html
 share/doc/postgresql/html/infoschema-view-routine-usage.html
 share/doc/postgresql/html/infoschema-view-table-usage.html
@@ -341,6 +351,7 @@ share/doc/postgresql/html/install-upgrading.html
 share/doc/postgresql/html/install-win32-full.html
 share/doc/postgresql/html/install-win32-libpq.html
 share/doc/postgresql/html/install-win32.html
+share/doc/postgresql/html/installation-platform-notes.html
 share/doc/postgresql/html/installation.html
 share/doc/postgresql/html/intagg.html
 share/doc/postgresql/html/intarray.html
@@ -356,6 +367,7 @@ share/doc/postgresql/html/libpq-connect.html
 share/doc/postgresql/html/libpq-control.html
 share/doc/postgresql/html/libpq-copy.html
 share/doc/postgresql/html/libpq-envars.html
+share/doc/postgresql/html/libpq-events.html
 share/doc/postgresql/html/libpq-example.html
 share/doc/postgresql/html/libpq-exec.html
 share/doc/postgresql/html/libpq-fastpath.html
@@ -411,6 +423,7 @@ share/doc/postgresql/html/pgcrypto.html
 share/doc/postgresql/html/pgfreespacemap.html
 share/doc/postgresql/html/pgrowlocks.html
 share/doc/postgresql/html/pgstandby.html
+share/doc/postgresql/html/pgstatstatements.html
 share/doc/postgresql/html/pgstattuple.html
 share/doc/postgresql/html/pgtrgm.html
 share/doc/postgresql/html/planner-optimizer.html
@@ -470,12 +483,14 @@ share/doc/postgresql/html/queries-select-lists.html
 share/doc/postgresql/html/queries-table-expressions.html
 share/doc/postgresql/html/queries-union.html
 share/doc/postgresql/html/queries-values.html
+share/doc/postgresql/html/queries-with.html
 share/doc/postgresql/html/queries.html
 share/doc/postgresql/html/query-path.html
 share/doc/postgresql/html/querytree.html
 share/doc/postgresql/html/reference-client.html
 share/doc/postgresql/html/reference-server.html
 share/doc/postgresql/html/reference.html
+share/doc/postgresql/html/regress-coverage.html
 share/doc/postgresql/html/regress-evaluation.html
 share/doc/postgresql/html/regress-run.html
 share/doc/postgresql/html/regress-variant.html
@@ -629,6 +644,7 @@ share/doc/postgresql/html/release-8-3-5.html
 share/doc/postgresql/html/release-8-3-6.html
 share/doc/postgresql/html/release-8-3-7.html
 share/doc/postgresql/html/release-8-3.html
+share/doc/postgresql/html/release-8-4.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/resources.html
 share/doc/postgresql/html/role-attributes.html
@@ -679,10 +695,12 @@ share/doc/postgresql/html/spi-spi-cursor-close.html
 share/doc/postgresql/html/spi-spi-cursor-fetch.html
 share/doc/postgresql/html/spi-spi-cursor-find.html
 share/doc/postgresql/html/spi-spi-cursor-move.html
+share/doc/postgresql/html/spi-spi-cursor-open-with-args.html
 share/doc/postgresql/html/spi-spi-cursor-open.html
 share/doc/postgresql/html/spi-spi-exec.html
 share/doc/postgresql/html/spi-spi-execp.html
 share/doc/postgresql/html/spi-spi-execute-plan.html
+share/doc/postgresql/html/spi-spi-execute-with-args.html
 share/doc/postgresql/html/spi-spi-execute.html
 share/doc/postgresql/html/spi-spi-finish.html
 share/doc/postgresql/html/spi-spi-fname.html
@@ -717,6 +735,7 @@ share/doc/postgresql/html/sql-alteraggregate.html
 share/doc/postgresql/html/sql-alterconversion.html
 share/doc/postgresql/html/sql-alterdatabase.html
 share/doc/postgresql/html/sql-alterdomain.html
+share/doc/postgresql/html/sql-alterforeigndatawrapper.html
 share/doc/postgresql/html/sql-alterfunction.html
 share/doc/postgresql/html/sql-altergroup.html
 share/doc/postgresql/html/sql-alterindex.html
@@ -727,6 +746,7 @@ share/doc/postgresql/html/sql-alteropfamily.html
 share/doc/postgresql/html/sql-alterrole.html
 share/doc/postgresql/html/sql-alterschema.html
 share/doc/postgresql/html/sql-altersequence.html
+share/doc/postgresql/html/sql-alterserver.html
 share/doc/postgresql/html/sql-altertable.html
 share/doc/postgresql/html/sql-altertablespace.html
 share/doc/postgresql/html/sql-altertrigger.html
@@ -736,6 +756,7 @@ share/doc/postgresql/html/sql-altertsparser.html
 share/doc/postgresql/html/sql-altertstemplate.html
 share/doc/postgresql/html/sql-altertype.html
 share/doc/postgresql/html/sql-alteruser.html
+share/doc/postgresql/html/sql-alterusermapping.html
 share/doc/postgresql/html/sql-alterview.html
 share/doc/postgresql/html/sql-analyze.html
 share/doc/postgresql/html/sql-begin.html
@@ -753,6 +774,7 @@ share/doc/postgresql/html/sql-createconstraint.html
 share/doc/postgresql/html/sql-createconversion.html
 share/doc/postgresql/html/sql-createdatabase.html
 share/doc/postgresql/html/sql-createdomain.html
+share/doc/postgresql/html/sql-createforeigndatawrapper.html
 share/doc/postgresql/html/sql-createfunction.html
 share/doc/postgresql/html/sql-creategroup.html
 share/doc/postgresql/html/sql-createindex.html
@@ -764,6 +786,7 @@ share/doc/postgresql/html/sql-createrole.html
 share/doc/postgresql/html/sql-createrule.html
 share/doc/postgresql/html/sql-createschema.html
 share/doc/postgresql/html/sql-createsequence.html
+share/doc/postgresql/html/sql-createserver.html
 share/doc/postgresql/html/sql-createtable.html
 share/doc/postgresql/html/sql-createtableas.html
 share/doc/postgresql/html/sql-createtablespace.html
@@ -774,6 +797,7 @@ share/doc/postgresql/html/sql-createtsparser.html
 share/doc/postgresql/html/sql-createtstemplate.html
 share/doc/postgresql/html/sql-createtype.html
 share/doc/postgresql/html/sql-createuser.html
+share/doc/postgresql/html/sql-createusermapping.html
 share/doc/postgresql/html/sql-createview.html
 share/doc/postgresql/html/sql-deallocate.html
 share/doc/postgresql/html/sql-declare.html
@@ -785,6 +809,7 @@ share/doc/postgresql/html/sql-dropcast.html
 share/doc/postgresql/html/sql-dropconversion.html
 share/doc/postgresql/html/sql-dropdatabase.html
 share/doc/postgresql/html/sql-dropdomain.html
+share/doc/postgresql/html/sql-dropforeigndatawrapper.html
 share/doc/postgresql/html/sql-dropfunction.html
 share/doc/postgresql/html/sql-dropgroup.html
 share/doc/postgresql/html/sql-dropindex.html
@@ -796,6 +821,7 @@ share/doc/postgresql/html/sql-droprole.html
 share/doc/postgresql/html/sql-droprule.html
 share/doc/postgresql/html/sql-dropschema.html
 share/doc/postgresql/html/sql-dropsequence.html
+share/doc/postgresql/html/sql-dropserver.html
 share/doc/postgresql/html/sql-droptable.html
 share/doc/postgresql/html/sql-droptablespace.html
 share/doc/postgresql/html/sql-droptrigger.html
@@ -805,6 +831,7 @@ share/doc/postgresql/html/sql-droptsparser.html
 share/doc/postgresql/html/sql-droptstemplate.html
 share/doc/postgresql/html/sql-droptype.html
 share/doc/postgresql/html/sql-dropuser.html
+share/doc/postgresql/html/sql-dropusermapping.html
 share/doc/postgresql/html/sql-dropview.html
 share/doc/postgresql/html/sql-end.html
 share/doc/postgresql/html/sql-execute.html
@@ -851,8 +878,10 @@ share/doc/postgresql/html/ssh-tunnels.html
 share/doc/postgresql/html/ssl-tcp.html
 share/doc/postgresql/html/sslinfo.html
 share/doc/postgresql/html/storage-file-layout.html
+share/doc/postgresql/html/storage-fsm.html
 share/doc/postgresql/html/storage-page-layout.html
 share/doc/postgresql/html/storage-toast.html
+share/doc/postgresql/html/storage-vm.html
 share/doc/postgresql/html/storage.html
 share/doc/postgresql/html/stylesheet.css
 share/doc/postgresql/html/supported-platforms.html
@@ -900,6 +929,7 @@ share/doc/postgresql/html/tutorial-table.html
 share/doc/postgresql/html/tutorial-transactions.html
 share/doc/postgresql/html/tutorial-update.html
 share/doc/postgresql/html/tutorial-views.html
+share/doc/postgresql/html/tutorial-window.html
 share/doc/postgresql/html/tutorial.html
 share/doc/postgresql/html/typeconv-func.html
 share/doc/postgresql/html/typeconv-oper.html
@@ -926,6 +956,7 @@ share/doc/postgresql/html/view-pg-stats.html
 share/doc/postgresql/html/view-pg-tables.html
 share/doc/postgresql/html/view-pg-timezone-abbrevs.html
 share/doc/postgresql/html/view-pg-timezone-names.html
+share/doc/postgresql/html/view-pg-user-mappings.html
 share/doc/postgresql/html/view-pg-user.html
 share/doc/postgresql/html/view-pg-views.html
 share/doc/postgresql/html/views-overview.html

databases/postgresql/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.13 2009/02/07 16:56:32 pea Exp $
+@comment $OpenBSD: PLIST-main,v 1.14 2009/07/21 19:43:45 pea Exp $
 @conflict pgsql-*
 @conflict pgsql-clients-*
 @conflict postgresql-*
@@ -39,6 +39,7 @@ include/postgresql/internal/port.h
 include/postgresql/internal/postgres_fe.h
 include/postgresql/internal/pqexpbuffer.h
 include/postgresql/libpq/
+include/postgresql/libpq-events.h
 include/postgresql/libpq-fe.h
 include/postgresql/libpq/libpq-fs.h
 include/postgresql/pg_config.h
@@ -104,6 +105,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/alter_conversion.7
 @man man/man7/alter_database.7
 @man man/man7/alter_domain.7
+@man man/man7/alter_foreign_data_wrapper.7
 @man man/man7/alter_function.7
 @man man/man7/alter_group.7
 @man man/man7/alter_index.7
@@ -114,6 +116,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/alter_role.7
 @man man/man7/alter_schema.7
 @man man/man7/alter_sequence.7
+@man man/man7/alter_server.7
 @man man/man7/alter_table.7
 @man man/man7/alter_tablespace.7
 @man man/man7/alter_text_search_configuration.7
@@ -123,6 +126,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/alter_trigger.7
 @man man/man7/alter_type.7
 @man man/man7/alter_user.7
+@man man/man7/alter_user_mapping.7
 @man man/man7/alter_view.7
 @man man/man7/analyze.7
 @man man/man7/begin.7
@@ -139,6 +143,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/create_conversion.7
 @man man/man7/create_database.7
 @man man/man7/create_domain.7
+@man man/man7/create_foreign_data_wrapper.7
 @man man/man7/create_function.7
 @man man/man7/create_group.7
 @man man/man7/create_index.7
@@ -150,6 +155,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/create_rule.7
 @man man/man7/create_schema.7
 @man man/man7/create_sequence.7
+@man man/man7/create_server.7
 @man man/man7/create_table.7
 @man man/man7/create_table_as.7
 @man man/man7/create_tablespace.7
@@ -160,6 +166,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/create_trigger.7
 @man man/man7/create_type.7
 @man man/man7/create_user.7
+@man man/man7/create_user_mapping.7
 @man man/man7/create_view.7
 @man man/man7/deallocate.7
 @man man/man7/declare.7
@@ -170,6 +177,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/drop_conversion.7
 @man man/man7/drop_database.7
 @man man/man7/drop_domain.7
+@man man/man7/drop_foreign_data_wrapper.7
 @man man/man7/drop_function.7
 @man man/man7/drop_group.7
 @man man/man7/drop_index.7
@@ -182,6 +190,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/drop_rule.7
 @man man/man7/drop_schema.7
 @man man/man7/drop_sequence.7
+@man man/man7/drop_server.7
 @man man/man7/drop_table.7
 @man man/man7/drop_tablespace.7
 @man man/man7/drop_text_search_configuration.7
@@ -191,6 +200,7 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/drop_trigger.7
 @man man/man7/drop_type.7
 @man man/man7/drop_user.7
+@man man/man7/drop_user_mapping.7
 @man man/man7/drop_view.7
 @man man/man7/end.7
 @man man/man7/execute.7
@@ -223,11 +233,13 @@ lib/postgresql/pgxs/src/test/regress/
 @man man/man7/set_transaction.7
 @man man/man7/show.7
 @man man/man7/start_transaction.7
+@man man/man7/table.7
 @man man/man7/truncate.7
 @man man/man7/unlisten.7
 @man man/man7/update.7
 @man man/man7/vacuum.7
 @man man/man7/values.7
+@man man/man7/with.7
 share/postgresql/
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql

databases/postgresql/pkg/PLIST-server

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-server,v 1.15 2008/07/18 06:57:30 brad Exp $
+@comment $OpenBSD: PLIST-server,v 1.16 2009/07/21 19:43:45 pea Exp $
 @conflict pgsql-*
 @conflict pgsql-clients-*
 @conflict postgresql-clients-*
@@ -7,7 +7,6 @@
 @newgroup _postgresql:503
 @newuser _postgresql:503:_postgresql:daemon:PostgreSQL Manager:/var/postgresql:/bin/sh
 @bin bin/initdb
-bin/ipcclean
 @bin bin/pg_controldata
 @bin bin/pg_ctl
 @bin bin/pg_resetxlog
@@ -39,6 +38,7 @@ include/postgresql/server/access/sdir.h
 include/postgresql/server/access/skey.h
 include/postgresql/server/access/slru.h
 include/postgresql/server/access/subtrans.h
+include/postgresql/server/access/sysattr.h
 include/postgresql/server/access/transam.h
 include/postgresql/server/access/tupdesc.h
 include/postgresql/server/access/tupmacs.h
@@ -46,6 +46,7 @@ include/postgresql/server/access/tuptoaster.h
 include/postgresql/server/access/twophase.h
 include/postgresql/server/access/twophase_rmgr.h
 include/postgresql/server/access/valid.h
+include/postgresql/server/access/visibilitymap.h
 include/postgresql/server/access/xact.h
 include/postgresql/server/access/xlog.h
 include/postgresql/server/access/xlog_internal.h
@@ -58,6 +59,7 @@ include/postgresql/server/catalog/
 include/postgresql/server/catalog/catalog.h
 include/postgresql/server/catalog/catversion.h
 include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/genbki.h
 include/postgresql/server/catalog/heap.h
 include/postgresql/server/catalog/index.h
 include/postgresql/server/catalog/indexing.h
@@ -70,18 +72,21 @@ include/postgresql/server/catalog/pg_attrdef.h
 include/postgresql/server/catalog/pg_attribute.h
 include/postgresql/server/catalog/pg_auth_members.h
 include/postgresql/server/catalog/pg_authid.h
-include/postgresql/server/catalog/pg_autovacuum.h
 include/postgresql/server/catalog/pg_cast.h
 include/postgresql/server/catalog/pg_class.h
 include/postgresql/server/catalog/pg_constraint.h
 include/postgresql/server/catalog/pg_control.h
 include/postgresql/server/catalog/pg_conversion.h
+include/postgresql/server/catalog/pg_conversion_fn.h
 include/postgresql/server/catalog/pg_database.h
 include/postgresql/server/catalog/pg_depend.h
 include/postgresql/server/catalog/pg_description.h
 include/postgresql/server/catalog/pg_enum.h
+include/postgresql/server/catalog/pg_foreign_data_wrapper.h
+include/postgresql/server/catalog/pg_foreign_server.h
 include/postgresql/server/catalog/pg_index.h
 include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_inherits_fn.h
 include/postgresql/server/catalog/pg_language.h
 include/postgresql/server/catalog/pg_largeobject.h
 include/postgresql/server/catalog/pg_listener.h
@@ -91,6 +96,7 @@ include/postgresql/server/catalog/pg_operator.h
 include/postgresql/server/catalog/pg_opfamily.h
 include/postgresql/server/catalog/pg_pltemplate.h
 include/postgresql/server/catalog/pg_proc.h
+include/postgresql/server/catalog/pg_proc_fn.h
 include/postgresql/server/catalog/pg_rewrite.h
 include/postgresql/server/catalog/pg_shdepend.h
 include/postgresql/server/catalog/pg_shdescription.h
@@ -103,6 +109,9 @@ include/postgresql/server/catalog/pg_ts_dict.h
 include/postgresql/server/catalog/pg_ts_parser.h
 include/postgresql/server/catalog/pg_ts_template.h
 include/postgresql/server/catalog/pg_type.h
+include/postgresql/server/catalog/pg_type_fn.h
+include/postgresql/server/catalog/pg_user_mapping.h
+include/postgresql/server/catalog/storage.h
 include/postgresql/server/catalog/toasting.h
 include/postgresql/server/commands/
 include/postgresql/server/commands/alter.h
@@ -145,6 +154,7 @@ include/postgresql/server/executor/nodeBitmapAnd.h
 include/postgresql/server/executor/nodeBitmapHeapscan.h
 include/postgresql/server/executor/nodeBitmapIndexscan.h
 include/postgresql/server/executor/nodeBitmapOr.h
+include/postgresql/server/executor/nodeCtescan.h
 include/postgresql/server/executor/nodeFunctionscan.h
 include/postgresql/server/executor/nodeGroup.h
 include/postgresql/server/executor/nodeHash.h
@@ -154,6 +164,7 @@ include/postgresql/server/executor/nodeLimit.h
 include/postgresql/server/executor/nodeMaterial.h
 include/postgresql/server/executor/nodeMergejoin.h
 include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeRecursiveunion.h
 include/postgresql/server/executor/nodeResult.h
 include/postgresql/server/executor/nodeSeqscan.h
 include/postgresql/server/executor/nodeSetOp.h
@@ -163,6 +174,8 @@ include/postgresql/server/executor/nodeSubqueryscan.h
 include/postgresql/server/executor/nodeTidscan.h
 include/postgresql/server/executor/nodeUnique.h
 include/postgresql/server/executor/nodeValuesscan.h
+include/postgresql/server/executor/nodeWindowAgg.h
+include/postgresql/server/executor/nodeWorktablescan.h
 include/postgresql/server/executor/spi.h
 include/postgresql/server/executor/spi_priv.h
 include/postgresql/server/executor/tstoreReceiver.h
@@ -222,6 +235,7 @@ include/postgresql/server/optimizer/geqo_selection.h
 include/postgresql/server/optimizer/joininfo.h
 include/postgresql/server/optimizer/pathnode.h
 include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/placeholder.h
 include/postgresql/server/optimizer/plancat.h
 include/postgresql/server/optimizer/planmain.h
 include/postgresql/server/optimizer/planner.h
@@ -233,12 +247,14 @@ include/postgresql/server/optimizer/tlist.h
 include/postgresql/server/optimizer/var.h
 include/postgresql/server/parser/
 include/postgresql/server/parser/analyze.h
+include/postgresql/server/parser/gram.h
 include/postgresql/server/parser/gramparse.h
 include/postgresql/server/parser/keywords.h
-include/postgresql/server/parser/parse.h
+include/postgresql/server/parser/kwlist.h
 include/postgresql/server/parser/parse_agg.h
 include/postgresql/server/parser/parse_clause.h
 include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_cte.h
 include/postgresql/server/parser/parse_expr.h
 include/postgresql/server/parser/parse_func.h
 include/postgresql/server/parser/parse_node.h
@@ -299,6 +315,8 @@ include/postgresql/server/port/win32.h
 @comment include/postgresql/server/port/win32_msvc/sys/time.h
 @comment include/postgresql/server/port/win32_msvc/unistd.h
 @comment include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/portability/
+include/postgresql/server/portability/instr_time.h
 include/postgresql/server/postgres.h
 include/postgresql/server/postgres_ext.h
 include/postgresql/server/postgres_fe.h
@@ -369,10 +387,11 @@ include/postgresql/server/storage/bufmgr.h
 include/postgresql/server/storage/bufpage.h
 include/postgresql/server/storage/fd.h
 include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/fsm_internals.h
+include/postgresql/server/storage/indexfsm.h
 include/postgresql/server/storage/ipc.h
 include/postgresql/server/storage/item.h
 include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itempos.h
 include/postgresql/server/storage/itemptr.h
 include/postgresql/server/storage/large_object.h
 include/postgresql/server/storage/lmgr.h
@@ -447,11 +466,14 @@ include/postgresql/server/utils/pg_lzcompress.h
 include/postgresql/server/utils/pg_rusage.h
 include/postgresql/server/utils/plancache.h
 include/postgresql/server/utils/portal.h
+include/postgresql/server/utils/probes.h
 include/postgresql/server/utils/ps_status.h
 include/postgresql/server/utils/rel.h
 include/postgresql/server/utils/relcache.h
 include/postgresql/server/utils/resowner.h
 include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/snapmgr.h
+include/postgresql/server/utils/snapshot.h
 include/postgresql/server/utils/syscache.h
 include/postgresql/server/utils/timestamp.h
 include/postgresql/server/utils/tqual.h
@@ -462,6 +484,7 @@ include/postgresql/server/utils/tzparser.h
 include/postgresql/server/utils/uuid.h
 include/postgresql/server/utils/varbit.h
 include/postgresql/server/utils/xml.h
+include/postgresql/server/windowapi.h
 lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/dict_int.so
@@ -496,7 +519,6 @@ lib/postgresql/utf8_and_sjis.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 @man man/man1/initdb.1
-@man man/man1/ipcclean.1
 @man man/man1/pg_controldata.1
 @man man/man1/pg_ctl.1
 @man man/man1/pg_resetxlog.1