3 files changed, 59 insertions, 39 deletions
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 417afff139fa..ceb90d25fa62 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,7 +1,8 @@
 AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359ecb0e5b5c746447b9a0e9d2dff188f6f0d45225dd07d1226a86297f0c9ba8b8be7587039f2cc7ceaab4bde61f570 SHA512 3d855d54b64e2871ad8ccd494939c92a6bca2bec61f186e907a9b6b8b4f51b4ff63fcacbb8b6d44cef33a39c6ba2bed6c1fdd30d7ad65ad03d1d659781c420fe
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
-AUX bmake-20220418-warnings.patch 1304 BLAKE2B 364c458c39541f5901a7e46c2275625972d1879d42fd9c5f347e2f27f3b6f837dc3c1f676b3da1615eab6f91f38766bfc758d58959313e5598c4c9a7445fb93e SHA512 3925f5feea2222bd0b136f41dc633e03254946a88ef6029e4363f2bbcf97214f25479d27489a8f1697ddca5bab4157fb7675aba81534bcfa35eaa16750ce098b
 DIST bmake-20220928.tar.gz 821224 BLAKE2B 9b377a9a8d329d229aae37fd852a68629edb78f7f0f16bf8aeb59df4da886fe89d8b7defd8294fa49fca397d4726e704eb9c95936561fe8a3a0a1fdfe4e5b861 SHA512 13fde6517d79080c5a548b1e47e4fbf00d54752f48b40d10542926b26a3be22da70877ca2b977b43366ec1b632a76a6974c78155c39895910e01e4142e7675a0
+DIST bmake-20230120.tar.gz 823514 BLAKE2B 45e96f4911b8965b44ebe30c636819b36cb33a9733304f3bb8a99a806356ef1f01925c48a0fd25cf57b65524ae6ef544b6a79974bf1f92b749a242323a068fdd SHA512 b3c54f723adaf3329af14247d9891b1732d2b6dc9856e30be6fd65f3cd7aab85c4fcef1ef9799eaca5203357e2be5a6564d7e9108844b459654b1fa3767f721a
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20220928.ebuild 1280 BLAKE2B 8b0a901f552c84562690e3543e66cb388b9a3415ecc83028748711982651b91e75fca5f6e4fbff17b5db3ec52447e9f03b56589ff991e41be979a1026f221389 SHA512 99320a95fc86b80d9449be59e98acaab416c69209528ed0110b00e1fe18b8739a5e8100c8f4a8bb302c6e1ea4f7930253ea5cf69861f5172b02fa987d3bd2f97
+EBUILD bmake-20230120.ebuild 1281 BLAKE2B 3710d6487c66efa8b203bdcbf49f0cc11fd213083159b91802e57e7ccc5a86bbf4de3df08a60ba18f2c807ab4e25e80116fb4ece95563b5f5cc67be79dc41082 SHA512 8507fcce4e0e397abe856786d8f4693d5b55f8262bfc0015e3978570b22442789ebe1a42fe7f666df05d0c4a3d299901fb29926b0ed7866537568b19879f3176
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20230120.ebuild b/sys-devel/bmake/bmake-20230120.ebuild
new file mode 100644
index 000000000000..7c7d277872cc
--- /dev/null
+++ b/sys-devel/bmake/bmake-20230120.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MK_VER=20210330
+
+DESCRIPTION="NetBSD's portable make"
+HOMEPAGE="http://www.crufty.net/help/sjg/bmake.html"
+SRC_URI="
+	http://void.crufty.net/ftp/pub/sjg/${P}.tar.gz
+	http://void.crufty.net/ftp/pub/sjg/mk-${MK_VER}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~x86"
+
+# Skip failing test (sandbox and csh)
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210206-tests.patch
+)
+
+src_prepare() {
+	default
+	cd "${WORKDIR}" || die
+	eapply "${FILESDIR}"/${PN}-20210314-mk-fixes.patch
+}
+
+src_configure() {
+	econf \
+		--with-mksrc=../mk \
+		--with-default-sys-path="${EPREFIX}"/usr/share/mk/${PN} \
+		--with-machine_arch=${ARCH}
+}
+
+src_compile() {
+	sh make-bootstrap.sh || die "bootstrap failed"
+}
+
+src_test() {
+	cd unit-tests || die
+
+	# the 'ternary' test uses ${A} internally, which
+	# conflicts with Gentoo's ${A}, hence unset it for
+	# the tests temporarily.
+	env -u A MAKEFLAGS= \
+		"${S}"/bmake -r -m / TEST_MAKE="${S}"/bmake test || die "tests compilation failed"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	FORCE_BSD_MK=1 SYS_MK_DIR=. \
+		sh ../mk/install-mk -v -m 644 "${ED}"/usr/share/mk/${PN} \
+		|| die "failed to install mk files"
+}
diff --git a/sys-devel/bmake/files/bmake-20220418-warnings.patch b/sys-devel/bmake/files/bmake-20220418-warnings.patch
deleted file mode 100644
index 1fccb91e95a3..000000000000
--- a/sys-devel/bmake/files/bmake-20220418-warnings.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-# https://bugs.gentoo.org/841362
-#
-# Fix -Wimplicit-function-declaration and -Wunused-result warnings
-#
-# meta.c: In function ‘meta_name’:
-# meta.c:262:21: warning: implicit declaration of function ‘strlcpy’; did you mean ‘strncpy’? [-Wimplicit-function-declaration]
-#   262 |                     strlcpy(rp, tname_base, sizeof buf - (size_t)(rp - buf));
-#       |                     ^~~~~~~
-#       |                     strncpy
-#
-# meta.c: In function ‘meta_job_error’:
-# meta.c:774:5: warning: ignoring return value of ‘getcwd’ declared with attribute ‘warn_unused_result’ [-Wunused-result]
-#   774 |     getcwd(cwd, sizeof cwd);
-#       |     ^~~~~~~~~~~~~~~~~~~~~~~
-
---- a/meta.c
-+++ b/meta.c
-@@ -106,6 +106,10 @@
- char * stresep(char **, const char *, int);
- #endif
- 
-+#if !defined(HAVE_STRLCPY)
-+size_t strlcpy(char *, const char *, size_t);
-+#endif
-+
- /*
-  * Filemon is a kernel module which snoops certain syscalls.
-  *
-@@ -769,7 +773,8 @@
-     }
-     if (gn != NULL)
- 	Global_Set(".ERROR_TARGET", GNode_Path(gn));
--    getcwd(cwd, sizeof cwd);
-+    if (getcwd(cwd, sizeof cwd) == NULL)
-+    	err(1, "Could not get current working directory");
-     Global_Set(".ERROR_CWD", cwd);
-     if (pbm->meta_fname[0] != '\0') {
- 	Global_Set(".ERROR_META_FILE", pbm->meta_fname);