CVS commit: pkgsrc/mk/tools

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug  6 03:50:23 UTC 2024

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

Log Message:
mk: avoid egrep and fgrep on Linux, use grep -E and grep -F

GNU grep 3.8 added a nag message on stderr telling us to do this:
https://git.savannah.gnu.org/cgit/grep.git/commit/src/egrep.sh?id=a9515624709865d480e3142fd959bccd1c9372d1


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/mk/tools/tools.Linux.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/tools.Linux.mk
diff -u pkgsrc/mk/tools/tools.Linux.mk:1.70 pkgsrc/mk/tools/tools.Linux.mk:1.71
--- pkgsrc/mk/tools/tools.Linux.mk:1.70 Wed Jul  3 13:27:16 2024
+++ pkgsrc/mk/tools/tools.Linux.mk      Tue Aug  6 03:50:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.70 2024/07/03 13:27:16 cheusov Exp $
+# $NetBSD: tools.Linux.mk,v 1.71 2024/08/06 03:50:23 tnn Exp $
 #
 # System-supplied tools for the Linux operating system.
 #
@@ -75,18 +75,12 @@ TOOLS_PLATFORM.diff3?=              ${_path}/diff3
 .  if exists(${_path}/dirname)
 TOOLS_PLATFORM.dirname?=       ${_path}/dirname
 .  endif
-.  if exists(${_path}/egrep)
-TOOLS_PLATFORM.egrep?=         ${_path}/egrep
-.  endif
 .  if exists(${_path}/env)
 TOOLS_PLATFORM.env?=           ${_path}/env
 .  endif
 .  if exists(${_path}/expr)
 TOOLS_PLATFORM.expr?=          ${_path}/expr
 .  endif
-.  if exists(${_path}/fgrep)
-TOOLS_PLATFORM.fgrep?=         ${_path}/fgrep
-.  endif
 .  if exists(${_path}/file)
 TOOLS_PLATFORM.file?=          ${_path}/file
 .  endif
@@ -110,6 +104,8 @@ TOOLS_PLATFORM.gawk?=               ${_path}/gawk
 .  endif
 .  if exists(${_path}/grep)
 TOOLS_PLATFORM.grep?=          ${_path}/grep
+TOOLS_PLATFORM.egrep?=         ${_path}/grep -E
+TOOLS_PLATFORM.fgrep?=         ${_path}/grep -F
 .  endif
 .  if exists(${_path}/groff)
 TOOLS_PLATFORM.groff?=         ${_path}/groff