git: 5b11f47f0d59 - main - databases/postgresql??-*: add postgresql-15 to the ports tree

From: Palle Girgensohn <girgen_at_FreeBSD.org>
Date: Thu, 19 May 2022 13:37:06 UTC
The branch main has been updated by girgen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5b11f47f0d59c95f6dcf1ff75badede5ec84e72e

commit 5b11f47f0d59c95f6dcf1ff75badede5ec84e72e
Author:     Palle Girgensohn <girgen@FreeBSD.org>
AuthorDate: 2022-05-18 19:11:48 +0000
Commit:     Palle Girgensohn <girgen@FreeBSD.org>
CommitDate: 2022-05-19 13:36:48 +0000

    databases/postgresql??-*: add postgresql-15 to the ports tree
    
    Introduce PostgreSQL-15 to the ports tree.
    
    Make version 15 the master port, and add plist parameter for the
    postgresql version.
    
    Release notes:  https://www.postgresql.org/docs/devel/release.html
---
 Mk/Uses/pgsql.mk                                   |    2 +-
 databases/Makefile                                 |    8 +
 databases/postgresql10-server/files/postgresql.in  |    4 +-
 databases/postgresql10-server/pkg-plist-client     |  202 +--
 databases/postgresql10-server/pkg-plist-server     |  308 ++--
 databases/postgresql11-server/files/postgresql.in  |    4 +-
 databases/postgresql11-server/pkg-plist-client     |  208 +--
 databases/postgresql11-server/pkg-plist-server     |  330 ++---
 databases/postgresql12-server/files/postgresql.in  |    4 +-
 databases/postgresql12-server/pkg-plist-client     |  194 +--
 databases/postgresql12-server/pkg-plist-server     |  344 ++---
 databases/postgresql13-server/files/postgresql.in  |    4 +-
 databases/postgresql13-server/pkg-plist-client     |  188 +--
 databases/postgresql13-server/pkg-plist-server     |  346 ++---
 databases/postgresql14-server/Makefile             |  346 +----
 databases/postgresql14-server/files/postgresql.in  |    4 +-
 databases/postgresql14-server/pkg-plist-client     |  196 +--
 databases/postgresql14-server/pkg-plist-server     |  338 ++---
 databases/postgresql15-client/Makefile             |   20 +
 databases/postgresql15-contrib/Makefile            |   43 +
 databases/postgresql15-contrib/pkg-descr           |   23 +
 databases/postgresql15-docs/Makefile               |   43 +
 databases/postgresql15-pgtcl/Makefile              |    9 +
 databases/postgresql15-plperl/Makefile             |   29 +
 databases/postgresql15-plpython/Makefile           |   28 +
 databases/postgresql15-plpython/pkg-descr          |    6 +
 databases/postgresql15-pltcl/Makefile              |   34 +
 databases/postgresql15-server/Makefile             |  348 +++++
 databases/postgresql15-server/distinfo             |    3 +
 databases/postgresql15-server/files/502.pgsql.in   |  114 ++
 databases/postgresql15-server/files/dot.cshrc.in   |   11 +
 databases/postgresql15-server/files/dot.profile.in |   22 +
 .../files/patch-disable-llvm-jit-inlining-with-tls |   24 +
 .../postgresql15-server/files/patch-doc-Makefile   |    9 +
 .../files/patch-doc-src-sgml-Makefile              |   41 +
 .../files/patch-src-Makefile.shlib                 |   11 +
 .../files/patch-src-backend-Makefile               |   11 +
 ...h-src_backend_utils_misc_postgresql.conf.sample |   21 +
 .../files/pkg-message-client.in                    |   38 +
 .../files/pkg-message-contrib.in                   |    9 +
 .../files/pkg-message-plperl.in                    |    9 +
 .../files/pkg-message-plpython.in                  |    9 +
 .../postgresql15-server/files/pkg-message-pltcl.in |    9 +
 .../files/pkg-message-server.in                    |   69 +
 .../postgresql15-server/files/pkgIndex.tcl.in      |    4 +
 databases/postgresql15-server/files/postgresql.in  |  115 ++
 databases/postgresql15-server/pkg-descr            |   23 +
 databases/postgresql15-server/pkg-install-server   |   23 +
 databases/postgresql15-server/pkg-plist-client     | 1277 ++++++++++++++++
 databases/postgresql15-server/pkg-plist-contrib    |  254 ++++
 databases/postgresql15-server/pkg-plist-plperl     |   24 +
 databases/postgresql15-server/pkg-plist-plpython   |   31 +
 databases/postgresql15-server/pkg-plist-pltcl      |    6 +
 databases/postgresql15-server/pkg-plist-server     | 1559 ++++++++++++++++++++
 54 files changed, 5659 insertions(+), 1680 deletions(-)

diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index 6cfd9a6c0cec..dc245d4f3cda 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -39,7 +39,7 @@ _INCLUDE_USES_PGSQL_MK=	yes
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-VALID_PGSQL_VER=	10 11 12 13 14
+VALID_PGSQL_VER=	10 11 12 13 14 15
 
 # Override non-default LIBVERS like this:
 #PGSQL99_LIBVER=6
diff --git a/databases/Makefile b/databases/Makefile
index 451eca18c7ee..c184791fe90e 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -712,6 +712,14 @@
     SUBDIR += postgresql14-plpython
     SUBDIR += postgresql14-pltcl
     SUBDIR += postgresql14-server
+    SUBDIR += postgresql15-client
+    SUBDIR += postgresql15-contrib
+    SUBDIR += postgresql15-docs
+    SUBDIR += postgresql15-pgtcl
+    SUBDIR += postgresql15-plperl
+    SUBDIR += postgresql15-plpython
+    SUBDIR += postgresql15-pltcl
+    SUBDIR += postgresql15-server
     SUBDIR += powa-archivist
     SUBDIR += powa-web
     SUBDIR += powerarchitect
diff --git a/databases/postgresql10-server/files/postgresql.in b/databases/postgresql10-server/files/postgresql.in
index e012b35f9dc8..444ab22e89da 100644
--- a/databases/postgresql10-server/files/postgresql.in
+++ b/databases/postgresql10-server/files/postgresql.in
@@ -8,7 +8,7 @@
 #
 #  postgresql_enable="YES"
 #  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data10"
+#  postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%"
 #  postgresql_flags="-w -s -m fast"
 #  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
 #  postgresql_login_class="default"
@@ -32,7 +32,7 @@ load_rc_config postgresql
 postgresql_enable=${postgresql_enable:-"NO"}
 postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
 postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data10"}
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data%%PG_VERSION%%"}
 postgresql_login_class=${postgresql_login_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
diff --git a/databases/postgresql10-server/pkg-plist-client b/databases/postgresql10-server/pkg-plist-client
index ee789e17f8d6..ba17a0b2cebd 100644
--- a/databases/postgresql10-server/pkg-plist-client
+++ b/databases/postgresql10-server/pkg-plist-client
@@ -1007,107 +1007,107 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
 
diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server
index 3c1847a139ce..e0261a9caaa9 100644
--- a/databases/postgresql10-server/pkg-plist-server
+++ b/databases/postgresql10-server/pkg-plist-server
@@ -61,158 +61,158 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
 %%DATADIR%%/extension/plpgsql.control
 %%DATADIR%%/postgres.shdescription
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-10.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
 %%DATADIR%%/snowball_create.sql
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
@@ -607,7 +607,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+%%PG_VERSION%%
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+11
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2
@@ -620,7 +620,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-%%PG_VERSION%%
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-11
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12
 %%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13
diff --git a/databases/postgresql11-server/files/postgresql.in b/databases/postgresql11-server/files/postgresql.in
index fa88459a55cb..444ab22e89da 100644
--- a/databases/postgresql11-server/files/postgresql.in
+++ b/databases/postgresql11-server/files/postgresql.in
@@ -8,7 +8,7 @@
 #
 #  postgresql_enable="YES"
 #  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data11"
+#  postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%"
 #  postgresql_flags="-w -s -m fast"
 #  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
 #  postgresql_login_class="default"
@@ -32,7 +32,7 @@ load_rc_config postgresql
 postgresql_enable=${postgresql_enable:-"NO"}
 postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
 postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data11"}
+eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data%%PG_VERSION%%"}
 postgresql_login_class=${postgresql_login_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
diff --git a/databases/postgresql11-server/pkg-plist-client b/databases/postgresql11-server/pkg-plist-client
index 6fefde4d9f77..2fad7e92b47b 100644
--- a/databases/postgresql11-server/pkg-plist-client
+++ b/databases/postgresql11-server/pkg-plist-client
@@ -1094,110 +1094,110 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-11.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
 
diff --git a/databases/postgresql11-server/pkg-plist-server b/databases/postgresql11-server/pkg-plist-server
index 393a82d55b25..a08afa7e65a9 100644
--- a/databases/postgresql11-server/pkg-plist-server
+++ b/databases/postgresql11-server/pkg-plist-server
@@ -717,169 +717,169 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
 %%DATADIR%%/extension/plpgsql.control
 %%DATADIR%%/postgres.shdescription
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-11.mo
*** 6954 LINES SKIPPED ***