From e8692aa7f1294938a20b312b4173cd6795d2051d Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Tue, 2 Apr 2024 06:42:48 +0000
Subject: bmake,bmake_host: switch to srcbase.foss21.org/, remove obsolete
 patches.

---
 groups.d/010.host_deps.group           | 13 ++++++++-----
 groups.d/231.native_packages_etc.group | 12 ++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'groups.d')

diff --git a/groups.d/010.host_deps.group b/groups.d/010.host_deps.group
index de68f590..580be8bf 100644
--- a/groups.d/010.host_deps.group
+++ b/groups.d/010.host_deps.group
@@ -37,11 +37,14 @@ HOST_DEPS_TOOLS_RPM_DISABLE=1;
 : ${PKG_BISON_HOST_VERSION:=3.7.6};
 : ${PKG_BISON_HOST_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_HOST_VERSION}.tar.xz};
 : ${PKG_BISON_HOST_ENV_VARS_EXTRA:="M4=${PREFIX}/bin/m4"};
-: ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
-: ${PKG_BMAKE_HOST_CONFIGURE_ARGS:=--with-default-sys-path=${PREFIX}/share/mk};
-: ${PKG_BMAKE_HOST_CFLAGS_BUILD_EXTRA:="-fcommon"};
-: ${PKG_BMAKE_HOST_LDFLAGS_BUILD_EXTRA:="-fcommon"};
-: ${PKG_BMAKE_HOST_MAKEFLAGS_LOADAVG:="none"};
+
+: ${PKG_BMAKE_HOST_VERSION:=20240401};
+: ${PKG_BMAKE_HOST_URL:=https://srcbase.foss21.org/bmake/srcbase.bmake-${PKG_BMAKE_HOST_VERSION}.tar.xz};
+: ${PKG_BMAKE_HOST_SHA256SUM:=38c81760e9021f5b8e00025a159e4819203cadb0d55d0597842ac0dc38709561};
+: ${PKG_BMAKE_HOST_SUBDIR:=bmake-20240401};
+: ${PKG_BMAKE_HOST_CONFIGURE_TYPE:="sofort"};
+: ${PKG_BMAKE_HOST_CONFIGURE_ARGS:=--prefix=};
+
 : ${PKG_BZIP2_HOST_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
 : ${PKG_BZIP2_HOST_VERSION:=1.0.8};
 : ${PKG_BZIP2_HOST_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_HOST_VERSION}.tar.gz};
diff --git a/groups.d/231.native_packages_etc.group b/groups.d/231.native_packages_etc.group
index 870b01ed..e19cae0e 100644
--- a/groups.d/231.native_packages_etc.group
+++ b/groups.d/231.native_packages_etc.group
@@ -28,10 +28,14 @@ zstd";
 : ${PKG_BDWGC_DEPENDS:="libatomic_ops"};
 : ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"};
 : ${PKG_BDWGC_CONFIGURE_ARGS_EXTRA:="--enable-threads=posix --enable-parallel-mark --enable-handle-fork"};
-: ${PKG_BMAKE_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
-: ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"};
-: ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"};
-: ${PKG_BMAKE_MAKEFLAGS_LOADAVG:="none"};
+
+: ${PKG_BMAKE_VERSION:=20240401};
+: ${PKG_BMAKE_URL:=https://srcbase.foss21.org/bmake/srcbase.bmake-${PKG_BMAKE_HOST_VERSION}.tar.xz};
+: ${PKG_BMAKE_SHA256SUM:=38c81760e9021f5b8e00025a159e4819203cadb0d55d0597842ac0dc38709561};
+: ${PKG_BMAKE_SUBDIR:=bmake-20240401};
+: ${PKG_BMAKE_CONFIGURE_TYPE:="sofort"};
+: ${PKG_BMAKE_CONFIGURE_ARGS:=--prefix=};
+
 : ${PKG_BOCHS_DEPENDS:="curl ncurses sdl1"};
 : ${PKG_BOCHS_SHA256SUM:=a010ab1bfdc72ac5a08d2e2412cd471c0febd66af1d9349bc0d796879de5b17a};
 : ${PKG_BOCHS_VERSION:=2.7};
-- 
cgit v1.2.3