Update all PostgreSQL ports to latest version.

Remove postgresql-contrib in favour for postgresqlNN-contrib.
This way we will get packages built, which is nice.

Security:	CVE-2010-1169
Security:	CVE-2010-1170

The PostgreSQL Project today released minor versions updating all active
branches of the PostgreSQL object-relational database system, including
versions 8.4.4, 8.3.11, 8.2.17, 8.1.21, 8.0.25, and 7.4.29. This release
fixes moderate-risk security issues with PL/perl and PL/tcl, as well as
a data corruption issue with standby databases.  Users of any of these
three features should update their PostgreSQL installations immediately.

The PL/perl security fix closes a security hole in PL/perl
procedures which could allow privilege escalation on the host system,
caused by a flaw in Safe.pm; see CVE-2010-1169 and CVE-2010-1447 for
details.  A second patch prevents PL/tcl's pltcl_modules table from
being subverted in order to run arbitrary Tcl scripts; see
CVE-2010-1170.  These issues only affect users who have enabled either
of these two stored procedure languages.

Also corrected is use of the command ALTER TABLE SET TABLESPACE, which
previously could cause data corruption on Warm Standby database slaves.
This issue affects only version 8.4.

There are also 21 other bug fixes in this release, some of which apply
only to version 8.4, and a few of which are specifically for Windows.
While these are generally fixes for minor issues, among the changes are:

     * Fix for a combinational crash condition
     * Prevent normal users from resetting some GUCs in
       their own role definitions
     * Correctly apply constraint exclusion in UPDATE and DELETE queries
     * Minor fixes for WAL archiving
     * Update timezone data for 12 zones

See the release notes for a full list of changes with details.

Releasenotes at http://www.postgresql.org/docs/current/static/release.html

4 files changed, 43 insertions, 22 deletions

diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 823aa17c18ee..c712a9b891ce 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.1.17
-PORTREVISION?=	1
+PORTVERSION?=	8.1.21
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -41,6 +40,7 @@ CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
+LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
@@ -107,7 +107,7 @@ USE_AUTOTOOLS=	autoconf:262
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-8113-icu-xx-2008-08-28.diff.gz:icu
+PATCHFILES+=	pg-8121-icu-xx-2010-05-14.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 927ce73e4e07..eaade8fdc675 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (postgresql/postgresql-8.1.17.tar.bz2) = 082c37bbed468847e75762dc12bb6acf
-SHA256 (postgresql/postgresql-8.1.17.tar.bz2) = 82954addb4a5753ed24081d84b3b8bdffd16ac4353776dfa43bbfdcc49fc5621
-SIZE (postgresql/postgresql-8.1.17.tar.bz2) = 11780776
+MD5 (postgresql/postgresql-8.1.21.tar.bz2) = 0f0868eca8c39e22390e688effe2af5f
+SHA256 (postgresql/postgresql-8.1.21.tar.bz2) = 192fdbe7e703c3ad9bf767997c62717f0f00192b884ae7ced0d6741795c15679
+SIZE (postgresql/postgresql-8.1.21.tar.bz2) = 11907115
 MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86
 SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e
 SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203
-MD5 (postgresql/pg-8113-icu-xx-2008-08-28.diff.gz) = da1713b818b202dc927caba522c74932
-SHA256 (postgresql/pg-8113-icu-xx-2008-08-28.diff.gz) = ad6690acde3c89a7cb02537bc3858b8732343a3a0c2b122ad0873d9844c3611f
-SIZE (postgresql/pg-8113-icu-xx-2008-08-28.diff.gz) = 4244
+MD5 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = af4e5f16bfc60a9e98d18f1f7c8d76e7
+SHA256 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4a5f4751599bd56144e598bce75f7a970e12d82f9300d36859f544083cf90a56
+SIZE (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4271
diff --git a/databases/postgresql81-server/files/502.pgsql b/databases/postgresql81-server/files/502.pgsql
index acc1afe431cf..281189a59c46 100644
--- a/databases/postgresql81-server/files/502.pgsql
+++ b/databases/postgresql81-server/files/502.pgsql
@@ -15,12 +15,10 @@
 # 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_enable="YES"
-daily_pgsql_backup_enable="NO"
-
 daily_pgsql_vacuum_args="-z"
 daily_pgsql_pgdump_args="-b -F c"
 # backupdir is relative to ~pgsql home directory unless it begins with a slash:
@@ -40,32 +38,32 @@ 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...
 	if [ ! -d ${backupdir} ] ; then 
 	    echo Creating ${backupdir}
-	    mkdir ${backupdir}; chmod 700 ${backupdir}; chown pgsql ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown pgsql ${backupdir}
 	fi
 
 	echo
-	echo "PostgreSQL maintenance"
+	echo "PostgreSQL backups"
 
 	# 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
@@ -76,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
 
@@ -83,7 +98,7 @@ case "$daily_pgsql_vacuum_enable" in
     [Yy][Ee][Ss])
 
 	echo
-	echo "vacuuming..."
+	echo "PostgreSQL vacuum"
 	su -l pgsql -c "vacuumdb -a -q ${daily_pgsql_vacuum_args}"
 	if [ $? -gt 0 ]
 	then
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 397609794c28..b6ed47fdf568 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -208,6 +208,7 @@ share/postgresql/timezone/America/Asuncion
 share/postgresql/timezone/America/Atikokan
 share/postgresql/timezone/America/Atka
 share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Bahia_Banderas
 share/postgresql/timezone/America/Barbados
 share/postgresql/timezone/America/Belem
 share/postgresql/timezone/America/Belize
@@ -280,6 +281,7 @@ share/postgresql/timezone/America/Managua
 share/postgresql/timezone/America/Manaus
 share/postgresql/timezone/America/Marigot
 share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Matamoros
 share/postgresql/timezone/America/Mazatlan
 share/postgresql/timezone/America/Mendoza
 share/postgresql/timezone/America/Menominee
@@ -298,6 +300,7 @@ share/postgresql/timezone/America/Nome
 share/postgresql/timezone/America/Noronha
 share/postgresql/timezone/America/North_Dakota/Center
 share/postgresql/timezone/America/North_Dakota/New_Salem
+share/postgresql/timezone/America/Ojinaga
 share/postgresql/timezone/America/Panama
 share/postgresql/timezone/America/Pangnirtung
 share/postgresql/timezone/America/Paramaribo
@@ -310,10 +313,11 @@ share/postgresql/timezone/America/Puerto_Rico
 share/postgresql/timezone/America/Rainy_River
 share/postgresql/timezone/America/Rankin_Inlet
 share/postgresql/timezone/America/Recife
-share/postgresql/timezone/America/Resolute
 share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Resolute
 share/postgresql/timezone/America/Rio_Branco
 share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santa_Isabel
 share/postgresql/timezone/America/Santarem
 share/postgresql/timezone/America/Santiago
 share/postgresql/timezone/America/Santo_Domingo
@@ -342,6 +346,7 @@ share/postgresql/timezone/America/Yellowknife
 share/postgresql/timezone/Antarctica/Casey
 share/postgresql/timezone/Antarctica/Davis
 share/postgresql/timezone/Antarctica/DumontDUrville
+share/postgresql/timezone/Antarctica/Macquarie
 share/postgresql/timezone/Antarctica/Mawson
 share/postgresql/timezone/Antarctica/McMurdo
 share/postgresql/timezone/Antarctica/Palmer
@@ -404,6 +409,7 @@ share/postgresql/timezone/Asia/Makassar
 share/postgresql/timezone/Asia/Manila
 share/postgresql/timezone/Asia/Muscat
 share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Novokuznetsk
 share/postgresql/timezone/Asia/Novosibirsk
 share/postgresql/timezone/Asia/Omsk
 share/postgresql/timezone/Asia/Oral