4 files changed, 15 insertions, 19 deletions

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