From: Sergey Matveev Date: Sat, 14 Mar 2026 08:20:36 +0000 (+0300) Subject: Separate utils on {bin,lib} X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=91924e368ef74f8f0766407621f4d6c5d3eaa154c038f0c166720fb3bd248a7e;p=bass.git Separate utils on {bin,lib} --- diff --git a/build/distfiles/utils/dl-urls b/build/distfiles/bin/dl-urls similarity index 74% rename from build/distfiles/utils/dl-urls rename to build/distfiles/bin/dl-urls index 5575f67..7f59f93 100755 --- a/build/distfiles/utils/dl-urls +++ b/build/distfiles/bin/dl-urls @@ -1,4 +1,5 @@ #!/bin/sh -e +# List available download URLs for specified meta/target [ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../.. sname=$0 . "$BASS_ROOT"/lib/rc diff --git a/build/distfiles/bin/hashers-detect b/build/distfiles/bin/hashers-detect new file mode 100755 index 0000000..74be7d4 --- /dev/null +++ b/build/distfiles/bin/hashers-detect @@ -0,0 +1,122 @@ +#!/bin/sh -e +# Detect possible hashers + +desired="$1" + +check() { + local name="$1" + local cmd="$2" + our=$(echo -n hello world | + sh -e -c "$cmd" | + { read h rem ; printf %s "$h"; }) + [ $HSH == "$our" ] && echo "$name $cmd" || return 1 +} + +no() { + echo no $1 >&2 +} + +n=blake3-256 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=d74981efa70a0c880b8d8c1985d075dbcbf679b99a5f9914e5aaf96b831a9e24 + check $n b3sum || # https://github.com/BLAKE3-team/BLAKE3 + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +n=blake2b-512 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=021ced8799296ceca557832ab941a50b4a11f83478cf141f51f933f653ab9fbcc05a037cddbed06e309bf334942c4e58cdf1a46e237911ccd7fcf9787cbc7fd0 + check $n b2sum || # https://blake2.net/, GNU Coreutils + check $n "openssl blake2b512 -r" || + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +n=blake2b-256 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=256c83b297114d201b30179f3f0ef0cace9783622da5974326b436178aeef610 + check $n "b2sum -l 256" || + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +n=skein-512 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=8b4830244fc36daa11177311dc6bf7636376180dce2d29193335878142e7d6f5e9016beba729e0a353dd2fd421c8b2022ee8927f0bce6b88631bb01be2e0f5ba + check $n skein512 || # FreeBSD's out-of-box command + no $n +fi + +n=shake128 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=3a9159f071e4dd1c8c4f968607c30942e120d8156b8b1e72e0d376e8871cb8b8 + check $n goshake128 || # go.stargrave.org/gosha3 + check $n "sha3sum -a 128000 | dd bs=1 count=64 2>/dev/null ; echo" || # p5-Digest-SHA3 + check $n "meta4ra-hash -hashes $n:builtin" || + no $n + # openssl shake128 -- useless, as it outputs only 128 bits +fi + +n=shake256 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=369771bb2cb9d2b04c1d54cca487e372d9f187f73f7ba3f65b95c8ee7798c527f4f3c2d55c2d46a29f2e945d469c3df27853a8735271f5cc2d9e889544357116 + check $n goshake256 || + check $n "sha3sum -a 256000 | dd bs=1 count=128 2>/dev/null ; echo" || + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +n=sha-512 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=309ecc489c12d6eb4cc40f50c902f2b4d0ed77ee511a7c7a9bcd3ca86d4cd86f989dd35bc5ff499670da34255b45b0cfd830e81f605dcf7dc5542e93ae9cd76f + check $n sha512 || + check $n sha512sum || + check $n "libressl dgst -sha512" || + check $n "openssl sha512 -r" || + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +n=sha-256 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9 + check $n sha256 || + check $n sha256sum || + check $n "libressl dgst -sha256" || + check $n "openssl sha256 -r" || + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +unxxd="xxd -c 0 -p" +unhexdump="hexdump -v -e '/1 \"%02x\"' ; echo" +n=streebog-512 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=84d883ede9fa6ce855d82d8c278ecd9f5fc88bf0602831ae0c38b9b506ea3cb02f3fa076b8f5664adf1ff862c0157da4cc9a83e141b738ff9268a9ba3ed6f563 + check $n streebog512 || # go.cypherpunks.su/gogost + check $n "nettle-hash --algorithm=streebog512 --raw | $unxxd" || + check $n "nettle-hash --algorithm=streebog512 --raw | $unhexdump" || + check $n "libressl dgst -streebog512" || + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +n=streebog-256 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=c600fd9dd049cf8abd2f5b32e840d2cb0e41ea44de1c155dcd88dc84fe58a855 + check $n streebog256 || + check $n "nettle-hash --algorithm=streebog256 --raw | $unxxd" || + check $n "nettle-hash --algorithm=streebog256 --raw | $unhexdump" || + check $n "libressl dgst -streebog256" || + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi + +n=xxh3-128 +if [ -z "$desired" ] || [ $desired = "$n" ] ; then + HSH=df8d09e93f874900a99b8775cc15b6c7 + check $n "xxhsum -H128" || # https://cyan4973.github.io/xxHash/ + check $n "meta4ra-hash -hashes $n:builtin" || + no $n +fi diff --git a/build/distfiles/bin/hashes-gen b/build/distfiles/bin/hashes-gen new file mode 100755 index 0000000..4b05845 --- /dev/null +++ b/build/distfiles/bin/hashes-gen @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Generates hashes with specified hasher + +hashers="$1" +[ -n "$hashers" ] || hashers="$($(dirname "$0")/hashers-detect 2>/dev/null)" +tmp=$(mktemp -d) +trap "rm -fr $tmp" HUP PIPE INT QUIT TERM EXIT +cd $tmp +while read -r name cmd ; do + mkfifo $name.in + cat >$name.sh <>names +done <$name.out & +done +tee *.in >/dev/null +wait +for name in $(cat names) ; do + read hsh rem <$name.out + echo $name $hsh +done diff --git a/build/distfiles/list b/build/distfiles/bin/list similarity index 64% rename from build/distfiles/list rename to build/distfiles/bin/list index a3d3a0c..4bd73d7 100755 --- a/build/distfiles/list +++ b/build/distfiles/bin/list @@ -1,3 +1,4 @@ #!/bin/sh -e +# List possible download targets sed -n "/[^\/]$/p" <.gitignore | sed "s#^/##" diff --git a/build/distfiles/utils/meta4-to-metadir b/build/distfiles/bin/meta4-to-metadir similarity index 96% rename from build/distfiles/utils/meta4-to-metadir rename to build/distfiles/bin/meta4-to-metadir index 7b6dd00..bc36ba8 100755 --- a/build/distfiles/utils/meta4-to-metadir +++ b/build/distfiles/bin/meta4-to-metadir @@ -1,5 +1,5 @@ #!/bin/sh -e -# Convert .meta4 to the directories with {size,hashes,urls} metainformation. +# Convert .meta4 to the directories with {size,hashes,urls} metainformation meta4="$1" [ -n "$meta4" ] diff --git a/build/distfiles/utils/metadir-from-file b/build/distfiles/bin/metadir-from-file similarity index 87% rename from build/distfiles/utils/metadir-from-file rename to build/distfiles/bin/metadir-from-file index 13894c3..44616dc 100755 --- a/build/distfiles/utils/metadir-from-file +++ b/build/distfiles/bin/metadir-from-file @@ -1,4 +1,5 @@ #!/bin/sh -e +# Generate metadir from specified file [ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../.. sname=$0 . "$BASS_ROOT"/lib/rc diff --git a/build/distfiles/utils/metadir-to-meta4 b/build/distfiles/bin/metadir-to-meta4 similarity index 95% rename from build/distfiles/utils/metadir-to-meta4 rename to build/distfiles/bin/metadir-to-meta4 index a5cbc03..38bf89e 100755 --- a/build/distfiles/utils/metadir-to-meta4 +++ b/build/distfiles/bin/metadir-to-meta4 @@ -1,4 +1,5 @@ #!/bin/sh -e +# Generate .meta4 from specified metadirs echo '' echo '' diff --git a/build/distfiles/dl/BLAKE3-1.7.0.tar.zst.do b/build/distfiles/dl/BLAKE3-1.7.0.tar.zst.do index 1f19d3a..a1c810d 100644 --- a/build/distfiles/dl/BLAKE3-1.7.0.tar.zst.do +++ b/build/distfiles/dl/BLAKE3-1.7.0.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball BLAKE3 \ +../lib/git-to-tarball BLAKE3 \ https://github.com/BLAKE3-team/BLAKE3.git \ 8b829b697fa4cfe35de35e9aa8c20b56266cb091 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/age-v1.3.0.tar.zst.do b/build/distfiles/dl/age-v1.3.0.tar.zst.do index 3a55c15..b46bb4e 100644 --- a/build/distfiles/dl/age-v1.3.0.tar.zst.do +++ b/build/distfiles/dl/age-v1.3.0.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball age \ +../lib/git-to-tarball age \ https://github.com/FiloSottile/age.git \ 6a8065f2da1cc3e00a1b4cb39bef5fbdf4c48960 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/all.do b/build/distfiles/dl/all.do index 4a459ae..69254ef 100644 --- a/build/distfiles/dl/all.do +++ b/build/distfiles/dl/all.do @@ -1 +1 @@ -../list | xargs redo-ifchange +../bin/list | xargs redo-ifchange diff --git a/build/distfiles/dl/b2sum-20190724-12-ged1974e.tar.zst.do b/build/distfiles/dl/b2sum-20190724-12-ged1974e.tar.zst.do index 60d0bd6..77f36ac 100644 --- a/build/distfiles/dl/b2sum-20190724-12-ged1974e.tar.zst.do +++ b/build/distfiles/dl/b2sum-20190724-12-ged1974e.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball BLAKE2 \ +../lib/git-to-tarball BLAKE2 \ https://github.com/BLAKE2/BLAKE2.git \ ed1974ea83433eba7b2d95c5dcd9ac33cb847913 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/bfs-4.0.7.tar.zst.do b/build/distfiles/dl/bfs-4.0.7.tar.zst.do index 5e42d81..748f942 100644 --- a/build/distfiles/dl/bfs-4.0.7.tar.zst.do +++ b/build/distfiles/dl/bfs-4.0.7.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball bfs \ +../lib/git-to-tarball bfs \ https://github.com/tavianator/bfs.git \ 8d5472c2ec6312569c177ccce3adc05414d8bb40 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/brotli-1.2.0.tar.zst.do b/build/distfiles/dl/brotli-1.2.0.tar.zst.do index 068b26f..00d37ea 100644 --- a/build/distfiles/dl/brotli-1.2.0.tar.zst.do +++ b/build/distfiles/dl/brotli-1.2.0.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball brotli \ +../lib/git-to-tarball brotli \ https://github.com/google/brotli.git \ 028fb5a23661f123017c060daa546b55cf4bde29 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/cppcheck-2.18.0.tar.zst.do b/build/distfiles/dl/cppcheck-2.18.0.tar.zst.do index 39ea320..86754af 100644 --- a/build/distfiles/dl/cppcheck-2.18.0.tar.zst.do +++ b/build/distfiles/dl/cppcheck-2.18.0.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball cppcheck \ +../lib/git-to-tarball cppcheck \ https://github.com/danmar/cppcheck.git \ bd62c8ca7be207583c60002a5af50e5f1d12660b \ ${1%.tar.zst} diff --git a/build/distfiles/dl/dav1d-1.5.2.tar.zst.do b/build/distfiles/dl/dav1d-1.5.2.tar.zst.do index 11acad4..4472945 100644 --- a/build/distfiles/dl/dav1d-1.5.2.tar.zst.do +++ b/build/distfiles/dl/dav1d-1.5.2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball dav1d \ +../lib/git-to-tarball dav1d \ https://code.videolan.org/videolan/dav1d.git \ c720f4d3556a01916324aea155555d3efba842e8 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/dq-20240101.tar.zst.do b/build/distfiles/dl/dq-20240101.tar.zst.do index 2aafb8c..b05f297 100644 --- a/build/distfiles/dl/dq-20240101.tar.zst.do +++ b/build/distfiles/dl/dq-20240101.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball dq \ +../lib/git-to-tarball dq \ https://github.com/janmojzis/dq.git \ 5b585015f2772b8e258bbb6441b8bf5a4b2861af \ ${1%.tar.zst} diff --git a/build/distfiles/dl/ffmpeg-n8.1-dev-1980-gde3f99d74b.tar.zst.do b/build/distfiles/dl/ffmpeg-n8.1-dev-1980-gde3f99d74b.tar.zst.do index 47b3864..04ece43 100644 --- a/build/distfiles/dl/ffmpeg-n8.1-dev-1980-gde3f99d74b.tar.zst.do +++ b/build/distfiles/dl/ffmpeg-n8.1-dev-1980-gde3f99d74b.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball ffmpeg \ +../lib/git-to-tarball ffmpeg \ https://github.com/FFmpeg/FFmpeg.git \ de3f99d74b916ea8363f2c81ca343980844f6031 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/gcc-4-compile-with-gcc-5.patch.do b/build/distfiles/dl/gcc-4-compile-with-gcc-5.patch.do index f674e15..a0d6711 100644 --- a/build/distfiles/dl/gcc-4-compile-with-gcc-5.patch.do +++ b/build/distfiles/dl/gcc-4-compile-with-gcc-5.patch.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball guix \ +../lib/git-to-tarball guix \ https://git.savannah.gnu.org/git/guix.git \ 749a73cacad30fd9e149d9086c7e4e4a0b86834b \ v1.5.0 >/dev/null diff --git a/build/distfiles/dl/girara-0.4.5.tar.zst.do b/build/distfiles/dl/girara-0.4.5.tar.zst.do index e7de232..4795f68 100644 --- a/build/distfiles/dl/girara-0.4.5.tar.zst.do +++ b/build/distfiles/dl/girara-0.4.5.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball girara \ +../lib/git-to-tarball girara \ https://github.com/pwmt/girara.git \ 5be5b1f7afd3bd61666babdd04f4015b931c990c \ ${1%.tar.zst} diff --git a/build/distfiles/dl/iniparser-v4.2.2.tar.zst.do b/build/distfiles/dl/iniparser-v4.2.2.tar.zst.do index 8042900..a5227d8 100644 --- a/build/distfiles/dl/iniparser-v4.2.2.tar.zst.do +++ b/build/distfiles/dl/iniparser-v4.2.2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball iniparser \ +../lib/git-to-tarball iniparser \ https://gitlab.com/iniparser/iniparser.git \ 762715ca6cdba9dcf31a5af9297b444f3b5b8c00 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/jimtcl-0.81.tar.zst.do b/build/distfiles/dl/jimtcl-0.81.tar.zst.do index e48a5fc..b656fd3 100644 --- a/build/distfiles/dl/jimtcl-0.81.tar.zst.do +++ b/build/distfiles/dl/jimtcl-0.81.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball jimtcl \ +../lib/git-to-tarball jimtcl \ https://github.com/msteveb/jimtcl.git \ 2553e31de2a0ab6ca5ae1de9f3bff3858e37701a \ ${1%.tar.zst} diff --git a/build/distfiles/dl/jimtcl-0.83-94-g912c167.tar.zst.do b/build/distfiles/dl/jimtcl-0.83-94-g912c167.tar.zst.do index 385a341..c3c78bd 100644 --- a/build/distfiles/dl/jimtcl-0.83-94-g912c167.tar.zst.do +++ b/build/distfiles/dl/jimtcl-0.83-94-g912c167.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball jimtcl \ +../lib/git-to-tarball jimtcl \ https://github.com/msteveb/jimtcl.git \ 912c167ed6dc5c2cb30bd57e20f10954503438e2 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst.do b/build/distfiles/dl/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst.do index a71082b..a26cdf0 100644 --- a/build/distfiles/dl/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst.do +++ b/build/distfiles/dl/libargparse-81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libargparse \ +../lib/git-to-tarball libargparse \ https://github.com/maryla-uc/libargparse.git \ 81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libavif-v1.3.0-137-g3126181b.tar.zst.do b/build/distfiles/dl/libavif-v1.3.0-137-g3126181b.tar.zst.do index 46a1f99..0715848 100644 --- a/build/distfiles/dl/libavif-v1.3.0-137-g3126181b.tar.zst.do +++ b/build/distfiles/dl/libavif-v1.3.0-137-g3126181b.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libavif \ +../lib/git-to-tarball libavif \ https://github.com/AOMediaCodec/libavif.git \ 3126181bed01a79a5716d18869b00b7ed3024708 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libde265-v1.0.15-17-g01bb88b7.tar.zst.do b/build/distfiles/dl/libde265-v1.0.15-17-g01bb88b7.tar.zst.do index 50b92e7..c9466a2 100644 --- a/build/distfiles/dl/libde265-v1.0.15-17-g01bb88b7.tar.zst.do +++ b/build/distfiles/dl/libde265-v1.0.15-17-g01bb88b7.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libde265 \ +../lib/git-to-tarball libde265 \ https://github.com/strukturag/libde265.git \ 01bb88b7a518bedec28b9c9229ee7ee83d436832 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libheif-v1.19.5-49-g1630460f.tar.zst.do b/build/distfiles/dl/libheif-v1.19.5-49-g1630460f.tar.zst.do index 63d9aec..41aff88 100644 --- a/build/distfiles/dl/libheif-v1.19.5-49-g1630460f.tar.zst.do +++ b/build/distfiles/dl/libheif-v1.19.5-49-g1630460f.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libheif \ +../lib/git-to-tarball libheif \ https://github.com/strukturag/libheif.git \ 1630460fdb747f2d3c803e9ce38c22469eeadc83 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libinotify-kqueue-20211018.tar.zst.do b/build/distfiles/dl/libinotify-kqueue-20211018.tar.zst.do index 8979fe4..56667a5 100644 --- a/build/distfiles/dl/libinotify-kqueue-20211018.tar.zst.do +++ b/build/distfiles/dl/libinotify-kqueue-20211018.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libinotify-kqueue \ +../lib/git-to-tarball libinotify-kqueue \ https://github.com/libinotify-kqueue/libinotify-kqueue.git \ ea7835fcafc3cee2a0d6c0e3c8034962c48f6afe \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libjxl-v0.11.2.tar.zst.do b/build/distfiles/dl/libjxl-v0.11.2.tar.zst.do index 5c33068..5b1802d 100644 --- a/build/distfiles/dl/libjxl-v0.11.2.tar.zst.do +++ b/build/distfiles/dl/libjxl-v0.11.2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-with-submodules-to-tarball -../utils/git-with-submodules-to-tarball libjxl \ +../lib/git-with-submodules-to-tarball libjxl \ https://github.com/libjxl/libjxl.git \ 332feb17d17311c748445f7ee75c4fb55cc38530 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libopusenc-v0.3.tar.zst.do b/build/distfiles/dl/libopusenc-v0.3.tar.zst.do index 7bad8fc..5299dbd 100644 --- a/build/distfiles/dl/libopusenc-v0.3.tar.zst.do +++ b/build/distfiles/dl/libopusenc-v0.3.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libopusenc \ +../lib/git-to-tarball libopusenc \ https://github.com/xiph/libopusenc.git \ 0dba1bea736ab8bb811409dce80c994a00a2ced9 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/liboqs-0.15.0.tar.zst.do b/build/distfiles/dl/liboqs-0.15.0.tar.zst.do index e8ff50c..6674c2a 100644 --- a/build/distfiles/dl/liboqs-0.15.0.tar.zst.do +++ b/build/distfiles/dl/liboqs-0.15.0.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball liboqs \ +../lib/git-to-tarball liboqs \ https://github.com/open-quantum-safe/liboqs.git \ 97f6b86b1b6d109cfd43cf276ae39c2e776aed80 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libplacebo-v6.338.0-117-g5c1e6da2.tar.zst.do b/build/distfiles/dl/libplacebo-v6.338.0-117-g5c1e6da2.tar.zst.do index 080a7f4..7249568 100644 --- a/build/distfiles/dl/libplacebo-v6.338.0-117-g5c1e6da2.tar.zst.do +++ b/build/distfiles/dl/libplacebo-v6.338.0-117-g5c1e6da2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-with-submodules-to-tarball -../utils/git-with-submodules-to-tarball libplacebo \ +../lib/git-with-submodules-to-tarball libplacebo \ https://code.videolan.org/videolan/libplacebo.git \ 5c1e6da21f108a27b11fad97fd491ddee06ede3c \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libtap-0.1.0-44-gb53e4ef.tar.zst.do b/build/distfiles/dl/libtap-0.1.0-44-gb53e4ef.tar.zst.do index 6fa71c5..500ec0f 100644 --- a/build/distfiles/dl/libtap-0.1.0-44-gb53e4ef.tar.zst.do +++ b/build/distfiles/dl/libtap-0.1.0-44-gb53e4ef.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libtap \ +../lib/git-to-tarball libtap \ https://github.com/zorgnax/libtap.git \ b53e4ef5257f80e881762b6143834d8aae29da1a \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libtorrent-v2.0.10-41-g2ab8fedab.tar.zst.do b/build/distfiles/dl/libtorrent-v2.0.10-41-g2ab8fedab.tar.zst.do index 396390d..4997882 100644 --- a/build/distfiles/dl/libtorrent-v2.0.10-41-g2ab8fedab.tar.zst.do +++ b/build/distfiles/dl/libtorrent-v2.0.10-41-g2ab8fedab.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-with-submodules-to-tarball -../utils/git-with-submodules-to-tarball libtorrent \ +../lib/git-with-submodules-to-tarball libtorrent \ https://github.com/arvidn/libtorrent.git \ 2ab8fedabb7716947edc77958da6d0b5e1040df9 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libvpx-v1.14.1-303-gd6ae3ea465.tar.zst.do b/build/distfiles/dl/libvpx-v1.14.1-303-gd6ae3ea465.tar.zst.do index 7b38e92..9aa7bc2 100644 --- a/build/distfiles/dl/libvpx-v1.14.1-303-gd6ae3ea465.tar.zst.do +++ b/build/distfiles/dl/libvpx-v1.14.1-303-gd6ae3ea465.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libvpx \ +../lib/git-to-tarball libvpx \ https://chromium.googlesource.com/webm/libvpx \ d6ae3ea465d32ea16a4814513f43022b88c5bdfe \ ${1%.tar.zst} diff --git a/build/distfiles/dl/libyuv-2024-06-22.tar.zst.do b/build/distfiles/dl/libyuv-2024-06-22.tar.zst.do index e0e4c1e..1cc4fbc 100644 --- a/build/distfiles/dl/libyuv-2024-06-22.tar.zst.do +++ b/build/distfiles/dl/libyuv-2024-06-22.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball libyuv \ +../lib/git-to-tarball libyuv \ https://chromium.googlesource.com/libyuv/libyuv.git \ efd164d64ee4aab463e00f69e0de7f53ca91865d \ ${1%.tar.zst} diff --git a/build/distfiles/dl/lsyncd-2.3.1.tar.zst.do b/build/distfiles/dl/lsyncd-2.3.1.tar.zst.do index c32e3f3..fd5bac3 100644 --- a/build/distfiles/dl/lsyncd-2.3.1.tar.zst.do +++ b/build/distfiles/dl/lsyncd-2.3.1.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball lsyncd \ +../lib/git-to-tarball lsyncd \ https://github.com/lsyncd/lsyncd.git \ 6d59f16140468242fe157b4a5adf36d6a93cf6a4 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do b/build/distfiles/dl/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do index 08e9469..a3c96f0 100644 --- a/build/distfiles/dl/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do +++ b/build/distfiles/dl/mod_tile-v0.7.0-58-gc3453bc.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball mod_tile \ +../lib/git-to-tarball mod_tile \ https://github.com/openstreetmap/mod_tile.git \ c3453bc1e19247c145b0e87742710d5e076e338e \ ${1%.tar.zst} diff --git a/build/distfiles/dl/mpv-v0.40.0-445-g7815181b19.tar.zst.do b/build/distfiles/dl/mpv-v0.40.0-445-g7815181b19.tar.zst.do index a6c4de7..a461357 100644 --- a/build/distfiles/dl/mpv-v0.40.0-445-g7815181b19.tar.zst.do +++ b/build/distfiles/dl/mpv-v0.40.0-445-g7815181b19.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball mpv \ +../lib/git-to-tarball mpv \ https://github.com/mpv-player/mpv.git \ 7815181b19e29a887a7105330768b9078e99a42e \ ${1%.tar.zst} diff --git a/build/distfiles/dl/mupdf-1.27.2.tar.zst.do b/build/distfiles/dl/mupdf-1.27.2.tar.zst.do index 6a3a911..a0f14a0 100644 --- a/build/distfiles/dl/mupdf-1.27.2.tar.zst.do +++ b/build/distfiles/dl/mupdf-1.27.2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-with-submodules-to-tarball -../utils/git-with-submodules-to-tarball mupdf \ +../lib/git-with-submodules-to-tarball mupdf \ https://github.com/ArtifexSoftware/mupdf.git \ 73d3100d46d8a9ad634f6ef035bbe78f0f947886 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/nfdump-v1.7.6-62-g96ebd8f.tar.zst.do b/build/distfiles/dl/nfdump-v1.7.6-62-g96ebd8f.tar.zst.do index 8a93bb7..5c8419e 100644 --- a/build/distfiles/dl/nfdump-v1.7.6-62-g96ebd8f.tar.zst.do +++ b/build/distfiles/dl/nfdump-v1.7.6-62-g96ebd8f.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball nfdump \ +../lib/git-to-tarball nfdump \ https://github.com/phaag/nfdump.git \ 96ebd8f30862162a97978861634bd55eec30c5ba \ ${1%.tar.zst} diff --git a/build/distfiles/dl/ninja-v1.12.1.tar.zst.do b/build/distfiles/dl/ninja-v1.12.1.tar.zst.do index a2edbd7..cf7475c 100644 --- a/build/distfiles/dl/ninja-v1.12.1.tar.zst.do +++ b/build/distfiles/dl/ninja-v1.12.1.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball ninja \ +../lib/git-to-tarball ninja \ https://github.com/ninja-build/ninja.git \ 2daa09ba270b0a43e1929d29b073348aa985dfaa \ ${1%.tar.zst} diff --git a/build/distfiles/dl/nsxiv-v32-11-g420a0a2.tar.zst.do b/build/distfiles/dl/nsxiv-v32-11-g420a0a2.tar.zst.do index 9536676..94fb289 100644 --- a/build/distfiles/dl/nsxiv-v32-11-g420a0a2.tar.zst.do +++ b/build/distfiles/dl/nsxiv-v32-11-g420a0a2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball nsxiv \ +../lib/git-to-tarball nsxiv \ https://github.com/nsxiv/nsxiv.git \ 420a0a245591ea73f86ebfb90de207a8e67e6cca \ ${1%.tar.zst} diff --git a/build/distfiles/dl/oneTBB-v2022.0.0.tar.zst.do b/build/distfiles/dl/oneTBB-v2022.0.0.tar.zst.do index e5d33cb..3ab9eb3 100644 --- a/build/distfiles/dl/oneTBB-v2022.0.0.tar.zst.do +++ b/build/distfiles/dl/oneTBB-v2022.0.0.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball oneTBB \ +../lib/git-to-tarball oneTBB \ https://github.com/uxlfoundation/oneTBB.git \ 0c0ff192a2304e114bc9e6557582dfba101360ff \ ${1%.tar.zst} diff --git a/build/distfiles/dl/oniguruma-v6.9.9.tar.zst.do b/build/distfiles/dl/oniguruma-v6.9.9.tar.zst.do index 94ba9bd..8cd6e43 100644 --- a/build/distfiles/dl/oniguruma-v6.9.9.tar.zst.do +++ b/build/distfiles/dl/oniguruma-v6.9.9.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball oniguruma \ +../lib/git-to-tarball oniguruma \ https://github.com/kkos/oniguruma.git \ e62a8e5ec123bb91651d297e6f72c84d53e3cff8 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/openjpeg-2.5.2.tar.zst.do b/build/distfiles/dl/openjpeg-2.5.2.tar.zst.do index e369399..cb39f59 100644 --- a/build/distfiles/dl/openjpeg-2.5.2.tar.zst.do +++ b/build/distfiles/dl/openjpeg-2.5.2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball openjpeg \ +../lib/git-to-tarball openjpeg \ https://github.com/uclouvain/openjpeg.git \ 39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae \ ${1%.tar.zst} diff --git a/build/distfiles/dl/opustags-1.10.1.tar.zst.do b/build/distfiles/dl/opustags-1.10.1.tar.zst.do index 589cbe0..a77212a 100644 --- a/build/distfiles/dl/opustags-1.10.1.tar.zst.do +++ b/build/distfiles/dl/opustags-1.10.1.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball opustags \ +../lib/git-to-tarball opustags \ https://github.com/fmang/opustags.git \ d9b051210ba756d28086c9b75e983e84ae11e730 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/sdcv-0.5.5.tar.zst.do b/build/distfiles/dl/sdcv-0.5.5.tar.zst.do index 77e3b81..4b5e775 100644 --- a/build/distfiles/dl/sdcv-0.5.5.tar.zst.do +++ b/build/distfiles/dl/sdcv-0.5.5.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball sdcv \ +../lib/git-to-tarball sdcv \ https://github.com/Dushistov/sdcv.git \ 49c8094b53b7dd90efeabeaf276752a650a0f931 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/shared-mime-info-2.2.tar.zst.do b/build/distfiles/dl/shared-mime-info-2.2.tar.zst.do index 8a77eda..65e5ad7 100644 --- a/build/distfiles/dl/shared-mime-info-2.2.tar.zst.do +++ b/build/distfiles/dl/shared-mime-info-2.2.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball shared-mime-info \ +../lib/git-to-tarball shared-mime-info \ https://gitlab.freedesktop.org/xdg/shared-mime-info.git \ 13695c7225c2f525a435e72739c33ac32bbfbbb9 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/sharness-1.2.0.tar.zst.do b/build/distfiles/dl/sharness-1.2.0.tar.zst.do index 120a9dc..4bc6fe0 100644 --- a/build/distfiles/dl/sharness-1.2.0.tar.zst.do +++ b/build/distfiles/dl/sharness-1.2.0.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball sharness \ +../lib/git-to-tarball sharness \ https://github.com/felipec/sharness.git \ e457513ae8d4912994f2ea5423a9392ee6d03f4b \ ${1%.tar.zst} diff --git a/build/distfiles/dl/svt-av1-v4.0.1.tar.zst.do b/build/distfiles/dl/svt-av1-v4.0.1.tar.zst.do index b0bee78..f1139ff 100644 --- a/build/distfiles/dl/svt-av1-v4.0.1.tar.zst.do +++ b/build/distfiles/dl/svt-av1-v4.0.1.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball svt-av1 \ +../lib/git-to-tarball svt-av1 \ https://gitlab.com/AOMediaCodec/SVT-AV1.git \ 4ae9272b588a05ee6e77a43e8dfdac05f54c4ff0 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/sxhkd-0.6.2-5-gb0923b6.tar.zst.do b/build/distfiles/dl/sxhkd-0.6.2-5-gb0923b6.tar.zst.do index 6d53700..a3712f5 100644 --- a/build/distfiles/dl/sxhkd-0.6.2-5-gb0923b6.tar.zst.do +++ b/build/distfiles/dl/sxhkd-0.6.2-5-gb0923b6.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball sxhkd \ +../lib/git-to-tarball sxhkd \ https://github.com/baskerville/sxhkd.git \ b0923b6b3d5d85b1ff80a5bb286934b8721a7c08 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/tigervnc-1.13.90.tar.zst.do b/build/distfiles/dl/tigervnc-1.13.90.tar.zst.do index 1c4410b..65b3523 100644 --- a/build/distfiles/dl/tigervnc-1.13.90.tar.zst.do +++ b/build/distfiles/dl/tigervnc-1.13.90.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball tigervnc \ +../lib/git-to-tarball tigervnc \ https://github.com/TigerVNC/tigervnc.git \ baf05ef240d3b5d3c103da9557cd9e6972cbe602 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/vim-v9.2.0140.tar.zst.do b/build/distfiles/dl/vim-v9.2.0140.tar.zst.do index 23dc386..4339e0c 100644 --- a/build/distfiles/dl/vim-v9.2.0140.tar.zst.do +++ b/build/distfiles/dl/vim-v9.2.0140.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball vim \ +../lib/git-to-tarball vim \ https://github.com/vim/vim.git \ ed6e853f8e49e81805d6a87f21a85762d6b49ea6 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/voxtral.c-20260208.tar.zst.do b/build/distfiles/dl/voxtral.c-20260208.tar.zst.do index 3512a9a..e57e706 100644 --- a/build/distfiles/dl/voxtral.c-20260208.tar.zst.do +++ b/build/distfiles/dl/voxtral.c-20260208.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball voxtral.c \ +../lib/git-to-tarball voxtral.c \ https://github.com/antirez/voxtral.c.git \ c9e8773a2042d67c637fc492c8a655c485354080 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/whisper.cpp-1.8.3.tar.zst.do b/build/distfiles/dl/whisper.cpp-1.8.3.tar.zst.do index de853f1..d6125a6 100644 --- a/build/distfiles/dl/whisper.cpp-1.8.3.tar.zst.do +++ b/build/distfiles/dl/whisper.cpp-1.8.3.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball whisper.cpp \ +../lib/git-to-tarball whisper.cpp \ https://github.com/ggerganov/whisper.cpp \ 2eeeba56e9edd762b4b38467bab96c2517163158 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/x264-2024-05-12.tar.zst.do b/build/distfiles/dl/x264-2024-05-12.tar.zst.do index f249901..92c84da 100644 --- a/build/distfiles/dl/x264-2024-05-12.tar.zst.do +++ b/build/distfiles/dl/x264-2024-05-12.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball x264 \ +../lib/git-to-tarball x264 \ https://code.videolan.org/videolan/x264.git \ 4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/xxHash-v0.8.3.tar.zst.do b/build/distfiles/dl/xxHash-v0.8.3.tar.zst.do index b5485dd..105774d 100644 --- a/build/distfiles/dl/xxHash-v0.8.3.tar.zst.do +++ b/build/distfiles/dl/xxHash-v0.8.3.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-to-tarball -../utils/git-to-tarball xxHash \ +../lib/git-to-tarball xxHash \ https://github.com/Cyan4973/xxHash.git \ e626a72bc2321cd320e953a0ccf1584cad60f363 \ ${1%.tar.zst} diff --git a/build/distfiles/dl/zimg-3.0.5-207-g0e56801.tar.zst.do b/build/distfiles/dl/zimg-3.0.5-207-g0e56801.tar.zst.do index 7664589..f150305 100644 --- a/build/distfiles/dl/zimg-3.0.5-207-g0e56801.tar.zst.do +++ b/build/distfiles/dl/zimg-3.0.5-207-g0e56801.tar.zst.do @@ -1,5 +1,4 @@ -redo-ifchange ../utils/git-with-submodules-to-tarball -../utils/git-with-submodules-to-tarball zimg \ +../lib/git-with-submodules-to-tarball zimg \ https://github.com/sekrit-twc/zimg.git \ 0e56801f98db3e363c974fca794fa06022d40ee4 \ ${1%.tar.zst} diff --git a/build/distfiles/utils/git-to-tarball b/build/distfiles/lib/git-to-tarball similarity index 87% rename from build/distfiles/utils/git-to-tarball rename to build/distfiles/lib/git-to-tarball index a008a5c..91e859c 100755 --- a/build/distfiles/utils/git-to-tarball +++ b/build/distfiles/lib/git-to-tarball @@ -1,4 +1,5 @@ #!/bin/sh -e +# Make compressed tarball with sources taken from Git repository [ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. sname=$0 . "$BASS_ROOT"/lib/rc diff --git a/build/distfiles/utils/git-with-submodules-to-tarball b/build/distfiles/lib/git-with-submodules-to-tarball similarity index 87% rename from build/distfiles/utils/git-with-submodules-to-tarball rename to build/distfiles/lib/git-with-submodules-to-tarball index 2b1a236..865472b 100755 --- a/build/distfiles/utils/git-with-submodules-to-tarball +++ b/build/distfiles/lib/git-with-submodules-to-tarball @@ -1,4 +1,5 @@ #!/bin/sh -e +# Make compressed tarball with sources taken from Git repository and its submodules [ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../.. sname=$0 . "$BASS_ROOT"/lib/rc diff --git a/build/distfiles/utils/urls-for-cpan b/build/distfiles/lib/urls-for-cpan similarity index 100% rename from build/distfiles/utils/urls-for-cpan rename to build/distfiles/lib/urls-for-cpan diff --git a/build/distfiles/utils/urls-for-distcache-FreeBSD b/build/distfiles/lib/urls-for-distcache-FreeBSD similarity index 100% rename from build/distfiles/utils/urls-for-distcache-FreeBSD rename to build/distfiles/lib/urls-for-distcache-FreeBSD diff --git a/build/distfiles/utils/urls-for-distcache-NetBSD b/build/distfiles/lib/urls-for-distcache-NetBSD similarity index 100% rename from build/distfiles/utils/urls-for-distcache-NetBSD rename to build/distfiles/lib/urls-for-distcache-NetBSD diff --git a/build/distfiles/utils/urls-for-gcrypt b/build/distfiles/lib/urls-for-gcrypt similarity index 100% rename from build/distfiles/utils/urls-for-gcrypt rename to build/distfiles/lib/urls-for-gcrypt diff --git a/build/distfiles/utils/urls-for-gnu b/build/distfiles/lib/urls-for-gnu similarity index 100% rename from build/distfiles/utils/urls-for-gnu rename to build/distfiles/lib/urls-for-gnu diff --git a/build/distfiles/utils/urls-for-leaseweb b/build/distfiles/lib/urls-for-leaseweb similarity index 100% rename from build/distfiles/utils/urls-for-leaseweb rename to build/distfiles/lib/urls-for-leaseweb diff --git a/build/distfiles/utils/urls-for-planetunix b/build/distfiles/lib/urls-for-planetunix similarity index 100% rename from build/distfiles/utils/urls-for-planetunix rename to build/distfiles/lib/urls-for-planetunix diff --git a/build/distfiles/utils/urls-for-savannah b/build/distfiles/lib/urls-for-savannah similarity index 100% rename from build/distfiles/utils/urls-for-savannah rename to build/distfiles/lib/urls-for-savannah diff --git a/build/distfiles/utils/urls-for-sourceforge b/build/distfiles/lib/urls-for-sourceforge similarity index 100% rename from build/distfiles/utils/urls-for-sourceforge rename to build/distfiles/lib/urls-for-sourceforge diff --git a/build/distfiles/utils/urls-sort b/build/distfiles/lib/urls-sort similarity index 100% rename from build/distfiles/utils/urls-sort rename to build/distfiles/lib/urls-sort diff --git a/build/distfiles/meta/Image-ExifTool-13.44.tar.gz/urls.do b/build/distfiles/meta/Image-ExifTool-13.44.tar.gz/urls.do index 43345ab..e411586 100644 --- a/build/distfiles/meta/Image-ExifTool-13.44.tar.gz/urls.do +++ b/build/distfiles/meta/Image-ExifTool-13.44.tar.gz/urls.do @@ -1,4 +1,4 @@ fn=$(basename $(pwd)) -redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD -../../utils/urls-for-sourceforge exiftool $fn -../../utils/urls-for-distcache-FreeBSD $fn +redo-ifchange ../../lib/urls-for-sourceforge ../../lib/urls-for-distcache-FreeBSD +../../lib/urls-for-sourceforge exiftool $fn +../../lib/urls-for-distcache-FreeBSD $fn diff --git a/build/distfiles/meta/ImageMagick-7.1.2-15.tar.xz/urls.do b/build/distfiles/meta/ImageMagick-7.1.2-15.tar.xz/urls.do index 3e0d8e1..c562d74 100644 --- a/build/distfiles/meta/ImageMagick-7.1.2-15.tar.xz/urls.do +++ b/build/distfiles/meta/ImageMagick-7.1.2-15.tar.xz/urls.do @@ -14,5 +14,5 @@ cat < https://datatracker.ietf.org/doc/html/rfc5854 Metalink4 -$DISTFILES/utils/meta4-to-metadir uses meta4ra utilities +$DISTFILES/bin/meta4-to-metadir uses meta4ra utilities to convert .meta4 file to "metadir". -$DISTFILES/utils/metadir-to-meta4 generates .meta4 back. +$DISTFILES/bin/metadir-to-meta4 generates .meta4 back. * $DISTFILE_FETCHER=meta4ra => http://www.meta4ra.stargrave.org/ Use meta4ra-dl for downloading. URLs are sorted with FETCHER_URLS_SORT function, which is by default: FETCHER_URLS_SORT() { - $DISTFILES/utils/urls-sort "" rand + $DISTFILES/lib/urls-sort "" rand } This is by default, because meta4ra utilities are installed by default. diff --git a/lib/rc b/lib/rc index 15dec86..dc3ad6b 100644 --- a/lib/rc +++ b/lib/rc @@ -48,7 +48,7 @@ export SKELPKGS=${SKELPKGS:-"$BASS_ROOT"/build/pkg} export DISTFILE_FETCHER="${DISTFILE_FETCHER:-meta4ra}" if ! type FETCHER_URLS_SORT 2>/dev/null >/dev/null ; then FETCHER_URLS_SORT() { - $DISTFILES/utils/urls-sort "" rand + $DISTFILES/lib/urls-sort "" rand } fi