CVS commit: pkgsrc/mk/tools

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Oct 17 08:30:43 UTC 2018

Modified Files:
        pkgsrc/mk/tools: tools.Darwin.mk tools.FreeBSD.mk tools.Linux.mk
            tools.NetBSD.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/mk/tools/tools.Darwin.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/mk/tools/tools.FreeBSD.mk
cvs rdiff -u -r1.61 -r1.62 pkgsrc/mk/tools/tools.Linux.mk \
    pkgsrc/mk/tools/tools.NetBSD.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.Darwin.mk
diff -u pkgsrc/mk/tools/tools.Darwin.mk:1.58 pkgsrc/mk/tools/tools.Darwin.mk:1.59
--- pkgsrc/mk/tools/tools.Darwin.mk:1.58        Mon Jun 12 16:11:51 2017
+++ pkgsrc/mk/tools/tools.Darwin.mk     Wed Oct 17 08:30:43 2018
@@ -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.file?=         /usr/bin/file
 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

Index: pkgsrc/mk/tools/tools.FreeBSD.mk
diff -u pkgsrc/mk/tools/tools.FreeBSD.mk:1.44 pkgsrc/mk/tools/tools.FreeBSD.mk:1.45
--- pkgsrc/mk/tools/tools.FreeBSD.mk:1.44       Sat Jul 22 18:10:25 2017
+++ pkgsrc/mk/tools/tools.FreeBSD.mk    Wed Oct 17 08:30:43 2018
@@ -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.fgrep?=                /usr/bin/fgrep
 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

Index: pkgsrc/mk/tools/tools.Linux.mk
diff -u pkgsrc/mk/tools/tools.Linux.mk:1.61 pkgsrc/mk/tools/tools.Linux.mk:1.62
--- pkgsrc/mk/tools/tools.Linux.mk:1.61 Mon Jul 10 12:32:30 2017
+++ pkgsrc/mk/tools/tools.Linux.mk      Wed Oct 17 08:30:43 2018
@@ -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.dirname?=     /usr/bin/dirnam
 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.expr?=                /bin/expr
 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 @@ TOOLS_PLATFORM.gmake?=             /usr/bin/make
 .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
Index: pkgsrc/mk/tools/tools.NetBSD.mk
diff -u pkgsrc/mk/tools/tools.NetBSD.mk:1.61 pkgsrc/mk/tools/tools.NetBSD.mk:1.62
--- pkgsrc/mk/tools/tools.NetBSD.mk:1.61        Fri Apr 21 16:03:10 2017
+++ pkgsrc/mk/tools/tools.NetBSD.mk     Wed Oct 17 08:30:43 2018
@@ -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 @@ TOOLS_PLATFORM.ftp?=          /usr/bin/ftp
 .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