postgresql12: make nls support optional

8 files changed, 305 insertions, 297 deletions

diff --git a/databases/postgresql12-client/PLIST b/databases/postgresql12-client/PLIST
index 8b67ab339ac..c49df033801 100644
--- a/databases/postgresql12-client/PLIST
+++ b/databases/postgresql12-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/07 19:21:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/24 07:57:13 triaxx Exp $
 bin/clusterdb
 bin/createdb
 bin/createuser
@@ -847,216 +847,216 @@ lib/postgresql/pgxs/src/Makefile.port
 lib/postgresql/pgxs/src/Makefile.shlib
 lib/postgresql/pgxs/src/makefiles/pgxs.mk
 lib/postgresql/pgxs/src/nls-global.mk
-share/locale/cs/LC_MESSAGES/ecpg-12.mo
-share/locale/cs/LC_MESSAGES/ecpglib6-12.mo
-share/locale/cs/LC_MESSAGES/initdb-12.mo
-share/locale/cs/LC_MESSAGES/libpq5-12.mo
-share/locale/cs/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/cs/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/cs/LC_MESSAGES/pg_checksums-12.mo
-share/locale/cs/LC_MESSAGES/pg_config-12.mo
-share/locale/cs/LC_MESSAGES/pg_controldata-12.mo
-share/locale/cs/LC_MESSAGES/pg_ctl-12.mo
-share/locale/cs/LC_MESSAGES/pg_dump-12.mo
-share/locale/cs/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/cs/LC_MESSAGES/pg_rewind-12.mo
-share/locale/cs/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/cs/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/cs/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/cs/LC_MESSAGES/pg_waldump-12.mo
-share/locale/cs/LC_MESSAGES/pgscripts-12.mo
-share/locale/cs/LC_MESSAGES/psql-12.mo
-share/locale/de/LC_MESSAGES/ecpg-12.mo
-share/locale/de/LC_MESSAGES/ecpglib6-12.mo
-share/locale/de/LC_MESSAGES/initdb-12.mo
-share/locale/de/LC_MESSAGES/libpq5-12.mo
-share/locale/de/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/de/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/de/LC_MESSAGES/pg_checksums-12.mo
-share/locale/de/LC_MESSAGES/pg_config-12.mo
-share/locale/de/LC_MESSAGES/pg_controldata-12.mo
-share/locale/de/LC_MESSAGES/pg_ctl-12.mo
-share/locale/de/LC_MESSAGES/pg_dump-12.mo
-share/locale/de/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/de/LC_MESSAGES/pg_rewind-12.mo
-share/locale/de/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/de/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/de/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/de/LC_MESSAGES/pg_waldump-12.mo
-share/locale/de/LC_MESSAGES/pgscripts-12.mo
-share/locale/de/LC_MESSAGES/psql-12.mo
-share/locale/es/LC_MESSAGES/ecpg-12.mo
-share/locale/es/LC_MESSAGES/ecpglib6-12.mo
-share/locale/es/LC_MESSAGES/initdb-12.mo
-share/locale/es/LC_MESSAGES/libpq5-12.mo
-share/locale/es/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/es/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/es/LC_MESSAGES/pg_checksums-12.mo
-share/locale/es/LC_MESSAGES/pg_config-12.mo
-share/locale/es/LC_MESSAGES/pg_controldata-12.mo
-share/locale/es/LC_MESSAGES/pg_ctl-12.mo
-share/locale/es/LC_MESSAGES/pg_dump-12.mo
-share/locale/es/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/es/LC_MESSAGES/pg_rewind-12.mo
-share/locale/es/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/es/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/es/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/es/LC_MESSAGES/pg_waldump-12.mo
-share/locale/es/LC_MESSAGES/pgscripts-12.mo
-share/locale/es/LC_MESSAGES/psql-12.mo
-share/locale/fr/LC_MESSAGES/ecpg-12.mo
-share/locale/fr/LC_MESSAGES/ecpglib6-12.mo
-share/locale/fr/LC_MESSAGES/initdb-12.mo
-share/locale/fr/LC_MESSAGES/libpq5-12.mo
-share/locale/fr/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/fr/LC_MESSAGES/pg_config-12.mo
-share/locale/fr/LC_MESSAGES/pg_controldata-12.mo
-share/locale/fr/LC_MESSAGES/pg_ctl-12.mo
-share/locale/fr/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/fr/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/fr/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/fr/LC_MESSAGES/pg_waldump-12.mo
-share/locale/fr/LC_MESSAGES/psql-12.mo
-share/locale/he/LC_MESSAGES/libpq5-12.mo
-share/locale/he/LC_MESSAGES/pg_config-12.mo
-share/locale/he/LC_MESSAGES/pg_ctl-12.mo
-share/locale/it/LC_MESSAGES/ecpg-12.mo
-share/locale/it/LC_MESSAGES/ecpglib6-12.mo
-share/locale/it/LC_MESSAGES/libpq5-12.mo
-share/locale/it/LC_MESSAGES/pg_config-12.mo
-share/locale/it/LC_MESSAGES/pg_controldata-12.mo
-share/locale/it/LC_MESSAGES/pg_ctl-12.mo
-share/locale/it/LC_MESSAGES/psql-12.mo
-share/locale/ja/LC_MESSAGES/ecpg-12.mo
-share/locale/ja/LC_MESSAGES/ecpglib6-12.mo
-share/locale/ja/LC_MESSAGES/initdb-12.mo
-share/locale/ja/LC_MESSAGES/libpq5-12.mo
-share/locale/ja/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/ja/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/ja/LC_MESSAGES/pg_checksums-12.mo
-share/locale/ja/LC_MESSAGES/pg_config-12.mo
-share/locale/ja/LC_MESSAGES/pg_controldata-12.mo
-share/locale/ja/LC_MESSAGES/pg_ctl-12.mo
-share/locale/ja/LC_MESSAGES/pg_dump-12.mo
-share/locale/ja/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/ja/LC_MESSAGES/pg_rewind-12.mo
-share/locale/ja/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/ja/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/ja/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/ja/LC_MESSAGES/pg_waldump-12.mo
-share/locale/ja/LC_MESSAGES/pgscripts-12.mo
-share/locale/ja/LC_MESSAGES/psql-12.mo
-share/locale/ko/LC_MESSAGES/ecpg-12.mo
-share/locale/ko/LC_MESSAGES/ecpglib6-12.mo
-share/locale/ko/LC_MESSAGES/libpq5-12.mo
-share/locale/ko/LC_MESSAGES/pg_config-12.mo
-share/locale/ko/LC_MESSAGES/pg_controldata-12.mo
-share/locale/ko/LC_MESSAGES/pg_ctl-12.mo
-share/locale/ko/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/ko/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/ko/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/pl/LC_MESSAGES/ecpg-12.mo
-share/locale/pl/LC_MESSAGES/ecpglib6-12.mo
-share/locale/pl/LC_MESSAGES/pg_config-12.mo
-share/locale/pl/LC_MESSAGES/pg_controldata-12.mo
-share/locale/pl/LC_MESSAGES/pg_ctl-12.mo
-share/locale/pl/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/pl/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/pt_BR/LC_MESSAGES/ecpg-12.mo
-share/locale/pt_BR/LC_MESSAGES/ecpglib6-12.mo
-share/locale/pt_BR/LC_MESSAGES/pg_config-12.mo
-share/locale/ro/LC_MESSAGES/pg_config-12.mo
-share/locale/ru/LC_MESSAGES/ecpg-12.mo
-share/locale/ru/LC_MESSAGES/ecpglib6-12.mo
-share/locale/ru/LC_MESSAGES/initdb-12.mo
-share/locale/ru/LC_MESSAGES/libpq5-12.mo
-share/locale/ru/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/ru/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/ru/LC_MESSAGES/pg_checksums-12.mo
-share/locale/ru/LC_MESSAGES/pg_config-12.mo
-share/locale/ru/LC_MESSAGES/pg_controldata-12.mo
-share/locale/ru/LC_MESSAGES/pg_ctl-12.mo
-share/locale/ru/LC_MESSAGES/pg_dump-12.mo
-share/locale/ru/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/ru/LC_MESSAGES/pg_rewind-12.mo
-share/locale/ru/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/ru/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/ru/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/ru/LC_MESSAGES/pg_waldump-12.mo
-share/locale/ru/LC_MESSAGES/pgscripts-12.mo
-share/locale/ru/LC_MESSAGES/psql-12.mo
-share/locale/sv/LC_MESSAGES/ecpg-12.mo
-share/locale/sv/LC_MESSAGES/ecpglib6-12.mo
-share/locale/sv/LC_MESSAGES/initdb-12.mo
-share/locale/sv/LC_MESSAGES/libpq5-12.mo
-share/locale/sv/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/sv/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/sv/LC_MESSAGES/pg_checksums-12.mo
-share/locale/sv/LC_MESSAGES/pg_config-12.mo
-share/locale/sv/LC_MESSAGES/pg_controldata-12.mo
-share/locale/sv/LC_MESSAGES/pg_ctl-12.mo
-share/locale/sv/LC_MESSAGES/pg_dump-12.mo
-share/locale/sv/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/sv/LC_MESSAGES/pg_rewind-12.mo
-share/locale/sv/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/sv/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/sv/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/sv/LC_MESSAGES/pg_waldump-12.mo
-share/locale/sv/LC_MESSAGES/pgscripts-12.mo
-share/locale/sv/LC_MESSAGES/psql-12.mo
-share/locale/tr/LC_MESSAGES/ecpg-12.mo
-share/locale/tr/LC_MESSAGES/ecpglib6-12.mo
-share/locale/tr/LC_MESSAGES/initdb-12.mo
-share/locale/tr/LC_MESSAGES/libpq5-12.mo
-share/locale/tr/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/tr/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/tr/LC_MESSAGES/pg_checksums-12.mo
-share/locale/tr/LC_MESSAGES/pg_config-12.mo
-share/locale/tr/LC_MESSAGES/pg_controldata-12.mo
-share/locale/tr/LC_MESSAGES/pg_ctl-12.mo
-share/locale/tr/LC_MESSAGES/pg_dump-12.mo
-share/locale/tr/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/tr/LC_MESSAGES/pg_rewind-12.mo
-share/locale/tr/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/tr/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/tr/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/tr/LC_MESSAGES/pg_waldump-12.mo
-share/locale/tr/LC_MESSAGES/pgscripts-12.mo
-share/locale/tr/LC_MESSAGES/psql-12.mo
-share/locale/uk/LC_MESSAGES/ecpg-12.mo
-share/locale/uk/LC_MESSAGES/ecpglib6-12.mo
-share/locale/uk/LC_MESSAGES/libpq5-12.mo
-share/locale/uk/LC_MESSAGES/pg_config-12.mo
-share/locale/uk/LC_MESSAGES/pg_controldata-12.mo
-share/locale/uk/LC_MESSAGES/pg_ctl-12.mo
-share/locale/uk/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/uk/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/uk/LC_MESSAGES/psql-12.mo
-share/locale/vi/LC_MESSAGES/ecpg-12.mo
-share/locale/vi/LC_MESSAGES/ecpglib6-12.mo
-share/locale/vi/LC_MESSAGES/pg_config-12.mo
-share/locale/vi/LC_MESSAGES/pg_controldata-12.mo
-share/locale/vi/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/vi/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/zh_CN/LC_MESSAGES/ecpg-12.mo
-share/locale/zh_CN/LC_MESSAGES/ecpglib6-12.mo
-share/locale/zh_CN/LC_MESSAGES/initdb-12.mo
-share/locale/zh_CN/LC_MESSAGES/libpq5-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_basebackup-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_config-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_controldata-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_ctl-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_dump-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_resetwal-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_rewind-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_test_timing-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_upgrade-12.mo
-share/locale/zh_CN/LC_MESSAGES/pg_waldump-12.mo
-share/locale/zh_CN/LC_MESSAGES/pgscripts-12.mo
-share/locale/zh_CN/LC_MESSAGES/psql-12.mo
-share/locale/zh_TW/LC_MESSAGES/ecpg-12.mo
-share/locale/zh_TW/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_checksums-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_checksums-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_checksums-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/he/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_checksums-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_checksums-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_checksums-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_checksums-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/ecpglib6-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/initdb-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/libpq5-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_basebackup-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_config-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_controldata-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_ctl-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_dump-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_resetwal-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_rewind-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_test_timing-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_upgrade-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pg_waldump-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pgscripts-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/psql-12.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/ecpg-12.mo
+${PLIST.nls}share/locale/zh_TW/LC_MESSAGES/pg_config-12.mo
 share/postgresql/pg_service.conf.sample
 share/postgresql/psqlrc.sample
diff --git a/databases/postgresql12-plperl/PLIST b/databases/postgresql12-plperl/PLIST
index c4ccd2491b9..ff0e8281f2a 100644
--- a/databases/postgresql12-plperl/PLIST
+++ b/databases/postgresql12-plperl/PLIST
@@ -1,23 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/07 19:21:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/24 07:57:14 triaxx Exp $
 include/postgresql/server/plperl.h
 include/postgresql/server/plperl_helpers.h
 include/postgresql/server/ppport.h
 lib/postgresql/plperl.so
-share/locale/cs/LC_MESSAGES/plperl-12.mo
-share/locale/de/LC_MESSAGES/plperl-12.mo
-share/locale/es/LC_MESSAGES/plperl-12.mo
-share/locale/fr/LC_MESSAGES/plperl-12.mo
-share/locale/it/LC_MESSAGES/plperl-12.mo
-share/locale/ja/LC_MESSAGES/plperl-12.mo
-share/locale/ko/LC_MESSAGES/plperl-12.mo
-share/locale/pl/LC_MESSAGES/plperl-12.mo
-share/locale/pt_BR/LC_MESSAGES/plperl-12.mo
-share/locale/ro/LC_MESSAGES/plperl-12.mo
-share/locale/ru/LC_MESSAGES/plperl-12.mo
-share/locale/sv/LC_MESSAGES/plperl-12.mo
-share/locale/tr/LC_MESSAGES/plperl-12.mo
-share/locale/vi/LC_MESSAGES/plperl-12.mo
-share/locale/zh_CN/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/ro/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/plperl-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/plperl-12.mo
 share/postgresql/extension/plperl--1.0.sql
 share/postgresql/extension/plperl--unpackaged--1.0.sql
 share/postgresql/extension/plperl.control
diff --git a/databases/postgresql12-plpython/PLIST b/databases/postgresql12-plpython/PLIST
index 4871164e42c..17ec5547109 100644
--- a/databases/postgresql12-plpython/PLIST
+++ b/databases/postgresql12-plpython/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/07 19:21:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/24 07:57:14 triaxx Exp $
 include/postgresql/server/plpy_cursorobject.h
 include/postgresql/server/plpy_elog.h
 include/postgresql/server/plpy_exec.h
@@ -19,21 +19,21 @@ ${PLIST.py3x}lib/postgresql/hstore_plpython3.so
 lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
 ${PLIST.py2x}lib/postgresql/plpython2.so
 ${PLIST.py3x}lib/postgresql/plpython3.so
-share/locale/cs/LC_MESSAGES/plpython-12.mo
-share/locale/de/LC_MESSAGES/plpython-12.mo
-share/locale/es/LC_MESSAGES/plpython-12.mo
-share/locale/fr/LC_MESSAGES/plpython-12.mo
-share/locale/it/LC_MESSAGES/plpython-12.mo
-share/locale/ja/LC_MESSAGES/plpython-12.mo
-share/locale/ko/LC_MESSAGES/plpython-12.mo
-share/locale/pl/LC_MESSAGES/plpython-12.mo
-share/locale/pt_BR/LC_MESSAGES/plpython-12.mo
-share/locale/ru/LC_MESSAGES/plpython-12.mo
-share/locale/sv/LC_MESSAGES/plpython-12.mo
-share/locale/tr/LC_MESSAGES/plpython-12.mo
-share/locale/uk/LC_MESSAGES/plpython-12.mo
-share/locale/vi/LC_MESSAGES/plpython-12.mo
-share/locale/zh_CN/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/plpython-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/plpython-12.mo
 share/postgresql/extension/hstore_plpython2u--1.0.sql
 share/postgresql/extension/hstore_plpython2u.control
 share/postgresql/extension/hstore_plpython3u--1.0.sql
diff --git a/databases/postgresql12-pltcl/PLIST b/databases/postgresql12-pltcl/PLIST
index 59e5db51e63..3c26bbdd79b 100644
--- a/databases/postgresql12-pltcl/PLIST
+++ b/databases/postgresql12-pltcl/PLIST
@@ -1,19 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/07 19:21:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/24 07:57:14 triaxx Exp $
 lib/postgresql/pltcl.so
-share/locale/cs/LC_MESSAGES/pltcl-12.mo
-share/locale/de/LC_MESSAGES/pltcl-12.mo
-share/locale/es/LC_MESSAGES/pltcl-12.mo
-share/locale/fr/LC_MESSAGES/pltcl-12.mo
-share/locale/it/LC_MESSAGES/pltcl-12.mo
-share/locale/ja/LC_MESSAGES/pltcl-12.mo
-share/locale/ko/LC_MESSAGES/pltcl-12.mo
-share/locale/pl/LC_MESSAGES/pltcl-12.mo
-share/locale/ru/LC_MESSAGES/pltcl-12.mo
-share/locale/sv/LC_MESSAGES/pltcl-12.mo
-share/locale/tr/LC_MESSAGES/pltcl-12.mo
-share/locale/uk/LC_MESSAGES/pltcl-12.mo
-share/locale/vi/LC_MESSAGES/pltcl-12.mo
-share/locale/zh_CN/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/pltcl-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/pltcl-12.mo
 share/postgresql/extension/pltcl--1.0.sql
 share/postgresql/extension/pltcl--unpackaged--1.0.sql
 share/postgresql/extension/pltcl.control
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 3e21ad5dfdb..60eb38cb6d5 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/10/07 19:21:49 adam Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/24 07:57:14 triaxx Exp $
 
 PKGNAME=	${DISTNAME:C/-/12-server-/}
 COMMENT=	PostgreSQL database server programs
@@ -20,8 +20,6 @@ INSTALL_DIRS+=	src/pl
 BUILD_DIRS=	src/port
 BUILD_DIRS+=	${INSTALL_DIRS}
 
-LIBS.SunOS+=	-lintl
-
 # PostgreSQL has loadable server-side language modules.
 #
 # Explicitly set DLOPEN_REQUIRE_PTHREADS to "no" on NetBSD as NetBSD-2.x
diff --git a/databases/postgresql12-server/PLIST b/databases/postgresql12-server/PLIST
index de425a6ce18..06f0812b4cc 100644
--- a/databases/postgresql12-server/PLIST
+++ b/databases/postgresql12-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2019/10/07 19:21:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/10/24 07:57:14 triaxx Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -685,32 +685,32 @@ lib/postgresql/utf8_and_sjis.so
 lib/postgresql/utf8_and_sjis2004.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
-share/locale/cs/LC_MESSAGES/plpgsql-12.mo
-share/locale/de/LC_MESSAGES/plpgsql-12.mo
-share/locale/de/LC_MESSAGES/postgres-12.mo
-share/locale/es/LC_MESSAGES/plpgsql-12.mo
-share/locale/es/LC_MESSAGES/postgres-12.mo
-share/locale/fr/LC_MESSAGES/plpgsql-12.mo
-share/locale/fr/LC_MESSAGES/postgres-12.mo
-share/locale/it/LC_MESSAGES/plpgsql-12.mo
-share/locale/it/LC_MESSAGES/postgres-12.mo
-share/locale/ja/LC_MESSAGES/plpgsql-12.mo
-share/locale/ja/LC_MESSAGES/postgres-12.mo
-share/locale/ko/LC_MESSAGES/plpgsql-12.mo
-share/locale/ko/LC_MESSAGES/postgres-12.mo
-share/locale/pl/LC_MESSAGES/plpgsql-12.mo
-share/locale/pl/LC_MESSAGES/postgres-12.mo
-share/locale/pt_BR/LC_MESSAGES/plpgsql-12.mo
-share/locale/ru/LC_MESSAGES/plpgsql-12.mo
-share/locale/ru/LC_MESSAGES/postgres-12.mo
-share/locale/sv/LC_MESSAGES/plpgsql-12.mo
-share/locale/sv/LC_MESSAGES/postgres-12.mo
-share/locale/tr/LC_MESSAGES/plpgsql-12.mo
-share/locale/tr/LC_MESSAGES/postgres-12.mo
-share/locale/uk/LC_MESSAGES/plpgsql-12.mo
-share/locale/vi/LC_MESSAGES/plpgsql-12.mo
-share/locale/zh_CN/LC_MESSAGES/plpgsql-12.mo
-share/locale/zh_CN/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/cs/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/de/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/es/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/fr/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/it/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/ja/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/ko/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/pl/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/pt_BR/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/ru/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/sv/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/tr/LC_MESSAGES/postgres-12.mo
+${PLIST.nls}share/locale/uk/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/vi/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/plpgsql-12.mo
+${PLIST.nls}share/locale/zh_CN/LC_MESSAGES/postgres-12.mo
 share/postgresql/errcodes.txt
 share/postgresql/extension/plpgsql--1.0.sql
 share/postgresql/extension/plpgsql--unpackaged--1.0.sql
diff --git a/databases/postgresql12/Makefile.common b/databases/postgresql12/Makefile.common
index b8041b3fecd..e249b5174a1 100644
--- a/databases/postgresql12/Makefile.common
+++ b/databases/postgresql12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2019/10/07 19:21:48 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2019/10/24 07:57:13 triaxx Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -37,7 +37,7 @@ DISTINFO_FILE?=		${.CURDIR}/../../databases/postgresql12/distinfo
 PATCHDIR?=		${.CURDIR}/../../databases/postgresql12/patches
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		bison gmake lex msgfmt
+USE_TOOLS+=		bison gmake lex
 PKG_SYSCONFSUBDIR=	postgresql
 
 .include "../../mk/bsd.prefs.mk"
@@ -61,7 +61,6 @@ CONFIGURE_ARGS+=	--docdir=${PG_DOC_DIR}
 CONFIGURE_ARGS+=	--localedir=${PG_LOCALE_DIR}
 CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
 
-CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--with-libxml
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--without-perl
@@ -99,8 +98,6 @@ CONFIGURE_ARGS+=	--with-blocksize=${PGSQL_BLCKSZ}
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-LIBS.SunOS+=		-lintl
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 
diff --git a/databases/postgresql12/options.mk b/databases/postgresql12/options.mk
index ed822568aaa..363e78f0f91 100644
--- a/databases/postgresql12/options.mk
+++ b/databases/postgresql12/options.mk
@@ -1,9 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2019/10/07 19:21:48 adam Exp $
+# $NetBSD: options.mk,v 1.2 2019/10/24 07:57:13 triaxx Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql12
-PKG_SUPPORTED_OPTIONS=	bonjour dtrace icu llvm gssapi ldap pam
+PKG_SUPPORTED_OPTIONS=	bonjour dtrace icu llvm gssapi ldap nls pam
 PKG_SUGGESTED_OPTIONS=	gssapi
 
+PLIST_VARS+=		llvm nls
+
 .include "../../mk/bsd.options.mk"
 
 # Bonjour support
@@ -42,7 +44,6 @@ CONFIGURE_ARGS+=	--with-ldap
 .endif
 
 # LLVM based JIT support
-PLIST_VARS+=		llvm
 .if !empty(PKG_OPTIONS:Mllvm)
 .  include "../../lang/llvm/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-llvm
@@ -50,6 +51,18 @@ CONFIGURE_ENV+=		CLANG=${CC}	# XXX: make it be better
 PLIST.llvm=		yes
 .endif
 
+# NLS support
+.if !empty(PKG_OPTIONS:Mnls)
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		msgfmt
+CONFIGURE_ARGS+=	--enable-nls
+PLIST.nls=		yes
+.  include "../../devel/gettext-lib/buildlink3.mk"
+LIBS.SunOS+=		-lintl
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
+
 # PAM authentication for the PostgreSQL backend
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"