8 files changed, 210 insertions, 166 deletions

diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 7ce3f7183e65..9769eab54ace 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.0.4
-PORTREVISION=	1
+DISTVERSION?=	9.1beta1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -17,12 +16,14 @@ MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
 CONFLICTS?=	${PORTNAME}-client-[78]* \
-		${PORTNAME}${PKGNAMESUFFIX}-[78]*
+		${PORTNAME}-client-9.[02-9]* \
+		${PORTNAME}${PKGNAMESUFFIX}-[78]* \
+		${PORTNAME}${PKGNAMESUFFIX}-9.[02-9]
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
 DIST_SUBDIR=	postgresql
 
-UNIQUENAME?=	${PORTNAME}90
+UNIQUENAME?=	${PORTNAME}91
 LATEST_LINK?=	${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX}
 
 USE_BZIP2=	YES
@@ -34,7 +35,7 @@ GNU_CONFIGURE=	YES
 .endif
 
 PG_USER?=	pgsql
-PG_GROUP?=	pgsql
+PG_GROUP?=	${PG_USER}
 PG_UID?=	70
 
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -61,6 +62,12 @@ SERVER_ONLY=	yes
 USE_RC_SUBR=	postgresql
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+USERS?=		${PG_USER}
+.if (${USERS} != "pgsql")
+UID_FILES+=	${WRKDIR}/pguid
+GID_FILES+=	${WRKDIR}/pggid
+.endif
+GROUPS?=	${PG_GROUP}
 SUB_FILES+=	502.pgsql
 .endif
 
@@ -98,20 +105,20 @@ OPTIONS+=	DEBUG "Builds with debugging symbols" off
 OPTIONS+=	GSSAPI "BUild with GSSAPI support" 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)" on
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
-USE_AUTOTOOLS=	autoconf
-CONFIGURE_ARGS+=--with-icu
-PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-900-icu-2010-09-19.diff.gz:icu
-LIB_DEPENDS+=	icudata.46:${PORTSDIR}/devel/icu
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
-.  endif
+#.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+#USE_AUTOTOOLS=	autoconf
+#CONFIGURE_ARGS+=--with-icu
+#PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
+#PATCHFILES+=	pg-900-icu-2010-09-19.diff.gz:icu
+#LIB_DEPENDS+=	icudata.46:${PORTSDIR}/devel/icu
+#EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
+#.  endif
 
 PATCH_DIST_STRIP=-p1
 
@@ -202,7 +209,7 @@ 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	   \
-		pg_config.1 pg_controldata.1 pg_ctl.1   \
+		pg_basebackup.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
 
@@ -228,8 +235,9 @@ MAN3=		SPI_connect.3 SPI_copytuple.3 SPI_cursor_close.3 SPI_cursor_fetch.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 \
+MAN7=		ABORT.7 ALTER_AGGREGATE.7 ALTER_COLLATION.7 ALTER_CONVERSION.7 \
+		ALTER_DATABASE.7 ALTER_EXTENSION.7 ALTER_DEFAULT_PRIVILEGES.7 \
+		ALTER_FOREIGN_TABLE.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	      \
@@ -244,7 +252,7 @@ MAN7=		ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.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_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		      \
@@ -280,7 +288,10 @@ MAN7=		ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.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
+		SAVEPOINT.7 VALUES.7 WITH.7 \
+		CREATE_COLLATION.7 CREATE_EXTENSION.7 CREATE_FOREIGN_TABLE.7 \
+		DROP_COLLATION.7 DROP_EXTENSION.7 DROP_FOREIGN_TABLE.7 \
+		SECURITY_LABEL.7
 .endif
 
 .if defined(SERVER_ONLY)
@@ -299,7 +310,7 @@ pre-configure:
 
 do-build:
 	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks
-	@ for dir in ${BUILD_DIRS}; do \
+	@ for dir in src/port ${BUILD_DIRS}; do \
 		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \
 	done
 
@@ -309,27 +320,26 @@ PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .  if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
 SUB_FILES+=     pkg-install${PKGNAMESUFFIX}
-SUB_LIST=       PG_GROUP=$(PG_GROUP) \
-                PG_USER=$(PG_USER) \
-                PG_UID=$(PG_UID)
-PLIST_SUB+=     PG_USER=$(PG_USER)
+SUB_LIST=	PG_GROUP=$(PG_GROUP) \
+		PG_USER=$(PG_USER) \
+		PG_UID=$(PG_UID)
 PKGINSTALL=     ${WRKDIR}/pkg-install${PKGNAMESUFFIX}
 .  endif
 .endif
 
-.if defined(SERVER_ONLY)
-pre-su-install:
-	@ ${SETENV} PKG_PREFIX=${PREFIX} PG_USER=$(PG_USER) PG_GROUP=$(PG_GROUP) \
-		${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
-
 .if !defined(NO_BUILD)
 post-patch:
 	@${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in
-.  if defined(WITH_ICU)
-	@${REINPLACE_CMD} -E -e \
-		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
-		${WRKSRC}/configure.in
+#.  if defined(WITH_ICU)
+#	@${REINPLACE_CMD} -E -e \
+#		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
+#		${WRKSRC}/configure.in
+#.  endif
+
+.  if defined(SERVER_ONLY) && (${PG_USER} != "pgsql")
+pre-install:
+	@${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid
+	@${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid
 .  endif
 
 do-install:
diff --git a/databases/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index fab2290611db..18cfb25a4581 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-server/distinfo
@@ -1,4 +1,4 @@
-SHA256 (postgresql/postgresql-9.0.4.tar.bz2) = 30572706e3176228415991895e63a8b77343a5abad11407961cfd08790be9e84
-SIZE (postgresql/postgresql-9.0.4.tar.bz2) = 14040871
+SHA256 (postgresql/postgresql-9.1beta1.tar.bz2) = 1b7dcabe7826b9e5111754aa92c0ad68015047bf26f0dc8e98f7a77af2913adb
+SIZE (postgresql/postgresql-9.1beta1.tar.bz2) = 14384089
 SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9
 SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349
diff --git a/databases/postgresql91-server/files/502.pgsql.in b/databases/postgresql91-server/files/502.pgsql.in
index caa2f90a58c0..e577f83467f4 100644
--- a/databases/postgresql91-server/files/502.pgsql.in
+++ b/databases/postgresql91-server/files/502.pgsql.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/databases/postgresql91-server/files/502.pgsql.in,v 1.2 2011-04-20 15:30:33 girgen Exp $
+# $FreeBSD: /tmp/pcvs/ports/databases/postgresql91-server/files/502.pgsql.in,v 1.3 2011-06-11 23:14:30 girgen Exp $
 #
 # Maintenance shell script to vacuum and backup database
 # Put this in /usr/local/etc/periodic/daily, and it will be run 
@@ -19,10 +19,12 @@
 # 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"
-daily_pgsql_pgdump_args="-b -F c"
+daily_pgsql_user=%%PG_USER%%
+daily_pgsql_vacuum_args="-U ${daily_pgsql_user} -qaz"
+daily_pgsql_pgdump_args="-U ${daily_pgsql_user} -bF c"
+daily_pgsql_pgdumpall_globals_args="-U ${daily_pgsql_user}"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
-daily_pgsql_backupdir="~%%PG_USER%%/backups"
+daily_pgsql_backupdir="~${daily_pgsql_user}/backups"
 daily_pgsql_savedays="7"
 
 # If there is a global system configuration file, suck it in.
@@ -44,7 +46,7 @@ pgsql_backup() {
 	# but this might not be where you want the backups...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir -m 700 ${backupdir}; chown %%PG_USER%% ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
 	fi
 
 	echo
@@ -55,13 +57,14 @@ pgsql_backup() {
 	rc=$?
 	now=`date "+%Y-%m-%dT%H:%M:%S"`
 	file=${daily_pgsql_backupdir}/pgglobals_${now}
-	su -l %%PG_USER%% -c "umask 077; pg_dumpall -g -U %%PG_USER%% | gzip -9 > ${file}.gz"
+	su -l ${daily_pgsql_user} -c \
+		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals__args} | gzip -9 > ${file}.gz"
 
 	db=$1
 	while shift; do
 	    echo -n " $db"
 	    file=${backupdir}/pgdump_${db}_${now}
-	    su -l %%PG_USER%% -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -U %%PG_USER%% -f ${file} ${db}"
+	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
 	    [ $? -gt 0 ] && rc=3
 		db=$1
 	done
@@ -99,7 +102,7 @@ case "$daily_pgsql_vacuum_enable" in
 
 	echo
 	echo "PostgreSQL vacuum"
-	su -l %%PG_USER%% -c "vacuumdb -a -q -U %%PG_USER%% ${daily_pgsql_vacuum_args}"
+	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
 	    echo
diff --git a/databases/postgresql91-server/files/pkg-install-server.in b/databases/postgresql91-server/files/pkg-install-server.in
index efa9b14c2788..66298484c23b 100644
--- a/databases/postgresql91-server/files/pkg-install-server.in
+++ b/databases/postgresql91-server/files/pkg-install-server.in
@@ -1,11 +1,8 @@
 #! /bin/sh
 
-# $FreeBSD: /tmp/pcvs/ports/databases/postgresql91-server/files/Attic/pkg-install-server.in,v 1.1 2011-04-18 23:34:27 girgen Exp $
+# $FreeBSD: /tmp/pcvs/ports/databases/postgresql91-server/files/Attic/pkg-install-server.in,v 1.2 2011-06-11 23:14:30 girgen Exp $
 
 PATH=/bin:/usr/bin:/usr/sbin
-PG_USER=%%PG_USER%%
-PG_GROUP=%%PG_GROUP%%
-PG_UID=%%PG_UID%%
 
 backupwarning() { echo "
 
@@ -23,43 +20,6 @@ backupwarning() { echo "
 }
 
 case $2 in
-PRE-INSTALL)
-	backupwarning
-	PGUSER=${PGUSER:-${PG_USER}}
-	PGGROUP=${PGGROUP:-${PG_GROUP}}
-	DB_DIR=${PKG_PREFIX}/${PGUSER}
-	UID=${PG_UID}
-	GID=${PG_UID}
-
-	if pw group show "${PGGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${PGGROUP}\", so I will use it."
-	else
-		if pw groupadd ${PGGROUP} -g ${GID}; then
-			echo "Added group \"${PGGROUP}\"."
-		else
-			echo "Adding group \"${PGGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${PGUSER}" 2>/dev/null; then
-		echo "You already have a user \"${PGUSER}\", so I will use it."
-	else
-		if pw useradd ${PGUSER} -u ${UID} -g ${PGGROUP} -h - \
-			-d ${DB_DIR} -c "PostgreSQL Daemon"
-		then
-			echo "Added user \"${PGUSER}\"."
-		else
-			echo "Adding user \"${PGUSER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! [ -x ~${PGUSER} ] ; then 
-		install -m 755 -o ${PGUSER} -g ${PGGROUP} -d ${DB_DIR}
-	fi
-	;;
-
 BACKUPWARNING)
 	backupwarning
 	;;
diff --git a/databases/postgresql91-server/files/postgresql.in b/databases/postgresql91-server/files/postgresql.in
index d1e3c763f8da..1d89451644ce 100644
--- a/databases/postgresql91-server/files/postgresql.in
+++ b/databases/postgresql91-server/files/postgresql.in
@@ -10,7 +10,7 @@
 #
 #  postgresql_enable="YES"
 #  # optional
-#  postgresql_data="%%PREFIX%%/pgsql/data"
+#  postgresql_data="%%PREFIX%%/%%PG_USER%%/data"
 #  postgresql_flags="-w -s -m fast"
 #  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
 #  postgresql_class="default"
diff --git a/databases/postgresql91-server/pkg-plist-client b/databases/postgresql91-server/pkg-plist-client
index dac1a5f8c8f3..11f57af7a9d4 100644
--- a/databases/postgresql91-server/pkg-plist-client
+++ b/databases/postgresql91-server/pkg-plist-client
@@ -19,6 +19,7 @@ include/postgresql/server/access/attnum.h
 include/postgresql/server/access/clog.h
 include/postgresql/server/access/genam.h
 include/postgresql/server/access/gin.h
+include/postgresql/server/access/gin_private.h
 include/postgresql/server/access/gist.h
 include/postgresql/server/access/gist_private.h
 include/postgresql/server/access/gistscan.h
@@ -63,6 +64,8 @@ include/postgresql/server/catalog/heap.h
 include/postgresql/server/catalog/index.h
 include/postgresql/server/catalog/indexing.h
 include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/objectaccess.h
+include/postgresql/server/catalog/objectaddress.h
 include/postgresql/server/catalog/pg_aggregate.h
 include/postgresql/server/catalog/pg_am.h
 include/postgresql/server/catalog/pg_amop.h
@@ -73,6 +76,8 @@ include/postgresql/server/catalog/pg_auth_members.h
 include/postgresql/server/catalog/pg_authid.h
 include/postgresql/server/catalog/pg_cast.h
 include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_collation.h
+include/postgresql/server/catalog/pg_collation_fn.h
 include/postgresql/server/catalog/pg_constraint.h
 include/postgresql/server/catalog/pg_control.h
 include/postgresql/server/catalog/pg_conversion.h
@@ -83,8 +88,10 @@ 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
+include/postgresql/server/catalog/pg_extension.h
 include/postgresql/server/catalog/pg_foreign_data_wrapper.h
 include/postgresql/server/catalog/pg_foreign_server.h
+include/postgresql/server/catalog/pg_foreign_table.h
 include/postgresql/server/catalog/pg_index.h
 include/postgresql/server/catalog/pg_inherits.h
 include/postgresql/server/catalog/pg_inherits_fn.h
@@ -99,6 +106,7 @@ 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_seclabel.h
 include/postgresql/server/catalog/pg_shdepend.h
 include/postgresql/server/catalog/pg_shdescription.h
 include/postgresql/server/catalog/pg_statistic.h
@@ -117,6 +125,7 @@ include/postgresql/server/catalog/toasting.h
 include/postgresql/server/commands/alter.h
 include/postgresql/server/commands/async.h
 include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/collationcmds.h
 include/postgresql/server/commands/comment.h
 include/postgresql/server/commands/conversioncmds.h
 include/postgresql/server/commands/copy.h
@@ -124,11 +133,13 @@ include/postgresql/server/commands/dbcommands.h
 include/postgresql/server/commands/defrem.h
 include/postgresql/server/commands/discard.h
 include/postgresql/server/commands/explain.h
+include/postgresql/server/commands/extension.h
 include/postgresql/server/commands/lockcmds.h
 include/postgresql/server/commands/portalcmds.h
 include/postgresql/server/commands/prepare.h
 include/postgresql/server/commands/proclang.h
 include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/seclabel.h
 include/postgresql/server/commands/sequence.h
 include/postgresql/server/commands/tablecmds.h
 include/postgresql/server/commands/tablespace.h
@@ -140,7 +151,6 @@ include/postgresql/server/commands/variable.h
 include/postgresql/server/commands/view.h
 include/postgresql/server/dynloader.h
 include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdefs.h
 include/postgresql/server/executor/execdesc.h
 include/postgresql/server/executor/executor.h
 include/postgresql/server/executor/functions.h
@@ -153,6 +163,7 @@ 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/nodeForeignscan.h
 include/postgresql/server/executor/nodeFunctionscan.h
 include/postgresql/server/executor/nodeGroup.h
 include/postgresql/server/executor/nodeHash.h
@@ -161,6 +172,7 @@ 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/nodeMergeAppend.h
 include/postgresql/server/executor/nodeMergejoin.h
 include/postgresql/server/executor/nodeModifyTable.h
 include/postgresql/server/executor/nodeNestloop.h
@@ -181,6 +193,7 @@ 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/foreign/fdwapi.h
 include/postgresql/server/foreign/foreign.h
 include/postgresql/server/funcapi.h
 include/postgresql/server/getaddrinfo.h
@@ -249,6 +262,7 @@ 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_collate.h
 include/postgresql/server/parser/parse_cte.h
 include/postgresql/server/parser/parse_expr.h
 include/postgresql/server/parser/parse_func.h
@@ -320,6 +334,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/basebackup.h
+include/postgresql/server/replication/replnodes.h
+include/postgresql/server/replication/syncrep.h
 include/postgresql/server/replication/walprotocol.h
 include/postgresql/server/replication/walreceiver.h
 include/postgresql/server/replication/walsender.h
@@ -371,6 +388,7 @@ include/postgresql/server/storage/buf_internals.h
 include/postgresql/server/storage/buffile.h
 include/postgresql/server/storage/bufmgr.h
 include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/copydir.h
 include/postgresql/server/storage/fd.h
 include/postgresql/server/storage/freespace.h
 include/postgresql/server/storage/fsm_internals.h
@@ -380,6 +398,7 @@ include/postgresql/server/storage/item.h
 include/postgresql/server/storage/itemid.h
 include/postgresql/server/storage/itemptr.h
 include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/latch.h
 include/postgresql/server/storage/lmgr.h
 include/postgresql/server/storage/lock.h
 include/postgresql/server/storage/lwlock.h
@@ -388,9 +407,12 @@ include/postgresql/server/storage/pg_sema.h
 include/postgresql/server/storage/pg_shmem.h
 include/postgresql/server/storage/pmsignal.h
 include/postgresql/server/storage/pos.h
+include/postgresql/server/storage/predicate.h
+include/postgresql/server/storage/predicate_internals.h
 include/postgresql/server/storage/proc.h
 include/postgresql/server/storage/procarray.h
 include/postgresql/server/storage/procsignal.h
+include/postgresql/server/storage/reinit.h
 include/postgresql/server/storage/relfilenode.h
 include/postgresql/server/storage/s_lock.h
 include/postgresql/server/storage/shmem.h
diff --git a/databases/postgresql91-server/pkg-plist-contrib b/databases/postgresql91-server/pkg-plist-contrib
index 3471716032c0..20a4952033d6 100644
--- a/databases/postgresql91-server/pkg-plist-contrib
+++ b/databases/postgresql91-server/pkg-plist-contrib
@@ -44,86 +44,133 @@ lib/postgresql/timetravel.so
 lib/postgresql/tsearch2.so
 lib/postgresql/unaccent.so
 %%DOCSDIR%%/README-contrib
-%%DOCSDIR%%/contrib/README
-%%DOCSDIR%%/contrib/autoinc.example
-%%DOCSDIR%%/contrib/insert_username.example
-%%DOCSDIR%%/contrib/moddatetime.example
-%%DOCSDIR%%/contrib/refint.example
-%%DOCSDIR%%/contrib/timetravel.example
-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
-share/postgresql/contrib/dict_xsyn.sql
-share/postgresql/contrib/earthdistance.sql
-share/postgresql/contrib/fuzzystrmatch.sql
-share/postgresql/contrib/hstore.sql
-share/postgresql/contrib/insert_username.sql
-share/postgresql/contrib/int_aggregate.sql
-share/postgresql/contrib/isn.sql
-share/postgresql/contrib/lo.sql
-share/postgresql/contrib/ltree.sql
-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
-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
-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
-share/postgresql/contrib/uninstall_dict_xsyn.sql
-share/postgresql/contrib/uninstall_earthdistance.sql
-share/postgresql/contrib/uninstall_fuzzystrmatch.sql
-share/postgresql/contrib/uninstall_hstore.sql
-share/postgresql/contrib/uninstall_int_aggregate.sql
-share/postgresql/contrib/uninstall_isn.sql
-share/postgresql/contrib/uninstall_lo.sql
-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_unaccent.sql
+%%DOCSDIR%%/extension/README
+bin/pg_test_fsync
+lib/postgresql/auth_delay.so
+lib/postgresql/dummy_seclabel.so
+lib/postgresql/file_fdw.so
+share/doc/postgresql/extension/autoinc.example
+share/doc/postgresql/extension/insert_username.example
+share/doc/postgresql/extension/moddatetime.example
+share/doc/postgresql/extension/refint.example
+share/doc/postgresql/extension/timetravel.example
+share/postgresql/extension/adminpack--1.0.sql
+share/postgresql/extension/adminpack.control
+share/postgresql/extension/autoinc--1.0.sql
+share/postgresql/extension/autoinc--unpackaged--1.0.sql
+share/postgresql/extension/autoinc.control
+share/postgresql/extension/btree_gin--1.0.sql
+share/postgresql/extension/btree_gin--unpackaged--1.0.sql
+share/postgresql/extension/btree_gin.control
+share/postgresql/extension/btree_gist--1.0.sql
+share/postgresql/extension/btree_gist--unpackaged--1.0.sql
+share/postgresql/extension/btree_gist.control
+share/postgresql/extension/chkpass--1.0.sql
+share/postgresql/extension/chkpass--unpackaged--1.0.sql
+share/postgresql/extension/chkpass.control
+share/postgresql/extension/citext--1.0.sql
+share/postgresql/extension/citext--unpackaged--1.0.sql
+share/postgresql/extension/citext.control
+share/postgresql/extension/cube--1.0.sql
+share/postgresql/extension/cube--unpackaged--1.0.sql
+share/postgresql/extension/cube.control
+share/postgresql/extension/dblink--1.0.sql
+share/postgresql/extension/dblink--unpackaged--1.0.sql
+share/postgresql/extension/dblink.control
+share/postgresql/extension/dict_int--1.0.sql
+share/postgresql/extension/dict_int--unpackaged--1.0.sql
+share/postgresql/extension/dict_int.control
+share/postgresql/extension/dict_xsyn--1.0.sql
+share/postgresql/extension/dict_xsyn--unpackaged--1.0.sql
+share/postgresql/extension/dict_xsyn.control
+share/postgresql/extension/earthdistance--1.0.sql
+share/postgresql/extension/earthdistance--unpackaged--1.0.sql
+share/postgresql/extension/earthdistance.control
+share/postgresql/extension/file_fdw--1.0.sql
+share/postgresql/extension/file_fdw.control
+share/postgresql/extension/fuzzystrmatch--1.0.sql
+share/postgresql/extension/fuzzystrmatch--unpackaged--1.0.sql
+share/postgresql/extension/fuzzystrmatch.control
+share/postgresql/extension/hstore--1.0.sql
+share/postgresql/extension/hstore--unpackaged--1.0.sql
+share/postgresql/extension/hstore.control
+share/postgresql/extension/insert_username--1.0.sql
+share/postgresql/extension/insert_username--unpackaged--1.0.sql
+share/postgresql/extension/insert_username.control
+share/postgresql/extension/intagg--1.0.sql
+share/postgresql/extension/intagg--unpackaged--1.0.sql
+share/postgresql/extension/intagg.control
+share/postgresql/extension/intarray--1.0.sql
+share/postgresql/extension/intarray--unpackaged--1.0.sql
+share/postgresql/extension/intarray.control
+share/postgresql/extension/isn--1.0.sql
+share/postgresql/extension/isn--unpackaged--1.0.sql
+share/postgresql/extension/isn.control
+share/postgresql/extension/lo--1.0.sql
+share/postgresql/extension/lo--unpackaged--1.0.sql
+share/postgresql/extension/lo.control
+share/postgresql/extension/ltree--1.0.sql
+share/postgresql/extension/ltree--unpackaged--1.0.sql
+share/postgresql/extension/ltree.control
+share/postgresql/extension/moddatetime--1.0.sql
+share/postgresql/extension/moddatetime--unpackaged--1.0.sql
+share/postgresql/extension/moddatetime.control
+share/postgresql/extension/pageinspect--1.0.sql
+share/postgresql/extension/pageinspect--unpackaged--1.0.sql
+share/postgresql/extension/pageinspect.control
+share/postgresql/extension/pg_buffercache--1.0.sql
+share/postgresql/extension/pg_buffercache--unpackaged--1.0.sql
+share/postgresql/extension/pg_buffercache.control
+share/postgresql/extension/pg_freespacemap--1.0.sql
+share/postgresql/extension/pg_freespacemap--unpackaged--1.0.sql
+share/postgresql/extension/pg_freespacemap.control
+share/postgresql/extension/pg_stat_statements--1.0.sql
+share/postgresql/extension/pg_stat_statements--unpackaged--1.0.sql
+share/postgresql/extension/pg_stat_statements.control
+share/postgresql/extension/pg_trgm--1.0.sql
+share/postgresql/extension/pg_trgm--unpackaged--1.0.sql
+share/postgresql/extension/pg_trgm.control
+share/postgresql/extension/pgcrypto--1.0.sql
+share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
+share/postgresql/extension/pgcrypto.control
+share/postgresql/extension/pgrowlocks--1.0.sql
+share/postgresql/extension/pgrowlocks--unpackaged--1.0.sql
+share/postgresql/extension/pgrowlocks.control
+share/postgresql/extension/pgstattuple--1.0.sql
+share/postgresql/extension/pgstattuple--unpackaged--1.0.sql
+share/postgresql/extension/pgstattuple.control
+share/postgresql/extension/refint--1.0.sql
+share/postgresql/extension/refint--unpackaged--1.0.sql
+share/postgresql/extension/refint.control
+share/postgresql/extension/seg--1.0.sql
+share/postgresql/extension/seg--unpackaged--1.0.sql
+share/postgresql/extension/seg.control
+share/postgresql/extension/sslinfo--1.0.sql
+share/postgresql/extension/sslinfo--unpackaged--1.0.sql
+share/postgresql/extension/sslinfo.control
+share/postgresql/extension/tablefunc--1.0.sql
+share/postgresql/extension/tablefunc--unpackaged--1.0.sql
+share/postgresql/extension/tablefunc.control
+share/postgresql/extension/test_parser--1.0.sql
+share/postgresql/extension/test_parser--unpackaged--1.0.sql
+share/postgresql/extension/test_parser.control
+share/postgresql/extension/timetravel--1.0.sql
+share/postgresql/extension/timetravel--unpackaged--1.0.sql
+share/postgresql/extension/timetravel.control
+share/postgresql/extension/tsearch2--1.0.sql
+share/postgresql/extension/tsearch2--unpackaged--1.0.sql
+share/postgresql/extension/tsearch2.control
+share/postgresql/extension/unaccent--1.0.sql
+share/postgresql/extension/unaccent--unpackaged--1.0.sql
+share/postgresql/extension/unaccent.control
+share/postgresql/extension/xml2--1.0.sql
+share/postgresql/extension/xml2--unpackaged--1.0.sql
+share/postgresql/extension/xml2.control
+@dirrmtry share/postgresql/extension
 share/postgresql/tsearch_data/unaccent.rules
 share/postgresql/tsearch_data/xsyn_sample.rules
 @dirrmtry share/postgresql/tsearch_data
-@dirrmtry share/postgresql/contrib
 @dirrmtry share/postgresql
-@dirrmtry %%DOCSDIR%%/contrib
+@dirrmtry %%DOCSDIR%%/extension
 @dirrmtry %%DOCSDIR%%
 @dirrmtry lib/postgresql
diff --git a/databases/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index ffd6dfc752d2..b65bdbfa2091 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-server/pkg-plist-server
@@ -46,6 +46,10 @@ share/postgresql/postgresql.conf.sample
 share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
 share/postgresql/system_views.sql
+share/postgresql/extension/plpgsql--1.0.sql
+share/postgresql/extension/plpgsql--unpackaged--1.0.sql
+share/postgresql/extension/plpgsql.control
+@dirrmtry share/postgresql/extension
 %%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
@@ -756,9 +760,7 @@ share/postgresql/tsearch_data/ispell_sample.dict
 share/postgresql/tsearch_data/synonym_sample.syn
 share/postgresql/tsearch_data/thesaurus_sample.ths
 @dirrmtry share/postgresql/tsearch_data
-@unexec echo "Warning: If you will *NOT* use this package anymore, please remove the pgsql user manually."
 @dirrmtry share/postgresql
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic
 @dirrmtry lib/postgresql
-@dirrmtry %%PG_USER%%