From ff765cb371f120bb1d6e648a2418a7c9e3f223b2 Mon Sep 17 00:00:00 2001
From: sjg <sjg@FreeBSD.org>
Date: Fri, 2 Aug 2013 06:25:28 +0000
Subject: Merge bmake-20130730 Main feature of interest is .MAKE.JOB.PREFIX= to
 suppress --- job --- tokens.

---
 usr.bin/bmake/Makefile            | 4 ++--
 usr.bin/bmake/config.h            | 4 ++--
 usr.bin/bmake/unit-tests/Makefile | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index 0765106..86414d4 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -14,10 +14,10 @@ CFLAGS+= -I${.CURDIR}
 CLEANDIRS+= FreeBSD
 CLEANFILES+= bootstrap
 
-#	$Id: Makefile,v 1.14 2013/06/05 04:03:22 sjg Exp $
+#	$Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20130604
+MAKE_VERSION= 20130730
 
 PROG?=	${.CURDIR:T}
 
diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h
index 93191b5..546af84 100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@ -230,7 +230,7 @@
 #define PACKAGE_NAME "bmake"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "bmake 20130303"
+#define PACKAGE_STRING "bmake 20130706"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "bmake"
@@ -239,7 +239,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "20130303"
+#define PACKAGE_VERSION "20130706"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile
index b24871f..4cbf6a2 100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@ -5,9 +5,9 @@
 
 SRCTOP?= ${.CURDIR:H:H:H}
 
-# $Id: Makefile.in,v 1.42 2013/03/23 02:31:13 sjg Exp $
+# $Id: Makefile.in,v 1.43 2013/07/16 21:14:30 sjg Exp $
 #
-# $NetBSD: Makefile,v 1.36 2013/03/22 16:36:46 sjg Exp $
+# $NetBSD: Makefile,v 1.37 2013/07/16 19:59:28 sjg Exp $
 #
 # Unit tests for make(1)
 # The main targets are:
@@ -96,7 +96,7 @@ test:
 	@echo "${TEST_MAKE} -f ${MAKEFILE} > ${.TARGET}.out 2>&1"
 	@cd ${.OBJDIR} && ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \
 	${TOOL_TR} -d '\015' | \
-	${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}:,make:,' \
+	${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}[^:]*:,make:,' \
 	-e '/stopped/s, /.*, unit-tests,' \
 	-e 's,${.CURDIR:C/\./\\\./g}/,,g' \
 	-e 's,${UNIT_TESTS:C/\./\\\./g}/,,g' > ${.TARGET}.out || { \
-- 
cgit v1.1