From 36283915692e2ccf6bf943327a9f934a62f0f1eb Mon Sep 17 00:00:00 2001
From: Samuel Tyler <samuel@samuelt.me>
Date: Thu, 5 Mar 2026 22:55:52 +1100
Subject: [PATCH] which: update to 2.23

---
 steps/SHA256SUMS.pkgs                     |  2 +-
 steps/manifest                            |  2 +-
 steps/which-2.21/sources                  |  1 -
 steps/{which-2.21 => which-2.23}/pass1.sh | 15 ++++++++++-----
 steps/which-2.23/sources                  |  2 ++
 5 files changed, 14 insertions(+), 8 deletions(-)
 delete mode 100644 steps/which-2.21/sources
 rename steps/{which-2.21 => which-2.23}/pass1.sh (55%)
 create mode 100644 steps/which-2.23/sources

diff --git a/steps/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs
index 197b8810..c6f015e4 100644
--- a/steps/SHA256SUMS.pkgs
+++ b/steps/SHA256SUMS.pkgs
@@ -149,6 +149,6 @@ ab49972345d0c05f79b9370530829792e8c5c3b7fe283fc90e1dff26c2d0f6db  tcc-0.9.27_2.t
 8576a7c99802bb462dd044ef7df7263192f1acfabde47462afd6145ffec1e4f1  tcc-0.9.27_3.tar.bz2
 252cc7226bef56e9dc591433ab2176cf1dd54dd18de20535edb708d5c6c21dce  texinfo-7.2_0.tar.bz2
 b54b1aa40dc08eec51982fd581a64a900e2598ba29acc6ca9c2b1b2321603b49  util-linux-2.19.1_0.tar.bz2
-9075b6832d8d7b094775c8e6ead763851aec96f4559d8cd62ce0a25e7a8a70ab  which-2.21_0.tar.bz2
+be2cddd4061b6e3acb96f12b66e6c1d0d17b7fd992015ece28ec987df0bb4911  which-2.23_0.tar.bz2
 d7357c5a73e4a0adb07220392316185716c42003fe7e63b63ba8493f12f3621b  xz-5.6.4_0.tar.bz2
 9b10db90e06129fd174d48edb60a6d1e2fa72944fccef420431f8e836adcf972  zlib-1.3.1_0.tar.bz2
diff --git a/steps/manifest b/steps/manifest
index 9fd6bd7a..7ee6e7cb 100644
--- a/steps/manifest
+++ b/steps/manifest
@@ -213,7 +213,7 @@ uninstall: python-2.0.1 python-2.3.7 python-3.1.5 python-3.3.7 python-3.4.10 pyt
 build: libunistring-1.4.1
 build: gc-8.2.12
 build: guile-3.0.11
-build: which-2.21
+build: which-2.23
 build: grep-3.7
 build: sed-4.8
 build: autogen-5.18.16
diff --git a/steps/which-2.21/sources b/steps/which-2.21/sources
deleted file mode 100644
index aec16795..00000000
--- a/steps/which-2.21/sources
+++ /dev/null
@@ -1 +0,0 @@
-f https://carlowood.github.io/which/which-2.21.tar.gz f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad
diff --git a/steps/which-2.21/pass1.sh b/steps/which-2.23/pass1.sh
similarity index 55%
rename from steps/which-2.21/pass1.sh
rename to steps/which-2.23/pass1.sh
index 6e89cdcb..a42dc670 100755
--- a/steps/which-2.21/pass1.sh
+++ b/steps/which-2.23/pass1.sh
@@ -2,13 +2,18 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-urls="https://carlowood.github.io/which/which-2.21.tar.gz"
+src_unpack() {
+    default
+    mv cwm4* cwm4
+}
 
 src_prepare() {
-    rm configure Makefile.in aclocal.m4 which.1
-    touch ChangeLog which.1
-    sed -i '/@ACLOCAL_CWFLAGS@/d' Makefile.am
-    autoreconf-2.69 -fi
+    default
+    rmdir cwm4
+    ln -s ../cwm4 cwm4
+    touch ChangeLog which.1 which.info m4/submodules.m4 version.texi
+    ./autogen.sh
+    sed -i 's/@CW_SUBDIRS@//' Makefile.in
 }
 
 src_configure() {
diff --git a/steps/which-2.23/sources b/steps/which-2.23/sources
new file mode 100644
index 00000000..7f13e1a2
--- /dev/null
+++ b/steps/which-2.23/sources
@@ -0,0 +1,2 @@
+g https://https.git.savannah.gnu.org/git/which.git~3e2c8f _ 4442a6e3d16ce13ea6a2920115321ef38050f2b1bfa0b6ad5723375fefc7b684 which-2.23.tar.gz
+g https://github.com/CarloWood/cwm4~3c2d71a3fa598cf336c2fa2d8e64332b62c1ffba https://github.com/CarloWood/cwm4/archive/3c2d71a3fa598cf336c2fa2d8e64332b62c1ffba.tar.gz aeffc74d35b7bc3c0ed636a784fee4daa05764c3c2a4f165841ece5c9095f9e6 cwm4-3c2d71a3fa598cf336c2fa2d8e64332b62c1ffba.tar.gz