1 files changed, 70 insertions, 59 deletions

diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 7a5170bad6fd..68224f4750ef 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -10,7 +10,7 @@ lib/postgresql/ascii_and_mic.so
 lib/postgresql/cyrillic_and_mic.so
 lib/postgresql/dict_snowball.so
 lib/postgresql/euc_cn_and_mic.so
-lib/postgresql/euc_jis_2004_and_shift_jis_2004.so
+lib/postgresql/euc2004_sjis2004.so
 lib/postgresql/euc_jp_and_sjis.so
 lib/postgresql/euc_kr_and_mic.so
 lib/postgresql/euc_tw_and_big5.so
@@ -21,17 +21,17 @@ lib/postgresql/utf8_and_ascii.so
 lib/postgresql/utf8_and_big5.so
 lib/postgresql/utf8_and_cyrillic.so
 lib/postgresql/utf8_and_euc_cn.so
-lib/postgresql/utf8_and_euc_jis_2004.so
 lib/postgresql/utf8_and_euc_jp.so
 lib/postgresql/utf8_and_euc_kr.so
 lib/postgresql/utf8_and_euc_tw.so
+lib/postgresql/utf8_and_euc2004.so
 lib/postgresql/utf8_and_gb18030.so
 lib/postgresql/utf8_and_gbk.so
 lib/postgresql/utf8_and_iso8859.so
 lib/postgresql/utf8_and_iso8859_1.so
 lib/postgresql/utf8_and_johab.so
-lib/postgresql/utf8_and_shift_jis_2004.so
 lib/postgresql/utf8_and_sjis.so
+lib/postgresql/utf8_and_sjis2004.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
 %%DOCSDIR%%/README-server
@@ -46,62 +46,69 @@ share/postgresql/postgresql.conf.sample
 share/postgresql/recovery.conf.sample
 share/postgresql/sql_features.txt
 share/postgresql/system_views.sql
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata-8.4.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/plpgsql-9.0.mo
+%%GETTEXT%%share/locale/tr/LC_MESSAGES/postgres-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.0.mo
 share/postgresql/postgres.shdescription
 share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Africa/Abidjan
@@ -180,6 +187,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/America/Atikokan
 %%TZDATA%%share/postgresql/timezone/America/Atka
 %%TZDATA%%share/postgresql/timezone/America/Bahia
+%%TZDATA%%share/postgresql/timezone/America/Bahia_Banderas
 %%TZDATA%%share/postgresql/timezone/America/Barbados
 %%TZDATA%%share/postgresql/timezone/America/Belem
 %%TZDATA%%share/postgresql/timezone/America/Belize
@@ -317,6 +325,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Antarctica/Casey
 %%TZDATA%%share/postgresql/timezone/Antarctica/Davis
 %%TZDATA%%share/postgresql/timezone/Antarctica/DumontDUrville
+%%TZDATA%%share/postgresql/timezone/Antarctica/Macquarie
 %%TZDATA%%share/postgresql/timezone/Antarctica/Mawson
 %%TZDATA%%share/postgresql/timezone/Antarctica/McMurdo
 %%TZDATA%%share/postgresql/timezone/Antarctica/Palmer
@@ -612,6 +621,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Pacific/Apia
 %%TZDATA%%share/postgresql/timezone/Pacific/Auckland
 %%TZDATA%%share/postgresql/timezone/Pacific/Chatham
+%%TZDATA%%share/postgresql/timezone/Pacific/Chuuk
 %%TZDATA%%share/postgresql/timezone/Pacific/Easter
 %%TZDATA%%share/postgresql/timezone/Pacific/Efate
 %%TZDATA%%share/postgresql/timezone/Pacific/Enderbury
@@ -637,6 +647,7 @@ share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Pacific/Pago_Pago
 %%TZDATA%%share/postgresql/timezone/Pacific/Palau
 %%TZDATA%%share/postgresql/timezone/Pacific/Pitcairn
+%%TZDATA%%share/postgresql/timezone/Pacific/Pohnpei
 %%TZDATA%%share/postgresql/timezone/Pacific/Ponape
 %%TZDATA%%share/postgresql/timezone/Pacific/Port_Moresby
 %%TZDATA%%share/postgresql/timezone/Pacific/Rarotonga