Attachment 220329 Details for Bug 251191 – Updated patch file

[patch] Updated patch file

Mk_Uses_ninja.mk.patch (text/plain), 64.97 KB, created by Yasuhiro Kimura on 2020-12-06 22:32:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2020-12-06 22:32:57 UTC

Size: 64.97 KB

patch

obsolete

>Index: Mk/Uses/ninja.mk
>===================================================================
>--- Mk/Uses/ninja.mk	(revision 557099)
>+++ Mk/Uses/ninja.mk	(working copy)
>@@ -14,16 +14,14 @@
> IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
> .endif
> 
>-MAKE_ARGS+=	-v
>-
> BUILD_DEPENDS+=	ninja:devel/ninja
> 
> CMAKE_ARGS+=	-GNinja
>-MAKEFILE=
>-MAKE_CMD=	ninja
>-MAKE_FLAGS=
>-# Set a minimal job of 1
>-_MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
>+# Intended to be used to pass options to ninja
>+NINJA_FLAGS?=
>+DO_MAKE_BUILD=	${SETENV} ${MAKE_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
>+DO_MAKE_INSTALL=	${SETENV} ${MAKE_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
>+DO_MAKE_TEST=	${SETENV} ${TEST_ENV} ninja -v -j${MAKE_JOBS_NUMBER} ${NINJA_FLAGS}
> _DESTDIR_VIA_ENV=	yes
> 
> .endif
>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 557099)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -3386,15 +3386,16 @@
> 
> # Install
> 
>+DO_MAKE_INSTALL?=	${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
> .if !target(do-install) && !defined(NO_INSTALL)
> do-install:
>-	@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
>+	@(cd ${INSTALL_WRKSRC} && ${DO_MAKE_INSTALL} ${INSTALL_TARGET})
> .endif
> 
> # Test
> 
>+DO_MAKE_TEST?=	${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}
> .if !target(do-test) && defined(TEST_TARGET)
>-DO_MAKE_TEST?=	${SETENV} ${TEST_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${TEST_ARGS:N${DESTDIRNAME}=*}
> do-test:
> 	@(cd ${TEST_WRKSRC}; if ! ${DO_MAKE_TEST} ${TEST_TARGET}; then \
> 		if [ -n "${TEST_FAIL_MESSAGE}" ] ; then \
>Index: cad/brlcad/Makefile
>===================================================================
>--- cad/brlcad/Makefile	(revision 557099)
>+++ cad/brlcad/Makefile	(working copy)
>@@ -60,6 +60,6 @@
> 	${INSTALL_SCRIPT} ${WRKSRC}/mged.sh ${STAGEDIR}${PREFIX}/bin/mged.sh
> 
> regression-test: build
>-	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} test)
>+	@(cd ${WRKSRC} && ${DO_MAKE_TEST} test)
> 
> .include <bsd.port.mk>
>Index: cad/cascade-compiler/Makefile
>===================================================================
>--- cad/cascade-compiler/Makefile	(revision 557099)
>+++ cad/cascade-compiler/Makefile	(working copy)
>@@ -36,7 +36,7 @@
> do-test:
> 	cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${SETENV} ${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${SETENV} ${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: comms/uhd/Makefile
>===================================================================
>--- comms/uhd/Makefile	(revision 557099)
>+++ comms/uhd/Makefile	(working copy)
>@@ -64,7 +64,7 @@
> # hack the install prefix now
> 	@${REINPLACE_CMD} -e 's|"${LOCALBASE}"|"${STAGEDIR}${PREFIX}"|g' \
> 		${CONFIGURE_WRKSRC}/cmake_install.cmake
>-	cd ${CONFIGURE_WRKSRC} && ${MAKE_CMD} install
>+	cd ${CONFIGURE_WRKSRC} && ${DO_MAKE_INSTALL} install
> #.for subdir in images
> #	${CP} -Rp ${WRKDIR}/uhd-ef1576780bc927b8611640091b15f3d051cb97ad/share/uhd/${subdir} ${STAGEDIR}${DATADIR}
> #.endfor
>Index: devel/args/Makefile
>===================================================================
>--- devel/args/Makefile	(revision 557099)
>+++ devel/args/Makefile	(working copy)
>@@ -27,7 +27,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DARGS_BUILD_UNITTESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/benchmark/Makefile
>===================================================================
>--- devel/benchmark/Makefile	(revision 557099)
>+++ devel/benchmark/Makefile	(working copy)
>@@ -25,7 +25,7 @@
> do-test: # Broken: https://github.com/google/benchmark/issues/979
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBENCHMARK_ENABLE_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/date/Makefile
>===================================================================
>--- devel/date/Makefile	(revision 557099)
>+++ devel/date/Makefile	(working copy)
>@@ -36,7 +36,7 @@
> 	@cd ${WRKSRC} && ${REINPLACE_CMD} 's|!/bin/bash|!${LOCALBASE}/bin/bash|' compile_fail.sh test_fail.sh
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DENABLE_DATE_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} testit
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} testit
> 
> .include <bsd.port.mk>
>Index: devel/docopt.cpp/Makefile
>===================================================================
>--- devel/docopt.cpp/Makefile	(revision 557099)
>+++ devel/docopt.cpp/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DWITH_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
> 		python${PYTHON_DEFAULT} run_tests
> 
> .include <bsd.port.mk>
>Index: devel/eastl/Makefile
>===================================================================
>--- devel/eastl/Makefile	(revision 557099)
>+++ devel/eastl/Makefile	(working copy)
>@@ -23,13 +23,13 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DEASTL_BUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
> 		cd test && ctest -C ${CMAKE_BUILD_TYPE}
> 
> benchmark: build
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DEASTL_BUILD_BENCHMARK=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
> 		cd benchmark && ctest -C ${CMAKE_BUILD_TYPE}
> 
> .include <bsd.port.mk>
>Index: devel/entt/Makefile
>===================================================================
>--- devel/entt/Makefile	(revision 557099)
>+++ devel/entt/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/estd/Makefile
>===================================================================
>--- devel/estd/Makefile	(revision 557099)
>+++ devel/estd/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} check
> 
> .include <bsd.port.mk>
>Index: devel/flatbuffers/Makefile
>===================================================================
>--- devel/flatbuffers/Makefile	(revision 557099)
>+++ devel/flatbuffers/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFLATBUFFERS_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${TEST_TARGET}
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} ${TEST_TARGET}
> 
> .include <bsd.port.mk>
>Index: devel/flatcc/Makefile
>===================================================================
>--- devel/flatcc/Makefile	(revision 557099)
>+++ devel/flatcc/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFLATCC_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/folly/Makefile
>===================================================================
>--- devel/folly/Makefile	(revision 557099)
>+++ devel/folly/Makefile	(working copy)
>@@ -40,7 +40,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/fp16/Makefile
>===================================================================
>--- devel/fp16/Makefile	(revision 557099)
>+++ devel/fp16/Makefile	(working copy)
>@@ -34,7 +34,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFP16_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/fxdiv/Makefile
>===================================================================
>--- devel/fxdiv/Makefile	(revision 557099)
>+++ devel/fxdiv/Makefile	(working copy)
>@@ -27,7 +27,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFXDIV_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/gcem/Makefile
>===================================================================
>--- devel/gcem/Makefile	(revision 557099)
>+++ devel/gcem/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DGCEM_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} gcem_tests && \
>+		${DO_MAKE_BUILD} gcem_tests && \
> 		(cd tests && ./exp.test)
> 
> .include <bsd.port.mk>
>Index: devel/hyperscan/Makefile
>===================================================================
>--- devel/hyperscan/Makefile	(revision 557099)
>+++ devel/hyperscan/Makefile	(working copy)
>@@ -51,6 +51,6 @@
> 	${RM} ${WRKSRC}/tools/CMakeLists.txt
> 
> do-test:
>-	cd ${BUILD_WRKSRC} && ${MAKE_CMD} unit
>+	cd ${BUILD_WRKSRC} && ${DO_MAKE_TEST} unit
> 
> .include <bsd.port.mk>
>Index: devel/ignition-common/Makefile
>===================================================================
>--- devel/ignition-common/Makefile	(revision 557099)
>+++ devel/ignition-common/Makefile	(working copy)
>@@ -38,7 +38,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${SETENV} ${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${SETENV} ${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/ispc/Makefile
>===================================================================
>--- devel/ispc/Makefile	(revision 557099)
>+++ devel/ispc/Makefile	(working copy)
>@@ -37,7 +37,7 @@
> 	@cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./run_tests.py
> 
> test-check-all:
>-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-all
>+	@cd ${BUILD_WRKSRC} && ${DO_MAKE_TEST} check-all
> 
> run-examples: build
> 	@[ -f ${LOCALBASE}/lib/libtbb.so ] || ! echo "ERROR run-examples target requires devel/tbb package installed"
>@@ -44,7 +44,7 @@
> .for e in simple sort mandelbrot stencil
> 	@cd ${WRKSRC}/examples/${e} && \
> 	${ECHO} "===> Running example ${e}" && \
>-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \
>+	${DO_MAKE_BUILD} && \
> 	./${e}
> .endfor
> 
>Index: devel/libfmt/Makefile
>===================================================================
>--- devel/libfmt/Makefile	(revision 557099)
>+++ devel/libfmt/Makefile	(working copy)
>@@ -31,7 +31,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DFMT_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/libgit2/Makefile
>===================================================================
>--- devel/libgit2/Makefile	(revision 557099)
>+++ devel/libgit2/Makefile	(working copy)
>@@ -44,7 +44,7 @@
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 		-DBUILD_CLAR=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.post.mk>
>Index: devel/llvm-cheri/Makefile
>===================================================================
>--- devel/llvm-cheri/Makefile	(revision 557099)
>+++ devel/llvm-cheri/Makefile	(working copy)
>@@ -327,7 +327,7 @@
> 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
> 	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}FileCheck${COMMAND_SUFFIX}
> 
>-TEST_CMD=	'(cd ${WRKSRC}/llvm/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/llvm/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/llvm/test; \
>Index: devel/llvm-devel/Makefile
>===================================================================
>--- devel/llvm-devel/Makefile	(revision 557099)
>+++ devel/llvm-devel/Makefile	(working copy)
>@@ -471,7 +471,7 @@
> post-install-LLD-on:
> 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
> 
>-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/test; \
>Index: devel/llvm10/Makefile
>===================================================================
>--- devel/llvm10/Makefile	(revision 557099)
>+++ devel/llvm10/Makefile	(working copy)
>@@ -494,7 +494,7 @@
> 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
> 	    ${WRKSRC_compiler_rt} && \
>-	    ${MAKE_ENV} ${MAKE_CMD}
>+	    ${DO_MAKE_BUILD}
> 
> post-install:
> 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
>@@ -536,7 +536,7 @@
> 
> post-install-COMPILER_RT-on:
> 	cd ${WRKDIR}/compiler-rt-build && \
>-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
>+	    ${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> .if ${ARCH} == "amd64"
> 	${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386*
> .endif
>@@ -568,7 +568,7 @@
> post-install-LLD-on:
> 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
> 
>-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/test; \
>Index: devel/llvm11/Makefile
>===================================================================
>--- devel/llvm11/Makefile	(revision 557099)
>+++ devel/llvm11/Makefile	(working copy)
>@@ -490,7 +490,7 @@
> 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
> 	    ${WRKSRC_compiler_rt} && \
>-	    ${MAKE_ENV} ${MAKE_CMD}
>+	    ${DO_MAKE_BUILD}
> 
> post-install:
> 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
>@@ -532,7 +532,7 @@
> 
> post-install-COMPILER_RT-on:
> 	cd ${WRKDIR}/compiler-rt-build && \
>-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
>+	    ${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> .if ${ARCH} == "amd64"
> 	${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386*
> .endif
>@@ -564,7 +564,7 @@
> post-install-LLD-on:
> 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
> 
>-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/test; \
>Index: devel/llvm60/Makefile
>===================================================================
>--- devel/llvm60/Makefile	(revision 557099)
>+++ devel/llvm60/Makefile	(working copy)
>@@ -324,7 +324,7 @@
> 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
> 	    ${WRKSRC_compiler_rt} && \
>-	    ${MAKE_ENV} ${MAKE_CMD}
>+	    ${DO_MAKE_BUILD}
> 
> post-install:
> 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
>@@ -371,7 +371,7 @@
> 
> post-install-COMPILER_RT-on:
> 	cd ${WRKDIR}/compiler-rt-build && \
>-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
>+	    ${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> .if ${ARCH} == "amd64"
> 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
> .endif
>@@ -400,7 +400,7 @@
> 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
> 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
> 
>-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/test; \
>Index: devel/llvm70/Makefile
>===================================================================
>--- devel/llvm70/Makefile	(revision 557099)
>+++ devel/llvm70/Makefile	(working copy)
>@@ -344,7 +344,7 @@
> 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
> 	    ${WRKSRC_compiler_rt} && \
>-	    ${MAKE_ENV} ${MAKE_CMD}
>+	    ${DO_MAKE_BUILD}
> 
> post-install:
> 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
>@@ -386,7 +386,7 @@
> 
> post-install-COMPILER_RT-on:
> 	cd ${WRKDIR}/compiler-rt-build && \
>-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
>+	    ${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> .if ${ARCH} == "amd64"
> 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
> .endif
>@@ -418,7 +418,7 @@
> 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
> 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
> 
>-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/test; \
>Index: devel/llvm80/Makefile
>===================================================================
>--- devel/llvm80/Makefile	(revision 557099)
>+++ devel/llvm80/Makefile	(working copy)
>@@ -434,7 +434,7 @@
> 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
> 	    ${WRKSRC_compiler_rt} && \
>-	    ${MAKE_ENV} ${MAKE_CMD}
>+	    ${DO_MAKE_BUILD}
> 
> post-install:
> 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
>@@ -477,7 +477,7 @@
> 
> post-install-COMPILER_RT-on:
> 	cd ${WRKDIR}/compiler-rt-build && \
>-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
>+	    ${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> .if ${ARCH} == "amd64"
> 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
> .endif
>@@ -509,7 +509,7 @@
> 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
> 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
> 
>-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/test; \
>Index: devel/llvm90/Makefile
>===================================================================
>--- devel/llvm90/Makefile	(revision 557099)
>+++ devel/llvm90/Makefile	(working copy)
>@@ -467,7 +467,7 @@
> 	${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 	    -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \
> 	    ${WRKSRC_compiler_rt} && \
>-	    ${MAKE_ENV} ${MAKE_CMD}
>+	    ${DO_MAKE_BUILD}
> 
> post-install:
> 	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
>@@ -506,7 +506,7 @@
> 
> post-install-COMPILER_RT-on:
> 	cd ${WRKDIR}/compiler-rt-build && \
>-	    ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET}
>+	    ${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> .if ${ARCH} == "amd64"
> 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/freebsd/libclang_rt*i386*
> .endif
>@@ -541,7 +541,7 @@
> post-install-LLD_LINK-on:
> 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
> 
>-TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
>+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ninja check-local-lit)'
> do-test:
> 	if [ `${ID} -u` = 0 ]; then \
> 		${CHOWN} -R nobody ${WRKSRC}/test; \
>Index: devel/msgpack/Makefile
>===================================================================
>--- devel/msgpack/Makefile	(revision 557099)
>+++ devel/msgpack/Makefile	(working copy)
>@@ -33,6 +33,6 @@
> 	${REINPLACE_CMD} -e 's/c++98/c++11/' ${WRKSRC}/CMakeLists.txt
> 
> pre-test:
>-	cd ${WRKSRC} && ${CMAKE_BIN} . && ${MAKE_CMD}
>+	cd ${WRKSRC} && ${CMAKE_BIN} . && ninja
> 
> .include <bsd.port.mk>
>Index: devel/nlohmann-json/Makefile
>===================================================================
>--- devel/nlohmann-json/Makefile	(revision 557099)
>+++ devel/nlohmann-json/Makefile	(working copy)
>@@ -27,7 +27,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DJSON_BuildTests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/pegtl/Makefile
>===================================================================
>--- devel/pegtl/Makefile	(revision 557099)
>+++ devel/pegtl/Makefile	(working copy)
>@@ -23,7 +23,7 @@
> do-test: # one test case fails: https://github.com/taocpp/PEGTL/issues/189
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DPEGTL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/pthreadpool/Makefile
>===================================================================
>--- devel/pthreadpool/Makefile	(revision 557099)
>+++ devel/pthreadpool/Makefile	(working copy)
>@@ -27,7 +27,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DPTHREADPOOL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/rapidcheck/Makefile
>===================================================================
>--- devel/rapidcheck/Makefile	(revision 557099)
>+++ devel/rapidcheck/Makefile	(working copy)
>@@ -29,7 +29,7 @@
> do-test: # broken: https://github.com/emil-e/rapidcheck/issues/242
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DRC_ENABLE_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/reproc/Makefile
>===================================================================
>--- devel/reproc/Makefile	(revision 557099)
>+++ devel/reproc/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DREPROC_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/ros-console_bridge/Makefile
>===================================================================
>--- devel/ros-console_bridge/Makefile	(revision 557099)
>+++ devel/ros-console_bridge/Makefile	(working copy)
>@@ -19,7 +19,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/ros-urdfdom/Makefile
>===================================================================
>--- devel/ros-urdfdom/Makefile	(revision 557099)
>+++ devel/ros-urdfdom/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> do-test: # some tests are known to fail: https://github.com/ros/urdfdom/issues/118
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/string_theory/Makefile
>===================================================================
>--- devel/string_theory/Makefile	(revision 557099)
>+++ devel/string_theory/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
> 		-DST_BUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/taskflow/Makefile
>===================================================================
>--- devel/taskflow/Makefile	(revision 557099)
>+++ devel/taskflow/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DTF_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/thrust/Makefile
>===================================================================
>--- devel/thrust/Makefile	(revision 557099)
>+++ devel/thrust/Makefile	(working copy)
>@@ -18,7 +18,7 @@
> do-test: # tests freeze: https://github.com/thrust/thrust/issues/981
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DENABLE_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/vc/Makefile
>===================================================================
>--- devel/vc/Makefile	(revision 557099)
>+++ devel/vc/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: devel/wasi-libcxx/Makefile
>===================================================================
>--- devel/wasi-libcxx/Makefile	(revision 557099)
>+++ devel/wasi-libcxx/Makefile	(working copy)
>@@ -76,11 +76,11 @@
> post-build:
> 	@${LOCALBASE}/bin/llvm-ranlib${LLVM_SUFFIX} ${CONFIGURE_WRKSRC}/lib/wasm32-wasi/*.a
> 	@cd ${WRKDIR}/.build_cxxabi && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
>+		${DO_MAKE_BUILD} ${ALL_TARGET}
> 	@${LOCALBASE}/bin/llvm-ranlib${LLVM_SUFFIX} ${WRKDIR}/.build_cxxabi/lib/wasm32-wasi/*.a
> 
> post-install:
> 	@cd ${WRKDIR}/.build_cxxabi && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}
>+		${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> 
> .include <bsd.port.mk>
>Index: devel/xtl-quant-stack/Makefile
>===================================================================
>--- devel/xtl-quant-stack/Makefile	(revision 557099)
>+++ devel/xtl-quant-stack/Makefile	(working copy)
>@@ -26,7 +26,7 @@
> do-test:
> 	@cd ${WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dxtl_DIR:STRING=${STAGEDIR}${PREFIX}/lib/cmake/xtl -DBUILD_TESTS=ON -DDOWNLOAD_GTEST=OFF && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xtest
>+		${DO_MAKE_BUILD} && \
>+		${DO_MAKE_TEST} xtest
> 
> .include <bsd.port.mk>
>Index: games/spring/Makefile
>===================================================================
>--- games/spring/Makefile	(revision 557099)
>+++ games/spring/Makefile	(working copy)
>@@ -108,6 +108,6 @@
> .endif
> 
> pre-build:
>-	cd ${WRKSRC} && ${MAKE_CMD} generateVersionFiles
>+	cd ${WRKSRC} && ninja generateVersionFiles
> 
> .include <bsd.port.post.mk>
>Index: graphics/ogre3d/Makefile
>===================================================================
>--- graphics/ogre3d/Makefile	(revision 557099)
>+++ graphics/ogre3d/Makefile	(working copy)
>@@ -95,7 +95,7 @@
> 		${WRKSRC}/Components/Python/CMakeLists.txt
> 
> post-build-DOCS-on:
>-	${MAKE_CMD} -C ${BUILD_WRKSRC} OgreDoc
>+	ninja -C ${BUILD_WRKSRC} OgreDoc
> 
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: graphics/opengv/Makefile
>===================================================================
>--- graphics/opengv/Makefile	(revision 557099)
>+++ graphics/opengv/Makefile	(working copy)
>@@ -23,8 +23,8 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.pre.mk>
> 
>Index: graphics/openimageio/Makefile
>===================================================================
>--- graphics/openimageio/Makefile	(revision 557099)
>+++ graphics/openimageio/Makefile	(working copy)
>@@ -131,7 +131,7 @@
> 		${STAGEDIR}${PREFIX}/lib/libOpenImageIO_Util.so.2
> 
> do-test-TEST-on:
>-	@cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ${MAKE_CMD} test
>+	@cd ${BUILD_WRKSRC} && ${SETENV} ARGS=-V ninja test
> .endif # SLAVE_PORT
> 
> .include <bsd.port.mk>
>Index: graphics/qgis/Makefile
>===================================================================
>--- graphics/qgis/Makefile	(revision 557099)
>+++ graphics/qgis/Makefile	(working copy)
>@@ -173,6 +173,6 @@
> 	@${RM} /tmp/srs.db
> 
> check:
>-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
>+	@cd ${WRKSRC} && ${DO_MAKE_TEST} check
> 
> .include <bsd.port.post.mk>
>Index: graphics/qgis-ltr/Makefile
>===================================================================
>--- graphics/qgis-ltr/Makefile	(revision 557099)
>+++ graphics/qgis-ltr/Makefile	(working copy)
>@@ -174,6 +174,6 @@
> 	@${RM} /tmp/srs.db
> 
> check:
>-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check
>+	@cd ${WRKSRC} && ${DO_MAKE_TEST} check
> 
> .include <bsd.port.post.mk>
>Index: graphics/reactphysics3d/Makefile
>===================================================================
>--- graphics/reactphysics3d/Makefile	(revision 557099)
>+++ graphics/reactphysics3d/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DRP3D_COMPILE_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
> 		./test/tests
> 
> .include <bsd.port.mk>
>Index: lang/chaiscript/Makefile
>===================================================================
>--- lang/chaiscript/Makefile	(revision 557099)
>+++ lang/chaiscript/Makefile	(working copy)
>@@ -36,7 +36,7 @@
> do-test: # some tests are known to fail: https://github.com/ChaiScript/ChaiScript/issues/466
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DRUN_FUZZY_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: lang/hermes/Makefile
>===================================================================
>--- lang/hermes/Makefile	(revision 557099)
>+++ lang/hermes/Makefile	(working copy)
>@@ -36,7 +36,7 @@
> do-test: # some tests are known to fail: https://github.com/facebook/hermes/issues/347
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHERMES_ENABLE_TEST_SUITE:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-hermes
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_make_TEST} check-hermes
> 
> .include <bsd.port.mk>
>Index: math/ascent/Makefile
>===================================================================
>--- math/ascent/Makefile	(revision 557099)
>+++ math/ascent/Makefile	(working copy)
>@@ -27,7 +27,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
> 		${BUILD_WRKSRC}/unit_tests/ascent_test
> 
> .include <bsd.port.mk>
>Index: math/blasfeo/Makefile
>===================================================================
>--- math/blasfeo/Makefile	(revision 557099)
>+++ math/blasfeo/Makefile	(working copy)
>@@ -37,7 +37,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBLASFEO_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/cglm/Makefile
>===================================================================
>--- math/cglm/Makefile	(revision 557099)
>+++ math/cglm/Makefile	(working copy)
>@@ -19,7 +19,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DCGLM_USE_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/elemental/Makefile
>===================================================================
>--- math/elemental/Makefile	(revision 557099)
>+++ math/elemental/Makefile	(working copy)
>@@ -42,7 +42,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHydrogen_ENABLE_TESTING:BOOL=ON -DHydrogen_ENABLE_UNIT_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/ensmallen/Makefile
>===================================================================
>--- math/ensmallen/Makefile	(revision 557099)
>+++ math/ensmallen/Makefile	(working copy)
>@@ -1,3 +1,4 @@
>+
> # $FreeBSD$
> 
> PORTNAME=	ensmallen
>@@ -24,7 +25,7 @@
> do-test: # tests for 2.14.1 fail: https://github.com/mlpack/ensmallen/issues/225
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/faiss/Makefile
>===================================================================
>--- math/faiss/Makefile	(revision 557099)
>+++ math/faiss/Makefile	(working copy)
>@@ -25,7 +25,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/fcl/Makefile
>===================================================================
>--- math/fcl/Makefile	(revision 557099)
>+++ math/fcl/Makefile	(working copy)
>@@ -33,7 +33,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DFCL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/fcl05/Makefile
>===================================================================
>--- math/fcl05/Makefile	(revision 557099)
>+++ math/fcl05/Makefile	(working copy)
>@@ -36,7 +36,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DFCL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/flexfloat/Makefile
>===================================================================
>--- math/flexfloat/Makefile	(revision 557099)
>+++ math/flexfloat/Makefile	(working copy)
>@@ -34,7 +34,7 @@
> do-test: # one test, value_representation_half, fails: https://github.com/oprecomp/flexfloat/issues/9
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/flint2/Makefile
>===================================================================
>--- math/flint2/Makefile	(revision 557099)
>+++ math/flint2/Makefile	(working copy)
>@@ -29,7 +29,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/hmat-oss/Makefile
>===================================================================
>--- math/hmat-oss/Makefile	(revision 557099)
>+++ math/hmat-oss/Makefile	(working copy)
>@@ -31,7 +31,7 @@
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
> 		${REINPLACE_CMD} "s|#define OPENBLAS_DISABLE_THREADS|\/\/&|" ${BUILD_WRKSRC}/config.h && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.post.mk>
>Index: math/ideep/Makefile
>===================================================================
>--- math/ideep/Makefile	(revision 557099)
>+++ math/ideep/Makefile	(working copy)
>@@ -22,7 +22,7 @@
> do-test: # tests broken: https://github.com/intel/ideep/issues/34 and assume bundled mkl-dnn
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/ignition-math/Makefile
>===================================================================
>--- math/ignition-math/Makefile	(revision 557099)
>+++ math/ignition-math/Makefile	(working copy)
>@@ -30,7 +30,7 @@
> do-test: # one test is known to fail: https://bitbucket.org/ignitionrobotics/ign-math/issues/98
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/lean/Makefile
>===================================================================
>--- math/lean/Makefile	(revision 557099)
>+++ math/lean/Makefile	(working copy)
>@@ -28,7 +28,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/mlpack/Makefile
>===================================================================
>--- math/mlpack/Makefile	(revision 557099)
>+++ math/mlpack/Makefile	(working copy)
>@@ -35,9 +35,9 @@
> 
> do-test: # 'clean' target below is a workaround for: https://github.com/mlpack/mlpack/issues/2300
> 	@cd ${BUILD_WRKSRC} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} clean && \
>+		${DO_MAKE_BUILD} clean && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/mppp/Makefile
>===================================================================
>--- math/mppp/Makefile	(revision 557099)
>+++ math/mppp/Makefile	(working copy)
>@@ -29,13 +29,13 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${TEST_ARGS} ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> benchmarks: build # additionally depends on boost-libs
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${BENCHMARK_ARGS} ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} benchmark
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} ${ALL_TARGET} benchmark
> 
> .include <bsd.port.mk>
>Index: math/nanoflann/Makefile
>===================================================================
>--- math/nanoflann/Makefile	(revision 557099)
>+++ math/nanoflann/Makefile	(working copy)
>@@ -28,13 +28,13 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> benchmarks: build # benchmarks fail to run: https://github.com/jlblancoc/nanoflann/issues/100
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_BENCHMARKS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} benchmarks
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} benchmarks
> 
> .include <bsd.port.mk>
>Index: math/onednn/Makefile
>===================================================================
>--- math/onednn/Makefile	(revision 557099)
>+++ math/onednn/Makefile	(working copy)
>@@ -72,7 +72,7 @@
> 	@${REINPLACE_CMD} 's| /bin/bash | ${LOCALBASE}/bin/bash |' ${WRKSRC}/tests/CMakeLists.txt
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDNNL_BUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/piranha/Makefile
>===================================================================
>--- math/piranha/Makefile	(revision 557099)
>+++ math/piranha/Makefile	(working copy)
>@@ -33,7 +33,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/primesieve/Makefile
>===================================================================
>--- math/primesieve/Makefile	(revision 557099)
>+++ math/primesieve/Makefile	(working copy)
>@@ -21,7 +21,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/qposases/Makefile
>===================================================================
>--- math/qposases/Makefile	(revision 557099)
>+++ math/qposases/Makefile	(working copy)
>@@ -31,7 +31,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DQPOASES_BUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
> 		for e in ${EXAMPLES}; do \
> 			${ECHO} "=== Running example $${e} ===" && \
> 			${BUILD_WRKSRC}/bin/$${e}; \
>Index: math/scalapack/Makefile
>===================================================================
>--- math/scalapack/Makefile	(revision 557099)
>+++ math/scalapack/Makefile	(working copy)
>@@ -138,7 +138,7 @@
> 	${CHMOD} go-r ${HOME}/.mpd.conf
> 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
> . endif
>-	(cd ${BUILD_WRKSRC}/TESTING && ${MAKE_CMD} test)
>+	(cd ${BUILD_WRKSRC}/TESTING && ninja test)
> 
> .endif
> 
>Index: math/superlu/Makefile
>===================================================================
>--- math/superlu/Makefile	(revision 557099)
>+++ math/superlu/Makefile	(working copy)
>@@ -65,7 +65,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Denable_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/symengine/Makefile
>===================================================================
>--- math/symengine/Makefile	(revision 557099)
>+++ math/symengine/Makefile	(working copy)
>@@ -78,7 +78,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/universal/Makefile
>===================================================================
>--- math/universal/Makefile	(revision 557099)
>+++ math/universal/Makefile	(working copy)
>@@ -29,7 +29,7 @@
> do-test: # 2 tests are known to fail: https://github.com/stillwater-sc/universal/issues/154
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_OFF:C/(.*)/-D\1=ON/} ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: math/xtensor/Makefile
>===================================================================
>--- math/xtensor/Makefile	(revision 557099)
>+++ math/xtensor/Makefile	(working copy)
>@@ -29,7 +29,7 @@
> 	@${RLN} ${STAGEDIR}${PREFIX}/include ${WRKSRC}/test/staged-include
> 	@cd ${WRKSRC}/test && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} . && \
>-		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \
>-		${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xtest
>+		${DO_MAKE_BUILD} && \
>+		${DO_MAKE_TEST} xtest
> 
> .include <bsd.port.mk>
>Index: misc/ignition-fuel-tools/Makefile
>===================================================================
>--- misc/ignition-fuel-tools/Makefile	(revision 557099)
>+++ misc/ignition-fuel-tools/Makefile	(working copy)
>@@ -36,7 +36,7 @@
> do-test: # 4 tests are known to fail: https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/48/4-unit-tests-fail-unit_fuelclient_test
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD-} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: misc/libpredict/Makefile
>===================================================================
>--- misc/libpredict/Makefile	(revision 557099)
>+++ misc/libpredict/Makefile	(working copy)
>@@ -27,7 +27,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: misc/mnn/Makefile
>===================================================================
>--- misc/mnn/Makefile	(revision 557099)
>+++ misc/mnn/Makefile	(working copy)
>@@ -63,7 +63,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DMNN_BUILD_TEST:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
> 		cd ${BUILD_WRKSRC} && ./run_test.out
> 
> .include <bsd.port.post.mk>
>Index: misc/sdformat/Makefile
>===================================================================
>--- misc/sdformat/Makefile	(revision 557099)
>+++ misc/sdformat/Makefile	(working copy)
>@@ -35,7 +35,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: misc/vxl/Makefile
>===================================================================
>--- misc/vxl/Makefile	(revision 557099)
>+++ misc/vxl/Makefile	(working copy)
>@@ -24,8 +24,8 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.pre.mk>
> 
>Index: multimedia/kodi-devel/Makefile
>===================================================================
>--- multimedia/kodi-devel/Makefile	(revision 557099)
>+++ multimedia/kodi-devel/Makefile	(working copy)
>@@ -216,8 +216,7 @@
> # Do a full install for the first platform including shared data files...
> .for platform in ${_KODI_PLATFORMS:O:[1]}
> 	@${ECHO_MSG} "===>  Installing for ${platform}"
>-	@cd ${INSTALL_WRKSRC}/${platform} && ${SETENV} ${MAKE_ENV} ${FAKEROOT} \
>-		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
>+	@cd ${INSTALL_WRKSRC}/${platform} && ${DO_MAKE_INSTALL} ${INSTALL_TARGET}
> .endfor
> # ... followed by only the other platform binaries
> .for platform in ${_KODI_PLATFORMS:O:[2..-1]}
>Index: multimedia/x265/Makefile
>===================================================================
>--- multimedia/x265/Makefile	(revision 557099)
>+++ multimedia/x265/Makefile	(working copy)
>@@ -101,7 +101,7 @@
> 		${CMAKE_OTHER_ARGS} ${b:C/1./-DHIGH_BIT_DEPTH:BOOL=true/} \
> 		-DMAIN$b:BOOL=true -DENABLE_ASSEMBLY:BOOL=${ASSEMBLY} \
> 		-DEXPORT_C_API:BOOL=false -DENABLE_CLI=false
>-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC:H}/$bbit ${MAKE_ARGS}
>+	${DO_MAKE_BUILD} -C ${WRKSRC:H}/$bbit
> 	${LN} -f ${WRKSRC:H}/$bbit/libx265.a ${WRKSRC:H}/$bbit/libx265_$bbit.a
> 	${ECHO_MSG} "---> Built the $b-bit library ---"
> .endfor
>Index: net/mvfst/Makefile
>===================================================================
>--- net/mvfst/Makefile	(revision 557099)
>+++ net/mvfst/Makefile	(working copy)
>@@ -30,7 +30,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: net-p2p/libtorrent-rasterbar/Makefile
>===================================================================
>--- net-p2p/libtorrent-rasterbar/Makefile	(revision 557099)
>+++ net-p2p/libtorrent-rasterbar/Makefile	(working copy)
>@@ -79,7 +79,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dbuild_tests:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: science/ALPSCore/Makefile
>===================================================================
>--- science/ALPSCore/Makefile	(revision 557099)
>+++ science/ALPSCore/Makefile	(working copy)
>@@ -54,6 +54,6 @@
> pre-test:
> 	@cd ${CONFIGURE_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_ARGS_TEST} ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
>+		${DO_MAKE_BUILD}
> 
> .include <bsd.port.post.mk>
>Index: science/highfive/Makefile
>===================================================================
>--- science/highfive/Makefile	(revision 557099)
>+++ science/highfive/Makefile	(working copy)
>@@ -28,7 +28,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DHIGHFIVE_UNIT_TESTS:BOOL=ON -DHIGHFIVE_USE_BOOST=ON -DHIGHFIVE_USE_EIGEN:BOOL=ON -DHIGHFIVE_USE_XTENSOR=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: science/mmtf-cpp/Makefile
>===================================================================
>--- science/mmtf-cpp/Makefile	(revision 557099)
>+++ science/mmtf-cpp/Makefile	(working copy)
>@@ -43,7 +43,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -Dmmtf_build_local=ON -DBUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: science/opensim-core/Makefile
>===================================================================
>--- science/opensim-core/Makefile	(revision 557099)
>+++ science/opensim-core/Makefile	(working copy)
>@@ -50,7 +50,7 @@
> do-test: # 4 testcases are known to fail: https://github.com/opensim-org/opensim-core/issues/2379
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DDO_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: science/p5-Mcstas-Tools/Makefile
>===================================================================
>--- science/p5-Mcstas-Tools/Makefile	(revision 557099)
>+++ science/p5-Mcstas-Tools/Makefile	(working copy)
>@@ -44,7 +44,7 @@
> 
> do-install:
> .for f in ${WRKSRC_SUBDIRS}
>-	@(cd ${WRKSRC}/${f}/.build && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
>+	@(cd ${WRKSRC}/${f}/.build && ${DO_MAKE_INSTALL} ${INSTALL_TARGET})
> .endfor
> .for e in ${EXECS}
> 	${RLN} ${STAGEDIR}/${PREFIX}/mcstas/${PORTVERSION}/bin/${e} ${STAGEDIR}${PREFIX}/bin/${e}
>Index: science/pagmo2/Makefile
>===================================================================
>--- science/pagmo2/Makefile	(revision 557099)
>+++ science/pagmo2/Makefile	(working copy)
>@@ -32,7 +32,7 @@
> do-test: # tests fail to build: https://github.com/esa/pagmo2/issues/273
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DPAGMO_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: science/simbody/Makefile
>===================================================================
>--- science/simbody/Makefile	(revision 557099)
>+++ science/simbody/Makefile	(working copy)
>@@ -47,7 +47,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: science/simint/Makefile
>===================================================================
>--- science/simint/Makefile	(revision 557099)
>+++ science/simint/Makefile	(working copy)
>@@ -49,7 +49,7 @@
> do-test: # unfirtunately  it rebuilds
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DENABLE_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
>+		${DO_MAKE_BUILD} ${ALL_TARGET}
> .for tst in test_eri test_eri_deriv1 benchmark_eri screentest # from test/CMakeLists.txt
> 	#@cd ${WRKSRC} && (${FIND} test/dat -name "*.mol" | ${XARGS} ${BUILD_WRKSRC}/test/${tst})
> 	@cd ${WRKSRC} && (${FIND} test/dat -name "*.mol" | ${XARGS} printf "%s")
>Index: science/vipster/Makefile
>===================================================================
>--- science/vipster/Makefile	(revision 557099)
>+++ science/vipster/Makefile	(working copy)
>@@ -46,7 +46,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DTESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: security/nflib/Makefile
>===================================================================
>--- security/nflib/Makefile	(revision 557099)
>+++ security/nflib/Makefile	(working copy)
>@@ -39,7 +39,7 @@
> do-test:
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: textproc/castxml/Makefile
>===================================================================
>--- textproc/castxml/Makefile	(revision 557099)
>+++ textproc/castxml/Makefile	(working copy)
>@@ -57,7 +57,7 @@
> do-test: # tests fail: https://github.com/CastXML/CastXML/issues/130
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: textproc/sdcv/Makefile
>===================================================================
>--- textproc/sdcv/Makefile	(revision 557099)
>+++ textproc/sdcv/Makefile	(working copy)
>@@ -34,6 +34,6 @@
> .endfor
> 
> post-build-NLS-on:
>-	cd ${BUILD_WRKSRC} && ${MAKE_CMD} lang
>+	cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD} lang
> 
> .include <bsd.port.mk>
>Index: textproc/tinyxml2/Makefile
>===================================================================
>--- textproc/tinyxml2/Makefile	(revision 557099)
>+++ textproc/tinyxml2/Makefile	(working copy)
>@@ -30,12 +30,12 @@
> 
> post-install:
> 	${AR} cq ${STAGEDIR}${PREFIX}/lib/libtinyxml2.a ${WRKSRC}/CMakeFiles/tinyxml2.dir/tinyxml2.cpp.o
>-	
>+
> post-install-EXAMPLES-on:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
> 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} resources ${STAGEDIR}${EXAMPLESDIR}/
> 
> do-test:
>-	cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} xmltest && ./xmltest
>+	cd ${WRKSRC}/ && ${DO_MAKE_TEST} xmltest && ./xmltest
> 
> .include <bsd.port.mk>
>Index: www/davix/Makefile
>===================================================================
>--- www/davix/Makefile	(revision 557099)
>+++ www/davix/Makefile	(working copy)
>@@ -28,7 +28,7 @@
> do-test: # tests are known to fail: https://github.com/cern-fts/davix/issues/33
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DUNIT_TESTS=ON FUNCTIONAL_TESTS=ON BENCH_TESTS=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: www/restbed/Makefile
>===================================================================
>--- www/restbed/Makefile	(revision 557099)
>+++ www/restbed/Makefile	(working copy)
>@@ -28,8 +28,8 @@
> 	@${ECHO_MSG} "===>    Configuring tests in ${PKGNAME}"
> 	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH}
> 	@${ECHO_MSG} "===>    Building tests in ${PKGNAME}"
>-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
>+	@cd ${BUILD_WRKSRC} && ${DO_MAKE_BUILD}
> 	@${ECHO_MSG} "===>    Running tests in ${PKGNAME}"
>-	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+	@cd ${BUILD_WRKSRC} && ${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: www/simple-web-server/Makefile
>===================================================================
>--- www/simple-web-server/Makefile	(revision 557099)
>+++ www/simple-web-server/Makefile	(working copy)
>@@ -24,7 +24,7 @@
> do-test: # one testcase is known to fail: https://gitlab.com/eidheim/Simple-Web-Server/-/issues/294
> 	@cd ${BUILD_WRKSRC} && \
> 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+		${DO_MAKE_BUILD} ${ALL_TARGET} && \
>+		${DO_MAKE_TEST} test
> 
> .include <bsd.port.mk>
>Index: x11-themes/qtcurve/Makefile
>===================================================================
>--- x11-themes/qtcurve/Makefile	(revision 557099)
>+++ x11-themes/qtcurve/Makefile	(working copy)
>@@ -72,7 +72,7 @@
> 
> post-install:
> 	@(cd ${WRKSRC}/lib/cairo && \
>-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
>+		${DO_MAKE_INSTALL} ${INSTALL_TARGET})
> .endif
> 
> .if ${QTCURVE_SLAVE} == "kf5"

Actions: View | Diff

Attachments on bug 251191: 219737 | 219766 | 220329