CVS commit: pkgsrc/databases/postgresql11

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Fri Oct 25 08:00:47 UTC 2019

Modified Files:
        pkgsrc/databases/postgresql11: Makefile.common options.mk

Log Message:
postgresql11: fix nls option support


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/postgresql11/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/postgresql11/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql11/Makefile.common
diff -u pkgsrc/databases/postgresql11/Makefile.common:1.8 pkgsrc/databases/postgresql11/Makefile.common:1.9
--- pkgsrc/databases/postgresql11/Makefile.common:1.8   Fri Oct 25 04:39:18 2019
+++ pkgsrc/databases/postgresql11/Makefile.common       Fri Oct 25 08:00:46 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2019/10/25 04:39:18 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.9 2019/10/25 08:00:46 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,6 @@ DISTINFO_FILE?=               ${.CURDIR}/../../databa
 COMMON_FILESDIR?=      ${.CURDIR}/../../databases/postgresql11/files
 PATCHDIR?=             ${.CURDIR}/../../databases/postgresql11/patches
 
-USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            bison gmake lex
 PKG_SYSCONFSUBDIR=     postgresql
 
@@ -68,9 +67,6 @@ CONFIGURE_ARGS+=      --without-perl
 CONFIGURE_ARGS+=       --without-python
 CONFIGURE_ARGS+=       --without-tcl
 
-# avoid pointing to a wrapper
-CONFIGURE_ENV+=                MSGFMT=${TOOLS_PATH.msgfmt}
-
 # sys/ucred.h shouldn't be included on Solaris, causes conflicts between
 # procfs and largefile.
 CONFIGURE_ENV.SunOS+=  ac_cv_header_sys_ucred_h=no

Index: pkgsrc/databases/postgresql11/options.mk
diff -u pkgsrc/databases/postgresql11/options.mk:1.4 pkgsrc/databases/postgresql11/options.mk:1.5
--- pkgsrc/databases/postgresql11/options.mk:1.4        Fri Oct 25 07:15:40 2019
+++ pkgsrc/databases/postgresql11/options.mk    Fri Oct 25 08:00:46 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2019/10/25 07:15:40 triaxx Exp $
+# $NetBSD: options.mk,v 1.5 2019/10/25 08:00:46 triaxx Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.postgresql11
-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 nls
 
 PLIST_VARS+=           llvm nls