From 7ba32064fd509a9422b9eb118734335c2a5fb05ee538b3abcb56acd2b44b09ae Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Mon, 9 Mar 2026 16:33:02 +0300 Subject: [PATCH] Do not mix utilities with other files --- build/distfiles/dl/default.rc | 2 +- build/distfiles/meta/Image-ExifTool-13.44.tar.gz/urls.do | 6 +++--- build/distfiles/meta/MIME-Base32-1.303.tar.gz/urls.do | 6 +++--- build/distfiles/meta/Python-3.10.14.tar.xz/urls.do | 4 ++-- build/distfiles/meta/Python-3.7.3.tar.xz/urls.do | 4 ++-- build/distfiles/meta/R-4.5.2.tar.gz/urls.do | 4 ++-- build/distfiles/meta/RHash-1.4.4.tar.gz/urls.do | 6 +++--- build/distfiles/meta/advancecomp-2.6.tar.gz/urls.do | 4 ++-- build/distfiles/meta/aria2-1.37.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/asciidoc-10.2.1.tar.gz/urls.do | 4 ++-- build/distfiles/meta/at-spi2-atk-2.38.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/at-spi2-core-2.52.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/atk-2.38.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/autoconf-2.72.tar.xz/urls.do | 6 +++--- build/distfiles/meta/automake-1.16.5.tar.xz/urls.do | 6 +++--- build/distfiles/meta/bash-5.2.21.tar.gz/urls.do | 4 ++-- build/distfiles/meta/bird-2.15.1.tar.gz/urls.do | 4 ++-- build/distfiles/meta/boost_1_74_0.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/boost_1_86_0.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/c-ares-1.30.0.tar.gz/urls.do | 4 ++-- build/distfiles/meta/cairo-1.16.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/cmake-3.28.3.tar.gz/urls.do | 4 ++-- build/distfiles/meta/cyrus-sasl-2.1.28.tar.gz/urls.do | 4 ++-- .../distfiles/meta/daemontools-encore-1.11.tar.gz/urls.do | 4 ++-- .../dic/stardict-English_German-2.4.2.tar.bz2/urls.do | 4 ++-- .../dic/stardict-german-english-2.4.2.tar.bz2/urls.do | 4 ++-- .../data/dic/stardict-german_rus2-2.4.2.tar.bz2/urls.do | 4 ++-- .../meta/data/dic/stardict-rus_ger-2.4.2.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/djvulibre-3.5.28.tar.gz/urls.do | 8 ++++---- build/distfiles/meta/docbook-xml-4.5.zip/urls.do | 4 ++-- build/distfiles/meta/docbook-xsl-1.79.1.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/expat-2.6.2.tar.xz/urls.do | 4 ++-- build/distfiles/meta/flac-1.5.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/fltk-1.3.9.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/fossil-2.23.tar.gz/urls.do | 4 ++-- build/distfiles/meta/freeciv-3.0.10.tar.xz/urls.do | 4 ++-- build/distfiles/meta/freetype-2.14.2.tar.xz/urls.do | 6 +++--- build/distfiles/meta/gcc-4.7.4.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/gcc-8.5.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/gdk-pixbuf-2.42.12.tar.xz/urls.do | 4 ++-- build/distfiles/meta/geos-3.12.1.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/getopt-1.1.6.tar.gz/urls.do | 4 ++-- build/distfiles/meta/git-2.53.0.tar.xz/urls.do | 4 ++-- .../distfiles/meta/glib-networking-2.80.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/gm4-1.4.19.tar.xz/urls.do | 6 +++--- build/distfiles/meta/gmake-4.4.1.tar.gz/urls.do | 4 ++-- build/distfiles/meta/gmime-3.2.7.tar.xz/urls.do | 4 ++-- build/distfiles/meta/gmp-4.3.2.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/gmp-6.3.0.tar.zst/urls.do | 4 ++-- build/distfiles/meta/gnupg-2.5.17.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/gnutls-3.8.12.tar.xz/urls.do | 4 ++-- build/distfiles/meta/go1.17.12.tar.gz/urls.do | 4 ++-- build/distfiles/meta/go1.20.14.tar.gz/urls.do | 4 ++-- build/distfiles/meta/go1.23.5.tar.gz/urls.do | 4 ++-- build/distfiles/meta/go1.25.6.tar.gz/urls.do | 4 ++-- build/distfiles/meta/go1.26.1.tar.gz/urls.do | 4 ++-- build/distfiles/meta/go1.4.3.tar.gz/urls.do | 4 ++-- build/distfiles/meta/gpgme-1.23.2.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/grep-3.11.tar.xz/urls.do | 6 +++--- build/distfiles/meta/gtk+-3.24.42.tar.xz/urls.do | 4 ++-- build/distfiles/meta/gv-3.7.4.tar.gz/urls.do | 6 +++--- build/distfiles/meta/httpd-2.4.59.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/imlib2-1.12.2.tar.xz/urls.do | 6 +++--- build/distfiles/meta/irssi-1.4.5.tar.xz/urls.do | 4 ++-- build/distfiles/meta/json-glib-1.10.6.tar.xz/urls.do | 4 ++-- build/distfiles/meta/lame-3.100.tar.gz/urls.do | 6 +++--- build/distfiles/meta/lcms2-2.16.tar.gz/urls.do | 4 ++-- build/distfiles/meta/less-692.tar.gz/urls.do | 4 ++-- build/distfiles/meta/lftp-4.9.3.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libao-1.2.0.tar.gz/urls.do | 4 ++-- build/distfiles/meta/libass-0.17.2.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libassuan-3.0.2.tar.bz2/urls.do | 8 ++++---- build/distfiles/meta/libebml-1.4.5.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libedit-20230828-3.1.tar.gz/urls.do | 4 ++-- build/distfiles/meta/libevent-2.1.12.tar.gz/urls.do | 4 ++-- build/distfiles/meta/libgcrypt-1.12.0.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/libgpg-error-1.58.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/libiconv-1.17.tar.gz/urls.do | 6 +++--- build/distfiles/meta/libidn2-2.3.7.tar.gz/urls.do | 6 +++--- build/distfiles/meta/libjpeg-turbo-1.5.2.tar.gz/urls.do | 6 +++--- build/distfiles/meta/libjpeg-turbo-3.0.3.tar.gz/urls.do | 4 ++-- build/distfiles/meta/libksba-1.6.7.tar.bz2/urls.do | 8 ++++---- build/distfiles/meta/libmad-0.16.3.tar.gz/urls.do | 4 ++-- build/distfiles/meta/libmatroska-1.7.1.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libogg-1.3.6.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libotr-4.1.1.tar.gz/urls.do | 4 ++-- build/distfiles/meta/libowfat-0.34.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libpng-1.6.55.tar.xz/urls.do | 6 +++--- build/distfiles/meta/libproxy-0.4.18.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libpsl-0.21.5.tar.lz/urls.do | 4 ++-- build/distfiles/meta/librsvg-2.40.21.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libsndfile-1.0.31.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/libsoup-2.74.3.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libtasn1-4.19.0.tar.gz/urls.do | 6 +++--- build/distfiles/meta/libtool-2.4.7.tar.xz/urls.do | 6 +++--- build/distfiles/meta/libvorbis-1.3.7.tar.xz/urls.do | 4 ++-- build/distfiles/meta/libwebp-1.4.0.tar.gz/urls.do | 4 ++-- build/distfiles/meta/libxml2-2.9.14.tar.xz/urls.do | 4 ++-- build/distfiles/meta/links-2.29.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/lua-5.2.4.tar.gz/urls.do | 4 ++-- build/distfiles/meta/lua-5.4.6.tar.gz/urls.do | 4 ++-- build/distfiles/meta/lzip-1.24.tar.gz/urls.do | 6 +++--- build/distfiles/meta/meson-0.56.0.tar.gz/urls.do | 4 ++-- build/distfiles/meta/mpc-0.8.2.tar.gz/urls.do | 4 ++-- build/distfiles/meta/mpc-1.3.1.tar.gz/urls.do | 6 +++--- build/distfiles/meta/mpfr-2.4.2.tar.xz/urls.do | 4 ++-- build/distfiles/meta/mpfr-4.2.1.tar.xz/urls.do | 4 ++-- build/distfiles/meta/nasm-2.16.01.tar.xz/urls.do | 4 ++-- build/distfiles/meta/ncurses-6.4.tar.gz/urls.do | 4 ++-- build/distfiles/meta/nettle-3.10.1.tar.gz/urls.do | 6 +++--- build/distfiles/meta/nghttp2-1.62.1.tar.xz/urls.do | 4 ++-- build/distfiles/meta/normalize-0.7.7.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/npth-1.7.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/nsd-4.13.0.tar.gz/urls.do | 4 ++-- build/distfiles/meta/openjpeg-2.5.2.tar.gz/urls.do | 4 ++-- build/distfiles/meta/openssl-1.1.1w.tar.gz/urls.do | 4 ++-- build/distfiles/meta/opus-1.6.tar.gz/urls.do | 4 ++-- build/distfiles/meta/opus-tools-0.2.tar.gz/urls.do | 4 ++-- build/distfiles/meta/opusfile-0.12.tar.gz/urls.do | 4 ++-- build/distfiles/meta/parallel-20240122.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/pcre-8.45.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/perl-5.32.1.tar.xz/urls.do | 6 +++--- build/distfiles/meta/pinentry-1.3.0.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/pkgconf-2.1.1.tar.xz/urls.do | 4 ++-- build/distfiles/meta/pngcrush-1.8.13.tar.xz/urls.do | 4 ++-- build/distfiles/meta/postgresql-11.22.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/postgresql-16.3.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/proj-4.9.3.tar.gz/urls.do | 4 ++-- build/distfiles/meta/qpdf-11.9.1.tar.gz/urls.do | 6 +++--- build/distfiles/meta/readline-8.2.tar.gz/urls.do | 6 +++--- build/distfiles/meta/recutils-1.9.tar.gz/urls.do | 6 +++--- build/distfiles/meta/remind-05.00.01.tar.gz/urls.do | 4 ++-- build/distfiles/meta/rsync-3.4.1.tar.gz/urls.do | 4 ++-- build/distfiles/meta/scummvm-2026.1.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/smartmontools-7.5.tar.gz/urls.do | 4 ++-- build/distfiles/meta/sox-14.4.2.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/sqlite-src-3450100.zip/urls.do | 4 ++-- build/distfiles/meta/stow-2.3.1.tar.bz2/urls.do | 6 +++--- build/distfiles/meta/tcl8.6.14.tar.gz/urls.do | 6 +++--- build/distfiles/meta/tcllib-1.21.tar.xz/urls.do | 4 ++-- build/distfiles/meta/texinfo-7.1.1.tar.xz/urls.do | 4 ++-- build/distfiles/meta/tiff-4.6.0.tar.xz/urls.do | 4 ++-- build/distfiles/meta/tk8.6.14.tar.gz/urls.do | 6 +++--- build/distfiles/meta/tmux-3.6.tar.gz/urls.do | 4 ++-- build/distfiles/meta/ucspi-tcp-0.88.tar.gz/urls.do | 4 ++-- build/distfiles/meta/unbound-1.24.2.tar.gz/urls.do | 4 ++-- build/distfiles/meta/valgrind-3.26.0.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/vnstat-2.13.tar.gz/urls.do | 4 ++-- build/distfiles/meta/vorbis-tools-1.4.3.tar.gz/urls.do | 4 ++-- build/distfiles/meta/wavpack-5.8.1.tar.xz/urls.do | 4 ++-- build/distfiles/meta/webkitgtk-2.34.6.tar.xz/urls.do | 4 ++-- build/distfiles/meta/wget-1.25.0.tar.lz/urls.do | 4 ++-- build/distfiles/meta/xapian-core-1.4.30.tar.xz/urls.do | 4 ++-- build/distfiles/meta/xmlto-0.0.26.tar.bz2/urls.do | 4 ++-- build/distfiles/meta/xxhash-v0.8.3.tar.gz/urls.do | 4 ++-- build/distfiles/meta/zathura-0.5.11.tar.xz/urls.do | 4 ++-- build/distfiles/meta/zathura-cb-0.1.11.tar.xz/urls.do | 4 ++-- build/distfiles/meta/zathura-djvu-0.2.10.tar.xz/urls.do | 4 ++-- .../distfiles/meta/zathura-pdf-mupdf-0.4.4.tar.xz/urls.do | 4 ++-- build/distfiles/meta/zsh-5.9.tar.xz/urls.do | 6 +++--- build/distfiles/{ => utils}/dl-urls | 0 build/distfiles/{meta => }/utils/meta4-to-metadir | 0 build/distfiles/{meta => }/utils/metadir-from-file | 0 build/distfiles/{meta => }/utils/metadir-to-meta4 | 0 build/distfiles/{meta => }/utils/urls-for-cpan | 0 .../distfiles/{meta => }/utils/urls-for-distcache-FreeBSD | 0 build/distfiles/{meta => }/utils/urls-for-gcrypt | 0 build/distfiles/{meta => }/utils/urls-for-gnu | 0 build/distfiles/{meta => }/utils/urls-for-savannah | 0 build/distfiles/{meta => }/utils/urls-for-sourceforge | 0 build/distfiles/{meta => }/utils/urls-sort | 0 doc/Build/Distfiles/Fetchers | 6 +++--- doc/Build/Distfiles/Tutorial | 4 ++-- lib/rc | 2 +- 174 files changed, 371 insertions(+), 371 deletions(-) rename build/distfiles/{ => utils}/dl-urls (100%) rename build/distfiles/{meta => }/utils/meta4-to-metadir (100%) rename build/distfiles/{meta => }/utils/metadir-from-file (100%) rename build/distfiles/{meta => }/utils/metadir-to-meta4 (100%) rename build/distfiles/{meta => }/utils/urls-for-cpan (100%) rename build/distfiles/{meta => }/utils/urls-for-distcache-FreeBSD (100%) rename build/distfiles/{meta => }/utils/urls-for-gcrypt (100%) rename build/distfiles/{meta => }/utils/urls-for-gnu (100%) rename build/distfiles/{meta => }/utils/urls-for-savannah (100%) rename build/distfiles/{meta => }/utils/urls-for-sourceforge (100%) rename build/distfiles/{meta => }/utils/urls-sort (100%) 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 -- 2.52.0