Update PostgreSQL to latest versions.

The PostgreSQL Global Development Group has released an update to all supported
versions of our database system, including 9.6.1, 9.5.5, 9.4.10, 9.3.15,
9.2.19, and 9.1.24.

This release fixes two issues that can cause data corruption, which are
described in more detail below. It also patches a number of other bugs reported
over the last three months. The project urges users to apply this update at the
next possible downtime.

25 files changed, 58 insertions, 58 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 53d3bfae23d3..9341deb76ee8 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -2,14 +2,16 @@
 # $FreeBSD$
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.2.18
-PORTREVISION?=	1
+DISTVERSION?=	9.2.19
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
-COMMENT?=	The most advanced open-source database available anywhere
+COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
+
+LICENSE=	PostgreSQL
 
 CONFLICTS?=	${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
 		${PORTNAME}${COMPONENT}-[^${PORTVERSION:R:R}].* \
@@ -106,7 +108,6 @@ GSSAPI_DESC=	Build with GSSAPI support
 OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
 DEBUG_DESC=	Builds with debugging symbols
 
-
 OPTIONS_DEFINE+=	SSL
 SSL_DESC=	Build with OpenSSL support
 
@@ -244,9 +245,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
 	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
 			${STAGEDIR}${PREFIX}/etc/periodic/daily
-.	if ${PORTVERSION:M9.[2345].*}
-		${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER}
-.	endif	
 .  endif # SERVER_ONLY
 .  if defined(CLIENT_ONLY)
 	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index 99116b79b9e4..2d4a634bd899 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1470919631
-SHA256 (postgresql/postgresql-9.2.18.tar.bz2) = d7aa37d586ae4d46d07a4fac417ff966e45a9dd99bac8b3cd149be8df9ea35f4
-SIZE (postgresql/postgresql-9.2.18.tar.bz2) = 16448429
+TIMESTAMP = 1477347738
+SHA256 (postgresql/postgresql-9.2.19.tar.bz2) = 1d29d73a4f590fcc348280f13ac2ff6a0f72c94908c54e3c20b7ab1560e8dbad
+SIZE (postgresql/postgresql-9.2.19.tar.bz2) = 16466698
 SHA256 (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 2f9c831b3dff866f0b2f6f2a9ef771a4045486bc252a851aadc73c50d376319d
 SIZE (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 5587
diff --git a/databases/postgresql92-server/files/pkg-message-server.in b/databases/postgresql92-server/files/pkg-message-server.in
index 54f397448198..3650316fba7b 100644
--- a/databases/postgresql92-server/files/pkg-message-server.in
+++ b/databases/postgresql92-server/files/pkg-message-server.in
@@ -8,8 +8,8 @@ appropriately.
 The port is set up to use autovacuum for new databases, but you might
 also want to vacuum and perhaps backup your database regularly. There
 is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
-you may find useful. You can use it to backup and perfom vacuum on all
-databases nightly. Per default, it perfoms `vacuum analyze'. See the
+you may find useful. You can use it to backup and perform vacuum on all
+databases nightly. Per default, it performs `vacuum analyze'. See the
 script for instructions. For autovacuum settings, please review
 ~pgsql/data/postgresql.conf.
 
diff --git a/databases/postgresql92-server/files/postgresql.in b/databases/postgresql92-server/files/postgresql.in
index 643171a44b91..016b5567ca33 100644
--- a/databases/postgresql92-server/files/postgresql.in
+++ b/databases/postgresql92-server/files/postgresql.in
@@ -58,8 +58,8 @@ if [ -n "$2" ]; then
 			echo "You must define a data directory (postgresql_${profile}_data)"
 			exit 1
 		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
@@ -108,7 +108,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 7cd2c727fd0c..d0199b45d231 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -464,6 +464,7 @@ lib/postgresql/utf8_and_win.so
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
 %%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
@@ -761,4 +762,3 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile
index 93d6796b168b..ce5b13682e76 100644
--- a/databases/postgresql93-server/Makefile
+++ b/databases/postgresql93-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.3.14
+DISTVERSION?=	9.3.15
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
diff --git a/databases/postgresql93-server/distinfo b/databases/postgresql93-server/distinfo
index 82891a2bd6dd..e2f99d2cfc2f 100644
--- a/databases/postgresql93-server/distinfo
+++ b/databases/postgresql93-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1470919705
-SHA256 (postgresql/postgresql-9.3.14.tar.bz2) = 5c4322f1c42ba1ff4b28383069c56663b46160bb08e85d41fa2ab9a5009d039d
-SIZE (postgresql/postgresql-9.3.14.tar.bz2) = 17042199
+TIMESTAMP = 1477347757
+SHA256 (postgresql/postgresql-9.3.15.tar.bz2) = a9fcba1446a93aa95e3e1b6535756f0472d10b0f267a0845f8b2b29f89de5c4f
+SIZE (postgresql/postgresql-9.3.15.tar.bz2) = 17059932
 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30
 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583
diff --git a/databases/postgresql93-server/files/pkg-message-server.in b/databases/postgresql93-server/files/pkg-message-server.in
index 82a4cffc01cd..d161fcb82f66 100644
--- a/databases/postgresql93-server/files/pkg-message-server.in
+++ b/databases/postgresql93-server/files/pkg-message-server.in
@@ -8,8 +8,8 @@ appropriately.
 The port is set up to use autovacuum for new databases, but you might
 also want to vacuum and perhaps backup your database regularly. There
 is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
-you may find useful. You can use it to backup and perfom vacuum on all
-databases nightly. Per default, it perfoms `vacuum analyze'. See the
+you may find useful. You can use it to backup and perform vacuum on all
+databases nightly. Per default, it performs `vacuum analyze'. See the
 script for instructions. For autovacuum settings, please review
 ~pgsql/data/postgresql.conf.
 
diff --git a/databases/postgresql93-server/files/postgresql.in b/databases/postgresql93-server/files/postgresql.in
index 643171a44b91..016b5567ca33 100644
--- a/databases/postgresql93-server/files/postgresql.in
+++ b/databases/postgresql93-server/files/postgresql.in
@@ -58,8 +58,8 @@ if [ -n "$2" ]; then
 			echo "You must define a data directory (postgresql_${profile}_data)"
 			exit 1
 		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
@@ -108,7 +108,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql93-server/pkg-plist-server b/databases/postgresql93-server/pkg-plist-server
index d1aba1f2404c..809dc4d90a26 100644
--- a/databases/postgresql93-server/pkg-plist-server
+++ b/databases/postgresql93-server/pkg-plist-server
@@ -453,6 +453,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
 %%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
@@ -750,4 +751,3 @@ lib/libpgcommon.a
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql94-server/Makefile b/databases/postgresql94-server/Makefile
index c52babe2a45e..7031794a7bc0 100644
--- a/databases/postgresql94-server/Makefile
+++ b/databases/postgresql94-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.4.9
+DISTVERSION?=	9.4.10
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -12,6 +12,6 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
 		src/bin/pg_basebackup
 
-ICU_PATCHFILE=	pg-949-icu-2016-08-10.diff.gz
+ICU_PATCHFILE=	pg-949-icu-2016-10-02.diff.gz
 
 .include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git a/databases/postgresql94-server/distinfo b/databases/postgresql94-server/distinfo
index 9a5a4ac9c27a..ef44eb94aef3 100644
--- a/databases/postgresql94-server/distinfo
+++ b/databases/postgresql94-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1470919711
-SHA256 (postgresql/postgresql-9.4.9.tar.bz2) = c120a62e90214c20d9160da3ca3fbaec97d5f1656f1dd033f60e7297b7a1e1c9
-SIZE (postgresql/postgresql-9.4.9.tar.bz2) = 17763281
-SHA256 (postgresql/pg-949-icu-2016-08-10.diff.gz) = 8e7f0470b5c04653aee850c58e690d1ca5f7cb3a2acb5d64c793a8412ee9ebfe
-SIZE (postgresql/pg-949-icu-2016-08-10.diff.gz) = 5263
+TIMESTAMP = 1477347764
+SHA256 (postgresql/postgresql-9.4.10.tar.bz2) = 7061678bed1981c681ce54c76b98b6ec17743f090a9775104a45e7e1a8826ecf
+SIZE (postgresql/postgresql-9.4.10.tar.bz2) = 17802812
+SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43
+SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289
diff --git a/databases/postgresql94-server/files/pkg-message-server.in b/databases/postgresql94-server/files/pkg-message-server.in
index 82a4cffc01cd..d161fcb82f66 100644
--- a/databases/postgresql94-server/files/pkg-message-server.in
+++ b/databases/postgresql94-server/files/pkg-message-server.in
@@ -8,8 +8,8 @@ appropriately.
 The port is set up to use autovacuum for new databases, but you might
 also want to vacuum and perhaps backup your database regularly. There
 is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
-you may find useful. You can use it to backup and perfom vacuum on all
-databases nightly. Per default, it perfoms `vacuum analyze'. See the
+you may find useful. You can use it to backup and perform vacuum on all
+databases nightly. Per default, it performs `vacuum analyze'. See the
 script for instructions. For autovacuum settings, please review
 ~pgsql/data/postgresql.conf.
 
diff --git a/databases/postgresql94-server/files/postgresql.in b/databases/postgresql94-server/files/postgresql.in
index 643171a44b91..016b5567ca33 100644
--- a/databases/postgresql94-server/files/postgresql.in
+++ b/databases/postgresql94-server/files/postgresql.in
@@ -58,8 +58,8 @@ if [ -n "$2" ]; then
 			echo "You must define a data directory (postgresql_${profile}_data)"
 			exit 1
 		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
@@ -108,7 +108,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql94-server/pkg-plist-server b/databases/postgresql94-server/pkg-plist-server
index cb698e7e2410..572e7c029ad8 100644
--- a/databases/postgresql94-server/pkg-plist-server
+++ b/databases/postgresql94-server/pkg-plist-server
@@ -453,6 +453,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
@@ -751,4 +752,3 @@ lib/libpgcommon.a
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql95-server/Makefile b/databases/postgresql95-server/Makefile
index 333048ec3250..4c85fcb26ade 100644
--- a/databases/postgresql95-server/Makefile
+++ b/databases/postgresql95-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.5.4
+DISTVERSION?=	9.5.5
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
diff --git a/databases/postgresql95-server/distinfo b/databases/postgresql95-server/distinfo
index ad331578e8d4..d90c62a7e15d 100644
--- a/databases/postgresql95-server/distinfo
+++ b/databases/postgresql95-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1470919717
-SHA256 (postgresql/postgresql-9.5.4.tar.bz2) = cf5e571164ad66028ecd7dd8819e3765470d45bcd440d258b686be7e69c76ed0
-SIZE (postgresql/postgresql-9.5.4.tar.bz2) = 18496299
+TIMESTAMP = 1477347770
+SHA256 (postgresql/postgresql-9.5.5.tar.bz2) = 02c65290be74de6604c3fed87c9fd3e6b32e949f0ab8105a75bd7ed5aa71f394
+SIZE (postgresql/postgresql-9.5.5.tar.bz2) = 18525082
 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365
 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952
diff --git a/databases/postgresql95-server/files/pkg-message-server.in b/databases/postgresql95-server/files/pkg-message-server.in
index 82a4cffc01cd..d161fcb82f66 100644
--- a/databases/postgresql95-server/files/pkg-message-server.in
+++ b/databases/postgresql95-server/files/pkg-message-server.in
@@ -8,8 +8,8 @@ appropriately.
 The port is set up to use autovacuum for new databases, but you might
 also want to vacuum and perhaps backup your database regularly. There
 is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
-you may find useful. You can use it to backup and perfom vacuum on all
-databases nightly. Per default, it perfoms `vacuum analyze'. See the
+you may find useful. You can use it to backup and perform vacuum on all
+databases nightly. Per default, it performs `vacuum analyze'. See the
 script for instructions. For autovacuum settings, please review
 ~pgsql/data/postgresql.conf.
 
diff --git a/databases/postgresql95-server/files/postgresql.in b/databases/postgresql95-server/files/postgresql.in
index 643171a44b91..016b5567ca33 100644
--- a/databases/postgresql95-server/files/postgresql.in
+++ b/databases/postgresql95-server/files/postgresql.in
@@ -58,8 +58,8 @@ if [ -n "$2" ]; then
 			echo "You must define a data directory (postgresql_${profile}_data)"
 			exit 1
 		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
@@ -108,7 +108,7 @@ postgresql_command()
 
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql95-server/pkg-plist-server b/databases/postgresql95-server/pkg-plist-server
index 3b70b8743eef..e6d0241845ce 100644
--- a/databases/postgresql95-server/pkg-plist-server
+++ b/databases/postgresql95-server/pkg-plist-server
@@ -475,6 +475,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
 %%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
@@ -772,4 +773,3 @@ lib/libpgcommon.a
 %%DATADIR%%/tsearch_data/ispell_sample.dict
 %%DATADIR%%/tsearch_data/synonym_sample.syn
 %%DATADIR%%/tsearch_data/thesaurus_sample.ths
-@dir(%%PG_USER%%,%%PG_GROUP%%,) %%PG_USER%%
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index 64a01ed6f3e4..a8a85e6a86de 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Marc G. Fournier <scrappy@FreeBSD.org>
 # $FreeBSD$
 
-DISTVERSION?=	9.6.0
+DISTVERSION?=	9.6.1
 
 MAINTAINER?=	pgsql@FreeBSD.org
 
@@ -19,7 +19,7 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-ICU_PATCHFILE=	pg-96b4-icu-2016-08-10.diff.gz
+ICU_PATCHFILE=	pg-96b4-icu-2016-10-02.diff.gz
 OPTIONS_DEFAULT+=ICU
 
 .include "${.CURDIR}/../postgresql92-server/Makefile"
diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo
index 6d926675c161..ad55855c9589 100644
--- a/databases/postgresql96-server/distinfo
+++ b/databases/postgresql96-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1472754782
-SHA256 (postgresql/postgresql-9.6.0.tar.bz2) = 3b5fe9634b80a4511aac1832a087586a7caa8c3413619562bdda009a015863ce
-SIZE (postgresql/postgresql-9.6.0.tar.bz2) = 19157472
-SHA256 (postgresql/pg-96b4-icu-2016-08-10.diff.gz) = ca9d57715d425dfcbc530f01c65c746000a1ee64838452b69a97730b39900317
-SIZE (postgresql/pg-96b4-icu-2016-08-10.diff.gz) = 5971
+TIMESTAMP = 1477347775
+SHA256 (postgresql/postgresql-9.6.1.tar.bz2) = e5101e0a49141fc12a7018c6dad594694d3a3325f5ab71e93e0e51bd94e51fcd
+SIZE (postgresql/postgresql-9.6.1.tar.bz2) = 19260568
+SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e
+SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998
diff --git a/databases/postgresql96-server/files/postgresql.in b/databases/postgresql96-server/files/postgresql.in
index a11b779a44e2..0ef575c7b63a 100644
--- a/databases/postgresql96-server/files/postgresql.in
+++ b/databases/postgresql96-server/files/postgresql.in
@@ -58,8 +58,8 @@ if [ -n "$2" ]; then
 			echo "You must define a data directory (postgresql_${profile}_data)"
 			exit 1
 		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
diff --git a/databases/postgresql96-server/pkg-plist-client b/databases/postgresql96-server/pkg-plist-client
index ceaa74398134..bf5ab28e0053 100644
--- a/databases/postgresql96-server/pkg-plist-client
+++ b/databases/postgresql96-server/pkg-plist-client
@@ -990,6 +990,7 @@ man/man7/WITH.7.gz
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_config-9.6.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-9.6.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-9.6.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-9.6.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/pg_config-9.6.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/ecpg-9.6.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-9.6.mo
diff --git a/databases/postgresql96-server/pkg-plist-server b/databases/postgresql96-server/pkg-plist-server
index 0e11284d590d..e260dbb72409 100644
--- a/databases/postgresql96-server/pkg-plist-server
+++ b/databases/postgresql96-server/pkg-plist-server
@@ -477,6 +477,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
 %%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
 %%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores