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, 32 insertions, 12 deletions

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index dd57c0036363..c8f6d35598cb 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.4.3
-PORTREVISION?=	1
+DISTVERSION?=	8.4.4
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -42,6 +41,7 @@ PGGROUP=	pgsql
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
 		--enable-thread-safety
+LDFLAGS+=	-L${PREFIX}/lib
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 81d413a0628a..9b77cff98c9a 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-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/postgresql-8.4.4.tar.bz2) = 4bf2448ad965bca3940df648c02194df
+SHA256 (postgresql/postgresql-8.4.4.tar.bz2) = e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e
+SIZE (postgresql/postgresql-8.4.4.tar.bz2) = 13853838
 MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136
+SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
 SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
diff --git a/databases/postgresql84-server/files/502.pgsql b/databases/postgresql84-server/files/502.pgsql
index d2235e414cd2..281189a59c46 100644
--- a/databases/postgresql84-server/files/502.pgsql
+++ b/databases/postgresql84-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/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 7a5170bad6fd..cded41078237 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -180,6 +180,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 +318,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