@@ -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 @@
 COMMON_FILESDIR?=	${.CURDIR}/../../databases/postgresql11/files
 PATCHDIR?=		${.CURDIR}/../../databases/postgresql11/patches
 
-USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bison gmake lex
 PKG_SYSCONFSUBDIR=	postgresql
 
@@ -67,9 +66,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.

@@ -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