4 files changed, 18 insertions, 22 deletions

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