6 files changed, 562 insertions, 552 deletions

diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 4d9a3589a421..742d14afde77 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.1.5
+PORTVERSION?=	8.1.6
 PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
@@ -46,7 +46,9 @@ CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 
 BUILD_DIRS?=	src/port src/timezone src/backend src/backend/utils/mb/conversion_procs \
-		src/pl src/utils
+		src/bin/initdb src/bin/ipcclean src/bin/pg_ctl src/bin/pg_controldata \
+		src/bin/pg_resetxlog src/pl
+
 INSTALL_DIRS?=	${BUILD_DIRS}
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo
index c71931c05124..47ec955947d2 100644
--- a/databases/postgresql81-server/distinfo
+++ b/databases/postgresql81-server/distinfo
@@ -1,15 +1,15 @@
-MD5 (postgresql/postgresql-base-8.1.5.tar.bz2) = 30a42fd5fc5326edc217e28651e5053b
-SHA256 (postgresql/postgresql-base-8.1.5.tar.bz2) = cb878499848aa8abb82f1ae79574923174851b0396a5befa31f49089a3abb4df
-SIZE (postgresql/postgresql-base-8.1.5.tar.bz2) = 8044522
-MD5 (postgresql/postgresql-opt-8.1.5.tar.bz2) = bcd3eec7cfc759dbfdde4f9e8fa07d27
-SHA256 (postgresql/postgresql-opt-8.1.5.tar.bz2) = 4fe0dc14e02d65516348ec0e90633be2a3ada002c151fca8f2e7eba6556c8b1c
-SIZE (postgresql/postgresql-opt-8.1.5.tar.bz2) = 144784
-MD5 (postgresql/postgresql-docs-8.1.5.tar.bz2) = d104e7e645ea36407831ca59470c7a12
-SHA256 (postgresql/postgresql-docs-8.1.5.tar.bz2) = 01c0a848b0016598adfcebea74960340edf80fc037051d106b62bea14e1cd0c9
-SIZE (postgresql/postgresql-docs-8.1.5.tar.bz2) = 2489400
-MD5 (postgresql/postgresql-test-8.1.5.tar.bz2) = b3e050a0af7998d78f928b96d95fa6d7
-SHA256 (postgresql/postgresql-test-8.1.5.tar.bz2) = 60ed8d466a66dfe72994f7c8e45324e81e8ce6b91343eee07df5939f10559166
-SIZE (postgresql/postgresql-test-8.1.5.tar.bz2) = 947271
+MD5 (postgresql/postgresql-base-8.1.6.tar.bz2) = ad616f482e119a39cc89ee6902e9205e
+SHA256 (postgresql/postgresql-base-8.1.6.tar.bz2) = d6c4e8cf28764aefe81e6de253933c33950e58ca8975c9d93b3e844137dfd732
+SIZE (postgresql/postgresql-base-8.1.6.tar.bz2) = 8064467
+MD5 (postgresql/postgresql-opt-8.1.6.tar.bz2) = ff928aa7e457fc8c418dd2875863942b
+SHA256 (postgresql/postgresql-opt-8.1.6.tar.bz2) = 321dcb79e042f1ddd202ecce5654d1ca0a6a72ec4fda86eac6e3990500bdbcfb
+SIZE (postgresql/postgresql-opt-8.1.6.tar.bz2) = 144641
+MD5 (postgresql/postgresql-docs-8.1.6.tar.bz2) = 3981cf168b4d39c2e0409d522c8a9c28
+SHA256 (postgresql/postgresql-docs-8.1.6.tar.bz2) = b674af62a954b0c71512cc332e873c8799fcd9cfefe55911c986ad51beac6f43
+SIZE (postgresql/postgresql-docs-8.1.6.tar.bz2) = 2495557
+MD5 (postgresql/postgresql-test-8.1.6.tar.bz2) = ab51f4033e170414d2f2949a662c2555
+SHA256 (postgresql/postgresql-test-8.1.6.tar.bz2) = 060af213dc188ef1c0690b66860e78152d5c047e62399d8d2399ec68a29656fb
+SIZE (postgresql/postgresql-test-8.1.6.tar.bz2) = 947637
 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/pkg-message-server.in b/databases/postgresql81-server/files/pkg-message-server.in
index d22a731f40d8..cd6c42ed2090 100644
--- a/databases/postgresql81-server/files/pkg-message-server.in
+++ b/databases/postgresql81-server/files/pkg-message-server.in
@@ -30,13 +30,19 @@ If you plan to access your PostgreSQL server using ODBC, please
 consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
 to get the functions required for ODBC compliance.
 
-If you need to store any characters besides strict ASCII in your
-database, you will want to set a character set, and possibly a
-collation locale, before initializing the database. Add something
-similar to this to /etc/login.conf:
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.conf/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default.  Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
 ---
 postgres:\
-	:setenv=LC_ALL=en_US.UTF-8,LC_COLLATE=C:\
+	:lang=en_US.UTF-8:\
+	:setenv=LC_COLLATE=C:\
 	:tc=default:
 ---
 and run `cap_mkdb /etc/login.conf'.
diff --git a/databases/postgresql81-server/files/postgresql.in b/databases/postgresql81-server/files/postgresql.in
index 3456ed3d7282..1b3b4226acdf 100644
--- a/databases/postgresql81-server/files/postgresql.in
+++ b/databases/postgresql81-server/files/postgresql.in
@@ -12,6 +12,10 @@
 #  # optional
 #  postgresql_data="%%PREFIX%%/pgsql/data"
 #  postgresql_flags="-w -s -m fast"
+#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+#  postgresql_class="default"
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
 #
 # This scripts takes one of the following commands:
 #
@@ -32,6 +36,7 @@ postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
 postgresql_user=pgsql
 eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data"}
 postgresql_class=${postgresql_class:-"default"}
+postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
 rcvar=`set_rcvar`
@@ -53,7 +58,7 @@ postgresql_command()
     
 postgresql_initdb()
 {
-    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb -D ${postgresql_data}"
+    su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql81-server/pkg-plist-client b/databases/postgresql81-server/pkg-plist-client
index c39bd07b8b0e..8ca10c20173c 100644
--- a/databases/postgresql81-server/pkg-plist-client
+++ b/databases/postgresql81-server/pkg-plist-client
@@ -6,14 +6,9 @@ bin/dropdb
 bin/droplang
 bin/dropuser
 bin/ecpg
-bin/initdb
-bin/ipcclean
 bin/pg_config
-bin/pg_controldata
-bin/pg_ctl
 bin/pg_dump
 bin/pg_dumpall
-bin/pg_resetxlog
 bin/pg_restore
 bin/psql
 bin/reindexdb
@@ -452,150 +447,84 @@ share/postgresql/pg_service.conf.sample
 share/postgresql/psqlrc.sample
 @dirrmtry share/postgresql
 %%GETTEXT%%share/locale/af/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/fa/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/psql.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sk/LC_MESSAGES/libpq.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sk/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sk/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql.mo
 %%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
diff --git a/databases/postgresql81-server/pkg-plist-server b/databases/postgresql81-server/pkg-plist-server
index db7177d31302..bc8bdd79b9cd 100644
--- a/databases/postgresql81-server/pkg-plist-server
+++ b/databases/postgresql81-server/pkg-plist-server
@@ -1,5 +1,10 @@
-bin/postmaster
+bin/ipcclean
+bin/initdb
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_resetxlog
 bin/postgres
+bin/postmaster
 etc/periodic/daily/502.pgsql
 lib/libpgport.a
 lib/postgresql/ascii_and_mic.so
@@ -43,23 +48,89 @@ share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
 share/postgresql/system_views.sql
 %%GETTEXT%%share/locale/af/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/cs/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/de/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/es/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/fa/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres.mo
 %%GETTEXT%%share/locale/hr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/hu/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/hu/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/it/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sk/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sk/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sl/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sl/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/sv/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog.mo
 %%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres.mo
 %%GETTEXT%%@dirrmtry share/locale/cs/LC_MESSAGES
 %%GETTEXT%%@dirrmtry share/locale/cs
@@ -75,498 +146,341 @@ share/postgresql/system_views.sql
 %%GETTEXT%%@dirrmtry share/locale/zh_CN
 %%GETTEXT%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
 %%GETTEXT%%@dirrmtry share/locale/zh_TW
-share/postgresql/timezone/Africa/Algiers
-share/postgresql/timezone/Africa/Luanda
-share/postgresql/timezone/Africa/Porto-Novo
-share/postgresql/timezone/Africa/Gaborone
-share/postgresql/timezone/Africa/Ouagadougou
-share/postgresql/timezone/Africa/Bujumbura
-share/postgresql/timezone/Africa/Douala
-share/postgresql/timezone/Africa/Bangui
-share/postgresql/timezone/Africa/Ndjamena
-share/postgresql/timezone/Africa/Kinshasa
-share/postgresql/timezone/Africa/Lubumbashi
-share/postgresql/timezone/Africa/Brazzaville
 share/postgresql/timezone/Africa/Abidjan
-share/postgresql/timezone/Africa/Djibouti
-share/postgresql/timezone/Africa/Cairo
-share/postgresql/timezone/Africa/Malabo
-share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Accra
 share/postgresql/timezone/Africa/Addis_Ababa
-share/postgresql/timezone/Africa/Libreville
+share/postgresql/timezone/Africa/Algiers
+share/postgresql/timezone/Africa/Asmera
+share/postgresql/timezone/Africa/Bamako
+share/postgresql/timezone/Africa/Bangui
 share/postgresql/timezone/Africa/Banjul
-share/postgresql/timezone/Africa/Accra
-share/postgresql/timezone/Africa/Conakry
 share/postgresql/timezone/Africa/Bissau
-share/postgresql/timezone/Africa/Nairobi
-share/postgresql/timezone/Africa/Maseru
-share/postgresql/timezone/Africa/Monrovia
-share/postgresql/timezone/Africa/Tripoli
 share/postgresql/timezone/Africa/Blantyre
-share/postgresql/timezone/Africa/Bamako
-share/postgresql/timezone/Africa/Timbuktu
-share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Brazzaville
+share/postgresql/timezone/Africa/Bujumbura
+share/postgresql/timezone/Africa/Cairo
 share/postgresql/timezone/Africa/Casablanca
-share/postgresql/timezone/Africa/El_Aaiun
-share/postgresql/timezone/Africa/Maputo
-share/postgresql/timezone/Africa/Windhoek
-share/postgresql/timezone/Africa/Niamey
-share/postgresql/timezone/Africa/Lagos
-share/postgresql/timezone/Africa/Kigali
-share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Ceuta
+share/postgresql/timezone/Africa/Conakry
 share/postgresql/timezone/Africa/Dakar
+share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Djibouti
+share/postgresql/timezone/Africa/Douala
+share/postgresql/timezone/Africa/El_Aaiun
 share/postgresql/timezone/Africa/Freetown
-share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Gaborone
+share/postgresql/timezone/Africa/Harare
 share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Kampala
 share/postgresql/timezone/Africa/Khartoum
-share/postgresql/timezone/Africa/Mbabane
-share/postgresql/timezone/Africa/Dar_es_Salaam
+share/postgresql/timezone/Africa/Kigali
+share/postgresql/timezone/Africa/Kinshasa
+share/postgresql/timezone/Africa/Lagos
+share/postgresql/timezone/Africa/Libreville
 share/postgresql/timezone/Africa/Lome
-share/postgresql/timezone/Africa/Tunis
-share/postgresql/timezone/Africa/Kampala
+share/postgresql/timezone/Africa/Luanda
+share/postgresql/timezone/Africa/Lubumbashi
 share/postgresql/timezone/Africa/Lusaka
-share/postgresql/timezone/Africa/Harare
-share/postgresql/timezone/Africa/Ceuta
-share/postgresql/timezone/Atlantic/Cape_Verde
-share/postgresql/timezone/Atlantic/St_Helena
-share/postgresql/timezone/Atlantic/Faeroe
-share/postgresql/timezone/Atlantic/Reykjavik
-share/postgresql/timezone/Atlantic/Azores
-share/postgresql/timezone/Atlantic/Madeira
-share/postgresql/timezone/Atlantic/Canary
-share/postgresql/timezone/Atlantic/Bermuda
-share/postgresql/timezone/Atlantic/Stanley
-share/postgresql/timezone/Atlantic/South_Georgia
-share/postgresql/timezone/Atlantic/Jan_Mayen
-share/postgresql/timezone/Indian/Comoro
-share/postgresql/timezone/Indian/Antananarivo
-share/postgresql/timezone/Indian/Mauritius
-share/postgresql/timezone/Indian/Mayotte
-share/postgresql/timezone/Indian/Reunion
-share/postgresql/timezone/Indian/Mahe
-share/postgresql/timezone/Indian/Kerguelen
-share/postgresql/timezone/Indian/Chagos
-share/postgresql/timezone/Indian/Maldives
-share/postgresql/timezone/Indian/Christmas
-share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Africa/Malabo
+share/postgresql/timezone/Africa/Maputo
+share/postgresql/timezone/Africa/Maseru
+share/postgresql/timezone/Africa/Mbabane
+share/postgresql/timezone/Africa/Mogadishu
+share/postgresql/timezone/Africa/Monrovia
+share/postgresql/timezone/Africa/Nairobi
+share/postgresql/timezone/Africa/Ndjamena
+share/postgresql/timezone/Africa/Niamey
+share/postgresql/timezone/Africa/Nouakchott
+share/postgresql/timezone/Africa/Ouagadougou
+share/postgresql/timezone/Africa/Porto-Novo
+share/postgresql/timezone/Africa/Sao_Tome
+share/postgresql/timezone/Africa/Timbuktu
+share/postgresql/timezone/Africa/Tripoli
+share/postgresql/timezone/Africa/Tunis
+share/postgresql/timezone/Africa/Windhoek
+share/postgresql/timezone/America/Adak
+share/postgresql/timezone/America/Anchorage
+share/postgresql/timezone/America/Anguilla
+share/postgresql/timezone/America/Antigua
+share/postgresql/timezone/America/Araguaina
+share/postgresql/timezone/America/Argentina/Buenos_Aires
+share/postgresql/timezone/America/Argentina/Catamarca
+share/postgresql/timezone/America/Argentina/ComodRivadavia
+share/postgresql/timezone/America/Argentina/Cordoba
+share/postgresql/timezone/America/Argentina/Jujuy
+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/Tucuman
+share/postgresql/timezone/America/Argentina/Ushuaia
+share/postgresql/timezone/America/Aruba
+share/postgresql/timezone/America/Asuncion
+share/postgresql/timezone/America/Atikokan
+share/postgresql/timezone/America/Atka
+share/postgresql/timezone/America/Bahia
+share/postgresql/timezone/America/Barbados
+share/postgresql/timezone/America/Belem
+share/postgresql/timezone/America/Belize
+share/postgresql/timezone/America/Blanc-Sablon
+share/postgresql/timezone/America/Boa_Vista
+share/postgresql/timezone/America/Bogota
+share/postgresql/timezone/America/Boise
+share/postgresql/timezone/America/Buenos_Aires
+share/postgresql/timezone/America/Cambridge_Bay
+share/postgresql/timezone/America/Campo_Grande
+share/postgresql/timezone/America/Cancun
+share/postgresql/timezone/America/Caracas
+share/postgresql/timezone/America/Catamarca
+share/postgresql/timezone/America/Cayenne
+share/postgresql/timezone/America/Cayman
+share/postgresql/timezone/America/Chicago
+share/postgresql/timezone/America/Chihuahua
+share/postgresql/timezone/America/Coral_Harbour
+share/postgresql/timezone/America/Cordoba
+share/postgresql/timezone/America/Costa_Rica
+share/postgresql/timezone/America/Cuiaba
+share/postgresql/timezone/America/Curacao
+share/postgresql/timezone/America/Danmarkshavn
+share/postgresql/timezone/America/Dawson
+share/postgresql/timezone/America/Dawson_Creek
+share/postgresql/timezone/America/Denver
+share/postgresql/timezone/America/Detroit
+share/postgresql/timezone/America/Dominica
+share/postgresql/timezone/America/Edmonton
+share/postgresql/timezone/America/Eirunepe
+share/postgresql/timezone/America/El_Salvador
+share/postgresql/timezone/America/Ensenada
+share/postgresql/timezone/America/Fort_Wayne
+share/postgresql/timezone/America/Fortaleza
+share/postgresql/timezone/America/Glace_Bay
+share/postgresql/timezone/America/Godthab
+share/postgresql/timezone/America/Goose_Bay
+share/postgresql/timezone/America/Grand_Turk
+share/postgresql/timezone/America/Grenada
+share/postgresql/timezone/America/Guadeloupe
+share/postgresql/timezone/America/Guatemala
+share/postgresql/timezone/America/Guayaquil
+share/postgresql/timezone/America/Guyana
+share/postgresql/timezone/America/Halifax
+share/postgresql/timezone/America/Havana
+share/postgresql/timezone/America/Hermosillo
+share/postgresql/timezone/America/Indiana/Indianapolis
+share/postgresql/timezone/America/Indiana/Knox
+share/postgresql/timezone/America/Indiana/Marengo
+share/postgresql/timezone/America/Indiana/Petersburg
+share/postgresql/timezone/America/Indiana/Vevay
+share/postgresql/timezone/America/Indiana/Vincennes
+share/postgresql/timezone/America/Indianapolis
+share/postgresql/timezone/America/Inuvik
+share/postgresql/timezone/America/Iqaluit
+share/postgresql/timezone/America/Jamaica
+share/postgresql/timezone/America/Jujuy
+share/postgresql/timezone/America/Juneau
+share/postgresql/timezone/America/Kentucky/Louisville
+share/postgresql/timezone/America/Kentucky/Monticello
+share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/La_Paz
+share/postgresql/timezone/America/Lima
+share/postgresql/timezone/America/Los_Angeles
+share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Maceio
+share/postgresql/timezone/America/Managua
+share/postgresql/timezone/America/Manaus
+share/postgresql/timezone/America/Martinique
+share/postgresql/timezone/America/Mazatlan
+share/postgresql/timezone/America/Mendoza
+share/postgresql/timezone/America/Menominee
+share/postgresql/timezone/America/Merida
+share/postgresql/timezone/America/Mexico_City
+share/postgresql/timezone/America/Miquelon
+share/postgresql/timezone/America/Moncton
+share/postgresql/timezone/America/Monterrey
+share/postgresql/timezone/America/Montevideo
+share/postgresql/timezone/America/Montreal
+share/postgresql/timezone/America/Montserrat
+share/postgresql/timezone/America/Nassau
+share/postgresql/timezone/America/New_York
+share/postgresql/timezone/America/Nipigon
+share/postgresql/timezone/America/Nome
+share/postgresql/timezone/America/Noronha
+share/postgresql/timezone/America/North_Dakota/Center
+share/postgresql/timezone/America/North_Dakota/New_Salem
+share/postgresql/timezone/America/Panama
+share/postgresql/timezone/America/Pangnirtung
+share/postgresql/timezone/America/Paramaribo
+share/postgresql/timezone/America/Phoenix
+share/postgresql/timezone/America/Port-au-Prince
+share/postgresql/timezone/America/Port_of_Spain
+share/postgresql/timezone/America/Porto_Acre
+share/postgresql/timezone/America/Porto_Velho
+share/postgresql/timezone/America/Puerto_Rico
+share/postgresql/timezone/America/Rainy_River
+share/postgresql/timezone/America/Rankin_Inlet
+share/postgresql/timezone/America/Recife
+share/postgresql/timezone/America/Regina
+share/postgresql/timezone/America/Rio_Branco
+share/postgresql/timezone/America/Rosario
+share/postgresql/timezone/America/Santiago
+share/postgresql/timezone/America/Santo_Domingo
+share/postgresql/timezone/America/Sao_Paulo
+share/postgresql/timezone/America/Scoresbysund
+share/postgresql/timezone/America/Shiprock
+share/postgresql/timezone/America/St_Johns
+share/postgresql/timezone/America/St_Kitts
+share/postgresql/timezone/America/St_Lucia
+share/postgresql/timezone/America/St_Thomas
+share/postgresql/timezone/America/St_Vincent
+share/postgresql/timezone/America/Swift_Current
+share/postgresql/timezone/America/Tegucigalpa
+share/postgresql/timezone/America/Thule
+share/postgresql/timezone/America/Thunder_Bay
+share/postgresql/timezone/America/Tijuana
+share/postgresql/timezone/America/Toronto
+share/postgresql/timezone/America/Tortola
+share/postgresql/timezone/America/Vancouver
+share/postgresql/timezone/America/Virgin
+share/postgresql/timezone/America/Whitehorse
+share/postgresql/timezone/America/Winnipeg
+share/postgresql/timezone/America/Yakutat
+share/postgresql/timezone/America/Yellowknife
 share/postgresql/timezone/Antarctica/Casey
 share/postgresql/timezone/Antarctica/Davis
-share/postgresql/timezone/Antarctica/Mawson
 share/postgresql/timezone/Antarctica/DumontDUrville
-share/postgresql/timezone/Antarctica/Syowa
-share/postgresql/timezone/Antarctica/Vostok
-share/postgresql/timezone/Antarctica/Rothera
-share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/Mawson
 share/postgresql/timezone/Antarctica/McMurdo
+share/postgresql/timezone/Antarctica/Palmer
+share/postgresql/timezone/Antarctica/Rothera
 share/postgresql/timezone/Antarctica/South_Pole
-share/postgresql/timezone/Asia/Kabul
-share/postgresql/timezone/Asia/Yerevan
-share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Antarctica/Syowa
+share/postgresql/timezone/Antarctica/Vostok
+share/postgresql/timezone/Arctic/Longyearbyen
+share/postgresql/timezone/Asia/Aden
+share/postgresql/timezone/Asia/Almaty
+share/postgresql/timezone/Asia/Amman
+share/postgresql/timezone/Asia/Anadyr
+share/postgresql/timezone/Asia/Aqtau
+share/postgresql/timezone/Asia/Aqtobe
+share/postgresql/timezone/Asia/Ashgabat
+share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Baghdad
 share/postgresql/timezone/Asia/Bahrain
-share/postgresql/timezone/Asia/Dhaka
-share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Baku
+share/postgresql/timezone/Asia/Bangkok
+share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Bishkek
 share/postgresql/timezone/Asia/Brunei
-share/postgresql/timezone/Asia/Rangoon
-share/postgresql/timezone/Asia/Phnom_Penh
-share/postgresql/timezone/Asia/Harbin
-share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Choibalsan
 share/postgresql/timezone/Asia/Chongqing
-share/postgresql/timezone/Asia/Urumqi
-share/postgresql/timezone/Asia/Kashgar
-share/postgresql/timezone/Asia/Hong_Kong
-share/postgresql/timezone/Asia/Taipei
-share/postgresql/timezone/Asia/Macau
-share/postgresql/timezone/Asia/Nicosia
-share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Chungking
+share/postgresql/timezone/Asia/Colombo
+share/postgresql/timezone/Asia/Dacca
+share/postgresql/timezone/Asia/Damascus
+share/postgresql/timezone/Asia/Dhaka
 share/postgresql/timezone/Asia/Dili
-share/postgresql/timezone/Asia/Calcutta
+share/postgresql/timezone/Asia/Dubai
+share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Harbin
+share/postgresql/timezone/Asia/Hong_Kong
+share/postgresql/timezone/Asia/Hovd
+share/postgresql/timezone/Asia/Irkutsk
+share/postgresql/timezone/Asia/Istanbul
 share/postgresql/timezone/Asia/Jakarta
-share/postgresql/timezone/Asia/Pontianak
-share/postgresql/timezone/Asia/Makassar
 share/postgresql/timezone/Asia/Jayapura
-share/postgresql/timezone/Asia/Tehran
-share/postgresql/timezone/Asia/Baghdad
 share/postgresql/timezone/Asia/Jerusalem
-share/postgresql/timezone/Asia/Tokyo
-share/postgresql/timezone/Asia/Amman
-share/postgresql/timezone/Asia/Almaty
-share/postgresql/timezone/Asia/Qyzylorda
-share/postgresql/timezone/Asia/Aqtobe
-share/postgresql/timezone/Asia/Aqtau
-share/postgresql/timezone/Asia/Oral
-share/postgresql/timezone/Asia/Bishkek
-share/postgresql/timezone/Asia/Seoul
-share/postgresql/timezone/Asia/Pyongyang
-share/postgresql/timezone/Asia/Kuwait
-share/postgresql/timezone/Asia/Vientiane
-share/postgresql/timezone/Asia/Beirut
+share/postgresql/timezone/Asia/Kabul
+share/postgresql/timezone/Asia/Kamchatka
+share/postgresql/timezone/Asia/Karachi
+share/postgresql/timezone/Asia/Kashgar
+share/postgresql/timezone/Asia/Katmandu
+share/postgresql/timezone/Asia/Krasnoyarsk
 share/postgresql/timezone/Asia/Kuala_Lumpur
 share/postgresql/timezone/Asia/Kuching
-share/postgresql/timezone/Asia/Hovd
-share/postgresql/timezone/Asia/Ulaanbaatar
-share/postgresql/timezone/Asia/Choibalsan
-share/postgresql/timezone/Asia/Katmandu
-share/postgresql/timezone/Asia/Muscat
-share/postgresql/timezone/Asia/Karachi
-share/postgresql/timezone/Asia/Gaza
+share/postgresql/timezone/Asia/Kuwait
+share/postgresql/timezone/Asia/Macao
+share/postgresql/timezone/Asia/Macau
+share/postgresql/timezone/Asia/Magadan
+share/postgresql/timezone/Asia/Makassar
 share/postgresql/timezone/Asia/Manila
+share/postgresql/timezone/Asia/Muscat
+share/postgresql/timezone/Asia/Nicosia
+share/postgresql/timezone/Asia/Novosibirsk
+share/postgresql/timezone/Asia/Omsk
+share/postgresql/timezone/Asia/Oral
+share/postgresql/timezone/Asia/Phnom_Penh
+share/postgresql/timezone/Asia/Pontianak
+share/postgresql/timezone/Asia/Pyongyang
 share/postgresql/timezone/Asia/Qatar
+share/postgresql/timezone/Asia/Qyzylorda
+share/postgresql/timezone/Asia/Rangoon
 share/postgresql/timezone/Asia/Riyadh
-share/postgresql/timezone/Asia/Singapore
-share/postgresql/timezone/Asia/Colombo
-share/postgresql/timezone/Asia/Damascus
-share/postgresql/timezone/Asia/Dushanbe
-share/postgresql/timezone/Asia/Bangkok
-share/postgresql/timezone/Asia/Ashgabat
-share/postgresql/timezone/Asia/Dubai
-share/postgresql/timezone/Asia/Samarkand
-share/postgresql/timezone/Asia/Tashkent
-share/postgresql/timezone/Asia/Saigon
-share/postgresql/timezone/Asia/Aden
-share/postgresql/timezone/Asia/Yekaterinburg
-share/postgresql/timezone/Asia/Omsk
-share/postgresql/timezone/Asia/Novosibirsk
-share/postgresql/timezone/Asia/Krasnoyarsk
-share/postgresql/timezone/Asia/Irkutsk
-share/postgresql/timezone/Asia/Yakutsk
-share/postgresql/timezone/Asia/Vladivostok
-share/postgresql/timezone/Asia/Sakhalin
-share/postgresql/timezone/Asia/Magadan
-share/postgresql/timezone/Asia/Kamchatka
-share/postgresql/timezone/Asia/Anadyr
 share/postgresql/timezone/Asia/Riyadh87
 share/postgresql/timezone/Asia/Riyadh88
 share/postgresql/timezone/Asia/Riyadh89
-share/postgresql/timezone/Asia/Istanbul
-share/postgresql/timezone/Asia/Ashkhabad
-share/postgresql/timezone/Asia/Chungking
-share/postgresql/timezone/Asia/Dacca
-share/postgresql/timezone/Asia/Macao
-share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Saigon
+share/postgresql/timezone/Asia/Sakhalin
+share/postgresql/timezone/Asia/Samarkand
+share/postgresql/timezone/Asia/Seoul
+share/postgresql/timezone/Asia/Shanghai
+share/postgresql/timezone/Asia/Singapore
+share/postgresql/timezone/Asia/Taipei
+share/postgresql/timezone/Asia/Tashkent
+share/postgresql/timezone/Asia/Tbilisi
+share/postgresql/timezone/Asia/Tehran
 share/postgresql/timezone/Asia/Tel_Aviv
 share/postgresql/timezone/Asia/Thimbu
+share/postgresql/timezone/Asia/Thimphu
+share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Ujung_Pandang
+share/postgresql/timezone/Asia/Ulaanbaatar
 share/postgresql/timezone/Asia/Ulan_Bator
-share/postgresql/timezone/Australia/Currie
-share/postgresql/timezone/Australia/Darwin
-share/postgresql/timezone/Australia/Perth
-share/postgresql/timezone/Australia/Brisbane
-share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Asia/Urumqi
+share/postgresql/timezone/Asia/Vientiane
+share/postgresql/timezone/Asia/Vladivostok
+share/postgresql/timezone/Asia/Yakutsk
+share/postgresql/timezone/Asia/Yekaterinburg
+share/postgresql/timezone/Asia/Yerevan
+share/postgresql/timezone/Atlantic/Azores
+share/postgresql/timezone/Atlantic/Bermuda
+share/postgresql/timezone/Atlantic/Canary
+share/postgresql/timezone/Atlantic/Cape_Verde
+share/postgresql/timezone/Atlantic/Faeroe
+share/postgresql/timezone/Atlantic/Jan_Mayen
+share/postgresql/timezone/Atlantic/Madeira
+share/postgresql/timezone/Atlantic/Reykjavik
+share/postgresql/timezone/Atlantic/South_Georgia
+share/postgresql/timezone/Atlantic/St_Helena
+share/postgresql/timezone/Atlantic/Stanley
+share/postgresql/timezone/Australia/ACT
 share/postgresql/timezone/Australia/Adelaide
-share/postgresql/timezone/Australia/Hobart
-share/postgresql/timezone/Australia/Melbourne
-share/postgresql/timezone/Australia/Sydney
+share/postgresql/timezone/Australia/Brisbane
 share/postgresql/timezone/Australia/Broken_Hill
-share/postgresql/timezone/Australia/Lord_Howe
-share/postgresql/timezone/Australia/ACT
 share/postgresql/timezone/Australia/Canberra
+share/postgresql/timezone/Australia/Currie
+share/postgresql/timezone/Australia/Darwin
+share/postgresql/timezone/Australia/Hobart
 share/postgresql/timezone/Australia/LHI
+share/postgresql/timezone/Australia/Lindeman
+share/postgresql/timezone/Australia/Lord_Howe
+share/postgresql/timezone/Australia/Melbourne
 share/postgresql/timezone/Australia/NSW
 share/postgresql/timezone/Australia/North
+share/postgresql/timezone/Australia/Perth
 share/postgresql/timezone/Australia/Queensland
 share/postgresql/timezone/Australia/South
+share/postgresql/timezone/Australia/Sydney
 share/postgresql/timezone/Australia/Tasmania
 share/postgresql/timezone/Australia/Victoria
 share/postgresql/timezone/Australia/West
 share/postgresql/timezone/Australia/Yancowinna
-share/postgresql/timezone/Pacific/Rarotonga
-share/postgresql/timezone/Pacific/Fiji
-share/postgresql/timezone/Pacific/Gambier
-share/postgresql/timezone/Pacific/Marquesas
-share/postgresql/timezone/Pacific/Tahiti
-share/postgresql/timezone/Pacific/Guam
-share/postgresql/timezone/Pacific/Tarawa
-share/postgresql/timezone/Pacific/Enderbury
-share/postgresql/timezone/Pacific/Kiritimati
-share/postgresql/timezone/Pacific/Saipan
-share/postgresql/timezone/Pacific/Majuro
-share/postgresql/timezone/Pacific/Kwajalein
-share/postgresql/timezone/Pacific/Yap
-share/postgresql/timezone/Pacific/Truk
-share/postgresql/timezone/Pacific/Ponape
-share/postgresql/timezone/Pacific/Kosrae
-share/postgresql/timezone/Pacific/Nauru
-share/postgresql/timezone/Pacific/Noumea
-share/postgresql/timezone/Pacific/Auckland
-share/postgresql/timezone/Pacific/Chatham
-share/postgresql/timezone/Pacific/Niue
-share/postgresql/timezone/Pacific/Norfolk
-share/postgresql/timezone/Pacific/Palau
-share/postgresql/timezone/Pacific/Port_Moresby
-share/postgresql/timezone/Pacific/Pitcairn
-share/postgresql/timezone/Pacific/Pago_Pago
-share/postgresql/timezone/Pacific/Apia
-share/postgresql/timezone/Pacific/Guadalcanal
-share/postgresql/timezone/Pacific/Fakaofo
-share/postgresql/timezone/Pacific/Tongatapu
-share/postgresql/timezone/Pacific/Funafuti
-share/postgresql/timezone/Pacific/Johnston
-share/postgresql/timezone/Pacific/Midway
-share/postgresql/timezone/Pacific/Wake
-share/postgresql/timezone/Pacific/Efate
-share/postgresql/timezone/Pacific/Wallis
-share/postgresql/timezone/Pacific/Honolulu
-share/postgresql/timezone/Pacific/Easter
-share/postgresql/timezone/Pacific/Galapagos
-share/postgresql/timezone/Pacific/Samoa
-share/postgresql/timezone/Europe/London
-share/postgresql/timezone/Europe/Belfast
-share/postgresql/timezone/Europe/Dublin
-share/postgresql/timezone/Europe/Tirane
-share/postgresql/timezone/Europe/Andorra
-share/postgresql/timezone/Europe/Vienna
-share/postgresql/timezone/Europe/Minsk
-share/postgresql/timezone/Europe/Brussels
-share/postgresql/timezone/Europe/Sofia
-share/postgresql/timezone/Europe/Prague
-share/postgresql/timezone/Europe/Copenhagen
-share/postgresql/timezone/Europe/Tallinn
-share/postgresql/timezone/Europe/Helsinki
-share/postgresql/timezone/Europe/Paris
-share/postgresql/timezone/Europe/Berlin
-share/postgresql/timezone/Europe/Gibraltar
-share/postgresql/timezone/Europe/Athens
-share/postgresql/timezone/Europe/Budapest
-share/postgresql/timezone/Europe/Rome
-share/postgresql/timezone/Europe/Riga
-share/postgresql/timezone/Europe/Vaduz
-share/postgresql/timezone/Europe/Vilnius
-share/postgresql/timezone/Europe/Luxembourg
-share/postgresql/timezone/Europe/Malta
-share/postgresql/timezone/Europe/Chisinau
-share/postgresql/timezone/Europe/Monaco
-share/postgresql/timezone/Europe/Amsterdam
-share/postgresql/timezone/Europe/Oslo
-share/postgresql/timezone/Europe/Warsaw
-share/postgresql/timezone/Europe/Lisbon
-share/postgresql/timezone/Europe/Bucharest
-share/postgresql/timezone/Europe/Kaliningrad
-share/postgresql/timezone/Europe/Moscow
-share/postgresql/timezone/Europe/Samara
-share/postgresql/timezone/Europe/Belgrade
-share/postgresql/timezone/Europe/Madrid
-share/postgresql/timezone/Europe/Stockholm
-share/postgresql/timezone/Europe/Zurich
-share/postgresql/timezone/Europe/Istanbul
-share/postgresql/timezone/Europe/Kiev
-share/postgresql/timezone/Europe/Uzhgorod
-share/postgresql/timezone/Europe/Zaporozhye
-share/postgresql/timezone/Europe/Simferopol
-share/postgresql/timezone/Europe/Nicosia
-share/postgresql/timezone/Europe/Mariehamn
-share/postgresql/timezone/Europe/Vatican
-share/postgresql/timezone/Europe/San_Marino
-share/postgresql/timezone/Europe/Ljubljana
-share/postgresql/timezone/Europe/Sarajevo
-share/postgresql/timezone/Europe/Skopje
-share/postgresql/timezone/Europe/Zagreb
-share/postgresql/timezone/Europe/Bratislava
-share/postgresql/timezone/Europe/Tiraspol
-share/postgresql/timezone/WET
-share/postgresql/timezone/CET
-share/postgresql/timezone/MET
-share/postgresql/timezone/EET
-share/postgresql/timezone/America/Danmarkshavn
-share/postgresql/timezone/America/Coral_Harbour
-share/postgresql/timezone/America/Scoresbysund
-share/postgresql/timezone/America/Godthab
-share/postgresql/timezone/America/Thule
-share/postgresql/timezone/America/New_York
-share/postgresql/timezone/America/Chicago
-share/postgresql/timezone/America/North_Dakota/Center
-share/postgresql/timezone/America/Denver
-share/postgresql/timezone/America/Los_Angeles
-share/postgresql/timezone/America/Juneau
-share/postgresql/timezone/America/Yakutat
-share/postgresql/timezone/America/Anchorage
-share/postgresql/timezone/America/Nome
-share/postgresql/timezone/America/Adak
-share/postgresql/timezone/America/Phoenix
-share/postgresql/timezone/America/Boise
-share/postgresql/timezone/America/Indianapolis
-share/postgresql/timezone/America/Indiana/Marengo
-share/postgresql/timezone/America/Indiana/Knox
-share/postgresql/timezone/America/Indiana/Vevay
-share/postgresql/timezone/America/Indiana/Indianapolis
-share/postgresql/timezone/America/Louisville
-share/postgresql/timezone/America/Kentucky/Monticello
-share/postgresql/timezone/America/Kentucky/Louisville
-share/postgresql/timezone/America/Detroit
-share/postgresql/timezone/America/Menominee
-share/postgresql/timezone/America/St_Johns
-share/postgresql/timezone/America/Goose_Bay
-share/postgresql/timezone/America/Halifax
-share/postgresql/timezone/America/Glace_Bay
-share/postgresql/timezone/America/Montreal
-share/postgresql/timezone/America/Toronto
-share/postgresql/timezone/America/Thunder_Bay
-share/postgresql/timezone/America/Nipigon
-share/postgresql/timezone/America/Rainy_River
-share/postgresql/timezone/America/Winnipeg
-share/postgresql/timezone/America/Regina
-share/postgresql/timezone/America/Swift_Current
-share/postgresql/timezone/America/Edmonton
-share/postgresql/timezone/America/Vancouver
-share/postgresql/timezone/America/Dawson_Creek
-share/postgresql/timezone/America/Pangnirtung
-share/postgresql/timezone/America/Iqaluit
-share/postgresql/timezone/America/Rankin_Inlet
-share/postgresql/timezone/America/Cambridge_Bay
-share/postgresql/timezone/America/Yellowknife
-share/postgresql/timezone/America/Inuvik
-share/postgresql/timezone/America/Whitehorse
-share/postgresql/timezone/America/Dawson
-share/postgresql/timezone/America/Cancun
-share/postgresql/timezone/America/Merida
-share/postgresql/timezone/America/Monterrey
-share/postgresql/timezone/America/Mexico_City
-share/postgresql/timezone/America/Chihuahua
-share/postgresql/timezone/America/Hermosillo
-share/postgresql/timezone/America/Mazatlan
-share/postgresql/timezone/America/Tijuana
-share/postgresql/timezone/America/Anguilla
-share/postgresql/timezone/America/Antigua
-share/postgresql/timezone/America/Nassau
-share/postgresql/timezone/America/Barbados
-share/postgresql/timezone/America/Belize
-share/postgresql/timezone/America/Cayman
-share/postgresql/timezone/America/Costa_Rica
-share/postgresql/timezone/America/Havana
-share/postgresql/timezone/America/Dominica
-share/postgresql/timezone/America/Santo_Domingo
-share/postgresql/timezone/America/El_Salvador
-share/postgresql/timezone/America/Grenada
-share/postgresql/timezone/America/Guadeloupe
-share/postgresql/timezone/America/Guatemala
-share/postgresql/timezone/America/Port-au-Prince
-share/postgresql/timezone/America/Tegucigalpa
-share/postgresql/timezone/America/Jamaica
-share/postgresql/timezone/America/Martinique
-share/postgresql/timezone/America/Montserrat
-share/postgresql/timezone/America/Managua
-share/postgresql/timezone/America/Panama
-share/postgresql/timezone/America/Puerto_Rico
-share/postgresql/timezone/America/St_Kitts
-share/postgresql/timezone/America/St_Lucia
-share/postgresql/timezone/America/Miquelon
-share/postgresql/timezone/America/St_Vincent
-share/postgresql/timezone/America/Grand_Turk
-share/postgresql/timezone/America/Tortola
-share/postgresql/timezone/America/St_Thomas
-share/postgresql/timezone/America/Argentina/Buenos_Aires
-share/postgresql/timezone/America/Argentina/Cordoba
-share/postgresql/timezone/America/Argentina/Tucuman
-share/postgresql/timezone/America/Argentina/La_Rioja
-share/postgresql/timezone/America/Argentina/San_Juan
-share/postgresql/timezone/America/Argentina/Jujuy
-share/postgresql/timezone/America/Argentina/Catamarca
-share/postgresql/timezone/America/Argentina/Mendoza
-share/postgresql/timezone/America/Argentina/ComodRivadavia
-share/postgresql/timezone/America/Argentina/Rio_Gallegos
-share/postgresql/timezone/America/Argentina/Ushuaia
-share/postgresql/timezone/America/Aruba
-share/postgresql/timezone/America/La_Paz
-share/postgresql/timezone/America/Noronha
-share/postgresql/timezone/America/Belem
-share/postgresql/timezone/America/Fortaleza
-share/postgresql/timezone/America/Recife
-share/postgresql/timezone/America/Araguaina
-share/postgresql/timezone/America/Maceio
-share/postgresql/timezone/America/Bahia
-share/postgresql/timezone/America/Sao_Paulo
-share/postgresql/timezone/America/Campo_Grande
-share/postgresql/timezone/America/Cuiaba
-share/postgresql/timezone/America/Porto_Velho
-share/postgresql/timezone/America/Boa_Vista
-share/postgresql/timezone/America/Manaus
-share/postgresql/timezone/America/Eirunepe
-share/postgresql/timezone/America/Rio_Branco
-share/postgresql/timezone/America/Santiago
-share/postgresql/timezone/America/Bogota
-share/postgresql/timezone/America/Curacao
-share/postgresql/timezone/America/Guayaquil
-share/postgresql/timezone/America/Cayenne
-share/postgresql/timezone/America/Guyana
-share/postgresql/timezone/America/Asuncion
-share/postgresql/timezone/America/Lima
-share/postgresql/timezone/America/Paramaribo
-share/postgresql/timezone/America/Port_of_Spain
-share/postgresql/timezone/America/Montevideo
-share/postgresql/timezone/America/Caracas
-share/postgresql/timezone/America/Shiprock
-share/postgresql/timezone/America/Atka
-share/postgresql/timezone/America/Buenos_Aires
-share/postgresql/timezone/America/Catamarca
-share/postgresql/timezone/America/Cordoba
-share/postgresql/timezone/America/Ensenada
-share/postgresql/timezone/America/Fort_Wayne
-share/postgresql/timezone/America/Jujuy
-share/postgresql/timezone/America/Knox_IN
-share/postgresql/timezone/America/Mendoza
-share/postgresql/timezone/America/Porto_Acre
-share/postgresql/timezone/America/Rosario
-share/postgresql/timezone/America/Virgin
-share/postgresql/timezone/Etc/GMT
-share/postgresql/timezone/Etc/UTC
-share/postgresql/timezone/Etc/UCT
-share/postgresql/timezone/Etc/GMT-14
-share/postgresql/timezone/Etc/GMT-13
-share/postgresql/timezone/Etc/GMT-12
-share/postgresql/timezone/Etc/GMT-11
-share/postgresql/timezone/Etc/GMT-10
-share/postgresql/timezone/Etc/GMT-9
-share/postgresql/timezone/Etc/GMT-8
-share/postgresql/timezone/Etc/GMT-7
-share/postgresql/timezone/Etc/GMT-6
-share/postgresql/timezone/Etc/GMT-5
-share/postgresql/timezone/Etc/GMT-4
-share/postgresql/timezone/Etc/GMT-3
-share/postgresql/timezone/Etc/GMT-2
-share/postgresql/timezone/Etc/GMT-1
-share/postgresql/timezone/Etc/GMT+1
-share/postgresql/timezone/Etc/GMT+2
-share/postgresql/timezone/Etc/GMT+3
-share/postgresql/timezone/Etc/GMT+4
-share/postgresql/timezone/Etc/GMT+5
-share/postgresql/timezone/Etc/GMT+6
-share/postgresql/timezone/Etc/GMT+7
-share/postgresql/timezone/Etc/GMT+8
-share/postgresql/timezone/Etc/GMT+9
-share/postgresql/timezone/Etc/GMT+10
-share/postgresql/timezone/Etc/GMT+11
-share/postgresql/timezone/Etc/GMT+12
-share/postgresql/timezone/Etc/Universal
-share/postgresql/timezone/Etc/Zulu
-share/postgresql/timezone/Etc/Greenwich
-share/postgresql/timezone/Etc/GMT-0
-share/postgresql/timezone/Etc/GMT+0
-share/postgresql/timezone/Etc/GMT0
-share/postgresql/timezone/Factory
-share/postgresql/timezone/Arctic/Longyearbyen
-share/postgresql/timezone/EST5EDT
-share/postgresql/timezone/CST6CDT
-share/postgresql/timezone/MST7MDT
-share/postgresql/timezone/PST8PDT
-share/postgresql/timezone/EST
-share/postgresql/timezone/MST
-share/postgresql/timezone/HST
-share/postgresql/timezone/US/Pacific-New
-share/postgresql/timezone/US/Alaska
-share/postgresql/timezone/US/Aleutian
-share/postgresql/timezone/US/Arizona
-share/postgresql/timezone/US/Central
-share/postgresql/timezone/US/East-Indiana
-share/postgresql/timezone/US/Eastern
-share/postgresql/timezone/US/Hawaii
-share/postgresql/timezone/US/Indiana-Starke
-share/postgresql/timezone/US/Michigan
-share/postgresql/timezone/US/Mountain
-share/postgresql/timezone/US/Pacific
-share/postgresql/timezone/US/Samoa
-share/postgresql/timezone/GMT
 share/postgresql/timezone/Brazil/Acre
 share/postgresql/timezone/Brazil/DeNoronha
 share/postgresql/timezone/Brazil/East
 share/postgresql/timezone/Brazil/West
+share/postgresql/timezone/CET
+share/postgresql/timezone/CST6CDT
 share/postgresql/timezone/Canada/Atlantic
 share/postgresql/timezone/Canada/Central
 share/postgresql/timezone/Canada/East-Saskatchewan
@@ -579,56 +493,211 @@ share/postgresql/timezone/Canada/Yukon
 share/postgresql/timezone/Chile/Continental
 share/postgresql/timezone/Chile/EasterIsland
 share/postgresql/timezone/Cuba
+share/postgresql/timezone/EET
+share/postgresql/timezone/EST
+share/postgresql/timezone/EST5EDT
 share/postgresql/timezone/Egypt
 share/postgresql/timezone/Eire
+share/postgresql/timezone/Etc/GMT
+share/postgresql/timezone/Etc/GMT+0
+share/postgresql/timezone/Etc/GMT+1
+share/postgresql/timezone/Etc/GMT+10
+share/postgresql/timezone/Etc/GMT+11
+share/postgresql/timezone/Etc/GMT+12
+share/postgresql/timezone/Etc/GMT+2
+share/postgresql/timezone/Etc/GMT+3
+share/postgresql/timezone/Etc/GMT+4
+share/postgresql/timezone/Etc/GMT+5
+share/postgresql/timezone/Etc/GMT+6
+share/postgresql/timezone/Etc/GMT+7
+share/postgresql/timezone/Etc/GMT+8
+share/postgresql/timezone/Etc/GMT+9
+share/postgresql/timezone/Etc/GMT-0
+share/postgresql/timezone/Etc/GMT-1
+share/postgresql/timezone/Etc/GMT-10
+share/postgresql/timezone/Etc/GMT-11
+share/postgresql/timezone/Etc/GMT-12
+share/postgresql/timezone/Etc/GMT-13
+share/postgresql/timezone/Etc/GMT-14
+share/postgresql/timezone/Etc/GMT-2
+share/postgresql/timezone/Etc/GMT-3
+share/postgresql/timezone/Etc/GMT-4
+share/postgresql/timezone/Etc/GMT-5
+share/postgresql/timezone/Etc/GMT-6
+share/postgresql/timezone/Etc/GMT-7
+share/postgresql/timezone/Etc/GMT-8
+share/postgresql/timezone/Etc/GMT-9
+share/postgresql/timezone/Etc/GMT0
+share/postgresql/timezone/Etc/Greenwich
+share/postgresql/timezone/Etc/UCT
+share/postgresql/timezone/Etc/UTC
+share/postgresql/timezone/Etc/Universal
+share/postgresql/timezone/Etc/Zulu
+share/postgresql/timezone/Europe/Amsterdam
+share/postgresql/timezone/Europe/Andorra
+share/postgresql/timezone/Europe/Athens
+share/postgresql/timezone/Europe/Belfast
+share/postgresql/timezone/Europe/Belgrade
+share/postgresql/timezone/Europe/Berlin
+share/postgresql/timezone/Europe/Bratislava
+share/postgresql/timezone/Europe/Brussels
+share/postgresql/timezone/Europe/Bucharest
+share/postgresql/timezone/Europe/Budapest
+share/postgresql/timezone/Europe/Chisinau
+share/postgresql/timezone/Europe/Copenhagen
+share/postgresql/timezone/Europe/Dublin
+share/postgresql/timezone/Europe/Gibraltar
+share/postgresql/timezone/Europe/Guernsey
+share/postgresql/timezone/Europe/Helsinki
+share/postgresql/timezone/Europe/Isle_of_Man
+share/postgresql/timezone/Europe/Istanbul
+share/postgresql/timezone/Europe/Jersey
+share/postgresql/timezone/Europe/Kaliningrad
+share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Lisbon
+share/postgresql/timezone/Europe/Ljubljana
+share/postgresql/timezone/Europe/London
+share/postgresql/timezone/Europe/Luxembourg
+share/postgresql/timezone/Europe/Madrid
+share/postgresql/timezone/Europe/Malta
+share/postgresql/timezone/Europe/Mariehamn
+share/postgresql/timezone/Europe/Minsk
+share/postgresql/timezone/Europe/Monaco
+share/postgresql/timezone/Europe/Moscow
+share/postgresql/timezone/Europe/Nicosia
+share/postgresql/timezone/Europe/Oslo
+share/postgresql/timezone/Europe/Paris
+share/postgresql/timezone/Europe/Podgorica
+share/postgresql/timezone/Europe/Prague
+share/postgresql/timezone/Europe/Riga
+share/postgresql/timezone/Europe/Rome
+share/postgresql/timezone/Europe/Samara
+share/postgresql/timezone/Europe/San_Marino
+share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Simferopol
+share/postgresql/timezone/Europe/Skopje
+share/postgresql/timezone/Europe/Sofia
+share/postgresql/timezone/Europe/Stockholm
+share/postgresql/timezone/Europe/Tallinn
+share/postgresql/timezone/Europe/Tirane
+share/postgresql/timezone/Europe/Tiraspol
+share/postgresql/timezone/Europe/Uzhgorod
+share/postgresql/timezone/Europe/Vaduz
+share/postgresql/timezone/Europe/Vatican
+share/postgresql/timezone/Europe/Vienna
+share/postgresql/timezone/Europe/Vilnius
+share/postgresql/timezone/Europe/Volgograd
+share/postgresql/timezone/Europe/Warsaw
+share/postgresql/timezone/Europe/Zagreb
+share/postgresql/timezone/Europe/Zaporozhye
+share/postgresql/timezone/Europe/Zurich
+share/postgresql/timezone/Factory
 share/postgresql/timezone/GB
 share/postgresql/timezone/GB-Eire
+share/postgresql/timezone/GMT
 share/postgresql/timezone/GMT+0
 share/postgresql/timezone/GMT-0
 share/postgresql/timezone/GMT0
 share/postgresql/timezone/Greenwich
+share/postgresql/timezone/HST
 share/postgresql/timezone/Hongkong
 share/postgresql/timezone/Iceland
+share/postgresql/timezone/Indian/Antananarivo
+share/postgresql/timezone/Indian/Chagos
+share/postgresql/timezone/Indian/Christmas
+share/postgresql/timezone/Indian/Cocos
+share/postgresql/timezone/Indian/Comoro
+share/postgresql/timezone/Indian/Kerguelen
+share/postgresql/timezone/Indian/Mahe
+share/postgresql/timezone/Indian/Maldives
+share/postgresql/timezone/Indian/Mauritius
+share/postgresql/timezone/Indian/Mayotte
+share/postgresql/timezone/Indian/Reunion
 share/postgresql/timezone/Iran
 share/postgresql/timezone/Israel
 share/postgresql/timezone/Jamaica
 share/postgresql/timezone/Japan
 share/postgresql/timezone/Kwajalein
 share/postgresql/timezone/Libya
+share/postgresql/timezone/MET
+share/postgresql/timezone/MST
+share/postgresql/timezone/MST7MDT
 share/postgresql/timezone/Mexico/BajaNorte
 share/postgresql/timezone/Mexico/BajaSur
 share/postgresql/timezone/Mexico/General
-share/postgresql/timezone/Navajo
+share/postgresql/timezone/Mideast/Riyadh87
+share/postgresql/timezone/Mideast/Riyadh88
+share/postgresql/timezone/Mideast/Riyadh89
 share/postgresql/timezone/NZ
 share/postgresql/timezone/NZ-CHAT
+share/postgresql/timezone/Navajo
+share/postgresql/timezone/PRC
+share/postgresql/timezone/PST8PDT
+share/postgresql/timezone/Pacific/Apia
+share/postgresql/timezone/Pacific/Auckland
+share/postgresql/timezone/Pacific/Chatham
+share/postgresql/timezone/Pacific/Easter
+share/postgresql/timezone/Pacific/Efate
+share/postgresql/timezone/Pacific/Enderbury
+share/postgresql/timezone/Pacific/Fakaofo
+share/postgresql/timezone/Pacific/Fiji
+share/postgresql/timezone/Pacific/Funafuti
+share/postgresql/timezone/Pacific/Galapagos
+share/postgresql/timezone/Pacific/Gambier
+share/postgresql/timezone/Pacific/Guadalcanal
+share/postgresql/timezone/Pacific/Guam
+share/postgresql/timezone/Pacific/Honolulu
+share/postgresql/timezone/Pacific/Johnston
+share/postgresql/timezone/Pacific/Kiritimati
+share/postgresql/timezone/Pacific/Kosrae
+share/postgresql/timezone/Pacific/Kwajalein
+share/postgresql/timezone/Pacific/Majuro
+share/postgresql/timezone/Pacific/Marquesas
+share/postgresql/timezone/Pacific/Midway
+share/postgresql/timezone/Pacific/Nauru
+share/postgresql/timezone/Pacific/Niue
+share/postgresql/timezone/Pacific/Norfolk
+share/postgresql/timezone/Pacific/Noumea
+share/postgresql/timezone/Pacific/Pago_Pago
+share/postgresql/timezone/Pacific/Palau
+share/postgresql/timezone/Pacific/Pitcairn
+share/postgresql/timezone/Pacific/Ponape
+share/postgresql/timezone/Pacific/Port_Moresby
+share/postgresql/timezone/Pacific/Rarotonga
+share/postgresql/timezone/Pacific/Saipan
+share/postgresql/timezone/Pacific/Samoa
+share/postgresql/timezone/Pacific/Tahiti
+share/postgresql/timezone/Pacific/Tarawa
+share/postgresql/timezone/Pacific/Tongatapu
+share/postgresql/timezone/Pacific/Truk
+share/postgresql/timezone/Pacific/Wake
+share/postgresql/timezone/Pacific/Wallis
+share/postgresql/timezone/Pacific/Yap
 share/postgresql/timezone/Poland
 share/postgresql/timezone/Portugal
-share/postgresql/timezone/PRC
 share/postgresql/timezone/ROC
 share/postgresql/timezone/ROK
 share/postgresql/timezone/Singapore
 share/postgresql/timezone/Turkey
 share/postgresql/timezone/UCT
+share/postgresql/timezone/US/Alaska
+share/postgresql/timezone/US/Aleutian
+share/postgresql/timezone/US/Arizona
+share/postgresql/timezone/US/Central
+share/postgresql/timezone/US/East-Indiana
+share/postgresql/timezone/US/Eastern
+share/postgresql/timezone/US/Hawaii
+share/postgresql/timezone/US/Indiana-Starke
+share/postgresql/timezone/US/Michigan
+share/postgresql/timezone/US/Mountain
+share/postgresql/timezone/US/Pacific
+share/postgresql/timezone/US/Pacific-New
+share/postgresql/timezone/US/Samoa
 share/postgresql/timezone/UTC
 share/postgresql/timezone/Universal
 share/postgresql/timezone/W-SU
+share/postgresql/timezone/WET
 share/postgresql/timezone/Zulu
-share/postgresql/timezone/SystemV/AST4ADT
-share/postgresql/timezone/SystemV/EST5EDT
-share/postgresql/timezone/SystemV/CST6CDT
-share/postgresql/timezone/SystemV/MST7MDT
-share/postgresql/timezone/SystemV/PST8PDT
-share/postgresql/timezone/SystemV/YST9YDT
-share/postgresql/timezone/SystemV/AST4
-share/postgresql/timezone/SystemV/EST5
-share/postgresql/timezone/SystemV/CST6
-share/postgresql/timezone/SystemV/MST7
-share/postgresql/timezone/SystemV/PST8
-share/postgresql/timezone/SystemV/YST9
-share/postgresql/timezone/SystemV/HST10
-share/postgresql/timezone/Mideast/Riyadh87
-share/postgresql/timezone/Mideast/Riyadh88
-share/postgresql/timezone/Mideast/Riyadh89
 @dirrm share/postgresql/timezone/Africa
 @dirrm share/postgresql/timezone/America/Argentina
 @dirrm share/postgresql/timezone/America/Indiana
@@ -649,7 +718,6 @@ share/postgresql/timezone/Mideast/Riyadh89
 @dirrm share/postgresql/timezone/Mexico
 @dirrm share/postgresql/timezone/Mideast
 @dirrm share/postgresql/timezone/Pacific
-@dirrm share/postgresql/timezone/SystemV
 @dirrm share/postgresql/timezone/US
 @dirrm share/postgresql/timezone
 @unexec if cmp -s ~pgsql/.profile %D/share/postgresql/dot.profile.dist; then rm -f ~pgsql/.profile; fi