CVS commit: pkgsrc/bootstrap

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Mar 26 15:30:27 UTC 2020

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Allow overriding EGREP/FGREP.

Makes bootstrapping on minimal Linux systems that don't include these
binaries in a normal location less broken.

from Michael Forney


To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 pkgsrc/bootstrap/bootstrap

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

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.276 pkgsrc/bootstrap/bootstrap:1.277
--- pkgsrc/bootstrap/bootstrap:1.276    Sun Mar 22 16:40:19 2020
+++ pkgsrc/bootstrap/bootstrap  Thu Mar 26 15:30:27 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.276 2020/03/22 16:40:19 rillig Exp $
+# $NetBSD: bootstrap,v 1.277 2020/03/26 15:30:27 nia Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1316,6 +1316,14 @@ if test -n "$GREP"; then
        echo "TOOLS_PLATFORM.grep?=             $GREP" >> ${TARGET_MKCONF}
        echo "TOOLS_PLATFORM.grep?=             $GREP" >> ${BOOTSTRAP_MKCONF}
 fi
+if test -n "$EGREP"; then
+       echo "TOOLS_PLATFORM.egrep?=            $EGREP" >> ${TARGET_MKCONF}
+       echo "TOOLS_PLATFORM.egrep?=            $EGREP" >> ${BOOTSTRAP_MKCONF}
+fi
+if test -n "$FGREP"; then
+       echo "TOOLS_PLATFORM.fgrep?=            $FGREP" >> ${TARGET_MKCONF}
+       echo "TOOLS_PLATFORM.fgrep?=            $FGREP" >> ${BOOTSTRAP_MKCONF}
+fi
 if test -n "$ID"; then
        echo "TOOLS_PLATFORM.id?=               $ID" >> ${TARGET_MKCONF}
        echo "TOOLS_PLATFORM.id?=               $ID" >> ${BOOTSTRAP_MKCONF}