summaryrefslogtreecommitdiff
path: root/databases/postgresql92-server
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2015-07-22 22:45:35 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2015-07-22 22:45:35 +0000
commitbc460272039a723eb5950cc2fa4ac0e6c717ef17 (patch)
tree83cb5d3d9ede68145464522c854ca88d9718fff0 /databases/postgresql92-server
parent[00:01:47] ====>> Warning: (graphics/ImageMagick7): make: "/poudriere/ports/h... (diff)
Simplify a bit the Makefiles
Use OPTIONS_SUB to automatically PLIST_SUB Use OPTIONS helpers
Notes
Notes: svn path=/head/; revision=392699
Diffstat (limited to 'databases/postgresql92-server')
-rw-r--r--databases/postgresql92-server/Makefile101
-rw-r--r--databases/postgresql92-server/pkg-plist-client178
-rw-r--r--databases/postgresql92-server/pkg-plist-server172
3 files changed, 210 insertions, 241 deletions
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 8f6b18915ef8..fe257bfcf79d 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -21,6 +21,8 @@ DIST_SUBDIR= postgresql
ICU_PATCHFILE?= pg-929-icu-2015-04-18.diff.gz
+OPTIONS_SUB= yes
+
.if !defined(SLAVE_ONLY)
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
.else # Contrib has different options from -client/-server
@@ -110,21 +112,37 @@ SSL_DESC= Build with OpenSSL support
OPTIONS_DEFAULT= NLS XML TZDATA INTDATE SSL
.endif # !SLAVE_ONLY
-.include <bsd.port.options.mk>
-
.if defined(CLIENT_ONLY)
-. if ${PORT_OPTIONS:MLIBEDIT}
-CONFIGURE_ARGS+=--with-libedit-preferred
-LIB_DEPENDS= libedit.so.0:${PORTSDIR}/devel/libedit
-. else
-USES+= readline
-. endif
+LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
+LIBEDIT_USES= libedit
+LIBEDIT_USES_OFF= readline
.endif # CLIENT_ONLY
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL= yes
-CONFIGURE_ARGS+=--with-openssl
-.endif
+SSL_USE= OPENSSL=yes
+SSL_CONFIGURE_WITH=openssl
+
+OSSP_UUID_BUILD_DEPENDS= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid
+OSSP_UUID_CONFIGURE_WITH= ossp-uuid
+
+PAM_CONFIGURE_WITH= pam
+
+XML_CONFIGURE_WITH= libxml
+XML_LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
+
+TZDATA_CONFIGURE_OFF=--with-system-tzdata=/usr/share/zoneinfo
+
+INTDATE_CONFIGURE_OFF=--disable-integer-datetimes
+
+NLS_CONFIGURE_ENABLE= nls
+NLS_USES= gettext
+
+PLIST_SUB+= PG_USER=${PG_USER} \
+ PG_GROUP=${PG_GROUP}
+SUB_LIST+= PG_GROUP=${PG_GROUP} \
+ PG_USER=${PG_USER} \
+ PG_UID=${PG_UID}
+
+.include <bsd.port.options.mk>
.if !defined(SLAVE_ONLY)
. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum)
@@ -136,14 +154,6 @@ LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu
. endif
.endif # !SLAVE_ONLY
-.if ${PORT_OPTIONS:MOSSP_UUID}
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libuuid.a:${PORTSDIR}/misc/ossp-uuid
-CONFIGURE_ARGS+=--with-ossp-uuid
-PLIST_SUB+= OSSP=""
-.else
-PLIST_SUB+= OSSP="@comment "
-.endif
-
.if !defined(SLAVE_ONLY)
PATCH_DIST_STRIP=-p1
@@ -156,50 +166,15 @@ IGNORE= need userland DTrace support found in FreeBSD 9.0
. endif
. endif
-. if ${PORT_OPTIONS:MPAM}
-CONFIGURE_ARGS+=--with-pam
-. endif
-
-. if ${PORT_OPTIONS:MLDAP}
-. if defined (SERVER_ONLY)
-CONFIGURE_ARGS+=--with-ldap
-USE_OPENLDAP= yes
-. endif
-. endif
-
-. if ${PORT_OPTIONS:MXML}
-CONFIGURE_ARGS+=--with-libxml
-LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2
-. endif
-
-. if ${PORT_OPTIONS:MTZDATA}
-PLIST_SUB+= TZDATA=""
-. else
-CONFIGURE_ARGS+=--with-system-tzdata=/usr/share/zoneinfo
-PLIST_SUB+= TZDATA="@comment "
-. endif
-
-. if empty(PORT_OPTIONS:MINTDATE)
-CONFIGURE_ARGS+=--disable-integer-datetimes
+. if defined (SERVER_ONLY)
+LDAP_CONFIGURE_WITH= with-ldap
+LDAP_USE= OPENLDAP=yes
. endif
-. if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+= GETTEXT=""
-USES+= gettext
-. else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= GETTEXT="@comment "
-. endif
-. if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+= -O3 -funroll-loops
-. endif
+OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops
-. if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-INSTALL_TARGET= install
-. endif
+DEBUG_CONFIGURE_ENABLE= debug
.if ${PORT_OPTIONS:MGSSAPI}
CONFIGURE_ARGS+=--with-gssapi
@@ -233,12 +208,6 @@ CONFIGURE_ARGS+=--with-krb5
.endif # !SLAVE_ONLY
-PLIST_SUB+= PG_USER=${PG_USER} \
- PG_GROUP=${PG_GROUP}
-SUB_LIST+= PG_GROUP=${PG_GROUP} \
- PG_USER=${PG_USER} \
- PG_UID=${PG_UID}
-
# For testing files in FILESDIR
.include <bsd.port.pre.mk>
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index cc4e23aeabcd..24c3b104e3e3 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -800,92 +800,92 @@ man/man7/WITH.7.gz
%%DOCSDIR%%/README-client
%%DATADIR%%/pg_service.conf.sample
%%DATADIR%%/psqlrc.sample
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/ta/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/psql-9.2.mo
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 41f923554aa6..43e0321bf266 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -51,92 +51,92 @@ lib/postgresql/utf8_and_win.so
%%DATADIR%%/extension/plpgsql--1.0.sql
%%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
%%DATADIR%%/extension/plpgsql.control
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/cs/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/de/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/es/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/fr/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/it/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/ru/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/sv/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/tr/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/plpgsql-9.2.mo
-%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/initdb-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-9.2.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/postgres-9.2.mo
%%DATADIR%%/postgres.shdescription
%%DATADIR%%/snowball_create.sql
%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan