5 files changed, 40 insertions, 17 deletions

diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 2510b350ce1e..505981e8184c 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.9
-PORTREVISION?=	1
+DISTVERSION?=	8.3.11
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -43,6 +42,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}"
@@ -105,7 +105,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-833-icu-xx-2008-08-28.diff.gz:icu
+PATCHFILES+=	pg-8311-icu-xx-2010-05-14.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index 79b1ebcff274..101008efa3ed 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.9.tar.bz2) = e120b001354851b5df26cbee8c2786d5
-SHA256 (postgresql/postgresql-8.3.9.tar.bz2) = 5cb10e40247c3304d542b774ad658c797bfdc287b5fc3f0341650305e1b8e623
-SIZE (postgresql/postgresql-8.3.9.tar.bz2) = 14170569
-MD5 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 94fb6634636cd36cb5fde449d76ece65
-SHA256 (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = c7d77dafe78afcf2e92567c7cdfda45dcfe41ea71efb2e326ef4f7eb66ec416b
-SIZE (postgresql/pg-833-icu-xx-2008-08-28.diff.gz) = 5302
+MD5 (postgresql/postgresql-8.3.11.tar.bz2) = 9dfbc971bd9ea7e2c2a042deba8213f9
+SHA256 (postgresql/postgresql-8.3.11.tar.bz2) = 81abb1a90069c93acf0b6ece980d674f325454ec7584247222080501946672db
+SIZE (postgresql/postgresql-8.3.11.tar.bz2) = 14217781
+MD5 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 43fd07e87e9ecff2aa09b134408bdcb5
+SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a
+SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064
diff --git a/databases/postgresql83-server/files/502.pgsql b/databases/postgresql83-server/files/502.pgsql
index d2235e414cd2..281189a59c46 100644
--- a/databases/postgresql83-server/files/502.pgsql
+++ b/databases/postgresql83-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/postgresql83-server/files/pkg-message-client.in b/databases/postgresql83-server/files/pkg-message-client.in
index 722d50cb4244..3183bc136aa6 100644
--- a/databases/postgresql83-server/files/pkg-message-client.in
+++ b/databases/postgresql83-server/files/pkg-message-client.in
@@ -26,7 +26,7 @@ p5-postgresql-plperl, postgresql-pltcl & postgresql-plruby
 
 postgresql-contrib
   Lots of contributed utilities, postgresql functions and
-  datatypes. There you find autovacuum, pgcrypto and many other cool
+  datatypes. There you find pg_standby, pgcrypto and many other cool
   things.
 
 etc...
diff --git a/databases/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index 20ae7bd07acd..4d2587cc4093 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-server/pkg-plist-server
@@ -216,6 +216,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
@@ -288,6 +289,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Manaus
 %%TZDATA%%share/postgresql/timezone/America/Marigot
 %%TZDATA%%share/postgresql/timezone/America/Martinique
+%%TZDATA%%share/postgresql/timezone/America/Matamoros
 %%TZDATA%%share/postgresql/timezone/America/Mazatlan
 %%TZDATA%%share/postgresql/timezone/America/Mendoza
 %%TZDATA%%share/postgresql/timezone/America/Menominee
@@ -306,6 +308,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Noronha
 %%TZDATA%%share/postgresql/timezone/America/North_Dakota/Center
 %%TZDATA%%share/postgresql/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%share/postgresql/timezone/America/Ojinaga
 %%TZDATA%%share/postgresql/timezone/America/Panama
 %%TZDATA%%share/postgresql/timezone/America/Pangnirtung
 %%TZDATA%%share/postgresql/timezone/America/Paramaribo
@@ -322,6 +325,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Resolute
 %%TZDATA%%share/postgresql/timezone/America/Rio_Branco
 %%TZDATA%%share/postgresql/timezone/America/Rosario
+%%TZDATA%%share/postgresql/timezone/America/Santa_Isabel
 %%TZDATA%%share/postgresql/timezone/America/Santarem
 %%TZDATA%%share/postgresql/timezone/America/Santiago
 %%TZDATA%%share/postgresql/timezone/America/Santo_Domingo
@@ -350,6 +354,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
@@ -412,8 +417,8 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Asia/Manila
 %%TZDATA%%share/postgresql/timezone/Asia/Muscat
 %%TZDATA%%share/postgresql/timezone/Asia/Nicosia
-%%TZDATA%%share/postgresql/timezone/Asia/Novosibirsk
 %%TZDATA%%share/postgresql/timezone/Asia/Novokuznetsk
+%%TZDATA%%share/postgresql/timezone/Asia/Novosibirsk
 %%TZDATA%%share/postgresql/timezone/Asia/Omsk
 %%TZDATA%%share/postgresql/timezone/Asia/Oral
 %%TZDATA%%share/postgresql/timezone/Asia/Phnom_Penh