Received: by mail.netbsd.org (Postfix, from userid 605) id 6441384E43; Sat, 14 Mar 2020 13:28:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E1CA484D6B for ; Sat, 14 Mar 2020 13:28:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GyXQhvPpXiQF for ; Sat, 14 Mar 2020 13:28:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 48CE984D62 for ; Sat, 14 Mar 2020 13:28:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 44187FB27; Sat, 14 Mar 2020 13:28:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_158419253869380" MIME-Version: 1.0 Date: Sat, 14 Mar 2020 13:28:58 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/devel/gmake To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200314132858.44187FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_158419253869380 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Sat Mar 14 13:28:58 UTC 2020 Modified Files: pkgsrc/devel/gmake: options.mk Log Message: gmake: try harder to unbreak circular dependency Having builtin gettext (the lib) doesn't always imply that we have a builtin msgfmt (the tool). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/gmake/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_158419253869380 Content-Disposition: inline Content-Length: 881 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/gmake/options.mk diff -u pkgsrc/devel/gmake/options.mk:1.8 pkgsrc/devel/gmake/options.mk:1.9 --- pkgsrc/devel/gmake/options.mk:1.8 Thu Oct 31 15:05:52 2019 +++ pkgsrc/devel/gmake/options.mk Sat Mar 14 13:28:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2019/10/31 15:05:52 jperkin Exp $ +# $NetBSD: options.mk,v 1.9 2020/03/14 13:28:57 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gmake PKG_SUPPORTED_OPTIONS= nls @@ -12,7 +12,8 @@ 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(USE_BUILTIN.gettext:M[yY][eE][sS]) + !empty(USE_BUILTIN.gettext:M[yY][eE][sS]) && \ + !empty(TOOLS_PLATFORM.msgfmt:U) USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt . include "../../devel/gettext-lib/buildlink3.mk" --_----------=_158419253869380--