3 files changed, 59 insertions, 0 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 9e7e3571f705..081459394bb0 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 7f579cbcf449..a7d79793a6c0 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -2,7 +2,9 @@ AUX bmake-20210206-tests.patch 467 BLAKE2B 7c66cfbb610f2ea9615a737dd2d97fbea359e
 AUX bmake-20210314-mk-fixes.patch 2054 BLAKE2B 404e99593f04408e3f62d8c6118fc1676ef414b4cc18f5ec8b089182fad8865ad79e40c236e58b084f3194bdcc94c92e1e10e40efbddc142b84053117065e202 SHA512 8c9e823dd158e352021f0905e2a15cb8d7da3020c49a8f824cc5dbd8f33910fc64629d5f400fd8651a16b07e0685a1247a661fd9230a62b7330bd5fc71427dd4
 DIST bmake-20230512.tar.gz 841752 BLAKE2B a9f1f64515b72ff84c2f1d2b467d3c908b3bf233bbba8feb6d11e5d44fbeadf4a675557a7412ed3b2ae395a7a0ee59b165a6a29a243cdea52d746e8b973d513e SHA512 7f1ccc4dad795827d15f7ae3a815a7dcf64ed6c9b31b25684efa42013fd4046de65d1f60130856ec4b2a3bb37a63a8cb7a984cf7d132f9169487f2d41dc4a1b7
 DIST bmake-20230909.tar.gz 859801 BLAKE2B 02a44598edf05ebbcb31767b156563bfa10071774a3e7ae565efddc9b1ea6e684558e4ec3cfbc56d7d855cbe8663c43f43bd8d37e0a289c55ec12733e3e4916c SHA512 50622aee8024b3e0385974a8f446a4b5df0ba494b6133ab91ebbe63c408154b112f62c9df8521f4f1beaf28cdd6e7da178c3334337f6b14c8bced532029d8ba5
+DIST bmake-20231210.tar.gz 859537 BLAKE2B 554a4fab9df6c3f0ed1659c69a6294a6c3e1ebce4a8609ea1fe8bc657c11be04ea9b66ca01c50fc3bfc1ee54552a7e16584b26bea9f5461834e608ea39bbc38a SHA512 e2e35b5442f17c521ef2bf1c4cc1dbdedd0b1a335ac9a3c743add1c0bbaf4e32396ba64fd572cca75821cfa2b722d58ee71ec694d150d7e70d7a550d911a308b
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
 EBUILD bmake-20230512.ebuild 1292 BLAKE2B 7f3399acacf8307502acfaeb78368e1e4bc64f8218f44cd8ef91a979f1af7a725edc1f11fd500c0064b41ca9707ea3ed95475d8f42d3d11be20047b7bd46181d SHA512 80341c1ff1618d479289058d1b5c90933159aca68154df6ec46a88ccd95d60903ca96d9194f878816ed9efccf6d4440b10af2f93eb550a3abd016b2f2df6ac09
 EBUILD bmake-20230909.ebuild 1332 BLAKE2B 552fdf25bd9e70a4d7c36b06476d3428c0939f1c80264b8ebc5e7b12aa28d30d76fe95e74c16ed2fe2b4745f021b23251c992bd6550bf9e5e04a3b567e0f0e97 SHA512 846edfbdebe7d90eb7681dfea78605d9ff8c5e3cce2e45723386530b276f68dbb028b7ade9c01cd0c64322227d5e685a1c22ed14a9c4950e6caf5dbdf8a4d7a9
+EBUILD bmake-20231210.ebuild 1332 BLAKE2B 552fdf25bd9e70a4d7c36b06476d3428c0939f1c80264b8ebc5e7b12aa28d30d76fe95e74c16ed2fe2b4745f021b23251c992bd6550bf9e5e04a3b567e0f0e97 SHA512 846edfbdebe7d90eb7681dfea78605d9ff8c5e3cce2e45723386530b276f68dbb028b7ade9c01cd0c64322227d5e685a1c22ed14a9c4950e6caf5dbdf8a4d7a9
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20231210.ebuild b/sys-devel/bmake/bmake-20231210.ebuild
new file mode 100644
index 000000000000..7331b69374fb
--- /dev/null
+++ b/sys-devel/bmake/bmake-20231210.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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~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"
+}