Welcome PostgreSQL 8.4

After many years of development, PostgreSQL has become feature-complete in many areas. This release shows a targeted approach to adding features (e.g., authentication, monitoring, space reuse), and adds capabilities defined in the later SQL standards. The major areas of enhancement are: Windowing Functions Common Table Expressions and Recursive Queries Default and variadic parameters for functions Parallel Restore Column Permissions Per-database locale settings Improved hash indexes Improved join performance for EXISTS and NOT EXISTS queries Easier-to-use Warm Standby Automatic sizing of the Free Space Map Visibility Map (greatly reduces vacuum overhead for slowly-changing tables) Version-aware psql (backslash commands work against older servers) Support SSL certificates for user authentication Per-function runtime statistics Easy editing of functions in psql New contrib modules: pg_stat_statements, auto_explain, citext, btree_gin URL: http://www.postgresql.org/docs/8.4/interactive/release-8-4.html
author: Palle Girgensohn <girgen@FreeBSD.org> 2009-07-07 22:30:06 +0000
committer: Palle Girgensohn <girgen@FreeBSD.org> 2009-07-07 22:30:06 +0000
commit: 00c3beec3943b166c0dd223e40358d5062439fa7 (patch)
tree: 6381d335b55d645f8866bcdb498a7de8ee1ead34 /databases
parent: - Flip MAKE_JOBS_SAFE to MAKE_JOBS_UNSAFE (diff)
30 files changed, 315 insertions, 217 deletions
diff --git a/databases/postgresql-contrib/Makefile b/databases/postgresql-contrib/Makefile
index 1a3c06c9c3b9..4596b0870fdd 100644
--- a/databases/postgresql-contrib/Makefile
+++ b/databases/postgresql-contrib/Makefile
@@ -38,6 +38,12 @@ INSTALL_DIRS=	contrib
 SLAVE_ONLY=	yes
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
+.if ${PGSQL_VER} > 83
+CONFIGURE_ARGS+=	--with-libxslt --with-libxml --with-ossp-uuid
+LIB_DEPENDS=		xslt.2:${PORTSDIR}/textproc/libxslt xml2.5:${PORTSDIR}/textproc/libxml2
+BUILD_DEPENDS=		${LOCALBASE}/bin/uuid-config:${PORTSDIR}/misc/ossp-uuid
+.endif
+
 post-install:
 .if ${PGSQL_VER} < 81
 	@- ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ipc_check/ipc_check.pl ${PREFIX}/bin/ipc_check ;\
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
index 81c722be9442..cb5a77b6b5cb 100644
--- a/databases/postgresql83-client/Makefile
+++ b/databases/postgresql83-client/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	-client
 
 COMMENT=	PostgreSQL database (client)
 
-MASTERDIR=	${.CURDIR}/../postgresql83-server
+MASTERDIR=	${.CURDIR}/../postgresql84-server
 
 BUILD_DIRS=	config src/include src/interfaces \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 44bd36ce8ffd..2c51fe52bbbf 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.7
+DISTVERSION?=	8.4.0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -17,13 +17,13 @@ COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
-		${PORTNAME}-client-8.[0-24-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.[0-24-9]*
+		${PORTNAME}-client-8.[0-35-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8.[0-35-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
-UNIQUENAME?=	${PORTNAME}83
+UNIQUENAME?=	${PORTNAME}84
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
@@ -40,8 +40,7 @@ PGGROUP=	pgsql
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
-		--enable-thread-safety \
-		--with-docdir=${DOCSDIR}
+		--enable-thread-safety
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -52,7 +51,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/bin/initdb src/bin/ipcclean src/bin/pg_ctl \
+		src/backend/snowball src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
@@ -96,19 +95,19 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+#OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS=	autoconf:262
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
-PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
-.  endif
+#.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+#USE_AUTOTOOLS=	autoconf:262
+#CONFIGURE_ARGS+=--with-icu
+#LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
+#PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
+#PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
+#.  endif
 
 PATCH_DIST_STRIP=-p1
 
@@ -188,13 +187,13 @@ CONFIGURE_ARGS+=--with-krb5
 .if defined(CLIENT_ONLY)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
-		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
-		alter_domain.7 alter_function.7 alter_group.7		      \
-		alter_index.7 alter_language.7 alter_operator_class.7	      \
+		alter_domain.7 alter_foreign_data_wrapper.7 alter_function.7 alter_group.7 alter_server.7 \
+		alter_user_mapping.7		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_operator_family.7 				      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
@@ -207,29 +206,30 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
-		create_database.7 create_domain.7 create_function.7	      \
+		create_database.7 create_domain.7 create_foreign_data_wrapper.7 \
+		create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_operator_family.7 create_role.7			      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
-		create_table.7 create_table_as.7			      \
+		create_server.7 create_table.7 create_table_as.7			      \
 		create_text_search_configuration.7			      \
 		create_text_search_dictionary.7				      \
 		create_text_search_parser.7				      \
 		create_text_search_template.7 create_trigger.7		      \
-		create_type.7 create_user.7 create_view.7 deallocate.7	      \
+		create_type.7 create_user.7 create_user_mapping.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7 discard.7				      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
-		drop_database.7 drop_domain.7 drop_function.7		      \
+		drop_database.7 drop_domain.7 drop_foreign_data_wrapper.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_operator_family.7  \
 		drop_owned.7 drop_role.7 drop_rule.7			      \
-		drop_schema.7 drop_sequence.7 drop_table.7		      \
+		drop_schema.7 drop_sequence.7 drop_server.7 drop_table.7		      \
 		drop_text_search_configuration.7			      \
 		drop_text_search_dictionary.7				      \
 		drop_text_search_parser.7				      \
 		drop_text_search_template.7 drop_trigger.7		      \
-		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
+		drop_type.7 drop_user.7 drop_user_mapping.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
@@ -237,11 +237,11 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
-		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		table.7 truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
-		savepoint.7 values.7
+		savepoint.7 values.7 with.7
 .endif
 
 .if defined(SERVER_ONLY)
@@ -259,8 +259,7 @@ pre-configure:
 .  endif
 
 do-build:
-	@ cd ${WRKSRC}/src/backend ;\
-	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
+	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index f94a2324bff6..8ced8f4d765e 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,6 +1,3 @@
-MD5 (postgresql/postgresql-8.3.7.tar.bz2) = 7b7e91a2221e55fe1b167e663217a96d
-SHA256 (postgresql/postgresql-8.3.7.tar.bz2) = eee00caf1860646f6c03b4266f2b2b7936e469b3305bd63b80b7b663c0ae1661
-SIZE (postgresql/postgresql-8.3.7.tar.bz2) = 14124712
-MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
-SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
-SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
+MD5 (postgresql/postgresql-8.4.0.tar.bz2) = 1f172d5f60326e972837f58fa5acd130
+SHA256 (postgresql/postgresql-8.4.0.tar.bz2) = 84bf53b4a45db4fdf875bb03bf247f29dcb97f8bda42839b00b73671df05e007
+SIZE (postgresql/postgresql-8.4.0.tar.bz2) = 13839282
diff --git a/databases/postgresql84-server/files/patch-doc-Makefile b/databases/postgresql84-server/files/patch-doc-Makefile
index 805b541b438a..8e08132e175b 100644
--- a/databases/postgresql84-server/files/patch-doc-Makefile
+++ b/databases/postgresql84-server/files/patch-doc-Makefile
@@ -1,20 +1,16 @@
---- doc/Makefile.orig	2007-02-09 16:55:57.000000000 +0100
-+++ doc/Makefile	2008-01-02 11:38:43.000000000 +0100
-@@ -25,11 +25,12 @@
+--- doc/Makefile.orig	2009-05-15 15:58:05.000000000 +0200
++++ doc/Makefile	2009-05-15 15:58:18.000000000 +0200
+@@ -25,9 +25,10 @@
  
  .NOTPARALLEL:
  
 -ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
--ifneq (,$(docdir))
 -found_html = yes
 -endif
--endif
 +# FreeBSD has a separate port for installing the documentation
 +#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
-+#ifneq (,$(docdir))
 +#found_html = yes
 +#endif
-+#endif
  
  ifneq ($(wildcard $(srcdir)/man.tar.gz),)
  # SCO OpenServer's man system is sufficiently different to not bother.
diff --git a/databases/postgresql84-server/files/patch-src-makefiles-Makefile.freebsd b/databases/postgresql84-server/files/patch-src-makefiles-Makefile.freebsd
deleted file mode 100644
index 81339e98e8db..000000000000
--- a/databases/postgresql84-server/files/patch-src-makefiles-Makefile.freebsd
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
-+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
-@@ -29,3 +29,5 @@
- endif
- 
- sqlmansect = 7
-+
-+allow_nonpic_in_shlib = yes
diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client
index c219ef4dff82..62ea592ed3ac 100644
--- a/databases/postgresql84-server/pkg-plist-client
+++ b/databases/postgresql84-server/pkg-plist-client
@@ -14,6 +14,7 @@ bin/psql
 bin/reindexdb
 bin/vacuumdb
 include/ecpg_config.h
+include/libpq-events.h
 include/postgresql/server/access/attnum.h
 include/postgresql/server/access/clog.h
 include/postgresql/server/access/genam.h
@@ -37,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
@@ -44,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
@@ -54,6 +57,7 @@ include/postgresql/server/c.h
 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
@@ -66,18 +70,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
@@ -87,6 +94,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
@@ -99,6 +107,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/alter.h
 include/postgresql/server/commands/async.h
@@ -139,6 +150,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
@@ -148,6 +160,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
@@ -157,6 +170,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
@@ -211,6 +226,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
@@ -221,12 +237,14 @@ include/postgresql/server/optimizer/subselect.h
 include/postgresql/server/optimizer/tlist.h
 include/postgresql/server/optimizer/var.h
 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
@@ -280,6 +298,7 @@ include/postgresql/server/port/win32_msvc/sys/param.h
 include/postgresql/server/port/win32_msvc/sys/time.h
 include/postgresql/server/port/win32_msvc/unistd.h
 include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/portability/instr_time.h
 include/postgresql/server/postgres.h
 include/postgresql/server/postgres_ext.h
 include/postgresql/server/postgres_fe.h
@@ -344,10 +363,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
@@ -418,11 +438,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
@@ -433,6 +456,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
 @dirrm include/postgresql/server/utils
 @dirrm include/postgresql/server/tsearch/dicts
 @dirrm include/postgresql/server/tsearch
@@ -443,6 +467,7 @@ include/postgresql/server/utils/xml.h
 @dirrm include/postgresql/server/rewrite
 @dirrm include/postgresql/server/regex
 @dirrm include/postgresql/server/postmaster
+@dirrm include/postgresql/server/portability
 @dirrm include/postgresql/server/port/win32_msvc/sys
 @dirrm include/postgresql/server/port/win32_msvc
 @dirrm include/postgresql/server/port/win32/sys
diff --git a/databases/postgresql84-server/pkg-plist-contrib b/databases/postgresql84-server/pkg-plist-contrib
index 304ec2a3f455..7113bf1de734 100644
--- a/databases/postgresql84-server/pkg-plist-contrib
+++ b/databases/postgresql84-server/pkg-plist-contrib
@@ -4,9 +4,12 @@ bin/pgbench
 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/dict_int.so
@@ -15,7 +18,6 @@ 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
@@ -23,10 +25,12 @@ lib/postgresql/moddatetime.so
 lib/postgresql/pageinspect.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
 lib/postgresql/pgstattuple.so
+lib/postgresql/pgxml.so
 lib/postgresql/refint.so
 lib/postgresql/seg.so
 lib/postgresql/sslinfo.so
@@ -34,6 +38,7 @@ lib/postgresql/tablefunc.so
 lib/postgresql/test_parser.so
 lib/postgresql/timetravel.so
 lib/postgresql/tsearch2.so
+lib/postgresql/uuid-ossp.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/autoinc.example
@@ -44,8 +49,10 @@ lib/postgresql/tsearch2.so
 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
@@ -62,10 +69,12 @@ 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
 share/postgresql/contrib/pgstattuple.sql
+share/postgresql/contrib/pgxml.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/seg.sql
 share/postgresql/contrib/sslinfo.sql
@@ -75,8 +84,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
@@ -91,15 +102,19 @@ 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
 share/postgresql/contrib/uninstall_pgstattuple.sql
+share/postgresql/contrib/uninstall_pgxml.sql
 share/postgresql/contrib/uninstall_seg.sql
 share/postgresql/contrib/uninstall_sslinfo.sql
 share/postgresql/contrib/uninstall_tablefunc.sql
 share/postgresql/contrib/uninstall_test_parser.sql
 share/postgresql/contrib/uninstall_tsearch2.sql
+share/postgresql/contrib/uninstall_uuid-ossp.sql
+share/postgresql/contrib/uuid-ossp.sql
 share/postgresql/tsearch_data/xsyn_sample.rules
 @dirrmtry share/postgresql/tsearch_data >&2
 @dirrmtry share/postgresql/contrib >&2
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index acd1ed72f94d..8f0e58501154 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -1,5 +1,4 @@
 bin/initdb
-bin/ipcclean
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_resetxlog
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 44bd36ce8ffd..2c51fe52bbbf 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.7
+DISTVERSION?=	8.4.0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -17,13 +17,13 @@ COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
-		${PORTNAME}-client-8.[0-24-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.[0-24-9]*
+		${PORTNAME}-client-8.[0-35-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8.[0-35-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
-UNIQUENAME?=	${PORTNAME}83
+UNIQUENAME?=	${PORTNAME}84
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
@@ -40,8 +40,7 @@ PGGROUP=	pgsql
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
-		--enable-thread-safety \
-		--with-docdir=${DOCSDIR}
+		--enable-thread-safety
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -52,7 +51,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/bin/initdb src/bin/ipcclean src/bin/pg_ctl \
+		src/backend/snowball src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
@@ -96,19 +95,19 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+#OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS=	autoconf:262
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
-PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
-.  endif
+#.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+#USE_AUTOTOOLS=	autoconf:262
+#CONFIGURE_ARGS+=--with-icu
+#LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
+#PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
+#PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
+#.  endif
 
 PATCH_DIST_STRIP=-p1
 
@@ -188,13 +187,13 @@ CONFIGURE_ARGS+=--with-krb5
 .if defined(CLIENT_ONLY)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
-		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
-		alter_domain.7 alter_function.7 alter_group.7		      \
-		alter_index.7 alter_language.7 alter_operator_class.7	      \
+		alter_domain.7 alter_foreign_data_wrapper.7 alter_function.7 alter_group.7 alter_server.7 \
+		alter_user_mapping.7		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_operator_family.7 				      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
@@ -207,29 +206,30 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
-		create_database.7 create_domain.7 create_function.7	      \
+		create_database.7 create_domain.7 create_foreign_data_wrapper.7 \
+		create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_operator_family.7 create_role.7			      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
-		create_table.7 create_table_as.7			      \
+		create_server.7 create_table.7 create_table_as.7			      \
 		create_text_search_configuration.7			      \
 		create_text_search_dictionary.7				      \
 		create_text_search_parser.7				      \
 		create_text_search_template.7 create_trigger.7		      \
-		create_type.7 create_user.7 create_view.7 deallocate.7	      \
+		create_type.7 create_user.7 create_user_mapping.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7 discard.7				      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
-		drop_database.7 drop_domain.7 drop_function.7		      \
+		drop_database.7 drop_domain.7 drop_foreign_data_wrapper.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_operator_family.7  \
 		drop_owned.7 drop_role.7 drop_rule.7			      \
-		drop_schema.7 drop_sequence.7 drop_table.7		      \
+		drop_schema.7 drop_sequence.7 drop_server.7 drop_table.7		      \
 		drop_text_search_configuration.7			      \
 		drop_text_search_dictionary.7				      \
 		drop_text_search_parser.7				      \
 		drop_text_search_template.7 drop_trigger.7		      \
-		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
+		drop_type.7 drop_user.7 drop_user_mapping.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
@@ -237,11 +237,11 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
-		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		table.7 truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
-		savepoint.7 values.7
+		savepoint.7 values.7 with.7
 .endif
 
 .if defined(SERVER_ONLY)
@@ -259,8 +259,7 @@ pre-configure:
 .  endif
 
 do-build:
-	@ cd ${WRKSRC}/src/backend ;\
-	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
+	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index f94a2324bff6..8ced8f4d765e 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,6 +1,3 @@
-MD5 (postgresql/postgresql-8.3.7.tar.bz2) = 7b7e91a2221e55fe1b167e663217a96d
-SHA256 (postgresql/postgresql-8.3.7.tar.bz2) = eee00caf1860646f6c03b4266f2b2b7936e469b3305bd63b80b7b663c0ae1661
-SIZE (postgresql/postgresql-8.3.7.tar.bz2) = 14124712
-MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
-SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
-SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
+MD5 (postgresql/postgresql-8.4.0.tar.bz2) = 1f172d5f60326e972837f58fa5acd130
+SHA256 (postgresql/postgresql-8.4.0.tar.bz2) = 84bf53b4a45db4fdf875bb03bf247f29dcb97f8bda42839b00b73671df05e007
+SIZE (postgresql/postgresql-8.4.0.tar.bz2) = 13839282
diff --git a/databases/postgresql90-server/files/patch-doc-Makefile b/databases/postgresql90-server/files/patch-doc-Makefile
index 805b541b438a..8e08132e175b 100644
--- a/databases/postgresql90-server/files/patch-doc-Makefile
+++ b/databases/postgresql90-server/files/patch-doc-Makefile
@@ -1,20 +1,16 @@
---- doc/Makefile.orig	2007-02-09 16:55:57.000000000 +0100
-+++ doc/Makefile	2008-01-02 11:38:43.000000000 +0100
-@@ -25,11 +25,12 @@
+--- doc/Makefile.orig	2009-05-15 15:58:05.000000000 +0200
++++ doc/Makefile	2009-05-15 15:58:18.000000000 +0200
+@@ -25,9 +25,10 @@
  
  .NOTPARALLEL:
  
 -ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
--ifneq (,$(docdir))
 -found_html = yes
 -endif
--endif
 +# FreeBSD has a separate port for installing the documentation
 +#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
-+#ifneq (,$(docdir))
 +#found_html = yes
 +#endif
-+#endif
  
  ifneq ($(wildcard $(srcdir)/man.tar.gz),)
  # SCO OpenServer's man system is sufficiently different to not bother.
diff --git a/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd b/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd
deleted file mode 100644
index 81339e98e8db..000000000000
--- a/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
-+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
-@@ -29,3 +29,5 @@
- endif
- 
- sqlmansect = 7
-+
-+allow_nonpic_in_shlib = yes
diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client
index c219ef4dff82..62ea592ed3ac 100644
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@@ -14,6 +14,7 @@ bin/psql
 bin/reindexdb
 bin/vacuumdb
 include/ecpg_config.h
+include/libpq-events.h
 include/postgresql/server/access/attnum.h
 include/postgresql/server/access/clog.h
 include/postgresql/server/access/genam.h
@@ -37,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
@@ -44,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
@@ -54,6 +57,7 @@ include/postgresql/server/c.h
 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
@@ -66,18 +70,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
@@ -87,6 +94,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
@@ -99,6 +107,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/alter.h
 include/postgresql/server/commands/async.h
@@ -139,6 +150,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
@@ -148,6 +160,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
@@ -157,6 +170,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
@@ -211,6 +226,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
@@ -221,12 +237,14 @@ include/postgresql/server/optimizer/subselect.h
 include/postgresql/server/optimizer/tlist.h
 include/postgresql/server/optimizer/var.h
 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
@@ -280,6 +298,7 @@ include/postgresql/server/port/win32_msvc/sys/param.h
 include/postgresql/server/port/win32_msvc/sys/time.h
 include/postgresql/server/port/win32_msvc/unistd.h
 include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/portability/instr_time.h
 include/postgresql/server/postgres.h
 include/postgresql/server/postgres_ext.h
 include/postgresql/server/postgres_fe.h
@@ -344,10 +363,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
@@ -418,11 +438,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
@@ -433,6 +456,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
 @dirrm include/postgresql/server/utils
 @dirrm include/postgresql/server/tsearch/dicts
 @dirrm include/postgresql/server/tsearch
@@ -443,6 +467,7 @@ include/postgresql/server/utils/xml.h
 @dirrm include/postgresql/server/rewrite
 @dirrm include/postgresql/server/regex
 @dirrm include/postgresql/server/postmaster
+@dirrm include/postgresql/server/portability
 @dirrm include/postgresql/server/port/win32_msvc/sys
 @dirrm include/postgresql/server/port/win32_msvc
 @dirrm include/postgresql/server/port/win32/sys
diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib
index 304ec2a3f455..7113bf1de734 100644
--- a/databases/postgresql90-server/pkg-plist-contrib
+++ b/databases/postgresql90-server/pkg-plist-contrib
@@ -4,9 +4,12 @@ bin/pgbench
 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/dict_int.so
@@ -15,7 +18,6 @@ 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
@@ -23,10 +25,12 @@ lib/postgresql/moddatetime.so
 lib/postgresql/pageinspect.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
 lib/postgresql/pgstattuple.so
+lib/postgresql/pgxml.so
 lib/postgresql/refint.so
 lib/postgresql/seg.so
 lib/postgresql/sslinfo.so
@@ -34,6 +38,7 @@ lib/postgresql/tablefunc.so
 lib/postgresql/test_parser.so
 lib/postgresql/timetravel.so
 lib/postgresql/tsearch2.so
+lib/postgresql/uuid-ossp.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/autoinc.example
@@ -44,8 +49,10 @@ lib/postgresql/tsearch2.so
 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
@@ -62,10 +69,12 @@ 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
 share/postgresql/contrib/pgstattuple.sql
+share/postgresql/contrib/pgxml.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/seg.sql
 share/postgresql/contrib/sslinfo.sql
@@ -75,8 +84,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
@@ -91,15 +102,19 @@ 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
 share/postgresql/contrib/uninstall_pgstattuple.sql
+share/postgresql/contrib/uninstall_pgxml.sql
 share/postgresql/contrib/uninstall_seg.sql
 share/postgresql/contrib/uninstall_sslinfo.sql
 share/postgresql/contrib/uninstall_tablefunc.sql
 share/postgresql/contrib/uninstall_test_parser.sql
 share/postgresql/contrib/uninstall_tsearch2.sql
+share/postgresql/contrib/uninstall_uuid-ossp.sql
+share/postgresql/contrib/uuid-ossp.sql
 share/postgresql/tsearch_data/xsyn_sample.rules
 @dirrmtry share/postgresql/tsearch_data >&2
 @dirrmtry share/postgresql/contrib >&2
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index acd1ed72f94d..8f0e58501154 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -1,5 +1,4 @@
 bin/initdb
-bin/ipcclean
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_resetxlog
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 44bd36ce8ffd..2c51fe52bbbf 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.7
+DISTVERSION?=	8.4.0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -17,13 +17,13 @@ COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
-		${PORTNAME}-client-8.[0-24-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.[0-24-9]*
+		${PORTNAME}-client-8.[0-35-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8.[0-35-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
-UNIQUENAME?=	${PORTNAME}83
+UNIQUENAME?=	${PORTNAME}84
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
@@ -40,8 +40,7 @@ PGGROUP=	pgsql
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
-		--enable-thread-safety \
-		--with-docdir=${DOCSDIR}
+		--enable-thread-safety
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -52,7 +51,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/bin/initdb src/bin/ipcclean src/bin/pg_ctl \
+		src/backend/snowball src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
@@ -96,19 +95,19 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+#OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS=	autoconf:262
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
-PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
-.  endif
+#.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+#USE_AUTOTOOLS=	autoconf:262
+#CONFIGURE_ARGS+=--with-icu
+#LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
+#PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
+#PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
+#.  endif
 
 PATCH_DIST_STRIP=-p1
 
@@ -188,13 +187,13 @@ CONFIGURE_ARGS+=--with-krb5
 .if defined(CLIENT_ONLY)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
-		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
-		alter_domain.7 alter_function.7 alter_group.7		      \
-		alter_index.7 alter_language.7 alter_operator_class.7	      \
+		alter_domain.7 alter_foreign_data_wrapper.7 alter_function.7 alter_group.7 alter_server.7 \
+		alter_user_mapping.7		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_operator_family.7 				      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
@@ -207,29 +206,30 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
-		create_database.7 create_domain.7 create_function.7	      \
+		create_database.7 create_domain.7 create_foreign_data_wrapper.7 \
+		create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_operator_family.7 create_role.7			      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
-		create_table.7 create_table_as.7			      \
+		create_server.7 create_table.7 create_table_as.7			      \
 		create_text_search_configuration.7			      \
 		create_text_search_dictionary.7				      \
 		create_text_search_parser.7				      \
 		create_text_search_template.7 create_trigger.7		      \
-		create_type.7 create_user.7 create_view.7 deallocate.7	      \
+		create_type.7 create_user.7 create_user_mapping.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7 discard.7				      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
-		drop_database.7 drop_domain.7 drop_function.7		      \
+		drop_database.7 drop_domain.7 drop_foreign_data_wrapper.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_operator_family.7  \
 		drop_owned.7 drop_role.7 drop_rule.7			      \
-		drop_schema.7 drop_sequence.7 drop_table.7		      \
+		drop_schema.7 drop_sequence.7 drop_server.7 drop_table.7		      \
 		drop_text_search_configuration.7			      \
 		drop_text_search_dictionary.7				      \
 		drop_text_search_parser.7				      \
 		drop_text_search_template.7 drop_trigger.7		      \
-		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
+		drop_type.7 drop_user.7 drop_user_mapping.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
@@ -237,11 +237,11 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
-		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		table.7 truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
-		savepoint.7 values.7
+		savepoint.7 values.7 with.7
 .endif
 
 .if defined(SERVER_ONLY)
@@ -259,8 +259,7 @@ pre-configure:
 .  endif
 
 do-build:
-	@ cd ${WRKSRC}/src/backend ;\
-	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
+	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index f94a2324bff6..8ced8f4d765e 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,6 +1,3 @@
-MD5 (postgresql/postgresql-8.3.7.tar.bz2) = 7b7e91a2221e55fe1b167e663217a96d
-SHA256 (postgresql/postgresql-8.3.7.tar.bz2) = eee00caf1860646f6c03b4266f2b2b7936e469b3305bd63b80b7b663c0ae1661
-SIZE (postgresql/postgresql-8.3.7.tar.bz2) = 14124712
-MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
-SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
-SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
+MD5 (postgresql/postgresql-8.4.0.tar.bz2) = 1f172d5f60326e972837f58fa5acd130
+SHA256 (postgresql/postgresql-8.4.0.tar.bz2) = 84bf53b4a45db4fdf875bb03bf247f29dcb97f8bda42839b00b73671df05e007
+SIZE (postgresql/postgresql-8.4.0.tar.bz2) = 13839282
diff --git a/databases/postgresql91-server/files/patch-doc-Makefile b/databases/postgresql91-server/files/patch-doc-Makefile
index 805b541b438a..8e08132e175b 100644
--- a/databases/postgresql91-server/files/patch-doc-Makefile
+++ b/databases/postgresql91-server/files/patch-doc-Makefile
@@ -1,20 +1,16 @@
---- doc/Makefile.orig	2007-02-09 16:55:57.000000000 +0100
-+++ doc/Makefile	2008-01-02 11:38:43.000000000 +0100
-@@ -25,11 +25,12 @@
+--- doc/Makefile.orig	2009-05-15 15:58:05.000000000 +0200
++++ doc/Makefile	2009-05-15 15:58:18.000000000 +0200
+@@ -25,9 +25,10 @@
  
  .NOTPARALLEL:
  
 -ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
--ifneq (,$(docdir))
 -found_html = yes
 -endif
--endif
 +# FreeBSD has a separate port for installing the documentation
 +#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
-+#ifneq (,$(docdir))
 +#found_html = yes
 +#endif
-+#endif
  
  ifneq ($(wildcard $(srcdir)/man.tar.gz),)
  # SCO OpenServer's man system is sufficiently different to not bother.
diff --git a/databases/postgresql91-server/files/patch-src-makefiles-Makefile.freebsd b/databases/postgresql91-server/files/patch-src-makefiles-Makefile.freebsd
deleted file mode 100644
index 81339e98e8db..000000000000
--- a/databases/postgresql91-server/files/patch-src-makefiles-Makefile.freebsd
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
-+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
-@@ -29,3 +29,5 @@
- endif
- 
- sqlmansect = 7
-+
-+allow_nonpic_in_shlib = yes
diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client
index c219ef4dff82..62ea592ed3ac 100644
--- a/databases/postgresql91-server/pkg-plist-client
+++ b/databases/postgresql91-server/pkg-plist-client
@@ -14,6 +14,7 @@ bin/psql
 bin/reindexdb
 bin/vacuumdb
 include/ecpg_config.h
+include/libpq-events.h
 include/postgresql/server/access/attnum.h
 include/postgresql/server/access/clog.h
 include/postgresql/server/access/genam.h
@@ -37,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
@@ -44,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
@@ -54,6 +57,7 @@ include/postgresql/server/c.h
 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
@@ -66,18 +70,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
@@ -87,6 +94,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
@@ -99,6 +107,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/alter.h
 include/postgresql/server/commands/async.h
@@ -139,6 +150,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
@@ -148,6 +160,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
@@ -157,6 +170,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
@@ -211,6 +226,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
@@ -221,12 +237,14 @@ include/postgresql/server/optimizer/subselect.h
 include/postgresql/server/optimizer/tlist.h
 include/postgresql/server/optimizer/var.h
 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
@@ -280,6 +298,7 @@ include/postgresql/server/port/win32_msvc/sys/param.h
 include/postgresql/server/port/win32_msvc/sys/time.h
 include/postgresql/server/port/win32_msvc/unistd.h
 include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/portability/instr_time.h
 include/postgresql/server/postgres.h
 include/postgresql/server/postgres_ext.h
 include/postgresql/server/postgres_fe.h
@@ -344,10 +363,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
@@ -418,11 +438,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
@@ -433,6 +456,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
 @dirrm include/postgresql/server/utils
 @dirrm include/postgresql/server/tsearch/dicts
 @dirrm include/postgresql/server/tsearch
@@ -443,6 +467,7 @@ include/postgresql/server/utils/xml.h
 @dirrm include/postgresql/server/rewrite
 @dirrm include/postgresql/server/regex
 @dirrm include/postgresql/server/postmaster
+@dirrm include/postgresql/server/portability
 @dirrm include/postgresql/server/port/win32_msvc/sys
 @dirrm include/postgresql/server/port/win32_msvc
 @dirrm include/postgresql/server/port/win32/sys
diff --git a/databases/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib
index 304ec2a3f455..7113bf1de734 100644
--- a/databases/postgresql91-server/pkg-plist-contrib
+++ b/databases/postgresql91-server/pkg-plist-contrib
@@ -4,9 +4,12 @@ bin/pgbench
 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/dict_int.so
@@ -15,7 +18,6 @@ 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
@@ -23,10 +25,12 @@ lib/postgresql/moddatetime.so
 lib/postgresql/pageinspect.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
 lib/postgresql/pgstattuple.so
+lib/postgresql/pgxml.so
 lib/postgresql/refint.so
 lib/postgresql/seg.so
 lib/postgresql/sslinfo.so
@@ -34,6 +38,7 @@ lib/postgresql/tablefunc.so
 lib/postgresql/test_parser.so
 lib/postgresql/timetravel.so
 lib/postgresql/tsearch2.so
+lib/postgresql/uuid-ossp.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/autoinc.example
@@ -44,8 +49,10 @@ lib/postgresql/tsearch2.so
 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
@@ -62,10 +69,12 @@ 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
 share/postgresql/contrib/pgstattuple.sql
+share/postgresql/contrib/pgxml.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/seg.sql
 share/postgresql/contrib/sslinfo.sql
@@ -75,8 +84,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
@@ -91,15 +102,19 @@ 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
 share/postgresql/contrib/uninstall_pgstattuple.sql
+share/postgresql/contrib/uninstall_pgxml.sql
 share/postgresql/contrib/uninstall_seg.sql
 share/postgresql/contrib/uninstall_sslinfo.sql
 share/postgresql/contrib/uninstall_tablefunc.sql
 share/postgresql/contrib/uninstall_test_parser.sql
 share/postgresql/contrib/uninstall_tsearch2.sql
+share/postgresql/contrib/uninstall_uuid-ossp.sql
+share/postgresql/contrib/uuid-ossp.sql
 share/postgresql/tsearch_data/xsyn_sample.rules
 @dirrmtry share/postgresql/tsearch_data >&2
 @dirrmtry share/postgresql/contrib >&2
diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index acd1ed72f94d..8f0e58501154 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
@@ -1,5 +1,4 @@
 bin/initdb
-bin/ipcclean
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_resetxlog
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 44bd36ce8ffd..2c51fe52bbbf 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.7
+DISTVERSION?=	8.4.0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -17,13 +17,13 @@ COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-7.* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.* \
-		${PORTNAME}-client-8.[0-24-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.[0-24-9]*
+		${PORTNAME}-client-8.[0-35-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8.[0-35-9]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
-UNIQUENAME?=	${PORTNAME}83
+UNIQUENAME?=	${PORTNAME}84
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
@@ -40,8 +40,7 @@ PGGROUP=	pgsql
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
-		--enable-thread-safety \
-		--with-docdir=${DOCSDIR}
+		--enable-thread-safety
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -52,7 +51,7 @@ LDFLAGS+=	${PTHREAD_LIBS}
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/bin/initdb src/bin/ipcclean src/bin/pg_ctl \
+		src/backend/snowball src/bin/initdb src/bin/pg_ctl \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl
 
 INSTALL_DIRS?=	${BUILD_DIRS}
@@ -96,19 +95,19 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+#OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" off
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS=	autoconf:262
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
-PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
-.  endif
+#.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+#USE_AUTOTOOLS=	autoconf:262
+#CONFIGURE_ARGS+=--with-icu
+#LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
+#PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
+#PATCHFILES+=	pg-833-icu-xx-2008-08-28.diff.gz:icu
+#.  endif
 
 PATCH_DIST_STRIP=-p1
 
@@ -188,13 +187,13 @@ CONFIGURE_ARGS+=--with-krb5
 .if defined(CLIENT_ONLY)
 MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.1   \
 		dropdb.1 droplang.1 dropuser.1 ecpg.1 initdb.1	   \
-		ipcclean.1 pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_config.1 pg_controldata.1 pg_ctl.1   \
 		pg_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
 		postgres.1 postmaster.1 psql.1 reindexdb.1 vacuumdb.1
 
 MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
-		alter_domain.7 alter_function.7 alter_group.7		      \
-		alter_index.7 alter_language.7 alter_operator_class.7	      \
+		alter_domain.7 alter_foreign_data_wrapper.7 alter_function.7 alter_group.7 alter_server.7 \
+		alter_user_mapping.7		alter_index.7 alter_language.7 alter_operator_class.7	      \
 		alter_operator_family.7 				      \
 		alter_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
@@ -207,29 +206,30 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		commit_prepared.7					      \
 		copy.7 create_aggregate.7 create_cast.7			      \
 		create_constraint_trigger.7 create_conversion.7		      \
-		create_database.7 create_domain.7 create_function.7	      \
+		create_database.7 create_domain.7 create_foreign_data_wrapper.7 \
+		create_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
 		create_operator_family.7 create_role.7			      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
-		create_table.7 create_table_as.7			      \
+		create_server.7 create_table.7 create_table_as.7			      \
 		create_text_search_configuration.7			      \
 		create_text_search_dictionary.7				      \
 		create_text_search_parser.7				      \
 		create_text_search_template.7 create_trigger.7		      \
-		create_type.7 create_user.7 create_view.7 deallocate.7	      \
+		create_type.7 create_user.7 create_user_mapping.7 create_view.7 deallocate.7	      \
 		declare.7 delete.7 discard.7				      \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
-		drop_database.7 drop_domain.7 drop_function.7		      \
+		drop_database.7 drop_domain.7 drop_foreign_data_wrapper.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
 		drop_operator.7 drop_operator_class.7 drop_operator_family.7  \
 		drop_owned.7 drop_role.7 drop_rule.7			      \
-		drop_schema.7 drop_sequence.7 drop_table.7		      \
+		drop_schema.7 drop_sequence.7 drop_server.7 drop_table.7		      \
 		drop_text_search_configuration.7			      \
 		drop_text_search_dictionary.7				      \
 		drop_text_search_parser.7				      \
 		drop_text_search_template.7 drop_trigger.7		      \
-		drop_type.7 drop_user.7 drop_view.7 end.7 execute.7	      \
+		drop_type.7 drop_user.7 drop_user_mapping.7 drop_view.7 end.7 execute.7	      \
 		explain.7 fetch.7 grant.7 insert.7 listen.7 load.7	      \
 		lock.7 move.7 notify.7 prepare.7 prepare_transaction.7	      \
 		reassign_owned.7 reindex.7 reset.7			      \
@@ -237,11 +237,11 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		select_into.7 set.7					      \
 		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
 		set_session_authorization.7 start_transaction.7		      \
-		truncate.7 unlisten.7 update.7 vacuum.7			      \
+		table.7 truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
 		release_savepoint.7 rollback_to_savepoint.7		      \
-		savepoint.7 values.7
+		savepoint.7 values.7 with.7
 .endif
 
 .if defined(SERVER_ONLY)
@@ -259,8 +259,7 @@ pre-configure:
 .  endif
 
 do-build:
-	@ cd ${WRKSRC}/src/backend ;\
-	${GMAKE} ../../src/include/parser/parse.h ../../src/include/utils/fmgroids.h
+	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks
 	@ for dir in ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index f94a2324bff6..8ced8f4d765e 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,6 +1,3 @@
-MD5 (postgresql/postgresql-8.3.7.tar.bz2) = 7b7e91a2221e55fe1b167e663217a96d
-SHA256 (postgresql/postgresql-8.3.7.tar.bz2) = eee00caf1860646f6c03b4266f2b2b7936e469b3305bd63b80b7b663c0ae1661
-SIZE (postgresql/postgresql-8.3.7.tar.bz2) = 14124712
-MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
-SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
-SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
+MD5 (postgresql/postgresql-8.4.0.tar.bz2) = 1f172d5f60326e972837f58fa5acd130
+SHA256 (postgresql/postgresql-8.4.0.tar.bz2) = 84bf53b4a45db4fdf875bb03bf247f29dcb97f8bda42839b00b73671df05e007
+SIZE (postgresql/postgresql-8.4.0.tar.bz2) = 13839282
diff --git a/databases/postgresql92-server/files/patch-doc-Makefile b/databases/postgresql92-server/files/patch-doc-Makefile
index 805b541b438a..8e08132e175b 100644
--- a/databases/postgresql92-server/files/patch-doc-Makefile
+++ b/databases/postgresql92-server/files/patch-doc-Makefile
@@ -1,20 +1,16 @@
---- doc/Makefile.orig	2007-02-09 16:55:57.000000000 +0100
-+++ doc/Makefile	2008-01-02 11:38:43.000000000 +0100
-@@ -25,11 +25,12 @@
+--- doc/Makefile.orig	2009-05-15 15:58:05.000000000 +0200
++++ doc/Makefile	2009-05-15 15:58:18.000000000 +0200
+@@ -25,9 +25,10 @@
  
  .NOTPARALLEL:
  
 -ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
--ifneq (,$(docdir))
 -found_html = yes
 -endif
--endif
 +# FreeBSD has a separate port for installing the documentation
 +#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
-+#ifneq (,$(docdir))
 +#found_html = yes
 +#endif
-+#endif
  
  ifneq ($(wildcard $(srcdir)/man.tar.gz),)
  # SCO OpenServer's man system is sufficiently different to not bother.
diff --git a/databases/postgresql92-server/files/patch-src-makefiles-Makefile.freebsd b/databases/postgresql92-server/files/patch-src-makefiles-Makefile.freebsd
deleted file mode 100644
index 81339e98e8db..000000000000
--- a/databases/postgresql92-server/files/patch-src-makefiles-Makefile.freebsd
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
-+++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
-@@ -29,3 +29,5 @@
- endif
- 
- sqlmansect = 7
-+
-+allow_nonpic_in_shlib = yes
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index c219ef4dff82..62ea592ed3ac 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -14,6 +14,7 @@ bin/psql
 bin/reindexdb
 bin/vacuumdb
 include/ecpg_config.h
+include/libpq-events.h
 include/postgresql/server/access/attnum.h
 include/postgresql/server/access/clog.h
 include/postgresql/server/access/genam.h
@@ -37,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
@@ -44,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
@@ -54,6 +57,7 @@ include/postgresql/server/c.h
 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
@@ -66,18 +70,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
@@ -87,6 +94,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
@@ -99,6 +107,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/alter.h
 include/postgresql/server/commands/async.h
@@ -139,6 +150,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
@@ -148,6 +160,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
@@ -157,6 +170,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
@@ -211,6 +226,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
@@ -221,12 +237,14 @@ include/postgresql/server/optimizer/subselect.h
 include/postgresql/server/optimizer/tlist.h
 include/postgresql/server/optimizer/var.h
 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
@@ -280,6 +298,7 @@ include/postgresql/server/port/win32_msvc/sys/param.h
 include/postgresql/server/port/win32_msvc/sys/time.h
 include/postgresql/server/port/win32_msvc/unistd.h
 include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/portability/instr_time.h
 include/postgresql/server/postgres.h
 include/postgresql/server/postgres_ext.h
 include/postgresql/server/postgres_fe.h
@@ -344,10 +363,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
@@ -418,11 +438,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
@@ -433,6 +456,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
 @dirrm include/postgresql/server/utils
 @dirrm include/postgresql/server/tsearch/dicts
 @dirrm include/postgresql/server/tsearch
@@ -443,6 +467,7 @@ include/postgresql/server/utils/xml.h
 @dirrm include/postgresql/server/rewrite
 @dirrm include/postgresql/server/regex
 @dirrm include/postgresql/server/postmaster
+@dirrm include/postgresql/server/portability
 @dirrm include/postgresql/server/port/win32_msvc/sys
 @dirrm include/postgresql/server/port/win32_msvc
 @dirrm include/postgresql/server/port/win32/sys
diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib
index 304ec2a3f455..7113bf1de734 100644
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@@ -4,9 +4,12 @@ bin/pgbench
 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/dict_int.so
@@ -15,7 +18,6 @@ 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
@@ -23,10 +25,12 @@ lib/postgresql/moddatetime.so
 lib/postgresql/pageinspect.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
 lib/postgresql/pgstattuple.so
+lib/postgresql/pgxml.so
 lib/postgresql/refint.so
 lib/postgresql/seg.so
 lib/postgresql/sslinfo.so
@@ -34,6 +38,7 @@ lib/postgresql/tablefunc.so
 lib/postgresql/test_parser.so
 lib/postgresql/timetravel.so
 lib/postgresql/tsearch2.so
+lib/postgresql/uuid-ossp.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/autoinc.example
@@ -44,8 +49,10 @@ lib/postgresql/tsearch2.so
 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
@@ -62,10 +69,12 @@ 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
 share/postgresql/contrib/pgstattuple.sql
+share/postgresql/contrib/pgxml.sql
 share/postgresql/contrib/refint.sql
 share/postgresql/contrib/seg.sql
 share/postgresql/contrib/sslinfo.sql
@@ -75,8 +84,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
@@ -91,15 +102,19 @@ 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
 share/postgresql/contrib/uninstall_pgstattuple.sql
+share/postgresql/contrib/uninstall_pgxml.sql
 share/postgresql/contrib/uninstall_seg.sql
 share/postgresql/contrib/uninstall_sslinfo.sql
 share/postgresql/contrib/uninstall_tablefunc.sql
 share/postgresql/contrib/uninstall_test_parser.sql
 share/postgresql/contrib/uninstall_tsearch2.sql
+share/postgresql/contrib/uninstall_uuid-ossp.sql
+share/postgresql/contrib/uuid-ossp.sql
 share/postgresql/tsearch_data/xsyn_sample.rules
 @dirrmtry share/postgresql/tsearch_data >&2
 @dirrmtry share/postgresql/contrib >&2
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index acd1ed72f94d..8f0e58501154 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -1,5 +1,4 @@
 bin/initdb
-bin/ipcclean
 bin/pg_controldata
 bin/pg_ctl
 bin/pg_resetxlog
author	Palle Girgensohn <girgen@FreeBSD.org>	2009-07-07 22:30:06 +0000
committer	Palle Girgensohn <girgen@FreeBSD.org>	2009-07-07 22:30:06 +0000
commit	00c3beec3943b166c0dd223e40358d5062439fa7 (patch)
tree	6381d335b55d645f8866bcdb498a7de8ee1ead34 /databases
parent	- Flip MAKE_JOBS_SAFE to MAKE_JOBS_UNSAFE (diff)