4 files changed, 14 insertions, 12 deletions

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index db59ef137c10..c850200be6ca 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.3.1
-PORTREVISION?=	1
+DISTVERSION?=	8.3.3
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -108,7 +107,7 @@ USE_AUTOTOOLS=	autoconf:261
 CONFIGURE_ARGS+=--with-icu
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	pg-831-icu-xx-2008-03-17.diff.gz:icu
+PATCHFILES+=	pg-833-icu-xx-2008-06-11.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo
index 0fdaf766ad8f..55212382b188 100644
--- a/databases/postgresql84-server/distinfo
+++ b/databases/postgresql84-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.3.1.tar.bz2) = a5e0ed6a85b450dc217ec71da93243a7
-SHA256 (postgresql/postgresql-8.3.1.tar.bz2) = 7ccf1e5c987920e4d6eb98b8589939e29d3a361d285055d5af35ddd8e1a2d992
-SIZE (postgresql/postgresql-8.3.1.tar.bz2) = 13995572 
-MD5 (postgresql/pg-831-icu-xx-2008-03-17.diff.gz) = bce2f2d862a19f92de9d297233f856b1
-SHA256 (postgresql/pg-831-icu-xx-2008-03-17.diff.gz) = 085ef29c1ccbb83a06e07c52c82f268e65bc96f194319ac128998da5c0a00b1e
-SIZE (postgresql/pg-831-icu-xx-2008-03-17.diff.gz) = 5252
+MD5 (postgresql/postgresql-8.3.3.tar.bz2) = 0ae4bd9620e84d3e08dcf923808d14d0
+SHA256 (postgresql/postgresql-8.3.3.tar.bz2) = e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
+SIZE (postgresql/postgresql-8.3.3.tar.bz2) = 14004538
+MD5 (postgresql/pg-833-icu-xx-2008-06-11.diff.gz) = 58773458a9a8498106d167b731c9fe6c
+SHA256 (postgresql/pg-833-icu-xx-2008-06-11.diff.gz) = 2495a0b788bcc026663b47895d13c5228e862c036e032145749f5f0d0e9d35ed
+SIZE (postgresql/pg-831-icu-xx-2008-03-17.diff.gz) = 5302
diff --git a/databases/postgresql84-server/files/502.pgsql b/databases/postgresql84-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql84-server/files/502.pgsql
+++ b/databases/postgresql84-server/files/502.pgsql
@@ -56,15 +56,15 @@ case "$daily_pgsql_backup_enable" in
 
 	# Protect the data
 	umask 077
-	dbnames=`su -l pgsql -c "psql -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	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 "pg_dumpall -g | gzip -9 > ${file}.gz"
+	su -l pgsql -c "umask 077; pg_dumpall -g | gzip -9 > ${file}.gz"
 	for db in ${dbnames}; do
 	    echo -n " $db"
 	    file=${backupdir}/pgdump_${db}_${now}
-	    su -l pgsql -c "pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
+	    su -l pgsql -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
 	    [ $? -gt 0 ] && rc=3
 	done
 
diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server
index 39d5b3457910..3b1a6f039a36 100644
--- a/databases/postgresql84-server/pkg-plist-server
+++ b/databases/postgresql84-server/pkg-plist-server
@@ -207,6 +207,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Argentina/Mendoza
 %%TZDATA%%share/postgresql/timezone/America/Argentina/Rio_Gallegos
 %%TZDATA%%share/postgresql/timezone/America/Argentina/San_Juan
+%%TZDATA%%share/postgresql/timezone/America/Argentina/San_Luis
 %%TZDATA%%share/postgresql/timezone/America/Argentina/Tucuman
 %%TZDATA%%share/postgresql/timezone/America/Argentina/Ushuaia
 %%TZDATA%%share/postgresql/timezone/America/Aruba
@@ -383,6 +384,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Asia/Dushanbe
 %%TZDATA%%share/postgresql/timezone/Asia/Gaza
 %%TZDATA%%share/postgresql/timezone/Asia/Harbin
+%%TZDATA%%share/postgresql/timezone/Asia/Ho_Chi_Minh
 %%TZDATA%%share/postgresql/timezone/Asia/Hong_Kong
 %%TZDATA%%share/postgresql/timezone/Asia/Hovd
 %%TZDATA%%share/postgresql/timezone/Asia/Irkutsk
@@ -395,6 +397,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Asia/Karachi
 %%TZDATA%%share/postgresql/timezone/Asia/Kashgar
 %%TZDATA%%share/postgresql/timezone/Asia/Katmandu
+%%TZDATA%%share/postgresql/timezone/Asia/Kolkata
 %%TZDATA%%share/postgresql/timezone/Asia/Krasnoyarsk
 %%TZDATA%%share/postgresql/timezone/Asia/Kuala_Lumpur
 %%TZDATA%%share/postgresql/timezone/Asia/Kuching