From 65641accfd7fa8a82e5343e793c7d75fc5252f1094df50f27abcd2ca3d7becf9 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Wed, 11 Mar 2026 17:02:54 +0300
Subject: [PATCH] NetBSD distfiles

And various other small fixes and additions.
---
 .../meta/Image-ExifTool-13.44.tar.gz/urls.do  |  7 ++-
 .../meta/ImageMagick-7.1.2-15.tar.xz/urls.do  |  4 +-
 .../meta/MIME-Base32-1.303.tar.gz/urls.do     | 11 +++-
 .../meta/Python-3.10.14.tar.xz/urls.do        |  5 +-
 .../meta/Python-3.7.3.tar.xz/urls.do          |  5 +-
 build/distfiles/meta/R-4.5.2.tar.gz/urls.do   |  5 +-
 .../distfiles/meta/RHash-1.4.4.tar.gz/urls.do |  5 +-
 .../meta/advancecomp-2.6.tar.gz/urls.do       |  8 ++-
 .../meta/apr-util-1.6.3.tar.bz2/urls          |  4 --
 .../meta/apr-util-1.6.3.tar.bz2/urls.do       |  9 +++
 .../meta/aria2-1.37.0.tar.xz/urls.do          |  8 ++-
 .../meta/asciidoc-10.2.1.tar.gz/urls.do       |  8 ++-
 .../meta/at-spi2-atk-2.38.0.tar.xz/urls.do    |  7 ++-
 .../meta/at-spi2-core-2.52.0.tar.xz/urls.do   |  7 ++-
 .../distfiles/meta/atk-2.38.0.tar.xz/urls.do  |  7 ++-
 .../meta/autoconf-2.72.tar.xz/urls.do         |  5 +-
 .../meta/automake-1.16.5.tar.xz/urls.do       |  5 +-
 .../distfiles/meta/bash-5.2.21.tar.gz/urls.do |  2 +-
 .../distfiles/meta/bird-2.15.1.tar.gz/urls.do |  5 +-
 .../meta/boost_1_74_0.tar.bz2/urls.do         |  5 +-
 .../meta/boost_1_86_0.tar.bz2/urls.do         |  7 ++-
 .../meta/c-ares-1.30.0.tar.gz/urls.do         |  5 +-
 .../meta/cairo-1.16.0.tar.xz/urls.do          |  5 +-
 .../meta/cmake-3.28.3.tar.gz/urls.do          |  5 +-
 .../meta/cyrus-sasl-2.1.28.tar.gz/urls.do     |  8 ++-
 .../daemontools-encore-1.11.tar.gz/urls.do    | 10 ++--
 .../meta/djvulibre-3.5.28.tar.gz/urls.do      |  8 +--
 .../meta/docbook-xml-4.5.zip/urls.do          |  8 ++-
 .../meta/docbook-xsl-1.79.1.tar.bz2/urls.do   |  5 +-
 .../distfiles/meta/expat-2.6.2.tar.xz/urls.do |  5 +-
 .../distfiles/meta/flac-1.5.0.tar.xz/urls.do  | 10 ++--
 .../distfiles/meta/fltk-1.3.9.tar.bz2/urls.do |  5 +-
 .../distfiles/meta/fossil-2.23.tar.gz/urls.do |  5 +-
 .../meta/freeciv-3.0.10.tar.xz/urls.do        |  7 ++-
 .../meta/freetype-2.14.2.tar.xz/urls.do       | 11 +++-
 build/distfiles/meta/gcc-8.5.0.tar.xz/urls.do |  3 +-
 .../meta/gdk-pixbuf-2.42.12.tar.xz/urls.do    | 10 ++--
 .../meta/geos-3.12.1.tar.bz2/urls.do          |  7 ++-
 .../meta/getopt-1.1.6.tar.gz/urls.do          |  8 ++-
 .../distfiles/meta/git-2.53.0.tar.xz/urls.do  |  7 ++-
 build/distfiles/meta/glib-2.58.3.tar.xz/urls  |  2 +-
 .../glib-networking-2.80.0.tar.xz/urls.do     | 10 ++--
 .../distfiles/meta/gm4-1.4.19.tar.xz/urls.do  |  5 +-
 .../distfiles/meta/gmake-4.4.1.tar.gz/urls.do |  2 +-
 .../distfiles/meta/gmime-3.2.7.tar.xz/urls.do |  7 ++-
 .../distfiles/meta/gmp-4.3.2.tar.bz2/urls.do  |  5 +-
 .../distfiles/meta/gmp-6.3.0.tar.zst/urls.do  |  2 +-
 .../meta/gnupg-2.5.17.tar.bz2/urls.do         |  8 ++-
 .../meta/gnutls-3.8.12.tar.xz/urls.do         | 10 +++-
 build/distfiles/meta/go1.17.12.tar.gz/urls.do |  5 +-
 build/distfiles/meta/go1.20.14.tar.gz/urls.do |  8 ++-
 build/distfiles/meta/go1.23.5.tar.gz/urls.do  |  5 +-
 build/distfiles/meta/go1.25.6.tar.gz/urls.do  |  8 ++-
 build/distfiles/meta/go1.26.1.tar.gz/urls.do  |  8 ++-
 build/distfiles/meta/go1.4.3.tar.gz/urls.do   |  8 ++-
 .../meta/gpgme-1.23.2.tar.bz2/urls.do         | 11 +++-
 build/distfiles/meta/grep-3.11.tar.xz/urls.do |  5 +-
 .../meta/gtk+-3.24.42.tar.xz/urls.do          |  7 ++-
 build/distfiles/meta/gv-3.7.4.tar.gz/urls.do  | 11 +++-
 .../meta/httpd-2.4.59.tar.bz2/urls.do         |  7 ++-
 .../meta/imlib2-1.12.2.tar.xz/urls.do         |  5 +-
 .../distfiles/meta/irssi-1.4.5.tar.xz/urls.do |  5 +-
 .../meta/json-glib-1.10.6.tar.xz/urls.do      | 10 ++--
 .../distfiles/meta/lame-3.100.tar.gz/urls.do  | 11 +++-
 .../distfiles/meta/lcms2-2.16.tar.gz/urls.do  |  8 ++-
 build/distfiles/meta/less-692.tar.gz/urls.do  |  5 +-
 .../distfiles/meta/lftp-4.9.3.tar.xz/urls.do  | 14 +++--
 .../distfiles/meta/libao-1.2.0.tar.gz/urls.do |  7 ++-
 .../meta/libass-0.17.2.tar.xz/urls.do         |  5 +-
 .../meta/libassuan-3.0.2.tar.bz2/urls.do      | 12 ++--
 .../meta/libebml-1.4.5.tar.xz/urls.do         |  8 ++-
 .../meta/libedit-20230828-3.1.tar.gz/urls.do  |  5 +-
 .../meta/libevent-2.1.12.tar.gz/urls.do       |  5 +-
 .../meta/libgcrypt-1.12.0.tar.bz2/urls.do     | 11 +++-
 .../meta/libgpg-error-1.58.tar.bz2/urls.do    | 11 +++-
 .../meta/libiconv-1.17.tar.gz/urls.do         | 11 +++-
 .../meta/libidn2-2.3.7.tar.gz/urls.do         | 11 +++-
 .../meta/libjpeg-turbo-1.5.2.tar.gz/urls.do   |  7 ++-
 .../meta/libjpeg-turbo-3.0.3.tar.gz/urls.do   |  5 +-
 .../meta/libksba-1.6.7.tar.bz2/urls.do        | 12 ++--
 .../meta/libmatroska-1.7.1.tar.xz/urls.do     |  8 ++-
 .../meta/libogg-1.3.6.tar.xz/urls.do          | 10 ++--
 .../meta/libotr-4.1.1.tar.gz/urls.do          |  8 ++-
 .../meta/libowfat-0.34.tar.xz/urls.do         |  8 ++-
 .../meta/libpng-1.6.55.tar.xz/urls.do         | 11 +++-
 .../meta/libproxy-0.4.18.tar.xz/urls.do       |  5 +-
 .../meta/libpsl-0.21.5.tar.lz/urls.do         |  8 ++-
 .../meta/librsvg-2.40.21.tar.xz/urls.do       | 10 ++--
 .../meta/libsndfile-1.0.31.tar.bz2/urls.do    |  5 +-
 .../meta/libsoup-2.74.3.tar.xz/urls.do        | 10 ++--
 .../meta/libtasn1-4.19.0.tar.gz/urls.do       |  5 +-
 .../meta/libtheora-1.1.1.tar.xz/urls          |  2 +
 .../meta/libtool-2.4.7.tar.xz/urls.do         |  5 +-
 .../meta/libvorbis-1.3.7.tar.xz/urls.do       | 10 ++--
 .../meta/libwebp-1.4.0.tar.gz/urls.do         |  5 +-
 .../meta/libxml2-2.9.14.tar.xz/urls.do        |  7 ++-
 .../distfiles/meta/links-2.29.tar.bz2/urls.do |  7 ++-
 build/distfiles/meta/lua-5.2.4.tar.gz/urls.do |  8 ++-
 build/distfiles/meta/lua-5.4.6.tar.gz/urls.do |  5 +-
 build/distfiles/meta/lzip-1.24.tar.gz/urls.do |  5 +-
 .../meta/meson-0.56.0.tar.gz/urls.do          |  5 +-
 .../meta/meson-1.7.2.tar.gz/{urls.do => urls} |  2 -
 build/distfiles/meta/mpc-0.8.2.tar.gz/urls.do |  5 +-
 build/distfiles/meta/mpc-1.3.1.tar.gz/urls.do | 11 +++-
 .../distfiles/meta/mpfr-2.4.2.tar.xz/urls.do  |  5 +-
 .../distfiles/meta/mpfr-4.2.1.tar.xz/urls.do  |  5 +-
 build/distfiles/meta/mutt-2.3.0.tar.gz/urls   |  2 -
 .../distfiles/meta/mutt-2.3.0.tar.gz/urls.do  |  8 +++
 .../meta/nasm-2.16.01.tar.xz/urls.do          | 10 ++--
 .../distfiles/meta/ncurses-6.4.tar.gz/urls.do | 11 ++--
 .../meta/nettle-3.10.1.tar.gz/urls.do         |  5 +-
 .../meta/nghttp2-1.62.1.tar.xz/urls.do        |  5 +-
 .../meta/normalize-0.7.7.tar.bz2/urls.do      | 11 +++-
 build/distfiles/meta/npth-1.7.tar.bz2/urls.do |  5 +-
 .../distfiles/meta/nsd-4.13.0.tar.gz/urls.do  |  8 ++-
 .../meta/openssh-10.2p1.tar.gz/urls.do        | 25 +++++---
 .../meta/openssl-1.1.1w.tar.gz/urls.do        |  7 ++-
 .../distfiles/meta/openvpn-2.6.17.tar.gz/urls |  2 -
 .../meta/openvpn-2.6.17.tar.gz/urls.do        |  7 +++
 build/distfiles/meta/opus-1.6.tar.gz/urls.do  |  7 ++-
 .../meta/opus-tools-0.2.tar.gz/urls.do        | 12 ++--
 .../meta/opusfile-0.12.tar.gz/urls.do         | 10 ++--
 build/distfiles/meta/pango-1.54.0.tar.xz/urls |  2 +-
 .../meta/parallel-20240122.tar.bz2/urls.do    |  2 +-
 .../distfiles/meta/pcre-8.45.tar.bz2/urls.do  | 11 +++-
 .../distfiles/meta/perl-5.32.1.tar.xz/urls.do |  5 +-
 .../meta/pinentry-1.3.0.tar.bz2/urls.do       |  5 +-
 .../meta/pkgconf-2.1.1.tar.xz/urls.do         |  5 +-
 .../meta/pngcrush-1.8.13.tar.xz/urls.do       |  2 +-
 .../meta/postgresql-11.22.tar.bz2/urls.do     | 13 ++--
 .../meta/postgresql-16.3.tar.bz2/urls.do      | 13 ++--
 .../distfiles/meta/proj-4.9.3.tar.gz/urls.do  |  7 ++-
 .../distfiles/meta/qpdf-11.9.1.tar.gz/urls.do |  5 +-
 .../meta/readline-8.2.tar.gz/urls.do          |  5 +-
 .../meta/recutils-1.9.tar.gz/urls.do          |  5 +-
 .../meta/remind-05.00.01.tar.gz/urls.do       |  5 +-
 .../distfiles/meta/rsync-3.4.1.tar.gz/urls.do |  5 +-
 .../meta/scummvm-2026.1.0.tar.xz/urls.do      |  8 ++-
 .../meta/smartmontools-7.5.tar.gz/urls.do     |  5 +-
 .../distfiles/meta/sox-14.4.2.tar.bz2/urls.do |  5 +-
 .../meta/sqlite-src-3450100.zip/urls.do       |  9 +--
 .../distfiles/meta/stow-2.3.1.tar.bz2/urls.do |  5 +-
 build/distfiles/meta/tcl8.6.14.tar.gz/urls.do |  5 +-
 .../distfiles/meta/tcllib-1.21.tar.xz/urls.do |  5 +-
 .../meta/texinfo-7.1.1.tar.xz/urls.do         |  2 +-
 .../distfiles/meta/tiff-4.6.0.tar.xz/urls.do  |  5 +-
 build/distfiles/meta/tk8.6.14.tar.gz/urls.do  |  5 +-
 build/distfiles/meta/tmux-3.6.tar.gz/urls.do  |  5 +-
 .../meta/ucspi-tcp-0.88.tar.gz/urls.do        |  8 ++-
 .../meta/unbound-1.24.2.tar.gz/urls.do        |  8 ++-
 .../meta/valgrind-3.26.0.tar.bz2/urls.do      |  2 +-
 .../distfiles/meta/vnstat-2.13.tar.gz/urls.do |  7 ++-
 .../meta/vorbis-tools-1.4.3.tar.gz/urls.do    |  7 ++-
 .../meta/wavpack-5.8.1.tar.xz/urls.do         | 10 ++--
 .../meta/webkitgtk-2.34.6.tar.xz/urls.do      |  5 +-
 .../distfiles/meta/wget-1.25.0.tar.lz/urls.do |  6 +-
 .../meta/xapian-core-1.4.30.tar.xz/urls.do    |  8 ++-
 .../meta/xmlto-0.0.26.tar.bz2/urls.do         |  5 +-
 .../meta/zathura-0.5.11.tar.xz/urls.do        |  5 +-
 .../meta/zathura-cb-0.1.11.tar.xz/urls.do     |  5 +-
 .../meta/zathura-djvu-0.2.10.tar.xz/urls.do   |  8 ++-
 .../zathura-pdf-mupdf-0.4.4.tar.xz/urls.do    |  8 ++-
 build/distfiles/meta/zsh-5.9.tar.xz/urls.do   | 21 ++++---
 build/distfiles/meta/zstd-1.5.7.tar.gz/urls   |  1 -
 .../distfiles/meta/zstd-1.5.7.tar.gz/urls.do  |  4 ++
 build/distfiles/utils/urls-for-cpan           | 12 ++--
 .../utils/urls-for-distcache-FreeBSD          |  6 +-
 .../distfiles/utils/urls-for-distcache-NetBSD | 11 ++++
 build/distfiles/utils/urls-for-gcrypt         |  1 +
 build/distfiles/utils/urls-for-gnu            |  1 +
 build/distfiles/utils/urls-for-leaseweb       | 13 ++++
 build/distfiles/utils/urls-for-planetunix     | 42 +++++++++++++
 build/distfiles/utils/urls-for-savannah       | 48 +++++++--------
 build/distfiles/utils/urls-for-sourceforge    | 59 ++++++++-----------
 doc/Build/Distfiles/Mirrors                   |  8 +--
 doc/Build/Distfiles/Tutorial                  |  2 +-
 176 files changed, 834 insertions(+), 509 deletions(-)
 delete mode 100644 build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls
 create mode 100644 build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls.do
 create mode 100644 build/distfiles/meta/libtheora-1.1.1.tar.xz/urls
 rename build/distfiles/meta/meson-1.7.2.tar.gz/{urls.do => urls} (85%)
 delete mode 100644 build/distfiles/meta/mutt-2.3.0.tar.gz/urls
 create mode 100644 build/distfiles/meta/mutt-2.3.0.tar.gz/urls.do
 delete mode 100644 build/distfiles/meta/openvpn-2.6.17.tar.gz/urls
 create mode 100644 build/distfiles/meta/openvpn-2.6.17.tar.gz/urls.do
 delete mode 100644 build/distfiles/meta/zstd-1.5.7.tar.gz/urls
 create mode 100644 build/distfiles/meta/zstd-1.5.7.tar.gz/urls.do
 create mode 100755 build/distfiles/utils/urls-for-distcache-NetBSD
 create mode 100755 build/distfiles/utils/urls-for-leaseweb
 create mode 100755 build/distfiles/utils/urls-for-planetunix

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 a5b11d0..43345ab 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,4 @@
-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
+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
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 e19ba38..3e0d8e1 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
@@ -1,4 +1,4 @@
-fn=ImageMagick-7.1.2-15.tar.xz
+fn=$(basename $(pwd))
 cat <<EOF
 1|au|http://mirror.aarnet.edu.au/pub/imagemagick/releases/$fn
 1|ch|http://mirror.metanet.ch/imagemagick/releases/$fn
@@ -14,3 +14,5 @@ cat <<EOF
 2|se|https://mirror.accum.se/mirror/imagemagick.org/ftp/releases/$fn
 3|us|https://imagemagick.org/archive/releases/$fn
 EOF
+redo-ifchange ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-NetBSD $fn
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 d3c5f82..66a2a18 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,8 @@
-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
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-cpan \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-cpan modules/by-module/MIME/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
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 21c97fe..c601d28 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,4 @@
-echo "1|xf|https://www.python.org/ftp/python/3.10.14/Python-3.10.14.tar.xz"
+fn=$(basename $(pwd))
+echo "1|xf|https://www.python.org/ftp/python/3.10.14/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD python/Python-3.10.14.tar.xz
+../../utils/urls-for-distcache-FreeBSD python/$fn
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 a597e78..32552bd 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,4 @@
-echo "1|xf|https://www.python.org/ftp/python/3.7.3/Python-3.7.3.tar.xz"
+fn=$(basename $(pwd))
+echo "1|xf|https://www.python.org/ftp/python/3.7.3/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD python/Python-3.7.3.tar.xz
+../../utils/urls-for-distcache-FreeBSD python/$fn
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 fe1e87c..127e9ae 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
@@ -1,4 +1,4 @@
-fn=R-4.5.2.tar.gz
+fn=$(basename $(pwd))
 cat <<EOF
 1|ar|http://mirror.fcaglp.unlp.edu.ar/CRAN/src/base/R-4/$fn
 1|au|http://mirror.aarnet.edu.au/pub/CRAN/src/base/R-4/$fn
@@ -135,5 +135,6 @@ cat <<EOF
 5|xm|http://cloud.r-project.org/src/base/R-4/$fn
 6|xm|https://cloud.r-project.org/src/base/R-4/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
 ../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/RHash-1.4.4.tar.gz/urls.do b/build/distfiles/meta/RHash-1.4.4.tar.gz/urls.do
index 66e1cb0..71cd543 100644
--- a/build/distfiles/meta/RHash-1.4.4.tar.gz/urls.do
+++ b/build/distfiles/meta/RHash-1.4.4.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=rhash-1.4.4-src.tar.gz
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge rhash rhash/1.4.4/rhash-1.4.4-src.tar.gz
-../../utils/urls-for-distcache-FreeBSD rhash-1.4.4-src.tar.gz
+../../utils/urls-for-sourceforge rhash rhash/1.4.4/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/advancecomp-2.6.tar.gz/urls.do b/build/distfiles/meta/advancecomp-2.6.tar.gz/urls.do
index d115c75..fa3bbca 100644
--- a/build/distfiles/meta/advancecomp-2.6.tar.gz/urls.do
+++ b/build/distfiles/meta/advancecomp-2.6.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|xg|https://github.com/amadvance/advancecomp/releases/download/v2.6/advancecomp-2.6.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD advancecomp-2.6.tar.gz
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/amadvance/advancecomp/releases/download/v2.6/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls b/build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls
deleted file mode 100644
index 363a4b6..0000000
--- a/build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls
+++ /dev/null
@@ -1,4 +0,0 @@
-1|xf|http://dlcdn.apache.org/apr/apr-util-1.6.3.tar.bz2
-2|xf|https://dlcdn.apache.org/apr/apr-util-1.6.3.tar.bz2
-3|fi|http://archive.apache.org/dist/apr/apr-util-1.6.3.tar.bz2
-4|fi|https://archive.apache.org/dist/apr/apr-util-1.6.3.tar.bz2
diff --git a/build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls.do b/build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls.do
new file mode 100644
index 0000000..8cdb099
--- /dev/null
+++ b/build/distfiles/meta/apr-util-1.6.3.tar.bz2/urls.do
@@ -0,0 +1,9 @@
+fn=$(basename $(pwd))
+cat <<EOF
+1|xf|http://dlcdn.apache.org/apr/$fn
+2|xf|https://dlcdn.apache.org/apr/$fn
+3|fi|http://archive.apache.org/dist/apr/$fn
+4|fi|https://archive.apache.org/dist/apr/$fn
+EOF
+redo-ifchange ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/aria2-1.37.0.tar.xz/urls.do b/build/distfiles/meta/aria2-1.37.0.tar.xz/urls.do
index a47a50a..d06a86f 100644
--- a/build/distfiles/meta/aria2-1.37.0.tar.xz/urls.do
+++ b/build/distfiles/meta/aria2-1.37.0.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|xg|https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD aria2-1.37.0.tar.xz
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/aria2/aria2/releases/download/release-1.37.0/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/asciidoc-10.2.1.tar.gz/urls.do b/build/distfiles/meta/asciidoc-10.2.1.tar.gz/urls.do
index 9276779..359fcda 100644
--- a/build/distfiles/meta/asciidoc-10.2.1.tar.gz/urls.do
+++ b/build/distfiles/meta/asciidoc-10.2.1.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|xf|https://files.pythonhosted.org/packages/1d/e7/315a82f2d256e9270977aa3c15e8fe281fd7c40b8e2a0b97e0cb61ca8fa0/asciidoc-10.2.1.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD asciidoc-10.2.0.tar.gz
+fn=$(basename $(pwd))
+echo "1|xf|https://files.pythonhosted.org/packages/1d/e7/315a82f2d256e9270977aa3c15e8fe281fd7c40b8e2a0b97e0cb61ca8fa0/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/at-spi2-atk-2.38.0.tar.xz/urls.do b/build/distfiles/meta/at-spi2-atk-2.38.0.tar.xz/urls.do
index 4f0d80e..65d2f21 100644
--- a/build/distfiles/meta/at-spi2-atk-2.38.0.tar.xz/urls.do
+++ b/build/distfiles/meta/at-spi2-atk-2.38.0.tar.xz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz
+1||https://download.gnome.org/sources/at-spi2-atk/2.38/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/at-spi2-atk/2.38/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/at-spi2-atk-2.38.0.tar.xz
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
diff --git a/build/distfiles/meta/at-spi2-core-2.52.0.tar.xz/urls.do b/build/distfiles/meta/at-spi2-core-2.52.0.tar.xz/urls.do
index f0cfda5..69a85e5 100644
--- a/build/distfiles/meta/at-spi2-core-2.52.0.tar.xz/urls.do
+++ b/build/distfiles/meta/at-spi2-core-2.52.0.tar.xz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/at-spi2-core/2.52/at-spi2-core-2.52.0.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.52/at-spi2-core-2.52.0.tar.xz
+1||https://download.gnome.org/sources/at-spi2-core/2.52/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.52/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/at-spi2-core-2.52.0.tar.xz
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
diff --git a/build/distfiles/meta/atk-2.38.0.tar.xz/urls.do b/build/distfiles/meta/atk-2.38.0.tar.xz/urls.do
index d829785..0559ee0 100644
--- a/build/distfiles/meta/atk-2.38.0.tar.xz/urls.do
+++ b/build/distfiles/meta/atk-2.38.0.tar.xz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/atk/2.38/atk-2.38.0.tar.xz
+1||https://download.gnome.org/sources/atk/2.38/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/atk/2.38/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/atk-2.38.0.tar.xz
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
diff --git a/build/distfiles/meta/autoconf-2.72.tar.xz/urls.do b/build/distfiles/meta/autoconf-2.72.tar.xz/urls.do
index e37f99f..f864dcc 100644
--- a/build/distfiles/meta/autoconf-2.72.tar.xz/urls.do
+++ b/build/distfiles/meta/autoconf-2.72.tar.xz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu autoconf/autoconf-2.72.tar.xz
-../../utils/urls-for-distcache-FreeBSD autoconf-2.72.tar.xz
+../../utils/urls-for-gnu autoconf/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/automake-1.16.5.tar.xz/urls.do b/build/distfiles/meta/automake-1.16.5.tar.xz/urls.do
index 9cb9b23..1f782f8 100644
--- a/build/distfiles/meta/automake-1.16.5.tar.xz/urls.do
+++ b/build/distfiles/meta/automake-1.16.5.tar.xz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu automake/automake-1.16.5.tar.xz
-../../utils/urls-for-distcache-FreeBSD automake-1.16.5.tar.xz
+../../utils/urls-for-gnu automake/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/bash-5.2.21.tar.gz/urls.do b/build/distfiles/meta/bash-5.2.21.tar.gz/urls.do
index 7255197..2c6677a 100644
--- a/build/distfiles/meta/bash-5.2.21.tar.gz/urls.do
+++ b/build/distfiles/meta/bash-5.2.21.tar.gz/urls.do
@@ -1,2 +1,2 @@
 redo-ifchange ../../utils/urls-for-gnu
-../../utils/urls-for-gnu bash/bash-5.2.21.tar.gz
+../../utils/urls-for-gnu bash/$(basename $(pwd))
diff --git a/build/distfiles/meta/bird-2.15.1.tar.gz/urls.do b/build/distfiles/meta/bird-2.15.1.tar.gz/urls.do
index 08aaf7e..f37dbbc 100644
--- a/build/distfiles/meta/bird-2.15.1.tar.gz/urls.do
+++ b/build/distfiles/meta/bird-2.15.1.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|cz|https://bird.network.cz/download/bird-2.15.1.tar.gz"
+fn=$(basename $(pwd))
+echo "1|cz|https://bird.network.cz/download/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD bird-2.15.1.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/boost_1_74_0.tar.bz2/urls.do b/build/distfiles/meta/boost_1_74_0.tar.bz2/urls.do
index dab6863..be08fd8 100644
--- a/build/distfiles/meta/boost_1_74_0.tar.bz2/urls.do
+++ b/build/distfiles/meta/boost_1_74_0.tar.bz2/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge
-../../utils/urls-for-sourceforge boost boost/1.74.0/boost_1_74_0.tar.bz2
-echo "4|xf|https://archives.boost.io/release/1.74.0/source/boost_1_74_0.tar.bz2"
+../../utils/urls-for-sourceforge boost boost/1.74.0/$fn
+echo "4|xf|https://archives.boost.io/release/1.74.0/source/$fn"
diff --git a/build/distfiles/meta/boost_1_86_0.tar.bz2/urls.do b/build/distfiles/meta/boost_1_86_0.tar.bz2/urls.do
index f76630f..689de13 100644
--- a/build/distfiles/meta/boost_1_86_0.tar.bz2/urls.do
+++ b/build/distfiles/meta/boost_1_86_0.tar.bz2/urls.do
@@ -1,4 +1,5 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge boost boost/1.86.0/boost_1_86_0.tar.bz2
-echo "4|xf|https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2"
-../../utils/urls-for-distcache-FreeBSD boost_1_86_0.tar.bz2
+../../utils/urls-for-sourceforge boost boost/1.86.0/$fn
+echo "4|xf|https://archives.boost.io/release/1.86.0/source/$fn"
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/c-ares-1.30.0.tar.gz/urls.do b/build/distfiles/meta/c-ares-1.30.0.tar.gz/urls.do
index 2439ed2..879fa86 100644
--- a/build/distfiles/meta/c-ares-1.30.0.tar.gz/urls.do
+++ b/build/distfiles/meta/c-ares-1.30.0.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/c-ares/c-ares/releases/download/v1.30.0/c-ares-1.30.0.tar.gz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/c-ares/c-ares/releases/download/v1.30.0/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD c-ares-1.30.0.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/cairo-1.16.0.tar.xz/urls.do b/build/distfiles/meta/cairo-1.16.0.tar.xz/urls.do
index 546e719..ffcef48 100644
--- a/build/distfiles/meta/cairo-1.16.0.tar.xz/urls.do
+++ b/build/distfiles/meta/cairo-1.16.0.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://cairographics.org/releases/cairo-1.16.0.tar.xz"
+fn=$(basename $(pwd))
+echo "1|us|https://cairographics.org/releases/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD cairo-1.16.0.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/cmake-3.28.3.tar.gz/urls.do b/build/distfiles/meta/cmake-3.28.3.tar.gz/urls.do
index 759dcb6..00c062b 100644
--- a/build/distfiles/meta/cmake-3.28.3.tar.gz/urls.do
+++ b/build/distfiles/meta/cmake-3.28.3.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://cmake.org/files/v3.28/cmake-3.28.3.tar.gz"
+fn=$(basename $(pwd))
+echo "1|us|https://cmake.org/files/v3.28/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD cmake-3.28.3.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/cyrus-sasl-2.1.28.tar.gz/urls.do b/build/distfiles/meta/cyrus-sasl-2.1.28.tar.gz/urls.do
index 7f4480c..671089d 100644
--- a/build/distfiles/meta/cyrus-sasl-2.1.28.tar.gz/urls.do
+++ b/build/distfiles/meta/cyrus-sasl-2.1.28.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|xg|https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/cyrus-sasl-2.1.28.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD cyrus-sasl-2.1.28.tar.gz
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.28/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/daemontools-encore-1.11.tar.gz/urls.do b/build/distfiles/meta/daemontools-encore-1.11.tar.gz/urls.do
index f0e4f03..dc2f603 100644
--- a/build/distfiles/meta/daemontools-encore-1.11.tar.gz/urls.do
+++ b/build/distfiles/meta/daemontools-encore-1.11.tar.gz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|us|http://untroubled.org/daemontools-encore/daemontools-encore-1.11.tar.gz
-2|us|https://untroubled.org/daemontools-encore/daemontools-encore-1.11.tar.gz
+1|us|http://untroubled.org/daemontools-encore/$fn
+2|us|https://untroubled.org/daemontools-encore/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD daemontools-encore-1.11.tar.gz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/djvulibre-3.5.28.tar.gz/urls.do b/build/distfiles/meta/djvulibre-3.5.28.tar.gz/urls.do
index a19494e..48d0ac3 100644
--- a/build/distfiles/meta/djvulibre-3.5.28.tar.gz/urls.do
+++ b/build/distfiles/meta/djvulibre-3.5.28.tar.gz/urls.do
@@ -1,4 +1,4 @@
-redo-ifchange ../../utils/urls-for-sourceforge
-../../utils/urls-for-sourceforge djvu DjVuLibre/3.5.28/djvulibre-3.5.28.tar.gz
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD djvulibre-3.5.28.tar.gz
+fn=$(basename $(pwd))
+redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
+../../utils/urls-for-sourceforge djvu DjVuLibre/3.5.28/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/docbook-xml-4.5.zip/urls.do b/build/distfiles/meta/docbook-xml-4.5.zip/urls.do
index 37f867d..6d7021b 100644
--- a/build/distfiles/meta/docbook-xml-4.5.zip/urls.do
+++ b/build/distfiles/meta/docbook-xml-4.5.zip/urls.do
@@ -1,3 +1,5 @@
-echo "1|gb|https://docbook.org/xml/4.5/docbook-xml-4.5.zip"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD docbook-xml-4.5.zip
+fn=$(basename $(pwd))
+echo "1|gb|https://docbook.org/xml/4.5/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/docbook-xsl-1.79.1.tar.bz2/urls.do b/build/distfiles/meta/docbook-xsl-1.79.1.tar.bz2/urls.do
index eb954a6..546eca3 100644
--- a/build/distfiles/meta/docbook-xsl-1.79.1.tar.bz2/urls.do
+++ b/build/distfiles/meta/docbook-xsl-1.79.1.tar.bz2/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge docbook docbook-xsl/1.79.1/docbook-xsl-1.79.1.tar.bz2
-../../utils/urls-for-distcache-FreeBSD docbook-xsl-1.79.1.tar.bz2
+../../utils/urls-for-sourceforge docbook docbook-xsl/1.79.1/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/expat-2.6.2.tar.xz/urls.do b/build/distfiles/meta/expat-2.6.2.tar.xz/urls.do
index be56a8c..9f45901 100644
--- a/build/distfiles/meta/expat-2.6.2.tar.xz/urls.do
+++ b/build/distfiles/meta/expat-2.6.2.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.tar.xz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/libexpat/libexpat/releases/download/R_2_6_2/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD expat-2.6.2.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/flac-1.5.0.tar.xz/urls.do b/build/distfiles/meta/flac-1.5.0.tar.xz/urls.do
index 5b15efd..ee8105a 100644
--- a/build/distfiles/meta/flac-1.5.0.tar.xz/urls.do
+++ b/build/distfiles/meta/flac-1.5.0.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/flac/flac-1.5.0.tar.xz
-2||https://downloads.xiph.org/releases/flac/flac-1.5.0.tar.xz
+1||http://downloads.xiph.org/releases/flac/$fn
+2||https://downloads.xiph.org/releases/flac/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD flac-1.5.0.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/fltk-1.3.9.tar.bz2/urls.do b/build/distfiles/meta/fltk-1.3.9.tar.bz2/urls.do
index a22b998..5b1b9d6 100644
--- a/build/distfiles/meta/fltk-1.3.9.tar.bz2/urls.do
+++ b/build/distfiles/meta/fltk-1.3.9.tar.bz2/urls.do
@@ -1,3 +1,4 @@
-echo "1|xa|https://www.fltk.org/pub/fltk/1.3.9/fltk-1.3.9-source.tar.bz2"
+fn=fltk-1.3.9-source.tar.bz2
+echo "1|xa|https://www.fltk.org/pub/fltk/1.3.9/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD fltk-1.3.9-source.tar.bz2
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/fossil-2.23.tar.gz/urls.do b/build/distfiles/meta/fossil-2.23.tar.gz/urls.do
index b765735..434f0a0 100644
--- a/build/distfiles/meta/fossil-2.23.tar.gz/urls.do
+++ b/build/distfiles/meta/fossil-2.23.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xa|https://fossil-scm.org/home/tarball/47362306a7dd7c6fc3cab77cebe5d25469b0a9448479d9718eb5c49c8337b29/fossil-src-2.23.tar.gz"
+fn=fossil-src-2.23.tar.gz
+echo "1|xa|https://fossil-scm.org/home/tarball/47362306a7dd7c6fc3cab77cebe5d25469b0a9448479d9718eb5c49c8337b29/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD fossil-src-2.23.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/freeciv-3.0.10.tar.xz/urls.do b/build/distfiles/meta/freeciv-3.0.10.tar.xz/urls.do
index 0163936..1948c11 100644
--- a/build/distfiles/meta/freeciv-3.0.10.tar.xz/urls.do
+++ b/build/distfiles/meta/freeciv-3.0.10.tar.xz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge
-../../utils/urls-for-sourceforge freeciv Freeciv%203.0/3.0.10/freeciv-3.0.10.tar.xz
+../../utils/urls-for-sourceforge freeciv Freeciv%203.0/3.0.10/$fn
 cat <<EOF
-4|fi|http://files.freeciv.org/stable/freeciv-3.0.10.tar.xz
-5|fi|https://files.freeciv.org/stable/freeciv-3.0.10.tar.xz
+4|fi|http://files.freeciv.org/stable/$fn
+5|fi|https://files.freeciv.org/stable/$fn
 EOF
diff --git a/build/distfiles/meta/freetype-2.14.2.tar.xz/urls.do b/build/distfiles/meta/freetype-2.14.2.tar.xz/urls.do
index c1b55ac..0abbbe1 100644
--- a/build/distfiles/meta/freetype-2.14.2.tar.xz/urls.do
+++ b/build/distfiles/meta/freetype-2.14.2.tar.xz/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-savannah ../../utils/urls-for-sourceforge
-../../utils/urls-for-savannah freetype/freetype-2.14.2.tar.xz
-PRI=5 ../../utils/urls-for-sourceforge freetype freetype2/2.14.2/freetype-2.14.2.tar.xz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-savannah \
+    ../../utils/urls-for-sourceforge \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-savannah freetype/$fn
+PRI=5 ../../utils/urls-for-sourceforge freetype freetype2/2.14.2/$fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/gcc-8.5.0.tar.xz/urls.do b/build/distfiles/meta/gcc-8.5.0.tar.xz/urls.do
index aa379f4..e712ac3 100644
--- a/build/distfiles/meta/gcc-8.5.0.tar.xz/urls.do
+++ b/build/distfiles/meta/gcc-8.5.0.tar.xz/urls.do
@@ -1,5 +1,5 @@
 fn=gcc-8.5.0/gcc-8.5.0.tar.xz
-redo-ifchange ../../utils/urls-for-gnu
+redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-NetBSD
 ../../utils/urls-for-gnu gcc/$fn
 cat <<EOF
 3|nl|http://mirror.koddos.net/gcc/releases/$fn
@@ -11,3 +11,4 @@ cat <<EOF
 4|us|https://bigsearcher.com/mirrors/gcc/releases/$fn
 4|us|https://mirrors.kernel.org/sourceware/gcc/releases/$fn
 EOF
+../../utils/urls-for-distcache-NetBSD $(basename $(pwd))
diff --git a/build/distfiles/meta/gdk-pixbuf-2.42.12.tar.xz/urls.do b/build/distfiles/meta/gdk-pixbuf-2.42.12.tar.xz/urls.do
index 08ad5c5..3dd1c80 100644
--- a/build/distfiles/meta/gdk-pixbuf-2.42.12.tar.xz/urls.do
+++ b/build/distfiles/meta/gdk-pixbuf-2.42.12.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.12.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.12.tar.xz
+1||https://download.gnome.org/sources/gdk-pixbuf/2.42/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/2.42/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/gdk-pixbuf-2.42.12.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/geos-3.12.1.tar.bz2/urls.do b/build/distfiles/meta/geos-3.12.1.tar.bz2/urls.do
index 08f70cc..e7cdebc 100644
--- a/build/distfiles/meta/geos-3.12.1.tar.bz2/urls.do
+++ b/build/distfiles/meta/geos-3.12.1.tar.bz2/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|us|https://download.osgeo.org/geos/geos-3.12.1.tar.bz2
-2|xg|https://github.com/libgeos/geos/releases/download/3.12.1/geos-3.12.1.tar.bz2
+1|us|https://download.osgeo.org/geos/$fn
+2|xg|https://github.com/libgeos/geos/releases/download/3.12.1/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD geos-3.12.1.tar.bz2
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/getopt-1.1.6.tar.gz/urls.do b/build/distfiles/meta/getopt-1.1.6.tar.gz/urls.do
index 37d6693..ef735ff 100644
--- a/build/distfiles/meta/getopt-1.1.6.tar.gz/urls.do
+++ b/build/distfiles/meta/getopt-1.1.6.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|nl|https://frodo.looijaard.name/system/files/software/getopt/getopt-1.1.6.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD getopt-1.1.6.tar.gz
+fn=$(basename $(pwd))
+echo "1|nl|https://frodo.looijaard.name/system/files/software/getopt/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/git-2.53.0.tar.xz/urls.do b/build/distfiles/meta/git-2.53.0.tar.xz/urls.do
index 449aea0..662e79d 100644
--- a/build/distfiles/meta/git-2.53.0.tar.xz/urls.do
+++ b/build/distfiles/meta/git-2.53.0.tar.xz/urls.do
@@ -1,4 +1,4 @@
-fn=git-2.53.0.tar.xz
+fn=$(basename $(pwd))
 cat <<EOF
 1|jp|http://ftp.nara.wide.ad.jp/pub/kernel.org/software/scm/git/$fn
 1|ru|http://mirror.yandex.ru/pub/software/scm/git/$fn
@@ -7,5 +7,6 @@ cat <<EOF
 2|us|https://mirrors.mit.edu/kernel/software/scm/git/$fn
 3|xf|https://www.kernel.org/pub/software/scm/git/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD git-2.53.0.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/glib-2.58.3.tar.xz/urls b/build/distfiles/meta/glib-2.58.3.tar.xz/urls
index 3526d3b..435b5bf 100644
--- a/build/distfiles/meta/glib-2.58.3.tar.xz/urls
+++ b/build/distfiles/meta/glib-2.58.3.tar.xz/urls
@@ -1,2 +1,2 @@
-1|xs|https://download.gnome.org/sources/glib/2.58/glib-2.58.3.tar.xz
+1||https://download.gnome.org/sources/glib/2.58/glib-2.58.3.tar.xz
 2|us|https://ftp.gnome.org/pub/GNOME/sources/glib/2.58/glib-2.58.3.tar.xz
diff --git a/build/distfiles/meta/glib-networking-2.80.0.tar.xz/urls.do b/build/distfiles/meta/glib-networking-2.80.0.tar.xz/urls.do
index 0b22034..aa450c4 100644
--- a/build/distfiles/meta/glib-networking-2.80.0.tar.xz/urls.do
+++ b/build/distfiles/meta/glib-networking-2.80.0.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/glib-networking/2.80/glib-networking-2.80.0.tar.xz
-2|us|https://ftp.gnome.org/ftp/GNOME/sources/glib-networking/2.80/glib-networking-2.80.0.tar.xz
+1||https://download.gnome.org/sources/glib-networking/2.80/$fn
+2|us|https://ftp.gnome.org/ftp/GNOME/sources/glib-networking/2.80/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/glib-networking-2.80.0.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/gm4-1.4.19.tar.xz/urls.do b/build/distfiles/meta/gm4-1.4.19.tar.xz/urls.do
index 72b20d7..e52c37e 100644
--- a/build/distfiles/meta/gm4-1.4.19.tar.xz/urls.do
+++ b/build/distfiles/meta/gm4-1.4.19.tar.xz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu m4/m4-1.4.19.tar.xz
-../../utils/urls-for-distcache-FreeBSD m4-1.4.19.tar.xz
+../../utils/urls-for-gnu m4/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/gmake-4.4.1.tar.gz/urls.do b/build/distfiles/meta/gmake-4.4.1.tar.gz/urls.do
index 12b9113..c826391 100644
--- a/build/distfiles/meta/gmake-4.4.1.tar.gz/urls.do
+++ b/build/distfiles/meta/gmake-4.4.1.tar.gz/urls.do
@@ -1,2 +1,2 @@
 redo-ifchange ../../utils/urls-for-gnu
-../../utils/urls-for-gnu make/make-4.4.1.tar.gz
+../../utils/urls-for-gnu make/$(basename $(pwd))
diff --git a/build/distfiles/meta/gmime-3.2.7.tar.xz/urls.do b/build/distfiles/meta/gmime-3.2.7.tar.xz/urls.do
index 3d4a3e7..2af23e4 100644
--- a/build/distfiles/meta/gmime-3.2.7.tar.xz/urls.do
+++ b/build/distfiles/meta/gmime-3.2.7.tar.xz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/gmime/3.2/gmime-3.2.7.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/gmime/3.2/gmime-3.2.7.tar.xz
+1||https://download.gnome.org/sources/gmime/3.2/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/gmime/3.2/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gmime-3.2.7.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/gmp-4.3.2.tar.bz2/urls.do b/build/distfiles/meta/gmp-4.3.2.tar.bz2/urls.do
index e97155e..9a93b7e 100644
--- a/build/distfiles/meta/gmp-4.3.2.tar.bz2/urls.do
+++ b/build/distfiles/meta/gmp-4.3.2.tar.bz2/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu gmp/gmp-4.3.2.tar.bz2
-../../utils/urls-for-distcache-FreeBSD gmp-4.3.2.tar.bz2
+../../utils/urls-for-gnu gmp/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/gmp-6.3.0.tar.zst/urls.do b/build/distfiles/meta/gmp-6.3.0.tar.zst/urls.do
index 1c18791..0c51bad 100644
--- a/build/distfiles/meta/gmp-6.3.0.tar.zst/urls.do
+++ b/build/distfiles/meta/gmp-6.3.0.tar.zst/urls.do
@@ -1,2 +1,2 @@
 redo-ifchange ../../utils/urls-for-gnu
-../../utils/urls-for-gnu gmp/gmp-6.3.0.tar.zst
+../../utils/urls-for-gnu gmp/$(basename $(pwd))
diff --git a/build/distfiles/meta/gnupg-2.5.17.tar.bz2/urls.do b/build/distfiles/meta/gnupg-2.5.17.tar.bz2/urls.do
index 07d0361..ea8fce3 100644
--- a/build/distfiles/meta/gnupg-2.5.17.tar.bz2/urls.do
+++ b/build/distfiles/meta/gnupg-2.5.17.tar.bz2/urls.do
@@ -1,3 +1,5 @@
-redo-ifchange ../../utils/urls-for-gcrypt ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gcrypt gnupg/gnupg-2.5.17.tar.bz2
-../../utils/urls-for-distcache-FreeBSD gnupg-2.5.17.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange ../../utils/urls-for-gcrypt ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gcrypt gnupg/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/gnutls-3.8.12.tar.xz/urls.do b/build/distfiles/meta/gnutls-3.8.12.tar.xz/urls.do
index f19545d..cced985 100644
--- a/build/distfiles/meta/gnutls-3.8.12.tar.xz/urls.do
+++ b/build/distfiles/meta/gnutls-3.8.12.tar.xz/urls.do
@@ -1,2 +1,8 @@
-redo-ifchange ../../utils/urls-for-gcrypt
-../../utils/urls-for-gcrypt gnutls/v3.8/gnutls-3.8.12.tar.xz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gcrypt \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gcrypt gnutls/v3.8/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/go1.17.12.tar.gz/urls.do b/build/distfiles/meta/go1.17.12.tar.gz/urls.do
index 4a8e150..51b98f0 100644
--- a/build/distfiles/meta/go1.17.12.tar.gz/urls.do
+++ b/build/distfiles/meta/go1.17.12.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1||https://go.dev/dl/go1.17.12.src.tar.gz"
+fn=go1.17.12.src.tar.gz
+echo "1||https://go.dev/dl/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD go1.17.12.src.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/go1.20.14.tar.gz/urls.do b/build/distfiles/meta/go1.20.14.tar.gz/urls.do
index 7fb831d..ec61995 100644
--- a/build/distfiles/meta/go1.20.14.tar.gz/urls.do
+++ b/build/distfiles/meta/go1.20.14.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1||https://go.dev/dl/go1.20.14.src.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD go1.20.14.src.tar.gz
+fn=go1.20.14.src.tar.gz
+echo "1||https://go.dev/dl/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/go1.23.5.tar.gz/urls.do b/build/distfiles/meta/go1.23.5.tar.gz/urls.do
index 640612f..391eb82 100644
--- a/build/distfiles/meta/go1.23.5.tar.gz/urls.do
+++ b/build/distfiles/meta/go1.23.5.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1||https://go.dev/dl/go1.23.5.src.tar.gz"
+fn=go1.23.5.src.tar.gz
+echo "1||https://go.dev/dl/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD go1.23.5.src.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/go1.25.6.tar.gz/urls.do b/build/distfiles/meta/go1.25.6.tar.gz/urls.do
index 9f9a556..b13b493 100644
--- a/build/distfiles/meta/go1.25.6.tar.gz/urls.do
+++ b/build/distfiles/meta/go1.25.6.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1||https://go.dev/dl/go1.25.6.src.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD go1.25.6.src.tar.gz
+fn=go1.25.6.src.tar.gz
+echo "1||https://go.dev/dl/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/go1.26.1.tar.gz/urls.do b/build/distfiles/meta/go1.26.1.tar.gz/urls.do
index abd9cb3..e66829b 100644
--- a/build/distfiles/meta/go1.26.1.tar.gz/urls.do
+++ b/build/distfiles/meta/go1.26.1.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1||https://go.dev/dl/go1.26.1.src.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD go1.26.1.src.tar.gz
+fn=go1.26.1.src.tar.gz
+echo "1||https://go.dev/dl/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/go1.4.3.tar.gz/urls.do b/build/distfiles/meta/go1.4.3.tar.gz/urls.do
index 89fa4ef..7f4b383 100644
--- a/build/distfiles/meta/go1.4.3.tar.gz/urls.do
+++ b/build/distfiles/meta/go1.4.3.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1||https://go.dev/dl/go1.4.3.src.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD go1.4.3.src.tar.gz
+fn=go1.4.3.src.tar.gz
+echo "1||https://go.dev/dl/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/gpgme-1.23.2.tar.bz2/urls.do b/build/distfiles/meta/gpgme-1.23.2.tar.bz2/urls.do
index 21c8fa5..453d0d5 100644
--- a/build/distfiles/meta/gpgme-1.23.2.tar.bz2/urls.do
+++ b/build/distfiles/meta/gpgme-1.23.2.tar.bz2/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-gcrypt ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gcrypt gpgme/gpgme-1.23.2.tar.bz2
-../../utils/urls-for-distcache-FreeBSD gpgme-1.23.2.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gcrypt \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gcrypt gpgme/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/grep-3.11.tar.xz/urls.do b/build/distfiles/meta/grep-3.11.tar.xz/urls.do
index af94a10..1090231 100644
--- a/build/distfiles/meta/grep-3.11.tar.xz/urls.do
+++ b/build/distfiles/meta/grep-3.11.tar.xz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu grep/grep-3.11.tar.xz
-../../utils/urls-for-distcache-FreeBSD grep-3.11.tar.xz
+../../utils/urls-for-gnu grep/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/gtk+-3.24.42.tar.xz/urls.do b/build/distfiles/meta/gtk+-3.24.42.tar.xz/urls.do
index f659791..13885cd 100644
--- a/build/distfiles/meta/gtk+-3.24.42.tar.xz/urls.do
+++ b/build/distfiles/meta/gtk+-3.24.42.tar.xz/urls.do
@@ -1,6 +1,7 @@
+fn=gtk%2B-3.24.42.tar.xz
 cat <<EOF
-1|xs|https://download.gnome.org/sources/gtk%2B/3.24/gtk%2B-3.24.42.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/gtk%2B/3.24/gtk%2B-3.24.42.tar.xz
+1||https://download.gnome.org/sources/gtk%2B/3.24/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/gtk%2B/3.24/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/gtk%2B-3.24.42.tar.xz
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
diff --git a/build/distfiles/meta/gv-3.7.4.tar.gz/urls.do b/build/distfiles/meta/gv-3.7.4.tar.gz/urls.do
index b1c9c39..ceeff28 100644
--- a/build/distfiles/meta/gv-3.7.4.tar.gz/urls.do
+++ b/build/distfiles/meta/gv-3.7.4.tar.gz/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu gv/gv-3.7.4.tar.gz
-../../utils/urls-for-distcache-FreeBSD gv-3.7.4.tar.gz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gnu \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gnu gv/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/httpd-2.4.59.tar.bz2/urls.do b/build/distfiles/meta/httpd-2.4.59.tar.bz2/urls.do
index 200ba7a..881368a 100644
--- a/build/distfiles/meta/httpd-2.4.59.tar.bz2/urls.do
+++ b/build/distfiles/meta/httpd-2.4.59.tar.bz2/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|fi|http://archive.apache.org/dist/httpd/httpd-2.4.59.tar.bz2
-2|fi|https://archive.apache.org/dist/httpd/httpd-2.4.59.tar.bz2
+1|fi|http://archive.apache.org/dist/httpd/$fn
+2|fi|https://archive.apache.org/dist/httpd/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD apache24/httpd-2.4.59.tar.bz2
+../../utils/urls-for-distcache-FreeBSD apache24/$fn
diff --git a/build/distfiles/meta/imlib2-1.12.2.tar.xz/urls.do b/build/distfiles/meta/imlib2-1.12.2.tar.xz/urls.do
index d125178..147e420 100644
--- a/build/distfiles/meta/imlib2-1.12.2.tar.xz/urls.do
+++ b/build/distfiles/meta/imlib2-1.12.2.tar.xz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge enlightenment imlib2-src/1.12.2/imlib2-1.12.2.tar.xz
-../../utils/urls-for-distcache-FreeBSD imlib2-1.12.2.tar.xz
+../../utils/urls-for-sourceforge enlightenment imlib2-src/1.12.2/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/irssi-1.4.5.tar.xz/urls.do b/build/distfiles/meta/irssi-1.4.5.tar.xz/urls.do
index 024207d..2ef5011 100644
--- a/build/distfiles/meta/irssi-1.4.5.tar.xz/urls.do
+++ b/build/distfiles/meta/irssi-1.4.5.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/irssi/irssi/releases/download/1.4.5/irssi-1.4.5.tar.xz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/irssi/irssi/releases/download/1.4.5/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD irssi-1.4.5.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/json-glib-1.10.6.tar.xz/urls.do b/build/distfiles/meta/json-glib-1.10.6.tar.xz/urls.do
index d51f050..902d4a2 100644
--- a/build/distfiles/meta/json-glib-1.10.6.tar.xz/urls.do
+++ b/build/distfiles/meta/json-glib-1.10.6.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/json-glib/1.10/json-glib-1.10.6.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/json-glib/1.10/json-glib-1.10.6.tar.xz
+1||https://download.gnome.org/sources/json-glib/1.10/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/json-glib/1.10/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD json-glib-1.10.6.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/lame-3.100.tar.gz/urls.do b/build/distfiles/meta/lame-3.100.tar.gz/urls.do
index 59d4276..463aaf5 100644
--- a/build/distfiles/meta/lame-3.100.tar.gz/urls.do
+++ b/build/distfiles/meta/lame-3.100.tar.gz/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge lame lame/3.100/lame-3.100.tar.gz
-../../utils/urls-for-distcache-FreeBSD lame-3.100.tar.gz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-sourceforge \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-sourceforge lame lame/3.100/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/lcms2-2.16.tar.gz/urls.do b/build/distfiles/meta/lcms2-2.16.tar.gz/urls.do
index 80f99b6..a6fba82 100644
--- a/build/distfiles/meta/lcms2-2.16.tar.gz/urls.do
+++ b/build/distfiles/meta/lcms2-2.16.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|xg|https://github.com/mm2/Little-CMS/releases/download/lcms2.16/lcms2-2.16.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD lcms2-2.16.tar.gz
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/mm2/Little-CMS/releases/download/lcms2.16/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/less-692.tar.gz/urls.do b/build/distfiles/meta/less-692.tar.gz/urls.do
index 27b9e73..6fc0669 100644
--- a/build/distfiles/meta/less-692.tar.gz/urls.do
+++ b/build/distfiles/meta/less-692.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://greenwoodsoftware.com/less/less-692.tar.gz"
+fn=$(basename $(pwd))
+echo "1|us|https://greenwoodsoftware.com/less/$fn"
 redo-ifchange ../../utils/urls-for-gnu
-PRI=2 ../../utils/urls-for-gnu less/less-692.tar.gz
+PRI=2 ../../utils/urls-for-gnu less/$fn
diff --git a/build/distfiles/meta/lftp-4.9.3.tar.xz/urls.do b/build/distfiles/meta/lftp-4.9.3.tar.xz/urls.do
index b632d5a..0bcad0c 100644
--- a/build/distfiles/meta/lftp-4.9.3.tar.xz/urls.do
+++ b/build/distfiles/meta/lftp-4.9.3.tar.xz/urls.do
@@ -1,8 +1,10 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|jp|http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/lftp-4.9.3.tar.xz
-1|ru|http://lftp.yar.ru/ftp/lftp-4.9.3.tar.xz
-2|jp|https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/lftp-4.9.3.tar.xz
-2|ru|https://lftp.yar.ru/ftp/lftp-4.9.3.tar.xz
+1|jp|http://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/$fn
+1|ru|http://lftp.yar.ru/ftp/.lftp-4.9.3.tar.xz
+2|jp|https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/$fn
+2|ru|https://lftp.yar.ru/ftp/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD lftp-4.9.3.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libao-1.2.0.tar.gz/urls.do b/build/distfiles/meta/libao-1.2.0.tar.gz/urls.do
index 9a0ea75..c5b384d 100644
--- a/build/distfiles/meta/libao-1.2.0.tar.gz/urls.do
+++ b/build/distfiles/meta/libao-1.2.0.tar.gz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/ao/libao-1.2.0.tar.gz
-2||https://downloads.xiph.org/releases/ao/libao-1.2.0.tar.gz
+1||http://downloads.xiph.org/releases/ao/$fn
+2||https://downloads.xiph.org/releases/ao/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libao-1.2.0.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libass-0.17.2.tar.xz/urls.do b/build/distfiles/meta/libass-0.17.2.tar.xz/urls.do
index 45ddec5..1704ae5 100644
--- a/build/distfiles/meta/libass-0.17.2.tar.xz/urls.do
+++ b/build/distfiles/meta/libass-0.17.2.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/libass/libass/releases/download/0.17.2/libass-0.17.2.tar.xz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/libass/libass/releases/download/0.17.2/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libass-0.17.2.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libassuan-3.0.2.tar.bz2/urls.do b/build/distfiles/meta/libassuan-3.0.2.tar.bz2/urls.do
index d648c9b..faa4830 100644
--- a/build/distfiles/meta/libassuan-3.0.2.tar.bz2/urls.do
+++ b/build/distfiles/meta/libassuan-3.0.2.tar.bz2/urls.do
@@ -1,4 +1,8 @@
-redo-ifchange ../../utils/urls-for-gcrypt
-../../utils/urls-for-gcrypt libassuan/libassuan-3.0.2.tar.bz2
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libassuan-3.0.2.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gcrypt \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gcrypt libassuan/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libebml-1.4.5.tar.xz/urls.do b/build/distfiles/meta/libebml-1.4.5.tar.xz/urls.do
index 1f076b4..bf29426 100644
--- a/build/distfiles/meta/libebml-1.4.5.tar.xz/urls.do
+++ b/build/distfiles/meta/libebml-1.4.5.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|de|https://dl.matroska.org/downloads/libebml/libebml-1.4.5.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libebml-1.4.5.tar.xz
+fn=$(basename $(pwd))
+echo "1|de|https://dl.matroska.org/downloads/libebml/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libedit-20230828-3.1.tar.gz/urls.do b/build/distfiles/meta/libedit-20230828-3.1.tar.gz/urls.do
index faa8ae3..cbc4819 100644
--- a/build/distfiles/meta/libedit-20230828-3.1.tar.gz/urls.do
+++ b/build/distfiles/meta/libedit-20230828-3.1.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|dk|https://www.thrysoee.dk/editline/libedit-20230828-3.1.tar.gz"
+fn=$(basename $(pwd))
+echo "1|dk|https://www.thrysoee.dk/editline/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libedit-20230828-3.1.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libevent-2.1.12.tar.gz/urls.do b/build/distfiles/meta/libevent-2.1.12.tar.gz/urls.do
index 170cc36..9dc466d 100644
--- a/build/distfiles/meta/libevent-2.1.12.tar.gz/urls.do
+++ b/build/distfiles/meta/libevent-2.1.12.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libevent-2.1.12-stable.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libgcrypt-1.12.0.tar.bz2/urls.do b/build/distfiles/meta/libgcrypt-1.12.0.tar.bz2/urls.do
index b714bf7..35a2470 100644
--- a/build/distfiles/meta/libgcrypt-1.12.0.tar.bz2/urls.do
+++ b/build/distfiles/meta/libgcrypt-1.12.0.tar.bz2/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-gcrypt ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gcrypt libgcrypt/libgcrypt-1.12.0.tar.bz2
-../../utils/urls-for-distcache-FreeBSD libgcrypt-1.12.0.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gcrypt \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gcrypt libgcrypt/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libgpg-error-1.58.tar.bz2/urls.do b/build/distfiles/meta/libgpg-error-1.58.tar.bz2/urls.do
index 14d39de..e97090a 100644
--- a/build/distfiles/meta/libgpg-error-1.58.tar.bz2/urls.do
+++ b/build/distfiles/meta/libgpg-error-1.58.tar.bz2/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-gcrypt ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gcrypt libgpg-error/libgpg-error-1.58.tar.bz2
-../../utils/urls-for-distcache-FreeBSD libgpg-error-1.58.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gcrypt \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gcrypt libgpg-error/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libiconv-1.17.tar.gz/urls.do b/build/distfiles/meta/libiconv-1.17.tar.gz/urls.do
index 4ea440a..59842eb 100644
--- a/build/distfiles/meta/libiconv-1.17.tar.gz/urls.do
+++ b/build/distfiles/meta/libiconv-1.17.tar.gz/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu libiconv/libiconv-1.17.tar.gz
-../../utils/urls-for-distcache-FreeBSD libiconv-1.17.tar.gz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gnu \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gnu libiconv/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libidn2-2.3.7.tar.gz/urls.do b/build/distfiles/meta/libidn2-2.3.7.tar.gz/urls.do
index 26b067e..aaebe00 100644
--- a/build/distfiles/meta/libidn2-2.3.7.tar.gz/urls.do
+++ b/build/distfiles/meta/libidn2-2.3.7.tar.gz/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu libidn/libidn2-2.3.7.tar.gz
-../../utils/urls-for-distcache-FreeBSD libidn2-2.3.7.tar.gz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gnu \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gnu libidn/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libjpeg-turbo-1.5.2.tar.gz/urls.do b/build/distfiles/meta/libjpeg-turbo-1.5.2.tar.gz/urls.do
index 53c06cc..cc896c9 100644
--- a/build/distfiles/meta/libjpeg-turbo-1.5.2.tar.gz/urls.do
+++ b/build/distfiles/meta/libjpeg-turbo-1.5.2.tar.gz/urls.do
@@ -1,4 +1,5 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge libjpeg-turbo 1.5.2/libjpeg-turbo-1.5.2.tar.gz
-echo "4|xg|https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/1.5.2/libjpeg-turbo-1.5.2.tar.gz"
-../../utils/urls-for-distcache-FreeBSD libjpeg-turbo-1.5.2.tar.gz
+../../utils/urls-for-sourceforge libjpeg-turbo 1.5.2/$fn
+echo "4|xg|https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/1.5.2/$fn"
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libjpeg-turbo-3.0.3.tar.gz/urls.do b/build/distfiles/meta/libjpeg-turbo-3.0.3.tar.gz/urls.do
index 3217470..0b1af07 100644
--- a/build/distfiles/meta/libjpeg-turbo-3.0.3.tar.gz/urls.do
+++ b/build/distfiles/meta/libjpeg-turbo-3.0.3.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/libjpeg-turbo-3.0.3.tar.gz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/3.0.3/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libjpeg-turbo-3.0.3.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libksba-1.6.7.tar.bz2/urls.do b/build/distfiles/meta/libksba-1.6.7.tar.bz2/urls.do
index b09c02a..7e5de02 100644
--- a/build/distfiles/meta/libksba-1.6.7.tar.bz2/urls.do
+++ b/build/distfiles/meta/libksba-1.6.7.tar.bz2/urls.do
@@ -1,4 +1,8 @@
-redo-ifchange ../../utils/urls-for-gcrypt
-../../utils/urls-for-gcrypt libksba/libksba-1.6.7.tar.bz2
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libksba-1.6.7.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gcrypt \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gcrypt libksba/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libmatroska-1.7.1.tar.xz/urls.do b/build/distfiles/meta/libmatroska-1.7.1.tar.xz/urls.do
index 304c233..76620b9 100644
--- a/build/distfiles/meta/libmatroska-1.7.1.tar.xz/urls.do
+++ b/build/distfiles/meta/libmatroska-1.7.1.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|de|https://dl.matroska.org/downloads/libmatroska/libmatroska-1.7.1.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libmatroska-1.7.1.tar.xz
+fn=$(basename $(pwd))
+echo "1|de|https://dl.matroska.org/downloads/libmatroska/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libogg-1.3.6.tar.xz/urls.do b/build/distfiles/meta/libogg-1.3.6.tar.xz/urls.do
index 32080d2..bf5f711 100644
--- a/build/distfiles/meta/libogg-1.3.6.tar.xz/urls.do
+++ b/build/distfiles/meta/libogg-1.3.6.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/ogg/libogg-1.3.6.tar.xz
-2||https://downloads.xiph.org/releases/ogg/libogg-1.3.6.tar.xz
+1||http://downloads.xiph.org/releases/ogg/$fn
+2||https://downloads.xiph.org/releases/ogg/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libogg-1.3.6.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libotr-4.1.1.tar.gz/urls.do b/build/distfiles/meta/libotr-4.1.1.tar.gz/urls.do
index ef0b178..b4c66d0 100644
--- a/build/distfiles/meta/libotr-4.1.1.tar.gz/urls.do
+++ b/build/distfiles/meta/libotr-4.1.1.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|ca|https://otr.cypherpunks.ca/libotr-4.1.1.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libotr-4.1.1.tar.gz
+fn=$(basename $(pwd))
+echo "1|ca|https://otr.cypherpunks.ca/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libowfat-0.34.tar.xz/urls.do b/build/distfiles/meta/libowfat-0.34.tar.xz/urls.do
index bb7d17c..5621b5e 100644
--- a/build/distfiles/meta/libowfat-0.34.tar.xz/urls.do
+++ b/build/distfiles/meta/libowfat-0.34.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|de|http://www.fefe.de/libowfat/libowfat-0.34.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libowfat-0.34.tar.xz
+fn=$(basename $(pwd))
+echo "1|de|http://www.fefe.de/libowfat/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libpng-1.6.55.tar.xz/urls.do b/build/distfiles/meta/libpng-1.6.55.tar.xz/urls.do
index 7dcf55d..e3abc24 100644
--- a/build/distfiles/meta/libpng-1.6.55.tar.xz/urls.do
+++ b/build/distfiles/meta/libpng-1.6.55.tar.xz/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge libpng libpng16/1.6.55/libpng-1.6.55.tar.xz
-../../utils/urls-for-distcache-FreeBSD libpng-1.6.55.tar.xz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-sourceforge \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-sourceforge libpng libpng16/1.6.55/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libproxy-0.4.18.tar.xz/urls.do b/build/distfiles/meta/libproxy-0.4.18.tar.xz/urls.do
index 550bac7..5081976 100644
--- a/build/distfiles/meta/libproxy-0.4.18.tar.xz/urls.do
+++ b/build/distfiles/meta/libproxy-0.4.18.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/libproxy/libproxy/releases/download/0.4.18/libproxy-0.4.18.tar.xz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/libproxy/libproxy/releases/download/0.4.18/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libproxy-0.4.18.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libpsl-0.21.5.tar.lz/urls.do b/build/distfiles/meta/libpsl-0.21.5.tar.lz/urls.do
index fa1c84a..7fcd8ab 100644
--- a/build/distfiles/meta/libpsl-0.21.5.tar.lz/urls.do
+++ b/build/distfiles/meta/libpsl-0.21.5.tar.lz/urls.do
@@ -1,3 +1,5 @@
-echo "1|xg|https://github.com/rockdaboot/libpsl/releases/download/0.21.5/libpsl-0.21.5.tar.lz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libpsl-0.21.5.tar.lz
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/rockdaboot/libpsl/releases/download/0.21.5/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/librsvg-2.40.21.tar.xz/urls.do b/build/distfiles/meta/librsvg-2.40.21.tar.xz/urls.do
index cd07b62..6fd17bc 100644
--- a/build/distfiles/meta/librsvg-2.40.21.tar.xz/urls.do
+++ b/build/distfiles/meta/librsvg-2.40.21.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.21.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-2.40.21.tar.xz
+1||https://download.gnome.org/sources/librsvg/2.40/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/librsvg-2.40.21.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libsndfile-1.0.31.tar.bz2/urls.do b/build/distfiles/meta/libsndfile-1.0.31.tar.bz2/urls.do
index 8eacb44..613bc39 100644
--- a/build/distfiles/meta/libsndfile-1.0.31.tar.bz2/urls.do
+++ b/build/distfiles/meta/libsndfile-1.0.31.tar.bz2/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/libsndfile/libsndfile/releases/download/1.0.31/libsndfile-1.0.31.tar.bz2"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/libsndfile/libsndfile/releases/download/1.0.31/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libsndfile-1.0.31.tar.bz2
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libsoup-2.74.3.tar.xz/urls.do b/build/distfiles/meta/libsoup-2.74.3.tar.xz/urls.do
index 1eabc1e..29eb796 100644
--- a/build/distfiles/meta/libsoup-2.74.3.tar.xz/urls.do
+++ b/build/distfiles/meta/libsoup-2.74.3.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/libsoup/2.74/libsoup-2.74.3.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/libsoup-2.74.3.tar.xz
+1||https://download.gnome.org/sources/libsoup/2.74/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/libsoup/2.74/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/libsoup-2.74.3.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libtasn1-4.19.0.tar.gz/urls.do b/build/distfiles/meta/libtasn1-4.19.0.tar.gz/urls.do
index 7b78dc9..179af75 100644
--- a/build/distfiles/meta/libtasn1-4.19.0.tar.gz/urls.do
+++ b/build/distfiles/meta/libtasn1-4.19.0.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu libtasn1/libtasn1-4.19.0.tar.gz
-../../utils/urls-for-distcache-FreeBSD libtasn1-4.19.0.tar.gz
+../../utils/urls-for-gnu libtasn1/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libtheora-1.1.1.tar.xz/urls b/build/distfiles/meta/libtheora-1.1.1.tar.xz/urls
new file mode 100644
index 0000000..d5e3d29
--- /dev/null
+++ b/build/distfiles/meta/libtheora-1.1.1.tar.xz/urls
@@ -0,0 +1,2 @@
+1||http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.xz
+2||https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.xz
diff --git a/build/distfiles/meta/libtool-2.4.7.tar.xz/urls.do b/build/distfiles/meta/libtool-2.4.7.tar.xz/urls.do
index 985f72f..547c01e 100644
--- a/build/distfiles/meta/libtool-2.4.7.tar.xz/urls.do
+++ b/build/distfiles/meta/libtool-2.4.7.tar.xz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu libtool/libtool-2.4.7.tar.xz
-../../utils/urls-for-distcache-FreeBSD libtool-2.4.7.tar.xz
+../../utils/urls-for-gnu libtool/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libvorbis-1.3.7.tar.xz/urls.do b/build/distfiles/meta/libvorbis-1.3.7.tar.xz/urls.do
index c306670..61fb0dc 100644
--- a/build/distfiles/meta/libvorbis-1.3.7.tar.xz/urls.do
+++ b/build/distfiles/meta/libvorbis-1.3.7.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz
-2||https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz
+1||http://downloads.xiph.org/releases/vorbis/$fn
+2||https://downloads.xiph.org/releases/vorbis/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libvorbis-1.3.7.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/libwebp-1.4.0.tar.gz/urls.do b/build/distfiles/meta/libwebp-1.4.0.tar.gz/urls.do
index 4090111..921bdfc 100644
--- a/build/distfiles/meta/libwebp-1.4.0.tar.gz/urls.do
+++ b/build/distfiles/meta/libwebp-1.4.0.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1||https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.4.0.tar.gz"
+fn=$(basename $(pwd))
+echo "1||https://storage.googleapis.com/downloads.webmproject.org/releases/webp/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD libwebp-1.4.0.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/libxml2-2.9.14.tar.xz/urls.do b/build/distfiles/meta/libxml2-2.9.14.tar.xz/urls.do
index 11be39e..28e5c52 100644
--- a/build/distfiles/meta/libxml2-2.9.14.tar.xz/urls.do
+++ b/build/distfiles/meta/libxml2-2.9.14.tar.xz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|xs|https://download.gnome.org/sources/libxml2/2.9/libxml2-2.9.14.tar.xz
-2|us|https://ftp.gnome.org/pub/GNOME/sources/libxml2/2.9/libxml2-2.9.14.tar.xz
+1||https://download.gnome.org/sources/libxml2/2.9/$fn
+2|us|https://ftp.gnome.org/pub/GNOME/sources/libxml2/2.9/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/libxml2-2.9.14.tar.xz
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
diff --git a/build/distfiles/meta/links-2.29.tar.bz2/urls.do b/build/distfiles/meta/links-2.29.tar.bz2/urls.do
index fb8cac4..df31b99 100644
--- a/build/distfiles/meta/links-2.29.tar.bz2/urls.do
+++ b/build/distfiles/meta/links-2.29.tar.bz2/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|fr|http://links.twibright.com/download/links-2.29.tar.bz2
-2|fr|https://links.twibright.com/download/links-2.29.tar.bz2
+1|fr|http://links.twibright.com/download/$fn
+2|fr|https://links.twibright.com/download/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD links-2.29.tar.bz2
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/lua-5.2.4.tar.gz/urls.do b/build/distfiles/meta/lua-5.2.4.tar.gz/urls.do
index 538de72..a347adc 100644
--- a/build/distfiles/meta/lua-5.2.4.tar.gz/urls.do
+++ b/build/distfiles/meta/lua-5.2.4.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|ch|https://lua.org/ftp/lua-5.2.4.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD lua-5.2.4.tar.gz
+fn=$(basename $(pwd))
+echo "1|ch|https://lua.org/ftp/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/lua-5.4.6.tar.gz/urls.do b/build/distfiles/meta/lua-5.4.6.tar.gz/urls.do
index 5294e65..43eed45 100644
--- a/build/distfiles/meta/lua-5.4.6.tar.gz/urls.do
+++ b/build/distfiles/meta/lua-5.4.6.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|ch|https://lua.org/ftp/lua-5.4.6.tar.gz"
+fn=$(basename $(pwd))
+echo "1|ch|https://lua.org/ftp/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD lua-5.4.6.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/lzip-1.24.tar.gz/urls.do b/build/distfiles/meta/lzip-1.24.tar.gz/urls.do
index 4180aa8..61b88d0 100644
--- a/build/distfiles/meta/lzip-1.24.tar.gz/urls.do
+++ b/build/distfiles/meta/lzip-1.24.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-savannah ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-savannah lzip/lzip-1.24.tar.gz
-../../utils/urls-for-distcache-FreeBSD lzip-1.24.tar.gz
+../../utils/urls-for-savannah lzip/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/meson-0.56.0.tar.gz/urls.do b/build/distfiles/meta/meson-0.56.0.tar.gz/urls.do
index 64a48f9..192a16b 100644
--- a/build/distfiles/meta/meson-0.56.0.tar.gz/urls.do
+++ b/build/distfiles/meta/meson-0.56.0.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xf|https://files.pythonhosted.org/packages/08/a0/4d3a1eb46c83a96b49c100c30762c8f1a60b62367dd052ab8730e73ab46b/meson-0.56.0.tar.gz"
+fn=$(basename $(pwd))
+echo "1|xf|https://files.pythonhosted.org/packages/08/a0/4d3a1eb46c83a96b49c100c30762c8f1a60b62367dd052ab8730e73ab46b/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD meson-0.56.0.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/meson-1.7.2.tar.gz/urls.do b/build/distfiles/meta/meson-1.7.2.tar.gz/urls
similarity index 85%
rename from build/distfiles/meta/meson-1.7.2.tar.gz/urls.do
rename to build/distfiles/meta/meson-1.7.2.tar.gz/urls
index 94b61a1..ecb2dfb 100644
--- a/build/distfiles/meta/meson-1.7.2.tar.gz/urls.do
+++ b/build/distfiles/meta/meson-1.7.2.tar.gz/urls
@@ -1,3 +1 @@
-cat <<EOF
 0|xg|https://github.com/mesonbuild/meson/releases/download/1.7.2/meson-1.7.2.tar.gz
-EOF
diff --git a/build/distfiles/meta/mpc-0.8.2.tar.gz/urls.do b/build/distfiles/meta/mpc-0.8.2.tar.gz/urls.do
index 0d900a8..dde8ead 100644
--- a/build/distfiles/meta/mpc-0.8.2.tar.gz/urls.do
+++ b/build/distfiles/meta/mpc-0.8.2.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|fr|https://www.multiprecision.org/downloads/mpc-0.8.2.tar.gz"
+fn=$(basename $(pwd))
+echo "1|fr|https://www.multiprecision.org/downloads/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD mpc-0.8.2.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/mpc-1.3.1.tar.gz/urls.do b/build/distfiles/meta/mpc-1.3.1.tar.gz/urls.do
index 82f6d5e..1c35b44 100644
--- a/build/distfiles/meta/mpc-1.3.1.tar.gz/urls.do
+++ b/build/distfiles/meta/mpc-1.3.1.tar.gz/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu mpc/mpc-1.3.1.tar.gz
-../../utils/urls-for-distcache-FreeBSD mpc-1.3.1.tar.gz
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-gnu \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gnu mpc/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/mpfr-2.4.2.tar.xz/urls.do b/build/distfiles/meta/mpfr-2.4.2.tar.xz/urls.do
index 795b28e..f530f97 100644
--- a/build/distfiles/meta/mpfr-2.4.2.tar.xz/urls.do
+++ b/build/distfiles/meta/mpfr-2.4.2.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|fr|https://www.mpfr.org/mpfr-2.4.2/mpfr-2.4.2.tar.xz"
+fn=$(basename $(pwd))
+echo "1|fr|https://www.mpfr.org/mpfr-2.4.2/$fn"
 redo-ifchange ../../utils/urls-for-gnu
-PRI=2 ../../utils/urls-for-gnu mpfr/mpfr-2.4.2.tar.xz
+PRI=2 ../../utils/urls-for-gnu mpfr/$fn
diff --git a/build/distfiles/meta/mpfr-4.2.1.tar.xz/urls.do b/build/distfiles/meta/mpfr-4.2.1.tar.xz/urls.do
index 1637cf2..8a0bc4b 100644
--- a/build/distfiles/meta/mpfr-4.2.1.tar.xz/urls.do
+++ b/build/distfiles/meta/mpfr-4.2.1.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|fr|https://www.mpfr.org/mpfr-4.2.1/mpfr-4.2.1.tar.xz"
+fn=$(basename $(pwd))
+echo "1|fr|https://www.mpfr.org/mpfr-4.2.1/$fn"
 redo-ifchange ../../utils/urls-for-gnu
-PRI=2 ../../utils/urls-for-gnu mpfr/mpfr-4.2.1.tar.xz
+PRI=2 ../../utils/urls-for-gnu mpfr/$fn
diff --git a/build/distfiles/meta/mutt-2.3.0.tar.gz/urls b/build/distfiles/meta/mutt-2.3.0.tar.gz/urls
deleted file mode 100644
index 0c5176e..0000000
--- a/build/distfiles/meta/mutt-2.3.0.tar.gz/urls
+++ /dev/null
@@ -1,2 +0,0 @@
-1|us|http://ftp.mutt.org/pub/mutt/mutt-2.3.0.tar.gz
-2|us|https://ftp.osuosl.org/pub/mutt/mutt-2.3.0.tar.gz
diff --git a/build/distfiles/meta/mutt-2.3.0.tar.gz/urls.do b/build/distfiles/meta/mutt-2.3.0.tar.gz/urls.do
new file mode 100644
index 0000000..f25ec8d
--- /dev/null
+++ b/build/distfiles/meta/mutt-2.3.0.tar.gz/urls.do
@@ -0,0 +1,8 @@
+fn=$(basename $(pwd))
+cat <<EOF
+1|us|http://ftp.mutt.org/pub/mutt/$fn
+2|us|https://ftp.osuosl.org/pub/mutt/$fn
+EOF
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD mutt/$fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/nasm-2.16.01.tar.xz/urls.do b/build/distfiles/meta/nasm-2.16.01.tar.xz/urls.do
index 1bb2ad4..2379484 100644
--- a/build/distfiles/meta/nasm-2.16.01.tar.xz/urls.do
+++ b/build/distfiles/meta/nasm-2.16.01.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|us|https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.xz
-2|de|https://mirror.sobukus.de/files/src/nasm/nasm-2.16.01.tar.xz
+1|us|https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/$fn
+2|de|https://mirror.sobukus.de/files/src/nasm/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD nasm-2.16.01.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/ncurses-6.4.tar.gz/urls.do b/build/distfiles/meta/ncurses-6.4.tar.gz/urls.do
index 53eab9e..5b1103a 100644
--- a/build/distfiles/meta/ncurses-6.4.tar.gz/urls.do
+++ b/build/distfiles/meta/ncurses-6.4.tar.gz/urls.do
@@ -1,8 +1,9 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|us|http://invisible-island.net/archives/ncurses/ncurses-6.4.tar.gz
-1|us|http://invisible-mirror.net/archives/ncurses/ncurses-6.4.tar.gz
-2|us|https://invisible-island.net/archives/ncurses/ncurses-6.4.tar.gz
-2|us|https://invisible-mirror.net/archives/ncurses/ncurses-6.4.tar.gz
+1|us|http://invisible-island.net/archives/ncurses/$fn
+1|us|http://invisible-mirror.net/archives/ncurses/$fn
+2|us|https://invisible-island.net/archives/ncurses/$fn
+2|us|https://invisible-mirror.net/archives/ncurses/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD ncurses/ncurses-6.4.tar.gz
+../../utils/urls-for-distcache-FreeBSD ncurses/$fn
diff --git a/build/distfiles/meta/nettle-3.10.1.tar.gz/urls.do b/build/distfiles/meta/nettle-3.10.1.tar.gz/urls.do
index 4e36511..8c1d410 100644
--- a/build/distfiles/meta/nettle-3.10.1.tar.gz/urls.do
+++ b/build/distfiles/meta/nettle-3.10.1.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu nettle/nettle-3.10.1.tar.gz
-../../utils/urls-for-distcache-FreeBSD nettle-3.10.1.tar.gz
+../../utils/urls-for-gnu nettle/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/nghttp2-1.62.1.tar.xz/urls.do b/build/distfiles/meta/nghttp2-1.62.1.tar.xz/urls.do
index 0b417e7..383dd6a 100644
--- a/build/distfiles/meta/nghttp2-1.62.1.tar.xz/urls.do
+++ b/build/distfiles/meta/nghttp2-1.62.1.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/nghttp2/nghttp2/releases/download/v1.62.1/nghttp2-1.62.1.tar.xz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/nghttp2/nghttp2/releases/download/v1.62.1/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD nghttp2-1.62.1.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/normalize-0.7.7.tar.bz2/urls.do b/build/distfiles/meta/normalize-0.7.7.tar.bz2/urls.do
index 85d65fc..f7773dc 100644
--- a/build/distfiles/meta/normalize-0.7.7.tar.bz2/urls.do
+++ b/build/distfiles/meta/normalize-0.7.7.tar.bz2/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-savannah ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-savannah normalize/normalize-0.7.7.tar.bz2
-../../utils/urls-for-distcache-FreeBSD normalize-0.7.7.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-savannah \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-savannah normalize/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/npth-1.7.tar.bz2/urls.do b/build/distfiles/meta/npth-1.7.tar.bz2/urls.do
index 16daafb..86815d6 100644
--- a/build/distfiles/meta/npth-1.7.tar.bz2/urls.do
+++ b/build/distfiles/meta/npth-1.7.tar.bz2/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gcrypt ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gcrypt npth/npth-1.7.tar.bz2
-../../utils/urls-for-distcache-FreeBSD npth-1.7.tar.bz2
+../../utils/urls-for-gcrypt npth/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/nsd-4.13.0.tar.gz/urls.do b/build/distfiles/meta/nsd-4.13.0.tar.gz/urls.do
index 7ca9081..3c2a330 100644
--- a/build/distfiles/meta/nsd-4.13.0.tar.gz/urls.do
+++ b/build/distfiles/meta/nsd-4.13.0.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|de|https://www.nlnetlabs.nl/downloads/nsd/nsd-4.13.0.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD nsd-4.13.0.tar.gz
+fn=$(basename $(pwd))
+echo "1|de|https://www.nlnetlabs.nl/downloads/nsd/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/openssh-10.2p1.tar.gz/urls.do b/build/distfiles/meta/openssh-10.2p1.tar.gz/urls.do
index dc7faf3..83c9341 100644
--- a/build/distfiles/meta/openssh-10.2p1.tar.gz/urls.do
+++ b/build/distfiles/meta/openssh-10.2p1.tar.gz/urls.do
@@ -1,4 +1,4 @@
-fn=openssh-10.2p1.tar.gz
+fn=$(basename $(pwd))
 cat <<EOF
 1|at|http://ftp2.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
 1|au|http://mirror.aarnet.edu.au/pub/OpenBSD/OpenSSH/portable/$fn
@@ -92,12 +92,19 @@ cat <<EOF
 2|us|https://mirrors.sonic.net/pub/OpenBSD/OpenSSH/portable/$fn
 2|us|https://openbsd.mirror.constant.com/pub/OpenBSD/OpenSSH/portable/$fn
 2|us|https://plug-mirror.rcac.purdue.edu/pub/OpenBSD/OpenSSH/portable/$fn
-3|xc|http://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
-3|xf|http://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
-3|xl|http://mirror.leaseweb.com/pub/OpenBSD/OpenSSH/portable/$fn
-3|xp|http://mirror.planetunix.net/pub/OpenBSD/OpenSSH/portable/$fn
-4|xc|https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
-4|xf|https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
-4|xl|https://mirror.leaseweb.com/pub/OpenBSD/OpenSSH/portable/$fn
-4|xp|https://mirror.planetunix.net/pub/OpenBSD/OpenSSH/portable/$fn
 EOF
+redo-ifchange \
+    ../../utils/urls-for-leaseweb \
+    ../../utils/urls-for-planetunix \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+PRI=3 ../../utils/urls-for-leaseweb pub/OpenBSD/OpenSSH/portable/$fn
+PRI=3 ../../utils/urls-for-planetunix pub/OpenBSD/OpenSSH/portable/$fn
+cat <<EOF
+7|xc|http://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
+7|xf|http://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
+8|xc|https://cloudflare.cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
+8|xf|https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/$fn
+EOF
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/openssl-1.1.1w.tar.gz/urls.do b/build/distfiles/meta/openssl-1.1.1w.tar.gz/urls.do
index e1be623..58c0a6a 100644
--- a/build/distfiles/meta/openssl-1.1.1w.tar.gz/urls.do
+++ b/build/distfiles/meta/openssl-1.1.1w.tar.gz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|us|https://www.openssl.org/source/old/1.1.1/openssl-1.1.1w.tar.gz
-2|us|https://mirrors.ibiblio.org/openssl/source/openssl-1.1.1w.tar.gz
+1|us|https://www.openssl.org/source/old/1.1.1/$fn
+2|us|https://mirrors.ibiblio.org/openssl/source/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD openssl-1.1.1w.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/openvpn-2.6.17.tar.gz/urls b/build/distfiles/meta/openvpn-2.6.17.tar.gz/urls
deleted file mode 100644
index 36722cd..0000000
--- a/build/distfiles/meta/openvpn-2.6.17.tar.gz/urls
+++ /dev/null
@@ -1,2 +0,0 @@
-1|ca|https://swupdate.openvpn.net/community/releases/openvpn-2.6.17.tar.gz
-2|de|https://build.openvpn.net/downloads/releases/openvpn-2.6.17.tar.gz
diff --git a/build/distfiles/meta/openvpn-2.6.17.tar.gz/urls.do b/build/distfiles/meta/openvpn-2.6.17.tar.gz/urls.do
new file mode 100644
index 0000000..eabdbd5
--- /dev/null
+++ b/build/distfiles/meta/openvpn-2.6.17.tar.gz/urls.do
@@ -0,0 +1,7 @@
+fn=$(basename $(pwd))
+cat <<EOF
+1|ca|https://swupdate.openvpn.net/community/releases/$fn
+2|de|https://build.openvpn.net/downloads/releases/$fn
+EOF
+redo-ifchange ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/opus-1.6.tar.gz/urls.do b/build/distfiles/meta/opus-1.6.tar.gz/urls.do
index e36a113..0f5215f 100644
--- a/build/distfiles/meta/opus-1.6.tar.gz/urls.do
+++ b/build/distfiles/meta/opus-1.6.tar.gz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/opus/opus-1.6.tar.gz
-2||https://downloads.xiph.org/releases/opus/opus-1.6.tar.gz
+1||http://downloads.xiph.org/releases/opus/$fn
+2||https://downloads.xiph.org/releases/opus/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD opus-1.6.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/opus-tools-0.2.tar.gz/urls.do b/build/distfiles/meta/opus-tools-0.2.tar.gz/urls.do
index 5395398..4688d17 100644
--- a/build/distfiles/meta/opus-tools-0.2.tar.gz/urls.do
+++ b/build/distfiles/meta/opus-tools-0.2.tar.gz/urls.do
@@ -1,7 +1,9 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/opus/opus-tools-0.2.tar.gz
-2||https://downloads.xiph.org/releases/opus/opus-tools-0.2.tar.gz
-3|xf|https://archive.mozilla.org/pub/opus/opus-tools-0.2.tar.gz
+1||http://downloads.xiph.org/releases/opus/$fn
+2||https://downloads.xiph.org/releases/opus/$fn
+3|xf|https://archive.mozilla.org/pub/opus/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD opus-tools-0.2.tar.gz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/opusfile-0.12.tar.gz/urls.do b/build/distfiles/meta/opusfile-0.12.tar.gz/urls.do
index c2a02e2..6c1d8de 100644
--- a/build/distfiles/meta/opusfile-0.12.tar.gz/urls.do
+++ b/build/distfiles/meta/opusfile-0.12.tar.gz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/opus/opusfile-0.12.tar.gz
-2||https://downloads.xiph.org/releases/opus/opusfile-0.12.tar.gz
+1||http://downloads.xiph.org/releases/opus/$fn
+2||https://downloads.xiph.org/releases/opus/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD opusfile-0.12.tar.gz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/pango-1.54.0.tar.xz/urls b/build/distfiles/meta/pango-1.54.0.tar.xz/urls
index 6144483..809c6d2 100644
--- a/build/distfiles/meta/pango-1.54.0.tar.xz/urls
+++ b/build/distfiles/meta/pango-1.54.0.tar.xz/urls
@@ -1,2 +1,2 @@
-1|xs|https://download.gnome.org/sources/pango/1.54/pango-1.54.0.tar.xz
+1||https://download.gnome.org/sources/pango/1.54/pango-1.54.0.tar.xz
 2|us|https://ftp.gnome.org/pub/GNOME/sources/pango/1.54/pango-1.54.0.tar.xz
diff --git a/build/distfiles/meta/parallel-20240122.tar.bz2/urls.do b/build/distfiles/meta/parallel-20240122.tar.bz2/urls.do
index 7c828a5..7adcd3e 100644
--- a/build/distfiles/meta/parallel-20240122.tar.bz2/urls.do
+++ b/build/distfiles/meta/parallel-20240122.tar.bz2/urls.do
@@ -1,2 +1,2 @@
 redo-ifchange ../../utils/urls-for-gnu
-../../utils/urls-for-gnu parallel/parallel-20240122.tar.bz2
+../../utils/urls-for-gnu parallel/$(basename $(pwd))
diff --git a/build/distfiles/meta/pcre-8.45.tar.bz2/urls.do b/build/distfiles/meta/pcre-8.45.tar.bz2/urls.do
index 5a254a5..6c4f307 100644
--- a/build/distfiles/meta/pcre-8.45.tar.bz2/urls.do
+++ b/build/distfiles/meta/pcre-8.45.tar.bz2/urls.do
@@ -1,3 +1,8 @@
-redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge pcre pcre/8.45/pcre-8.45.tar.bz2
-../../utils/urls-for-distcache-FreeBSD pcre-8.45.tar.bz2
+fn=$(basename $(pwd))
+redo-ifchange \
+    ../../utils/urls-for-sourceforge \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-sourceforge pcre pcre/8.45/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/perl-5.32.1.tar.xz/urls.do b/build/distfiles/meta/perl-5.32.1.tar.xz/urls.do
index 91fe5a6..a496278 100644
--- a/build/distfiles/meta/perl-5.32.1.tar.xz/urls.do
+++ b/build/distfiles/meta/perl-5.32.1.tar.xz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-cpan ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-cpan src/5.0/perl-5.32.1.tar.xz
-../../utils/urls-for-distcache-FreeBSD perl/perl-5.32.1.tar.xz
+../../utils/urls-for-cpan src/5.0/$fn
+../../utils/urls-for-distcache-FreeBSD perl/$fn
diff --git a/build/distfiles/meta/pinentry-1.3.0.tar.bz2/urls.do b/build/distfiles/meta/pinentry-1.3.0.tar.bz2/urls.do
index efa663f..43e5ff7 100644
--- a/build/distfiles/meta/pinentry-1.3.0.tar.bz2/urls.do
+++ b/build/distfiles/meta/pinentry-1.3.0.tar.bz2/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gcrypt ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gcrypt pinentry/pinentry-1.3.0.tar.bz2
-../../utils/urls-for-distcache-FreeBSD pinentry-1.3.0.tar.bz2
+../../utils/urls-for-gcrypt pinentry/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/pkgconf-2.1.1.tar.xz/urls.do b/build/distfiles/meta/pkgconf-2.1.1.tar.xz/urls.do
index bbb38d7..173aa5d 100644
--- a/build/distfiles/meta/pkgconf-2.1.1.tar.xz/urls.do
+++ b/build/distfiles/meta/pkgconf-2.1.1.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://distfiles.dereferenced.org/pkgconf/pkgconf-2.1.1.tar.xz"
+fn=$(basename $(pwd))
+echo "1|us|https://distfiles.dereferenced.org/pkgconf/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD pkgconf-2.1.1.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/pngcrush-1.8.13.tar.xz/urls.do b/build/distfiles/meta/pngcrush-1.8.13.tar.xz/urls.do
index 9e1edc6..f1c32bb 100644
--- a/build/distfiles/meta/pngcrush-1.8.13.tar.xz/urls.do
+++ b/build/distfiles/meta/pngcrush-1.8.13.tar.xz/urls.do
@@ -1,2 +1,2 @@
 redo-ifchange ../../utils/urls-for-sourceforge
-../../utils/urls-for-sourceforge pmt pngcrush/1.8.13/pngcrush-1.8.13.tar.xz
+../../utils/urls-for-sourceforge pmt pngcrush/1.8.13/$(basename $(pwd))
diff --git a/build/distfiles/meta/postgresql-11.22.tar.bz2/urls.do b/build/distfiles/meta/postgresql-11.22.tar.bz2/urls.do
index 4933809..19f90f8 100644
--- a/build/distfiles/meta/postgresql-11.22.tar.bz2/urls.do
+++ b/build/distfiles/meta/postgresql-11.22.tar.bz2/urls.do
@@ -1,9 +1,10 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|dk|http://mirrors.dotsrc.org/postgresql/source/v11.22/postgresql-11.22.tar.bz2
-1|gb|http://mirrorservice.org/sites/ftp.postgresql.org/source/v11.22/postgresql-11.22.tar.bz2
-2|dk|https://mirrors.dotsrc.org/postgresql/source/v11.22/postgresql-11.22.tar.bz2
-2|gb|https://mirrorservice.org/sites/ftp.postgresql.org/source/v11.22/postgresql-11.22.tar.bz2
-3|xf|https://ftp.postgresql.org/pub/source/v11.22/postgresql-11.22.tar.bz2
+1|dk|http://mirrors.dotsrc.org/postgresql/source/v11.22/$fn
+1|gb|http://mirrorservice.org/sites/ftp.postgresql.org/source/v11.22/$fn
+2|dk|https://mirrors.dotsrc.org/postgresql/source/v11.22/$fn
+2|gb|https://mirrorservice.org/sites/ftp.postgresql.org/source/v11.22/$fn
+3|xf|https://ftp.postgresql.org/pub/source/v11.22/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD postgresql/postgresql-11.22.tar.bz2
+../../utils/urls-for-distcache-FreeBSD postgresql/$fn
diff --git a/build/distfiles/meta/postgresql-16.3.tar.bz2/urls.do b/build/distfiles/meta/postgresql-16.3.tar.bz2/urls.do
index ee689a0..3f9dc36 100644
--- a/build/distfiles/meta/postgresql-16.3.tar.bz2/urls.do
+++ b/build/distfiles/meta/postgresql-16.3.tar.bz2/urls.do
@@ -1,9 +1,10 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|dk|http://mirrors.dotsrc.org/postgresql/source/v16.3/postgresql-16.3.tar.bz2
-1|gb|http://mirrorservice.org/sites/ftp.postgresql.org/source/v16.3/postgresql-16.3.tar.bz2
-2|dk|https://mirrors.dotsrc.org/postgresql/source/v16.3/postgresql-16.3.tar.bz2
-2|gb|https://mirrorservice.org/sites/ftp.postgresql.org/source/v16.3/postgresql-16.3.tar.bz2
-3|xf|https://ftp.postgresql.org/pub/source/v16.3/postgresql-16.3.tar.bz2
+1|dk|http://mirrors.dotsrc.org/postgresql/source/v16.3/$fn
+1|gb|http://mirrorservice.org/sites/ftp.postgresql.org/source/v16.3/$fn
+2|dk|https://mirrors.dotsrc.org/postgresql/source/v16.3/$fn
+2|gb|https://mirrorservice.org/sites/ftp.postgresql.org/source/v16.3/$fn
+3|xf|https://ftp.postgresql.org/pub/source/v16.3/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD postgresql/postgresql-16.3.tar.bz2
+../../utils/urls-for-distcache-FreeBSD postgresql/$fn
diff --git a/build/distfiles/meta/proj-4.9.3.tar.gz/urls.do b/build/distfiles/meta/proj-4.9.3.tar.gz/urls.do
index 72dd46d..ebbb86c 100644
--- a/build/distfiles/meta/proj-4.9.3.tar.gz/urls.do
+++ b/build/distfiles/meta/proj-4.9.3.tar.gz/urls.do
@@ -1,4 +1,5 @@
-echo "1|us|http://download.osgeo.org/proj/proj-4.9.3.tar.gz"
-echo "2|us|https://download.osgeo.org/proj/proj-4.9.3.tar.gz"
+fn=$(basename $(pwd))
+echo "1|us|http://download.osgeo.org/proj/$fn"
+echo "2|us|https://download.osgeo.org/proj/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD proj-4.9.3.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/qpdf-11.9.1.tar.gz/urls.do b/build/distfiles/meta/qpdf-11.9.1.tar.gz/urls.do
index 1259985..be5d838 100644
--- a/build/distfiles/meta/qpdf-11.9.1.tar.gz/urls.do
+++ b/build/distfiles/meta/qpdf-11.9.1.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge qpdf qpdf/11.9.1/qpdf-11.9.1.tar.gz
-../../utils/urls-for-distcache-FreeBSD qpdf-11.9.1.tar.gz
+../../utils/urls-for-sourceforge qpdf qpdf/11.9.1/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/readline-8.2.tar.gz/urls.do b/build/distfiles/meta/readline-8.2.tar.gz/urls.do
index 24b2543..2694368 100644
--- a/build/distfiles/meta/readline-8.2.tar.gz/urls.do
+++ b/build/distfiles/meta/readline-8.2.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu readline/readline-8.2.tar.gz
-../../utils/urls-for-distcache-FreeBSD readline-8.2.tar.gz
+../../utils/urls-for-gnu readline/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/recutils-1.9.tar.gz/urls.do b/build/distfiles/meta/recutils-1.9.tar.gz/urls.do
index f36e841..3afe91b 100644
--- a/build/distfiles/meta/recutils-1.9.tar.gz/urls.do
+++ b/build/distfiles/meta/recutils-1.9.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu recutils/recutils-1.9.tar.gz
-../../utils/urls-for-distcache-FreeBSD recutils-1.9.tar.gz
+../../utils/urls-for-gnu recutils/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/remind-05.00.01.tar.gz/urls.do b/build/distfiles/meta/remind-05.00.01.tar.gz/urls.do
index 4abb735..efc6a0b 100644
--- a/build/distfiles/meta/remind-05.00.01.tar.gz/urls.do
+++ b/build/distfiles/meta/remind-05.00.01.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|ca|https://dianne.skoll.ca/projects/remind/download/remind-05.00.01.tar.gz"
+fn=$(basename $(pwd))
+echo "1|ca|https://dianne.skoll.ca/projects/remind/download/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD remind-05.00.01.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/rsync-3.4.1.tar.gz/urls.do b/build/distfiles/meta/rsync-3.4.1.tar.gz/urls.do
index 34d3c64..8cf610b 100644
--- a/build/distfiles/meta/rsync-3.4.1.tar.gz/urls.do
+++ b/build/distfiles/meta/rsync-3.4.1.tar.gz/urls.do
@@ -1,8 +1,9 @@
-fn=rsync-3.4.1.tar.gz
+fn=$(basename $(pwd))
 cat <<EOF
 1|de|https://download.samba.org/pub/rsync/src/$fn
 2|gb|http://mirrorservice.org/sites/rsync.samba.org/$fn
 3|gb|https://mirrorservice.org/sites/rsync.samba.org/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
 ../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/scummvm-2026.1.0.tar.xz/urls.do b/build/distfiles/meta/scummvm-2026.1.0.tar.xz/urls.do
index 33adaf8..9cb74b0 100644
--- a/build/distfiles/meta/scummvm-2026.1.0.tar.xz/urls.do
+++ b/build/distfiles/meta/scummvm-2026.1.0.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|de|https://downloads.scummvm.org/frs/scummvm/2026.1.0/scummvm-2026.1.0.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD scummvm-2026.1.0.tar.xz
+fn=$(basename $(pwd))
+echo "1|de|https://downloads.scummvm.org/frs/scummvm/2026.1.0/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/smartmontools-7.5.tar.gz/urls.do b/build/distfiles/meta/smartmontools-7.5.tar.gz/urls.do
index 6ac4562..3a7e534 100644
--- a/build/distfiles/meta/smartmontools-7.5.tar.gz/urls.do
+++ b/build/distfiles/meta/smartmontools-7.5.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/smartmontools/smartmontools/releases/download/RELEASE_7_5/smartmontools-7.5.tar.gz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/smartmontools/smartmontools/releases/download/RELEASE_7_5/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD smartmontools-7.5.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/sox-14.4.2.tar.bz2/urls.do b/build/distfiles/meta/sox-14.4.2.tar.bz2/urls.do
index 4bf8d42..75bfcb7 100644
--- a/build/distfiles/meta/sox-14.4.2.tar.bz2/urls.do
+++ b/build/distfiles/meta/sox-14.4.2.tar.bz2/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge sox sox/14.4.2/sox-14.4.2.tar.bz2
-../../utils/urls-for-distcache-FreeBSD sox-14.4.2.tar.bz2
+../../utils/urls-for-sourceforge sox sox/14.4.2/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/sqlite-src-3450100.zip/urls.do b/build/distfiles/meta/sqlite-src-3450100.zip/urls.do
index a1ff792..aa23837 100644
--- a/build/distfiles/meta/sqlite-src-3450100.zip/urls.do
+++ b/build/distfiles/meta/sqlite-src-3450100.zip/urls.do
@@ -1,7 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|us|https://www.sqlite.org/2024/sqlite-src-3450100.zip
-1|us|https://www2.sqlite.org/2024/sqlite-src-3450100.zip
-1|us|https://www3.sqlite.org/2024/sqlite-src-3450100.zip
+1|us|https://www.sqlite.org/2024/$fn
+1|us|https://www2.sqlite.org/2024/$fn
+1|us|https://www3.sqlite.org/2024/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD sqlite-src-3450100.zip
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/stow-2.3.1.tar.bz2/urls.do b/build/distfiles/meta/stow-2.3.1.tar.bz2/urls.do
index 09c3bbd..4b4ed20 100644
--- a/build/distfiles/meta/stow-2.3.1.tar.bz2/urls.do
+++ b/build/distfiles/meta/stow-2.3.1.tar.bz2/urls.do
@@ -1,3 +1,4 @@
+fn=$(basename $(pwd))
 redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-gnu stow/stow-2.3.1.tar.bz2
-../../utils/urls-for-distcache-FreeBSD stow-2.3.1.tar.bz2
+../../utils/urls-for-gnu stow/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/tcl8.6.14.tar.gz/urls.do b/build/distfiles/meta/tcl8.6.14.tar.gz/urls.do
index 5569212..df7cb1f 100644
--- a/build/distfiles/meta/tcl8.6.14.tar.gz/urls.do
+++ b/build/distfiles/meta/tcl8.6.14.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=tcl8.6.14-src.tar.gz
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge tcl Tcl/8.6.14/tcl8.6.14-src.tar.gz
-../../utils/urls-for-distcache-FreeBSD tcl8.6.14-src.tar.gz
+../../utils/urls-for-sourceforge tcl Tcl/8.6.14/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/tcllib-1.21.tar.xz/urls.do b/build/distfiles/meta/tcllib-1.21.tar.xz/urls.do
index 63166fd..d9b89c1 100644
--- a/build/distfiles/meta/tcllib-1.21.tar.xz/urls.do
+++ b/build/distfiles/meta/tcllib-1.21.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|ca|https://core.tcl-lang.org/tcllib/uv/tcllib-1.21.tar.xz"
+fn=$(basename $(pwd))
+echo "1|ca|https://core.tcl-lang.org/tcllib/uv/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD tcllib-1.21.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/texinfo-7.1.1.tar.xz/urls.do b/build/distfiles/meta/texinfo-7.1.1.tar.xz/urls.do
index 016ab58..f656c57 100644
--- a/build/distfiles/meta/texinfo-7.1.1.tar.xz/urls.do
+++ b/build/distfiles/meta/texinfo-7.1.1.tar.xz/urls.do
@@ -1,2 +1,2 @@
 redo-ifchange ../../utils/urls-for-gnu
-../../utils/urls-for-gnu texinfo/texinfo-7.1.1.tar.xz
+../../utils/urls-for-gnu texinfo/$(basename $(pwd))
diff --git a/build/distfiles/meta/tiff-4.6.0.tar.xz/urls.do b/build/distfiles/meta/tiff-4.6.0.tar.xz/urls.do
index f7dc1bb..e9a1b07 100644
--- a/build/distfiles/meta/tiff-4.6.0.tar.xz/urls.do
+++ b/build/distfiles/meta/tiff-4.6.0.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://download.osgeo.org/libtiff/tiff-4.6.0.tar.xz"
+fn=$(basename $(pwd))
+echo "1|us|https://download.osgeo.org/libtiff/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD tiff-4.6.0.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/tk8.6.14.tar.gz/urls.do b/build/distfiles/meta/tk8.6.14.tar.gz/urls.do
index add492e..3639fc9 100644
--- a/build/distfiles/meta/tk8.6.14.tar.gz/urls.do
+++ b/build/distfiles/meta/tk8.6.14.tar.gz/urls.do
@@ -1,3 +1,4 @@
+fn=tk8.6.14-src.tar.gz
 redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-sourceforge tcl Tcl/8.6.14/tk8.6.14-src.tar.gz
-../../utils/urls-for-distcache-FreeBSD tk8.6.14-src.tar.gz
+../../utils/urls-for-sourceforge tcl Tcl/8.6.14/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/tmux-3.6.tar.gz/urls.do b/build/distfiles/meta/tmux-3.6.tar.gz/urls.do
index 630b8f6..5194160 100644
--- a/build/distfiles/meta/tmux-3.6.tar.gz/urls.do
+++ b/build/distfiles/meta/tmux-3.6.tar.gz/urls.do
@@ -1,3 +1,4 @@
-echo "1|xg|https://github.com/tmux/tmux/releases/download/3.6/tmux-3.6.tar.gz"
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/tmux/tmux/releases/download/3.6/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD tmux-3.6.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/ucspi-tcp-0.88.tar.gz/urls.do b/build/distfiles/meta/ucspi-tcp-0.88.tar.gz/urls.do
index 16d1630..7fe8a86 100644
--- a/build/distfiles/meta/ucspi-tcp-0.88.tar.gz/urls.do
+++ b/build/distfiles/meta/ucspi-tcp-0.88.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|us|http://cr.yp.to/ucspi-tcp/ucspi-tcp-0.88.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD ucspi-tcp-0.88.tar.gz
+fn=$(basename $(pwd))
+echo "1|us|http://cr.yp.to/ucspi-tcp/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/unbound-1.24.2.tar.gz/urls.do b/build/distfiles/meta/unbound-1.24.2.tar.gz/urls.do
index 05f9b60..8c1e666 100644
--- a/build/distfiles/meta/unbound-1.24.2.tar.gz/urls.do
+++ b/build/distfiles/meta/unbound-1.24.2.tar.gz/urls.do
@@ -1,3 +1,5 @@
-echo "1|de|https://nlnetlabs.nl/downloads/unbound/unbound-1.24.2.tar.gz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD unbound-1.24.2.tar.gz
+fn=$(basename $(pwd))
+echo "1|de|https://nlnetlabs.nl/downloads/unbound/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/valgrind-3.26.0.tar.bz2/urls.do b/build/distfiles/meta/valgrind-3.26.0.tar.bz2/urls.do
index a4c4644..2c7137f 100644
--- a/build/distfiles/meta/valgrind-3.26.0.tar.bz2/urls.do
+++ b/build/distfiles/meta/valgrind-3.26.0.tar.bz2/urls.do
@@ -1,4 +1,4 @@
-fn=valgrind-3.26.0.tar.bz2
+fn=$(basename $(pwd))
 cat <<EOF
 1|au|http://mirror.aarnet.edu.au/pub/sourceware/valgrind/$fn
 1|de|http://ftp-stud.fht-esslingen.de/pub/Mirrors/sourceware.org/valgrind/$fn
diff --git a/build/distfiles/meta/vnstat-2.13.tar.gz/urls.do b/build/distfiles/meta/vnstat-2.13.tar.gz/urls.do
index 15a1727..822e934 100644
--- a/build/distfiles/meta/vnstat-2.13.tar.gz/urls.do
+++ b/build/distfiles/meta/vnstat-2.13.tar.gz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|gb|https://humdi.net/vnstat/vnstat-2.13.tar.gz
-2|xg|https://github.com/vergoh/vnstat/releases/download/v2.13/vnstat-2.13.tar.gz
+1|gb|https://humdi.net/vnstat/$fn
+2|xg|https://github.com/vergoh/vnstat/releases/download/v2.13/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD vnstat-2.13.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/vorbis-tools-1.4.3.tar.gz/urls.do b/build/distfiles/meta/vorbis-tools-1.4.3.tar.gz/urls.do
index ceffff5..7a598c7 100644
--- a/build/distfiles/meta/vorbis-tools-1.4.3.tar.gz/urls.do
+++ b/build/distfiles/meta/vorbis-tools-1.4.3.tar.gz/urls.do
@@ -1,6 +1,7 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1||http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.3.tar.gz
-2||https://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.3.tar.gz
+1||http://downloads.xiph.org/releases/vorbis/$fn
+2||https://downloads.xiph.org/releases/vorbis/$fn
 EOF
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD vorbis-tools-1.4.3.tar.gz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/wavpack-5.8.1.tar.xz/urls.do b/build/distfiles/meta/wavpack-5.8.1.tar.xz/urls.do
index 09825d9..0578985 100644
--- a/build/distfiles/meta/wavpack-5.8.1.tar.xz/urls.do
+++ b/build/distfiles/meta/wavpack-5.8.1.tar.xz/urls.do
@@ -1,6 +1,8 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|ca|https://www.wavpack.com/wavpack-5.8.1.tar.xz
-2|xg|https://github.com/dbry/WavPack/releases/download/5.8.1/wavpack-5.8.1.tar.xz
+1|ca|https://www.wavpack.com/$fn
+2|xg|https://github.com/dbry/WavPack/releases/download/5.8.1/$fn
 EOF
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD wavpack-5.8.1.tar.xz
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/webkitgtk-2.34.6.tar.xz/urls.do b/build/distfiles/meta/webkitgtk-2.34.6.tar.xz/urls.do
index f9792f8..c58c755 100644
--- a/build/distfiles/meta/webkitgtk-2.34.6.tar.xz/urls.do
+++ b/build/distfiles/meta/webkitgtk-2.34.6.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|pt|https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz"
+fn=$(basename $(pwd))
+echo "1|pt|https://webkitgtk.org/releases/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD gnome/webkitgtk-2.34.6.tar.xz
+../../utils/urls-for-distcache-FreeBSD gnome/$fn
diff --git a/build/distfiles/meta/wget-1.25.0.tar.lz/urls.do b/build/distfiles/meta/wget-1.25.0.tar.lz/urls.do
index e3c542c..973b471 100644
--- a/build/distfiles/meta/wget-1.25.0.tar.lz/urls.do
+++ b/build/distfiles/meta/wget-1.25.0.tar.lz/urls.do
@@ -1,2 +1,4 @@
-redo-ifchange ../../utils/urls-for-gnu
-../../utils/urls-for-gnu wget/wget-1.25.0.tar.lz
+fn=$(basename $(pwd))
+redo-ifchange ../../utils/urls-for-gnu ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-gnu wget/$fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/xapian-core-1.4.30.tar.xz/urls.do b/build/distfiles/meta/xapian-core-1.4.30.tar.xz/urls.do
index 6c83051..209842b 100644
--- a/build/distfiles/meta/xapian-core-1.4.30.tar.xz/urls.do
+++ b/build/distfiles/meta/xapian-core-1.4.30.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|fr|https://oligarchy.co.uk/xapian/1.4.30/xapian-core-1.4.30.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD xapian-core-1.4.30.tar.xz
+fn=$(basename $(pwd))
+echo "1|fr|https://oligarchy.co.uk/xapian/1.4.30/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/xmlto-0.0.26.tar.bz2/urls.do b/build/distfiles/meta/xmlto-0.0.26.tar.bz2/urls.do
index b891eb8..83c7db8 100644
--- a/build/distfiles/meta/xmlto-0.0.26.tar.bz2/urls.do
+++ b/build/distfiles/meta/xmlto-0.0.26.tar.bz2/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://releases.pagure.org/xmlto/xmlto-0.0.26.tar.bz2"
+fn=$(basename $(pwd))
+echo "1|us|https://releases.pagure.org/xmlto/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD xmlto/xmlto-0.0.26.tar.bz2
+../../utils/urls-for-distcache-FreeBSD xmlto/$fn
diff --git a/build/distfiles/meta/zathura-0.5.11.tar.xz/urls.do b/build/distfiles/meta/zathura-0.5.11.tar.xz/urls.do
index ab349e8..e3455d9 100644
--- a/build/distfiles/meta/zathura-0.5.11.tar.xz/urls.do
+++ b/build/distfiles/meta/zathura-0.5.11.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://pwmt.org/projects/zathura/download/zathura-0.5.11.tar.xz"
+fn=$(basename $(pwd))
+echo "1|us|https://pwmt.org/projects/zathura/download/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD zathura-0.5.11.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/zathura-cb-0.1.11.tar.xz/urls.do b/build/distfiles/meta/zathura-cb-0.1.11.tar.xz/urls.do
index 72224f1..b8a4eb7 100644
--- a/build/distfiles/meta/zathura-cb-0.1.11.tar.xz/urls.do
+++ b/build/distfiles/meta/zathura-cb-0.1.11.tar.xz/urls.do
@@ -1,3 +1,4 @@
-echo "1|us|https://pwmt.org/projects/zathura-cb/download/zathura-cb-0.1.11.tar.xz"
+fn=$(basename $(pwd))
+echo "1|us|https://pwmt.org/projects/zathura-cb/download/$fn"
 redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD zathura-cb-0.1.11.tar.xz
+../../utils/urls-for-distcache-FreeBSD $fn
diff --git a/build/distfiles/meta/zathura-djvu-0.2.10.tar.xz/urls.do b/build/distfiles/meta/zathura-djvu-0.2.10.tar.xz/urls.do
index 1577193..3865eef 100644
--- a/build/distfiles/meta/zathura-djvu-0.2.10.tar.xz/urls.do
+++ b/build/distfiles/meta/zathura-djvu-0.2.10.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|us|https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-0.2.10.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD zathura-djvu-0.2.10.tar.xz
+fn=$(basename $(pwd))
+echo "1|us|https://pwmt.org/projects/zathura-djvu/download/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/zathura-pdf-mupdf-0.4.4.tar.xz/urls.do b/build/distfiles/meta/zathura-pdf-mupdf-0.4.4.tar.xz/urls.do
index 2a0b3e4..390b862 100644
--- a/build/distfiles/meta/zathura-pdf-mupdf-0.4.4.tar.xz/urls.do
+++ b/build/distfiles/meta/zathura-pdf-mupdf-0.4.4.tar.xz/urls.do
@@ -1,3 +1,5 @@
-echo "1|us|https://pwmt.org/projects/zathura-pdf-mupdf/download/zathura-pdf-mupdf-0.4.4.tar.xz"
-redo-ifchange ../../utils/urls-for-distcache-FreeBSD
-../../utils/urls-for-distcache-FreeBSD zathura-pdf-mupdf-0.4.4.tar.xz
+fn=$(basename $(pwd))
+echo "1|us|https://pwmt.org/projects/zathura-pdf-mupdf/download/$fn"
+redo-ifchange ../../utils/urls-for-distcache-FreeBSD ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/zsh-5.9.tar.xz/urls.do b/build/distfiles/meta/zsh-5.9.tar.xz/urls.do
index 671ae1a..536b682 100644
--- a/build/distfiles/meta/zsh-5.9.tar.xz/urls.do
+++ b/build/distfiles/meta/zsh-5.9.tar.xz/urls.do
@@ -1,10 +1,15 @@
+fn=$(basename $(pwd))
 cat <<EOF
-1|fi|http://ftp.funet.fi/pub/unix/shells/zsh/zsh-5.9.tar.xz
-1|pl|http://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.9.tar.xz
-2|fi|https://ftp.funet.fi/pub/unix/shells/zsh/zsh-5.9.tar.xz
-2|pl|https://sunsite.icm.edu.pl/pub/unix/shells/zsh/zsh-5.9.tar.xz
-3|nl|https://www.zsh.org/pub/zsh-5.9.tar.xz
+1|fi|http://ftp.funet.fi/pub/unix/shells/zsh/$fn
+1|pl|http://sunsite.icm.edu.pl/pub/unix/shells/zsh/$fn
+2|fi|https://ftp.funet.fi/pub/unix/shells/zsh/$fn
+2|pl|https://sunsite.icm.edu.pl/pub/unix/shells/zsh/$fn
+3|nl|https://www.zsh.org/pub/$fn
 EOF
-redo-ifchange ../../utils/urls-for-sourceforge ../../utils/urls-for-distcache-FreeBSD
-PRI=4 ../../utils/urls-for-sourceforge zsh zsh/5.9/zsh-5.9.tar.xz
-../../utils/urls-for-distcache-FreeBSD zsh-5.9.tar.xz
+redo-ifchange \
+    ../../utils/urls-for-sourceforge \
+    ../../utils/urls-for-distcache-FreeBSD \
+    ../../utils/urls-for-distcache-NetBSD
+PRI=4 ../../utils/urls-for-sourceforge zsh zsh/5.9/$fn
+../../utils/urls-for-distcache-FreeBSD $fn
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/meta/zstd-1.5.7.tar.gz/urls b/build/distfiles/meta/zstd-1.5.7.tar.gz/urls
deleted file mode 100644
index fe84571..0000000
--- a/build/distfiles/meta/zstd-1.5.7.tar.gz/urls
+++ /dev/null
@@ -1 +0,0 @@
-|xg|https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz
diff --git a/build/distfiles/meta/zstd-1.5.7.tar.gz/urls.do b/build/distfiles/meta/zstd-1.5.7.tar.gz/urls.do
new file mode 100644
index 0000000..b23d20a
--- /dev/null
+++ b/build/distfiles/meta/zstd-1.5.7.tar.gz/urls.do
@@ -0,0 +1,4 @@
+fn=$(basename $(pwd))
+echo "1|xg|https://github.com/facebook/zstd/releases/download/v1.5.7/$fn"
+redo-ifchange ../../utils/urls-for-distcache-NetBSD
+../../utils/urls-for-distcache-NetBSD $fn
diff --git a/build/distfiles/utils/urls-for-cpan b/build/distfiles/utils/urls-for-cpan
index 5797f72..a04482d 100755
--- a/build/distfiles/utils/urls-for-cpan
+++ b/build/distfiles/utils/urls-for-cpan
@@ -1,4 +1,5 @@
 #!/bin/sh -e
+# http://mirrors.cpan.org/
 
 file=$1
 [ -n "$file" ]
@@ -19,7 +20,6 @@ $(( $PRI + 0 ))|cr|http://mirrors.ucr.ac.cr/CPAN/$file
 $(( $PRI + 0 ))|de|http://cpan.mirror.iphh.net/$file
 $(( $PRI + 0 ))|de|http://mirror.23m.com/cpan/$file
 $(( $PRI + 0 ))|de|http://mirror.checkdomain.de/CPAN/$file
-$(( $PRI + 0 ))|de|http://mirror.de.leaseweb.net/CPAN/$file
 $(( $PRI + 0 ))|de|http://mirror.netcologne.de/cpan/$file
 $(( $PRI + 0 ))|dk|http://mirrors.dotsrc.org/cpan/$file
 $(( $PRI + 0 ))|fr|http://cpan.tetaneutral.net/$file
@@ -37,7 +37,6 @@ $(( $PRI + 0 ))|ke|http://mirror.liquidtelecom.com/CPAN/$file
 $(( $PRI + 0 ))|kr|http://mirror.navercorp.com/CPAN/$file
 $(( $PRI + 0 ))|nc|http://cpan.lagoon.nc/pub/CPAN/$file
 $(( $PRI + 0 ))|nl|http://cpan.mirror.triple-it.nl/$file
-$(( $PRI + 0 ))|nl|http://mirror.nl.leaseweb.net/CPAN/$file
 $(( $PRI + 0 ))|nz|http://cpan.inspire.net.nz/$file
 $(( $PRI + 0 ))|pt|http://mirrors.up.pt/CPAN/$file
 $(( $PRI + 0 ))|ro|http://ftp.lug.ro/CPAN/$file
@@ -70,7 +69,6 @@ $(( $PRI + 1 ))|cn|https://mirrors.ustc.edu.cn/CPAN/$file
 $(( $PRI + 1 ))|de|https://cpan.mirror.iphh.net/$file
 $(( $PRI + 1 ))|de|https://mirror.23m.com/cpan/$file
 $(( $PRI + 1 ))|de|https://mirror.checkdomain.de/CPAN/$file
-$(( $PRI + 1 ))|de|https://mirror.de.leaseweb.net/CPAN/$file
 $(( $PRI + 1 ))|de|https://mirror.netcologne.de/cpan/$file
 $(( $PRI + 1 ))|de|https://www.planet-elektronik.de/CPAN/$file
 $(( $PRI + 1 ))|dk|https://mirrors.dotsrc.org/cpan/$file
@@ -85,7 +83,6 @@ $(( $PRI + 1 ))|jp|https://ftp.yz.yamagata-u.ac.jp/pub/lang/cpan/$file
 $(( $PRI + 1 ))|ke|https://mirror.liquidtelecom.com/CPAN/$file
 $(( $PRI + 1 ))|kr|https://mirror.navercorp.com/CPAN/$file
 $(( $PRI + 1 ))|nc|https://cpan.lagoon.nc/pub/CPAN/$file
-$(( $PRI + 1 ))|nl|https://mirror.nl.leaseweb.net/CPAN/$file
 $(( $PRI + 1 ))|nz|https://cpan.inspire.net.nz/$file
 $(( $PRI + 1 ))|ro|https://ftp.lug.ro/CPAN/$file
 $(( $PRI + 1 ))|ru|https://mirror.truenetwork.ru/CPAN/$file
@@ -102,6 +99,9 @@ $(( $PRI + 1 ))|us|https://mirror.team-cymru.org/CPAN/$file
 $(( $PRI + 1 ))|us|https://mirrors.ibiblio.org/CPAN/$file
 $(( $PRI + 1 ))|us|https://mirrors.rit.edu/CPAN/$file
 $(( $PRI + 1 ))|za|https://mirror.is.co.za/pub/cpan/$file
-$(( $PRI + 2 ))|xf|http://www.cpan.org/$file
-$(( $PRI + 3 ))|xf|https://www.cpan.org/$file
+EOF
+PRI=2 $(dirname $0)/urls-for-leaseweb CPAN/$file
+cat <<EOF
+$(( $PRI + 6 ))|xf|http://www.cpan.org/$file
+$(( $PRI + 7 ))|xf|https://www.cpan.org/$file
 EOF
diff --git a/build/distfiles/utils/urls-for-distcache-FreeBSD b/build/distfiles/utils/urls-for-distcache-FreeBSD
index 5a436a8..bf90cd7 100755
--- a/build/distfiles/utils/urls-for-distcache-FreeBSD
+++ b/build/distfiles/utils/urls-for-distcache-FreeBSD
@@ -5,7 +5,7 @@ file=$1
 PRI=${PRI:-20}
 cat <<EOF
 $(( $PRI + 0 ))||http://distcache.FreeBSD.org/ports-distfiles/$file
-$(( $PRI + 1 ))|eu|http://distcache.eu.FreeBSD.org/ports-distfiles/$file
-$(( $PRI + 1 ))|us|http://distcache.us-east.FreeBSD.org/ports-distfiles/$file
-$(( $PRI + 1 ))|us|http://distcache.us-west.FreeBSD.org/ports-distfiles/$file
+$(( $PRI + 5 ))|eu|http://distcache.eu.FreeBSD.org/ports-distfiles/$file
+$(( $PRI + 5 ))|us|http://distcache.us-east.FreeBSD.org/ports-distfiles/$file
+$(( $PRI + 5 ))|us|http://distcache.us-west.FreeBSD.org/ports-distfiles/$file
 EOF
diff --git a/build/distfiles/utils/urls-for-distcache-NetBSD b/build/distfiles/utils/urls-for-distcache-NetBSD
new file mode 100755
index 0000000..c43836c
--- /dev/null
+++ b/build/distfiles/utils/urls-for-distcache-NetBSD
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+file=$1
+[ -n "$file" ]
+PRI=${PRI:-20}
+cat <<EOF
+$(( $PRI + 0 ))|xf|http://cdn.NetBSD.org/pub/pkgsrc/distfiles/$file
+$(( $PRI + 1 ))|xf|https://cdn.NetBSD.org/pub/pkgsrc/distfiles/$file
+$(( $PRI + 5 ))|us|http://ftp.NetBSD.org/pub/pkgsrc/distfiles/$file
+$(( $PRI + 6 ))|us|https://ftp.NetBSD.org/pub/pkgsrc/distfiles/$file
+EOF
diff --git a/build/distfiles/utils/urls-for-gcrypt b/build/distfiles/utils/urls-for-gcrypt
index 84a7618..27727bf 100755
--- a/build/distfiles/utils/urls-for-gcrypt
+++ b/build/distfiles/utils/urls-for-gcrypt
@@ -1,4 +1,5 @@
 #!/bin/sh -e
+# https://gnupg.org/download/mirrors.html
 
 file=$1
 [ -n "$file" ]
diff --git a/build/distfiles/utils/urls-for-gnu b/build/distfiles/utils/urls-for-gnu
index 29a58f0..f9c1005 100755
--- a/build/distfiles/utils/urls-for-gnu
+++ b/build/distfiles/utils/urls-for-gnu
@@ -1,4 +1,5 @@
 #!/bin/sh -e
+# https://www.gnu.org/prep/ftp.html
 
 file=$1
 [ -n "$file" ]
diff --git a/build/distfiles/utils/urls-for-leaseweb b/build/distfiles/utils/urls-for-leaseweb
new file mode 100755
index 0000000..1d48376
--- /dev/null
+++ b/build/distfiles/utils/urls-for-leaseweb
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+file=$1
+[ -n "$file" ]
+PRI=${PRI:-1}
+cat <<EOF
+$(( $PRI + 0 ))||http://mirror.leaseweb.com/$file
+$(( $PRI + 1 ))||https://mirror.leaseweb.com/$file
+EOF
+for cn in ca de nl us ; do
+    echo "$(( $PRI + 2 ))|$cn|http://mirror.$cn.leaseweb.net/$file"
+    echo "$(( $PRI + 3 ))|$cn|https://mirror.$cn.leaseweb.net/$file"
+done
diff --git a/build/distfiles/utils/urls-for-planetunix b/build/distfiles/utils/urls-for-planetunix
new file mode 100755
index 0000000..1a30db4
--- /dev/null
+++ b/build/distfiles/utils/urls-for-planetunix
@@ -0,0 +1,42 @@
+#!/bin/sh -e
+# http://mirror.planetunix.net/
+
+file=$1
+[ -n "$file" ]
+PRI=${PRI:-1}
+cat <<EOF
+$(( $PRI + 0 ))||http://mirror.planetunix.net/$file
+$(( $PRI + 1 ))||https://mirror.planetunix.net/$file
+EOF
+while read cn dn ; do
+    echo "$(( $PRI + 2 ))|$cn|http://$dn.ext.planetunix.net/$file"
+    echo "$(( $PRI + 3 ))|$cn|https://$dn.ext.planetunix.net/$file"
+done <<EOF
+au metis.au
+bg phoebe.bg
+br umbriel.br
+ca elara.ca
+cn hippocamp.cn
+co mimas.co
+de oberon.de
+fr nereid.fr
+gb callisto.gb
+il tethys.il
+in ariel.in
+it belinda.it
+jp kale.jp
+kz rhea.kz
+mx triton.mx
+qa prospero.qa
+sg enceladus.sg
+th dione.th
+ua himalia.ua
+us cordelia.fl.us
+us despina.ca.us
+us galatea.ny.us
+us hyperion.wa.us
+us ophelia.tx.us
+us proteus.il.us
+us puck.ca.us
+za setebos.za
+EOF
diff --git a/build/distfiles/utils/urls-for-savannah b/build/distfiles/utils/urls-for-savannah
index 2b180ea..bc455c6 100755
--- a/build/distfiles/utils/urls-for-savannah
+++ b/build/distfiles/utils/urls-for-savannah
@@ -1,4 +1,5 @@
 #!/bin/sh -e
+# http://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html
 
 file=$1
 [ -n "$file" ]
@@ -6,32 +7,23 @@ PRI=${PRI:-1}
 cat <<EOF
 $(( $PRI + 0 ))||http://download.savannah.nongnu.org/releases/$file
 $(( $PRI + 1 ))||https://download.savannah.nongnu.org/releases/$file
-$(( $PRI + 2 ))|at|http://mirror.easyname.at/nongnu/$file
-$(( $PRI + 2 ))|at|http://mirror.kumi.systems/nongnu/$file
-$(( $PRI + 2 ))|br|http://savannah.c3sl.ufpr.br/$file
-$(( $PRI + 2 ))|ca|http://mirror.csclub.uwaterloo.ca/nongnu/$file
-$(( $PRI + 2 ))|de|http://mirror.netcologne.de/savannah/$file
-$(( $PRI + 2 ))|gb|http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/$file
-$(( $PRI + 2 ))|gr|http://fosszone.csd.auth.gr/nongnu/$file
-$(( $PRI + 2 ))|gr|http://ftp.cc.uoc.gr/mirrors/nongnu.org/$file
-$(( $PRI + 2 ))|ma|http://mirror.marwan.ma/savannah/$file
-$(( $PRI + 2 ))|nl|http://nongnu.niranjan.co/$file
-$(( $PRI + 2 ))|se|http://mirror.accum.se/mirror/gnu.org/savannah/$file
-$(( $PRI + 2 ))|us|http://download-mirror.savannah.nongnu.org/releases/$file
-$(( $PRI + 2 ))|us|http://mirrors.ocf.berkeley.edu/nongnu/$file
-$(( $PRI + 2 ))|us|http://nongnu.askapache.com/$file
-$(( $PRI + 3 ))|at|https://mirror.easyname.at/nongnu/$file
-$(( $PRI + 3 ))|at|https://mirror.kumi.systems/nongnu/$file
-$(( $PRI + 3 ))|br|https://savannah.c3sl.ufpr.br/$file
-$(( $PRI + 3 ))|ca|https://mirror.csclub.uwaterloo.ca/nongnu/$file
-$(( $PRI + 3 ))|de|https://mirror.netcologne.de/savannah/$file
-$(( $PRI + 3 ))|ec|https://mirror.cedia.org.ec/nongnu/$file
-$(( $PRI + 3 ))|gb|https://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/$file
-$(( $PRI + 3 ))|gr|https://fosszone.csd.auth.gr/nongnu/$file
-$(( $PRI + 3 ))|ma|https://mirror.marwan.ma/savannah/$file
-$(( $PRI + 3 ))|nl|https://nongnu.niranjan.co/$file
-$(( $PRI + 3 ))|se|https://mirror.accum.se/mirror/gnu.org/savannah/$file
-$(( $PRI + 3 ))|us|https://download-mirror.savannah.nongnu.org/releases/$file
-$(( $PRI + 3 ))|us|https://mirrors.ocf.berkeley.edu/nongnu/$file
-$(( $PRI + 3 ))|us|https://nongnu.askapache.com/$file
+EOF
+while read cn prefix ; do
+    echo "$(( $PRI + 2 ))|$cn|http://$prefix/$file"
+    echo "$(( $PRI + 3 ))|$cn|https://$prefix/$file"
+done <<EOF
+at mirror.easyname.at/nongnu
+at mirror.kumi.systems/nongnu
+br savannah.c3sl.ufpr.br
+ca mirror.csclub.uwaterloo.ca/nongnu
+de mirror.netcologne.de/savannah
+gb www.mirrorservice.org/sites/download.savannah.gnu.org/releases
+gr fosszone.csd.auth.gr/nongnu
+gr ftp.cc.uoc.gr/mirrors/nongnu.org
+ma mirror.marwan.ma/savannah
+nl nongnu.niranjan.co
+se mirror.accum.se/mirror/gnu.org/savannah
+us download-mirror.savannah.nongnu.org/releases
+us mirrors.ocf.berkeley.edu/nongnu
+us nongnu.askapache.com
 EOF
diff --git a/build/distfiles/utils/urls-for-sourceforge b/build/distfiles/utils/urls-for-sourceforge
index ab2b376..1b36ec1 100755
--- a/build/distfiles/utils/urls-for-sourceforge
+++ b/build/distfiles/utils/urls-for-sourceforge
@@ -1,44 +1,31 @@
 #!/bin/sh -e
+# https://sourceforge.net/p/forge/documentation/Mirrors/
 
 proj=$1
 file=$2
 [ -n "$proj" ]
 [ -n "$file" ]
 PRI=${PRI:-1}
-cat <<EOF
-$(( $PRI + 0 ))||https://sourceforge.net/projects/$proj/files/$file/download
-$(( $PRI + 1 ))|ar|http://sitsa.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|au|http://ixpeering.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|az|http://phoenixnap.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|az|http://yer.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|br|http://sinalbr.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|fr|http://deac-fra.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|fr|http://freefr.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|hk|http://zenlayer.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|in|http://excellmedia.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|lv|http://deac-riga.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|nl|http://deac-ams.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|se|http://altushost-swe.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|sg|http://onboardcloud.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|tw|http://nchc.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|us|http://cfhcable.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|us|http://gigenet.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 1 ))|za|http://tenet.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|ar|https://sitsa.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|au|https://ixpeering.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|az|https://phoenixnap.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|az|https://yer.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|br|https://sinalbr.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|fr|https://deac-fra.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|fr|https://freefr.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|hk|https://zenlayer.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|in|https://excellmedia.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|lv|https://deac-riga.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|nl|https://deac-ams.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|se|https://altushost-swe.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|sg|https://onboardcloud.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|tw|https://nchc.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|us|https://cfhcable.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|us|https://gigenet.dl.sourceforge.net/project/$proj/$file?viasf=1
-$(( $PRI + 2 ))|za|https://tenet.dl.sourceforge.net/project/$proj/$file?viasf=1
+echo "$(( $PRI + 0 ))||https://sourceforge.net/projects/$proj/files/$file/download"
+while read cn dn ; do
+    echo "$(( $PRI + 1 ))|$cn|http://$dn.dl.sourceforge.net/project/$proj/$file?viasf=1"
+    echo "$(( $PRI + 2 ))|$cn|https://$dn.dl.sourceforge.net/project/$proj/$file?viasf=1"
+done <<EOF
+ar sitsa
+au ixpeering
+az phoenixnap
+az yer
+br sinalbr
+fr deac-fra
+fr freefr
+hk zenlayer
+in excellmedia
+lv deac-riga
+nl deac-ams
+se altushost-swe
+sg onboardcloud
+tw nchc
+us cfhcable
+us gigenet
+za tenet
 EOF
diff --git a/doc/Build/Distfiles/Mirrors b/doc/Build/Distfiles/Mirrors
index 9da0225..ed50235 100644
--- a/doc/Build/Distfiles/Mirrors
+++ b/doc/Build/Distfiles/Mirrors
@@ -7,17 +7,15 @@ Here we use the following precedence preference:
 
 * balancers > mirrors > CDNs > homepage > GitHub
 * all links should use HTTP as higher priority than HTTPS
-* distcache.FreeBSD.org is used as least priority fallback
+* distcache.FreeBSD.org and cdn.NetBSD.org/pub/pkgsrc/distfiles
+  are used as least priority fallback
 
 There are special country codes for identifying and specifying CDNs:
     xa -> Akamai
     xc -> Cloudflare
     xf -> Fastly
     xg -> GitHub
-    xl -> Leaseweb
     xm -> Amazon
-    xp -> PlanetUnix
-    xs -> CDN77
 
 Example list of URLs:
 
@@ -37,7 +35,9 @@ as a fallback, having balancer entrypoint.
 
 List of known mirrors:
     => http://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html
+    => http://mirror.planetunix.net/
     => http://mirrors.cpan.org/
+    => http://www.openbsd.org/build/mirrors.dat
     => https://archlinux.org/mirrors/
     => https://cran.r-project.org/mirrors.html
     => https://crux.nu/Main/Download#Mirrors
diff --git a/doc/Build/Distfiles/Tutorial b/doc/Build/Distfiles/Tutorial
index 7a7d5be..9dfab2e 100644
--- a/doc/Build/Distfiles/Tutorial
+++ b/doc/Build/Distfiles/Tutorial
@@ -50,7 +50,7 @@ generate your urls file instead then.
 
     $ cat >$DISTFILES/meta/$tarball/urls.do <<EOF
     redo-ifchange ../../utils/urls-for-gnu
-    ../../utils/urls-for-gnu parallel/parallel-20240122.tar.bz2
+    ../../utils/urls-for-gnu parallel/$(basename $(pwd))
     EOF
 
 That is all! You may "redo $DISTFILES/meta/$tarball.meta4" to get the
-- 
2.52.0