pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools mk: Avoid egrep/fgrep wrappers when using GNU...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d7f20296ef33
branches:  trunk
changeset: 388295:d7f20296ef33
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Nov 16 12:12:46 2022 +0000

description:
mk: Avoid egrep/fgrep wrappers when using GNU grep.

A recent GNU grep release has started to add obnoxious warnings when calling
egrep/fgrep, so use grep with -E or -F flags respectively to avoid them.

diffstat:

 mk/tools/replace.mk |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (26 lines):

diff -r d7bcb80e1de7 -r d7f20296ef33 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Nov 16 11:56:15 2022 +0000
+++ b/mk/tools/replace.mk       Wed Nov 16 12:12:46 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.295 2022/07/24 14:47:00 wiz Exp $
+# $NetBSD: replace.mk,v 1.296 2022/11/16 12:12:46 jperkin Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -998,10 +998,13 @@
 TOOLS_DEPENDS.ggrep?=  grep>=2.5.1:../../textproc/grep
 .    for _t_ in ${_TOOLS.grep}
 TOOLS_CREATE+=         g${_t_}
-TOOLS_PATH.${_t_}=     ${LOCALBASE}/bin/g${_t_}
-TOOLS_PATH.g${_t_}=    ${LOCALBASE}/bin/g${_t_}
-TOOLS_ALIASES.g${_t_}= ${_t_}
+TOOLS_PATH.${_t_}=     ${LOCALBASE}/bin/ggrep
+TOOLS_PATH.g${_t_}=    ${LOCALBASE}/bin/ggrep
 .    endfor
+TOOLS_ARGS.egrep=      -E
+TOOLS_ARGS.gegrep=     -E
+TOOLS_ARGS.fgrep=      -F
+TOOLS_ARGS.gfgrep=     -F
 .  endif
 .else
 .  for _t_ in ${_TOOLS.grep}



Home | Main Index | Thread Index | Old Index