From: Sergey Matveev Date: Mon, 9 Mar 2026 13:33:02 +0000 (+0300) Subject: Do not mix utilities with other files X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=7ba32064fd509a9422b9eb118734335c2a5fb05ee538b3abcb56acd2b44b09ae;p=bass.git Do not mix utilities with other files --- diff --git a/build/distfiles/dl/default.rc b/build/distfiles/dl/default.rc index 6910d68..fc63daa 100644 --- a/build/distfiles/dl/default.rc +++ b/build/distfiles/dl/default.rc @@ -43,7 +43,7 @@ fn=$(basename $dst) get-meta4() { ( cd "$DISTFILES"/meta - utils/metadir-to-meta4 $dst + ../utils/metadir-to-meta4 $dst ) } 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 f223e09..a5b11d0 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,3 +1,3 @@ -redo-ifchange ../utils/urls-for-sourceforge ../utils/urls-for-distcache-FreeBSD -../utils/urls-for-sourceforge exiftool Image-ExifTool-13.44.tar.gz -../utils/urls-for-distcache-FreeBSD Image-ExifTool-13.44.tar.gz +redo-ifchange ../../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD +../../../utils/urls-for-sourceforge exiftool Image-ExifTool-13.44.tar.gz +../../../utils/urls-for-distcache-FreeBSD Image-ExifTool-13.44.tar.gz diff --git a/build/distfiles/meta/MIME-Base32-1.303.tar.gz/urls.do b/build/distfiles/meta/MIME-Base32-1.303.tar.gz/urls.do index 71a7530..d3c5f82 100644 --- a/build/distfiles/meta/MIME-Base32-1.303.tar.gz/urls.do +++ b/build/distfiles/meta/MIME-Base32-1.303.tar.gz/urls.do @@ -1,3 +1,3 @@ -redo-ifchange ../utils/urls-for-cpan ../utils/urls-for-distcache-FreeBSD -../utils/urls-for-cpan modules/by-module/MIME/MIME-Base32-1.303.tar.gz -../utils/urls-for-distcache-FreeBSD MIME-Base32-1.303.tar.gz +redo-ifchange ../../utils/urls-for-cpan ../../utils/urls-for-distcache-FreeBSD +../../utils/urls-for-cpan modules/by-module/MIME/MIME-Base32-1.303.tar.gz +../../utils/urls-for-distcache-FreeBSD MIME-Base32-1.303.tar.gz diff --git a/build/distfiles/meta/Python-3.10.14.tar.xz/urls.do b/build/distfiles/meta/Python-3.10.14.tar.xz/urls.do index 0af8abe..21c97fe 100644 --- a/build/distfiles/meta/Python-3.10.14.tar.xz/urls.do +++ b/build/distfiles/meta/Python-3.10.14.tar.xz/urls.do @@ -1,3 +1,3 @@ echo "1|xf|https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tar.xz" -redo-ifchange ../utils/urls-for-distcache-FreeBSD -../utils/urls-for-distcache-FreeBSD python/Python-3.10.14.tar.xz +redo-ifchange ../../utils/urls-for-distcache-FreeBSD +../../utils/urls-for-distcache-FreeBSD python/Python-3.10.14.tar.xz diff --git a/build/distfiles/meta/Python-3.7.3.tar.xz/urls.do b/build/distfiles/meta/Python-3.7.3.tar.xz/urls.do index f98c9db..a597e78 100644 --- a/build/distfiles/meta/Python-3.7.3.tar.xz/urls.do +++ b/build/distfiles/meta/Python-3.7.3.tar.xz/urls.do @@ -1,3 +1,3 @@ echo "1|xf|https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz" -redo-ifchange ../utils/urls-for-distcache-FreeBSD -../utils/urls-for-distcache-FreeBSD python/Python-3.7.3.tar.xz +redo-ifchange ../../utils/urls-for-distcache-FreeBSD +../../utils/urls-for-distcache-FreeBSD python/Python-3.7.3.tar.xz diff --git a/build/distfiles/meta/R-4.5.2.tar.gz/urls.do b/build/distfiles/meta/R-4.5.2.tar.gz/urls.do index 015f0f7..fe1e87c 100644 --- a/build/distfiles/meta/R-4.5.2.tar.gz/urls.do +++ b/build/distfiles/meta/R-4.5.2.tar.gz/urls.do @@ -135,5 +135,5 @@ cat < https://datatracker.ietf.org/doc/html/rfc5854 Metalink4 -$DISTFILES/meta/utils/meta4-to-metadir uses meta4ra utilities +$DISTFILES/utils/meta4-to-metadir uses meta4ra utilities to convert .meta4 file to "metadir". -$DISTFILES/meta/utils/metadir-to-meta4 generates .meta4 back. +$DISTFILES/utils/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/meta/utils/urls-sort "" rand + $DISTFILES/utils/urls-sort "" rand } This is by default, because meta4ra utilities are installed by default. diff --git a/doc/Build/Distfiles/Tutorial b/doc/Build/Distfiles/Tutorial index 67378b1..7a7d5be 100644 --- a/doc/Build/Distfiles/Tutorial +++ b/doc/Build/Distfiles/Tutorial @@ -49,8 +49,8 @@ Fortunately there is one for GNU ecosystem. You should automatically generate your urls file instead then. $ cat >$DISTFILES/meta/$tarball/urls.do </dev/null >/dev/null ; then FETCHER_URLS_SORT() { - $DISTFILES/meta/utils/urls-sort "" rand + $DISTFILES/utils/urls-sort "" rand } fi