pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/tools mk: Add native GNU/BSD grep where they are kn...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/93601977048a
branches:  trunk
changeset: 314054:93601977048a
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Oct 17 08:30:43 2018 +0000

description:
mk: Add native GNU/BSD grep where they are known to exist.

diffstat:

 mk/tools/tools.Darwin.mk  |  5 ++++-
 mk/tools/tools.FreeBSD.mk |  5 ++++-
 mk/tools/tools.Linux.mk   |  8 +++++++-
 mk/tools/tools.NetBSD.mk  |  5 ++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diffs (99 lines):

diff -r a98003cc4232 -r 93601977048a mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Wed Oct 17 08:22:19 2018 +0000
+++ b/mk/tools/tools.Darwin.mk  Wed Oct 17 08:30:43 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.58 2017/06/12 16:11:51 sevan Exp $
+# $NetBSD: tools.Darwin.mk,v 1.59 2018/10/17 08:30:43 jperkin Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -45,6 +45,9 @@
 TOOLS_PLATFORM.find?=          /usr/bin/find
 TOOLS_PLATFORM.flex?=          /usr/bin/flex
 TOOLS_PLATFORM.ftp?=           /usr/bin/ftp
+TOOLS_PLATFORM.gerep?=         /usr/bin/egrep
+TOOLS_PLATFORM.gfrep?=         /usr/bin/fgrep
+TOOLS_PLATFORM.ggrep?=         /usr/bin/grep
 .if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
 TOOLS_PLATFORM.gmake?=         /usr/bin/gnumake
 TOOLS_PLATFORM.gm4?=           /usr/bin/gm4
diff -r a98003cc4232 -r 93601977048a mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Wed Oct 17 08:22:19 2018 +0000
+++ b/mk/tools/tools.FreeBSD.mk Wed Oct 17 08:30:43 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.44 2017/07/22 18:10:25 maya Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.45 2018/10/17 08:30:43 jperkin Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -33,6 +33,9 @@
 TOOLS_PLATFORM.file?=          /usr/bin/file
 TOOLS_PLATFORM.find?=          /usr/bin/find
 TOOLS_PLATFORM.flex?=          /usr/bin/lex
+TOOLS_PLATFORM.gegrep?=                /usr/bin/egrep
+TOOLS_PLATFORM.gfgrep?=                /usr/bin/fgrep
+TOOLS_PLATFORM.ggrep?=         /usr/bin/grep
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.groff?=         /usr/bin/groff
 TOOLS_PLATFORM.gunzip?=                /usr/bin/gunzip -f
diff -r a98003cc4232 -r 93601977048a mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Wed Oct 17 08:22:19 2018 +0000
+++ b/mk/tools/tools.Linux.mk   Wed Oct 17 08:30:43 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.61 2017/07/10 12:32:30 joerg Exp $
+# $NetBSD: tools.Linux.mk,v 1.62 2018/10/17 08:30:43 jperkin Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -77,8 +77,10 @@
 TOOLS_PLATFORM.echo?=          echo                    # shell builtin
 .if exists(/bin/egrep)
 TOOLS_PLATFORM.egrep?=         /bin/egrep
+TOOLS_PLATFORM.gegrep?=                /bin/egrep
 .elif exists(/usr/bin/egrep)
 TOOLS_PLATFORM.egrep?=         /usr/bin/egrep
+TOOLS_PLATFORM.gegrep?=                /usr/bin/egrep
 .endif
 TOOLS_PLATFORM.env?=           /usr/bin/env
 .if exists(/usr/bin/expr)
@@ -89,8 +91,10 @@
 TOOLS_PLATFORM.false?=         false                   # shell builtin
 .if exists(/bin/fgrep)
 TOOLS_PLATFORM.fgrep?=         /bin/fgrep
+TOOLS_PLATFORM.gfgrep?=                /bin/fgrep
 .elif exists(/usr/bin/fgrep)
 TOOLS_PLATFORM.fgrep?=         /usr/bin/fgrep
+TOOLS_PLATFORM.gfgrep?=                /usr/bin/fgrep
 .endif
 TOOLS_PLATFORM.file?=          /usr/bin/file
 TOOLS_PLATFORM.find?=          /usr/bin/find
@@ -116,8 +120,10 @@
 .endif
 .if exists(/bin/grep)
 TOOLS_PLATFORM.grep?=          /bin/grep
+TOOLS_PLATFORM.ggrep?=         /bin/grep
 .elif exists(/usr/bin/grep)
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
+TOOLS_PLATFORM.ggrep?=         /usr/bin/grep
 .endif
 .if exists(/usr/bin/groff)
 TOOLS_PLATFORM.groff?=         /usr/bin/groff
diff -r a98003cc4232 -r 93601977048a mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Wed Oct 17 08:22:19 2018 +0000
+++ b/mk/tools/tools.NetBSD.mk  Wed Oct 17 08:30:43 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.61 2017/04/21 16:03:10 maya Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.62 2018/10/17 08:30:43 jperkin Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -41,6 +41,9 @@
 .if exists(/usr/bin/gettext)
 TOOLS_PLATFORM.gettext?=       /usr/bin/gettext
 .endif
+TOOLS_PLATFORM.gegrep?=                /usr/bin/egrep
+TOOLS_PLATFORM.gfgrep?=                /usr/bin/fgrep
+TOOLS_PLATFORM.ggrep?=         /usr/bin/grep
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.groff?=         /usr/bin/groff
 TOOLS_PLATFORM.gsoelim?=       ${TOOLS_PLATFORM.soelim}        # GNUish



Home | Main Index | Thread Index | Old Index