CVS commit: pkgsrc/mk/tools

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 18 13:01:28 UTC 2025

Modified Files:
        pkgsrc/mk/tools: replace.mk

Log Message:
mk: Avoid m4 TOOLS_NOOP if gm4 is required.

Adding gm4 as a tool creates an m4 -> gm4 symlink, which can cause
problems when trying to write to m4 later.

Ideally this all needs to be rewritten so that tools is a unique list
containing a single operation to be applied for each tool.

>From Jonathan Perkin <jperkin%smartos.org@localhost>
via drecklypkg commit 4c16c936d248f7b03638e37aaa5366063b7d6213


To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 pkgsrc/mk/tools/replace.mk

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

Modified files:

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.304 pkgsrc/mk/tools/replace.mk:1.305
--- pkgsrc/mk/tools/replace.mk:1.304    Wed Jul  3 13:27:16 2024
+++ pkgsrc/mk/tools/replace.mk  Tue Feb 18 13:01:28 2025
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.304 2024/07/03 13:27:16 cheusov Exp $
+# $NetBSD: replace.mk,v 1.305 2025/02/18 13:01:28 wiz Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -606,7 +606,7 @@ TOOLS_DEPENDS.m4?=          m4>=1.4:../../devel/
 TOOLS_CREATE+=                 m4
 TOOLS_PATH.m4=                 ${TOOLBASE}/bin/gm4
 .  endif
-.elif !empty(OSX_TOOLS_FORCE_NOOP:Mm4)
+.elif empty(_USE_TOOLS:Mgm4) && !empty(OSX_TOOLS_FORCE_NOOP:Mm4)
 # After 2024Q1: switch to TOOLS_FAIL and/or generalize to all undeclared tools
 TOOLS_NOOP+=                   m4
 .endif