git: 477f6e3c963b - main - sys.dirdeps.mk use ?= for OBJTOP

The branch main has been updated by sjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=477f6e3c963b472cf513ab8101ac05354301fcf8

commit 477f6e3c963b472cf513ab8101ac05354301fcf8
Author:     Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-05-13 17:46:24 +0000
Commit:     Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2023-05-13 17:46:24 +0000

    sys.dirdeps.mk use ?= for OBJTOP
    
    This broke bmake's after-import step.
---
 contrib/bmake/mk/sys.dirdeps.mk   | 2 +-
 share/mk/sys.dirdeps.mk           | 2 +-
 usr.bin/bmake/Makefile.config     | 2 +-
 usr.bin/bmake/unit-tests/Makefile | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/contrib/bmake/mk/sys.dirdeps.mk b/contrib/bmake/mk/sys.dirdeps.mk
index 845eda181b90..2daf3681d8d0 100644
--- a/contrib/bmake/mk/sys.dirdeps.mk
+++ b/contrib/bmake/mk/sys.dirdeps.mk
@@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET}
 MACHINE_OBJ.host32 = ${HOST_TARGET32}
 MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC}
 MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}}
-OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR}
+OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR}
 
 # we do not use MAKEOBJDIRPREFIX
 .undef MAKEOBJDIRPREFIX
diff --git a/share/mk/sys.dirdeps.mk b/share/mk/sys.dirdeps.mk
index 845eda181b90..2daf3681d8d0 100644
--- a/share/mk/sys.dirdeps.mk
+++ b/share/mk/sys.dirdeps.mk
@@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET}
 MACHINE_OBJ.host32 = ${HOST_TARGET32}
 MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC}
 MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}}
-OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR}
+OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR}
 
 # we do not use MAKEOBJDIRPREFIX
 .undef MAKEOBJDIRPREFIX
diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config
index 60e86b185246..83920a75165b 100644
--- a/usr.bin/bmake/Makefile.config
+++ b/usr.bin/bmake/Makefile.config
@@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H}
 
 # things set by configure
 
-_MAKE_VERSION?=20230414
+_MAKE_VERSION?=20230510
 
 prefix?= /usr
 srcdir= ${SRCTOP}/contrib/bmake
diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile
index 1db1dcd87718..cacf343d162f 100644
--- a/usr.bin/bmake/unit-tests/Makefile
+++ b/usr.bin/bmake/unit-tests/Makefile
@@ -2,9 +2,9 @@
 # See contrib/bmake/bsd.after-import.mk
 #
 # $FreeBSD$
-# $Id: Makefile,v 1.193 2023/02/25 20:03:25 sjg Exp $
+# $Id: Makefile,v 1.195 2023/05/10 18:26:24 sjg Exp $
 #
-# $NetBSD: Makefile,v 1.333 2023/02/25 19:30:32 sjg Exp $
+# $NetBSD: Makefile,v 1.335 2023/05/10 13:03:06 rillig Exp $
 #
 # Unit tests for make(1)
 #
@@ -378,6 +378,7 @@ TESTS+=		varmod-loop-delete
 TESTS+=		varmod-loop-varname
 TESTS+=		varmod-match
 TESTS+=		varmod-match-escape
+TESTS+=		varmod-mtime
 TESTS+=		varmod-no-match
 TESTS+=		varmod-order
 TESTS+=		varmod-order-numeric