7 files changed, 78 insertions, 102 deletions

diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index ac0672bbd051..4398586e3e22 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 PKGNAMESUFFIX?=	-server
-PORTVERSION?=	8.0.3
+PORTVERSION?=	8.1.0
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -21,8 +21,6 @@ COMMENT?=	The most advanced open-source database available anywhere
 CONFLICTS?=	${PORTNAME}-client-7.[0-9]* \
 		${PORTNAME}${PKGNAMESUFFIX}-7.[0-9]*
 
-BROKEN=		Work in progress, nothing to see, please move along...
-
 WRKSRC=		${WRKDIR}/postgresql-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
@@ -97,24 +95,25 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
 
 # See http://gppl.moonbone.ru/ for more info
-OPTIONS+=	HIER  "Builds with query hierarchy (server)" off
+#OPTIONS+=	HIER  "Builds with query hierarchy (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_HIER)
+BROKEN=		no HIER patch for 8.1 series exists
 PATCH_SITES+=	http://gppl.moonbone.ru/:hier801054
 PATCHFILES+=	hier-Pg8.0.1-0.5.4.diff.gz:hier801054
 USE_BISON=	yes
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_ICU)
-USE_AUTOCONF_VER=253
+USE_AUTOCONF_VER=259
 CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata.32:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	icudata.34:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-803-icu-2005-08-16.diff.gz:icu
+PATCHFILES+=	pg-810-icu-34-2005-11-09.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
@@ -152,6 +151,9 @@ INSTALL_TARGET=	install-strip
 .  endif
 
 .  if defined(WITH_MIT_KRB5)
+.    if exists(/usr/lib/libkrb5.so)
+BROKEN=		"You must remove heimdal's /usr/lib/libkrb5.so* to build successfully with MIT-KRB"
+.    endif
 WITH_KRB5=	yes
 KRB5_HOME?=	${LOCALBASE}
 KRB5CONF=	${KRB5_HOME}/bin/krb5-config
@@ -160,20 +162,17 @@ LIB_DEPENDS+=	krb5.3:${PORTSDIR}/security/krb5
 
 .  if defined(WITH_HEIMDAL_KRB5)
 WITH_KRB5=	yes
-.    if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a)
-KRB5CONF=	${HEIMDAL_HOME}/bin/krb5-config
-.    elif ( defined(MAKE_KERBEROS5) || ${OSVERSION} > 500105 ) && exists(${DESTDIR}/usr/lib/libkrb5.a)
-KRB5CONF=	${DESTDIR}/usr/bin/krb5-config
-.    else
+# Base heimdal in /usr will not link properly with postgresql, we must
+# use the port. See
+# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
 LIB_DEPENDS+=	krb5:${PORTSDIR}/security/heimdal
 KRB5CONF=	${LOCALBASE}/bin/krb5-config
-.    endif
 .  endif
 
 .  if defined(WITH_KRB5)
 CONFIGURE_ARGS+=	--with-krb5
-LDFLAGS+=	`${KRB5CONF} --libs krb5`
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
+LIBS=		`${KRB5CONF} --libs krb5`
+CONFIGURE_ENV+=	LIBS="${LIBS}"
 .  endif
 
 .  if defined(SERVER_ONLY) && defined(WITH_TESTS)
@@ -196,19 +195,22 @@ 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_dump.1 pg_dumpall.1 pg_resetxlog.1 pg_restore.1 \
-		postgres.1 postmaster.1 psql.1 vacuumdb.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_role.7						      \
 		alter_schema.7 alter_sequence.7 alter_table.7		      \
 		alter_trigger.7 alter_user.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_function.7	      \
 		create_group.7 create_index.7 create_language.7		      \
 		create_operator.7 create_operator_class.7		      \
+		create_role.7						      \
 		create_rule.7 create_schema.7 create_sequence.7		      \
 		create_table.7 create_table_as.7 create_trigger.7	      \
 		create_type.7 create_user.7 create_view.7 deallocate.7	      \
@@ -216,25 +218,17 @@ MAN7=		abort.7 alter_aggregate.7 alter_conversion.7 alter_database.7 \
 		drop_aggregate.7 drop_cast.7 drop_conversion.7		      \
 		drop_database.7 drop_domain.7 drop_function.7		      \
 		drop_group.7 drop_index.7 drop_language.7		      \
-		drop_operator.7 drop_operator_class.7 drop_rule.7	      \
+		drop_operator.7 drop_operator_class.7 drop_role.7	      \
+		drop_rule.7						      \
 		drop_schema.7 drop_sequence.7 drop_table.7 drop_trigger.7     \
 		drop_type.7 drop_user.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 reindex.7 reset.7	      \
-		revoke.7 rollback.7 select.7 select_into.7 set.7	      \
-		set_constraints.7 set_transaction.7 show.7		      \
+		lock.7 move.7 notify.7 prepare.7 prepare_transaction.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		      \
-		spi_connect.7 spi_copytuple.7 spi_cursor_close.7	      \
-		spi_cursor_fetch.7 spi_cursor_find.7 spi_cursor_move.7	      \
-		spi_cursor_open.7 spi_exec.7 spi_execp.7 spi_execute.7	      \
-		spi_execute_plan.7					      \
-		spi_finish.7 spi_fname.7 spi_fnumber.7 spi_freeplan.7	      \
-		spi_freetuple.7 spi_freetuptable.7 spi_getargcount.7	      \
-		spi_getargtypeid.7 spi_getbinval.7 spi_getrelname.7	      \
-		spi_gettype.7 spi_gettypeid.7 spi_getvalue.7		      \
-		spi_is_cursor_plan.7 spi_modifytuple.7 spi_palloc.7	      \
-		spi_pfree.7 spi_pop.7 spi_prepare.7 spi_push.7		      \
-		spi_repalloc.7 spi_returntuple.7 spi_saveplan.7		      \
 		truncate.7 unlisten.7 update.7 vacuum.7			      \
 		alter_operator.7 alter_tablespace.7 alter_type.7	      \
 		create_tablespace.7 drop_tablespace.7			      \
diff --git a/databases/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index 0a61ebc5441a..df22506b50e5 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-server/distinfo
@@ -1,12 +1,15 @@
-MD5 (postgresql/postgresql-base-8.0.3.tar.bz2) = 35ff2b9a3bc5c65f55b4192a334b0e88
-SIZE (postgresql/postgresql-base-8.0.3.tar.bz2) = 7818251
-MD5 (postgresql/postgresql-docs-8.0.3.tar.bz2) = a9bb1e0dbc7ff862a30b6b9ca00b6470
-SIZE (postgresql/postgresql-docs-8.0.3.tar.bz2) = 2213693
-MD5 (postgresql/postgresql-opt-8.0.3.tar.bz2) = ea1ce6f570a4408e934af914de71da0e
-SIZE (postgresql/postgresql-opt-8.0.3.tar.bz2) = 133623
-MD5 (postgresql/postgresql-test-8.0.3.tar.bz2) = 4dac47d2c87bb83ba6f2cd788ec794a6
-SIZE (postgresql/postgresql-test-8.0.3.tar.bz2) = 959642
-MD5 (postgresql/hier-Pg8.0.1-0.5.4.diff.gz) = 1d410cfb38253675fee36c8f9ee655e2
-SIZE (postgresql/hier-Pg8.0.1-0.5.4.diff.gz) = 30662
-MD5 (postgresql/pg-803-icu-2005-08-16.diff.gz) = 83cb174132c5dd7aeec622bc5c9a8b0d
-SIZE (postgresql/pg-803-icu-2005-08-16.diff.gz) = 4190
+MD5 (postgresql/postgresql-base-8.1.0.tar.bz2) = 61ada6238aebbe6f3850895af25df37b
+SHA256 (postgresql/postgresql-base-8.1.0.tar.bz2) = 604b6be364d88a2d0b0a4bae2165be0072bb8e79129c874f9a7fa1734dc8cb38
+SIZE (postgresql/postgresql-base-8.1.0.tar.bz2) = 8027880
+MD5 (postgresql/postgresql-docs-8.1.0.tar.bz2) = 544a41caa516cd9c6a07fa5d604a91bd
+SHA256 (postgresql/postgresql-docs-8.1.0.tar.bz2) = 9ef412d3859646ec6d3478cd828c395e56610cc7a54daa18381da53153847d7b
+SIZE (postgresql/postgresql-docs-8.1.0.tar.bz2) = 2443376
+MD5 (postgresql/postgresql-opt-8.1.0.tar.bz2) = 5fd9e43abc22e6af1ca819e43eb1fbd2
+SHA256 (postgresql/postgresql-opt-8.1.0.tar.bz2) = a9dbb375428f2250e7fcb5e66be2eaf3b87644f33f36b195b0d87ad91432bb40
+SIZE (postgresql/postgresql-opt-8.1.0.tar.bz2) =  141420
+MD5 (postgresql/postgresql-test-8.1.0.tar.bz2) = 594b045aa80aef1907bbd6b922a1e02b
+SHA256 (postgresql/postgresql-test-8.1.0.tar.bz2) = 1fd3b5fb35d39b0fe703124b982cf4b10d6495f99eb3519cb2c59134a8bfcb2f
+SIZE (postgresql/postgresql-test-8.1.0.tar.bz2) =  968672
+MD5 (postgresql/pg-810-icu-34-2005-11-09.diff.gz) = b1f6f40f6fcc887f35d57bb7aee2ed09
+SHA256 (postgresql/pg-810-icu-34-2005-11-09.diff.gz) = 714d030be73d3df1fd5f47409e0b059ef1d04ad9cb56255b5d803f25b8c93f1a
+SIZE (postgresql/pg-810-icu-34-2005-11-09.diff.gz) = 3956
diff --git a/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd b/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd
index 89aaa9a2c0cc..81339e98e8db 100644
--- a/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd
+++ b/databases/postgresql90-server/files/patch-src-makefiles-Makefile.freebsd
@@ -1,14 +1,5 @@
 --- src/makefiles/Makefile.freebsd.orig	Fri Nov 19 01:41:39 2004
 +++ src/makefiles/Makefile.freebsd	Tue Dec 21 02:44:09 2004
-@@ -11,7 +11,7 @@
- ifeq ($(findstring sparc,$(host_cpu)), sparc)
- CFLAGS_SL = -fPIC -DPIC
- else
--CFLAGS_SL = -fpic -DPIC
-+CFLAGS_SL = -fPIC -DPIC
- endif
- 
- 
 @@ -29,3 +29,5 @@
  endif
  
diff --git a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample b/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
index 07363e882113..da57f46e3552 100644
--- a/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
+++ b/databases/postgresql90-server/files/patch-src:backend:utils:misc:postgresql.conf.sample
@@ -1,18 +1,18 @@
---- src/backend/utils/misc/postgresql.conf.sample~	Fri Nov  5 20:16:16 2004
-+++ src/backend/utils/misc/postgresql.conf.sample	Tue Dec 21 02:06:45 2004
-@@ -172,6 +172,7 @@
+--- src/backend/utils/misc/postgresql.conf.sample~	Tue Nov  8 00:45:49 2005
++++ src/backend/utils/misc/postgresql.conf.sample	Tue Nov  8 00:47:16 2005
+@@ -206,6 +206,7 @@
  
  # - Where to Log -
  
 +log_destination = 'syslog'
- #log_destination = 'stderr'	# Valid values are combinations of stderr,
-                                 # syslog and eventlog, depending on
-                                 # platform.
-@@ -219,6 +220,7 @@
- 				 
- #log_min_duration_statement = -1 # -1 is disabled, in milliseconds.
+ #log_destination = 'stderr'		# Valid values are combinations of 
+ 					# stderr, syslog and eventlog, 
+ 					# depending on platform.
+@@ -283,6 +284,7 @@
+ #log_min_duration_statement = -1	# -1 is disabled, 0 logs all statements
+ 					# and their durations, in milliseconds.
  
-+silent_mode = true
- #silent_mode = false		 # DO NOT USE without syslog or redirect_stderr
++silent_mode = on
+ #silent_mode = off			# DO NOT USE without syslog or 
+ 					# redirect_stderr
  
- # - What to Log -
diff --git a/databases/postgresql90-server/pkg-plist-client b/databases/postgresql90-server/pkg-plist-client
index 5810e57ecead..cda05962118f 100644
--- a/databases/postgresql90-server/pkg-plist-client
+++ b/databases/postgresql90-server/pkg-plist-client
@@ -16,19 +16,21 @@ bin/pg_dumpall
 bin/pg_resetxlog
 bin/pg_restore
 bin/psql
+bin/reindexdb
 bin/vacuumdb
 include/postgresql/server/access/attnum.h
 include/postgresql/server/access/clog.h
 include/postgresql/server/access/genam.h
 include/postgresql/server/access/gist.h
+include/postgresql/server/access/gist_private.h
 include/postgresql/server/access/gistscan.h
 include/postgresql/server/access/hash.h
 include/postgresql/server/access/heapam.h
 include/postgresql/server/access/hio.h
 include/postgresql/server/access/htup.h
-include/postgresql/server/access/ibit.h
 include/postgresql/server/access/iqual.h
 include/postgresql/server/access/itup.h
+include/postgresql/server/access/multixact.h
 include/postgresql/server/access/nbtree.h
 include/postgresql/server/access/printtup.h
 include/postgresql/server/access/relscan.h
@@ -43,6 +45,8 @@ include/postgresql/server/access/transam.h
 include/postgresql/server/access/tupdesc.h
 include/postgresql/server/access/tupmacs.h
 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/xact.h
 include/postgresql/server/access/xlog.h
@@ -52,7 +56,6 @@ include/postgresql/server/access/xlogutils.h
 include/postgresql/server/bootstrap/bootstrap.h
 include/postgresql/server/c.h
 include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catname.h
 include/postgresql/server/catalog/catversion.h
 include/postgresql/server/catalog/dependency.h
 include/postgresql/server/catalog/heap.h
@@ -65,6 +68,9 @@ include/postgresql/server/catalog/pg_amop.h
 include/postgresql/server/catalog/pg_amproc.h
 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
@@ -73,7 +79,6 @@ include/postgresql/server/catalog/pg_conversion.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_group.h
 include/postgresql/server/catalog/pg_index.h
 include/postgresql/server/catalog/pg_inherits.h
 include/postgresql/server/catalog/pg_language.h
@@ -82,14 +87,14 @@ include/postgresql/server/catalog/pg_listener.h
 include/postgresql/server/catalog/pg_namespace.h
 include/postgresql/server/catalog/pg_opclass.h
 include/postgresql/server/catalog/pg_operator.h
+include/postgresql/server/catalog/pg_pltemplate.h
 include/postgresql/server/catalog/pg_proc.h
 include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_shadow.h
+include/postgresql/server/catalog/pg_shdepend.h
 include/postgresql/server/catalog/pg_statistic.h
 include/postgresql/server/catalog/pg_tablespace.h
 include/postgresql/server/catalog/pg_trigger.h
 include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_version.h
 include/postgresql/server/commands/alter.h
 include/postgresql/server/commands/async.h
 include/postgresql/server/commands/cluster.h
@@ -124,6 +129,10 @@ include/postgresql/server/executor/hashjoin.h
 include/postgresql/server/executor/instrument.h
 include/postgresql/server/executor/nodeAgg.h
 include/postgresql/server/executor/nodeAppend.h
+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/nodeFunctionscan.h
 include/postgresql/server/executor/nodeGroup.h
 include/postgresql/server/executor/nodeHash.h
@@ -178,6 +187,7 @@ include/postgresql/server/nodes/primnodes.h
 include/postgresql/server/nodes/print.h
 include/postgresql/server/nodes/readfuncs.h
 include/postgresql/server/nodes/relation.h
+include/postgresql/server/nodes/tidbitmap.h
 include/postgresql/server/nodes/value.h
 include/postgresql/server/optimizer/clauses.h
 include/postgresql/server/optimizer/cost.h
@@ -196,6 +206,7 @@ include/postgresql/server/optimizer/paths.h
 include/postgresql/server/optimizer/plancat.h
 include/postgresql/server/optimizer/planmain.h
 include/postgresql/server/optimizer/planner.h
+include/postgresql/server/optimizer/predtest.h
 include/postgresql/server/optimizer/prep.h
 include/postgresql/server/optimizer/restrictinfo.h
 include/postgresql/server/optimizer/subselect.h
@@ -293,6 +304,7 @@ include/postgresql/server/storage/pg_shmem.h
 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/relfilenode.h
 include/postgresql/server/storage/s_lock.h
 include/postgresql/server/storage/shmem.h
@@ -320,6 +332,7 @@ 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
@@ -340,6 +353,7 @@ include/postgresql/server/utils/palloc.h
 include/postgresql/server/utils/pg_crc.h
 include/postgresql/server/utils/pg_locale.h
 include/postgresql/server/utils/pg_lzcompress.h
+include/postgresql/server/utils/pg_rusage.h
 include/postgresql/server/utils/portal.h
 include/postgresql/server/utils/ps_status.h
 include/postgresql/server/utils/rel.h
diff --git a/databases/postgresql90-server/pkg-plist-contrib b/databases/postgresql90-server/pkg-plist-contrib
index fd3f553e5b25..aba5a7b1cc19 100644
--- a/databases/postgresql90-server/pkg-plist-contrib
+++ b/databases/postgresql90-server/pkg-plist-contrib
@@ -1,25 +1,17 @@
 bin/DBMirror.pl
 bin/clean_pending.pl
 bin/dbf2pg
-bin/findoidjoins
 bin/fti.pl
-bin/ipc_check
-bin/make_oidjoins_check
-bin/my2pg.pl
-bin/mysql2pgsql
 bin/oid2name
-bin/pg_autovacuum
-bin/pg_dumplo
 bin/pgbench
-bin/reindexdb
 bin/vacuumlo
 lib/postgresql/_int.so
 lib/postgresql/autoinc.so
 lib/postgresql/btree_gist.so
+lib/postgresql/pg_buffercache.so
 lib/postgresql/chkpass.so
 lib/postgresql/cube.so
 lib/postgresql/dblink.so
-lib/postgresql/dbsize.so
 lib/postgresql/earthdistance.so
 lib/postgresql/fti.so
 lib/postgresql/fuzzystrmatch.so
@@ -28,20 +20,15 @@ lib/postgresql/int_aggregate.so
 lib/postgresql/isbn_issn.so
 lib/postgresql/lo.so
 lib/postgresql/ltree.so
-lib/postgresql/misc_utils.so
 lib/postgresql/moddatetime.so
-lib/postgresql/noup.so
 lib/postgresql/pending.so
 lib/postgresql/pg_trgm.so
 lib/postgresql/pgcrypto.so
 lib/postgresql/pgstattuple.so
 lib/postgresql/refint.so
-lib/postgresql/rtree_gist.so
 lib/postgresql/seg.so
-lib/postgresql/string_io.so
 lib/postgresql/tablefunc.so
 lib/postgresql/timetravel.so
-lib/postgresql/tsearch.so
 lib/postgresql/tsearch2.so
 lib/postgresql/user_locks.so
 %%DOCSDIR%%/README-contrib
@@ -53,37 +40,26 @@ lib/postgresql/user_locks.so
 %%DOCSDIR%%/contrib/README.dbf2pg
 %%DOCSDIR%%/contrib/README.dblink
 %%DOCSDIR%%/contrib/README.dbmirror
-%%DOCSDIR%%/contrib/README.dbsize
 %%DOCSDIR%%/contrib/README.earthdistance
-%%DOCSDIR%%/contrib/README.findoidjoins
 %%DOCSDIR%%/contrib/README.fti
 %%DOCSDIR%%/contrib/README.fuzzystrmatch
 %%DOCSDIR%%/contrib/README.int_aggregate
 %%DOCSDIR%%/contrib/README.intarray
-%%DOCSDIR%%/contrib/README.ipc_check
 %%DOCSDIR%%/contrib/README.isbn_issn
 %%DOCSDIR%%/contrib/README.lo
 %%DOCSDIR%%/contrib/README.ltree
-%%DOCSDIR%%/contrib/README.misc_utils
-%%DOCSDIR%%/contrib/README.mysql
-%%DOCSDIR%%/contrib/README.noup
 %%DOCSDIR%%/contrib/README.oid2name
-%%DOCSDIR%%/contrib/README.pg_autovacuum
-%%DOCSDIR%%/contrib/README.pg_dumplo
+%%DOCSDIR%%/contrib/README.pg_buffercache
 %%DOCSDIR%%/contrib/README.pg_trgm
 %%DOCSDIR%%/contrib/README.pgbench
 %%DOCSDIR%%/contrib/README.pgbench_jis
 %%DOCSDIR%%/contrib/README.pgcrypto
 %%DOCSDIR%%/contrib/README.pgstattuple
 %%DOCSDIR%%/contrib/README.pgstattuple.euc_jp
-%%DOCSDIR%%/contrib/README.reindexdb
-%%DOCSDIR%%/contrib/README.rtree_gist
 %%DOCSDIR%%/contrib/README.seg
 %%DOCSDIR%%/contrib/README.soundex
 %%DOCSDIR%%/contrib/README.spi
-%%DOCSDIR%%/contrib/README.string_io
 %%DOCSDIR%%/contrib/README.tablefunc
-%%DOCSDIR%%/contrib/README.tsearch
 %%DOCSDIR%%/contrib/README.tsearch2
 %%DOCSDIR%%/contrib/README.user_locks
 %%DOCSDIR%%/contrib/README.vacuumlo
@@ -100,7 +76,6 @@ share/postgresql/contrib/btree_gist.sql
 share/postgresql/contrib/chkpass.sql
 share/postgresql/contrib/cube.sql
 share/postgresql/contrib/dblink.sql
-share/postgresql/contrib/dbsize.sql
 share/postgresql/contrib/earthdistance.sql
 share/postgresql/contrib/english.stop
 share/postgresql/contrib/fti.sql
@@ -112,21 +87,17 @@ share/postgresql/contrib/lo.sql
 share/postgresql/contrib/lo_drop.sql
 share/postgresql/contrib/lo_test.sql
 share/postgresql/contrib/ltree.sql
-share/postgresql/contrib/misc_utils.sql
 share/postgresql/contrib/moddatetime.sql
-share/postgresql/contrib/noup.sql
+share/postgresql/contrib/pg_buffercache.sql
 share/postgresql/contrib/pg_trgm.sql
 share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/pgstattuple.sql
 share/postgresql/contrib/refint.sql
-share/postgresql/contrib/rtree_gist.sql
 share/postgresql/contrib/russian.stop
 share/postgresql/contrib/seg.sql
 share/postgresql/contrib/slaveDatabase.conf
-share/postgresql/contrib/string_io.sql
 share/postgresql/contrib/tablefunc.sql
 share/postgresql/contrib/timetravel.sql
-share/postgresql/contrib/tsearch.sql
 share/postgresql/contrib/tsearch2.sql
 share/postgresql/contrib/untsearch2.sql
 share/postgresql/contrib/user_locks.sql
diff --git a/databases/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index 24cff6b753f0..9c00caef50c8 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-server/pkg-plist-server
@@ -24,10 +24,11 @@ lib/postgresql/utf8_and_iso8859.so
 lib/postgresql/utf8_and_iso8859_1.so
 lib/postgresql/utf8_and_johab.so
 lib/postgresql/utf8_and_sjis.so
-lib/postgresql/utf8_and_tcvn.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win1250.so
+lib/postgresql/utf8_and_win1252.so
 lib/postgresql/utf8_and_win1256.so
+lib/postgresql/utf8_and_win1258.so
 lib/postgresql/utf8_and_win874.so
 lib/postgresql/plpgsql.so
 %%DOCSDIR%%/README-server
@@ -246,6 +247,7 @@ share/postgresql/timezone/Asia/Ujung_Pandang
 share/postgresql/timezone/Asia/Tel_Aviv
 share/postgresql/timezone/Asia/Thimbu
 share/postgresql/timezone/Asia/Ulan_Bator
+share/postgresql/timezone/Australia/Currie
 share/postgresql/timezone/Australia/Darwin
 share/postgresql/timezone/Australia/Perth
 share/postgresql/timezone/Australia/Brisbane
@@ -365,6 +367,7 @@ share/postgresql/timezone/CET
 share/postgresql/timezone/MET
 share/postgresql/timezone/EET
 share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Coral_Harbour
 share/postgresql/timezone/America/Scoresbysund
 share/postgresql/timezone/America/Godthab
 share/postgresql/timezone/America/Thule