From 5d6e10d1fa23245d4097fe413e41dfbe8c48ae48 Mon Sep 17 00:00:00 2001
From: John Marino <draco@marino.st>
Date: Sun, 22 Mar 2015 20:00:55 +0100
Subject: [PATCH] bmake(1): complete update to version 20141111

The local modification to job.c was returned, but it may no longer be
necessary.  Until that's determined, leave the current behavior in place
though.
---
 contrib/bmake/README.DRAGONFLY | 11 ++++++-----
 contrib/bmake/job.c            | 11 ++++++++++-
 usr.bin/bmake/Makefile         |  2 +-
 usr.bin/bmake/config.h         | 13 +++++++++++--
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/contrib/bmake/README.DRAGONFLY b/contrib/bmake/README.DRAGONFLY
index 84666abe18..d2c0e783a8 100644
--- a/contrib/bmake/README.DRAGONFLY
+++ b/contrib/bmake/README.DRAGONFLY
@@ -1,18 +1,19 @@
-BMAKE 2013-10-01
+BMAKE 2014-11-11
 ================
 
 Original source can be downloaded from:
 http://www.crufty.net/ftp/pub/sjg
 
-file = bmake-20131001.tar.gz
-date = 21 November 2013
-size = 506072
-sha1 = 436733e4ec8751f527fe5bd82088ba3d81ce9ce5
+file = bmake-20141111.tar.gz
+date = 11 November 2014
+size = 524560
+sha1 = a6f670210f9ccde09a0e93a29a766f4726ddfeed
 
 The file README.DELETED contains a list of deleted files and directories.
 
 The following files have been patched:
 bmake.1
+job.c
 main.c
 meta.c
 var.c
diff --git a/contrib/bmake/job.c b/contrib/bmake/job.c
index 95326eb0b9..81fb490b25 100644
--- a/contrib/bmake/job.c
+++ b/contrib/bmake/job.c
@@ -1360,7 +1360,16 @@ JobExec(Job *job, char **argv)
 	(void)fcntl(0, F_SETFD, 0);
 	(void)lseek(0, (off_t)0, SEEK_SET);
 
-	if (job->node->type & (OP_MAKE | OP_SUBMAKE)) {
+	/*
+	 * Always pass job token pipe to submakes.  In the previous version
+	 * only the OP_MAKE flag was checked, which simply doesn't catch all
+	 * situtions and can lead to a massive multiplication of jobs.  This
+	 * may have been corrected with OR OP_SUBMAKE, but until this is
+	 * known for sure, keep the original modication in place
+	 *
+	 * if (job->node->type & (OP_MAKE | OP_SUBMAKE))
+	 */
+	{
 		/*
 		 * Pass job token pipe to submakes.
 		 */
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile
index fb8faebea1..82b442c88e 100644
--- a/usr.bin/bmake/Makefile
+++ b/usr.bin/bmake/Makefile
@@ -21,7 +21,7 @@ SRCS+=	meta.c
 srcdir= ${.CURDIR}/../../contrib/bmake
 
 # Base version on src date
-MAKE_VERSION= 20131001
+MAKE_VERSION= 20141111
 .if defined(BOOTSTRAPPING)
 DEFAULT_SYS_PATH = ${.CURDIR}/../../share/mk
 .else
diff --git a/usr.bin/bmake/config.h b/usr.bin/bmake/config.h
index 0781491bcd..8125a99a90 100644
--- a/usr.bin/bmake/config.h
+++ b/usr.bin/bmake/config.h
@@ -145,6 +145,9 @@
    `HAVE_STRUCT_STAT_ST_RDEV' instead. */
 #define HAVE_ST_RDEV 1
 
+/* Define to 1 if you have the `sysctl' function. */
+#define HAVE_SYSCTL 1
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 /* #undef HAVE_SYS_DIR_H */
@@ -165,6 +168,9 @@
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
 
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#define HAVE_SYS_SYSCTL_H 1
+
 /* Define to 1 if you have the <sys/time.h> header file. */
 #define HAVE_SYS_TIME_H 1
 
@@ -229,7 +235,7 @@
 #define PACKAGE_NAME "bmake"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "bmake 20130706"
+#define PACKAGE_STRING "bmake 20140214"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "bmake"
@@ -238,7 +244,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "20130706"
+#define PACKAGE_VERSION "20140214"
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #define RETSIGTYPE void
@@ -299,6 +305,9 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 /* #undef _POSIX_SOURCE */
 
+/* C99 function name */
+/* #undef __func__ */
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
-- 
2.41.0