[pkgsrc/trunk]: pkgsrc/devel/gmake gmake: Unbreak PREFER_PKGSRC circular depe...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26233412b5b4
branches:  trunk
changeset: 343203:26233412b5b4
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Oct 31 15:05:52 2019 +0000

description:
gmake: Unbreak PREFER_PKGSRC circular dependencies.

Just because a builtin is available does not mean a user has configured their
system to use it.  Check for USE_BUILTIN instead of IS_BUILTIN to ensure both
the builtin is available, and the user has allowed pkgsrc to use it, before
enabling.

diffstat:

 devel/gmake/options.mk |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 33b5c5f216d4 -r 26233412b5b4 devel/gmake/options.mk
--- a/devel/gmake/options.mk    Thu Oct 31 14:43:48 2019 +0000
+++ b/devel/gmake/options.mk    Thu Oct 31 15:05:52 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2019/10/28 10:03:18 triaxx Exp $
+# $NetBSD: options.mk,v 1.8 2019/10/31 15:05:52 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gmake
 PKG_SUPPORTED_OPTIONS= nls
@@ -12,10 +12,9 @@
 # to avoid a circular dependency (gmake->gettext-tools->ncurses->gmake).
 .include "../../devel/gettext-lib/builtin.mk"
 .if !empty(PKG_OPTIONS:Mnls) && \
-    !empty(IS_BUILTIN.gettext:M[yY][eE][sS])
+    !empty(USE_BUILTIN.gettext:M[yY][eE][sS])
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            msgfmt
-USE_BUILTIN.gettext=   yes
 .  include "../../devel/gettext-lib/buildlink3.mk"
 PLIST.nls=             yes
 .else