CVS commit: pkgsrc/devel/gmake

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Oct 31 15:05:52 UTC 2019

Modified Files:
        pkgsrc/devel/gmake: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/gmake/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/devel/gmake/options.mk
diff -u pkgsrc/devel/gmake/options.mk:1.7 pkgsrc/devel/gmake/options.mk:1.8
--- pkgsrc/devel/gmake/options.mk:1.7   Mon Oct 28 10:03:18 2019
+++ pkgsrc/devel/gmake/options.mk       Thu Oct 31 15:05:52 2019
@@ -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 @@ PLIST_VARS+=         nls
 # 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