[src/netbsd-7]: src Pull up following revision(s) (requested by joerg in tick...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/792146fb8d77
branches:  netbsd-7
changeset: 799733:792146fb8d77
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Dec 26 21:58:47 2015 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #1049):
        share/mk/bsd.own.mk: revision 1.881
        distrib/sets/Makefile: revision 1.99
checkflist requires an egrep that honours multiple pattern options, so
use ours. Fixes build on Solaris distributions.
--
Don't set TOOL_GREP to something which doesn't exist, just use the host
tool for now.

diffstat:

 distrib/sets/Makefile |  3 ++-
 share/mk/bsd.own.mk   |  6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 4adf09b3a6ca -r 792146fb8d77 distrib/sets/Makefile
--- a/distrib/sets/Makefile     Sat Dec 26 21:53:58 2015 +0000
+++ b/distrib/sets/Makefile     Sat Dec 26 21:58:47 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.97 2014/08/05 15:45:49 apb Exp $
+#      $NetBSD: Makefile,v 1.97.2.1 2015/12/26 21:58:47 snj Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -24,6 +24,7 @@
                AWK=${TOOL_AWK:Q} \
                CKSUM=${TOOL_CKSUM:Q} \
                DB=${TOOL_DB:Q} \
+               EGREP=${TOOL_GREP:Q}\ -E \
                HOST_SH=${HOST_SH:Q} \
                MAKE=${MAKE:Q} \
                MKTEMP=${TOOL_MKTEMP:Q} \
diff -r 4adf09b3a6ca -r 792146fb8d77 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Dec 26 21:53:58 2015 +0000
+++ b/share/mk/bsd.own.mk       Sat Dec 26 21:58:47 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.829.2.8 2015/06/04 16:33:03 snj Exp $
+#      $NetBSD: bsd.own.mk,v 1.829.2.9 2015/12/26 21:58:47 snj Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -318,7 +318,9 @@
 TOOL_GENASSYM=         ${TOOLDIR}/bin/${_TOOL_PREFIX}genassym
 TOOL_GENCAT=           ${TOOLDIR}/bin/${_TOOL_PREFIX}gencat
 TOOL_GMAKE=            ${TOOLDIR}/bin/${_TOOL_PREFIX}gmake
-TOOL_GREP=             ${TOOLDIR}/bin/${_TOOL_PREFIX}grep
+# grep exists in src/tools, but is not hooked up into the build.
+#TOOL_GREP=            ${TOOLDIR}/bin/${_TOOL_PREFIX}grep
+TOOL_GREP=             grep
 TOOL_GROFF=            PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff
 TOOL_HEXDUMP=          ${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump
 TOOL_HP300MKBOOT=      ${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot