PostgreSQL 9.0 is here! The PostgreSQL Global Development Group

announces the availability of our most eagerly awaited release.
PostgreSQL 9.0 includes built-in, binary replication, and over a dozen
other major features which will appeal to everyone from web developers
to database hackers.

9.0 includes more major features than any release before it, including:
* Hot standby
* Streaming replication
* In-place upgrades
* 64-bit Windows builds
* Easy mass permissions management
* Anonymous blocks and named parameter calls for stored procedures
* New windowing functions and ordered aggregates

... and many more.  For details on the over 200 additions and
improvements in this version, developed by over a hundred contributors,
please see the release notes.

"These kinds of feature additions continue to make a strong case for why
mission-critical technology tasks can continue to depend on the power,
flexibility and robustness of PostgreSQL,” said Afilias CTO Ram Mohan.

More information on PostgreSQL 9.0:
* Release notes
  http://www.postgresql.org/docs/9.0/static/release-9-0
* Presskit
  http://www.postgresql.org/about/press/presskit90
* Guide to 9.0:
  http://wiki.postgresql.org/wiki/What's_new_in_PostgreSQL_9.0

---
PR: 150430, Add dtrace

8 files changed, 319 insertions, 252 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 7ce9dab829c..80d9c75a968 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.4.3
-PORTREVISION?=	2
+DISTVERSION?=	9.0.0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -16,15 +15,13 @@ PKGNAMESUFFIX?=	-server
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
-CONFLICTS?=	${PORTNAME}-client-7.* \
-		${PORTNAME}${PKGNAMESUFFIX}-7.* \
-		${PORTNAME}-client-8.[0-35-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-8.[0-35-9]*
+CONFLICTS?=	${PORTNAME}-client-[78]* \
+		${PORTNAME}${PKGNAMESUFFIX}-[78]*
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
-UNIQUENAME?=	${PORTNAME}84
+UNIQUENAME?=	${PORTNAME}90
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 PKGINSTALL?=	${PKGDIR}/pkg-install${PKGNAMESUFFIX}
@@ -83,6 +80,7 @@ CONFIGURE_ARGS+=--with-openssl
 .include <bsd.port.pre.mk>
 
 .if !defined(SLAVE_ONLY)
+OPTIONS+=	DTRACE "Build with DTrace probes (server only)" off
 OPTIONS+=	PAM "Build with PAM support (server only)" off
 OPTIONS+=	LDAP "Build with LDAP authentication support" off
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
@@ -108,10 +106,9 @@ IGNORE=		options WITH_ICU and WITH_ICU4 are mutually exclusive
 USE_AUTOTOOLS=	autoconf:267
 CONFIGURE_ARGS+=--with-icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-840-icu-2009-09-15.diff.gz:icu
+PATCHFILES+=	pg-900-icu-2010-09-19.diff.gz:icu
 .   if defined(WITH_ICU4)
-LIB_DEPENDS+=	icudata.43:${PORTSDIR}/devel/icu4
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
+LIB_DEPENDS+=	icudata.44:${PORTSDIR}/devel/icu4
 .   else
 LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
 .   endif
@@ -119,6 +116,11 @@ LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
 
 PATCH_DIST_STRIP=-p1
 
+.  if defined(SERVER_ONLY) && defined(WITH_DTRACE)
+CONFIGURE_ARGS+=--enable-dtrace
+LDFLAGS+=-lelf
+.  endif
+
 .  if defined(SERVER_ONLY) && defined(WITH_PAM)
 CONFIGURE_ARGS+=--with-pam
 .  endif
@@ -199,57 +201,81 @@ MAN1=		clusterdb.1 createdb.1 createlang.1 createuser.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_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		      \
-		alter_text_search_configuration.7			      \
-		alter_text_search_dictionary.7				      \
-		alter_text_search_parser.7				      \
-		alter_text_search_template.7				      \
-		alter_trigger.7 alter_user.7 alter_view.7 analyze.7 begin.7   \
-		checkpoint.7 close.7 cluster.7 comment.7 commit.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_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_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_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_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_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_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			      \
-		revoke.7 rollback.7 rollback_prepared.7 select.7	      \
-		select_into.7 set.7					      \
-		set_constraints.7 set_role.7 set_transaction.7 show.7	      \
-		set_session_authorization.7 start_transaction.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 with.7
+MAN3=		SPI_connect.3 SPI_copytuple.3 SPI_cursor_close.3 SPI_cursor_fetch.3 \
+		SPI_cursor_find.3 SPI_cursor_move.3 SPI_cursor_open.3 \
+		SPI_cursor_open_with_args.3 SPI_cursor_open_with_paramlist.3 \
+		SPI_exec.3 SPI_execp.3 SPI_execute.3 SPI_execute_plan.3 \
+		SPI_execute_plan_with_paramlist.3 SPI_execute_with_args.3 \
+		SPI_finish.3 SPI_fname.3 SPI_fnumber.3 SPI_freeplan.3 \
+		SPI_freetuple.3 SPI_freetuptable.3 SPI_getargcount.3 \
+		SPI_getargtypeid.3 SPI_getbinval.3 SPI_getnspname.3 \
+		SPI_getrelname.3 SPI_gettype.3 SPI_gettypeid.3 \
+		SPI_getvalue.3 SPI_is_cursor_plan.3 SPI_modifytuple.3 \
+		SPI_palloc.3 SPI_pfree.3 SPI_pop.3 SPI_prepare.3 \
+		SPI_prepare_cursor.3 SPI_prepare_params.3 SPI_push.3 \
+		SPI_repalloc.3 SPI_returntuple.3 SPI_saveplan.3 \
+		SPI_scroll_cursor_fetch.3 SPI_scroll_cursor_move.3 \
+		dblink.3 dblink_build_sql_delete.3 dblink_build_sql_insert.3 \
+		dblink_build_sql_update.3 dblink_cancel_query.3 \
+		dblink_close.3 dblink_connect.3 dblink_connect_u.3 \
+		dblink_disconnect.3 dblink_error_message.3 dblink_exec.3 \
+		dblink_fetch.3 dblink_get_connections.3 dblink_get_notify.3 \
+		dblink_get_pkey.3 dblink_get_result.3 dblink_is_busy.3 \
+		dblink_open.3 dblink_send_query.3
+
+MAN7=		ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \
+		ALTER_DEFAULT_PRIVILEGES.7 \
+		ALTER_DOMAIN.7 ALTER_FOREIGN_DATA_WRAPPER.7 ALTER_FUNCTION.7 ALTER_GROUP.7 \
+		ALTER_LARGE_OBJECT.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		      \
+		ALTER_TEXT_SEARCH_CONFIGURATION.7			      \
+		ALTER_TEXT_SEARCH_DICTIONARY.7				      \
+		ALTER_TEXT_SEARCH_PARSER.7				      \
+		ALTER_TEXT_SEARCH_TEMPLATE.7				      \
+		ALTER_TRIGGER.7 ALTER_USER.7 ALTER_VIEW.7 ANALYZE.7 BEGIN.7   \
+		CHECKPOINT.7 CLOSE.7 CLUSTER.7 COMMENT.7 COMMIT.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_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_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_USER_MAPPING.7 CREATE_VIEW.7 DEALLOCATE.7	      \
+		DECLARE.7 DELETE.7 DISCARD.7				      \
+		DO.7 DROP_AGGREGATE.7 DROP_CAST.7 DROP_CONVERSION.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_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_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			      \
+		REVOKE.7 ROLLBACK.7 ROLLBACK_PREPARED.7 SELECT.7	      \
+		SELECT_INTO.7 SET.7					      \
+		SET_CONSTRAINTS.7 SET_ROLE.7 SET_TRANSACTION.7 SHOW.7	      \
+		SET_SESSION_AUTHORIZATION.7 START_TRANSACTION.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 WITH.7
 .endif
 
 .if defined(SERVER_ONLY)
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 81d413a0628..d6eca70c281 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.4.3.tar.bz2) = 7f70e7b140fb190f268837255582b07e
-SHA256 (postgresql/postgresql-8.4.3.tar.bz2) = 050c3e8324b453715e819456638fc1561351b33c8011b7cb63db98bbc2061564
-SIZE (postgresql/postgresql-8.4.3.tar.bz2) = 13645257
-SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
-MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136
-SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
+MD5 (postgresql/postgresql-9.0.0.tar.bz2) = 14c2122cc322e69ab2ab702ed7714bbe
+SHA256 (postgresql/postgresql-9.0.0.tar.bz2) = 7dcc381603c02595adc96a8fc5c9d067d3b39aaa44987e7a524a7504a10ff676
+SIZE (postgresql/postgresql-9.0.0.tar.bz2) = 13753207
+SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9
+MD5 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 150268fbcce8c0bbe68c176dcb5464ad
+SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349
diff --git a/databases/postgresql92-server/files/502.pgsql b/databases/postgresql92-server/files/502.pgsql
index d2235e414cd..281189a59c4 100644
--- a/databases/postgresql92-server/files/502.pgsql
+++ b/databases/postgresql92-server/files/502.pgsql
@@ -15,7 +15,8 @@
 # Define these variables in either /etc/periodic.conf or
 # /etc/periodic.conf.local to override the default values.
 #
-# daily_pgsql_backup_enable="YES" # do backup
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
 # daily_pgsql_vacuum_enable="YES" # do vacuum
 
 daily_pgsql_vacuum_args="-z"
@@ -37,9 +38,7 @@ eval backupdir=${daily_pgsql_backupdir}
 
 rc=0
 
-case "$daily_pgsql_backup_enable" in
-    [Yy][Ee][Ss])
-
+pgsql_backup() {
 	# daily_pgsql_backupdir must be writeable by user pgsql
 	# ~pgsql is just that under normal circumstances,
 	# but this might not be where you want the backups...
@@ -53,16 +52,18 @@ case "$daily_pgsql_backup_enable" in
 
 	# Protect the data
 	umask 077
-	dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
 	rc=$?
 	now=`date "+%Y-%m-%dT%H:%M:%S"`
 	file=${daily_pgsql_backupdir}/pgglobals_${now}
 	su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
-	for db in ${dbnames}; do
+
+	db=$1
+	while shift; do
 	    echo -n " $db"
 	    file=${backupdir}/pgdump_${db}_${now}
 	    su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
 	    [ $? -gt 0 ] && rc=3
+		db=$1
 	done
 
 	if [ $rc -gt 0 ]; then
@@ -73,6 +74,23 @@ case "$daily_pgsql_backup_enable" in
 	# cleaning up old data
 	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \
 	    -a -mtime +${daily_pgsql_savedays} -delete
+	echo
+}
+
+case "$daily_pgsql_backup_enable" in
+    [Yy][Ee][Ss])
+	dbnames=`su -l pgsql -c "umask 077; psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	pgsql_backup $dbnames
+	;;
+
+	[Nn][Oo])
+	;;
+
+	"")
+	;;
+
+	*)
+	pgsql_backup $daily_pgsql_backup_enable
 	;;
 esac
 
diff --git a/databases/postgresql92-server/files/extra-patch-icu4 b/databases/postgresql92-server/files/extra-patch-icu4
deleted file mode 100644
index 28c8a8cfff3..00000000000
--- a/databases/postgresql92-server/files/extra-patch-icu4
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure.in.orig	2010-03-25 22:25:10.655197193 +0100
-+++ configure.in	2010-03-25 22:25:13.611658318 +0100
-@@ -945,15 +945,19 @@
- fi
- 
- if test "$with_icu" = yes ; then
--  AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
--     AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
--        AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
--   ])
-+  AC_CHECK_LIB(icui18n, ucol_open_43, [], [
-+     AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
-+        AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
-+           AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
-+        ])
-+     ])
-   ])
--  AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
--     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
--        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
--   ])
-+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
-+     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
-+        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
-+           AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
-+        ])
-+     ])
-   ])
- fi
- 
diff --git a/databases/postgresql92-server/files/patch-doc-Makefile b/databases/postgresql92-server/files/patch-doc-Makefile
index 8e08132e175..a366d4ca262 100644
--- a/databases/postgresql92-server/files/patch-doc-Makefile
+++ b/databases/postgresql92-server/files/patch-doc-Makefile
@@ -1,16 +1,28 @@
---- 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),)
--found_html = yes
--endif
-+# FreeBSD has a separate port for installing the documentation
-+#ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)
-+#found_html = yes
-+#endif
- 
- ifneq ($(wildcard $(srcdir)/man.tar.gz),)
- # SCO OpenServer's man system is sufficiently different to not bother.
+--- doc/src/sgml/Makefile.orig	2010-06-12 23:40:31.000000000 +0200
++++ doc/src/sgml/Makefile	2010-09-19 22:07:11.210759927 +0200
+@@ -15,14 +15,14 @@
+ 
+ # Make "html" the default target, since that is what most people tend
+ # to want to use.
+-html:
++man:
+ 
+ subdir = doc/src/sgml
+ top_builddir = ../../..
+ include $(top_builddir)/src/Makefile.global
+ 
+ 
+-all: html man
++all: man
+ 
+ distprep: html distprep-man
+ 
+@@ -285,7 +285,7 @@
+ ## Install
+ ##
+ 
+-install: install-html
++##install: install-html
+ 
+ ifneq ($(PORTNAME), sco)
+ install: install-man
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index 31a1fd4b22f..cb6713877ce 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -40,6 +40,7 @@ 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/tupconvert.h
 include/postgresql/server/access/tupdesc.h
 include/postgresql/server/access/tupmacs.h
 include/postgresql/server/access/tuptoaster.h
@@ -77,6 +78,8 @@ 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_db_role_setting.h
+include/postgresql/server/catalog/pg_default_acl.h
 include/postgresql/server/catalog/pg_depend.h
 include/postgresql/server/catalog/pg_description.h
 include/postgresql/server/catalog/pg_enum.h
@@ -87,7 +90,7 @@ 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
+include/postgresql/server/catalog/pg_largeobject_metadata.h
 include/postgresql/server/catalog/pg_namespace.h
 include/postgresql/server/catalog/pg_opclass.h
 include/postgresql/server/catalog/pg_operator.h
@@ -134,7 +137,6 @@ include/postgresql/server/commands/typecmds.h
 include/postgresql/server/commands/user.h
 include/postgresql/server/commands/vacuum.h
 include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/version.h
 include/postgresql/server/commands/view.h
 include/postgresql/server/dynloader.h
 include/postgresql/server/executor/execdebug.h
@@ -157,8 +159,10 @@ include/postgresql/server/executor/nodeHash.h
 include/postgresql/server/executor/nodeHashjoin.h
 include/postgresql/server/executor/nodeIndexscan.h
 include/postgresql/server/executor/nodeLimit.h
+include/postgresql/server/executor/nodeLockRows.h
 include/postgresql/server/executor/nodeMaterial.h
 include/postgresql/server/executor/nodeMergejoin.h
+include/postgresql/server/executor/nodeModifyTable.h
 include/postgresql/server/executor/nodeNestloop.h
 include/postgresql/server/executor/nodeRecursiveunion.h
 include/postgresql/server/executor/nodeResult.h
@@ -177,8 +181,8 @@ include/postgresql/server/executor/spi_priv.h
 include/postgresql/server/executor/tstoreReceiver.h
 include/postgresql/server/executor/tuptable.h
 include/postgresql/server/fmgr.h
-include/postgresql/server/funcapi.h
 include/postgresql/server/foreign/foreign.h
+include/postgresql/server/funcapi.h
 include/postgresql/server/getaddrinfo.h
 include/postgresql/server/getopt_long.h
 include/postgresql/server/lib/dllist.h
@@ -250,12 +254,14 @@ include/postgresql/server/parser/parse_expr.h
 include/postgresql/server/parser/parse_func.h
 include/postgresql/server/parser/parse_node.h
 include/postgresql/server/parser/parse_oper.h
+include/postgresql/server/parser/parse_param.h
 include/postgresql/server/parser/parse_relation.h
 include/postgresql/server/parser/parse_target.h
 include/postgresql/server/parser/parse_type.h
 include/postgresql/server/parser/parse_utilcmd.h
 include/postgresql/server/parser/parser.h
 include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scanner.h
 include/postgresql/server/parser/scansup.h
 include/postgresql/server/pg_config.h
 include/postgresql/server/pg_config_manual.h
@@ -314,6 +320,9 @@ include/postgresql/server/regex/regcustom.h
 include/postgresql/server/regex/regerrs.h
 include/postgresql/server/regex/regex.h
 include/postgresql/server/regex/regguts.h
+include/postgresql/server/replication/walprotocol.h
+include/postgresql/server/replication/walreceiver.h
+include/postgresql/server/replication/walsender.h
 include/postgresql/server/rewrite/prs2lock.h
 include/postgresql/server/rewrite/rewriteDefine.h
 include/postgresql/server/rewrite/rewriteHandler.h
@@ -381,6 +390,7 @@ include/postgresql/server/storage/pmsignal.h
 include/postgresql/server/storage/pos.h
 include/postgresql/server/storage/proc.h
 include/postgresql/server/storage/procarray.h
+include/postgresql/server/storage/procsignal.h
 include/postgresql/server/storage/relfilenode.h
 include/postgresql/server/storage/s_lock.h
 include/postgresql/server/storage/shmem.h
@@ -388,6 +398,7 @@ include/postgresql/server/storage/sinval.h
 include/postgresql/server/storage/sinvaladt.h
 include/postgresql/server/storage/smgr.h
 include/postgresql/server/storage/spin.h
+include/postgresql/server/storage/standby.h
 include/postgresql/server/tcop/dest.h
 include/postgresql/server/tcop/fastpath.h
 include/postgresql/server/tcop/pquery.h
@@ -404,7 +415,9 @@ include/postgresql/server/tsearch/ts_utils.h
 include/postgresql/server/utils/acl.h
 include/postgresql/server/utils/array.h
 include/postgresql/server/utils/ascii.h
+include/postgresql/server/utils/attoptcache.h
 include/postgresql/server/utils/builtins.h
+include/postgresql/server/utils/bytea.h
 include/postgresql/server/utils/cash.h
 include/postgresql/server/utils/catcache.h
 include/postgresql/server/utils/combocid.h
@@ -415,7 +428,6 @@ include/postgresql/server/utils/dynahash.h
 include/postgresql/server/utils/dynamic_loader.h
 include/postgresql/server/utils/elog.h
 include/postgresql/server/utils/errcodes.h
-include/postgresql/server/utils/flatfiles.h
 include/postgresql/server/utils/fmgroids.h
 include/postgresql/server/utils/fmgrtab.h
 include/postgresql/server/utils/formatting.h
@@ -441,12 +453,15 @@ 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/rbtree.h
 include/postgresql/server/utils/rel.h
 include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/relmapper.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/spccache.h
 include/postgresql/server/utils/syscache.h
 include/postgresql/server/utils/timestamp.h
 include/postgresql/server/utils/tqual.h
@@ -458,6 +473,9 @@ include/postgresql/server/utils/uuid.h
 include/postgresql/server/utils/varbit.h
 include/postgresql/server/utils/xml.h
 include/postgresql/server/windowapi.h
+include/sqlda-compat.h
+include/sqlda-native.h
+include/sqlda.h
 @dirrm include/postgresql/server/utils
 @dirrm include/postgresql/server/tsearch/dicts
 @dirrm include/postgresql/server/tsearch
@@ -466,6 +484,7 @@ include/postgresql/server/windowapi.h
 @dirrm include/postgresql/server/snowball/libstemmer
 @dirrm include/postgresql/server/snowball
 @dirrm include/postgresql/server/rewrite
+@dirrm include/postgresql/server/replication
 @dirrm include/postgresql/server/regex
 @dirrm include/postgresql/server/postmaster
 @dirrm include/postgresql/server/portability
@@ -495,7 +514,6 @@ include/postgresql/internal/libpq/pqcomm.h
 @dirrm include/postgresql/internal/libpq
 include/postgresql/informix/esql/datetime.h
 include/postgresql/informix/esql/decimal.h
-include/postgresql/informix/esql/sqlda.h
 include/postgresql/informix/esql/sqltypes.h
 @dirrm include/postgresql/informix/esql
 @dirrm include/postgresql/informix
@@ -535,7 +553,6 @@ lib/libpq.so.5
 lib/libpgtypes.a
 lib/libpgtypes.so
 lib/postgresql/pgxs/config/install-sh
-lib/postgresql/pgxs/config/mkinstalldirs
 lib/postgresql/pgxs/src/makefiles/pgxs.mk
 lib/postgresql/pgxs/src/Makefile.global
 lib/postgresql/pgxs/src/Makefile.port
@@ -551,70 +568,76 @@ lib/postgresql/pgxs/src/nls-global.mk
 share/postgresql/pg_service.conf.sample
 share/postgresql/psqlrc.sample
 @dirrmtry share/postgresql
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpglib6-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpg-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpglib6-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpg-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpglib6-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpg-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpg-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpglib6-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpglib6-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpg-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq5-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpglib6-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpg-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config-8.4.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo
diff --git a/databases/postgresql92-server/pkg-plist-contrib b/databases/postgresql92-server/pkg-plist-contrib
index 7fd4f432829..b3a1c61e6d8 100644
--- a/databases/postgresql92-server/pkg-plist-contrib
+++ b/databases/postgresql92-server/pkg-plist-contrib
@@ -1,6 +1,7 @@
 bin/oid2name
+bin/pg_archivecleanup
 bin/pg_standby
-bin/pgbench
+bin/pg_upgrade
 bin/vacuumlo
 lib/postgresql/_int.so
 lib/postgresql/adminpack.so
@@ -23,10 +24,12 @@ lib/postgresql/lo.so
 lib/postgresql/ltree.so
 lib/postgresql/moddatetime.so
 lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
 lib/postgresql/pg_buffercache.so
 lib/postgresql/pg_freespacemap.so
 lib/postgresql/pg_stat_statements.so
 lib/postgresql/pg_trgm.so
+lib/postgresql/pg_upgrade_support.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgrowlocks.so
 lib/postgresql/pgstattuple.so
@@ -38,6 +41,7 @@ lib/postgresql/tablefunc.so
 lib/postgresql/test_parser.so
 lib/postgresql/timetravel.so
 lib/postgresql/tsearch2.so
+lib/postgresql/unaccent.so
 %%DOCSDIR%%/README-contrib
 %%DOCSDIR%%/contrib/README
 %%DOCSDIR%%/contrib/autoinc.example
@@ -81,6 +85,7 @@ share/postgresql/contrib/tablefunc.sql
 share/postgresql/contrib/test_parser.sql
 share/postgresql/contrib/timetravel.sql
 share/postgresql/contrib/tsearch2.sql
+share/postgresql/contrib/unaccent.sql
 share/postgresql/contrib/uninstall__int.sql
 share/postgresql/contrib/uninstall_adminpack.sql
 share/postgresql/contrib/uninstall_btree_gin.sql
@@ -112,6 +117,8 @@ 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_unaccent.sql
+share/postgresql/tsearch_data/unaccent.rules
 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 7a5170bad6f..68224f4750e 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -10,7 +10,7 @@ lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/dict_snowball.so
 lib/postgresql/euc_cn_and_mic.so
-lib/postgresql/euc_jis_2004_and_shift_jis_2004.so
+lib/postgresql/euc2004_sjis2004.so
 lib/postgresql/euc_jp_and_sjis.so
 lib/postgresql/euc_kr_and_mic.so
 lib/postgresql/euc_tw_and_big5.so
@@ -21,17 +21,17 @@ lib/postgresql/utf8_and_ascii.so
 lib/postgresql/utf8_and_big5.so
 lib/postgresql/utf8_and_cyrillic.so
 lib/postgresql/utf8_and_euc_cn.so
-lib/postgresql/utf8_and_euc_jis_2004.so
 lib/postgresql/utf8_and_euc_jp.so
 lib/postgresql/utf8_and_euc_kr.so
 lib/postgresql/utf8_and_euc_tw.so
+lib/postgresql/utf8_and_euc2004.so
 lib/postgresql/utf8_and_gb18030.so
 lib/postgresql/utf8_and_gbk.so
 lib/postgresql/utf8_and_iso8859.so
 lib/postgresql/utf8_and_iso8859_1.so
 lib/postgresql/utf8_and_johab.so
-lib/postgresql/utf8_and_shift_jis_2004.so
 lib/postgresql/utf8_and_sjis.so
+lib/postgresql/utf8_and_sjis2004.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 %%DOCSDIR%%/README-server
@@ -46,62 +46,69 @@ share/postgresql/postgresql.conf.sample
 share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
 share/postgresql/system_views.sql
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.0.mo
 share/postgresql/postgres.shdescription
 share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Africa/Abidjan
@@ -180,6 +187,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Atikokan
 %%TZDATA%%share/postgresql/timezone/America/Atka
 %%TZDATA%%share/postgresql/timezone/America/Bahia
+%%TZDATA%%share/postgresql/timezone/America/Bahia_Banderas
 %%TZDATA%%share/postgresql/timezone/America/Barbados
 %%TZDATA%%share/postgresql/timezone/America/Belem
 %%TZDATA%%share/postgresql/timezone/America/Belize
@@ -317,6 +325,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Antarctica/Casey
 %%TZDATA%%share/postgresql/timezone/Antarctica/Davis
 %%TZDATA%%share/postgresql/timezone/Antarctica/DumontDUrville
+%%TZDATA%%share/postgresql/timezone/Antarctica/Macquarie
 %%TZDATA%%share/postgresql/timezone/Antarctica/Mawson
 %%TZDATA%%share/postgresql/timezone/Antarctica/McMurdo
 %%TZDATA%%share/postgresql/timezone/Antarctica/Palmer
@@ -612,6 +621,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Pacific/Apia
 %%TZDATA%%share/postgresql/timezone/Pacific/Auckland
 %%TZDATA%%share/postgresql/timezone/Pacific/Chatham
+%%TZDATA%%share/postgresql/timezone/Pacific/Chuuk
 %%TZDATA%%share/postgresql/timezone/Pacific/Easter
 %%TZDATA%%share/postgresql/timezone/Pacific/Efate
 %%TZDATA%%share/postgresql/timezone/Pacific/Enderbury
@@ -637,6 +647,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Pacific/Pago_Pago
 %%TZDATA%%share/postgresql/timezone/Pacific/Palau
 %%TZDATA%%share/postgresql/timezone/Pacific/Pitcairn
+%%TZDATA%%share/postgresql/timezone/Pacific/Pohnpei
 %%TZDATA%%share/postgresql/timezone/Pacific/Ponape
 %%TZDATA%%share/postgresql/timezone/Pacific/Port_Moresby
 %%TZDATA%%share/postgresql/timezone/Pacific/Rarotonga