5 files changed, 10 insertions, 10 deletions

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%%