Update bfs

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 49ed98e397ec2b3156aabaca5579d12252a8804bcf4969ccad29b735eab26d14..cb6ab5b143104e846e1492a2717596cefc4812accedececa16cf1c761d613b35 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -14,7 +14,7 @@
 /b2sum-20190724-12-ged1974e.tar.zst
 /b3sum-1.7.0.tar.gz
 /bash-5.2.21.tar.gz
-/bfs-3.1.3.tar.zst
+/bfs-4.0.7.tar.zst
 /bfs.git/
 /bird-2.15.1.tar.gz
 /bird-doc-2.15.1.tar.gz

diff --git a/build/distfiles/bfs-3.1.3.tar.zst.do b/build/distfiles/bfs-4.0.7.tar.zst.do
similarity index 85%
rename from build/distfiles/bfs-3.1.3.tar.zst.do
rename to build/distfiles/bfs-4.0.7.tar.zst.do
index 8a5a13a996a2edfc77313629d8ef1f2e234e19987762df7148fe640b25940fdd..e835bd2c85da56beb60eca0abed3315124bf37308ad5c47d94302fcc9ac041fe 100644 (file)
--- a/build/distfiles/bfs-3.1.3.tar.zst.do
+++ b/build/distfiles/bfs-4.0.7.tar.zst.do
@@ -2,6 +2,6 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 [ -d bfs.git ] || git clone --depth 1 --bare https://github.com/tavianator/bfs.git >&2
 cd bfs.git
-commit=a1e288cb6a2482b7acc1edb92eea9d676da0729f
+commit=8d5472c2ec6312569c177ccce3adc05414d8bb40
 git fetch origin $commit >&2
 git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR

diff --git a/build/skel/sysutils/bfs-3.1.3.do b/build/skel/sysutils/bfs-4.0.7.do
similarity index 70%
rename from build/skel/sysutils/bfs-3.1.3.do
rename to build/skel/sysutils/bfs-4.0.7.do
index 02323a9502e52e6d985a2fe74f684d76ab2c9abb7d141830dd57f04d1f965307..77afe8d4b7be53744d5069491919693d1c2b2addb9c8a30ef24d8be1174fb1d8 100644 (file)
--- a/build/skel/sysutils/bfs-3.1.3.do
+++ b/build/skel/sysutils/bfs-4.0.7.do
@@ -6,7 +6,6 @@ bdeps="
 rc-paths
 stow
 archivers/zstd
-devel/gmake-4.4.1
 devel/pkgconf-2.1.1
 devel/oniguruma-v6.9.9
 "
@@ -20,9 +19,15 @@ $TAR xf "$DISTFILES"/$NAME.tar.zst
 
 cd $NAME
 patch <"$BASS_ROOT"/build/skel/sysutils/bfs-skip-mtab.patch >&2
-gmake -j$MAKE_JOBS LDFLAGS="-static $LDFLAGS" >&2
-mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/bin
+LDFLAGS="-static $LDFLAGS" ./configure \
+    --with-oniguruma \
+    --prefix="$SKELBINS"/$ARCH/$NAME-$hsh >&2
+make -j$MAKE_JOBS >&2
+mkdir -p \
+    "$SKELBINS"/$ARCH/$NAME-$hsh/bin \
+    "$SKELBINS"/$ARCH/$NAME-$hsh/share/man/man1
 mv bin/bfs "$SKELBINS"/$ARCH/$NAME-$hsh/bin
+mv docs/bfs.1 "$SKELBINS"/$ARCH/$NAME-$hsh/share/man/man1
 
 cd "$SKELBINS"/$ARCH
 "$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh