--- bmake/boot-strap.orig	2020-02-08 19:30:56.653565539 +0000
+++ bmake/boot-strap	2020-02-11 11:45:44.426114614 +0000
@@ -202,7 +202,6 @@
 fi
 
 op=all
-BMAKE=
 
 while :
 do
@@ -391,7 +390,7 @@
 	    cd $Mydir &&
 	    MAKESYSPATH=$mksrc SRCTOP=$Mydir OBJTOP=$objdir \
 	    MAKEOBJDIR='${.CURDIR:S,${SRCTOP:tA},${OBJTOP:tA},}' \
-	    ${BMAKE:-$objdir/bmake} -f $Mydir/Makefile "$@"
+	    ${BMAKE} -f $Mydir/Makefile TEST_MAKE="${BMAKE}" "$@"
     )
 }
 
--- bmake/install-sh.orig	2020-02-15 15:51:24.856000000 +0000
+++ bmake/install-sh	2020-02-20 15:52:47.596000000 +0000
@@ -1,3 +1,4 @@
+#!/bin/sh
 :
 # NAME:
 #	install.sh - portable version of install(1)
--- bmake/makefile.in.orig	2022-12-26 19:16:39.881930779 +0100
+++ bmake/makefile.in	2023-03-23 18:09:58.883692945 +0100
@@ -9,6 +9,6 @@
 all: build
 
 build clean install test:
-	${srcdir}/boot-strap --prefix=${prefix} -o . op=$@
+	MAKEFLAGS="${MAKEFLAGS%*--jobserver-auth=[0-9],[0=9]*}" ${srcdir}/boot-strap --prefix=${prefix} -o . op=$@