40 files changed, 121 insertions, 123 deletions

diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile
index 7199c9eddffd..68df6a033ca3 100644
--- a/databases/postgresql74-client/Makefile
+++ b/databases/postgresql74-client/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 7320ef9d0917..687a458a760e 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	7.4.19
-PORTREVISION?=	1
+PORTVERSION?=	7.4.21
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -81,7 +80,7 @@ OPTIONS+=	PAM "Build with PAM support (server only)" off
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal kerberos support" off
 OPTIONS+=	OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
-OPTIONS+=	LIBC_R "Link w/ libc_r, used by plpython (server)" off
+OPTIONS+=	PTHREAD "Link w/ libc_r, used by plpython (server)" off
 #  to run regression tests:
 OPTIONS+=	TESTS "Allows the use of a \"check\" target (server)" off
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
diff --git a/databases/postgresql74-server/distinfo b/databases/postgresql74-server/distinfo
index cb04e036ee6e..32c907f98cb7 100644
--- a/databases/postgresql74-server/distinfo
+++ b/databases/postgresql74-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-7.4.19.tar.bz2) = 0be8c193fb73113930d043c60200598b
-SHA256 (postgresql/postgresql-7.4.19.tar.bz2) = 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
-SIZE (postgresql/postgresql-7.4.19.tar.bz2) = 10307396
+MD5 (postgresql/postgresql-7.4.21.tar.bz2) = b372d271bb30f703c241c7cc3d58f198
+SHA256 (postgresql/postgresql-7.4.21.tar.bz2) = 2c62d112a7addd4333d14101e508d2222a639e1698b8e4958ce1b05138f76932
+SIZE (postgresql/postgresql-7.4.21.tar.bz2) = 10282778
 MD5 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 16d037213b879963724da7809a0a1589
 SHA256 (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 1e56f76560c86227b08faabf78e3a53de4188c6a8f9d1f38b1481427e8fdf74c
 SIZE (postgresql/hier-Pg7.4-0.5.3.tar.gz) = 34662
diff --git a/databases/postgresql74-server/files/502.pgsql b/databases/postgresql74-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql74-server/files/502.pgsql
+++ b/databases/postgresql74-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/postgresql80-client/Makefile b/databases/postgresql80-client/Makefile
index d439925647f7..78c0721ddf9e 100644
--- a/databases/postgresql80-client/Makefile
+++ b/databases/postgresql80-client/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 7b6a476e8b42..566879821e50 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.0.15
-PORTREVISION?=	1
+PORTVERSION?=	8.0.17
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -39,11 +38,15 @@ GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
+		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
@@ -80,8 +83,6 @@ OPTIONS+=	PAM "Build with PAM support (server only)" off
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal kerberos support" off
 OPTIONS+=	OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
-OPTIONS+=	LIBC_R "Link w/ libc_r, used by plpython (server)" off
-OPTIONS+=	THREADSAFE "make libpq thread safe" off
 #  to run regression tests:
 OPTIONS+=	TESTS "Allows the use of a \"check\" target (server)" off
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
@@ -107,7 +108,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-8015-icu-xx-2008-01-08.diff.gz:icu
+PATCHFILES+=	pg-8015-icu-xx-2008-06-11.diff.gz:icu
 .  endif
 
 PATCH_DIST_STRIP=-p1
@@ -170,14 +171,6 @@ CONFIGURE_ARGS+=--with-krb5
 EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
 
-.  if defined(WITH_THREADSAFE)
-CONFIGURE_ARGS+=--enable-thread-safety
-.  endif
-
-.  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
-.  endif
 .endif # !SLAVE_ONLY
 
 .if defined(CLIENT_ONLY)
diff --git a/databases/postgresql80-server/distinfo b/databases/postgresql80-server/distinfo
index bb3e8cfa4618..6da35419f1d5 100644
--- a/databases/postgresql80-server/distinfo
+++ b/databases/postgresql80-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (postgresql/postgresql-8.0.15.tar.bz2) = 3ee548b3643e0a0a4b76493e81b336f3
-SHA256 (postgresql/postgresql-8.0.15.tar.bz2) = 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
-SIZE (postgresql/postgresql-8.0.15.tar.bz2) = 11253897
+MD5 (postgresql/postgresql-8.0.17.tar.bz2) = 0154b01820cb73aeca73b9d060cb3328
+SHA256 (postgresql/postgresql-8.0.17.tar.bz2) = e425602f60c034ecfd6ffe9b403d863cd99ff6fbc0891a8d59da33258a21a93b
+SIZE (postgresql/postgresql-8.0.17.tar.bz2) = 11234855
 MD5 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 9fa75cd7b3f1cb913d2e6d310582a4bc
 SHA256 (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = f3a1849f2d527759ef721502cb445a435e072cc9be820c2e489c9e4a71c7adbe
 SIZE (postgresql/hier-Pg8.0.3-0.5.5.diff.gz) = 30555
-MD5 (postgresql/pg-8015-icu-xx-2008-01-08.diff.gz) = 8f01943557fdaff5c4d472a458d4bef8
-SHA256 (postgresql/pg-8015-icu-xx-2008-01-08.diff.gz) = 3540ffdeae085d764668894839e8c15750275fc7bd2765975e31fda8bcfa0d2a
-SIZE (postgresql/pg-8015-icu-xx-2008-01-08.diff.gz) = 4553
+MD5 (postgresql/pg-8015-icu-xx-2008-06-11.diff.gz) = a83fd50d3373e300b02e05f4e30fb547
+SHA256 (postgresql/pg-8015-icu-xx-2008-06-11.diff.gz) = 50b5a9884500ab05dea373e5e9971575a405056d814a32cb20e24dc0fee8f22a
+SIZE (postgresql/pg-8015-icu-xx-2008-06-11.diff.gz) = 4596
diff --git a/databases/postgresql80-server/files/502.pgsql b/databases/postgresql80-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql80-server/files/502.pgsql
+++ b/databases/postgresql80-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/postgresql80-server/pkg-plist-server b/databases/postgresql80-server/pkg-plist-server
index 66fecfdacc95..eea08812b057 100644
--- a/databases/postgresql80-server/pkg-plist-server
+++ b/databases/postgresql80-server/pkg-plist-server
@@ -198,6 +198,7 @@ share/postgresql/timezone/America/Argentina/La_Rioja
 share/postgresql/timezone/America/Argentina/Mendoza
 share/postgresql/timezone/America/Argentina/Rio_Gallegos
 share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/San_Luis
 share/postgresql/timezone/America/Argentina/Tucuman
 share/postgresql/timezone/America/Argentina/Ushuaia
 share/postgresql/timezone/America/Aruba
@@ -374,6 +375,7 @@ share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Ho_Chi_Minh
 share/postgresql/timezone/Asia/Hong_Kong
 share/postgresql/timezone/Asia/Hovd
 share/postgresql/timezone/Asia/Irkutsk
@@ -386,6 +388,7 @@ share/postgresql/timezone/Asia/Kamchatka
 share/postgresql/timezone/Asia/Karachi
 share/postgresql/timezone/Asia/Kashgar
 share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Kolkata
 share/postgresql/timezone/Asia/Krasnoyarsk
 share/postgresql/timezone/Asia/Kuala_Lumpur
 share/postgresql/timezone/Asia/Kuching
diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile
index 2199c27a198f..7c5fa9d9e3f9 100644
--- a/databases/postgresql81-client/Makefile
+++ b/databases/postgresql81-client/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 56cf8433c02d..d494bc76d2c4 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.1.11
-PORTREVISION?=	1
+PORTVERSION?=	8.1.13
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -39,11 +38,15 @@ GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=--with-libraries=${LOCALBASE}/lib \
 		--with-includes=${LOCALBASE}/include \
+		--enable-thread-safety \
 		--with-docdir=${DOCSDIR}
 CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+CFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
+
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
@@ -81,8 +84,6 @@ OPTIONS+=	PAM "Build with PAM support (server only)" off
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal kerberos support" off
 OPTIONS+=	OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
-OPTIONS+=	LIBC_R "Link w/ libc_r, used by plpython (server)" off
-OPTIONS+=	THREADSAFE "make libpq thread safe" off
 #  to run regression tests:
 OPTIONS+=	TESTS "Allows the use of a \"check\" target (server)" off
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
@@ -168,17 +169,9 @@ CONFIGURE_ARGS+=--with-krb5
 .  endif
 
 .  if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum)
-EXTRA_PATCHES=	${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
-.  endif
-
-.  if defined(WITH_THREADSAFE)
-CONFIGURE_ARGS+=--enable-thread-safety
+EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh
 .  endif
 
-.  if defined(SERVER_ONLY) && defined(WITH_LIBC_R)
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
-.  endif
 .endif # !SLAVE_ONLY
 
 .if ${ARCH} == sparc64 && ${OSVERSION} < 700000
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index 3ff1c032edd4..04182cef89f9 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.1.11.tar.bz2) = 48922512bcf683d5ea22a99df5eaaecd
-SHA256 (postgresql/postgresql-8.1.11.tar.bz2) = 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
-SIZE (postgresql/postgresql-8.1.11.tar.bz2) = 11735420
+MD5 (postgresql/postgresql-8.1.13.tar.bz2) = fb88b45deeed02e8822fa0ed8e03aa13
+SHA256 (postgresql/postgresql-8.1.13.tar.bz2) = a537734da80f85c51ef72dd2d28bb2f64b73f63a727ef53a90211ccac2dcb1d1
+SIZE (postgresql/postgresql-8.1.13.tar.bz2) = 11744780
 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
diff --git a/databases/postgresql81-server/files/502.pgsql b/databases/postgresql81-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql81-server/files/502.pgsql
+++ b/databases/postgresql81-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/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index 922331a91702..2ec7b15a59f1 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -199,6 +199,7 @@ share/postgresql/timezone/America/Argentina/La_Rioja
 share/postgresql/timezone/America/Argentina/Mendoza
 share/postgresql/timezone/America/Argentina/Rio_Gallegos
 share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/San_Luis
 share/postgresql/timezone/America/Argentina/Tucuman
 share/postgresql/timezone/America/Argentina/Ushuaia
 share/postgresql/timezone/America/Aruba
@@ -375,6 +376,7 @@ share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Ho_Chi_Minh
 share/postgresql/timezone/Asia/Hong_Kong
 share/postgresql/timezone/Asia/Hovd
 share/postgresql/timezone/Asia/Irkutsk
@@ -387,6 +389,7 @@ share/postgresql/timezone/Asia/Kamchatka
 share/postgresql/timezone/Asia/Karachi
 share/postgresql/timezone/Asia/Kashgar
 share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Kolkata
 share/postgresql/timezone/Asia/Krasnoyarsk
 share/postgresql/timezone/Asia/Kuala_Lumpur
 share/postgresql/timezone/Asia/Kuching
diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile
index 17eb168fea08..c9ff84ec5a3d 100644
--- a/databases/postgresql82-client/Makefile
+++ b/databases/postgresql82-client/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index ce33a8c45229..9eeefdc64f6a 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.7
-PORTREVISION?=	1
+PORTVERSION?=	8.2.9
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
diff --git a/databases/postgresql82-server/distinfo b/databases/postgresql82-server/distinfo
index b6793c98896c..13cac2cd7f15 100644
--- a/databases/postgresql82-server/distinfo
+++ b/databases/postgresql82-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-8.2.7.tar.bz2) = e8b21cbc20ec23a1d9490fdfbaa7c09e
-SHA256 (postgresql/postgresql-8.2.7.tar.bz2) = 39528d1ba50f5abc51569e8b9bdeb47d0d4650d289a2c2e465621864b1ff3584
-SIZE (postgresql/postgresql-8.2.7.tar.bz2) = 12576126
+MD5 (postgresql/postgresql-8.2.9.tar.bz2) = 579506cf91881f6ede67e3be98a47c37
+SHA256 (postgresql/postgresql-8.2.9.tar.bz2) = 95ea81e0fa00184a63dae960007be95200343b24dec6cdea41bc809db29f22c2
+SIZE (postgresql/postgresql-8.2.9.tar.bz2) = 12558265
diff --git a/databases/postgresql82-server/files/502.pgsql b/databases/postgresql82-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql82-server/files/502.pgsql
+++ b/databases/postgresql82-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/postgresql82-server/pkg-plist-server b/databases/postgresql82-server/pkg-plist-server
index ddd85d4891e2..ad24d963eb03 100644
--- a/databases/postgresql82-server/pkg-plist-server
+++ b/databases/postgresql82-server/pkg-plist-server
@@ -196,6 +196,7 @@ share/postgresql/timezone/America/Argentina/La_Rioja
 share/postgresql/timezone/America/Argentina/Mendoza
 share/postgresql/timezone/America/Argentina/Rio_Gallegos
 share/postgresql/timezone/America/Argentina/San_Juan
+share/postgresql/timezone/America/Argentina/San_Luis
 share/postgresql/timezone/America/Argentina/Tucuman
 share/postgresql/timezone/America/Argentina/Ushuaia
 share/postgresql/timezone/America/Aruba
@@ -372,6 +373,7 @@ share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Ho_Chi_Minh
 share/postgresql/timezone/Asia/Hong_Kong
 share/postgresql/timezone/Asia/Hovd
 share/postgresql/timezone/Asia/Irkutsk
@@ -384,6 +386,7 @@ share/postgresql/timezone/Asia/Kamchatka
 share/postgresql/timezone/Asia/Karachi
 share/postgresql/timezone/Asia/Kashgar
 share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Kolkata
 share/postgresql/timezone/Asia/Krasnoyarsk
 share/postgresql/timezone/Asia/Kuala_Lumpur
 share/postgresql/timezone/Asia/Kuching
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
index 020a7881d52b..81c722be9442 100644
--- a/databases/postgresql83-client/Makefile
+++ b/databases/postgresql83-client/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	postgresql
 PKGNAMESUFFIX=	-client
-PORTREVISION=	1
 
 COMMENT=	PostgreSQL database (client)
 
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index db59ef137c10..c850200be6ca 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-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/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index 0fdaf766ad8f..55212382b188 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-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/postgresql83-server/files/502.pgsql b/databases/postgresql83-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql83-server/files/502.pgsql
+++ b/databases/postgresql83-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/postgresql83-server/pkg-plist-server b/databases/postgresql83-server/pkg-plist-server
index 39d5b3457910..3b1a6f039a36 100644
--- a/databases/postgresql83-server/pkg-plist-server
+++ b/databases/postgresql83-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
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
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index db59ef137c10..c850200be6ca 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-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/postgresql90-server/distinfo b/databases/postgresql90-server/distinfo
index 0fdaf766ad8f..55212382b188 100644
--- a/databases/postgresql90-server/distinfo
+++ b/databases/postgresql90-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/postgresql90-server/files/502.pgsql b/databases/postgresql90-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql90-server/files/502.pgsql
+++ b/databases/postgresql90-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/postgresql90-server/pkg-plist-server b/databases/postgresql90-server/pkg-plist-server
index 39d5b3457910..3b1a6f039a36 100644
--- a/databases/postgresql90-server/pkg-plist-server
+++ b/databases/postgresql90-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
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index db59ef137c10..c850200be6ca 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-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/postgresql91-server/distinfo b/databases/postgresql91-server/distinfo
index 0fdaf766ad8f..55212382b188 100644
--- a/databases/postgresql91-server/distinfo
+++ b/databases/postgresql91-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/postgresql91-server/files/502.pgsql b/databases/postgresql91-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql91-server/files/502.pgsql
+++ b/databases/postgresql91-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/postgresql91-server/pkg-plist-server b/databases/postgresql91-server/pkg-plist-server
index 39d5b3457910..3b1a6f039a36 100644
--- a/databases/postgresql91-server/pkg-plist-server
+++ b/databases/postgresql91-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
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index db59ef137c10..c850200be6ca 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-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/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 0fdaf766ad8f..55212382b188 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-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/postgresql92-server/files/502.pgsql b/databases/postgresql92-server/files/502.pgsql
index 09591559c317..acc1afe431cf 100644
--- a/databases/postgresql92-server/files/502.pgsql
+++ b/databases/postgresql92-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/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 39d5b3457910..3b1a6f039a36 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-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