pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Mass-change BUILD_DEPENDS to TOOL_DEPENDS.
Module Name: pkgsrc-wip
Committed By: Taylor R Campbell <riastradh%NetBSD.org@localhost>
Pushed By: riastradh
Date: Sat Jun 24 20:53:17 2023 +0000
Changeset: 880f08b4f52c77d26a377f9745352188e673f602
Modified Files:
MesaLib-dfbsd-meson/Makefile
MesaLib-dfbsd/Makefile
PHPUnit/Makefile
ReZound/Makefile
akonadi-calendar-tools/Makefile
akonadi-contacts/Makefile
akonadi-import-wizard/Makefile
akonadi-mime/Makefile
akonadi/Makefile
akonadiconsole/Makefile
akregator/Makefile
apache-arrow/Makefile
argyllcms/Makefile
ariamaestosa/Makefile
arm-trusted-firmware-sun50i_a64-crust/Makefile
audacity-cmake/Makefile
avrdude/Makefile
backplane/Makefile
bamf/Makefile
binutils-gold-git/Makefile
bitkeeper/Makefile
bitlbee-purple/Makefile
bmp-docklet/Makefile
boringssl/Makefile
breeze-gtk/Makefile
breeze-kde4/Makefile
brlcad/Makefile
bulk-test-llvm/Makefile
bup-git/Makefile
cacti-plugin-aggregate/Makefile
cacti-plugin-monitor/Makefile
cacti-plugin-realtime/Makefile
cacti-plugin-rrdclean/Makefile
cacti-plugin-settings/Makefile
cacti-plugin-thold/Makefile
canna-dict/Makefile
catfish/Makefile
chapel/Makefile
chromium/Makefile
chronograf/Makefile
cinnamon-control-center/Makefile
cinnamon-session/Makefile
cinnamon-settings-daemon/Makefile
cinnamon/Makefile
cjs/Makefile
clementine/Makefile
clfswm/Makefile
colord/Makefile
compat32_fontconfig/Makefile
compat32_libxslt/Makefile
compat32_libxslt/xsltproc-nonet.mk
copytape/Makefile
crust-firmware/Makefile
ctags-git/Makefile
cygwin/Makefile.common
d1x-rebirth/Makefile
d2x-rebirth/Makefile
dbus-dfbsd/Makefile
diablo/Makefile
dict-est-rus/Makefile
dict-freedict-eng-ara/Makefile
dict-freedict-eng-fra/Makefile
distbb-git/Makefile
drumpiler/Makefile
dub/Makefile
eciadsl-usermode/Makefile
edelib/Makefile
efl/Makefile
emerald/Makefile
epix/Makefile
erlang-git/module.mk
exabgp4/Makefile
fakenes/Makefile
fceux/Makefile
ffmpeg-git/Makefile.common
firefox-hg/mozilla-common.mk
firefox102/mozilla-common.mk
firefox69-2019Q4/mozilla-common.mk
flexdock/Makefile
flim/Makefile
flnews-devel/Makefile
fontaine/Makefile
fricas-svn/Makefile
fricas-svn/options.mk
frida-libffi/Makefile
gambas3-runtime/options.mk
gambas3/Makefile.common
gambatte-dev/Makefile
gcc46-libs/Makefile
gcc47-libs/Makefile
gdb-git/Makefile
gdcm/Makefile
git-docs-html/Makefile
glibc/Makefile
gnome-calculator/Makefile
gnome-desktop2/Makefile
gnome-jabber/Makefile
gnucash-devel/options.mk
gnuradio-monolithic/options.mk
grantlee-editor/Makefile
greybird-theme/Makefile
grub2-current/Makefile
grub2-current/download.mk
grub2-current/options.mk
gtk-d/Makefile
gtk-doc/Makefile
gxmms2/Makefile
hammer/Makefile
hare/Makefile
harec/Makefile
i3-git/Makefile
icecat/Makefile
influxdb/Makefile
jabberd14/Makefile
jacorb-lib/Makefile
jgraphx/Makefile
jhbuild/Makefile
jitsi-meet/Makefile
julia/Makefile
kaddressbook/Makefile
kalarm/Makefile
kalarmcal/Makefile
kapacitor/Makefile
kde-cli-tools/Makefile
kdepim-runtime/Makefile
kdevelop/Makefile
kdiagram/Makefile
keditbookmarks/Makefile
kfind/Makefile
kgamma5/Makefile
kget/Makefile
kgpg/Makefile
kgrab/Makefile
kgraphviewer/Makefile
khotkeys/Makefile
kinfocenter/Makefile
kleopatra/Makefile
kmail-account-wizard/Makefile
kmail/Makefile
kmailtransport/Makefile
kmenuedit/Makefile
kmymoney-git/Makefile
kmymoney4/Makefile
knotes/Makefile
kodi/Makefile
konqueror/Makefile
kontact/Makefile
korganizer/Makefile
kronometer/Makefile
kscreenlocker/Makefile
ksshaskpass/Makefile
ksysguard/Makefile
kuickshow/Makefile
kwin/Makefile
kwrited/Makefile
libalkimia/Makefile
libgamemusic/Makefile
libguestfs-appliance/Makefile
libksieve/Makefile
libksysguard/Makefile
libnfc/options.mk
libreoffice-git/Makefile
libreoffice-git/options.mk
libsocialweb/Makefile
libstacktrace/Makefile
libvirt-glib/Makefile
libvpx-git/Makefile
lidia/Makefile
lilypond-git/Makefile
linux-kbd/Makefile
linux-kernel/Makefile
linux24-kernel/Makefile
linuxdcpp/Makefile
lmdbg-current/Makefile
man-db/Makefile
mapnik/Makefile
mat/Makefile
meka-git/Makefile
miktex/Makefile
milou/Makefile
miracl/Makefile
mlton-git/Makefile
modular-xorg-server-dfbsd-meson/Makefile.common
modular-xorg-server-dfbsd/Makefile.common
mono-git/Makefile
mono/Makefile
mount-zip-git/Makefile
mount-zip-git/TODO
mount-zip/Makefile
mount-zip/TODO
mozjpeg/Makefile
mppdec/Makefile
mpv-git/Makefile
mrust-cargo/Makefile
mrust-libs/Makefile
mrust-llvm/Makefile
mrust-rustc/Makefile
mrust-rustclibs/Makefile
mtpaint-git/Makefile
mtpaint/Makefile
multisync-backup/Makefile
multisync-ldap/Makefile
multisync-opie/Makefile
multisync-palm/Makefile
multisync-syncml-moto/Makefile
multisync-syncml/Makefile
munin-common/Makefile.common
mupen64plus-extraplugins/Makefile
mupen64plus/Makefile
navidrome/Makefile
nblood/Makefile
nemo/Makefile
neomutt-git/Makefile
netbsd-awk/Makefile
newsboat/Makefile
newsboat213/Makefile
nih-current/Makefile
nix/Makefile
nyan/Makefile
ocaml-ptmap/Makefile
ocaml-sedlex/Makefile
ogmrip/Makefile
okteta/Makefile
openaxiom-svn/Makefile
openjkdf2/Makefile
openscep/Makefile
opensubdiv/options.mk
openxcom/Makefile
orion/Makefile
p5-Alien-FFI/Makefile
p5-CGI-Application-Dispatch/Makefile
p5-Catalyst-Engine-Apache/Makefile
p5-Catalyst-Log-Log4perl/Makefile
p5-Catalyst-Plugin-FillInForm/Makefile
p5-Catalyst-Plugin-FormValidator/Makefile
p5-Exception-Base/Makefile
p5-HTTP-BrowserDetect/Makefile
p5-Mail-DMARC-PurePerl/Makefile
p5-MojoX-Log-Log4perl-Tiny/Makefile
p5-OptArgs/Makefile
p5-PDL/Makefile
p5-Plucene/Makefile
p5-PluceneSimple/Makefile
p5-Test-Stub/Makefile
p5-Text-Hatena/Makefile
p5-Text-VimColor/Makefile
p5-UUID/Makefile
p5-WebService-GData/Makefile
p5-XML-RSS-LibXML/Makefile
pan2-git/Makefile
pear-Base/Makefile
pear-CakePHP_CodeSniffer/Makefile
pear-ConsoleTools/Makefile
pear-FPDF/Makefile
pear-File_Iterator/Makefile
pear-Finder/Makefile
pear-FinderFacade/Makefile
pear-Horde_ActiveSync/Makefile
pear-Horde_Alarm/Makefile
pear-Horde_Auth/Makefile
pear-Horde_Autoloader/Makefile
pear-Horde_Browser/Makefile
pear-Horde_Cache/Makefile
pear-Horde_Cli/Makefile
pear-Horde_Compress/Makefile
pear-Horde_Constraint/Makefile
pear-Horde_Controller/Makefile
pear-Horde_Data/Makefile
pear-Horde_Date/Makefile
pear-Horde_Db/Makefile
pear-Horde_Exception/Makefile
pear-Horde_Group/Makefile
pear-Horde_History/Makefile
pear-Horde_Icalendar/Makefile
pear-Horde_Injector/Makefile
pear-Horde_Lock/Makefile
pear-Horde_Log/Makefile
pear-Horde_Mime/Makefile
pear-Horde_Nls/Makefile
pear-Horde_Stream_Filter/Makefile
pear-Horde_Stream_Wrapper/Makefile
pear-Horde_Support/Makefile
pear-Horde_Text_Flowed/Makefile
pear-Horde_Translation/Makefile
pear-Horde_Url/Makefile
pear-Horde_Util/Makefile
pear-PHP_Depend/Makefile
pear-PHP_PMD/Makefile
pear-PHP_Timer/Makefile
pear-PHP_TokenStream/Makefile
pear-Swift/Makefile
pear-Text_Template/Makefile
pear-Version/Makefile
pear-Yaml/Makefile
pear-fDOMDocument/Makefile
perl5-devel/module.mk
perl5/module.mk
pgstudio/Makefile
phonon-backend-xine/Makefile
pidgin-festival/Makefile
pidgin-rhythmbox/Makefile
pike8.0/Makefile
pike8.0/builtin_module.mk
pim-data-exporter/Makefile
pim-sieve-editor/Makefile
pinkpony/Makefile
pkg_summary-utils/Makefile
plasma-desktop/Makefile
plasma-workspace/Makefile
polkit-kde-agent/Makefile
powerdevil/Makefile
psybnc/Makefile
pwnat/Makefile
py-HeapDict/Makefile
py-altair/Makefile
py-amply/Makefile
py-apache-arrow/Makefile
py-apscheduler/Makefile
py-art/Makefile
py-badges/Makefile
py-bidict/Makefile
py-branca/Makefile
py-buildbot-console-view/Makefile
py-buildbot-grid-view/Makefile
py-buildbot-waterfall-view/Makefile
py-buildbot-worker/Makefile
py-buildbot-www/Makefile
py-ccdproc2/Makefile
py-checkov/Makefile
py-chspy/Makefile
py-cityhash/Makefile
py-coconut/Makefile
py-compyle/Makefile
py-continuum-mechanics/Makefile
py-dask/Makefile
py-debtcollector/Makefile
py-deep-translator/Makefile
py-distributed/Makefile
py-djvulibre/Makefile
py-eight2/Makefile
py-einsteinpy-geodesics/Makefile
py-equation/Makefile
py-essm/Makefile
py-expression/Makefile
py-fastaudio/Makefile
py-fastcluster/Makefile
py-fastparquet/Makefile
py-goulib/Makefile
py-graphene-sqlalchemy/Makefile
py-hmmlearn/Makefile
py-hopic/Makefile
py-hotdoc/Makefile
py-hug/Makefile
py-jitcdde/Makefile
py-jitcxde-common/Makefile
py-jose/Makefile
py-librabbitmq/options.mk
py-libvirt/Makefile
py-mathics-scanner/Makefile
py-mdanalysis/Makefile
py-mesa/Makefile
py-minidb/Makefile
py-mongomock/Makefile
py-munch/Makefile
py-nameko/Makefile
py-nbimporter/Makefile
py-ndjson/Makefile
py-numdifftools/Makefile
py-orjson/Makefile
py-ortho/Makefile
py-pdfminer-six/Makefile
py-pdoc3/Makefile
py-pipenv-setup/Makefile
py-pipenv/Makefile
py-poisson-approval/Makefile
py-polars/Makefile
py-pynitrokey/Makefile
py-qstylizer/Makefile
py-reactive-papi/Makefile
py-scikits_ann/Makefile
py-screenkey/Makefile
py-spacy/Makefile
py-speex/Makefile
py-stravalib/Makefile
py-swh-core/Makefile
py-swh-deposit/Makefile
py-swh-graph/Makefile
py-swh-icinga-plugins/Makefile
py-swh-indexer/Makefile
py-swh-journal/Makefile
py-swh-lister/Makefile
py-swh-loader-core/Makefile
py-swh-loader-git/Makefile
py-swh-loader-mercurial/Makefile
py-swh-loader-svn/Makefile
py-swh-model/Makefile
py-swh-objstorage-replayer/Makefile
py-swh-objstorage/Makefile
py-swh-scheduler/Makefile
py-swh-storage/Makefile
py-swh-vault/Makefile
py-swh-web-client/Makefile
py-swh-web/Makefile
py-symbolic-equation/Makefile
py-symbolic/Makefile
py-symlens/Makefile
py-tblib/Makefile
py-test-metadata/Makefile
py-test-repeat/Makefile
py-testfixtures/Makefile
py-ua-parser/Makefile
py-update-checker/Makefile
py-zlmdb/Makefile
pywm/Makefile
pyzor/Makefile
qemu-git/Makefile
qmc2/Makefile
rakudo-star/Makefile
riak14/Makefile
ripe-rpsl-objectlibrary/Makefile
rippled/Makefile
roxterm/Makefile
rstudio/Makefile
rust/Makefile
rygel/Makefile
safekeep/Makefile
sbcl-git/Makefile
sbcl/Makefile
scsh-install-lib/Makefile
scsh-install-lib/Makefile.common
scummvm-git/Makefile
scx/Makefile
sddm/Makefile
simgrid/Makefile
simulavr-git/Makefile
slurm-wlm-devel/Makefile
smallbasic/Makefile.common
stardict/Makefile
stmd-git/Makefile
stratagus/Makefile
strongswan/Makefile
supermodel/Makefile
sushi/Makefile
svt-vp9/Makefile
syncthing-discosrv/Makefile
syncthing-inotify/Makefile
syncthing-relaysrv/Makefile
systemsettings/Makefile
tardy/TODO
tc-git/Makefile
tc-hasida-table/Makefile
tc/Makefile
telegraf/Makefile
telepathy-logger/Makefile
tendra.org-sid/Makefile
tengwar-ttf/Makefile
thunderbird/mozilla-common.mk
tilix/Makefile
tor-dev/options.mk
tuxguitar/Makefile
tuxpaint-cvs/Makefile
u-boot-full/Makefile
u-boot-khadas-vim3/Makefile
u-boot-pinebook-crust/Makefile
unmo3/Makefile
uprof/Makefile
uzbl-git/Makefile
v8-316/Makefile
v8/Makefile
varnish-modules/Makefile
varnish-slash/Makefile
vcsh/Makefile
virtualbox-svn/Makefile
virtualbox/Makefile
vista-fonts/Makefile
wasi-libc-git/Makefile
wasi-libcxx/Makefile
wla-dx/options.mk
wmc2d/Makefile
xbsql/Makefile
xmms2/TODO
xmms2/options.mk
xtreemfs-server/Makefile
zig-git/application.mk
zmap/Makefile
Log Message:
Mass-change BUILD_DEPENDS to TOOL_DEPENDS.
No change for native builds; this is, in almost every case (if not
every case) the correct change for cross builds.
As proposed for pkgsrc:
https://mail-index.netbsd.org/tech-pkg/2023/06/03/msg027632.html
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=880f08b4f52c77d26a377f9745352188e673f602
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
MesaLib-dfbsd-meson/Makefile | 4 +--
MesaLib-dfbsd/Makefile | 4 +--
PHPUnit/Makefile | 2 +-
ReZound/Makefile | 2 +-
akonadi-calendar-tools/Makefile | 2 +-
akonadi-contacts/Makefile | 2 +-
akonadi-import-wizard/Makefile | 2 +-
akonadi-mime/Makefile | 2 +-
akonadi/Makefile | 2 +-
akonadiconsole/Makefile | 2 +-
akregator/Makefile | 2 +-
apache-arrow/Makefile | 2 +-
argyllcms/Makefile | 2 +-
ariamaestosa/Makefile | 4 +--
arm-trusted-firmware-sun50i_a64-crust/Makefile | 2 +-
audacity-cmake/Makefile | 2 +-
avrdude/Makefile | 8 ++---
backplane/Makefile | 2 +-
bamf/Makefile | 2 +-
binutils-gold-git/Makefile | 2 +-
bitkeeper/Makefile | 2 +-
bitlbee-purple/Makefile | 6 ++--
bmp-docklet/Makefile | 2 +-
boringssl/Makefile | 2 +-
breeze-gtk/Makefile | 4 +--
breeze-kde4/Makefile | 2 +-
brlcad/Makefile | 14 ++++----
bulk-test-llvm/Makefile | 48 ++++++++++++-------------
bup-git/Makefile | 4 +--
cacti-plugin-aggregate/Makefile | 2 +-
cacti-plugin-monitor/Makefile | 2 +-
cacti-plugin-realtime/Makefile | 2 +-
cacti-plugin-rrdclean/Makefile | 2 +-
cacti-plugin-settings/Makefile | 2 +-
cacti-plugin-thold/Makefile | 2 +-
canna-dict/Makefile | 2 +-
catfish/Makefile | 2 +-
chapel/Makefile | 2 +-
chromium/Makefile | 20 +++++------
chronograf/Makefile | 10 +++---
cinnamon-control-center/Makefile | 4 +--
cinnamon-session/Makefile | 4 +--
cinnamon-settings-daemon/Makefile | 4 +--
cinnamon/Makefile | 2 +-
cjs/Makefile | 2 +-
clementine/Makefile | 2 +-
clfswm/Makefile | 2 +-
colord/Makefile | 4 +--
compat32_fontconfig/Makefile | 2 +-
compat32_libxslt/Makefile | 4 +--
compat32_libxslt/xsltproc-nonet.mk | 2 +-
copytape/Makefile | 2 +-
crust-firmware/Makefile | 2 +-
ctags-git/Makefile | 2 +-
cygwin/Makefile.common | 2 +-
d1x-rebirth/Makefile | 2 +-
d2x-rebirth/Makefile | 2 +-
dbus-dfbsd/Makefile | 2 +-
diablo/Makefile | 2 +-
dict-est-rus/Makefile | 4 +--
dict-freedict-eng-ara/Makefile | 2 +-
dict-freedict-eng-fra/Makefile | 2 +-
distbb-git/Makefile | 2 +-
drumpiler/Makefile | 2 +-
dub/Makefile | 2 +-
eciadsl-usermode/Makefile | 2 +-
edelib/Makefile | 4 +--
efl/Makefile | 2 +-
emerald/Makefile | 2 +-
epix/Makefile | 30 ++++++++--------
erlang-git/module.mk | 4 +--
exabgp4/Makefile | 2 +-
fakenes/Makefile | 2 +-
fceux/Makefile | 2 +-
ffmpeg-git/Makefile.common | 2 +-
firefox-hg/mozilla-common.mk | 2 +-
firefox102/mozilla-common.mk | 2 +-
firefox69-2019Q4/mozilla-common.mk | 4 +--
flexdock/Makefile | 2 +-
flim/Makefile | 2 +-
flnews-devel/Makefile | 2 +-
fontaine/Makefile | 2 +-
fricas-svn/Makefile | 2 +-
fricas-svn/options.mk | 2 +-
frida-libffi/Makefile | 2 +-
gambas3-runtime/options.mk | 12 +++----
gambas3/Makefile.common | 4 +--
gambatte-dev/Makefile | 2 +-
gcc46-libs/Makefile | 2 +-
gcc47-libs/Makefile | 2 +-
gdb-git/Makefile | 2 +-
gdcm/Makefile | 2 +-
git-docs-html/Makefile | 4 +--
glibc/Makefile | 2 +-
gnome-calculator/Makefile | 2 +-
gnome-desktop2/Makefile | 2 +-
gnome-jabber/Makefile | 12 +++----
gnucash-devel/options.mk | 2 +-
gnuradio-monolithic/options.mk | 2 +-
grantlee-editor/Makefile | 2 +-
greybird-theme/Makefile | 2 +-
grub2-current/Makefile | 2 +-
grub2-current/download.mk | 6 ++--
grub2-current/options.mk | 2 +-
gtk-d/Makefile | 2 +-
gtk-doc/Makefile | 2 +-
gxmms2/Makefile | 4 +--
hammer/Makefile | 2 +-
hare/Makefile | 6 ++--
harec/Makefile | 2 +-
i3-git/Makefile | 2 +-
icecat/Makefile | 2 +-
influxdb/Makefile | 2 +-
jabberd14/Makefile | 2 +-
jacorb-lib/Makefile | 2 +-
jgraphx/Makefile | 2 +-
jhbuild/Makefile | 2 +-
jitsi-meet/Makefile | 2 +-
julia/Makefile | 2 +-
kaddressbook/Makefile | 2 +-
kalarm/Makefile | 2 +-
kalarmcal/Makefile | 2 +-
kapacitor/Makefile | 2 +-
kde-cli-tools/Makefile | 2 +-
kdepim-runtime/Makefile | 2 +-
kdevelop/Makefile | 2 +-
kdiagram/Makefile | 2 +-
keditbookmarks/Makefile | 2 +-
kfind/Makefile | 2 +-
kgamma5/Makefile | 2 +-
kget/Makefile | 2 +-
kgpg/Makefile | 2 +-
kgrab/Makefile | 2 +-
kgraphviewer/Makefile | 2 +-
khotkeys/Makefile | 2 +-
kinfocenter/Makefile | 2 +-
kleopatra/Makefile | 2 +-
kmail-account-wizard/Makefile | 2 +-
kmail/Makefile | 2 +-
kmailtransport/Makefile | 2 +-
kmenuedit/Makefile | 2 +-
kmymoney-git/Makefile | 2 +-
kmymoney4/Makefile | 2 +-
knotes/Makefile | 2 +-
kodi/Makefile | 6 ++--
konqueror/Makefile | 2 +-
kontact/Makefile | 2 +-
korganizer/Makefile | 2 +-
kronometer/Makefile | 2 +-
kscreenlocker/Makefile | 2 +-
ksshaskpass/Makefile | 2 +-
ksysguard/Makefile | 2 +-
kuickshow/Makefile | 2 +-
kwin/Makefile | 2 +-
kwrited/Makefile | 2 +-
libalkimia/Makefile | 4 +--
libgamemusic/Makefile | 2 +-
libguestfs-appliance/Makefile | 2 +-
libksieve/Makefile | 2 +-
libksysguard/Makefile | 2 +-
libnfc/options.mk | 2 +-
libreoffice-git/Makefile | 2 +-
libreoffice-git/options.mk | 2 +-
libsocialweb/Makefile | 2 +-
libstacktrace/Makefile | 2 +-
libvirt-glib/Makefile | 2 +-
libvpx-git/Makefile | 2 +-
lidia/Makefile | 4 +--
lilypond-git/Makefile | 24 ++++++-------
linux-kbd/Makefile | 4 +--
linux-kernel/Makefile | 4 +--
linux24-kernel/Makefile | 2 +-
linuxdcpp/Makefile | 2 +-
lmdbg-current/Makefile | 2 +-
man-db/Makefile | 2 +-
mapnik/Makefile | 2 +-
mat/Makefile | 2 +-
meka-git/Makefile | 2 +-
miktex/Makefile | 4 +--
milou/Makefile | 2 +-
miracl/Makefile | 2 +-
mlton-git/Makefile | 4 +--
modular-xorg-server-dfbsd-meson/Makefile.common | 2 +-
modular-xorg-server-dfbsd/Makefile.common | 2 +-
mono-git/Makefile | 2 +-
mono/Makefile | 2 +-
mount-zip-git/Makefile | 2 +-
mount-zip-git/TODO | 2 +-
mount-zip/Makefile | 2 +-
mount-zip/TODO | 2 +-
mozjpeg/Makefile | 2 +-
mppdec/Makefile | 2 +-
mpv-git/Makefile | 4 +--
mrust-cargo/Makefile | 6 ++--
mrust-libs/Makefile | 4 +--
mrust-llvm/Makefile | 8 ++---
mrust-rustc/Makefile | 8 ++---
mrust-rustclibs/Makefile | 4 +--
mtpaint-git/Makefile | 2 +-
mtpaint/Makefile | 2 +-
multisync-backup/Makefile | 2 +-
multisync-ldap/Makefile | 2 +-
multisync-opie/Makefile | 2 +-
multisync-palm/Makefile | 2 +-
multisync-syncml-moto/Makefile | 2 +-
multisync-syncml/Makefile | 2 +-
munin-common/Makefile.common | 2 +-
mupen64plus-extraplugins/Makefile | 2 +-
mupen64plus/Makefile | 2 +-
navidrome/Makefile | 2 +-
nblood/Makefile | 2 +-
nemo/Makefile | 4 +--
neomutt-git/Makefile | 8 ++---
netbsd-awk/Makefile | 2 +-
newsboat/Makefile | 2 +-
newsboat213/Makefile | 2 +-
nih-current/Makefile | 2 +-
nix/Makefile | 8 ++---
nyan/Makefile | 2 +-
ocaml-ptmap/Makefile | 2 +-
ocaml-sedlex/Makefile | 2 +-
ogmrip/Makefile | 4 +--
okteta/Makefile | 2 +-
openaxiom-svn/Makefile | 2 +-
openjkdf2/Makefile | 2 +-
openscep/Makefile | 2 +-
opensubdiv/options.mk | 4 +--
openxcom/Makefile | 2 +-
orion/Makefile | 4 +--
p5-Alien-FFI/Makefile | 2 +-
p5-CGI-Application-Dispatch/Makefile | 6 ++--
p5-Catalyst-Engine-Apache/Makefile | 4 +--
p5-Catalyst-Log-Log4perl/Makefile | 2 +-
p5-Catalyst-Plugin-FillInForm/Makefile | 2 +-
p5-Catalyst-Plugin-FormValidator/Makefile | 2 +-
p5-Exception-Base/Makefile | 2 +-
p5-HTTP-BrowserDetect/Makefile | 6 ++--
p5-Mail-DMARC-PurePerl/Makefile | 6 ++--
p5-MojoX-Log-Log4perl-Tiny/Makefile | 2 +-
p5-OptArgs/Makefile | 4 +--
p5-PDL/Makefile | 6 ++--
p5-Plucene/Makefile | 2 +-
p5-PluceneSimple/Makefile | 6 ++--
p5-Test-Stub/Makefile | 2 +-
p5-Text-Hatena/Makefile | 2 +-
p5-Text-VimColor/Makefile | 4 +--
p5-UUID/Makefile | 2 +-
p5-WebService-GData/Makefile | 2 +-
p5-XML-RSS-LibXML/Makefile | 6 ++--
pan2-git/Makefile | 4 +--
pear-Base/Makefile | 2 +-
pear-CakePHP_CodeSniffer/Makefile | 2 +-
pear-ConsoleTools/Makefile | 2 +-
pear-FPDF/Makefile | 2 +-
pear-File_Iterator/Makefile | 2 +-
pear-Finder/Makefile | 2 +-
pear-FinderFacade/Makefile | 2 +-
pear-Horde_ActiveSync/Makefile | 2 +-
pear-Horde_Alarm/Makefile | 2 +-
pear-Horde_Auth/Makefile | 2 +-
pear-Horde_Autoloader/Makefile | 2 +-
pear-Horde_Browser/Makefile | 2 +-
pear-Horde_Cache/Makefile | 2 +-
pear-Horde_Cli/Makefile | 2 +-
pear-Horde_Compress/Makefile | 2 +-
pear-Horde_Constraint/Makefile | 2 +-
pear-Horde_Controller/Makefile | 2 +-
pear-Horde_Data/Makefile | 2 +-
pear-Horde_Date/Makefile | 2 +-
pear-Horde_Db/Makefile | 2 +-
pear-Horde_Exception/Makefile | 2 +-
pear-Horde_Group/Makefile | 2 +-
pear-Horde_History/Makefile | 2 +-
pear-Horde_Icalendar/Makefile | 2 +-
pear-Horde_Injector/Makefile | 2 +-
pear-Horde_Lock/Makefile | 2 +-
pear-Horde_Log/Makefile | 2 +-
pear-Horde_Mime/Makefile | 2 +-
pear-Horde_Nls/Makefile | 2 +-
pear-Horde_Stream_Filter/Makefile | 2 +-
pear-Horde_Stream_Wrapper/Makefile | 2 +-
pear-Horde_Support/Makefile | 2 +-
pear-Horde_Text_Flowed/Makefile | 2 +-
pear-Horde_Translation/Makefile | 2 +-
pear-Horde_Url/Makefile | 2 +-
pear-Horde_Util/Makefile | 2 +-
pear-PHP_Depend/Makefile | 2 +-
pear-PHP_PMD/Makefile | 2 +-
pear-PHP_Timer/Makefile | 2 +-
pear-PHP_TokenStream/Makefile | 2 +-
pear-Swift/Makefile | 2 +-
pear-Text_Template/Makefile | 2 +-
pear-Version/Makefile | 2 +-
pear-Yaml/Makefile | 2 +-
pear-fDOMDocument/Makefile | 2 +-
perl5-devel/module.mk | 6 ++--
perl5/module.mk | 6 ++--
pgstudio/Makefile | 2 +-
phonon-backend-xine/Makefile | 2 +-
pidgin-festival/Makefile | 2 +-
pidgin-rhythmbox/Makefile | 2 +-
pike8.0/Makefile | 4 +--
pike8.0/builtin_module.mk | 2 +-
pim-data-exporter/Makefile | 2 +-
pim-sieve-editor/Makefile | 2 +-
pinkpony/Makefile | 2 +-
pkg_summary-utils/Makefile | 2 +-
plasma-desktop/Makefile | 2 +-
plasma-workspace/Makefile | 2 +-
polkit-kde-agent/Makefile | 2 +-
powerdevil/Makefile | 2 +-
psybnc/Makefile | 2 +-
pwnat/Makefile | 2 +-
py-HeapDict/Makefile | 2 +-
py-altair/Makefile | 16 ++++-----
py-amply/Makefile | 2 +-
py-apache-arrow/Makefile | 6 ++--
py-apscheduler/Makefile | 2 +-
py-art/Makefile | 10 +++---
py-badges/Makefile | 8 ++---
py-bidict/Makefile | 22 ++++++------
py-branca/Makefile | 2 +-
py-buildbot-console-view/Makefile | 2 +-
py-buildbot-grid-view/Makefile | 2 +-
py-buildbot-waterfall-view/Makefile | 2 +-
py-buildbot-worker/Makefile | 2 +-
py-buildbot-www/Makefile | 8 ++---
py-ccdproc2/Makefile | 2 +-
py-checkov/Makefile | 10 +++---
py-chspy/Makefile | 2 +-
py-cityhash/Makefile | 2 +-
py-coconut/Makefile | 34 +++++++++---------
py-compyle/Makefile | 2 +-
py-continuum-mechanics/Makefile | 2 +-
py-dask/Makefile | 4 +--
py-debtcollector/Makefile | 2 +-
py-deep-translator/Makefile | 2 +-
py-distributed/Makefile | 4 +--
py-djvulibre/Makefile | 4 +--
py-eight2/Makefile | 2 +-
py-einsteinpy-geodesics/Makefile | 28 +++++++--------
py-equation/Makefile | 2 +-
py-essm/Makefile | 12 +++----
py-expression/Makefile | 2 +-
py-fastaudio/Makefile | 2 +-
py-fastcluster/Makefile | 2 +-
py-fastparquet/Makefile | 6 ++--
py-goulib/Makefile | 2 +-
py-graphene-sqlalchemy/Makefile | 6 ++--
py-hmmlearn/Makefile | 4 +--
py-hopic/Makefile | 2 +-
py-hotdoc/Makefile | 2 +-
py-hug/Makefile | 2 +-
py-jitcdde/Makefile | 2 +-
py-jitcxde-common/Makefile | 2 +-
py-jose/Makefile | 2 +-
py-librabbitmq/options.mk | 6 ++--
py-libvirt/Makefile | 2 +-
py-mathics-scanner/Makefile | 2 +-
py-mdanalysis/Makefile | 2 +-
py-mesa/Makefile | 10 +++---
py-minidb/Makefile | 2 +-
py-mongomock/Makefile | 2 +-
py-munch/Makefile | 2 +-
py-nameko/Makefile | 24 ++++++-------
py-nbimporter/Makefile | 2 +-
py-ndjson/Makefile | 2 +-
py-numdifftools/Makefile | 2 +-
py-orjson/Makefile | 2 +-
py-ortho/Makefile | 2 +-
py-pdfminer-six/Makefile | 4 +--
py-pdoc3/Makefile | 2 +-
py-pipenv-setup/Makefile | 12 +++----
py-pipenv/Makefile | 16 ++++-----
py-poisson-approval/Makefile | 2 +-
py-polars/Makefile | 2 +-
py-pynitrokey/Makefile | 2 +-
py-qstylizer/Makefile | 2 +-
py-reactive-papi/Makefile | 2 +-
py-scikits_ann/Makefile | 2 +-
py-screenkey/Makefile | 2 +-
py-spacy/Makefile | 2 +-
py-speex/Makefile | 2 +-
py-stravalib/Makefile | 2 +-
py-swh-core/Makefile | 2 +-
py-swh-deposit/Makefile | 2 +-
py-swh-graph/Makefile | 2 +-
py-swh-icinga-plugins/Makefile | 2 +-
py-swh-indexer/Makefile | 2 +-
py-swh-journal/Makefile | 2 +-
py-swh-lister/Makefile | 2 +-
py-swh-loader-core/Makefile | 2 +-
py-swh-loader-git/Makefile | 2 +-
py-swh-loader-mercurial/Makefile | 2 +-
py-swh-loader-svn/Makefile | 2 +-
py-swh-model/Makefile | 2 +-
py-swh-objstorage-replayer/Makefile | 2 +-
py-swh-objstorage/Makefile | 2 +-
py-swh-scheduler/Makefile | 2 +-
py-swh-storage/Makefile | 2 +-
py-swh-vault/Makefile | 2 +-
py-swh-web-client/Makefile | 2 +-
py-swh-web/Makefile | 2 +-
py-symbolic-equation/Makefile | 38 ++++++++++----------
py-symbolic/Makefile | 2 +-
py-symlens/Makefile | 2 +-
py-tblib/Makefile | 2 +-
py-test-metadata/Makefile | 2 +-
py-test-repeat/Makefile | 2 +-
py-testfixtures/Makefile | 4 +--
py-ua-parser/Makefile | 2 +-
py-update-checker/Makefile | 6 ++--
py-zlmdb/Makefile | 2 +-
pywm/Makefile | 2 +-
pyzor/Makefile | 2 +-
qemu-git/Makefile | 2 +-
qmc2/Makefile | 2 +-
rakudo-star/Makefile | 2 +-
riak14/Makefile | 2 +-
ripe-rpsl-objectlibrary/Makefile | 2 +-
rippled/Makefile | 2 +-
roxterm/Makefile | 4 +--
rstudio/Makefile | 6 ++--
rust/Makefile | 8 ++---
rygel/Makefile | 2 +-
safekeep/Makefile | 4 +--
sbcl-git/Makefile | 6 ++--
sbcl/Makefile | 4 +--
scsh-install-lib/Makefile | 2 +-
scsh-install-lib/Makefile.common | 4 +--
scummvm-git/Makefile | 2 +-
scx/Makefile | 4 +--
sddm/Makefile | 4 +--
simgrid/Makefile | 2 +-
simulavr-git/Makefile | 6 ++--
slurm-wlm-devel/Makefile | 2 +-
smallbasic/Makefile.common | 2 +-
stardict/Makefile | 2 +-
stmd-git/Makefile | 2 +-
stratagus/Makefile | 2 +-
strongswan/Makefile | 2 +-
supermodel/Makefile | 4 +--
sushi/Makefile | 2 +-
svt-vp9/Makefile | 2 +-
syncthing-discosrv/Makefile | 2 +-
syncthing-inotify/Makefile | 2 +-
syncthing-relaysrv/Makefile | 2 +-
systemsettings/Makefile | 2 +-
tardy/TODO | 2 +-
tc-git/Makefile | 2 +-
tc-hasida-table/Makefile | 2 +-
tc/Makefile | 2 +-
telegraf/Makefile | 2 +-
telepathy-logger/Makefile | 2 +-
tendra.org-sid/Makefile | 6 ++--
tengwar-ttf/Makefile | 2 +-
thunderbird/mozilla-common.mk | 2 +-
tilix/Makefile | 4 +--
tor-dev/options.mk | 2 +-
tuxguitar/Makefile | 2 +-
tuxpaint-cvs/Makefile | 2 +-
u-boot-full/Makefile | 2 +-
u-boot-khadas-vim3/Makefile | 2 +-
u-boot-pinebook-crust/Makefile | 2 +-
unmo3/Makefile | 2 +-
uprof/Makefile | 2 +-
uzbl-git/Makefile | 4 +--
v8-316/Makefile | 2 +-
v8/Makefile | 2 +-
varnish-modules/Makefile | 2 +-
varnish-slash/Makefile | 4 +--
vcsh/Makefile | 6 ++--
virtualbox-svn/Makefile | 10 +++---
virtualbox/Makefile | 8 ++---
vista-fonts/Makefile | 2 +-
wasi-libc-git/Makefile | 2 +-
wasi-libcxx/Makefile | 2 +-
wla-dx/options.mk | 2 +-
wmc2d/Makefile | 2 +-
xbsql/Makefile | 2 +-
xmms2/TODO | 2 +-
xmms2/options.mk | 8 ++---
xtreemfs-server/Makefile | 2 +-
zig-git/application.mk | 2 +-
zmap/Makefile | 2 +-
485 files changed, 797 insertions(+), 797 deletions(-)
diffs:
diff --git a/MesaLib-dfbsd-meson/Makefile b/MesaLib-dfbsd-meson/Makefile
index 0b460dfac9..0721285efe 100644
--- a/MesaLib-dfbsd-meson/Makefile
+++ b/MesaLib-dfbsd-meson/Makefile
@@ -138,9 +138,9 @@ MESON_ARGS+= -Dglx-read-only-text=true
.endif
PYTHON_FOR_BUILD_ONLY= yes
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
# needed to build vulkan support
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+TOOL_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
.include "../../lang/python/tool.mk"
diff --git a/MesaLib-dfbsd/Makefile b/MesaLib-dfbsd/Makefile
index fe708822b5..0caa958962 100644
--- a/MesaLib-dfbsd/Makefile
+++ b/MesaLib-dfbsd/Makefile
@@ -76,9 +76,9 @@ MESON_ARGS+= -Dglx-read-only-text=true
.endif
PYTHON_FOR_BUILD_ONLY= yes
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
# needed to build vulkan support
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+TOOL_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
.include "../../lang/python/tool.mk"
diff --git a/PHPUnit/Makefile b/PHPUnit/Makefile
index b1ea6c4b97..96eda55888 100644
--- a/PHPUnit/Makefile
+++ b/PHPUnit/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.phpunit.de/
COMMENT= PHP regression testing framework for unit tests
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
DEPENDS+= ${PHP_PKG_PREFIX}-pear-PHP_CodeCoverage>=1.2.7:../../wip/pear-PHP_CodeCoverage
DEPENDS+= ${PHP_PKG_PREFIX}-pear-PHP_Timer>=1.0.4:../../wip/pear-PHP_Timer
diff --git a/ReZound/Makefile b/ReZound/Makefile
index 82e310d234..46cedcc7aa 100644
--- a/ReZound/Makefile
+++ b/ReZound/Makefile
@@ -12,7 +12,7 @@ COMMENT= Audio editor with graphical interface
LICENSE= gnu-gpl-v2
# needs real bison and not yacc
-#BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
+#TOOL_DEPENDS+= bison-[0-9]*:../../devel/bison
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-jack
diff --git a/akonadi-calendar-tools/Makefile b/akonadi-calendar-tools/Makefile
index c3d696ab1a..25c8e901d8 100644
--- a/akonadi-calendar-tools/Makefile
+++ b/akonadi-calendar-tools/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/akonadi-contacts/Makefile b/akonadi-contacts/Makefile
index f91b449097..158622ba10 100644
--- a/akonadi-contacts/Makefile
+++ b/akonadi-contacts/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-#BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+#TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/akonadi-import-wizard/Makefile b/akonadi-import-wizard/Makefile
index e7868c743f..242403929c 100644
--- a/akonadi-import-wizard/Makefile
+++ b/akonadi-import-wizard/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/akonadi-mime/Makefile b/akonadi-mime/Makefile
index 56388e42b8..a099e2d2ed 100644
--- a/akonadi-mime/Makefile
+++ b/akonadi-mime/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/akonadi/Makefile b/akonadi/Makefile
index 9659fbfccc..08c82f47bf 100644
--- a/akonadi/Makefile
+++ b/akonadi/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
DEPENDS+= kdesignerplugin-[0-9]*:../../x11/kdesignerplugin
CMAKE_ARGS+= -DMYSQLD_EXECUTABLE="${PREFIX}/sbin/mysqld"
diff --git a/akonadiconsole/Makefile b/akonadiconsole/Makefile
index 4997b026cb..a816610fe0 100644
--- a/akonadiconsole/Makefile
+++ b/akonadiconsole/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/akregator/Makefile b/akregator/Makefile
index edf5fb16b1..ba23c3d054 100644
--- a/akregator/Makefile
+++ b/akregator/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/apache-arrow/Makefile b/apache-arrow/Makefile
index 77396d5c87..5b49e2044f 100644
--- a/apache-arrow/Makefile
+++ b/apache-arrow/Makefile
@@ -57,7 +57,7 @@ CMAKE_ARGS+= -DARROW_BUILD_TESTS=OFF
post-install:
${MV} ${DESTDIR}${PREFIX}/share/gdb/auto-load/${LOCALBASE}/lib/libarrow.so.${APACHE_ARROW_VERSION:S/.//g}.0.0-gdb.py ${DESTDIR}${PREFIX}/share/arrow/gdb/
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
# Needs gnu install for -v option
.if ${OPSYS} == "NetBSD"
TOOL_DEPENDS+= coreutils>=0:../../sysutils/coreutils
diff --git a/argyllcms/Makefile b/argyllcms/Makefile
index 4ef6f3113f..9213aee479 100644
--- a/argyllcms/Makefile
+++ b/argyllcms/Makefile
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= zlib/zlib.pc.in
BUILDLINK_TRANSFORM+= rm:-ldl
-BUILD_DEPENDS+= jam>=2.5.2:../../devel/jam
+TOOL_DEPENDS+= jam>=2.5.2:../../devel/jam
do-build:
cd ${WRKSRC} && ${SETENV} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \
diff --git a/ariamaestosa/Makefile b/ariamaestosa/Makefile
index f5a0299f37..4e43143e53 100644
--- a/ariamaestosa/Makefile
+++ b/ariamaestosa/Makefile
@@ -13,8 +13,8 @@ HOMEPAGE= http://ariamaestosa.sourceforge.net/
COMMENT= Open-source (GPL) midi tracker/editor
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND public-domain
-BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
-BUILD_DEPENDS+= irrxml-1.2:../../wip/irrxml
+TOOL_DEPENDS+= scons-[0-9]*:../../devel/scons
+TOOL_DEPENDS+= irrxml-1.2:../../wip/irrxml
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c++
diff --git a/arm-trusted-firmware-sun50i_a64-crust/Makefile b/arm-trusted-firmware-sun50i_a64-crust/Makefile
index bf6b4b8bbe..c17ca27bad 100644
--- a/arm-trusted-firmware-sun50i_a64-crust/Makefile
+++ b/arm-trusted-firmware-sun50i_a64-crust/Makefile
@@ -32,7 +32,7 @@ BUILD_TARGET= bl31
SSP_SUPPORTED= no
FORTIFY_SUPPORTED= no
-BUILD_DEPENDS+= cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
+TOOL_DEPENDS+= cross-aarch64-none-elf-gcc-[0-9]*:../../cross/aarch64-none-elf-gcc
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/arm-trusted-firmware/${PLATFORM}
diff --git a/audacity-cmake/Makefile b/audacity-cmake/Makefile
index 0d8819245e..934069936d 100644
--- a/audacity-cmake/Makefile
+++ b/audacity-cmake/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 # AND cc-by-v3.0-license
WRKSRC= ${WRKDIR}/audacity-${GITHUB_PROJECT}-${PKGVERSION_NOREV}
-BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
+TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
USE_CMAKE= yes
USE_TOOLS+= pkg-config msgfmt msgmerge
diff --git a/avrdude/Makefile b/avrdude/Makefile
index 233f2e3def..a94b13fddb 100644
--- a/avrdude/Makefile
+++ b/avrdude/Makefile
@@ -32,12 +32,12 @@ PLIST_VARS+= doc
PLIST.doc= yes
TEXINFO_REQD= 4.9
USE_TOOLS+= texi2html makeinfo
-BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
-BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
-BUILD_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
+TOOL_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
+TOOL_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
+TOOL_DEPENDS+= tex-pdftex-[0-9]*:../../print/tex-pdftex
# DragonFly has stripped makeinfo in the base - without texi2dvi.
. if ${OPSYS} == "DragonFly"
-BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
+TOOL_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
. endif
CONFIGURE_ARGS+= --enable-doc
.else
diff --git a/backplane/Makefile b/backplane/Makefile
index faef64026d..23363977c8 100644
--- a/backplane/Makefile
+++ b/backplane/Makefile
@@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.backplane.com/
COMMENT= Innovative RDBMS database by Matthew Dillon
-BUILD_DEPENDS+= dxmake>=0:../../wip/dxmake
+TOOL_DEPENDS+= dxmake>=0:../../wip/dxmake
.include "../../mk/bsd.prefs.mk"
diff --git a/bamf/Makefile b/bamf/Makefile
index a67a2350a1..6ce15c81ba 100644
--- a/bamf/Makefile
+++ b/bamf/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config gsed
-BUILD_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
PYTHON_VERSIONS_ACCEPTED= 27
diff --git a/binutils-gold-git/Makefile b/binutils-gold-git/Makefile
index 0c88bb0342..2c4e1604be 100644
--- a/binutils-gold-git/Makefile
+++ b/binutils-gold-git/Makefile
@@ -55,7 +55,7 @@ AUTO_MKDIRS= yes
.include "../../mk/bsd.prefs.mk"
# TEST_DEPENDS
-#BUILD_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu
+#TOOL_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu
#check-base:
# ${RUN}${_ULIMIT_CMD} cd ${TEST_DIRS} && ${TEST_MAKE_CMD} -j1 check TESTS="gdb.base/*.exp"
diff --git a/bitkeeper/Makefile b/bitkeeper/Makefile
index 9ee20418fc..d7f69c0c6a 100644
--- a/bitkeeper/Makefile
+++ b/bitkeeper/Makefile
@@ -13,7 +13,7 @@ LICENSE= apache-2.0
USE_TOOLS+= gmake bison lex groff perl bash pkg-config
-BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
BUILD_DIRS= src
diff --git a/bitlbee-purple/Makefile b/bitlbee-purple/Makefile
index 1c8b1d6cd2..295dcc2c5e 100644
--- a/bitlbee-purple/Makefile
+++ b/bitlbee-purple/Makefile
@@ -11,9 +11,9 @@ HOMEPAGE= https://www.bitlbee.org/
COMMENT= IRC to other chat networks gateway (libpurple)
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
-BUILD_DEPENDS+= w3m-[0-9]*:../../www/w3m
-BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= w3m-[0-9]*:../../www/w3m
+TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
HAS_CONFIGURE= yes
USE_TOOLS+= gmake pkg-config
diff --git a/bmp-docklet/Makefile b/bmp-docklet/Makefile
index 6b3b45a5e8..1c263766b8 100644
--- a/bmp-docklet/Makefile
+++ b/bmp-docklet/Makefile
@@ -18,5 +18,5 @@ USE_TOOLS+= intltool pkg-config
USE_PKGLOCALEDIR= YES
.include "../../audio/bmp/buildlink3.mk"
-# XXX Should we use BUILD_DEPENDS instead?
+# XXX Should we use TOOL_DEPENDS instead?
.include "../../mk/bsd.pkg.mk"
diff --git a/boringssl/Makefile b/boringssl/Makefile
index 0d1cd0d86c..40b80bd914 100644
--- a/boringssl/Makefile
+++ b/boringssl/Makefile
@@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/boringssl
.include "../../lang/go/version.mk"
-BUILD_DEPENDS+= ${GO_PACKAGE_DEP}
+TOOL_DEPENDS+= ${GO_PACKAGE_DEP}
USE_TOOLS+= cmake perl
USE_LANGUAGES+= c gnu++11
diff --git a/breeze-gtk/Makefile b/breeze-gtk/Makefile
index 53ae21c775..b2eabb2b25 100644
--- a/breeze-gtk/Makefile
+++ b/breeze-gtk/Makefile
@@ -9,8 +9,8 @@ LICENSE= gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= sassc-[0-9]*:../../www/sassc
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+TOOL_DEPENDS+= sassc-[0-9]*:../../www/sassc
+TOOL_DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
PYTHON_VERSIONS_INCOMPATIBLE= 27
diff --git a/breeze-kde4/Makefile b/breeze-kde4/Makefile
index d171494f28..836ad3a2b4 100644
--- a/breeze-kde4/Makefile
+++ b/breeze-kde4/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v3
DISTINFO_FILE= ${.CURDIR}/../../wip/breeze/distinfo
-BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
+TOOL_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
USE_TOOLS+= pkg-config perl
diff --git a/brlcad/Makefile b/brlcad/Makefile
index e512831695..7abc60dd79 100644
--- a/brlcad/Makefile
+++ b/brlcad/Makefile
@@ -57,13 +57,13 @@ PKGCONFIG_OVERRIDE+= src/other/libz/zlib.pc.in
# What else?
NOT_PAX_MPROTECT_SAFE+= brlcad/bin/mged
-BUILD_DEPENDS+= astyle-[0-9]*:../../devel/astyle
-# BUILD_DEPENDS+= lemon-[0-9]*:../../devel/lemon # built in
-# BUILD_DEPENDS+= re2c-[0-9]*:../../devel/re2c # built in
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt # for xsltproc
-BUILD_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
-BUILD_DEPENDS+= swig-[0-9]*:../../devel/swig
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= astyle-[0-9]*:../../devel/astyle
+# TOOL_DEPENDS+= lemon-[0-9]*:../../devel/lemon # built in
+# TOOL_DEPENDS+= re2c-[0-9]*:../../devel/re2c # built in
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt # for xsltproc
+TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
+TOOL_DEPENDS+= swig-[0-9]*:../../devel/swig
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
# brlcad builds intermediate tools and uses it to process files to be built
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/lib
diff --git a/bulk-test-llvm/Makefile b/bulk-test-llvm/Makefile
index 4a981ef53b..f062e62323 100644
--- a/bulk-test-llvm/Makefile
+++ b/bulk-test-llvm/Makefile
@@ -21,29 +21,29 @@ NO_BIN_ON_FTP= ${RESTRICTED}
.include "../../lang/python/pyversion.mk"
-BUILD_DEPENDS+= clang-[0-9]*:../../wip/clang
-#BUILD_DEPENDS+= creduce-[0-9]*:../../devel/creduce
-BUILD_DEPENDS+= cvise-[0-9]*:../../devel/cvise
-BUILD_DEPENDS+= firefox-[0-9]*:../../www/firefox
-BUILD_DEPENDS+= firefox-esr-[0-9]*:../../www/firefox-esr
-BUILD_DEPENDS+= include-what-you-use-[0-9]*:../../wip/include-what-you-use
-BUILD_DEPENDS+= polly-[0-9]*:../../wip/polly
-BUILD_DEPENDS+= qtcreator-[0-9]*:../../editors/qtcreator
-BUILD_DEPENDS+= libcxx-[0-9]*:../../wip/libcxx
-BUILD_DEPENDS+= libcxxabi-[0-9]*:../../wip/libcxxabi
-BUILD_DEPENDS+= libunwind-[0-9]*:../../wip/libunwind
-BUILD_DEPENDS+= lld-[0-9]*:../../wip/lld
-BUILD_DEPENDS+= lldb-[0-9]*:../../wip/lldb
-BUILD_DEPENDS+= mozjs78-[0-9]*:../../lang/mozjs78
-BUILD_DEPENDS+= opencl-clang-[0-9]*:../../parallel/opencl-clang
-BUILD_DEPENDS+= openmp-[0-9]*:../../wip/openmp
-BUILD_DEPENDS+= pocl-[0-9]*:../../parallel/pocl
-BUILD_DEPENDS+= ${PYPKGPREFIX}-llvmlite-[0-9]*:../../devel/py-llvmlite
-BUILD_DEPENDS+= rust-[0-9]*:../../lang/rust
-BUILD_DEPENDS+= seamonkey-[0-9]*:../../www/seamonkey
-BUILD_DEPENDS+= spirv-llvm-translator-[0-9]*:../../parallel/spirv-llvm-translator
-BUILD_DEPENDS+= thunderbird-[0-9]*:../../mail/thunderbird
-BUILD_DEPENDS+= woboq_codebrowser-[0-9]*:../../devel/woboq_codebrowser
-BUILD_DEPENDS+= zig-[0-9]*:../../lang/zig
+TOOL_DEPENDS+= clang-[0-9]*:../../wip/clang
+#TOOL_DEPENDS+= creduce-[0-9]*:../../devel/creduce
+TOOL_DEPENDS+= cvise-[0-9]*:../../devel/cvise
+TOOL_DEPENDS+= firefox-[0-9]*:../../www/firefox
+TOOL_DEPENDS+= firefox-esr-[0-9]*:../../www/firefox-esr
+TOOL_DEPENDS+= include-what-you-use-[0-9]*:../../wip/include-what-you-use
+TOOL_DEPENDS+= polly-[0-9]*:../../wip/polly
+TOOL_DEPENDS+= qtcreator-[0-9]*:../../editors/qtcreator
+TOOL_DEPENDS+= libcxx-[0-9]*:../../wip/libcxx
+TOOL_DEPENDS+= libcxxabi-[0-9]*:../../wip/libcxxabi
+TOOL_DEPENDS+= libunwind-[0-9]*:../../wip/libunwind
+TOOL_DEPENDS+= lld-[0-9]*:../../wip/lld
+TOOL_DEPENDS+= lldb-[0-9]*:../../wip/lldb
+TOOL_DEPENDS+= mozjs78-[0-9]*:../../lang/mozjs78
+TOOL_DEPENDS+= opencl-clang-[0-9]*:../../parallel/opencl-clang
+TOOL_DEPENDS+= openmp-[0-9]*:../../wip/openmp
+TOOL_DEPENDS+= pocl-[0-9]*:../../parallel/pocl
+TOOL_DEPENDS+= ${PYPKGPREFIX}-llvmlite-[0-9]*:../../devel/py-llvmlite
+TOOL_DEPENDS+= rust-[0-9]*:../../lang/rust
+TOOL_DEPENDS+= seamonkey-[0-9]*:../../www/seamonkey
+TOOL_DEPENDS+= spirv-llvm-translator-[0-9]*:../../parallel/spirv-llvm-translator
+TOOL_DEPENDS+= thunderbird-[0-9]*:../../mail/thunderbird
+TOOL_DEPENDS+= woboq_codebrowser-[0-9]*:../../devel/woboq_codebrowser
+TOOL_DEPENDS+= zig-[0-9]*:../../lang/zig
.include "../../mk/bsd.pkg.mk"
diff --git a/bup-git/Makefile b/bup-git/Makefile
index 28d2238832..c615cc5881 100644
--- a/bup-git/Makefile
+++ b/bup-git/Makefile
@@ -16,8 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-tornado-[0-9]*:../../www/py-tornado
DEPENDS+= git-base-[0-9]*:../../devel/git-base
# actually a TEST_DEPENDS
-BUILD_DEPENDS+= rsync>=3.0:../../net/rsync
-BUILD_DEPENDS+= rdiff-backup-[0-9]*:../../sysutils/rdiff-backup
+TOOL_DEPENDS+= rsync>=3.0:../../net/rsync
+TOOL_DEPENDS+= rdiff-backup-[0-9]*:../../sysutils/rdiff-backup
PYTHON_VERSIONS_ACCEPTED= 27 # py-fuse-bindings
diff --git a/cacti-plugin-aggregate/Makefile b/cacti-plugin-aggregate/Makefile
index dbcf3e245c..c51cc677e3 100644
--- a/cacti-plugin-aggregate/Makefile
+++ b/cacti-plugin-aggregate/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/aggregate
EXTRACT_USING= gtar
-BUILD_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
+TOOL_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
DEPENDS+= cacti>=0.8.7g:../../net/cacti
USE_TOOLS+= gtar
diff --git a/cacti-plugin-monitor/Makefile b/cacti-plugin-monitor/Makefile
index 58b2e7811e..a6c42af99c 100644
--- a/cacti-plugin-monitor/Makefile
+++ b/cacti-plugin-monitor/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/monitor
EXTRACT_USING= gtar
-BUILD_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
+TOOL_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
DEPENDS+= cacti>=0.8.7:../../net/cacti
USE_TOOLS+= gtar
diff --git a/cacti-plugin-realtime/Makefile b/cacti-plugin-realtime/Makefile
index 794a021916..12d7683b32 100644
--- a/cacti-plugin-realtime/Makefile
+++ b/cacti-plugin-realtime/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/realtime
EXTRACT_USING= gtar
-BUILD_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
+TOOL_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
DEPENDS+= cacti>=0.8.7:../../net/cacti
USE_TOOLS+= gtar
diff --git a/cacti-plugin-rrdclean/Makefile b/cacti-plugin-rrdclean/Makefile
index 8097558383..133bea5680 100644
--- a/cacti-plugin-rrdclean/Makefile
+++ b/cacti-plugin-rrdclean/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/rrdclean
EXTRACT_USING= gtar
-BUILD_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
+TOOL_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
DEPENDS+= cacti>=0.8.7g:../../net/cacti
USE_TOOLS+= gtar
diff --git a/cacti-plugin-settings/Makefile b/cacti-plugin-settings/Makefile
index bac8e8ad76..39b8764506 100644
--- a/cacti-plugin-settings/Makefile
+++ b/cacti-plugin-settings/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/settings
EXTRACT_USING= gtar
-BUILD_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
+TOOL_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
DEPENDS+= cacti>=0.8.7:../../net/cacti
USE_TOOLS+= gtar
diff --git a/cacti-plugin-thold/Makefile b/cacti-plugin-thold/Makefile
index 8d99fd98cb..dfbcea2935 100644
--- a/cacti-plugin-thold/Makefile
+++ b/cacti-plugin-thold/Makefile
@@ -18,7 +18,7 @@ NO_BUILD= yes
WRKSRC= ${WRKDIR}/thold
EXTRACT_USING= gtar
-BUILD_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
+TOOL_DEPENDS+= gtar-[0-9]*:../../archivers/gtar
DEPENDS+= cacti>=0.8.7:../../net/cacti
USE_TOOLS+= gtar
diff --git a/canna-dict/Makefile b/canna-dict/Makefile
index 05664d86d0..cf06af0a16 100644
--- a/canna-dict/Makefile
+++ b/canna-dict/Makefile
@@ -8,7 +8,7 @@ MAKE_JOBS_SAFE= no
LICENSE= mit
-BUILD_DEPENDS+= Canna-server>=${CANNA_VERSION}:../../wip/canna-server
+TOOL_DEPENDS+= Canna-server>=${CANNA_VERSION}:../../wip/canna-server
EVAL_PREFIX+= CANNASERVERBINDIR=Canna-server
.for cmd in MERGE FORCPP FORSORT SPLITWORD MERGEWORD CRXGRAM CRXDIC CRFREQ KPDIC
diff --git a/catfish/Makefile b/catfish/Makefile
index 6e4d256785..49194e0b50 100644
--- a/catfish/Makefile
+++ b/catfish/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
USE_TOOLS= intltool
-BUILD_DEPENDS+= ${PYPKGPREFIX}-distutils-extra-[0-9]*:../../wip/py-distutils-extra
+TOOL_DEPENDS+= ${PYPKGPREFIX}-distutils-extra-[0-9]*:../../wip/py-distutils-extra
DEPENDS+= ${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
diff --git a/chapel/Makefile b/chapel/Makefile
index df1f3a954e..8459fd0570 100644
--- a/chapel/Makefile
+++ b/chapel/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://chapel-lang.org/
COMMENT= The Chapel programming language
LICENSE= apache-2.0
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
USE_TOOLS= bash:run pkg-config gmake perl
USE_LIBTOOL= yes
diff --git a/chromium/Makefile b/chromium/Makefile
index 096b51b88d..a591442416 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -23,16 +23,16 @@ CHECK_PORTABILITY_SKIP+= third_party/llvm/flang/tools/f18/flang.sh.in
CHECK_PORTABILITY_SKIP+= third_party/llvm/polly/lib/External/isl/configure
CHECK_PORTABILITY_SKIP+= v8/tools/run-llprof.sh
-BUILD_DEPENDS+= gperf>=3.0.1:../../devel/gperf
-BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
-BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
-BUILD_DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
-BUILD_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
-BUILD_DEPENDS+= ${PYPKGPREFIX}-ply-[0-9]*:../../devel/py-ply
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
-BUILD_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
-BUILD_DEPENDS+= openjdk11-[0-9]*:../../lang/openjdk11
-#BUILD_DEPENDS+= clang-[0-9]*:../../lang/clang # clang-format
+TOOL_DEPENDS+= gperf>=3.0.1:../../devel/gperf
+TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
+TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
+TOOL_DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
+TOOL_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
+TOOL_DEPENDS+= ${PYPKGPREFIX}-ply-[0-9]*:../../devel/py-ply
+TOOL_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
+TOOL_DEPENDS+= openjdk11-[0-9]*:../../lang/openjdk11
+#TOOL_DEPENDS+= clang-[0-9]*:../../lang/clang # clang-format
PYTHON_VERSIONS_ACCEPTED= 27 # python3 not supported.
diff --git a/chronograf/Makefile b/chronograf/Makefile
index 8f2a2d03c9..524672e3d0 100644
--- a/chronograf/Makefile
+++ b/chronograf/Makefile
@@ -34,11 +34,11 @@ WRKSRC= ${WRKDIR}/src/github.com/influxdata/chronograf
USE_TOOLS+= gmake curl
USE_LANGUAGES+= c c++
-BUILD_DEPENDS+= go110-1.10.*:../../lang/go110
-BUILD_DEPENDS+= py27-gyp-[0-9]*:../../devel/gyp
-BUILD_DEPENDS+= python27-2.7.*:../../lang/python27
-BUILD_DEPENDS+= npm-6.*.*:../../lang/npm
-BUILD_DEPENDS+= yarn-1.7.*:../../devel/yarn
+TOOL_DEPENDS+= go110-1.10.*:../../lang/go110
+TOOL_DEPENDS+= py27-gyp-[0-9]*:../../devel/gyp
+TOOL_DEPENDS+= python27-2.7.*:../../lang/python27
+TOOL_DEPENDS+= npm-6.*.*:../../lang/npm
+TOOL_DEPENDS+= yarn-1.7.*:../../devel/yarn
# go language executables don't have SSP support
CHECK_SSP_SKIP= bin/*
diff --git a/cinnamon-control-center/Makefile b/cinnamon-control-center/Makefile
index 3709242f61..b0d3aeec1f 100644
--- a/cinnamon-control-center/Makefile
+++ b/cinnamon-control-center/Makefile
@@ -28,8 +28,8 @@ MAKE_DIRS= ${PKG_SYSCONFDIR}/menus
CONF_FILES= share/examples/menus/cinnamoncc.menu \
${PKG_SYSCONFDIR}/menus/cinnamoncc.menu
-BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
#DEPENDS+= cheese-[0-9]*:../../graphics/cheese
diff --git a/cinnamon-session/Makefile b/cinnamon-session/Makefile
index eaa841de0a..fe2ca08812 100644
--- a/cinnamon-session/Makefile
+++ b/cinnamon-session/Makefile
@@ -13,8 +13,8 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
USE_TOOLS+= pkg-config intltool msgfmt
-BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
LDFLAGS.SunOS+= -lsocket
diff --git a/cinnamon-settings-daemon/Makefile b/cinnamon-settings-daemon/Makefile
index 87f8767c3f..0aa87405bf 100644
--- a/cinnamon-settings-daemon/Makefile
+++ b/cinnamon-settings-daemon/Makefile
@@ -66,8 +66,8 @@ CONF_FILES+= ${EGDIR}/cinnamon-settings-daemon-a11y-keyboard.desktop \
pre-configure:
cd ${WRKSRC} && NOCONFIGURE=1 ./autogen.sh
-BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
.include "../../devel/glib2/schemas.mk"
.include "../../print/cups-base/buildlink3.mk"
diff --git a/cinnamon/Makefile b/cinnamon/Makefile
index 5e256a401c..faa28dbd88 100644
--- a/cinnamon/Makefile
+++ b/cinnamon/Makefile
@@ -99,7 +99,7 @@ DEPENDS+= gnome-icon-theme-[0-9]*:../../graphics/gnome-icon-theme
DEPENDS+= mate-polkit-[0-9]*:../../security/mate-polkit
DEPENDS+= mozilla-rootcerts-openssl-[0-9]*:../../security/mozilla-rootcerts-openssl
DEPENDS+= muffin>=4.6.2:../../wip/muffin
-BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
.include "../../lang/python/application.mk"
.include "../../devel/glib2/schemas.mk"
diff --git a/cjs/Makefile b/cjs/Makefile
index 82f7e8598e..67138bcd56 100644
--- a/cjs/Makefile
+++ b/cjs/Makefile
@@ -20,7 +20,7 @@ USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --disable-profiler
-BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
.include "../../devel/meson/build.mk"
.include "../../lang/mozjs78/buildlink3.mk"
diff --git a/clementine/Makefile b/clementine/Makefile
index a506ee9810..e002a2ddce 100644
--- a/clementine/Makefile
+++ b/clementine/Makefile
@@ -37,7 +37,7 @@ CMAKE_ARGS+= -DENABLE_SPOTIFY_BLOB=OFF \
-DBUILD_WERROR=OFF
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake \
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake \
pkgconf>=0.9.10:../../devel/pkgconf
DEPENDS+= qt4-tiff>=4.5.0:../../x11/qt4-tiff \
diff --git a/clfswm/Makefile b/clfswm/Makefile
index 0d0a72680e..5dbb587e72 100644
--- a/clfswm/Makefile
+++ b/clfswm/Makefile
@@ -20,7 +20,7 @@ USE_GNU_READLINE= yes
# Wide arch support, although no native machine code generation (only byte-code, JIT).
# X11 bindings
-BUILD_DEPENDS+= clisp-new-clx>=2.43:../../x11/clisp-new-clx
+TOOL_DEPENDS+= clisp-new-clx>=2.43:../../x11/clisp-new-clx
CONFIGURE_ARGS= -l clisp
CONFIGURE_ARGS+= -d ${WRKSRC}/dump/
CONFIGURE_ARGS+= --with-clfswm ${WRKSRC}
diff --git a/colord/Makefile b/colord/Makefile
index b7985ebf91..6970e07be4 100644
--- a/colord/Makefile
+++ b/colord/Makefile
@@ -28,8 +28,8 @@ MESON_ARGS+= -Dbash_completion=false
PKGCONFIG_OVERRIDE+= lib/colorhug/colorhug.pc.in
PKGCONFIG_OVERRIDE+= lib/colord/colord.pc.in
-BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
-BUILD_DEPENDS+= docbook-xsl-ns-[0-9]*:../../wip/docbook-xsl-ns
+TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
+TOOL_DEPENDS+= docbook-xsl-ns-[0-9]*:../../wip/docbook-xsl-ns
.include "options.mk"
diff --git a/compat32_fontconfig/Makefile b/compat32_fontconfig/Makefile
index 6433ed6cfb..5591608954 100644
--- a/compat32_fontconfig/Makefile
+++ b/compat32_fontconfig/Makefile
@@ -13,7 +13,7 @@ COMMENT= Library for configuring and customizing font access
#LICENSE= x11?
# https://bugs.freedesktop.org/show_bug.cgi?id=101280
-BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config msgfmt
diff --git a/compat32_libxslt/Makefile b/compat32_libxslt/Makefile
index f804d2aef2..1a4072629d 100644
--- a/compat32_libxslt/Makefile
+++ b/compat32_libxslt/Makefile
@@ -2,8 +2,8 @@
.include "Makefile.common"
-BUILD_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= docbook-xml-[0-9]*:../../textproc/docbook-xml
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
USE_LIBTOOL= yes
USE_TOOLS+= gmake perl
diff --git a/compat32_libxslt/xsltproc-nonet.mk b/compat32_libxslt/xsltproc-nonet.mk
index 1fa6f31a1b..1d7399363d 100644
--- a/compat32_libxslt/xsltproc-nonet.mk
+++ b/compat32_libxslt/xsltproc-nonet.mk
@@ -1,6 +1,6 @@
# $NetBSD: xsltproc-nonet.mk,v 1.3 2015/07/09 01:56:44 richard Exp $
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
pre-configure: create-xsltproc-wrapper
diff --git a/copytape/Makefile b/copytape/Makefile
index a05454edfd..745e93be0f 100644
--- a/copytape/Makefile
+++ b/copytape/Makefile
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .Z
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Copytape duplicates magnetic tapes, with only one drive
-BUILD_DEPENDS+= gsharutils>=4.2.1nb2:../../archivers/gsharutils
+TOOL_DEPENDS+= gsharutils>=4.2.1nb2:../../archivers/gsharutils
WRKSRC= ${WRKDIR}
BUILD_TARGET= copytape
diff --git a/crust-firmware/Makefile b/crust-firmware/Makefile
index 4a63260508..ffb7237f47 100644
--- a/crust-firmware/Makefile
+++ b/crust-firmware/Makefile
@@ -17,7 +17,7 @@ LICENSE= modified-bsd
USE_TOOLS+= gmake yacc flex
-BUILD_DEPENDS+= cross-or1k-none-elf-gcc-[0-9]*:../../cross/or1k-none-elf-gcc
+TOOL_DEPENDS+= cross-or1k-none-elf-gcc-[0-9]*:../../cross/or1k-none-elf-gcc
MAKE_FLAGS+= CROSS_COMPILE=${PREFIX}/cross-or1k-none-elf/bin/or1k-none-elf-
diff --git a/ctags-git/Makefile b/ctags-git/Makefile
index 93db5e8a54..a5ee2ac1e5 100644
--- a/ctags-git/Makefile
+++ b/ctags-git/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://ctags.io/
COMMENT= Maintained ctags implementation
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
USE_TOOLS= aclocal autoreconf autoconf automake autoheader
USE_TOOLS+= bash gmake perl pkg-config
diff --git a/cygwin/Makefile.common b/cygwin/Makefile.common
index b2b30004af..cdd9848597 100644
--- a/cygwin/Makefile.common
+++ b/cygwin/Makefile.common
@@ -14,7 +14,7 @@ CONFIGURE_ENV+= CYGWIN_TARGET=${CYGWIN_TARGET:Q}
PATH:= ${PREFIX}/cross/bin:${PATH}
-BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
+TOOL_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
. if defined(GNU_CONFIGURE)
CONFIGURE_ARGS= # reset
diff --git a/d1x-rebirth/Makefile b/d1x-rebirth/Makefile
index a11491586e..6743e5e2eb 100644
--- a/d1x-rebirth/Makefile
+++ b/d1x-rebirth/Makefile
@@ -14,7 +14,7 @@ COMMENT= Source port of the Descent 1 engine
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-BUILD_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
+TOOL_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
SCONS= ${PREFIX}/bin/scons
SCONS_ARGS+= -C ${WRKSRC}
SCONS_ARGS+= DESTDIR=${DESTDIR}
diff --git a/d2x-rebirth/Makefile b/d2x-rebirth/Makefile
index b5187ccd05..18db8a9154 100644
--- a/d2x-rebirth/Makefile
+++ b/d2x-rebirth/Makefile
@@ -14,7 +14,7 @@ COMMENT= Source port of the Descent 2 engine
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-BUILD_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
+TOOL_DEPENDS+= ${PYPKGPREFIX}-scons-[0-9]*:../../devel/scons
SCONS= ${PREFIX}/bin/scons
SCONS_ARGS+= -C ${WRKSRC}
SCONS_ARGS+= DESTDIR=${DESTDIR}
diff --git a/dbus-dfbsd/Makefile b/dbus-dfbsd/Makefile
index b4c06b41f4..d4748fb571 100644
--- a/dbus-dfbsd/Makefile
+++ b/dbus-dfbsd/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
CONFLICTS+= dbus-glib<0.71
CONFLICTS+= py27-dbus<0.71
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
GNU_CONFIGURE= YES
USE_TOOLS+= gmake msgfmt pkg-config
diff --git a/diablo/Makefile b/diablo/Makefile
index f3b991f123..b22faa5620 100644
--- a/diablo/Makefile
+++ b/diablo/Makefile
@@ -20,7 +20,7 @@ NEWS_DIR= ${PREFIX}/news
#USE_TOOLS+= xmake
-BUILD_DEPENDS+= xmake>=1.06:../../devel/xmake
+TOOL_DEPENDS+= xmake>=1.06:../../devel/xmake
SUBST_CLASSES+= paths
SUBST_FILES.paths= ${WRKSRC}/XMakefile.inc
diff --git a/dict-est-rus/Makefile b/dict-est-rus/Makefile
index 171e363e6c..e37cf7c638 100644
--- a/dict-est-rus/Makefile
+++ b/dict-est-rus/Makefile
@@ -12,8 +12,8 @@ MAINTAINER= cheusov%NetBSD.org@localhost
HOMEPAGE= https://sourceforge.net/projects/er-dict
COMMENT= DICTD data for Estonian-Russian dictionary
-BUILD_DEPENDS+= dict-server>=1.10.2:../../textproc/dict-server
-BUILD_DEPENDS+= metamail>=1.10.2:../../mail/metamail
+TOOL_DEPENDS+= dict-server>=1.10.2:../../textproc/dict-server
+TOOL_DEPENDS+= metamail>=1.10.2:../../mail/metamail
DEPENDS+= dict-server>=1.9.14:../../textproc/dict-server
DICTD_DB_DIR= ${PREFIX}/share/dictd
diff --git a/dict-freedict-eng-ara/Makefile b/dict-freedict-eng-ara/Makefile
index 16c8ea918e..682a72209b 100644
--- a/dict-freedict-eng-ara/Makefile
+++ b/dict-freedict-eng-ara/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.freedict.org/ar/
COMMENT= Dict package for English-Arabic Freedict dictionary
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= dict-server>=1.10.2:../../textproc/dict-server
+TOOL_DEPENDS+= dict-server>=1.10.2:../../textproc/dict-server
DEPENDS+= dict-server>=1.9.14:../../textproc/dict-server
DICTSRCNAME= ${DISTNAME:S/freedict-//S/-0.0.2//}
diff --git a/dict-freedict-eng-fra/Makefile b/dict-freedict-eng-fra/Makefile
index eb63d24f95..f044c99be4 100644
--- a/dict-freedict-eng-fra/Makefile
+++ b/dict-freedict-eng-fra/Makefile
@@ -17,7 +17,7 @@ DICTSRCNAME= ${DISTNAME}
USE_TOOLS+= gzip
DEPENDS+= dict-server>=1.9.14:../../textproc/dict-server
-BUILD_DEPENDS+= dict-server>=1.10.2:../../textproc/dict-server
+TOOL_DEPENDS+= dict-server>=1.10.2:../../textproc/dict-server
DICTD_DB_DIR= ${PREFIX}/share/dictd
INSTALLATION_DIRS+= ${DICTD_DB_DIR}
diff --git a/distbb-git/Makefile b/distbb-git/Makefile
index 7aa11f3322..a871633e92 100644
--- a/distbb-git/Makefile
+++ b/distbb-git/Makefile
@@ -19,7 +19,7 @@ DEPENDS+= runawk>=1.1.0:../../lang/runawk
DEPENDS+= pipestatus>=0.6.0:../../devel/pipestatus
DEPENDS+= digest-[0-9]*:../../pkgtools/digest
-BUILD_DEPENDS+= mk-configure>=0.21:../../devel/mk-configure
+TOOL_DEPENDS+= mk-configure>=0.21:../../devel/mk-configure
WRKSRC= ${WRKDIR}/distbb
diff --git a/drumpiler/Makefile b/drumpiler/Makefile
index 739ca93b20..533f82c375 100644
--- a/drumpiler/Makefile
+++ b/drumpiler/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://drumpiler.sourceforge.net/
COMMENT= Drum machine compiler
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= SDL-1.2.[0-9]*:../../devel/SDL
+TOOL_DEPENDS+= SDL-1.2.[0-9]*:../../devel/SDL
SDL_CONFIG= ${PREFIX}/bin/sdl-config
CFLAGS+= `${SDL_CONFIG} --cflags`
diff --git a/dub/Makefile b/dub/Makefile
index cf0d0d99b9..c5dcdb6980 100644
--- a/dub/Makefile
+++ b/dub/Makefile
@@ -24,6 +24,6 @@ do-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/dub ${DESTDIR}${PREFIX}/bin
-BUILD_DEPENDS+= ldc>1.0:../../wip/ldc
+TOOL_DEPENDS+= ldc>1.0:../../wip/ldc
.include "../../mk/bsd.pkg.mk"
diff --git a/eciadsl-usermode/Makefile b/eciadsl-usermode/Makefile
index 88e2887fdc..5e9202520d 100644
--- a/eciadsl-usermode/Makefile
+++ b/eciadsl-usermode/Makefile
@@ -10,7 +10,7 @@ COMMENT= Driver for Globespan chipset-based ADSL USB modems
ONLY_FOR_PLATFORM= NetBSD-*-i386
-BUILD_DEPENDS+= userppp>=001107:../../net/userppp
+TOOL_DEPENDS+= userppp>=001107:../../net/userppp
CHECK_PORTABILITY_SKIP= configure.sav
diff --git a/edelib/Makefile b/edelib/Makefile
index 2186f8433f..7de30107b9 100644
--- a/edelib/Makefile
+++ b/edelib/Makefile
@@ -37,12 +37,12 @@ REPLACE_SH+= autogen.sh configure \
test/abicheck.sh tools/geniconmap
.else
# doxygen doesn't build from pkgsrc on Solaris now - handle this better later
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
.endif
.include "options.mk"
-BUILD_DEPENDS+= jam-[0-9]*:../../devel/jam
+TOOL_DEPENDS+= jam-[0-9]*:../../devel/jam
.include "../../mk/fam.buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
diff --git a/efl/Makefile b/efl/Makefile
index b9fd7bb1cb..947a6e2788 100644
--- a/efl/Makefile
+++ b/efl/Makefile
@@ -46,7 +46,7 @@ SUBST_SED.xdg+= -e 's,/etc/xdg,${PKG_SYSCONFDIR}/xdg,g'
REPLACE_PYTHON+= src/bin/exactness/exactness_play.in
REPLACE_PYTHON+= src/bin/exactness/exactness_record.in
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
diff --git a/emerald/Makefile b/emerald/Makefile
index 26f0108132..275b97d819 100644
--- a/emerald/Makefile
+++ b/emerald/Makefile
@@ -27,5 +27,5 @@ PKGCONFIG_OVERRIDE+= libengine/emeraldengine.pc.in
.include "../../devel/libwnck/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
.include "../../mk/bsd.pkg.mk"
diff --git a/epix/Makefile b/epix/Makefile
index 30db6e2ae1..6dc3e50c4b 100644
--- a/epix/Makefile
+++ b/epix/Makefile
@@ -14,21 +14,21 @@ USE_LANGUAGES= c c++
USE_TOOLS= bash:run ghostscript gmake makeinfo
INFO_FILES= yes
-BUILD_DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex
-BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
-BUILD_DEPENDS+= tex-amsmath-[0-9]*:../../print/tex-amsmath
-BUILD_DEPENDS+= tex-eepic-[0-9]*:../../graphics/tex-eepic
-BUILD_DEPENDS+= tex-pstricks-[0-9]*:../../graphics/tex-pstricks
-BUILD_DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor
-BUILD_DEPENDS+= tex-comment-[0-9]*:../../print/tex-comment
-BUILD_DEPENDS+= tex-iftex-[0-9]*:../../print/tex-iftex
-BUILD_DEPENDS+= tex-pgf-[0-9]*:../../print/tex-pgf
-BUILD_DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry
-BUILD_DEPENDS+= tex-index-[0-9]*:../../print/tex-index
-BUILD_DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref
-BUILD_DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk
-BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
-BUILD_DEPENDS+= tex-pst-tools-[0-9]*:../../graphics/tex-pst-tools
+TOOL_DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex
+TOOL_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+TOOL_DEPENDS+= tex-amsmath-[0-9]*:../../print/tex-amsmath
+TOOL_DEPENDS+= tex-eepic-[0-9]*:../../graphics/tex-eepic
+TOOL_DEPENDS+= tex-pstricks-[0-9]*:../../graphics/tex-pstricks
+TOOL_DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor
+TOOL_DEPENDS+= tex-comment-[0-9]*:../../print/tex-comment
+TOOL_DEPENDS+= tex-iftex-[0-9]*:../../print/tex-iftex
+TOOL_DEPENDS+= tex-pgf-[0-9]*:../../print/tex-pgf
+TOOL_DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry
+TOOL_DEPENDS+= tex-index-[0-9]*:../../print/tex-index
+TOOL_DEPENDS+= tex-hyperref-[0-9]*:../../print/tex-hyperref
+TOOL_DEPENDS+= makeindexk-[0-9]*:../../textproc/makeindexk
+TOOL_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
+TOOL_DEPENDS+= tex-pst-tools-[0-9]*:../../graphics/tex-pst-tools
REPLACE_BASH+= elaps.in epix.in flix.in laps.in
diff --git a/erlang-git/module.mk b/erlang-git/module.mk
index 830601a1a0..3d8b64eb4f 100644
--- a/erlang-git/module.mk
+++ b/erlang-git/module.mk
@@ -6,10 +6,10 @@
PKGNAME?= erlang-${DISTNAME}
.if defined(REBAR3_BUILD)
-BUILD_DEPENDS+= rebar3-[0-9]*:../../devel/rebar3
+TOOL_DEPENDS+= rebar3-[0-9]*:../../devel/rebar3
REBAR= ${PREFIX}/bin/rebar3
.else
-BUILD_DEPENDS+= rebar-[0-9]*:../../devel/rebar
+TOOL_DEPENDS+= rebar-[0-9]*:../../devel/rebar
.endif
USE_TOOLS+= gmake pax
diff --git a/exabgp4/Makefile b/exabgp4/Makefile
index fbaa56d36a..95bdee7221 100644
--- a/exabgp4/Makefile
+++ b/exabgp4/Makefile
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/exabgp-${VERSION}
#USE_TOOLS+= perl:run
#PYTHON_VERSIONED_DEPENDENCIES+= setuptools
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
REPLACE_PERL+= etc/exabgp/examples/dynamic-1.pl
REPLACE_PERL+= etc/exabgp/examples/watchdog-1.pl
diff --git a/fakenes/Makefile b/fakenes/Makefile
index 8e5a7a5b0c..84477e7696 100644
--- a/fakenes/Makefile
+++ b/fakenes/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://fakenes.sourceforge.net/
COMMENT= Portable Open Source NES emulator
-BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
+TOOL_DEPENDS+= nasm>=0.98:../../devel/nasm
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
diff --git a/fceux/Makefile b/fceux/Makefile
index 2ca5efd133..ac398c0e8e 100644
--- a/fceux/Makefile
+++ b/fceux/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_LANGUAGES= c c++
-BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
+TOOL_DEPENDS+= scons-[0-9]*:../../devel/scons
USE_TOOLS+= pkg-config
INSTALLATION_DIRS+= bin share/applications share/pixmaps
diff --git a/ffmpeg-git/Makefile.common b/ffmpeg-git/Makefile.common
index ccf5c4ce1c..a61f69b250 100644
--- a/ffmpeg-git/Makefile.common
+++ b/ffmpeg-git/Makefile.common
@@ -52,7 +52,7 @@ SUBST_SED.sunwspro+= -e "s/-std=c99/-xc99=all/"
SUBST_SED.sunwspro+= -e "s/-Wl,-rpath-link,/-L /g"
.endif
-BUILD_DEPENDS+= yasm>=0.7.2:../../devel/yasm
+TOOL_DEPENDS+= yasm>=0.7.2:../../devel/yasm
REPLACE_PERL+= doc/texi2pod.pl
REPLACE_SH+= configure version.sh
diff --git a/firefox-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index 06a70ca538..5772ee24b7 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -14,7 +14,7 @@ UNLIMIT_RESOURCES+= datasize
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
+TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm
# Enable Google widevine CDM. This requires external libwidevinecdm.so.
#CONFIGURE_ARGS+= --enable-eme=widevine
diff --git a/firefox102/mozilla-common.mk b/firefox102/mozilla-common.mk
index b65e9a680a..4bd1797aa0 100644
--- a/firefox102/mozilla-common.mk
+++ b/firefox102/mozilla-common.mk
@@ -113,7 +113,7 @@ CONFIGURE_ARGS+= --with-libclang-path=${PREFIX}/lib
# RLBox WASM sandbox
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
# For wasm-ld command
-BUILD_DEPENDS+= lld-[0-9]*:../../wip/lld
+TOOL_DEPENDS+= lld-[0-9]*:../../wip/lld
.include "../../wip/wasi-libc/buildlink3.mk"
.include "../../wip/wasi-libcxx/buildlink3.mk"
# NB the exact versions of the clang and wasi-compiler-rt dependencies must
diff --git a/firefox69-2019Q4/mozilla-common.mk b/firefox69-2019Q4/mozilla-common.mk
index dd54ebfc60..cb5dedef99 100644
--- a/firefox69-2019Q4/mozilla-common.mk
+++ b/firefox69-2019Q4/mozilla-common.mk
@@ -31,8 +31,8 @@ TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
.endif
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-BUILD_DEPENDS+= nasm>=1.1:../../devel/nasm
-BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
+TOOL_DEPENDS+= nasm>=1.1:../../devel/nasm
+TOOL_DEPENDS+= yasm>=1.1:../../devel/yasm
.endif
# For rustc/cargo detection
diff --git a/flexdock/Makefile b/flexdock/Makefile
index 1f4bbd6243..70d853986d 100644
--- a/flexdock/Makefile
+++ b/flexdock/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Swing windowing and docking framework
LICENSE= apache-2.0
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
+TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
USE_LANGUAGES= # none
USE_JAVA= run
AUTO_MKDIRS= yes
diff --git a/flim/Makefile b/flim/Makefile
index 865ab394ba..79b4bbf691 100644
--- a/flim/Makefile
+++ b/flim/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://git.chise.org/elisp/flim/
COMMENT= Emacs lisp library for message representation/encoding
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3
-BUILD_DEPENDS+= qkc-[0-9]*:../../converters/qkc
+TOOL_DEPENDS+= qkc-[0-9]*:../../converters/qkc
INSTALLATION_DIRS+= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/flim \
${EMACS_INFOPREFIX:C|^${PREFIX}/||}
diff --git a/flnews-devel/Makefile b/flnews-devel/Makefile
index 4a52e48b53..990a6c3ac6 100644
--- a/flnews-devel/Makefile
+++ b/flnews-devel/Makefile
@@ -77,7 +77,7 @@ do-configure:
${SETENV} ${CONFIGURE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} config
.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER:Msunpro}
-BUILD_DEPENDS+= makedepend-[0-9]*:../../devel/makedepend
+TOOL_DEPENDS+= makedepend-[0-9]*:../../devel/makedepend
.endif
BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3
diff --git a/fontaine/Makefile b/fontaine/Makefile
index 12ee6b8460..c87d4196b2 100644
--- a/fontaine/Makefile
+++ b/fontaine/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
USE_CMAKE= yes
USE_LANGUAGES= c++ c
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fricas-svn/Makefile b/fricas-svn/Makefile
index 44d5ecc7da..6e548c1c29 100644
--- a/fricas-svn/Makefile
+++ b/fricas-svn/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://fricas.sourceforge.net/
COMMENT= FriCAS is a fork of the Axiom computer algebra system
LICENSE= modified-bsd
-BUILD_DEPENDS+= noweb-[0-9]*:../../devel/noweb
+TOOL_DEPENDS+= noweb-[0-9]*:../../devel/noweb
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/fricas-svn/options.mk b/fricas-svn/options.mk
index f2c2febd22..2af51f03af 100644
--- a/fricas-svn/options.mk
+++ b/fricas-svn/options.mk
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS+= clisp x11
# Select Lisp backend
.if !empty(PKG_OPTIONS:Mclisp)
FASL= fas
-BUILD_DEPENDS+= clisp>=2.41:../../lang/clisp
+TOOL_DEPENDS+= clisp>=2.41:../../lang/clisp
CONFIGURE_ARGS+= --with-lisp=clisp
.endif
.if !empty(PKG_OPTIONS:Msbcl)
diff --git a/frida-libffi/Makefile b/frida-libffi/Makefile
index 230fb6772d..b65c9073cb 100644
--- a/frida-libffi/Makefile
+++ b/frida-libffi/Makefile
@@ -37,7 +37,7 @@ pre-build:
.if !empty(PKGSRC_RUN_TEST:M[Yy][Ee][Ss])
TEST_TARGET= check
TEST_ENV=
-BUILD_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu
+TOOL_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu
.endif
# patch-aj uses m68k_sync_icache(2)
diff --git a/gambas3-runtime/options.mk b/gambas3-runtime/options.mk
index f0f22c006b..312a1a50fc 100644
--- a/gambas3-runtime/options.mk
+++ b/gambas3-runtime/options.mk
@@ -8,27 +8,27 @@ PLIST_VARS+= gui gui.opengl gui.qt
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgtk2)
-BUILD_DEPENDS+= gambas3-gb-gtk-opengl-${GB_VERSION}:../../wip/gambas3-gb-gtk-opengl
+TOOL_DEPENDS+= gambas3-gb-gtk-opengl-${GB_VERSION}:../../wip/gambas3-gb-gtk-opengl
PLIST.gui= yes
PLIST.gui.opengl= yes
.endif
.if !empty(PKG_OPTIONS:Mgtk3)
-BUILD_DEPENDS+= gambas3-gb-gtk3-${GB_VERSION}:../../wip/gambas3-gb-gtk3
+TOOL_DEPENDS+= gambas3-gb-gtk3-${GB_VERSION}:../../wip/gambas3-gb-gtk3
PLIST.gui= yes
.endif
.if !empty(PKG_OPTIONS:Mqt4)
-BUILD_DEPENDS+= gambas3-gb-qt4-opengl-${GB_VERSION}:../../wip/gambas3-gb-qt4-opengl
-BUILD_DEPENDS+= gambas3-gb-qt4-webkit-${GB_VERSION}:../../wip/gambas3-gb-qt4-webkit
+TOOL_DEPENDS+= gambas3-gb-qt4-opengl-${GB_VERSION}:../../wip/gambas3-gb-qt4-opengl
+TOOL_DEPENDS+= gambas3-gb-qt4-webkit-${GB_VERSION}:../../wip/gambas3-gb-qt4-webkit
PLIST.gui= yes
PLIST.gui.opengl= yes
PLIST.gui.qt= yes
.endif
.if !empty(PKG_OPTIONS:Mqt5)
-BUILD_DEPENDS+= gambas3-gb-qt5-opengl-${GB_VERSION}:../../wip/gambas3-gb-qt5-opengl
-BUILD_DEPENDS+= gambas3-gb-qt5-webkit-${GB_VERSION}:../../wip/gambas3-gb-qt5-webkit
+TOOL_DEPENDS+= gambas3-gb-qt5-opengl-${GB_VERSION}:../../wip/gambas3-gb-qt5-opengl
+TOOL_DEPENDS+= gambas3-gb-qt5-webkit-${GB_VERSION}:../../wip/gambas3-gb-qt5-webkit
PLIST.gui= yes
PLIST.gui.opengl= yes
PLIST.gui.qt= yes
diff --git a/gambas3/Makefile.common b/gambas3/Makefile.common
index 6efabffaeb..21c8e5d404 100644
--- a/gambas3/Makefile.common
+++ b/gambas3/Makefile.common
@@ -118,8 +118,8 @@ USE_TOOLS+= autoreconf automake aclocal pkg-config intltool
CONFIGURE_DIRS!= for d in ${BUILD_DIRS}; do echo $$d | cut -d/ -f1; done
.if "${BUILD_DIRS}" != "main/gbc"
-BUILD_DEPENDS+= gambas3-devel-${GB_VERSION}:../../wip/gambas3-devel
-BUILD_DEPENDS+= xdg-utils-1.*:../../misc/xdg-utils
+TOOL_DEPENDS+= gambas3-devel-${GB_VERSION}:../../wip/gambas3-devel
+TOOL_DEPENDS+= xdg-utils-1.*:../../misc/xdg-utils
. export XDG_DATA_HOME ${DESTDIR}${PREFIX}/share
. export XDG_UTILS_INSTALL_MODE user
diff --git a/gambatte-dev/Makefile b/gambatte-dev/Makefile
index 41c4a00cec..a45b8fd16a 100644
--- a/gambatte-dev/Makefile
+++ b/gambatte-dev/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://gambatte.sourceforge.net/
COMMENT= Game Boy Color emulator
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
+TOOL_DEPENDS+= scons-[0-9]*:../../devel/scons
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/gcc46-libs/Makefile b/gcc46-libs/Makefile
index f89e8e2488..d27a002e99 100644
--- a/gcc46-libs/Makefile
+++ b/gcc46-libs/Makefile
@@ -23,7 +23,7 @@ USE_TOOLS+= pax
NO_BUILD= yes
## Depend on exactly ${GCC46_DIST_VERSION}.
-BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC46_DIST_VERSION}{,nb[0-9]*}:../../wip/gcc46
+TOOL_DEPENDS+= ${GCC_PKGNAME}-${GCC46_DIST_VERSION}{,nb[0-9]*}:../../wip/gcc46
.include "../../mk/bsd.prefs.mk"
diff --git a/gcc47-libs/Makefile b/gcc47-libs/Makefile
index cffe1ddec4..8bc0a473e5 100644
--- a/gcc47-libs/Makefile
+++ b/gcc47-libs/Makefile
@@ -24,7 +24,7 @@ NO_BUILD= yes
CHECK_SHLIBS= no
## Depend on exactly ${GCC47_DIST_VERSION}.
-BUILD_DEPENDS+= ${GCC_PKGNAME}-${GCC47_DIST_VERSION}{,nb[0-9]*}:../../wip/gcc47
+TOOL_DEPENDS+= ${GCC_PKGNAME}-${GCC47_DIST_VERSION}{,nb[0-9]*}:../../wip/gcc47
.include "../../mk/bsd.prefs.mk"
diff --git a/gdb-git/Makefile b/gdb-git/Makefile
index 7fd85d2733..0af7f56b16 100644
--- a/gdb-git/Makefile
+++ b/gdb-git/Makefile
@@ -71,7 +71,7 @@ PLIST.gdbserver= YES
.endif
# TEST_DEPENDS
-BUILD_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu
+TOOL_DEPENDS+= dejagnu-[0-9]*:../../devel/dejagnu
check-base:
${RUN}${_ULIMIT_CMD} cd ${TEST_DIRS} && ${TEST_MAKE_CMD} -j1 check TESTS="gdb.base/*.exp"
diff --git a/gdcm/Makefile b/gdcm/Makefile
index caf4cf1dca..39b930d7e0 100644
--- a/gdcm/Makefile
+++ b/gdcm/Makefile
@@ -21,7 +21,7 @@ CMAKE_ARGS+= -DGDCM_USE_SYSTEM_OPENJPEG=ON
CMAKE_ARGS+= -DGDCM_INSTALL_MAN_DIR=man
CMAKE_ARGS+= -DGDCM_MANPAGES_USE_NONET:BOOL=TRUE
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
SUBST_CLASSES+= docbook
SUBST_MESSAGE.docbook= Fix docbook URLs.
diff --git a/git-docs-html/Makefile b/git-docs-html/Makefile
index 5178a8411c..38a9b0ee53 100644
--- a/git-docs-html/Makefile
+++ b/git-docs-html/Makefile
@@ -5,8 +5,8 @@ COMMENT= GIT Tree History Storage Tool (HTML documentation)
DISTINFO_FILE= ../../devel/git-base/distinfo
-BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
USE_LANGUAGES= c
BUILD_TARGET= html
diff --git a/glibc/Makefile b/glibc/Makefile
index 6a60bdfaa9..9d9968cd26 100644
--- a/glibc/Makefile
+++ b/glibc/Makefile
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --disable-profile
CONFIGURE_ARGS+= --enable-add-ons=linuxthreads
CONFIGURE_ARGS+= --with-headers=${PREFIX}/include
-BUILD_DEPENDS+= linux-kernel-headers-[0-9]*:../../wip/linux-kernel-headers
+TOOL_DEPENDS+= linux-kernel-headers-[0-9]*:../../wip/linux-kernel-headers
post-extract:
(cd ${WRKDIR} && ${MV} linuxthreads ${WRKDIR}/${DISTNAME})
diff --git a/gnome-calculator/Makefile b/gnome-calculator/Makefile
index 096dc97eaf..37acf21d6d 100644
--- a/gnome-calculator/Makefile
+++ b/gnome-calculator/Makefile
@@ -11,7 +11,7 @@ COMMENT= Desktop calculator for GNOME
LICENSE= gnu-gpl-v2
DEPENDS+= gnome-icon-theme-symbolic-[0-9]*:../../graphics/gnome-icon-theme-symbolic
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
CONFLICTS+= gcalctool-[0-9]*
diff --git a/gnome-desktop2/Makefile b/gnome-desktop2/Makefile
index 6d8705d562..9e40211074 100644
--- a/gnome-desktop2/Makefile
+++ b/gnome-desktop2/Makefile
@@ -21,7 +21,7 @@ AUTOCONF_REQD= 2.62
CONFIGURE_ARGS+= --with-gnome-distributor="The NetBSD Foundation"
-BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
post-install:
.for f in netbsd-logo-icon.png netbsd-logo-icon-transparent.png
diff --git a/gnome-jabber/Makefile b/gnome-jabber/Makefile
index 2fea1edb71..f5bc8cf91c 100644
--- a/gnome-jabber/Makefile
+++ b/gnome-jabber/Makefile
@@ -29,18 +29,18 @@ MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
GCONF_SCHEMAS+= gnome-jabber.schemas
.include "../../x11/libXScrnSaver/buildlink3.mk"
-BUILD_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
+TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
.include "../../x11/libX11/buildlink3.mk"
-BUILD_DEPENDS+= glib2>=2.0.3:../../devel/glib2
+TOOL_DEPENDS+= glib2>=2.0.3:../../devel/glib2
.include "../../devel/glib2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILD_DEPENDS+= libglade>=2.0.0:../../devel/libglade
+TOOL_DEPENDS+= libglade>=2.0.0:../../devel/libglade
.include "../../devel/libglade/buildlink3.mk"
-BUILD_DEPENDS+= gtk2+>=2.0.4:../../x11/gtk2
+TOOL_DEPENDS+= gtk2+>=2.0.4:../../x11/gtk2
.include "../../x11/gtk2/buildlink3.mk"
.include "../../net/gnet/buildlink3.mk"
-BUILD_DEPENDS+= libgnome>=2.0.0:../../devel/libgnome
+TOOL_DEPENDS+= libgnome>=2.0.0:../../devel/libgnome
.include "../../devel/libgnome/buildlink3.mk"
-BUILD_DEPENDS+= GConf>=1.2.0:../../devel/GConf
+TOOL_DEPENDS+= GConf>=1.2.0:../../devel/GConf
.include "../../devel/GConf/schemas.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnucash-devel/options.mk b/gnucash-devel/options.mk
index ff6b168f2c..4f3f405be6 100644
--- a/gnucash-devel/options.mk
+++ b/gnucash-devel/options.mk
@@ -22,7 +22,7 @@ CMAKE_ARGS+= -DWITH_OFX=OFF
.if !empty(PKG_OPTIONS:Mlibdbi)
CMAKE_ARGS+= -DWITH_SQL=ON
PLIST_SRC+= PLIST.dbi
-BUILD_DEPENDS+= libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
+TOOL_DEPENDS+= libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
.include "../../databases/libdbi/buildlink3.mk"
.else
CMAKE_ARGS+= -DWITH_SQL=OFF
diff --git a/gnuradio-monolithic/options.mk b/gnuradio-monolithic/options.mk
index 499accd74d..d71fa069f7 100644
--- a/gnuradio-monolithic/options.mk
+++ b/gnuradio-monolithic/options.mk
@@ -16,7 +16,7 @@ PKG_SUGGESTED_OPTIONS= filter-design
.if !empty(PKG_OPTIONS:Mninja-build)
CMAKE_ARGS+= -GNinja
-BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
+TOOL_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
do-build:
(cd ${WRKSRC}/build; ninja)
diff --git a/grantlee-editor/Makefile b/grantlee-editor/Makefile
index d1810556de..fdea5007d1 100644
--- a/grantlee-editor/Makefile
+++ b/grantlee-editor/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/greybird-theme/Makefile b/greybird-theme/Makefile
index 3ed07fe987..50b625d2c8 100644
--- a/greybird-theme/Makefile
+++ b/greybird-theme/Makefile
@@ -17,7 +17,7 @@ GITHUB_TAG= v${PKGVERSION_NOREV}
GNU_CONFIGURE= yes
USE_TOOLS+= autoconf automake
-BUILD_DEPENDS+= sassc-[0-9]*:../../www/sassc
+TOOL_DEPENDS+= sassc-[0-9]*:../../www/sassc
DEPENDS+= gtk2-engines-murrine-[0-9]*:../../x11/gtk2-engines-murrine
post-extract:
diff --git a/grub2-current/Makefile b/grub2-current/Makefile
index b7c81e8097..63e8c6f3e0 100644
--- a/grub2-current/Makefile
+++ b/grub2-current/Makefile
@@ -42,7 +42,7 @@ TODAY!= ${DATE} -u +'%Y%m%d'
GCC_REQD= 4.4
FLEX_REQD= 2.5.35
DEPENDS+= gettext-tools>=0.17:../../devel/gettext-tools
-BUILD_DEPENDS+= help2man>=1.36:../../converters/help2man
+TOOL_DEPENDS+= help2man>=1.36:../../converters/help2man
# XXX Force use of pkgsrc's flex on NetBSD to prevent build failure.
.if ${OPSYS} == "NetBSD"
diff --git a/grub2-current/download.mk b/grub2-current/download.mk
index 36e6329c62..6228c67beb 100644
--- a/grub2-current/download.mk
+++ b/grub2-current/download.mk
@@ -10,9 +10,9 @@
PKG_SKIP_REASON+= "skipping bzr package in bulk build"
.endif
-BUILD_DEPENDS+= bzr>=1.0:../../devel/bzr
-BUILD_DEPENDS+= rsync>=3.0:../../net/rsync
-BUILD_DEPENDS+= autogen>=5.9:../../devel/autogen
+TOOL_DEPENDS+= bzr>=1.0:../../devel/bzr
+TOOL_DEPENDS+= rsync>=3.0:../../net/rsync
+TOOL_DEPENDS+= autogen>=5.9:../../devel/autogen
BZR_REPOSITORY= bzr://bzr.savannah.gnu.org/grub/trunk/grub
BZR_REVISION= 5148
diff --git a/grub2-current/options.mk b/grub2-current/options.mk
index 852a350e91..dec20f72d8 100644
--- a/grub2-current/options.mk
+++ b/grub2-current/options.mk
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --disable-mm-debug
CONFIGURE_ARGS+= --enable-grub-mkfont
PLIST.freetype= yes
DISTFILES+= ${UNIFONT}.gz
-BUILD_DEPENDS+= dejavu-ttf>=2.30:../../fonts/dejavu-ttf
+TOOL_DEPENDS+= dejavu-ttf>=2.30:../../fonts/dejavu-ttf
do-move-unifont:
${MV} ${WRKDIR}/${UNIFONT} ${WRKSRC}/unifont.pcf
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/gtk-d/Makefile b/gtk-d/Makefile
index 4d1f24c96e..116aa29911 100644
--- a/gtk-d/Makefile
+++ b/gtk-d/Makefile
@@ -20,6 +20,6 @@ BUILD_MAKE_FLAGS+=LDFLAGS=-L=${LDFLAGS}
MAKE_ENV+= prefix=${PREFIX}
-BUILD_DEPENDS+= ldc>1.0:../../wip/ldc
+TOOL_DEPENDS+= ldc>1.0:../../wip/ldc
.include "../../mk/bsd.pkg.mk"
diff --git a/gtk-doc/Makefile b/gtk-doc/Makefile
index f86ceb5161..01c7564ac8 100644
--- a/gtk-doc/Makefile
+++ b/gtk-doc/Makefile
@@ -15,7 +15,7 @@ DEPENDS+= docbook-xsl>=1.68.1:../../textproc/docbook-xsl
DEPENDS+= ${PYPKGPREFIX}-anytree-[0-9]*:../../devel/py-anytree
DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
DEPENDS+= ${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
-BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
+TOOL_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
TEST_DEPENDS+= ${PYPKGPREFIX}-parameterized-[0-9]*:../../devel/py-parameterized
diff --git a/gxmms2/Makefile b/gxmms2/Makefile
index 3f53c3d250..39b14612a6 100644
--- a/gxmms2/Makefile
+++ b/gxmms2/Makefile
@@ -26,10 +26,10 @@ SUBST_STAGE.prefix= post-patch
SUBST_SED.prefix= -e "s|/usr|${PREFIX}|g"
SUBST_SED.prefix+= -e "s|/local||1"
-BUILD_DEPENDS+= gkrellm>=2.2:../../sysutils/gkrellm
+TOOL_DEPENDS+= gkrellm>=2.2:../../sysutils/gkrellm
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../wip/xmms2/buildlink3.mk"
-BUILD_DEPENDS+= gtk2+>=2.6.0:../../x11/gtk2
+TOOL_DEPENDS+= gtk2+>=2.6.0:../../x11/gtk2
.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/hammer/Makefile b/hammer/Makefile
index d2f912cde0..bc602e797f 100644
--- a/hammer/Makefile
+++ b/hammer/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/UpstandingHackers/hammer
COMMENT= Parser combinator library in C
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
+TOOL_DEPENDS+= scons-[0-9]*:../../devel/scons
USE_LANGUAGES= c c++
EXTRACT_USING= bsdtar
diff --git a/hare/Makefile b/hare/Makefile
index 4a92de38d2..95380fc1de 100644
--- a/hare/Makefile
+++ b/hare/Makefile
@@ -19,9 +19,9 @@ MAKE_FLAGS+= LIBDIR=${LIBDIR}
MAKE_FLAGS+= MANDIR=${MANDIR}
MAKE_FLAGS+= PREFIX=${PREFIX}
-BUILD_DEPENDS+= harec-[0-9]*:../../wip/harec
-BUILD_DEPENDS+= qbe>=1.1:../../lang/qbe
-BUILD_DEPENDS+= scdoc-[0-9]*:../../textproc/scdoc
+TOOL_DEPENDS+= harec-[0-9]*:../../wip/harec
+TOOL_DEPENDS+= qbe>=1.1:../../lang/qbe
+TOOL_DEPENDS+= scdoc-[0-9]*:../../textproc/scdoc
pre-configure:
${RUN} ${CP} -f ${FILESDIR}/config.mk ${WRKSRC}
diff --git a/harec/Makefile b/harec/Makefile
index b0e5bc869c..bae7320e46 100644
--- a/harec/Makefile
+++ b/harec/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --mandir=${MANDIR}
CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --sharedir=${SHAREDIR}
-BUILD_DEPENDS+= qbe>=1.1*:../../lang/qbe
+TOOL_DEPENDS+= qbe>=1.1*:../../lang/qbe
do-configure:
${RUN} cd ${WRKSRC} && ${CONFIG_SHELL} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
diff --git a/i3-git/Makefile b/i3-git/Makefile
index 7fcd466476..0db8587bb6 100644
--- a/i3-git/Makefile
+++ b/i3-git/Makefile
@@ -42,7 +42,7 @@ SUBST_MESSAGE.fix-paths= Fixing absolute paths.
SUBST_FILES.fix-paths= i3-dmenu-desktop
SUBST_SED.fix-paths+= -e 's,/usr/local/share,${PREFIX}/share,g'
-BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
# for i3-save-tree
DEPENDS+= p5-AnyEvent-I3-[0-9]*:../../wip/p5-AnyEvent-I3
diff --git a/icecat/Makefile b/icecat/Makefile
index f80930a644..0a512ca211 100644
--- a/icecat/Makefile
+++ b/icecat/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config perl gmake autoconf213
USE_LANGUAGES= c c++
-BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
+TOOL_DEPENDS+= zip>=2.3:../../archivers/zip
CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh
diff --git a/influxdb/Makefile b/influxdb/Makefile
index 2f19c1e8a9..6a6948478e 100644
--- a/influxdb/Makefile
+++ b/influxdb/Makefile
@@ -22,7 +22,7 @@ LICENSE= mit
# of ${FAKEHOMEDIR}/.cargo in influxd binary.
CHECK_WRKREF_SKIP= sbin/influxd
-BUILD_DEPENDS+= protobuf-[0-9]*:../../devel/protobuf
+TOOL_DEPENDS+= protobuf-[0-9]*:../../devel/protobuf
DATADIR= ${VARBASE}/lib/influxdb
LOGDIR= ${VARBASE}/log/influxdb
diff --git a/jabberd14/Makefile b/jabberd14/Makefile
index fc5d7e9b69..f37c7bc5b7 100644
--- a/jabberd14/Makefile
+++ b/jabberd14/Makefile
@@ -28,7 +28,7 @@ LICENSE= gnu-gpl-v2
CONFLICTS= jabberd2-[0-9]*
-BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
TOOL_DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
WRKSRC= ${WRKDIR}/jabberd-${GITHUB_TAG}/jabberd14
diff --git a/jacorb-lib/Makefile b/jacorb-lib/Makefile
index e3784b079d..3ecf2c8bb4 100644
--- a/jacorb-lib/Makefile
+++ b/jacorb-lib/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= dprice%cs.nmsu.edu@localhost
HOMEPAGE= http://www.jacorb.org/releases/${PKG_VERSION}/
COMMENT= Java implementation of the OMG's CORBA jar
-BUILD_DEPENDS+= apache-ant>=1.5.3.1:../../devel/apache-ant
+TOOL_DEPENDS+= apache-ant>=1.5.3.1:../../devel/apache-ant
WRKSRC= ${WRKDIR}/JacORB_${DIST_VERSION}
diff --git a/jgraphx/Makefile b/jgraphx/Makefile
index fd3e5300ed..0f70fd9322 100644
--- a/jgraphx/Makefile
+++ b/jgraphx/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/jgraph/jgraphx
COMMENT= Java Swing diagramming (graph visualisation) library
LICENSE= modified-bsd
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
+TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
diff --git a/jhbuild/Makefile b/jhbuild/Makefile
index 0789a6f8ab..280efe5ccf 100644
--- a/jhbuild/Makefile
+++ b/jhbuild/Makefile
@@ -18,7 +18,7 @@ PKGCONFIG_OVERRIDE+= tests/libhello/libhello.pc.in
CHECK_PORTABILITY_SKIP= configure
-BUILD_DEPENDS+= yelp-tools-[0-9]*:../../textproc/yelp-tools
+TOOL_DEPENDS+= yelp-tools-[0-9]*:../../textproc/yelp-tools
SUBST_CLASSES+= python
SUBST_STAGE.python= pre-configure
diff --git a/jitsi-meet/Makefile b/jitsi-meet/Makefile
index 32eab93050..dd4c2a01f1 100644
--- a/jitsi-meet/Makefile
+++ b/jitsi-meet/Makefile
@@ -7,7 +7,7 @@ PKGNAME= ${GITHUB_PROJECT}-${JITSI_MEET_VERSION}
USE_LANGUAGES+= c++
USE_TOOLS+= gmake tar
-BUILD_DEPENDS+= npm-[0-9]*:../../lang/npm
+TOOL_DEPENDS+= npm-[0-9]*:../../lang/npm
BUILD_TARGET= compile
INSTALL_TARGET= deploy source-package
diff --git a/julia/Makefile b/julia/Makefile
index d73150488e..70ef15ff93 100644
--- a/julia/Makefile
+++ b/julia/Makefile
@@ -16,6 +16,6 @@ USE_TOOLS= gmake
USE_LANGUAGES+= c++
USE_LANGUAGES+= c
USE_LANGUAGES+= fortran
-BUILD_DEPENDS+= git-base>=1.0:../../devel/git-base
+TOOL_DEPENDS+= git-base>=1.0:../../devel/git-base
.include "../../mk/bsd.pkg.mk"
diff --git a/kaddressbook/Makefile b/kaddressbook/Makefile
index 95bcebcba7..75dcf94f53 100644
--- a/kaddressbook/Makefile
+++ b/kaddressbook/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge perl:run
diff --git a/kalarm/Makefile b/kalarm/Makefile
index 42a7a2667b..37b4e04aaa 100644
--- a/kalarm/Makefile
+++ b/kalarm/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge perl:run
diff --git a/kalarmcal/Makefile b/kalarmcal/Makefile
index d852c58b14..a3a15c1892 100644
--- a/kalarmcal/Makefile
+++ b/kalarmcal/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kapacitor/Makefile b/kapacitor/Makefile
index 828ec636d8..99122191a3 100644
--- a/kapacitor/Makefile
+++ b/kapacitor/Makefile
@@ -22,7 +22,7 @@ EXTRACT_DIR.${KAPACITOR_DISTNAME}= ${WRKDIR}/src/github.com/influxdata
WRKSRC= ${WRKDIR}/src/github.com/influxdata/kapacitor
USE_TOOLS+= gmake
-BUILD_DEPENDS+= go110-1.10.*:../../lang/go110
+TOOL_DEPENDS+= go110-1.10.*:../../lang/go110
# go language executables don't have SSP support
CHECK_SSP_SKIP= bin/*
diff --git a/kde-cli-tools/Makefile b/kde-cli-tools/Makefile
index c15da06639..be735324dd 100644
--- a/kde-cli-tools/Makefile
+++ b/kde-cli-tools/Makefile
@@ -10,7 +10,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config
diff --git a/kdepim-runtime/Makefile b/kdepim-runtime/Makefile
index 6e9380bfbf..6a31eb6384 100644
--- a/kdepim-runtime/Makefile
+++ b/kdepim-runtime/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config
diff --git a/kdevelop/Makefile b/kdevelop/Makefile
index 4d6b00dc35..4c96865fa9 100644
--- a/kdevelop/Makefile
+++ b/kdevelop/Makefile
@@ -11,7 +11,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= gmake gtar pkg-config #perl msgfmt
diff --git a/kdiagram/Makefile b/kdiagram/Makefile
index 45717b26c5..45318bdd21 100644
--- a/kdiagram/Makefile
+++ b/kdiagram/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://www.kde.org/
COMMENT= Powerful libraries for creating business diagrams
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= extra-cmake-modules>=5.60.0:../../devel/extra-cmake-modules
+TOOL_DEPENDS+= extra-cmake-modules>=5.60.0:../../devel/extra-cmake-modules
USE_CMAKE= yes
USE_LANGUAGES= c c++
diff --git a/keditbookmarks/Makefile b/keditbookmarks/Makefile
index e4a02e88ef..d8bd34ffb7 100644
--- a/keditbookmarks/Makefile
+++ b/keditbookmarks/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kfind/Makefile b/kfind/Makefile
index 3d997aaf31..6d5041bf01 100644
--- a/kfind/Makefile
+++ b/kfind/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kgamma5/Makefile b/kgamma5/Makefile
index 247be1e7b0..5b1d4e74a3 100644
--- a/kgamma5/Makefile
+++ b/kgamma5/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kget/Makefile b/kget/Makefile
index 5c80fe29e0..3b5a5ea322 100644
--- a/kget/Makefile
+++ b/kget/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= pkg-config msgmerge
diff --git a/kgpg/Makefile b/kgpg/Makefile
index 362c1c73e5..e2bf739491 100644
--- a/kgpg/Makefile
+++ b/kgpg/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kgrab/Makefile b/kgrab/Makefile
index 379b8f4424..62adaec871 100644
--- a/kgrab/Makefile
+++ b/kgrab/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE= https://extragear.kde.org/
COMMENT= Screen Grabbing Program (KDE4)
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
+TOOL_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
diff --git a/kgraphviewer/Makefile b/kgraphviewer/Makefile
index 0acb0c99f2..d6d215aff7 100644
--- a/kgraphviewer/Makefile
+++ b/kgraphviewer/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE= https://extragear.kde.org/
COMMENT= GraphViz dot graph viewer for KDE4
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
+TOOL_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
diff --git a/khotkeys/Makefile b/khotkeys/Makefile
index 0607572256..0ac3d9a010 100644
--- a/khotkeys/Makefile
+++ b/khotkeys/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config
diff --git a/kinfocenter/Makefile b/kinfocenter/Makefile
index 0dabf0dcc7..9b445b87b2 100644
--- a/kinfocenter/Makefile
+++ b/kinfocenter/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config
diff --git a/kleopatra/Makefile b/kleopatra/Makefile
index 245571b631..9f443fe619 100644
--- a/kleopatra/Makefile
+++ b/kleopatra/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
DEPENDS+= paperkey>=1.3:../../security/paperkey
USE_TOOLS+= msgmerge
diff --git a/kmail-account-wizard/Makefile b/kmail-account-wizard/Makefile
index fcc0123b15..02964519c5 100644
--- a/kmail-account-wizard/Makefile
+++ b/kmail-account-wizard/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kmail/Makefile b/kmail/Makefile
index 540b3a9a8f..9ea715e85b 100644
--- a/kmail/Makefile
+++ b/kmail/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
DEPENDS+= akonadi-import-wizard>=${KAPPSVER}:../../wip/akonadi-import-wizard
DEPENDS+= kmail-account-wizard>=${KAPPSVER}:../../wip/kmail-account-wizard
DEPENDS+= mbox-importer>=${KAPPSVER}:../../wip/mbox-importer
diff --git a/kmailtransport/Makefile b/kmailtransport/Makefile
index d917363883..865137cfa2 100644
--- a/kmailtransport/Makefile
+++ b/kmailtransport/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kmenuedit/Makefile b/kmenuedit/Makefile
index eaaa0df368..2e3b94fe57 100644
--- a/kmenuedit/Makefile
+++ b/kmenuedit/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kmymoney-git/Makefile b/kmymoney-git/Makefile
index da69931876..9055b41b4f 100644
--- a/kmymoney-git/Makefile
+++ b/kmymoney-git/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://kmymoney2.sourceforge.net/
COMMENT= Personal finance manager for KDE 4, Subversion Snapshot
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= automoc4-[0-9]*:../../devel/automoc4
+TOOL_DEPENDS+= automoc4-[0-9]*:../../devel/automoc4
GIT_REPOSITORIES= kmymoney
GIT_REPO.kmymoney= git://anongit.kde.org/kmymoney.git
diff --git a/kmymoney4/Makefile b/kmymoney4/Makefile
index c162421c58..cde724a6be 100644
--- a/kmymoney4/Makefile
+++ b/kmymoney4/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
CONFLICTS+= kmymoney2-[0-9]*
-BUILD_DEPENDS+= automoc4-[0-9]*:../../devel/automoc4
+TOOL_DEPENDS+= automoc4-[0-9]*:../../devel/automoc4
#MAKE_JOBS_SAFE= no
BUILD_MAKE_FLAGS+= VERBOSE=yes
diff --git a/knotes/Makefile b/knotes/Makefile
index 9c6a958ad9..2adbc2e373 100644
--- a/knotes/Makefile
+++ b/knotes/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kodi/Makefile b/kodi/Makefile
index ff95ee9e8b..b332ba0475 100644
--- a/kodi/Makefile
+++ b/kodi/Makefile
@@ -13,9 +13,9 @@ LICENSE= gnu-gpl-v2
DEPENDS+= unzip-[0-9]*:../../archivers/unzip
DEPENDS+= zip-[0-9]*:../../archivers/zip
-BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
-BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
EXTRACT_USING= gtar
diff --git a/konqueror/Makefile b/konqueror/Makefile
index c21fa5773c..5930641da8 100644
--- a/konqueror/Makefile
+++ b/konqueror/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kontact/Makefile b/kontact/Makefile
index c8cc89e2d1..aaa88df6e3 100644
--- a/kontact/Makefile
+++ b/kontact/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
DEPENDS+= kmail-account-wizard>=${KAPPSVER}:../../wip/kmail-account-wizard
USE_TOOLS+= msgmerge
diff --git a/korganizer/Makefile b/korganizer/Makefile
index 41a8bfc8b6..51a70b452a 100644
--- a/korganizer/Makefile
+++ b/korganizer/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/kronometer/Makefile b/kronometer/Makefile
index a00817d21b..5d96883dfb 100644
--- a/kronometer/Makefile
+++ b/kronometer/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://userbase.kde.org/Kronometer
COMMENT= Stopwatch application by KDE
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_CMAKE= yes
USE_TOOLS= msgmerge
diff --git a/kscreenlocker/Makefile b/kscreenlocker/Makefile
index 01aa044f11..70d9f6741e 100644
--- a/kscreenlocker/Makefile
+++ b/kscreenlocker/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config perl:run
diff --git a/ksshaskpass/Makefile b/ksshaskpass/Makefile
index 13995613d0..6167ff01c3 100644
--- a/ksshaskpass/Makefile
+++ b/ksshaskpass/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/ksysguard/Makefile b/ksysguard/Makefile
index e443d4717c..98a76a26fb 100644
--- a/ksysguard/Makefile
+++ b/ksysguard/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config
diff --git a/kuickshow/Makefile b/kuickshow/Makefile
index 5446535325..d5ad5317a6 100644
--- a/kuickshow/Makefile
+++ b/kuickshow/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE= https://extragear.kde.org/
COMMENT= Very fast and comfortable imageviewer (KDE4)
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
+TOOL_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
diff --git a/kwin/Makefile b/kwin/Makefile
index 2e8fac646d..ca1b187a21 100644
--- a/kwin/Makefile
+++ b/kwin/Makefile
@@ -10,7 +10,7 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2
PLASMAVER= 5.12.5
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
DEPENDS+= kinit>=5.21.0:../../x11/kinit
USE_TOOLS+= msgmerge pkg-config
diff --git a/kwrited/Makefile b/kwrited/Makefile
index d47faa09cb..c4b113d0fb 100644
--- a/kwrited/Makefile
+++ b/kwrited/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/libalkimia/Makefile b/libalkimia/Makefile
index 017301f65e..1396736fb2 100644
--- a/libalkimia/Makefile
+++ b/libalkimia/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= https://community.kde.org/Alkimia/libalkimia
COMMENT= Common finance routines for kde4 applications
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
-#BUILD_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
+TOOL_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
+#TOOL_DEPENDS+= extra-cmake-modules>=5.19.0:../../devel/extra-cmake-modules
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/libgamemusic/Makefile b/libgamemusic/Makefile
index af804f6a71..6ebb460be1 100644
--- a/libgamemusic/Makefile
+++ b/libgamemusic/Makefile
@@ -15,7 +15,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-BUILD_DEPENDS= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS= xmlto-[0-9]*:../../textproc/xmlto
PKGCONFIG_OVERRIDE+= libgamemusic.pc.in
diff --git a/libguestfs-appliance/Makefile b/libguestfs-appliance/Makefile
index 27ca1aa43c..24f8e1eb7d 100644
--- a/libguestfs-appliance/Makefile
+++ b/libguestfs-appliance/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://libguestfs.org/guestfs-building.1.html\#using-a-prebuilt-binary
COMMENT= Fixed appliance binaries for libguestfs
LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2.1
-BUILD_DEPENDS+= qemu-[0-9]*:../../emulators/qemu
+TOOL_DEPENDS+= qemu-[0-9]*:../../emulators/qemu
EXTRACT_USING= bsdtar
NO_CONFIGURE= yes
diff --git a/libksieve/Makefile b/libksieve/Makefile
index 5681de77a2..ad5c9722be 100644
--- a/libksieve/Makefile
+++ b/libksieve/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/libksysguard/Makefile b/libksysguard/Makefile
index 2944400d53..8dfd3782b0 100644
--- a/libksysguard/Makefile
+++ b/libksysguard/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config
USE_LANGUAGES+= c++20
diff --git a/libnfc/options.mk b/libnfc/options.mk
index 13b73b90aa..c6ec726092 100644
--- a/libnfc/options.mk
+++ b/libnfc/options.mk
@@ -53,7 +53,7 @@ PN53X_USB_DRIVER=
.if !empty(PKG_OPTIONS:Mdoc)
CONFIGURE_ARGS+= --enable-doc
-BUILD_DEPENDS+= doxygen>=1.8.11:../../devel/doxygen
+TOOL_DEPENDS+= doxygen>=1.8.11:../../devel/doxygen
.endif
CONFIGURE_ARGS+= --with-drivers="${PCSC_DRIVER}${ACR122_PCSC_DRIVER}${ACR122_USB_DRIVER}${ACR122S_DRIVER}${ARYGON_DRIVER}${PN532_I2C_DRIVER}${PN532_SPI_DRIVER}${PN532_UART_DRIVER}${PN53X_USB_DRIVER}"
diff --git a/libreoffice-git/Makefile b/libreoffice-git/Makefile
index bb8f1353b2..ac31572e2c 100644
--- a/libreoffice-git/Makefile
+++ b/libreoffice-git/Makefile
@@ -101,7 +101,7 @@ EXTRACT_USING= gtar
WRKSRC= ${WRKDIR}/${LO_BOOTSTRAP}
-BUILD_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
+TOOL_DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip
DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
# dmake scripts use relative path with -rpath-link ld arguments, which
diff --git a/libreoffice-git/options.mk b/libreoffice-git/options.mk
index 3928eeb795..d56913199d 100644
--- a/libreoffice-git/options.mk
+++ b/libreoffice-git/options.mk
@@ -17,7 +17,7 @@ PLIST_VARS+= java kde4 gtk3
.include "../../mk/java-vm.mk"
USE_JAVA= yes
USE_JAVA2= yes
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
+TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
CONFIGURE_ARGS+= --with-ant-home=${PREFIX}
DEPENDS+= hsqldb18-[0-9]*:../../databases/hsqldb18
diff --git a/libsocialweb/Makefile b/libsocialweb/Makefile
index 92512728b2..f3329b1c5a 100644
--- a/libsocialweb/Makefile
+++ b/libsocialweb/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://projects.gnome.org/ # XXX
COMMENT= Personal social data server
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/libstacktrace/Makefile b/libstacktrace/Makefile
index 68211a8ccd..e744eb4557 100644
--- a/libstacktrace/Makefile
+++ b/libstacktrace/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://sourceforge.net/projects/lmdbg/
COMMENT= Stacktracing library similar to glibc backtrace(3)
LICENSE= mit
-BUILD_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure
+TOOL_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure
ONLY_FOR_COMPILER= gcc icc
NOT_FOR_PLATFORM= Darwin-*-*
diff --git a/libvirt-glib/Makefile b/libvirt-glib/Makefile
index 96e083d45f..810b1e528a 100644
--- a/libvirt-glib/Makefile
+++ b/libvirt-glib/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://libvirt.org/
COMMENT= GLib-friendly libvirt wrapper
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool
diff --git a/libvpx-git/Makefile b/libvpx-git/Makefile
index 69ae0cf6f5..203034093f 100644
--- a/libvpx-git/Makefile
+++ b/libvpx-git/Makefile
@@ -101,7 +101,7 @@ CONFIGURE_ARGS.MirBSD+= --disable-runtime-cpu-detect
# Under Solaris 10 its /usr/xpg4/bin/tr is not sufficient. PR pkg/48508
.if !empty(MACHINE_PLATFORM:MSunOS-5.10*)
-BUILD_DEPENDS= coreutils-[0-9]*:../../sysutils/coreutils
+TOOL_DEPENDS= coreutils-[0-9]*:../../sysutils/coreutils
TOOLS_PLATFORM.tr= ${PREFIX}/bin/gtr
.endif
diff --git a/lidia/Makefile b/lidia/Makefile
index 7eb20d11e4..fc8c99bcbb 100644
--- a/lidia/Makefile
+++ b/lidia/Makefile
@@ -16,12 +16,12 @@ USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --with-arithmetic=gmp
-#BUILD_DEPENDS+= teTeX-[0-9]*:../../print/teTeX
+#TOOL_DEPENDS+= teTeX-[0-9]*:../../print/teTeX
.include "../../mk/bsd.prefs.mk"
.if (${OPSYS} != "NetBSD")
-BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
+TOOL_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
.endif
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
diff --git a/lilypond-git/Makefile b/lilypond-git/Makefile
index ea8d90e844..2e385598e9 100644
--- a/lilypond-git/Makefile
+++ b/lilypond-git/Makefile
@@ -9,20 +9,20 @@ HOMEPAGE= http://lilypond.org/
COMMENT= GNU Music Typesetter
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= tex-metafont-[0-9]*:../../fonts/tex-metafont
-BUILD_DEPENDS+= tex-metapost-[0-9]*:../../graphics/tex-metapost
-BUILD_DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
-BUILD_DEPENDS+= intlfonts-[0-9]*:../../fonts/intlfonts
-BUILD_DEPENDS+= font-cronyx-cyrillic-[0-9]*:../../fonts/font-cronyx-cyrillic
-BUILD_DEPENDS+= kochi-ttf-[0-9]*:../../fonts/kochi-ttf
-BUILD_DEPENDS+= fontforge>=20060125:../../fonts/fontforge
-BUILD_DEPENDS+= t1utils>=1.33:../../fonts/t1utils
-BUILD_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex
-BUILD_DEPENDS+= rsync-[0-9]*:../../net/rsync
+TOOL_DEPENDS+= tex-metafont-[0-9]*:../../fonts/tex-metafont
+TOOL_DEPENDS+= tex-metapost-[0-9]*:../../graphics/tex-metapost
+TOOL_DEPENDS+= urw-fonts-[0-9]*:../../fonts/urw-fonts
+TOOL_DEPENDS+= intlfonts-[0-9]*:../../fonts/intlfonts
+TOOL_DEPENDS+= font-cronyx-cyrillic-[0-9]*:../../fonts/font-cronyx-cyrillic
+TOOL_DEPENDS+= kochi-ttf-[0-9]*:../../fonts/kochi-ttf
+TOOL_DEPENDS+= fontforge>=20060125:../../fonts/fontforge
+TOOL_DEPENDS+= t1utils>=1.33:../../fonts/t1utils
+TOOL_DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex
+TOOL_DEPENDS+= rsync-[0-9]*:../../net/rsync
# pngtopnm
-BUILD_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
+TOOL_DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
# convert
-BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
+TOOL_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
DEPENDS+= tex-cyrillic-[0-9]*:../../print/tex-cyrillic
DEPENDS+= tex-tex-gyre-[0-9]*:../../fonts/tex-tex-gyre
diff --git a/linux-kbd/Makefile b/linux-kbd/Makefile
index a3059adf13..102736b57b 100644
--- a/linux-kbd/Makefile
+++ b/linux-kbd/Makefile
@@ -20,13 +20,13 @@ CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --mandir=/man
.if !exists(/usr/bin/lex)
-BUILD_DEPENDS+= flex-[0-9]*:../../devel/flex
+TOOL_DEPENDS+= flex-[0-9]*:../../devel/flex
LEX= ${PREFIX}/bin/flex -8
MAKE_ENV+= LEX=${LEX:Q}
.endif
.if !exists(/usr/bin/yacc)
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
+TOOL_DEPENDS+= bison-[0-9]*:../../devel/bison
YACC= ${PREFIX}/bin/bison -y
MAKE_ENV+= YACC=${YACC:Q}
.endif
diff --git a/linux-kernel/Makefile b/linux-kernel/Makefile
index c91b99bdf4..f650c8cfc8 100644
--- a/linux-kernel/Makefile
+++ b/linux-kernel/Makefile
@@ -7,9 +7,9 @@ PKGNAME= linux-kernel${LINUX_VERSION}-${LINUX_VERSION}
COMMENT= The Linux kernel
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= linux-module-init-tools-[0-9]*:../../wip/linux-module-init-tools
+TOOL_DEPENDS+= linux-module-init-tools-[0-9]*:../../wip/linux-module-init-tools
# This means that old linux-modutils aren't available for other kernel
-#BUILD_DEPENDS+= linux-modutils-[0-9]*:../../wip/linux-modutils
+#TOOL_DEPENDS+= linux-modutils-[0-9]*:../../wip/linux-modutils
# Don't let the Linux kernel get accidently deinstalled.
# XXX todo: fix pkg_info to not be so noisy about this
diff --git a/linux24-kernel/Makefile b/linux24-kernel/Makefile
index 11ec98834b..7ac17a5627 100644
--- a/linux24-kernel/Makefile
+++ b/linux24-kernel/Makefile
@@ -7,7 +7,7 @@ PKGNAME= linux-kernel-${LINUX_VERSION}
COMMENT= The Linux kernel
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= linux-modutils-[0-9]*:../../wip/linux-modutils
+TOOL_DEPENDS+= linux-modutils-[0-9]*:../../wip/linux-modutils
do-configure:
cd ${WRKSRC} && \
diff --git a/linuxdcpp/Makefile b/linuxdcpp/Makefile
index 237aa2308d..f182fac6d9 100644
--- a/linuxdcpp/Makefile
+++ b/linuxdcpp/Makefile
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config pax
PTHREAD_OPTS+= native
NO_CONFIGURE= yes
-BUILD_DEPENDS+= scons>=0.96:../../devel/scons
+TOOL_DEPENDS+= scons>=0.96:../../devel/scons
LDFLAGS+= ${X11_LDFLAGS}
diff --git a/lmdbg-current/Makefile b/lmdbg-current/Makefile
index 07098dd02c..5c43308078 100644
--- a/lmdbg-current/Makefile
+++ b/lmdbg-current/Makefile
@@ -15,7 +15,7 @@ GIT_REPOSITORIES= lmdbg
GIT_REPO.lmdbg= https://github.com/cheusov/lmdbg.git
.include "../../wip/mk/git-package.mk"
-BUILD_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure
+TOOL_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure
DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus
DEPENDS+= runawk>=1.3.1:../../lang/runawk
#DEPENDS+= gdb-[0-9]*:../../devel/gdb
diff --git a/man-db/Makefile b/man-db/Makefile
index 53b0e06163..1930c6ce6d 100644
--- a/man-db/Makefile
+++ b/man-db/Makefile
@@ -21,7 +21,7 @@ DEPENDS+= groff-[0-9]*:../../textproc/groff
.endif
.if !exists(/usr/bin/yacc)
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
+TOOL_DEPENDS+= bison-[0-9]*:../../devel/bison
.endif
diff --git a/mapnik/Makefile b/mapnik/Makefile
index 50298450dc..147f15ee47 100644
--- a/mapnik/Makefile
+++ b/mapnik/Makefile
@@ -14,7 +14,7 @@ HOMEPAGE= https://mapnik.org/
COMMENT= Toolkit for mapping applications
NO_CONFIGURE= yes
-BUILD_DEPENDS+= scons>=0.96:../../devel/scons
+TOOL_DEPENDS+= scons>=0.96:../../devel/scons
DEPENDS+= dejavu-ttf>=2.19:../../fonts/dejavu-ttf
USE_LANGUAGES= c c++
diff --git a/mat/Makefile b/mat/Makefile
index 9669d63310..76295febc6 100644
--- a/mat/Makefile
+++ b/mat/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= # none
USE_TOOLS+= intltool
-BUILD_DEPENDS+= ${PYPKGPREFIX}-distutils-extra-[0-9]*:../../wip/py-distutils-extra
+TOOL_DEPENDS+= ${PYPKGPREFIX}-distutils-extra-[0-9]*:../../wip/py-distutils-extra
DEPENDS+= ${PYPKGPREFIX}-argparse-[0-9]*:../../devel/py-argparse
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
diff --git a/meka-git/Makefile b/meka-git/Makefile
index 97e023ee1e..bf0a775338 100644
--- a/meka-git/Makefile
+++ b/meka-git/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://smspower.org/
COMMENT= Meka is a multi-machine 8 bit emulator
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= nasm>=2.0:../../devel/nasm
+TOOL_DEPENDS+= nasm>=2.0:../../devel/nasm
BUILD_TARGET= exe
diff --git a/miktex/Makefile b/miktex/Makefile
index fda31b7489..7287b7b4ef 100644
--- a/miktex/Makefile
+++ b/miktex/Makefile
@@ -16,9 +16,9 @@ USE_LANGUAGES= c c++
TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= log4cxx-[0-9]*:../../devel/log4cxx
+TOOL_DEPENDS+= log4cxx-[0-9]*:../../devel/log4cxx
# or lzmalib?
-BUILD_DEPENDS+= lzma-[0-9]*:../../archivers/lzma
+TOOL_DEPENDS+= lzma-[0-9]*:../../archivers/lzma
.include "options.mk"
diff --git a/milou/Makefile b/milou/Makefile
index 0576a3a38a..5199d24c03 100644
--- a/milou/Makefile
+++ b/milou/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/miracl/Makefile b/miracl/Makefile
index e972ed1d72..d0830633a4 100644
--- a/miracl/Makefile
+++ b/miracl/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/miracl/MIRACL
COMMENT= Multiprecision Integer and Rational Arithmetic C/C++ Library
INSTALLATION_DIRS+= include/${DISTNAME}
-#BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
+#TOOL_DEPENDS+= unzip-[0-9]*:../../archivers/unzip
EXTRACT_OPTS_ZIP+= -j -aa -L -d ${DISTNAME}
diff --git a/mlton-git/Makefile b/mlton-git/Makefile
index b62d6a289d..c2db44e5f5 100644
--- a/mlton-git/Makefile
+++ b/mlton-git/Makefile
@@ -15,10 +15,10 @@ USE_TOOLS+= gmake bash
.if defined(MLTON_BOOT) && ${MLTON_BOOT} == "mlton"
BUILD_TARGET= all
.else # use SML/NJ
-BUILD_DEPENDS+= smlnj-[0-9]*:../../lang/smlnj
+TOOL_DEPENDS+= smlnj-[0-9]*:../../lang/smlnj
BUILD_TARGET= smlnj-mlton all
.endif
-BUILD_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+TOOL_DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
GIT_REPOSITORIES= mlton
GIT_REPO.mlton= https://github.com/MLton/mlton.git
diff --git a/modular-xorg-server-dfbsd-meson/Makefile.common b/modular-xorg-server-dfbsd-meson/Makefile.common
index 7a93df156e..b253c36f25 100644
--- a/modular-xorg-server-dfbsd-meson/Makefile.common
+++ b/modular-xorg-server-dfbsd-meson/Makefile.common
@@ -238,7 +238,7 @@ BUILDLINK_API_DEPENDS.dri+= dri>=7.8
BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
-BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
+TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
# .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
diff --git a/modular-xorg-server-dfbsd/Makefile.common b/modular-xorg-server-dfbsd/Makefile.common
index ec235b510b..20fda28d34 100644
--- a/modular-xorg-server-dfbsd/Makefile.common
+++ b/modular-xorg-server-dfbsd/Makefile.common
@@ -178,7 +178,7 @@ BUILDLINK_API_DEPENDS.dri+= dri>=7.8
BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
-BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
+TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
# .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
diff --git a/mono-git/Makefile b/mono-git/Makefile
index 0a6af005e4..16609bf526 100644
--- a/mono-git/Makefile
+++ b/mono-git/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://www.mono-project.com/
COMMENT= Open source ECMA CLI, C# and .NET implementation
LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
-BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} PLATFORM=
WRKSRC= ${WRKDIR}/mono
diff --git a/mono/Makefile b/mono/Makefile
index 6ce150fb78..b0a13b3853 100644
--- a/mono/Makefile
+++ b/mono/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
WRKSRC= ${WRKDIR}/${DISTNAME}
-BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} PLATFORM=
diff --git a/mount-zip-git/Makefile b/mount-zip-git/Makefile
index 37d5bcedfd..e942cecd09 100644
--- a/mount-zip-git/Makefile
+++ b/mount-zip-git/Makefile
@@ -34,7 +34,7 @@ BUILDLINK_TRANSFORM+= opt:-std=c++20:-std=c++2a
# Required for generating a man page.
# TODO: Pandoc is not portable enough, because GHC isn't. We should
# probably put a pre-generated man page in ${FILESDIR}.
-BUILD_DEPENDS+= pandoc-[0-9]*:../../converters/pandoc
+TOOL_DEPENDS+= pandoc-[0-9]*:../../converters/pandoc
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
INSTALL_MAKE_FLAGS+= bindir=${PREFIX:Q}/bin
diff --git a/mount-zip-git/TODO b/mount-zip-git/TODO
index a515fc56a0..5df0b62c7b 100644
--- a/mount-zip-git/TODO
+++ b/mount-zip-git/TODO
@@ -1 +1 @@
-Eliminate BUILD_DEPENDS on pandoc (see Makefile).
+Eliminate TOOL_DEPENDS on pandoc (see Makefile).
diff --git a/mount-zip/Makefile b/mount-zip/Makefile
index 474c4e1e11..b78071ca6d 100644
--- a/mount-zip/Makefile
+++ b/mount-zip/Makefile
@@ -32,7 +32,7 @@ BUILDLINK_TRANSFORM+= opt:-std=c++20:-std=c++2a
# Required for generating a man page.
# TODO: Pandoc is not portable enough, because GHC isn't. We should
# probably put a pre-generated man page in ${FILESDIR}.
-BUILD_DEPENDS+= pandoc-[0-9]*:../../converters/pandoc
+TOOL_DEPENDS+= pandoc-[0-9]*:../../converters/pandoc
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
INSTALL_MAKE_FLAGS+= bindir=${PREFIX:Q}/bin
diff --git a/mount-zip/TODO b/mount-zip/TODO
index a515fc56a0..5df0b62c7b 100644
--- a/mount-zip/TODO
+++ b/mount-zip/TODO
@@ -1 +1 @@
-Eliminate BUILD_DEPENDS on pandoc (see Makefile).
+Eliminate TOOL_DEPENDS on pandoc (see Makefile).
diff --git a/mozjpeg/Makefile b/mozjpeg/Makefile
index 0df664244e..8259717147 100644
--- a/mozjpeg/Makefile
+++ b/mozjpeg/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/mozilla/mozjpeg/
COMMENT= Mozilla JPEG Encoder Project
LICENSE= modified-bsd
-BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
+TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
WRKSRC= ${WRKDIR}/mozjpeg
diff --git a/mppdec/Makefile b/mppdec/Makefile
index f5893fbbb8..02e7aacf8a 100644
--- a/mppdec/Makefile
+++ b/mppdec/Makefile
@@ -27,7 +27,7 @@ MAKE_FILE= Makefile.nol
# see TODO
# .if ${MACHINE_ARCH} == "i386"
-# BUILD_DEPENDS+= nasm>=0.0:../../devel/nasm
+# TOOL_DEPENDS+= nasm>=0.0:../../devel/nasm
# .endif
INSTALLATION_DIRS= bin
diff --git a/mpv-git/Makefile b/mpv-git/Makefile
index ce35d86383..eb2cc27a23 100644
--- a/mpv-git/Makefile
+++ b/mpv-git/Makefile
@@ -9,9 +9,9 @@ HOMEPAGE= https://mpv.io/
COMMENT= Video player based on MPlayer and mplayer2 (git version)
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
# ${WRKSRC}/bootstrap.py mentions needed version
-BUILD_DEPENDS+= waf>=1.8.4:../../devel/waf
+TOOL_DEPENDS+= waf>=1.8.4:../../devel/waf
GIT_REPOSITORIES= mpv
GIT_REPO.mpv= https://github.com/mpv-player/mpv.git
diff --git a/mrust-cargo/Makefile b/mrust-cargo/Makefile
index 8ce126d5aa..88000d714c 100644
--- a/mrust-cargo/Makefile
+++ b/mrust-cargo/Makefile
@@ -105,9 +105,9 @@ do-install:
${DESTDIR}${PREFIX}/bin )
-BUILD_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
-BUILD_DEPENDS+= mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
-##BUILD_DEPENDS+= cmake>=3.18.2:../../devel/cmake
+TOOL_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+TOOL_DEPENDS+= mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
+##TOOL_DEPENDS+= cmake>=3.18.2:../../devel/cmake
##.include "../../devel/libatomic/buildlink3.mk"
diff --git a/mrust-libs/Makefile b/mrust-libs/Makefile
index 877a97d794..d18881609d 100644
--- a/mrust-libs/Makefile
+++ b/mrust-libs/Makefile
@@ -106,8 +106,8 @@ do-install:
## for ff in lib*.rlib lib*.rlib.[ho]* *build build*.txt; do \
-BUILD_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
-BUILD_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
+TOOL_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+TOOL_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
.include "../../devel/libatomic/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff --git a/mrust-llvm/Makefile b/mrust-llvm/Makefile
index ebdb791d62..7ba97616a2 100644
--- a/mrust-llvm/Makefile
+++ b/mrust-llvm/Makefile
@@ -134,10 +134,10 @@ do-install:
##### done; \
-###BUILD_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
-###BUILD_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
-###BUILD_DEPENDS+= mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
-BUILD_DEPENDS+= cmake>=3.18.2:../../devel/cmake
+###TOOL_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+###TOOL_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
+###TOOL_DEPENDS+= mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
+TOOL_DEPENDS+= cmake>=3.18.2:../../devel/cmake
###.include "../../devel/libatomic/buildlink3.mk"
diff --git a/mrust-rustc/Makefile b/mrust-rustc/Makefile
index 81ef953240..f00c92395f 100644
--- a/mrust-rustc/Makefile
+++ b/mrust-rustc/Makefile
@@ -109,10 +109,10 @@ do-install:
${DESTDIR}${PREFIX}/bin )
-BUILD_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
-BUILD_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
-BUILD_DEPENDS+= mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
-BUILD_DEPENDS+= cmake>=3.18.2:../../devel/cmake
+TOOL_DEPENDS+= mrust-mrustc>=${SNAPSTAMP}:../../wip/mrust-mrustc
+TOOL_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
+TOOL_DEPENDS+= mrust-libs>=${SNAPSTAMP}:../../wip/mrust-libs
+TOOL_DEPENDS+= cmake>=3.18.2:../../devel/cmake
.include "../../devel/libatomic/buildlink3.mk"
diff --git a/mrust-rustclibs/Makefile b/mrust-rustclibs/Makefile
index 9f0c0be1fb..f5b87cb088 100644
--- a/mrust-rustclibs/Makefile
+++ b/mrust-rustclibs/Makefile
@@ -129,8 +129,8 @@ do-install:
${DESTDIR}${RUSTCLIBS}; \
done )
-BUILD_DEPENDS+= mrust-rustc>=${SNAPSTAMP}:../../wip/mrust-rustc
-BUILD_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
+TOOL_DEPENDS+= mrust-rustc>=${SNAPSTAMP}:../../wip/mrust-rustc
+TOOL_DEPENDS+= mrust-minicargo>=${SNAPSTAMP}:../../wip/mrust-minicargo
##.include "../../devel/libatomic/buildlink3.mk"
##.include "../../mk/dlopen.buildlink3.mk"
diff --git a/mtpaint-git/Makefile b/mtpaint-git/Makefile
index 6615ae6b69..d0910399b6 100644
--- a/mtpaint-git/Makefile
+++ b/mtpaint-git/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ARGS+= cflags gtk3 jpeg jp2v2 webp intl tiff man
USE_TOOLS+= gmake pkg-config
-BUILD_DEPENDS+= glib2-[0-9]*:../../devel/glib2
+TOOL_DEPENDS+= glib2-[0-9]*:../../devel/glib2
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
diff --git a/mtpaint/Makefile b/mtpaint/Makefile
index 90a8b216af..2c671f6a94 100644
--- a/mtpaint/Makefile
+++ b/mtpaint/Makefile
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ARGS+= cflags GIF gtk3 jpeg jp2v2 webp intl tiff man
USE_TOOLS+= gmake pkg-config
-BUILD_DEPENDS+= glib2-[0-9]*:../../devel/glib2
+TOOL_DEPENDS+= glib2-[0-9]*:../../devel/glib2
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/giflib/buildlink3.mk"
diff --git a/multisync-backup/Makefile b/multisync-backup/Makefile
index 925b6db1b2..399cbf0dac 100644
--- a/multisync-backup/Makefile
+++ b/multisync-backup/Makefile
@@ -10,7 +10,7 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/multisync-0.82/plugins/backup_plugin/
DEPENDS+= multisync>=0.82:../../wip/multisync
-BUILD_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
+TOOL_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
USE_TOOLS+= aclocal autoconf autoheader automake
pre-configure:
diff --git a/multisync-ldap/Makefile b/multisync-ldap/Makefile
index a751041bde..2b8ec75a2f 100644
--- a/multisync-ldap/Makefile
+++ b/multisync-ldap/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/multisync-0.82/plugins/ldap_plugin/
DEPENDS+= multisync>=0.82:../../wip/multisync
-BUILD_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
+TOOL_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
USE_TOOLS+= aclocal autoconf autoheader automake
pre-configure:
diff --git a/multisync-opie/Makefile b/multisync-opie/Makefile
index 7e01f9b161..f2ff815d81 100644
--- a/multisync-opie/Makefile
+++ b/multisync-opie/Makefile
@@ -11,7 +11,7 @@ WRKSRC= ${WRKDIR}/multisync-0.82/plugins/opie_sync/
DEPENDS+= multisync>=0.82:../../wip/multisync
-BUILD_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
+TOOL_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
USE_TOOLS+= aclocal autoconf autoheader automake
pre-configure:
diff --git a/multisync-palm/Makefile b/multisync-palm/Makefile
index d3367ba76c..fc1af04893 100644
--- a/multisync-palm/Makefile
+++ b/multisync-palm/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/multisync-0.82/plugins/palm_sync/
DEPENDS+= multisync>=0.82:../../wip/multisync
-BUILD_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
+TOOL_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
USE_TOOLS+= aclocal autoconf autoheader automake
pre-configure:
diff --git a/multisync-syncml-moto/Makefile b/multisync-syncml-moto/Makefile
index 20f0af0a8f..d93bf9e8e9 100644
--- a/multisync-syncml-moto/Makefile
+++ b/multisync-syncml-moto/Makefile
@@ -11,7 +11,7 @@ LICENSE= gnu-gpl-v2
CONFLICTS= multisync-syncml-[0-9]*
DEPENDS+= multisync>=0.82:../../wip/multisync
-BUILD_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
+TOOL_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
USE_TOOLS+= aclocal autoconf autoheader automake
PATCH_SITES= http://www.troodon.org/a780/files/syncml/
diff --git a/multisync-syncml/Makefile b/multisync-syncml/Makefile
index cf7dfa7b3e..a689bd2dd2 100644
--- a/multisync-syncml/Makefile
+++ b/multisync-syncml/Makefile
@@ -12,7 +12,7 @@ CONFLICTS= multisync-syncml-moto-[0-9]*
WRKSRC= ${WRKDIR}/multisync-0.82/plugins/syncml_plugin/
DEPENDS+= multisync>=0.82:../../wip/multisync
-BUILD_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
+TOOL_DEPENDS+= libtool-base>=1.5.10:../../devel/libtool-base
USE_TOOLS+= aclocal autoconf autoheader automake
pre-configure:
diff --git a/munin-common/Makefile.common b/munin-common/Makefile.common
index 740d5920c4..a004038600 100644
--- a/munin-common/Makefile.common
+++ b/munin-common/Makefile.common
@@ -13,7 +13,7 @@ MAINTAINER= tm%NetBSD.org@localhost
HOMEPAGE= http://munin-monitoring.org/
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
+TOOL_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
DEPENDS= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
DISTINFO_FILE= ${.CURDIR}/../../sysutils/munin-common/distinfo
diff --git a/mupen64plus-extraplugins/Makefile b/mupen64plus-extraplugins/Makefile
index 2edd899445..bcb834a16a 100644
--- a/mupen64plus-extraplugins/Makefile
+++ b/mupen64plus-extraplugins/Makefile
@@ -29,5 +29,5 @@ INSTALL_ENV+= PREFIX=${PREFIX}
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../wip/mupen64plus/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
-BUILD_DEPENDS+= cpuflags>=1.42:../../devel/cpuflags
+TOOL_DEPENDS+= cpuflags>=1.42:../../devel/cpuflags
.include "../../mk/bsd.pkg.mk"
diff --git a/mupen64plus/Makefile b/mupen64plus/Makefile
index c2bd996e5b..c8fccf4123 100644
--- a/mupen64plus/Makefile
+++ b/mupen64plus/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://code.google.com/p/mupen64plus/
COMMENT= Cross-platform plugin-based N64 emulator
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= cpuflags>=1.42:../../devel/cpuflags
+TOOL_DEPENDS+= cpuflags>=1.42:../../devel/cpuflags
USE_LANGUAGES= c c++
USE_TOOLS+= bash gmake pkg-config
USE_LIBTOOL= yes
diff --git a/navidrome/Makefile b/navidrome/Makefile
index f7e80954cc..5d2b684c5b 100644
--- a/navidrome/Makefile
+++ b/navidrome/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/navidrome/navidrome/
COMMENT= Modern Music Server and Streamer compatible with Subsonic/Airsonic
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= npm-[0-9]*:../../lang/npm
+TOOL_DEPENDS+= npm-[0-9]*:../../lang/npm
USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config
diff --git a/nblood/Makefile b/nblood/Makefile
index a072f95dd4..d27e953d1c 100644
--- a/nblood/Makefile
+++ b/nblood/Makefile
@@ -23,7 +23,7 @@ MAKE_ENV+= prefix=${PREFIX}
MAKE_FILE= GNUmakefile
-BUILD_DEPENDS= nasm-[0-9]*:../../devel/nasm
+TOOL_DEPENDS= nasm-[0-9]*:../../devel/nasm
BUILD_MAKE_FLAGS+= LTO=0 RELEASE=1 USE_LIBVPX=0
diff --git a/nemo/Makefile b/nemo/Makefile
index 23b03cb7f8..7ef476b391 100644
--- a/nemo/Makefile
+++ b/nemo/Makefile
@@ -26,8 +26,8 @@ USE_CMAKE= yes
DEPENDS+= ${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
DEPENDS+= gvfs-[0-9]*:../../sysutils/gvfs
-BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-BUILD_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+= gettext-m4>=0.14.6:../../devel/gettext-m4
TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
REPLACE_PYTHON= data/merge_action_strings \
diff --git a/neomutt-git/Makefile b/neomutt-git/Makefile
index b4755c802e..ae41be6990 100644
--- a/neomutt-git/Makefile
+++ b/neomutt-git/Makefile
@@ -11,10 +11,10 @@ HOMEPAGE= https://www.neomutt.org/
COMMENT= Fork of mutt with integrated community patches
LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # or newer
-BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-BUILD_DEPENDS+= w3m-[0-9]*:../../www/w3m
+TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= w3m-[0-9]*:../../www/w3m
DEPENDS+= mime-types-[0-9]*:../../misc/mime-types
USE_TOOLS+= msgfmt gmake perl:build pkg-config
diff --git a/netbsd-awk/Makefile b/netbsd-awk/Makefile
index f55e90d7a4..37c21c33de 100644
--- a/netbsd-awk/Makefile
+++ b/netbsd-awk/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://cvsweb.NetBSD.org/bsdweb.cgi/src/external/historical/nawk/dis
COMMENT= NetBSD version of AWK
#LICENSE= mit/bsd?
-BUILD_DEPENDS+= mk-configure>0.19.0:../../devel/mk-configure
+TOOL_DEPENDS+= mk-configure>0.19.0:../../devel/mk-configure
USE_TOOLS+= yacc lex
diff --git a/newsboat/Makefile b/newsboat/Makefile
index 56f03df218..37ecfb0f14 100644
--- a/newsboat/Makefile
+++ b/newsboat/Makefile
@@ -17,7 +17,7 @@ USE_CURSES= wide
REPLACE_PERL+= txt2h.pl
-BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
BUILD_TARGET= all doc
FAKE_NCURSES= yes
diff --git a/newsboat213/Makefile b/newsboat213/Makefile
index 5b9ddb9022..7d9f1332ab 100644
--- a/newsboat213/Makefile
+++ b/newsboat213/Makefile
@@ -16,7 +16,7 @@ USE_CURSES= wide
REPLACE_PERL+= txt2h.pl
-BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
BUILD_TARGET= all doc
FAKE_NCURSES= yes
diff --git a/nih-current/Makefile b/nih-current/Makefile
index 5bd02e2722..a83e23b4b0 100644
--- a/nih-current/Makefile
+++ b/nih-current/Makefile
@@ -17,7 +17,7 @@ DEPENDS+= pkg_summary-utils>=0.66.0:../../pkgtools/pkg_summary-utils
DEPENDS+= digest-[0-9]*:../../pkgtools/digest
DEPENDS+= pkg_install>=20100915:../../pkgtools/pkg_install
-BUILD_DEPENDS+= mk-configure>=0.21.0:../../devel/mk-configure
+TOOL_DEPENDS+= mk-configure>=0.21.0:../../devel/mk-configure
CONFLICTS= pkg_status-[0-9]*
SUPERSEDES= pkgnih-[0-9]*
diff --git a/nix/Makefile b/nix/Makefile
index 4c979b70c5..f05a1d6f04 100644
--- a/nix/Makefile
+++ b/nix/Makefile
@@ -14,7 +14,7 @@ USE_TOOLS+= automake autoconf autoreconf
USE_LANGUAGES= c c++17
GNU_CONFIGURE= yes
-BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
PKGCONFIG_OVERRIDE+= src/libexpr/nix-expr.pc.in
PKGCONFIG_OVERRIDE+= src/libmain/nix-main.pc.in
@@ -91,9 +91,9 @@ PKG_USERS+= nixbld${i}:nixbld
# SUBST_STAGE.docbook2= pre-configure
# SUBST_SED.docbook2+= -e 's,http://docbook.org/xml/5.0/rng/docbook.rng,${PREFIX}/share/xsl/docbook,g'
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-BUILD_DEPENDS+= jq-[0-9]*:../../devel/jq
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= jq-[0-9]*:../../devel/jq
# Linux is supported, FreeBSD support is experimental.
# macOS is probably supported.
diff --git a/nyan/Makefile b/nyan/Makefile
index 1f2b50193d..7763071286 100644
--- a/nyan/Makefile
+++ b/nyan/Makefile
@@ -9,7 +9,7 @@ MAINTAINER= charlotte%NetBSD.org@localhost
COMMENT= Modding API with a typesafe hierarchical key-value database
LICENSE= gnu-lgpl-v3
-BUILD_DEPENDS+= flex-[0-9]*:../../devel/flex
+TOOL_DEPENDS+= flex-[0-9]*:../../devel/flex
USE_LANGUAGES= c c++
USE_CMAKE= yes
diff --git a/ocaml-ptmap/Makefile b/ocaml-ptmap/Makefile
index 1901d341cb..6681e86bad 100644
--- a/ocaml-ptmap/Makefile
+++ b/ocaml-ptmap/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/ocaml-community/sedlex
COMMENT= Implementation of maps over integers implemented as Patricia trees
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ocaml-obuild-[0-9]*:../../wip/ocaml-obuild
+TOOL_DEPENDS+= ocaml-obuild-[0-9]*:../../wip/ocaml-obuild
.include "../../devel/ocamlbuild/buildlink3.mk"
.include "../../lang/ocaml/ocaml.mk"
diff --git a/ocaml-sedlex/Makefile b/ocaml-sedlex/Makefile
index 45c6525eaa..bff8d1090b 100644
--- a/ocaml-sedlex/Makefile
+++ b/ocaml-sedlex/Makefile
@@ -14,7 +14,7 @@ LICENSE= mit
USE_TOOLS+= gmake
OCAML_USE_DUNE= yes
-BUILD_DEPENDS+= ocaml-odoc-[0-9]*:../../wip/ocaml-odoc
+TOOL_DEPENDS+= ocaml-odoc-[0-9]*:../../wip/ocaml-odoc
.include "../../lang/ocaml/ocaml.mk"
.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
diff --git a/ogmrip/Makefile b/ogmrip/Makefile
index 265641d4f0..0902758779 100644
--- a/ogmrip/Makefile
+++ b/ogmrip/Makefile
@@ -16,8 +16,8 @@ DEPENDS+= mplayer-[0-9]*:../../multimedia/mplayer
DEPENDS+= ogmtools-[0-9]*:../../multimedia/ogmtools
DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
DEPENDS+= gocr-[0-9]*:../../graphics/gocr
-BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
-BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
+TOOL_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
+TOOL_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= SED_PROG=${PREFIX}/bin/gsed
diff --git a/okteta/Makefile b/okteta/Makefile
index 9d3614855d..53acbef837 100644
--- a/okteta/Makefile
+++ b/okteta/Makefile
@@ -10,7 +10,7 @@ LICENSE= gnu-lgpl-v2 AND gnu-gpl-v2 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/openaxiom-svn/Makefile b/openaxiom-svn/Makefile
index 435bb73c41..c4fb70dc9e 100644
--- a/openaxiom-svn/Makefile
+++ b/openaxiom-svn/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake makeinfo awk:run
USE_LANGUAGES+= fortran77
-BUILD_DEPENDS+= noweb-[0-9]*:../../devel/noweb
+TOOL_DEPENDS+= noweb-[0-9]*:../../devel/noweb
BUILD_MAKE_FLAGS+= TOOLS_PLATFORM.install=${TOOLS_PLATFORM.install:Q}
diff --git a/openjkdf2/Makefile b/openjkdf2/Makefile
index d105213350..8cf54161a9 100644
--- a/openjkdf2/Makefile
+++ b/openjkdf2/Makefile
@@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
.include "../../lang/python/pyversion.mk"
-BUILD_DEPENDS+= ${PYPKGPREFIX}-cogapp-[0-9]*:../../devel/py-cogapp
+TOOL_DEPENDS+= ${PYPKGPREFIX}-cogapp-[0-9]*:../../devel/py-cogapp
CMAKE_ARGS+= -DPLAT_PKGSRC:BOOL=TRUE
CMAKE_ARGS+= -DPLAT_PKGSRC64:BOOL=FALSE
diff --git a/openscep/Makefile b/openscep/Makefile
index d5ada59089..845df01949 100644
--- a/openscep/Makefile
+++ b/openscep/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= carton%Ivy.NET@localhost
HOMEPAGE= http://openscep.othello.ch/
COMMENT= CA glue for Cisco SCEP
-BUILD_DEPENDS+= w3m>=0.5.1:../../www/w3m
+TOOL_DEPENDS+= w3m>=0.5.1:../../www/w3m
.include "../../mk/bsd.prefs.mk"
diff --git a/opensubdiv/options.mk b/opensubdiv/options.mk
index cda228474e..ba3c3f972c 100644
--- a/opensubdiv/options.mk
+++ b/opensubdiv/options.mk
@@ -24,8 +24,8 @@ CMAKE_ARGS+= -DNO_PTEX:BOOL=ON
.endif
.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DEPENDS+= doxygen>=1.8.9.1:../../devel/doxygen
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+TOOL_DEPENDS+= doxygen>=1.8.9.1:../../devel/doxygen
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
CMAKE_ARGS+= -DRST2HTML_EXECUTABLE:PATH=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
.include "../../lang/python/pyversion.mk"
PLIST.doc= yes
diff --git a/openxcom/Makefile b/openxcom/Makefile
index d922bc0c23..6966a0fd07 100644
--- a/openxcom/Makefile
+++ b/openxcom/Makefile
@@ -18,7 +18,7 @@ LICENSE= gnu-gpl-v3
DEPENDS+= timidity-[0-9]*:../../audio/timidity
# Docs say this is needed, but it builds fine without
-#BUILD_DEPENDS+= docbook2X-[0-9]*:../../wip/docbook2X
+#TOOL_DEPENDS+= docbook2X-[0-9]*:../../wip/docbook2X
OPENXCOM_BASE= ${PREFIX}/share/games/${PKGBASE}
OPENXCOM_DATA= ${OPENXCOM_BASE}/data
diff --git a/orion/Makefile b/orion/Makefile
index 23d5694c45..ee71d33cc0 100644
--- a/orion/Makefile
+++ b/orion/Makefile
@@ -11,8 +11,8 @@ COMMENT= Orion - a window manager for X written in Scheme
#
# XXX; This is just nasty.
#
-BUILD_DEPENDS+= scsh>=0.6:../../shells/scsh
-BUILD_DEPENDS+= scsh-install-lib>=1:../../wip/scsh-install-lib
+TOOL_DEPENDS+= scsh>=0.6:../../shells/scsh
+TOOL_DEPENDS+= scsh-install-lib>=1:../../wip/scsh-install-lib
DEPENDS+= sunterlib-*:../../wip/sunterlib
DEPENDS+= scx-*:../../wip/scx
diff --git a/p5-Alien-FFI/Makefile b/p5-Alien-FFI/Makefile
index a69f531275..48cac8b3e3 100644
--- a/p5-Alien-FFI/Makefile
+++ b/p5-Alien-FFI/Makefile
@@ -12,7 +12,7 @@ LICENSE= ${PERL5_LICENSE}
PERL5_PACKLIST= auto/Alien/FFI/.packlist
-BUILD_DEPENDS+= p5-Test2-Suite>=0:../../devel/p5-Test2-Suite
+TOOL_DEPENDS+= p5-Test2-Suite>=0:../../devel/p5-Test2-Suite
DEPENDS+= p5-Alien-Build-[0-9]*:../../devel/p5-Alien-Build
diff --git a/p5-CGI-Application-Dispatch/Makefile b/p5-CGI-Application-Dispatch/Makefile
index 395758488b..3647ddd4dc 100644
--- a/p5-CGI-Application-Dispatch/Makefile
+++ b/p5-CGI-Application-Dispatch/Makefile
@@ -16,9 +16,9 @@ DEPENDS+= p5-Exception-Class-[0-9]*:../../devel/p5-Exception-Class
DEPENDS+= p5-Try-Tiny-[0-9]*:../../devel/p5-Try-Tiny
DEPENDS+= p5-HTTP-Exception-[0-9]*:../../wip/p5-HTTP-Exception
-BUILD_DEPENDS+= p5-CGI-PSGI-[0-9]*:../../www/p5-CGI-PSGI
-BUILD_DEPENDS+= p5-Test-LongString-[0-9]*:../../devel/p5-Test-LongString
-BUILD_DEPENDS+= p5-Plack-[0-9]*:../../www/p5-Plack
+TOOL_DEPENDS+= p5-CGI-PSGI-[0-9]*:../../www/p5-CGI-PSGI
+TOOL_DEPENDS+= p5-Test-LongString-[0-9]*:../../devel/p5-Test-LongString
+TOOL_DEPENDS+= p5-Plack-[0-9]*:../../www/p5-Plack
PERL5_MODULE_TYPE= Module::Build
PERL5_PACKLIST= auto/CGI/Application/Dispatch/.packlist
diff --git a/p5-Catalyst-Engine-Apache/Makefile b/p5-Catalyst-Engine-Apache/Makefile
index ffac04720b..1dcdcd4768 100644
--- a/p5-Catalyst-Engine-Apache/Makefile
+++ b/p5-Catalyst-Engine-Apache/Makefile
@@ -9,8 +9,8 @@ MAINTAINER= kuli0020%umn.edu@localhost
HOMEPAGE= https://metacpan.org/release/Catalyst-Engine-Apache
COMMENT= Catalyst Apache Engines
-BUILD_DEPENDS+= p5-Catalyst-Runtime>=5.50:../../www/p5-Catalyst-Runtime
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+TOOL_DEPENDS+= p5-Catalyst-Runtime>=5.50:../../www/p5-Catalyst-Runtime
+TOOL_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
PERL5_PACKLIST= auto/Catalyst/Engine/Apache/.packlist
diff --git a/p5-Catalyst-Log-Log4perl/Makefile b/p5-Catalyst-Log-Log4perl/Makefile
index d7c7b92d2b..40800eb4fa 100644
--- a/p5-Catalyst-Log-Log4perl/Makefile
+++ b/p5-Catalyst-Log-Log4perl/Makefile
@@ -13,7 +13,7 @@ DEPENDS+= p5-Catalyst-Runtime>=5.60:../../www/p5-Catalyst-Runtime
DEPENDS+= p5-Log-Log4perl>=0.49:../../devel/p5-Log-Log4perl
DEPENDS+= p5-Params-Validate>=0:../../devel/p5-Params-Validate
DEPENDS+= p5-Sub-Install>=0:../../devel/p5-Sub-Install
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+TOOL_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
PERL5_PACKLIST= auto/Catalyst/Log/Log4perl/.packlist
MAKE_ENV+= PERL_USE_UNSAFE_INC=1
diff --git a/p5-Catalyst-Plugin-FillInForm/Makefile b/p5-Catalyst-Plugin-FillInForm/Makefile
index cc457e41c2..09bc7b9b10 100644
--- a/p5-Catalyst-Plugin-FillInForm/Makefile
+++ b/p5-Catalyst-Plugin-FillInForm/Makefile
@@ -15,7 +15,7 @@ PERL5_REQD+= 5.8
DEPENDS+= p5-Catalyst-Runtime>=2.99:../../www/p5-Catalyst-Runtime
DEPENDS+= p5-Catalyst-Action-RenderView-[0-9]*:../../www/p5-Catalyst-Action-RenderView
DEPENDS+= p5-HTML-FillInForm>=0:../../www/p5-HTML-FillInForm
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+TOOL_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
MAKE_ENV+= PERL_USE_UNSAFE_INC=1
PERL5_PACKLIST= auto/Catalyst/Plugin/FillInForm/.packlist
diff --git a/p5-Catalyst-Plugin-FormValidator/Makefile b/p5-Catalyst-Plugin-FormValidator/Makefile
index 43eb154c28..19b1971d5b 100644
--- a/p5-Catalyst-Plugin-FormValidator/Makefile
+++ b/p5-Catalyst-Plugin-FormValidator/Makefile
@@ -11,7 +11,7 @@ COMMENT= FormValidator for Catalyst
DEPENDS+= p5-Catalyst-Runtime>=2.99:../../www/p5-Catalyst-Runtime
DEPENDS+= p5-Data-FormValidator>=0:../../textproc/p5-Data-FormValidator
-BUILD_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
+TOOL_DEPENDS+= p5-Package-DeprecationManager-[0-9]*:../../devel/p5-Package-DeprecationManager
MAKE_ENV+= PERL_USE_UNSAFE_INC=1
PERL5_PACKLIST= auto/Catalyst/Plugin/FormValidator/.packlist
diff --git a/p5-Exception-Base/Makefile b/p5-Exception-Base/Makefile
index 3cf508c0f6..7e0b4f547f 100644
--- a/p5-Exception-Base/Makefile
+++ b/p5-Exception-Base/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://metacpan.org/release/Exception-Base
COMMENT= Exception::Base
LICENSE= ${PERL5_LICENSE}
-BUILD_DEPENDS+= p5-Test-Unit-Lite>=0.12:../../wip/p5-Test-Unit-Lite
+TOOL_DEPENDS+= p5-Test-Unit-Lite>=0.12:../../wip/p5-Test-Unit-Lite
PERL5_PACKLIST= auto/Exception/Base/.packlist
diff --git a/p5-HTTP-BrowserDetect/Makefile b/p5-HTTP-BrowserDetect/Makefile
index 413c7a25dc..a2aa17277a 100644
--- a/p5-HTTP-BrowserDetect/Makefile
+++ b/p5-HTTP-BrowserDetect/Makefile
@@ -14,9 +14,9 @@ DEPENDS+= p5-File-Slurp-[0-9]*:../../devel/p5-File-Slurp
DEPENDS+= p5-Path-Tiny-[0-9]*:../../filesystems/p5-Path-Tiny
DEPENDS+= p5-Hash-Merge-[0-9]*:../../devel/p5-Hash-Merge
-BUILD_DEPENDS+= p5-Test-Most-[0-9]*:../../devel/p5-Test-Most
-BUILD_DEPENDS+= p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
-BUILD_DEPENDS+= p5-Test-FailWarnings-[0-9]*:../../devel/p5-Test-FailWarnings
+TOOL_DEPENDS+= p5-Test-Most-[0-9]*:../../devel/p5-Test-Most
+TOOL_DEPENDS+= p5-Test-NoWarnings-[0-9]*:../../devel/p5-Test-NoWarnings
+TOOL_DEPENDS+= p5-Test-FailWarnings-[0-9]*:../../devel/p5-Test-FailWarnings
PERL5_PACKLIST= auto/HTTP/BrowserDetect/.packlist
diff --git a/p5-Mail-DMARC-PurePerl/Makefile b/p5-Mail-DMARC-PurePerl/Makefile
index 3c64613de4..d19c48f709 100644
--- a/p5-Mail-DMARC-PurePerl/Makefile
+++ b/p5-Mail-DMARC-PurePerl/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE= https://metacpan.org/pod/Mail::DMARC
COMMENT= Perl implementation of DMARC
LICENSE= ${PERL5_LICENSE}
-BUILD_DEPENDS+= p5-Module-Build>=0.3601:../../devel/p5-Module-Build
-BUILD_DEPENDS+= p5-File-ShareDir-Install>=0.06:../../devel/p5-File-ShareDir-Install
-BUILD_DEPENDS+= p5-Module-Build>=0.3601:../../devel/p5-Module-Build
+TOOL_DEPENDS+= p5-Module-Build>=0.3601:../../devel/p5-Module-Build
+TOOL_DEPENDS+= p5-File-ShareDir-Install>=0.06:../../devel/p5-File-ShareDir-Install
+TOOL_DEPENDS+= p5-Module-Build>=0.3601:../../devel/p5-Module-Build
DEPENDS+= p5-Config-Tiny>=0:../../devel/p5-Config-Tiny
DEPENDS+= # TODO: p5-POSIX>=0
DEPENDS+= # TODO: p5-perl>=5.10.0
diff --git a/p5-MojoX-Log-Log4perl-Tiny/Makefile b/p5-MojoX-Log-Log4perl-Tiny/Makefile
index 159bfe2dfb..a8bf0bc9d2 100644
--- a/p5-MojoX-Log-Log4perl-Tiny/Makefile
+++ b/p5-MojoX-Log-Log4perl-Tiny/Makefile
@@ -19,7 +19,7 @@ PERL5_PACKLIST= auto/MojoX/Log/Log4perl/Tiny/.packlist
PERL5_MODULE_TYPE= Module::Build
-BUILD_DEPENDS+= p5-Module-Build-Tiny-[0-9]*:../../devel/p5-Module-Build-Tiny
+TOOL_DEPENDS+= p5-Module-Build-Tiny-[0-9]*:../../devel/p5-Module-Build-Tiny
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/p5-OptArgs/Makefile b/p5-OptArgs/Makefile
index fa1099dd07..beeb9b9407 100644
--- a/p5-OptArgs/Makefile
+++ b/p5-OptArgs/Makefile
@@ -11,8 +11,8 @@ LICENSE= ${PERL5_LICENSE}
DEPENDS+= p5-Exporter-Tidy-[0-9]*:../../wip/p5-Exporter-Tidy
DEPENDS+= p5-IO-Capture-[0-9]*:../../devel/p5-IO-Capture
-BUILD_DEPENDS+= p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
-BUILD_DEPENDS+= p5-Test-Output-[0-9]*:../../devel/p5-Test-Output
+TOOL_DEPENDS+= p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
+TOOL_DEPENDS+= p5-Test-Output-[0-9]*:../../devel/p5-Test-Output
MAKE_ENV+= PERL_USE_UNSAFE_INC=1
PERL5_PACKLIST= auto/OptArgs/.packlist
diff --git a/p5-PDL/Makefile b/p5-PDL/Makefile
index 420bbf09d5..61fd2d7dcb 100644
--- a/p5-PDL/Makefile
+++ b/p5-PDL/Makefile
@@ -21,9 +21,9 @@ DEPENDS+= p5-Inline-C-[0-9]*:../../devel/p5-Inline-C
DEPENDS+= p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
DEPENDS+= p5-Module-Compile-[0-9]*:../../devel/p5-Module-Compile
DEPENDS+= p5-Pod-Parser-[0-9]*:../../textproc/p5-Pod-Parser
-BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
-BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-BUILD_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
+TOOL_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
+TOOL_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+TOOL_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
PERL5_PACKLIST= auto/PDL/.packlist
MAKE_JOBS_SAFE= no
diff --git a/p5-Plucene/Makefile b/p5-Plucene/Makefile
index c1e01cff56..40dfdd2de5 100644
--- a/p5-Plucene/Makefile
+++ b/p5-Plucene/Makefile
@@ -20,7 +20,7 @@ DEPENDS+= p5-Lingua-Stem>=0.81:../../textproc/p5-Lingua-Stem
DEPENDS+= p5-Scalar-List-Utils>=1.13:../../devel/p5-Scalar-List-Utils
DEPENDS+= p5-Tie-Array-Sorted>=1.1:../../devel/p5-Tie-Array-Sorted
DEPENDS+= p5-Encode-compat>=0:../../wip/p5-Encode-compat
-BUILD_DEPENDS+= p5-File-Slurp>=2002.1031:../../devel/p5-File-Slurp
+TOOL_DEPENDS+= p5-File-Slurp>=2002.1031:../../devel/p5-File-Slurp
PERL5_MODULE_TYPE= Module::Build
PERL5_PACKLIST= auto/Plucene/.packlist
diff --git a/p5-PluceneSimple/Makefile b/p5-PluceneSimple/Makefile
index 32eddffe11..1c647ae0ae 100644
--- a/p5-PluceneSimple/Makefile
+++ b/p5-PluceneSimple/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perl interface to Plucene
DEPENDS+= p5-PathTools>=1.2:../../devel/p5-PathTools
DEPENDS+= p5-Plucene>=1.09:../../wip/p5-Plucene
DEPENDS+= p5-Time-Piece-Range>=1.0:../../wip/p5-Time-Piece-Range
-BUILD_DEPENDS+= p5-File-Find-Rule>=0.10:../../devel/p5-File-Find-Rule
-BUILD_DEPENDS+= p5-File-Slurp>=2002.1031:../../devel/p5-File-Slurp
-BUILD_DEPENDS+= p5-Test-Class>=0.03:../../devel/p5-Test-Class
+TOOL_DEPENDS+= p5-File-Find-Rule>=0.10:../../devel/p5-File-Find-Rule
+TOOL_DEPENDS+= p5-File-Slurp>=2002.1031:../../devel/p5-File-Slurp
+TOOL_DEPENDS+= p5-Test-Class>=0.03:../../devel/p5-Test-Class
PERL5_MODULE_TYPE= Module::Build
diff --git a/p5-Test-Stub/Makefile b/p5-Test-Stub/Makefile
index ae784eea1f..0df5967e10 100644
--- a/p5-Test-Stub/Makefile
+++ b/p5-Test-Stub/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://metacpan.org/release/Test-Stub
COMMENT= Simple stubbing library for Perl5
LICENSE= ${PERL5_LICENSE}
-BUILD_DEPENDS+= p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
+TOOL_DEPENDS+= p5-Test-Requires-[0-9]*:../../devel/p5-Test-Requires
USE_LANGUAGES= # empty
diff --git a/p5-Text-Hatena/Makefile b/p5-Text-Hatena/Makefile
index 738a79f82e..4fefb15d7e 100644
--- a/p5-Text-Hatena/Makefile
+++ b/p5-Text-Hatena/Makefile
@@ -17,7 +17,7 @@ DEPENDS+= p5-libwww>=5.805:../../www/p5-libwww
DEPENDS+= p5-Text-VimColor>=0.11:../../wip/p5-Text-VimColor
DEPENDS+= p5-Regexp-Assemble-[0-9]*:../../devel/p5-Regexp-Assemble
DEPENDS+= p5-Parse-RecDescent-[0-9]*:../../devel/p5-Parse-RecDescent
-BUILD_DEPENDS+= p5-Test-Base-[0-9]*:../../devel/p5-Test-Base
+TOOL_DEPENDS+= p5-Test-Base-[0-9]*:../../devel/p5-Test-Base
PERL5_PACKLIST= auto/Text/Hatena/.packlist
diff --git a/p5-Text-VimColor/Makefile b/p5-Text-VimColor/Makefile
index d31fa2d98e..527df2762c 100644
--- a/p5-Text-VimColor/Makefile
+++ b/p5-Text-VimColor/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE= https://metacpan.org/release/Text-VimColor
COMMENT= Syntax color text in HTML or XML using Vim
LICENSE= ${PERL5_LICENSE}
-BUILD_DEPENDS+= p5-File-ShareDir-Install-[0-9]*:../../devel/p5-File-ShareDir-Install
-BUILD_DEPENDS+= p5-Test-File-ShareDir-[0-9]*:../../devel/p5-Test-File-ShareDir
+TOOL_DEPENDS+= p5-File-ShareDir-Install-[0-9]*:../../devel/p5-File-ShareDir-Install
+TOOL_DEPENDS+= p5-Test-File-ShareDir-[0-9]*:../../devel/p5-Test-File-ShareDir
DEPENDS+= p5-Path-Class>=0.02:../../devel/p5-Path-Class
DEPENDS+= p5-File-ShareDir-[0-9]*:../../devel/p5-File-ShareDir
diff --git a/p5-UUID/Makefile b/p5-UUID/Makefile
index 42828bcb66..9bae3819c3 100644
--- a/p5-UUID/Makefile
+++ b/p5-UUID/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://metacpan.org/release/UUID
COMMENT= DCE compatible Universally Unique Identifier library for Perl
LICENSE= ${PERL5_LICENSE}
-BUILD_DEPENDS+= p5-Devel-CheckLib>=1.02:../../devel/p5-Devel-CheckLib
+TOOL_DEPENDS+= p5-Devel-CheckLib>=1.02:../../devel/p5-Devel-CheckLib
PERL5_PACKLIST= auto/UUID/.packlist
diff --git a/p5-WebService-GData/Makefile b/p5-WebService-GData/Makefile
index 67732a9a61..e0f7c3aaf5 100644
--- a/p5-WebService-GData/Makefile
+++ b/p5-WebService-GData/Makefile
@@ -14,7 +14,7 @@ LICENSE= ${PERL5_LICENSE}
DEPENDS+= p5-libwww>=0:../../www/p5-libwww
DEPENDS+= p5-JSON>=2:../../converters/p5-JSON
DEPENDS+= p5-Crypt-SSLeay>=0:../../security/p5-Crypt-SSLeay
-BUILD_DEPENDS+= p5-Test-Mock-LWP>=0.05:../../devel/p5-Test-Mock-LWP
+TOOL_DEPENDS+= p5-Test-Mock-LWP>=0.05:../../devel/p5-Test-Mock-LWP
PERL5_PACKLIST= auto/WebService/GData/.packlist
diff --git a/p5-XML-RSS-LibXML/Makefile b/p5-XML-RSS-LibXML/Makefile
index 61623fcc31..5a5f60e4ad 100644
--- a/p5-XML-RSS-LibXML/Makefile
+++ b/p5-XML-RSS-LibXML/Makefile
@@ -16,9 +16,9 @@ DEPENDS+= p5-DateTime-Format-W3CDTF-[0-9]*:../../time/p5-DateTime-Format-W3CDTF
DEPENDS+= p5-XML-LibXML>=1.66:../../textproc/p5-XML-LibXML
DEPENDS+= p5-UNIVERSAL-require-[0-9]*:../../devel/p5-UNIVERSAL-require
# TEST_DEPENDS
-BUILD_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
-BUILD_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
-BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
+TOOL_DEPENDS+= p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
+TOOL_DEPENDS+= p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
+TOOL_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences
PERL5_MODULE_TYPE= Module::Build
PERL5_PACKLIST= auto/XML/RSS/LibXML/.packlist
diff --git a/pan2-git/Makefile b/pan2-git/Makefile
index c7dc34e31c..e2cab1889e 100644
--- a/pan2-git/Makefile
+++ b/pan2-git/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE= http://pan.rebelbase.com/
COMMENT= Newsreader for GTK3 and GTK2
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= gnome-common>=3.6.0nb1:../../devel/gnome-common
-BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
+TOOL_DEPENDS+= gnome-common>=3.6.0nb1:../../devel/gnome-common
+TOOL_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
USE_TOOLS+= autoconf automake gettext-m4 gmake perl pkg-config
USE_LIBTOOL= yes
diff --git a/pear-Base/Makefile b/pear-Base/Makefile
index a102ca7892..2f411447e2 100644
--- a/pear-Base/Makefile
+++ b/pear-Base/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.ezcomponents.org/docs/tutorials/Base
COMMENT= Basic functionality that all eZ Components need
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-ezc-[0-9]*:../../wip/pear-channel-ezc
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-ezc-[0-9]*:../../wip/pear-channel-ezc
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-CakePHP_CodeSniffer/Makefile b/pear-CakePHP_CodeSniffer/Makefile
index b9272c05a7..38e6993036 100644
--- a/pear-CakePHP_CodeSniffer/Makefile
+++ b/pear-CakePHP_CodeSniffer/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= https://pear.cakephp.org/
COMMENT= CodeSniffer rules for checking code against the CakePHP coding standards
LICENSE= mit
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-cakephp-[0-9]*:../../wip/pear-channel-cakephp
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-cakephp-[0-9]*:../../wip/pear-channel-cakephp
DEPENDS+= ${PHP_PKG_PREFIX}-pear-PHP_CodeSniffer>=1.4.4:../../wip/pear-PHP_CodeSniffer
.include "../../lang/php/pear.mk"
diff --git a/pear-ConsoleTools/Makefile b/pear-ConsoleTools/Makefile
index bd467b4751..a8288e4a83 100644
--- a/pear-ConsoleTools/Makefile
+++ b/pear-ConsoleTools/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.ezcomponents.org/docs/tutorials/ConsoleTools
COMMENT= Tools to build applications that run on a computer console
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-ezc-[0-9]*:../../wip/pear-channel-ezc
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-ezc-[0-9]*:../../wip/pear-channel-ezc
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Base>=1.8:../../wip/pear-Base
.include "../../lang/php/pear.mk"
diff --git a/pear-FPDF/Makefile b/pear-FPDF/Makefile
index 0f1f2a991d..c6d3547fd5 100644
--- a/pear-FPDF/Makefile
+++ b/pear-FPDF/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.pearhub.org/projects/FPDF
COMMENT= Unofficial PEAR FPDF-library
LICENSE= gnu-lgpl-v3
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-pearhub-[0-9]*:../../wip/pear-channel-pearhub
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-pearhub-[0-9]*:../../wip/pear-channel-pearhub
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-File_Iterator/Makefile b/pear-File_Iterator/Makefile
index ba9bfda01b..b365f56623 100644
--- a/pear-File_Iterator/Makefile
+++ b/pear-File_Iterator/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://pear.phpunit.de/
COMMENT= Filters files based on a list of suffixes
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Finder/Makefile b/pear-Finder/Makefile
index 5f4b767a39..3db7b168c5 100644
--- a/pear-Finder/Makefile
+++ b/pear-Finder/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= https://symfony.com/
COMMENT= Symfony2 Finder Component
LICENSE= mit
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-symfony2-[0-9]*:../../wip/pear-channel-symfony
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-symfony2-[0-9]*:../../wip/pear-channel-symfony
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-FinderFacade/Makefile b/pear-FinderFacade/Makefile
index e588495c67..d1adc8efa8 100644
--- a/pear-FinderFacade/Makefile
+++ b/pear-FinderFacade/Makefile
@@ -8,7 +8,7 @@ MAINTAINER= noud4%users.sourceforge.net@localhost
HOMEPAGE= http://pear.phpunit.de/
COMMENT= Convenience wrapper for Symfony\'s Finder component
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
DEPENDS+= ${PHP_PKG_PREFIX}-pear-fDOMDocument>=1.3.1:../../wip/pear-fDOMDocument
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Finder>=2.2.0:../../wip/pear-Finder
diff --git a/pear-Horde_ActiveSync/Makefile b/pear-Horde_ActiveSync/Makefile
index 5e8131d4be..abd440e593 100644
--- a/pear-Horde_ActiveSync/Makefile
+++ b/pear-Horde_ActiveSync/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= ActiveSync server
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Date-[0-9]*:../../wip/pear-Horde_Date
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Support-[0-9]*:../../wip/pear-Horde_Support
diff --git a/pear-Horde_Alarm/Makefile b/pear-Horde_Alarm/Makefile
index 9cb04d23ac..cf9d4363ae 100644
--- a/pear-Horde_Alarm/Makefile
+++ b/pear-Horde_Alarm/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Interface dealing with alarms
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Date-[0-9]*:../../wip/pear-Horde_Date
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Translation-[0-9]*:../../wip/pear-Horde_Translation
diff --git a/pear-Horde_Auth/Makefile b/pear-Horde_Auth/Makefile
index 2cac993166..e2e4e6c5d4 100644
--- a/pear-Horde_Auth/Makefile
+++ b/pear-Horde_Auth/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Authentification backends
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Util-[0-9]*:../../wip/pear-Horde_Util
diff --git a/pear-Horde_Autoloader/Makefile b/pear-Horde_Autoloader/Makefile
index b524fe8900..398cbcf56a 100644
--- a/pear-Horde_Autoloader/Makefile
+++ b/pear-Horde_Autoloader/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Autoload implementation
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Horde_Browser/Makefile b/pear-Horde_Browser/Makefile
index 55ff8c5119..98b629e3bf 100644
--- a/pear-Horde_Browser/Makefile
+++ b/pear-Horde_Browser/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Browser informations
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Util-[0-9]*:../../wip/pear-Horde_Util
diff --git a/pear-Horde_Cache/Makefile b/pear-Horde_Cache/Makefile
index e334b04840..a4abea50ed 100644
--- a/pear-Horde_Cache/Makefile
+++ b/pear-Horde_Cache/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Caching API
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Util-[0-9]*:../../wip/pear-Horde_Util
diff --git a/pear-Horde_Cli/Makefile b/pear-Horde_Cli/Makefile
index 4bf4ba4f24..94bc8867e7 100644
--- a/pear-Horde_Cli/Makefile
+++ b/pear-Horde_Cli/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Command-line functionalities
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Support-[0-9]*:../../wip/pear-Horde_Support
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Translation-[0-9]*:../../wip/pear-Horde_Translation
diff --git a/pear-Horde_Compress/Makefile b/pear-Horde_Compress/Makefile
index 6267159f62..5e090e9d8a 100644
--- a/pear-Horde_Compress/Makefile
+++ b/pear-Horde_Compress/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= API for compression
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Translation-[0-9]*:../../wip/pear-Horde_Translation
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Util-[0-9]*:../../wip/pear-Horde_Util
diff --git a/pear-Horde_Constraint/Makefile b/pear-Horde_Constraint/Makefile
index ba138b2245..2185ba6815 100644
--- a/pear-Horde_Constraint/Makefile
+++ b/pear-Horde_Constraint/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Constraints builder for horde
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Horde_Controller/Makefile b/pear-Horde_Controller/Makefile
index b77beb165f..da795f58d8 100644
--- a/pear-Horde_Controller/Makefile
+++ b/pear-Horde_Controller/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Controller part of an MVC system for horde
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Injector-[0-9]*:../../wip/pear-Horde_Injector
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Log-[0-9]*:../../wip/pear-Horde_Log
diff --git a/pear-Horde_Data/Makefile b/pear-Horde_Data/Makefile
index 87bc2c7066..d197b6b4a7 100644
--- a/pear-Horde_Data/Makefile
+++ b/pear-Horde_Data/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Data import and export backends for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Browser-[0-9]*:../../wip/pear-Horde_Browser
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
diff --git a/pear-Horde_Date/Makefile b/pear-Horde_Date/Makefile
index b417f17c35..9406150726 100644
--- a/pear-Horde_Date/Makefile
+++ b/pear-Horde_Date/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Date manipulation
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Nls-[0-9]*:../../wip/pear-Horde_Nls
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Translation-[0-9]*:../../wip/pear-Horde_Translation
diff --git a/pear-Horde_Db/Makefile b/pear-Horde_Db/Makefile
index 56dd11d180..a035e76cda 100644
--- a/pear-Horde_Db/Makefile
+++ b/pear-Horde_Db/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Database abstraction for horde
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Date-[0-9]*:../../wip/pear-Horde_Date
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Support-[0-9]*:../../wip/pear-Horde_Support
diff --git a/pear-Horde_Exception/Makefile b/pear-Horde_Exception/Makefile
index 288b61a1e9..c4a0b30e0b 100644
--- a/pear-Horde_Exception/Makefile
+++ b/pear-Horde_Exception/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Default exception handlers for Horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Translation-[0-9]*:../../wip/pear-Horde_Translation
.include "../../lang/php/pear.mk"
diff --git a/pear-Horde_Group/Makefile b/pear-Horde_Group/Makefile
index 7f9b058648..70505e680f 100644
--- a/pear-Horde_Group/Makefile
+++ b/pear-Horde_Group/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Group management for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Util-[0-9]*:../../wip/pear-Horde_Util
diff --git a/pear-Horde_History/Makefile b/pear-Horde_History/Makefile
index c8d9138828..146d7866fb 100644
--- a/pear-Horde_History/Makefile
+++ b/pear-Horde_History/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Change tracker in horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Db-[0-9]*:../../wip/pear-Horde_Db
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
diff --git a/pear-Horde_Icalendar/Makefile b/pear-Horde_Icalendar/Makefile
index 93780c53e6..77a0f9a0d6 100644
--- a/pear-Horde_Icalendar/Makefile
+++ b/pear-Horde_Icalendar/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= ICalendar API for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Date-[0-9]*:../../wip/pear-Horde_Date
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Mime-[0-9]*:../../wip/pear-Horde_Mime
diff --git a/pear-Horde_Injector/Makefile b/pear-Horde_Injector/Makefile
index fdad56ab49..96efd97728 100644
--- a/pear-Horde_Injector/Makefile
+++ b/pear-Horde_Injector/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Injection container for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
.include "../../lang/php/pear.mk"
diff --git a/pear-Horde_Lock/Makefile b/pear-Horde_Lock/Makefile
index d19feb0955..ea9caa3aac 100644
--- a/pear-Horde_Lock/Makefile
+++ b/pear-Horde_Lock/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Locking system for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Support-[0-9]*:../../wip/pear-Horde_Support
diff --git a/pear-Horde_Log/Makefile b/pear-Horde_Log/Makefile
index 6f4219ce04..faaf5a1189 100644
--- a/pear-Horde_Log/Makefile
+++ b/pear-Horde_Log/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Logging package for horde
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Support-[0-9]*:../../wip/pear-Horde_Support
diff --git a/pear-Horde_Mime/Makefile b/pear-Horde_Mime/Makefile
index 6e06230ec2..1d10be45a2 100644
--- a/pear-Horde_Mime/Makefile
+++ b/pear-Horde_Mime/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= MIME manipulation for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Stream_Filter-[0-9]*:../../wip/pear-Horde_Stream_Filter
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Support-[0-9]*:../../wip/pear-Horde_Support
diff --git a/pear-Horde_Nls/Makefile b/pear-Horde_Nls/Makefile
index fe0a840bd0..e5ac60c94e 100644
--- a/pear-Horde_Nls/Makefile
+++ b/pear-Horde_Nls/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= TODO: Short description of the package
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Translation-[0-9]*:../../wip/pear-Horde_Translation
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Util-[0-9]*:../../wip/pear-Horde_Util
diff --git a/pear-Horde_Stream_Filter/Makefile b/pear-Horde_Stream_Filter/Makefile
index dd8c83a99b..4588100564 100644
--- a/pear-Horde_Stream_Filter/Makefile
+++ b/pear-Horde_Stream_Filter/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Stream filters for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Horde_Stream_Wrapper/Makefile b/pear-Horde_Stream_Wrapper/Makefile
index 94bece1354..07b8087607 100644
--- a/pear-Horde_Stream_Wrapper/Makefile
+++ b/pear-Horde_Stream_Wrapper/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Stream wrappers
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Horde_Support/Makefile b/pear-Horde_Support/Makefile
index b2518f609c..c9773b7461 100644
--- a/pear-Horde_Support/Makefile
+++ b/pear-Horde_Support/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Support classes
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Stream_Wrapper-[0-9]*:../../wip/pear-Horde_Stream_Wrapper
diff --git a/pear-Horde_Text_Flowed/Makefile b/pear-Horde_Text_Flowed/Makefile
index 28bbd902a5..d3b998b372 100644
--- a/pear-Horde_Text_Flowed/Makefile
+++ b/pear-Horde_Text_Flowed/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= RFC 3676 encoded text manipulation for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Util-[0-9]*:../../wip/pear-Horde_Util
.include "../../lang/php/pear.mk"
diff --git a/pear-Horde_Translation/Makefile b/pear-Horde_Translation/Makefile
index 72c374594e..3723e567de 100644
--- a/pear-Horde_Translation/Makefile
+++ b/pear-Horde_Translation/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Translation wrappers
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Horde_Url/Makefile b/pear-Horde_Url/Makefile
index 96b9ec02b6..c24203ec72 100644
--- a/pear-Horde_Url/Makefile
+++ b/pear-Horde_Url/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= URL manipulation class
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Exception-[0-9]*:../../wip/pear-Horde_Exception
.include "../../lang/php/pear.mk"
diff --git a/pear-Horde_Util/Makefile b/pear-Horde_Util/Makefile
index c4554cf455..d2c30cb251 100644
--- a/pear-Horde_Util/Makefile
+++ b/pear-Horde_Util/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pear.horde.org/
COMMENT= Useful functionalities for horde
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-horde-[0-9]*:../../wip/pear-channel-horde
DEPENDS+= ${PHP_PKG_PREFIX}-pear-Horde_Url-[0-9]*:../../wip/pear-Horde_Url
.include "../../lang/php/pear.mk"
diff --git a/pear-PHP_Depend/Makefile b/pear-PHP_Depend/Makefile
index fcacf23c9f..aaafa7cbe0 100644
--- a/pear-PHP_Depend/Makefile
+++ b/pear-PHP_Depend/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pdepend.org/
COMMENT= PHP_Depend design quality metrics for PHP packages
LICENSE= original-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-pdepend-[0-9]*:../../wip/pear-channel-pdepend
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-pdepend-[0-9]*:../../wip/pear-channel-pdepend
DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
# XXX option pecl/imagick
diff --git a/pear-PHP_PMD/Makefile b/pear-PHP_PMD/Makefile
index 86f182b5b1..32e6047820 100644
--- a/pear-PHP_PMD/Makefile
+++ b/pear-PHP_PMD/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://phpmd.org/
COMMENT= PHP Mess Detector
LICENSE= original-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpmd-[0-9]*:../../wip/pear-channel-phpmd
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpmd-[0-9]*:../../wip/pear-channel-phpmd
DEPENDS+= ${PHP_PKG_PREFIX}-pear-PHP_Depend>=1.1.0:../../wip/pear-PHP_Depend
DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
diff --git a/pear-PHP_Timer/Makefile b/pear-PHP_Timer/Makefile
index 131ddaa8ab..9759d8dfb5 100644
--- a/pear-PHP_Timer/Makefile
+++ b/pear-PHP_Timer/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://pear.phpunit.de/
COMMENT= Utility class for timing
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-PHP_TokenStream/Makefile b/pear-PHP_TokenStream/Makefile
index 512113666f..37e8e399c0 100644
--- a/pear-PHP_TokenStream/Makefile
+++ b/pear-PHP_TokenStream/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://pear.phpunit.de/
COMMENT= Wrapper around PHP\'s tokenizer extension
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Swift/Makefile b/pear-Swift/Makefile
index a4d654d20e..c38ec1b20a 100644
--- a/pear-Swift/Makefile
+++ b/pear-Swift/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://swiftmailer.org/
COMMENT= Free Feature-rich PHP Mailer
LICENSE= gnu-lgpl-v3
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-swiftmailer-[0-9]*:../../wip/pear-channel-swiftmailer
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-swiftmailer-[0-9]*:../../wip/pear-channel-swiftmailer
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Text_Template/Makefile b/pear-Text_Template/Makefile
index 823f04accc..8be7188008 100644
--- a/pear-Text_Template/Makefile
+++ b/pear-Text_Template/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://pear.phpunit.de/
COMMENT= Simple template engine
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Version/Makefile b/pear-Version/Makefile
index 57081403b5..31230b8df6 100644
--- a/pear-Version/Makefile
+++ b/pear-Version/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://pear.phpunit.de/
COMMENT= Library that helps with managing the version number of Git-hosted PHP projects
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-phpunit-[0-9]*:../../wip/pear-channel-phpunit
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-Yaml/Makefile b/pear-Yaml/Makefile
index eefeed94b4..fe88de74c0 100644
--- a/pear-Yaml/Makefile
+++ b/pear-Yaml/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= https://symfony.com/components
COMMENT= Symfony2 Yaml Component
LICENSE= mit
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-symfony2-[0-9]*:../../wip/pear-channel-symfony
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-symfony2-[0-9]*:../../wip/pear-channel-symfony
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pear-fDOMDocument/Makefile b/pear-fDOMDocument/Makefile
index e52e8af8cd..cb76f1bdd8 100644
--- a/pear-fDOMDocument/Makefile
+++ b/pear-fDOMDocument/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://pear.netpirates.net/
COMMENT= Extension to PHP\'s standard DOM to add methods and exceptions
LICENSE= modified-bsd # XXX unsure which bsd license
-BUILD_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-theseer-[0-9]*:../../wip/pear-channel-theseer
+TOOL_DEPENDS+= ${PHP_PKG_PREFIX}-pear-channel-theseer-[0-9]*:../../wip/pear-channel-theseer
DEPENDS+= ${PHP_PKG_PREFIX}-dom-[0-9]*:../../textproc/php-dom
.include "../../lang/php/pear.mk"
diff --git a/perl5-devel/module.mk b/perl5-devel/module.mk
index 1ccbabae0b..de49e3ee6e 100644
--- a/perl5-devel/module.mk
+++ b/perl5-devel/module.mk
@@ -83,17 +83,17 @@ BUILDLINK_DEPMETHOD.perl+= full
.if ${PKGPATH} != devel/p5-Module-Build && \
(${PERL5_MODULE_TYPE} == "Module::Build")
-BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
+TOOL_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
.endif
.if ${PKGPATH} != devel/p5-Module-Build-Tiny && \
(${PERL5_MODULE_TYPE} == "Module::Build::Tiny")
-BUILD_DEPENDS+= p5-Module-Build-Tiny>=0.23:../../devel/p5-Module-Build-Tiny
+TOOL_DEPENDS+= p5-Module-Build-Tiny>=0.23:../../devel/p5-Module-Build-Tiny
.endif
.if ${PKGPATH} != devel/p5-Module-Install && \
(${PERL5_MODULE_TYPE} == "Module::Install")
-BUILD_DEPENDS+= p5-Module-Install>=0.91:../../devel/p5-Module-Install
+TOOL_DEPENDS+= p5-Module-Install>=0.91:../../devel/p5-Module-Install
.endif
diff --git a/perl5/module.mk b/perl5/module.mk
index 1ccbabae0b..de49e3ee6e 100644
--- a/perl5/module.mk
+++ b/perl5/module.mk
@@ -83,17 +83,17 @@ BUILDLINK_DEPMETHOD.perl+= full
.if ${PKGPATH} != devel/p5-Module-Build && \
(${PERL5_MODULE_TYPE} == "Module::Build")
-BUILD_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
+TOOL_DEPENDS+= p5-Module-Build>=0.42050:../../devel/p5-Module-Build
.endif
.if ${PKGPATH} != devel/p5-Module-Build-Tiny && \
(${PERL5_MODULE_TYPE} == "Module::Build::Tiny")
-BUILD_DEPENDS+= p5-Module-Build-Tiny>=0.23:../../devel/p5-Module-Build-Tiny
+TOOL_DEPENDS+= p5-Module-Build-Tiny>=0.23:../../devel/p5-Module-Build-Tiny
.endif
.if ${PKGPATH} != devel/p5-Module-Install && \
(${PERL5_MODULE_TYPE} == "Module::Install")
-BUILD_DEPENDS+= p5-Module-Install>=0.91:../../devel/p5-Module-Install
+TOOL_DEPENDS+= p5-Module-Install>=0.91:../../devel/p5-Module-Install
.endif
diff --git a/pgstudio/Makefile b/pgstudio/Makefile
index fb81b58a66..58e931d533 100644
--- a/pgstudio/Makefile
+++ b/pgstudio/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://www.postgresqlstudio.org/about/
COMMENT= GUI to manage PostgreSQL database
LICENSE= postgresql-license
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
+TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
DEPENDS+= apache-tomcat-[0-9]*:../../www/apache-tomcat8
DEPENDS+= p5-CGI-[0-9]*:../../www/p5-CGI
diff --git a/phonon-backend-xine/Makefile b/phonon-backend-xine/Makefile
index bc1147e074..1cca4d02b8 100644
--- a/phonon-backend-xine/Makefile
+++ b/phonon-backend-xine/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-lgpl-v2.1
# BUILD_MAKE_FLAGS+= VERBOSE=1
-BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
+TOOL_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
diff --git a/pidgin-festival/Makefile b/pidgin-festival/Makefile
index 22747fd19e..e3d5e1c70a 100644
--- a/pidgin-festival/Makefile
+++ b/pidgin-festival/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://pidgin-festival.sourceforge.net/
COMMENT= Pidgin plugin that interfaces with festival
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
DEPENDS+= festival-[0-9]*:../../audio/festival
WRKSRC= ${WRKDIR}/pidgin-festival-2.4
GNU_CONFIGURE= yes
diff --git a/pidgin-rhythmbox/Makefile b/pidgin-rhythmbox/Makefile
index 21d5f8cb7f..75f40552e4 100644
--- a/pidgin-rhythmbox/Makefile
+++ b/pidgin-rhythmbox/Makefile
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
-BUILD_DEPENDS+= rhythmbox>=0.11.6:../../audio/rhythmbox
+TOOL_DEPENDS+= rhythmbox>=0.11.6:../../audio/rhythmbox
INSTALLATION_DIRS= share/pidgin-rhythmbox
diff --git a/pike8.0/Makefile b/pike8.0/Makefile
index 720a3dc594..72e46e9096 100644
--- a/pike8.0/Makefile
+++ b/pike8.0/Makefile
@@ -18,8 +18,8 @@ CHECK_SSP= no
# so leaving SSP enabled causes problems.
SSP_SUPPORTED= no
-BUILD_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
-BUILD_DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
+TOOL_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
+TOOL_DEPENDS+= pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= src/configure
diff --git a/pike8.0/builtin_module.mk b/pike8.0/builtin_module.mk
index 76d6cf4091..4321589c6f 100644
--- a/pike8.0/builtin_module.mk
+++ b/pike8.0/builtin_module.mk
@@ -41,7 +41,7 @@ MAINTAINER= william%welliver.org@localhost
HOMEPAGE= https://pike.lysator.liu.se/
COMMENT= ${MODULENAME} module for Pike ${PIKEVERSUFFIX}
-BUILD_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
+TOOL_DEPENDS+= pkgconf-[0-9]*:../../devel/pkgconf
MAKE_JOBS_SAFE= no
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff --git a/pim-data-exporter/Makefile b/pim-data-exporter/Makefile
index 1e7ac73fb6..5e74a0b793 100644
--- a/pim-data-exporter/Makefile
+++ b/pim-data-exporter/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/pim-sieve-editor/Makefile b/pim-sieve-editor/Makefile
index 9f60c696e1..a5ff42d0ec 100644
--- a/pim-sieve-editor/Makefile
+++ b/pim-sieve-editor/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v2
.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/pinkpony/Makefile b/pinkpony/Makefile
index 72ecd25612..8ab1c68bf2 100644
--- a/pinkpony/Makefile
+++ b/pinkpony/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= http://code.google.com/p/pink-pony/
COMMENT= Pink Pony is a 3D racing game with ponies!
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
+TOOL_DEPENDS+= scons-[0-9]*:../../devel/scons
WRKSRC= ${WRKDIR}/pink-pony
USE_LANGUAGES= c c++
diff --git a/pkg_summary-utils/Makefile b/pkg_summary-utils/Makefile
index e38bdf1c24..ea1e274ff7 100644
--- a/pkg_summary-utils/Makefile
+++ b/pkg_summary-utils/Makefile
@@ -18,7 +18,7 @@ DEPENDS+= runawk>=1.1.0:../../lang/runawk
DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus
DEPENDS+= digest-[0-9]*:../../pkgtools/digest
-BUILD_DEPENDS+= mk-configure>=0.24.0:../../devel/mk-configure
+TOOL_DEPENDS+= mk-configure>=0.24.0:../../devel/mk-configure
CONFLICTS+= awk-pkgsrc-dewey-[0-9]*
CONFLICTS+= pkg_src_summary-[0-9]*
diff --git a/plasma-desktop/Makefile b/plasma-desktop/Makefile
index 1e694ade6e..d3bb1add89 100644
--- a/plasma-desktop/Makefile
+++ b/plasma-desktop/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
#DEPENDS+= ksysguard>=${PLASMAVER}:../../wip/ksysguard
DEPENDS+= kmenuedit>=${PLASMAVER}:../../wip/kmenuedit
DEPENDS+= polkit-kde-agent>=${PLASMAVER}:../../wip/polkit-kde-agent
diff --git a/plasma-workspace/Makefile b/plasma-workspace/Makefile
index 00f214642b..00c14ae310 100644
--- a/plasma-workspace/Makefile
+++ b/plasma-workspace/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
DEPENDS+= breeze>=${PLASMAVER}:../../wip/breeze
DEPENDS+= kactivitymanagerd>=${PLASMAVER}:../../wip/kactivitymanagerd
#DEPENDS+= kde-cli-tools>=${PLASMAVER}:../../wip/kde-cli-tools
diff --git a/polkit-kde-agent/Makefile b/polkit-kde-agent/Makefile
index 5e8c48e38a..a7d8838a4c 100644
--- a/polkit-kde-agent/Makefile
+++ b/polkit-kde-agent/Makefile
@@ -10,7 +10,7 @@ LICENSE= gnu-gpl-v2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge pkg-config
diff --git a/powerdevil/Makefile b/powerdevil/Makefile
index 2495d123b6..0c8ee4d902 100644
--- a/powerdevil/Makefile
+++ b/powerdevil/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-lgpl-v2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/psybnc/Makefile b/psybnc/Makefile
index 12898473fb..c8cfe429bb 100644
--- a/psybnc/Makefile
+++ b/psybnc/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/psybnc
-BUILD_DEPENDS+= glib-[0-9]*:../../devel/glib
+TOOL_DEPENDS+= glib-[0-9]*:../../devel/glib
USE_TOOLS+= gmake
diff --git a/pwnat/Makefile b/pwnat/Makefile
index acf01461da..18a2c56ff7 100644
--- a/pwnat/Makefile
+++ b/pwnat/Makefile
@@ -8,7 +8,7 @@ HOMEPAGE= https://samy.pl/pwnat/
COMMENT= NAT to NAT client-server communication
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
GIT_REPOSITORIES= samyk
GIT_REPO.samyk= https://github.com/samyk/${PKGBASE}.git
diff --git a/py-HeapDict/Makefile b/py-HeapDict/Makefile
index 13ed3238dd..412a8edc58 100644
--- a/py-HeapDict/Makefile
+++ b/py-HeapDict/Makefile
@@ -13,7 +13,7 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
do-test:
diff --git a/py-altair/Makefile b/py-altair/Makefile
index 941e95ca0d..9c24dc383e 100644
--- a/py-altair/Makefile
+++ b/py-altair/Makefile
@@ -10,14 +10,14 @@ HOMEPAGE= https://altair-viz.github.io/
COMMENT= Altair: A declarative statistical visualization library for Python
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-black>=20.8:../../textproc/py-black
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.16:../../textproc/py-docutils
-BUILD_DEPENDS+= ${PYPKGPREFIX}-ipython>=0:../../devel/py-ipython
-BUILD_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.3.0:../../devel/py-flake8
-BUILD_DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=4.0.1:../../devel/py-typing-extensions
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.4.4:../../textproc/py-sphinx
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-recommonmark>=0.6.0:../../wip/py-recommonmark
+TOOL_DEPENDS+= ${PYPKGPREFIX}-black>=20.8:../../textproc/py-black
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.16:../../textproc/py-docutils
+TOOL_DEPENDS+= ${PYPKGPREFIX}-ipython>=0:../../devel/py-ipython
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.3.0:../../devel/py-flake8
+TOOL_DEPENDS+= ${PYPKGPREFIX}-typing-extensions>=4.0.1:../../devel/py-typing-extensions
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.4.4:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-recommonmark>=0.6.0:../../wip/py-recommonmark
DEPENDS+= ${PYPKGPREFIX}-entrypoints>=0.3:../../devel/py-entrypoints
DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.11.2:../../textproc/py-jinja2
DEPENDS+= ${PYPKGPREFIX}-jsonschema>=3.2.0:../../textproc/py-jsonschema
diff --git a/py-amply/Makefile b/py-amply/Makefile
index f0d0394452..5e901f2608 100644
--- a/py-amply/Makefile
+++ b/py-amply/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://github.com/willu47/amply
COMMENT= Allows you to load and manipulate AMPL/GLPK data as Python
LICENSE= eclipse-license
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-docutils>=0.16:../../textproc/py-docutils
DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
diff --git a/py-apache-arrow/Makefile b/py-apache-arrow/Makefile
index 06643f4e8e..86a533f9ef 100644
--- a/py-apache-arrow/Makefile
+++ b/py-apache-arrow/Makefile
@@ -18,9 +18,9 @@ LICENSE= apache-2.0
PYSETUPSUBDIR= python
USE_LANGUAGES= c c++
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=0:../../devel/py-setuptools_scm
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=0:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
TEST_DEPENDS+= ${PYPKGPREFIX}-test>=3.8:../../devel/py-test
TEST_DEPENDS+= ${PYPKGPREFIX}-test-runner>=6.0.0:../../devel/py-test-runner
TEST_DEPENDS+= ${PYPKGPREFIX}-pytest-lazy-fixture>=0.6.3:../../devel/py-pytest-lazy-fixture
diff --git a/py-apscheduler/Makefile b/py-apscheduler/Makefile
index ba134d80b8..81a96cd321 100644
--- a/py-apscheduler/Makefile
+++ b/py-apscheduler/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/agronholm/apscheduler
COMMENT= In-process task scheduler with Cron-like capabilities
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=0:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=0:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
DEPENDS+= ${PYPKGPREFIX}-tzlocal>=2.1:../../time/py-tzlocal
diff --git a/py-art/Makefile b/py-art/Makefile
index 3fb81bbc9b..c052d85fc2 100644
--- a/py-art/Makefile
+++ b/py-art/Makefile
@@ -10,11 +10,11 @@ HOMEPAGE= https://github.com/sepandhaghighi/art
COMMENT= ASCII Art Library For Python
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.1:../../devel/py-coverage
-BUILD_DEPENDS+= ${PYPKGPREFIX}-codecov>=2.0.15:../../wip/py-codecov
-BUILD_DEPENDS+= ${PYPKGPREFIX}-vulture>=1.0:../../devel/py-vulture
-BUILD_DEPENDS+= ${PYPKGPREFIX}-bandit>=1.5.1:../../security/py-bandit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docstyle>=3.0.0:../../wip/py-docstyle
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.1:../../devel/py-coverage
+TOOL_DEPENDS+= ${PYPKGPREFIX}-codecov>=2.0.15:../../wip/py-codecov
+TOOL_DEPENDS+= ${PYPKGPREFIX}-vulture>=1.0:../../devel/py-vulture
+TOOL_DEPENDS+= ${PYPKGPREFIX}-bandit>=1.5.1:../../security/py-bandit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docstyle>=3.0.0:../../wip/py-docstyle
USE_LANGUAGES= # none
diff --git a/py-badges/Makefile b/py-badges/Makefile
index 4d8b6d07c2..0af47a139b 100644
--- a/py-badges/Makefile
+++ b/py-badges/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE= https://github.com/google/pybadges
COMMENT= Library and command-line tool for generating Github-style badges
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-fonttools>=3.26:../../fonts/py-fonttools
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nox-[0-9]*:../../wip/py-nox
-BUILD_DEPENDS+= ${PYPKGPREFIX}-Pillow>=5:../../graphics/py-Pillow
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=6.1.2:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-fonttools>=3.26:../../fonts/py-fonttools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nox-[0-9]*:../../wip/py-nox
+TOOL_DEPENDS+= ${PYPKGPREFIX}-Pillow>=5:../../graphics/py-Pillow
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=6.1.2:../../devel/py-test
DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.10.3:../../textproc/py-jinja2
DEPENDS+= ${PYPKGPREFIX}-requests>=2.9.0,<3:../../devel/py-requests
diff --git a/py-bidict/Makefile b/py-bidict/Makefile
index 0690b0111f..bec256bde7 100644
--- a/py-bidict/Makefile
+++ b/py-bidict/Makefile
@@ -10,17 +10,17 @@ HOMEPAGE= https://bidict.readthedocs.io
COMMENT= The bidirectional mapping library for Python
LICENSE= mpl-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.5:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-benchmark>=3.2.3:../../devel/py-test-benchmark
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sortedcollections>=1.2.1:../../wip/py-sortedcollections
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.2.2:../../devel/py-sortedcontainers
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-autodoc-typehints>=1.10.3:../../textproc/py-sphinx-autodoc-typehints
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.2.1:../../devel/py-coverage
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.7.1:../../wip/py-pre-commit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-tox>=3.12.1:../../devel/py-tox
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.5:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-benchmark>=3.2.3:../../devel/py-test-benchmark
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sortedcollections>=1.2.1:../../wip/py-sortedcollections
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.2.2:../../devel/py-sortedcontainers
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-autodoc-typehints>=1.10.3:../../textproc/py-sphinx-autodoc-typehints
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.2.1:../../devel/py-coverage
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.7.1:../../wip/py-pre-commit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-tox>=3.12.1:../../devel/py-tox
PYTHON_VERSIONED_DEPENDENCIES= hypothesis:test
diff --git a/py-branca/Makefile b/py-branca/Makefile
index 0b2eeb437d..567d817e37 100644
--- a/py-branca/Makefile
+++ b/py-branca/Makefile
@@ -15,7 +15,7 @@ HOMEPAGE= https://github.com/python-visualization/branca/
COMMENT= Generate complex HTML+JS pages with Python
LICENSE= mit
-BUILD_DEPENDS+= py37-setuptools>=50.0:../../devel/py-setuptools
+TOOL_DEPENDS+= py37-setuptools>=50.0:../../devel/py-setuptools
DEPENDS+= ${PYPKGPREFIX}-python37>=0:../../lang/python37
DEPENDS+= ${PYPKGPREFIX}-jinja2>=0:../../textproc/py-jinja2
diff --git a/py-buildbot-console-view/Makefile b/py-buildbot-console-view/Makefile
index 64c5099ca5..feaad72580 100644
--- a/py-buildbot-console-view/Makefile
+++ b/py-buildbot-console-view/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=b/buildbot-console-view/}
COMMENT= Waterfall Plugin for the buildbot CI system
DEPENDS+= ${PYPKGPREFIX}-buildbot-[0-9]*:../../wip/py-buildbot
-BUILD_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
+TOOL_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
USE_LANGUAGES= # none
diff --git a/py-buildbot-grid-view/Makefile b/py-buildbot-grid-view/Makefile
index 188580d900..5afeead0e9 100644
--- a/py-buildbot-grid-view/Makefile
+++ b/py-buildbot-grid-view/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=b/buildbot-grid-view/}
COMMENT= Grid View Plugin for the buildbot CI system
DEPENDS+= ${PYPKGPREFIX}-buildbot-[0-9]*:../../wip/py-buildbot
-BUILD_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
+TOOL_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
USE_LANGUAGES= # none
diff --git a/py-buildbot-waterfall-view/Makefile b/py-buildbot-waterfall-view/Makefile
index 1119d59fa7..c8a92bf720 100644
--- a/py-buildbot-waterfall-view/Makefile
+++ b/py-buildbot-waterfall-view/Makefile
@@ -8,7 +8,7 @@ COMMENT= Waterfall Plugin for the buildbot CI system
LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-buildbot-[0-9]*:../../wip/py-buildbot
-BUILD_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
+TOOL_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
USE_LANGUAGES= # none
diff --git a/py-buildbot-worker/Makefile b/py-buildbot-worker/Makefile
index f564def2a0..665a532c0f 100644
--- a/py-buildbot-worker/Makefile
+++ b/py-buildbot-worker/Makefile
@@ -9,7 +9,7 @@ COMMENT= Worker for the buildbot CI system
DEPENDS+= ${PYPKGPREFIX}-future-[0-9]*:../../devel/py-future
DEPENDS+= ${PYPKGPREFIX}-twisted>=17.9.0:../../net/py-twisted
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_trial-[0-9]*:../../devel/py-setuptools_trial
TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
USE_LANGUAGES= # none
diff --git a/py-buildbot-www/Makefile b/py-buildbot-www/Makefile
index c662e3c53f..fa2f3d3def 100644
--- a/py-buildbot-www/Makefile
+++ b/py-buildbot-www/Makefile
@@ -7,10 +7,10 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=b/buildbot-www/}
COMMENT= Web frontend for the buildbot CI system
DEPENDS+= ${PYPKGPREFIX}-buildbot-[0-9]*:../../wip/py-buildbot
-BUILD_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+TOOL_DEPENDS+= ${PYPKGPREFIX}-buildbot-pkg-[0-9]*:../../wip/py-buildbot-pkg
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
USE_LANGUAGES= # none
diff --git a/py-ccdproc2/Makefile b/py-ccdproc2/Makefile
index fab2069d2a..d8e5fc6935 100644
--- a/py-ccdproc2/Makefile
+++ b/py-ccdproc2/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/astropy/ccdproc/
COMMENT= Astropy coordinated package for CCD data recution in astronomy
LICENSE= modified-bsd
-BUILD_DEPENDS+= git-base-[0-9]*:../../devel/git-base
+TOOL_DEPENDS+= git-base-[0-9]*:../../devel/git-base
DEPENDS+= ${PYPKGPREFIX}-astropy>=4:../../math/py-astropy
DEPENDS+= ${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
DEPENDS+= ${PYPKGPREFIX}-scipy-[0-9]*:../../math/py-scipy
diff --git a/py-checkov/Makefile b/py-checkov/Makefile
index 1425736079..02b8654a1f 100644
--- a/py-checkov/Makefile
+++ b/py-checkov/Makefile
@@ -11,11 +11,11 @@ HOMEPAGE= https://github.com/bridgecrewio/checkov
COMMENT= Infrastructure as code static analysis
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pip>=0:../../devel/py-pip
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.1:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.3.1:../../devel/py-coverage
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage-badge>=1.0.1:../../wip/py-coverage-badge
-BUILD_DEPENDS+= ${PYPKGPREFIX}-bandit>=1.7.0:../../security/py-bandit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pip>=0:../../devel/py-pip
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.1:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.3.1:../../devel/py-coverage
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage-badge>=1.0.1:../../wip/py-coverage-badge
+TOOL_DEPENDS+= ${PYPKGPREFIX}-bandit>=1.7.0:../../security/py-bandit
DEPENDS+= ${PYPKGPREFIX}-bc-python-hcl2>=0.3.12:../../wip/py-bc-python-hcl2
DEPENDS+= ${PYPKGPREFIX}-deep-merge>=0.0.4:../../wip/py-deep-merge
DEPENDS+= ${PYPKGPREFIX}-tabulate>=0.8.6:../../textproc/py-tabulate
diff --git a/py-chspy/Makefile b/py-chspy/Makefile
index 684246053a..67831a8671 100644
--- a/py-chspy/Makefile
+++ b/py-chspy/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://files.pythonhosted.org/packages/5d/6f/fbeb848039fdcaaad8736f4b
COMMENT= Cubic Hermite splines
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
TEST_DEPENDS+= # TODO: symengine>=0
USE_LANGUAGES= # none
diff --git a/py-cityhash/Makefile b/py-cityhash/Makefile
index eb31b36725..4714a48aa7 100644
--- a/py-cityhash/Makefile
+++ b/py-cityhash/Makefile
@@ -14,7 +14,7 @@ LICENSE= modified-bsd
WRKSRC= ${WRKDIR}/python-${DISTNAME}
DEPENDS+= cityhash-[0-9]*:../../textproc/cityhash
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.36.2:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.36.2:../../devel/py-wheel
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
TEST_ENV+= PYTHONPATH=${WRKSRC}/src
diff --git a/py-coconut/Makefile b/py-coconut/Makefile
index 85e467a0f5..ae771c8a79 100644
--- a/py-coconut/Makefile
+++ b/py-coconut/Makefile
@@ -10,23 +10,23 @@ HOMEPAGE= http://coconut-lang.org
COMMENT= Simple, elegant, Pythonic functional programming
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-ipython>=6.5:../../devel/py-ipython
-BUILD_DEPENDS+= ${PYPKGPREFIX}-jupyter-console>=5.2:../../devel/py-jupyter-console
-BUILD_DEPENDS+= ${PYPKGPREFIX}-psutil>=5.7.2:../../sysutils/py-psutil
-BUILD_DEPENDS+= ${PYPKGPREFIX}-vprof>=0.36:../../wip/py-vprof
-BUILD_DEPENDS+= ${PYPKGPREFIX}-requests>=2.24.0:../../devel/py-requests
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.7.4:../../textproc/py-sphinx
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-bootstrap-theme>=0.4:../../wip/py-sphinx-bootstrap-theme
-BUILD_DEPENDS+= ${PYPKGPREFIX}-jupyter>=1.0:../../devel/py-jupyter
-BUILD_DEPENDS+= ${PYPKGPREFIX}-ipykernel>=5.1:../../devel/py-ipykernel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=6.1.2:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-recommonmark>=0.6:../../wip/py-recommonmark
-BUILD_DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.9:../../sysutils/py-watchdog
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pygments>=2.3.1:../../textproc/py-pygments
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pexpect>=4.8.0:../../devel/py-pexpect
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mypy>=0.761:../../lang/py-mypy
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.8.2:../../wip/py-pre-commit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
+TOOL_DEPENDS+= ${PYPKGPREFIX}-ipython>=6.5:../../devel/py-ipython
+TOOL_DEPENDS+= ${PYPKGPREFIX}-jupyter-console>=5.2:../../devel/py-jupyter-console
+TOOL_DEPENDS+= ${PYPKGPREFIX}-psutil>=5.7.2:../../sysutils/py-psutil
+TOOL_DEPENDS+= ${PYPKGPREFIX}-vprof>=0.36:../../wip/py-vprof
+TOOL_DEPENDS+= ${PYPKGPREFIX}-requests>=2.24.0:../../devel/py-requests
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.7.4:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-bootstrap-theme>=0.4:../../wip/py-sphinx-bootstrap-theme
+TOOL_DEPENDS+= ${PYPKGPREFIX}-jupyter>=1.0:../../devel/py-jupyter
+TOOL_DEPENDS+= ${PYPKGPREFIX}-ipykernel>=5.1:../../devel/py-ipykernel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=6.1.2:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-recommonmark>=0.6:../../wip/py-recommonmark
+TOOL_DEPENDS+= ${PYPKGPREFIX}-watchdog>=0.9:../../sysutils/py-watchdog
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pygments>=2.3.1:../../textproc/py-pygments
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pexpect>=4.8.0:../../devel/py-pexpect
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mypy>=0.761:../../lang/py-mypy
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.8.2:../../wip/py-pre-commit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
DEPENDS+= ${PYPKGPREFIX}-cPyparsing>=2.4.5.0.1.1:../../wip/py-cPyparsing
DEPENDS+= ${PYPKGPREFIX}-pygments>=2.3.1:../../textproc/py-pygments
DEPENDS+= ${PYPKGPREFIX}-prompt_toolkit>=3.0.8:../../devel/py-prompt_toolkit
diff --git a/py-compyle/Makefile b/py-compyle/Makefile
index 4b5244cf70..11a722c9ef 100644
--- a/py-compyle/Makefile
+++ b/py-compyle/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/pypr/compyle
COMMENT= Execute a subset of Python on HPC platforms
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.8.5:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.8.5:../../textproc/py-sphinx
DEPENDS+= ${PYPKGPREFIX}-mako>=1.1.3:../../devel/py-mako
DEPENDS+= ${PYPKGPREFIX}-pytools-[0-9]*:../../wip/py-pytools
TEST_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.5:../../devel/py-test
diff --git a/py-continuum-mechanics/Makefile b/py-continuum-mechanics/Makefile
index ef5ddb8a16..5293edfb1b 100644
--- a/py-continuum-mechanics/Makefile
+++ b/py-continuum-mechanics/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/nicoguaro/continuum_mechanics
COMMENT= Utilities for doing calculations in continuum mechanics
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGRPEFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGRPEFIX}-test-runner>=5.2:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-sympy>=1.3:../../math/py-sympy
DEPENDS+= ${PYPKGPREFIX}-matplotlib>=3:../../graphics/py-matplotlib
DEPENDS+= ${PYPKGPREFIX}-scipy>=1.9.3:../../math/py-scipy
diff --git a/py-dask/Makefile b/py-dask/Makefile
index 26aaf28709..76125bac6e 100644
--- a/py-dask/Makefile
+++ b/py-dask/Makefile
@@ -18,8 +18,8 @@ LICENSE= modified-bsd
PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-versioneer>=0.28:../../devel/py-versioneer
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-versioneer>=0.28:../../devel/py-versioneer
DEPENDS+= ${PYPKGPREFIX}-toolz>=0.8.2:../../devel/py-toolz
DEPENDS+= ${PYPKGPREFIX}-numpy>=1.18:../../math/py-numpy
diff --git a/py-debtcollector/Makefile b/py-debtcollector/Makefile
index 5398919318..6d2dea0557 100644
--- a/py-debtcollector/Makefile
+++ b/py-debtcollector/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pbr>=2.0.0:../../devel/py-pbr
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pbr>=2.0.0:../../devel/py-pbr
USE_LANGUAGES= # none
diff --git a/py-deep-translator/Makefile b/py-deep-translator/Makefile
index c4c4a13307..46fd651fcf 100644
--- a/py-deep-translator/Makefile
+++ b/py-deep-translator/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/nidhaloff/deep_translator
COMMENT= Tool to translate between different languages
LICENSE= mit
-BUILD_DEPENDS+=
+TOOL_DEPENDS+=
${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-requests>=2.25.1:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4>=4.9.3:../../www/py-beautifulsoup4
diff --git a/py-distributed/Makefile b/py-distributed/Makefile
index 8970fa991a..56e92c1d8f 100644
--- a/py-distributed/Makefile
+++ b/py-distributed/Makefile
@@ -14,8 +14,8 @@ LICENSE= modified-bsd
PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-versioneer>=0.28:../../devel/py-versioneer
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-versioneer>=0.28:../../devel/py-versioneer
DEPENDS+= ${PYPKGPREFIX}-click>=8.1.3:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.0.1:../../devel/py-sortedcontainers
diff --git a/py-djvulibre/Makefile b/py-djvulibre/Makefile
index 8576bf2cb7..69e6ef8e93 100644
--- a/py-djvulibre/Makefile
+++ b/py-djvulibre/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE= https://jwilk.net/software/python-djvulibre
COMMENT= Python bindings for the DjVuLibre library
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
USE_TOOLS+= pkg-config
diff --git a/py-eight2/Makefile b/py-eight2/Makefile
index 822a16f944..e7260b7de9 100644
--- a/py-eight2/Makefile
+++ b/py-eight2/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-tzlocal>=2.1:../../time/py-tzlocal
DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.11.3:../../textproc/py-jinja2
DEPENDS+= ${PYPKGPREFIX}-arrow>=0.15.8:../../time/py-arrow
diff --git a/py-einsteinpy-geodesics/Makefile b/py-einsteinpy-geodesics/Makefile
index fd22c2f33e..db0595eef0 100644
--- a/py-einsteinpy-geodesics/Makefile
+++ b/py-einsteinpy-geodesics/Makefile
@@ -12,20 +12,20 @@ LICENSE= mit
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.2.1:../../devel/py-coverage
-BUILD_DEPENDS+= ${PYPKGPREFIX}-isort>=4.3.21:../../devel/py-isort
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mypy>=0.782:../../devel/py-codestyle
-BUILD_DEPENDS+= ${PYPKGPREFIX}-codestyle>=2.6.0:../../lang/py-mypy
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=6.0.2:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-doctestplus>=0.8.0:../../devel/py-test-doctestplus
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-mpl>=0.11:../../devel/py-test-mpl
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-mypy>=0:../../devel/py-test-mypy
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-remotedata>=0:../../devel/py-test-remotedata
-BUILD_DEPENDS+= ${PYPKGPREFIX}-alabaster>=0.7.12:../../textproc/py-alabaster
-BUILD_DEPENDS+= ${PYPKGPREFIX}-tox>=3.12.1:../../devel/py-tox
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.8.5:../../textproc/py-sphinx
-BUILD_DEPENDS+= ${PYPKGPREFIX}-black-[0-9]*:../../wip/py-black
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.2.1:../../devel/py-coverage
+TOOL_DEPENDS+= ${PYPKGPREFIX}-isort>=4.3.21:../../devel/py-isort
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mypy>=0.782:../../devel/py-codestyle
+TOOL_DEPENDS+= ${PYPKGPREFIX}-codestyle>=2.6.0:../../lang/py-mypy
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=6.0.2:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-doctestplus>=0.8.0:../../devel/py-test-doctestplus
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-mpl>=0.11:../../devel/py-test-mpl
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-mypy>=0:../../devel/py-test-mypy
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-remotedata>=0:../../devel/py-test-remotedata
+TOOL_DEPENDS+= ${PYPKGPREFIX}-alabaster>=0.7.12:../../textproc/py-alabaster
+TOOL_DEPENDS+= ${PYPKGPREFIX}-tox>=3.12.1:../../devel/py-tox
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.8.5:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-black-[0-9]*:../../wip/py-black
TEST_DEPENDS+= ${PYPKGPREFIX}-hypothesis-[0-9]*:../../devel/py-hypothesis
USE_LANGUAGES= # none
diff --git a/py-equation/Makefile b/py-equation/Makefile
index bdf69c7a4d..394b635182 100644
--- a/py-equation/Makefile
+++ b/py-equation/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= https://github.com/alphaomega-technology/Equation
COMMENT= General Equation Parser and Evaluator
-BUILD_DEPENDS+= ${PYPKGPREFIX}-numpy>=1.9.2:../../math/py-numpy
+TOOL_DEPENDS+= ${PYPKGPREFIX}-numpy>=1.9.2:../../math/py-numpy
USE_LANGUAGES= # none
diff --git a/py-essm/Makefile b/py-essm/Makefile
index 630c03ec4f..556fed3190 100644
--- a/py-essm/Makefile
+++ b/py-essm/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE= https://essm.readthedocs.io/en/latest/
COMMENT= Environmental Science using Symbolic Math
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= ${PYPKGPREFIX}-jupyter_core>=4.6.3:../../devel/py-jupyter_core
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nbconvert>=5.6.1,:../../www/py-nbconvert
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nbsphinx>=0:../../wip/py-nbsphinx
-BUILD_DEPENDS+= ${PYPKGPREFIX}-ipython>=7.16.1:../../devel/py-ipython
-BUILD_DEPENDS+= ${PYPKGPREFIX}-ipykernel>=5.3.4:../../devel/py-ipykernel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-jupyter_core>=4.6.3:../../devel/py-jupyter_core
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nbconvert>=5.6.1,:../../www/py-nbconvert
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nbsphinx>=0:../../wip/py-nbsphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-ipython>=7.16.1:../../devel/py-ipython
+TOOL_DEPENDS+= ${PYPKGPREFIX}-ipykernel>=5.3.4:../../devel/py-ipykernel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-matplotlib>=3.2.2:../../graphics/py-matplotlib
DEPENDS+= ${PYPKGPREFIX}-sympy>=1.5.1:../../math/py-sympy
DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
diff --git a/py-expression/Makefile b/py-expression/Makefile
index 80501a8b70..677b2a5f8a 100644
--- a/py-expression/Makefile
+++ b/py-expression/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
PYTHON_VERSIONS_INCOMPATIBLE= 27 37
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-fastaudio/Makefile b/py-fastaudio/Makefile
index 2f8e892fbc..dd85d3c665 100644
--- a/py-fastaudio/Makefile
+++ b/py-fastaudio/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.freenet.org.nz/python/pyPortAudio/
COMMENT= Python bindings for portaudio library
-BUILD_DEPENDS= ${PYPKGPREFIX}-pyrex>=0.8.1:../../lang/py-pyrex
+TOOL_DEPENDS= ${PYPKGPREFIX}-pyrex>=0.8.1:../../lang/py-pyrex
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/py-fastcluster/Makefile b/py-fastcluster/Makefile
index 9585071604..587868bd42 100644
--- a/py-fastcluster/Makefile
+++ b/py-fastcluster/Makefile
@@ -12,7 +12,7 @@ LICENSE= 2-clause-bsd
USE_LANGUAGES= c c++
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
TEST_DEPENDS+= ${PYPKGPREFIX}-scipy>=1.6:../../math/py-scipy
# Tests Requires installing the package
do-test:
diff --git a/py-fastparquet/Makefile b/py-fastparquet/Makefile
index 9a71cab8f7..18fa771308 100644
--- a/py-fastparquet/Makefile
+++ b/py-fastparquet/Makefile
@@ -17,9 +17,9 @@ COMMENT= Python implementation of the parquet format,
LICENSE= apache-2.0
USE_LANGUAGES= c c++
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-packaging>=0:../../devel/py-packaging
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-packaging>=0:../../devel/py-packaging
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-numpy>=1.18:../../math/py-numpy
DEPENDS+= ${PYPKGPREFIX}-pandas>=1.1.0:../../math/py-pandas
diff --git a/py-goulib/Makefile b/py-goulib/Makefile
index eb7fec0bd3..8a4f6006af 100644
--- a/py-goulib/Makefile
+++ b/py-goulib/Makefile
@@ -18,7 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
DEPENDS+= ${PYPKGPREFIX}-scipy>=0.15.0:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-xlrd>=0.9.3:../../textproc/py-xlrd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
USE_LANGUAGES= # none
diff --git a/py-graphene-sqlalchemy/Makefile b/py-graphene-sqlalchemy/Makefile
index 5d92719dad..eba0528136 100644
--- a/py-graphene-sqlalchemy/Makefile
+++ b/py-graphene-sqlalchemy/Makefile
@@ -11,9 +11,9 @@ COMMENT= Graphene SQLAlchemy integration
LICENSE= mit
#Force dependency for >= Py3.6
-BUILD_DEPENDS+= ${PYPKGPREFIX}-tox>=3.7.0:../../devel/py-tox
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coveralls>=2.4.2:../../wip/py-coveralls
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.7.1:../../wip/py-pre-commit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-tox>=3.7.0:../../devel/py-tox
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coveralls>=2.4.2:../../wip/py-coveralls
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.7.1:../../wip/py-pre-commit
DEPENDS+= ${PYPKGPREFIX}-graphene>=2.1.3:../../wip/py-graphene
DEPENDS+= ${PYPKGPREFIX}-promise>=2.3:../../wip/py-promise
DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=1.2:../../databases/py-sqlalchemy
diff --git a/py-hmmlearn/Makefile b/py-hmmlearn/Makefile
index 5f8d6ca608..e5bdc0b3a8 100644
--- a/py-hmmlearn/Makefile
+++ b/py-hmmlearn/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= https://github.com/hmmlearn/hmmlearn
COMMENT= Algorithms for inference of Hidden Markov Models
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-numpy>=1.21.5:../../math/py-numpy
USE_LANGUAGES= c c++ # none
diff --git a/py-hopic/Makefile b/py-hopic/Makefile
index 7bfe54dc24..f46cd99543 100644
--- a/py-hopic/Makefile
+++ b/py-hopic/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/tomtom-international/hopic
COMMENT= Generic jenkins shared pipeline alternative
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=7.0.0:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=7.0.0:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.0<8.0:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-click-log:../../devel/py-click-log
DEPENDS+= ${PYPKGPREFIX}-commisery>=0.5<1:../../wip/py-commisery
diff --git a/py-hotdoc/Makefile b/py-hotdoc/Makefile
index 2243447673..36c3aa51d0 100644
--- a/py-hotdoc/Makefile
+++ b/py-hotdoc/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://hotdoc.github.io/
COMMENT= API documentation system
LICENSE= gnu-lgpl-v2.1
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
DEPENDS+= ${PYPKGPREFIX}-appdirs-[0-9]*:../../devel/py-appdirs
#DEPENDS+= ${PYPKGPREFIX}-cchardet-[0-9]*:../../devel/py-cchardet
DEPENDS+= ${PYPKGPREFIX}-contextlib2-[0-9]*:../../devel/py-contextlib2
diff --git a/py-hug/Makefile b/py-hug/Makefile
index b9f77730bd..8c3226697a 100644
--- a/py-hug/Makefile
+++ b/py-hug/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-falcon>=2.0.0:../../devel/py-falcon
DEPENDS+= ${PYPKGPREFIX}-requests>=2.24.0:../../devel/py-requests
TEST_DEPENDS+= ${PYPKGPREFIX}-mock>=3.0.5:../../devel/py-mock
diff --git a/py-jitcdde/Makefile b/py-jitcdde/Makefile
index 3346abca40..2751e22271 100644
--- a/py-jitcdde/Makefile
+++ b/py-jitcdde/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://github.com/neurophysik/jitcdde
COMMENT= Just-in-Time Compilation for Delay Differential Equations
#LICENSE= # TODO: (see mk/license.mk)
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-jitcxde-common-1.5.2:../../wip/py-jitcxde-common
diff --git a/py-jitcxde-common/Makefile b/py-jitcxde-common/Makefile
index 603b8d1f05..fe4f289b11 100644
--- a/py-jitcxde-common/Makefile
+++ b/py-jitcxde-common/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://github.com/neurophysik/jitcxde_common
COMMENT= Common code for JiTC*DE
#LICENSE= # TODO: (see mk/license.mk)
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
#DEPENDS+= ${PYPKGPREFIX}-symengine>=0.3.1.dev0:../../category/py-symengine
DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.11.2:../../textproc/py-jinja2
diff --git a/py-jose/Makefile b/py-jose/Makefile
index fc51dcd4c8..e6600d1305 100644
--- a/py-jose/Makefile
+++ b/py-jose/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://github.com/mpdavis/python-jose/
COMMENT= JOSE implementation in Python
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=0:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=0:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-ecdsa>=0.16.0:../../security/py-ecdsa
DEPENDS+= ${PYPKGPREFIX}-rsa>=4.6:../../security/py-rsa
DEPENDS+= ${PYPKGPREFIX}-asn1>=0.4.8:../../security/py-asn1
diff --git a/py-librabbitmq/options.mk b/py-librabbitmq/options.mk
index 630cb7ebf3..c145c75045 100644
--- a/py-librabbitmq/options.mk
+++ b/py-librabbitmq/options.mk
@@ -10,8 +10,8 @@ PKG_OPTIONS_GROUP.ssl= gnutls openssl polarssl
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
CONFIGURE_ARGS+= --enable-docs=yes
.else
CONFIGURE_ARGS+= --enable-docs=no
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --with-ssl=no
.if !empty(PKG_OPTIONS:Mpopt)
.include "../../devel/popt/buildlink3.mk"
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
CONFIGURE_ARGS+= --enable-tools=yes
.else
CONFIGURE_ARGS+= --enable-tools=no
diff --git a/py-libvirt/Makefile b/py-libvirt/Makefile
index c2dbc310df..768e240a9e 100644
--- a/py-libvirt/Makefile
+++ b/py-libvirt/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://libvirt.org/sources/python/
COMMENT= libvirt python library
LICENSE= gnu-lgpl-v2
-BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+TOOL_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
USE_TOOLS+= pkg-config
diff --git a/py-mathics-scanner/Makefile b/py-mathics-scanner/Makefile
index e8b9d8c4ad..11fe395061 100644
--- a/py-mathics-scanner/Makefile
+++ b/py-mathics-scanner/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://mathics.org/
COMMENT= Character Tables and Tokenizer for Mathics and the Wolfram Language
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=7.2.0:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=7.2.0:../../devel/py-test
DEPENDS+= ${PYPKGPREFIX}-chardet>=5.0.0:../../converters/py-chardet
DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
DEPENDS+= ${PYPKGPREFIX}-click>=1.3.8:../../devel/py-click
diff --git a/py-mdanalysis/Makefile b/py-mdanalysis/Makefile
index 9bcdae8b92..6c5ae10975 100644
--- a/py-mdanalysis/Makefile
+++ b/py-mdanalysis/Makefile
@@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-networkx-[0-9]*:../../math/py-networkx
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
# also needs unpackaged GridDataFormats
# TEST_DEPENDS
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
# also needs unpackaged MDAnalysisTests for tests
USE_LANGUAGES= c c++
diff --git a/py-mesa/Makefile b/py-mesa/Makefile
index be35c74bd8..3f3eec5a67 100644
--- a/py-mesa/Makefile
+++ b/py-mesa/Makefile
@@ -10,11 +10,11 @@ HOMEPAGE= https://github.com/projectmesa/mesa
COMMENT= Agent-based modeling (ABM) in Python 3+
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.3:../../devel/py-coverage
-BUILD_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.8.4:../../devel/py-flake8
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=6.2.1:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.4.4:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.3:../../devel/py-coverage
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.8.4:../../devel/py-flake8
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=6.2.1:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.4.4:../../textproc/py-sphinx
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-cookiecutter>=1.7.2:../../devel/py-cookiecutter
DEPENDS+= ${PYPKGPREFIX}-networkx>=2.4:../../math/py-networkx
diff --git a/py-minidb/Makefile b/py-minidb/Makefile
index 9c7d7c151f..daed228d54 100644
--- a/py-minidb/Makefile
+++ b/py-minidb/Makefile
@@ -13,7 +13,7 @@ LICENSE= isc
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
# TEST_DEPENDS
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.32:../../devel/py-wheel
USE_LANGUAGES= # none
diff --git a/py-mongomock/Makefile b/py-mongomock/Makefile
index 7b5a1329cf..eb27ad8859 100644
--- a/py-mongomock/Makefile
+++ b/py-mongomock/Makefile
@@ -12,7 +12,7 @@ COMMENT= Fake pymongo stub for testing simple MongoDB-dependent code
DEPENDS+= ${PYPKGPREFIX}-bson>=0.5.10:../../devel/py-bson
DEPENDS+= ${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pbr>=5.4.5:../../devel/py-pbr
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pbr>=5.4.5:../../devel/py-pbr
USE_LANGUAGES= # none
diff --git a/py-munch/Makefile b/py-munch/Makefile
index ccbaafc280..c60faf91c8 100644
--- a/py-munch/Makefile
+++ b/py-munch/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/Infinidat/munch
COMMENT= Dot-accessible dictionary (a la JavaScript objects)
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pbr>=3.0:../../devel/py-pbr
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pbr>=3.0:../../devel/py-pbr
DEPENDS+= ${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
USE_LANGUAGES= # none
diff --git a/py-nameko/Makefile b/py-nameko/Makefile
index 4d4b4e3067..983f22ec74 100644
--- a/py-nameko/Makefile
+++ b/py-nameko/Makefile
@@ -10,18 +10,18 @@ HOMEPAGE= https://www.nameko.io/
COMMENT= Microservices framework for Python
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-astroid>=2.4.2:../../devel/py-astroid
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.5.1:../../devel/py-coverage
-BUILD_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.3.0:../../devel/py-flake8
-BUILD_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.15:../../devel/py-isort
-BUILD_DEPENDS+= ${PYPKGPREFIX}-mccabe>=0.6.1:../../devel/py-mccabe
-BUILD_DEPENDS+= ${PYPKGPREFIX}-codestyle>=2.3.1:../../devel/py-codestyle
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pylint>=1.7.1:../../devel/py-pylint
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=4.3.1:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=1.3.3:../../devel/py-test-timeout
-BUILD_DEPENDS+= ${PYPKGPREFIX}-urllib3>=1.23:../../www/py-urllib3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-websocket-client>=0.48.0:../../www/py-websocket-client
+TOOL_DEPENDS+= ${PYPKGPREFIX}-astroid>=2.4.2:../../devel/py-astroid
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage>=4.5.1:../../devel/py-coverage
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.3.0:../../devel/py-flake8
+TOOL_DEPENDS+= ${PYPKGPREFIX}-isort>=4.2.15:../../devel/py-isort
+TOOL_DEPENDS+= ${PYPKGPREFIX}-mccabe>=0.6.1:../../devel/py-mccabe
+TOOL_DEPENDS+= ${PYPKGPREFIX}-codestyle>=2.3.1:../../devel/py-codestyle
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pylint>=1.7.1:../../devel/py-pylint
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=4.3.1:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.5.1:../../devel/py-test-cov
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=1.3.3:../../devel/py-test-timeout
+TOOL_DEPENDS+= ${PYPKGPREFIX}-urllib3>=1.23:../../www/py-urllib3
+TOOL_DEPENDS+= ${PYPKGPREFIX}-websocket-client>=0.48.0:../../www/py-websocket-client
DEPENDS+= ${PYPKGPREFIX}-dns>=1.16.0:../../net/py-dns
DEPENDS+= ${PYPKGPREFIX}-amqp>=2.5.2:../../net/py-amqp
DEPENDS+= ${PYPKGPREFIX}-eventlet>=0.29.1:../../wip/py-eventlet
diff --git a/py-nbimporter/Makefile b/py-nbimporter/Makefile
index 012f707c7d..c41872d21b 100644
--- a/py-nbimporter/Makefile
+++ b/py-nbimporter/Makefile
@@ -10,7 +10,7 @@ Homepage= https://github.com/grst/nbimporter/
COMMENT= Import IPython notebooks as modules
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
USE_LANGUAGES= # none
diff --git a/py-ndjson/Makefile b/py-ndjson/Makefile
index 230097cfa6..a0ee90d6ae 100644
--- a/py-ndjson/Makefile
+++ b/py-ndjson/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/rhgrant10/ndjson
COMMENT= JsonDecoder for ndjson
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
TEST_DEPENDS+= ${PYPKGPREFIX}-test>=6.1.2:../../devel/py-test
TEST_DEPENDS+= ${PYPKGPREFIX}-six>=1.15.0:../../lang/py-six
diff --git a/py-numdifftools/Makefile b/py-numdifftools/Makefile
index a4ecdfe84e..3b69bc5cb9 100644
--- a/py-numdifftools/Makefile
+++ b/py-numdifftools/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/pbrod/numdifftools
COMMENT= Solves automatic numerical differentiation problems
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-scipy>=0.8:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-statsmodels>=0.11.1:../../math/py-statsmodels
DEPENDS+= ${PYPKGPREFIX}-algopy>=0.5.7:../../wip/py-algopy
diff --git a/py-orjson/Makefile b/py-orjson/Makefile
index 652c294cd9..a33a2982f6 100644
--- a/py-orjson/Makefile
+++ b/py-orjson/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/ijl/orjson
COMMENT= Fast, correct Python JSON library
LICENSE= apache-2.0 OR mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
+TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
PYTHON_VERSIONS_INCOMPATIBLE= 27
diff --git a/py-ortho/Makefile b/py-ortho/Makefile
index 8c2a253e58..dfb6211f43 100644
--- a/py-ortho/Makefile
+++ b/py-ortho/Makefile
@@ -12,7 +12,7 @@ LICENSE= modified-bsd
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-sympy>=1.9:../../math/py-sympy
DEPENDS+= ${PYPKGPREFIX}-matplotlib>=3.6.2:../../graphics/py-matplotlib
DEPENDS+= ${PYPKGPREFIX}-seaborn>=0.9.0:../../graphics/py-seaborn
diff --git a/py-pdfminer-six/Makefile b/py-pdfminer-six/Makefile
index ce1d44678a..0f3779c0b9 100644
--- a/py-pdfminer-six/Makefile
+++ b/py-pdfminer-six/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE= https://github.com/pdfminer/pdfminer.six
COMMENT= PDF parser and analyzer
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
-BUILD_DEPENDS+= ${PYPKGPREFIX}-tox>=3.12.1:../../devel/py-tox
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.7:../../devel/py-nose
+TOOL_DEPENDS+= ${PYPKGPREFIX}-tox>=3.12.1:../../devel/py-tox
DEPENDS+= ${PYPKGPREFIX}-chardet>=3.0.4:../../converters/py-chardet
DEPENDS+= ${PYPKGPREFIX}-cryptography>=2.9.2:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-sortedcontainers>=2.2.2:../../devel/py-sortedcontainers
diff --git a/py-pdoc3/Makefile b/py-pdoc3/Makefile
index 188afdc66b..0b69e61d17 100644
--- a/py-pdoc3/Makefile
+++ b/py-pdoc3/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pdoc3.github.io/pdoc/
COMMENT= Auto-generate API documentation for Python projects
LICENSE= gnu-agpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=3.5.0:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-mako>=1.1.3:../../devel/py-mako
diff --git a/py-pipenv-setup/Makefile b/py-pipenv-setup/Makefile
index 96ee2f3cdf..6cecce40df 100644
--- a/py-pipenv-setup/Makefile
+++ b/py-pipenv-setup/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE= https://github.com/Madoshakalaka/pipenv-setup
COMMENT= Sync Pipfile/Pipfile.lock to setup.py
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.10:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-mypy>=0.7.0:../../devel/py-test-mypy
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-datadir>=1.3.1:../../devel/py-test-datadir
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.34.0:../../devel/py-test-xdist
-BUILD_DEPENDS+= ${PYPKGPREFIX}-tox>=3.20.1:../../devel/py-tox
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.10:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-mypy>=0.7.0:../../devel/py-test-mypy
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-datadir>=1.3.1:../../devel/py-test-datadir
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.34.0:../../devel/py-test-xdist
+TOOL_DEPENDS+= ${PYPKGPREFIX}-tox>=3.20.1:../../devel/py-tox
DEPENDS+= ${PYPKGPREFIX}-pipfile>=0.0.2:../../wip/py-pipfile
DEPENDS+= ${PYPKGPREFIX}-black-[0-9]*:../../textproc/py-black
DEPENDS+= ${PYPKGPREFIX}-colorama>=0.4.3:../../comms/py-colorama
diff --git a/py-pipenv/Makefile b/py-pipenv/Makefile
index e47ddb8baa..3f51e893ba 100644
--- a/py-pipenv/Makefile
+++ b/py-pipenv/Makefile
@@ -10,14 +10,14 @@ HOMEPAGE= https://github.com/pypa/pipenv
COMMENT= Python Development Workflow for Humans
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-towncrier>=19.2.0:../../wip/py-towncrier
-BUILD_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4>=4.3.2:../../www/py-beautifulsoup4
-BUILD_DEPENDS+= ${PYPKGPREFIX}-twine>=1.13.0:../../net/py-twine
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.4.4:../../textproc/py-sphinx
-BUILD_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.3.0:../../devel/py-flake8
-BUILD_DEPENDS+= ${PYPKGPREFIX}-black>=20.8:../../textproc/py-black
-BUILD_DEPENDS+= ${PYPKGPREFIX}-parver>=0.3.1:../../wip/py-parver
-BUILD_DEPENDS+= ${PYPKGPREFIX}-invoke>=1.4.1:../../sysutils/py-invoke
+TOOL_DEPENDS+= ${PYPKGPREFIX}-towncrier>=19.2.0:../../wip/py-towncrier
+TOOL_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4>=4.3.2:../../www/py-beautifulsoup4
+TOOL_DEPENDS+= ${PYPKGPREFIX}-twine>=1.13.0:../../net/py-twine
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.4.4:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.3.0:../../devel/py-flake8
+TOOL_DEPENDS+= ${PYPKGPREFIX}-black>=20.8:../../textproc/py-black
+TOOL_DEPENDS+= ${PYPKGPREFIX}-parver>=0.3.1:../../wip/py-parver
+TOOL_DEPENDS+= ${PYPKGPREFIX}-invoke>=1.4.1:../../sysutils/py-invoke
DEPENDS+= ${PYPKGPREFIX}-certifi-[0-9]*:../../security/py-certifi
DEPENDS+= ${PYPKGPREFIX}-virtualenv-clone>=0.2.5:../../wip/py-virtualenv-clone
DEPENDS+= ${PYPKGPREFIX}-virtualenv>=0:../../devel/py-virtualenv
diff --git a/py-poisson-approval/Makefile b/py-poisson-approval/Makefile
index 6a9e07ed9d..8981eca5db 100644
--- a/py-poisson-approval/Makefile
+++ b/py-poisson-approval/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/francois-durand/poisson_approval
COMMENT= Poisson Approval studies the Poisson Game of Approval Voting
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= # TODO: pytest-runner>=0
+TOOL_DEPENDS+= # TODO: pytest-runner>=0
DEPENDS+= ${PYPKGPREFIX}-scipy>=1.4.1:../../math/py-scipy
DEPENDS+= ${PYPKGPREFIX}-matplotlib>=3.2.2:../../graphics/py-matplotlib
DEPENDS+= # TODO: python-ternary>=0
diff --git a/py-polars/Makefile b/py-polars/Makefile
index 66a3ba301c..62fe58a2b5 100644
--- a/py-polars/Makefile
+++ b/py-polars/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= https://www.pola.rs/
COMMENT= Lightning-fast DataFrame library
LICENSE= mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
+TOOL_DEPENDS+= ${PYPKGPREFIX}-maturin-[0-9]*:../../devel/py-maturin
USE_LANGUAGES= # none
PYTHON_VERSIONS_INCOMPATIBLE= 27
diff --git a/py-pynitrokey/Makefile b/py-pynitrokey/Makefile
index 0c4bc76a2e..b4320ec07e 100644
--- a/py-pynitrokey/Makefile
+++ b/py-pynitrokey/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://pypi.org/project/pynitrokey/
COMMENT= Python library for Nitrokey devices
LICENSE= apache-2.0 AND mit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-flit>=3.8.0:../../devel/py-flit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flit>=3.8.0:../../devel/py-flit
DEPENDS+= ${PYPKGPREFIX}-serial-[0-9]*:../../comms/py-serial
DEPENDS+= ${PYPKGPREFIX}-click-[0-9]*:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-frozendict-[0-9]*:../../devel/py-frozendict
diff --git a/py-qstylizer/Makefile b/py-qstylizer/Makefile
index 770119e465..7db687bc0e 100644
--- a/py-qstylizer/Makefile
+++ b/py-qstylizer/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE= https://github.com/blambright/qstylizer/
COMMENT= Qt Stylesheet Generator for PyQt/PySide
LICENSE= mit
-#BUILD_DEPENDS+= ${PYPKGPREFIX}-pbr>=0:../../devel/py-pbr
+#TOOL_DEPENDS+= ${PYPKGPREFIX}-pbr>=0:../../devel/py-pbr
DEPENDS+= ${PYPKGPREFIX}-inflection-[0-9]*:../../textproc/py-inflection
DEPENDS+= ${PYPKGPREFIX}-tinycss2-[0-9]*:../../textproc/py-tinycss2
diff --git a/py-reactive-papi/Makefile b/py-reactive-papi/Makefile
index 85fb6e14d8..4137824467 100644
--- a/py-reactive-papi/Makefile
+++ b/py-reactive-papi/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://www.reactivemarkets.com/
COMMENT= Reactive Platform flatbuffer api
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
USE_LANGUAGES= # none
diff --git a/py-scikits_ann/Makefile b/py-scikits_ann/Makefile
index c5250aeb1d..d6f63cd32b 100644
--- a/py-scikits_ann/Makefile
+++ b/py-scikits_ann/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= http://scipy.org/scipy/scikits/wiki/AnnWrapper
COMMENT= Approximate Nearest Neighbor library wrapper for Numpy
LICENSE= gnu-lgpl-v3
-BUILD_DEPENDS+= swig-[0-9]*:../../devel/swig
+TOOL_DEPENDS+= swig-[0-9]*:../../devel/swig
PYTHON_VERSIONS_ACCEPTED= 27 # as of 0.2.dev-r803, uses ConfigParser
diff --git a/py-screenkey/Makefile b/py-screenkey/Makefile
index 7d39b10a15..40d7932565 100644
--- a/py-screenkey/Makefile
+++ b/py-screenkey/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://www.thregr.org/~wavexx/software/screenkey/
COMMENT= Screencast tool to display your keys
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-babel-[0-9]*:../../devel/py-babel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-babel-[0-9]*:../../devel/py-babel
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
DEPENDS+= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
diff --git a/py-spacy/Makefile b/py-spacy/Makefile
index 2c775bff33..009bc0f4d1 100644
--- a/py-spacy/Makefile
+++ b/py-spacy/Makefile
@@ -15,7 +15,7 @@ LICENSE= mit
USE_TOOLS+= gmake
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
#.include "../../devel/py-setuptools/buildlink3.mk"
.include "../../wip/py-cymem/buildlink3.mk"
diff --git a/py-speex/Makefile b/py-speex/Makefile
index 1c1d647710..a8dc9ebf0c 100644
--- a/py-speex/Makefile
+++ b/py-speex/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.freenet.org.nz/python/pySpeex/
COMMENT= Speex bindings for Python; see speex package for details
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pyrex>=0:../../lang/py-pyrex
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pyrex>=0:../../lang/py-pyrex
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/py-stravalib/Makefile b/py-stravalib/Makefile
index 2ff969126f..5f0c1b7dfd 100644
--- a/py-stravalib/Makefile
+++ b/py-stravalib/Makefile
@@ -12,7 +12,7 @@ LICENSE= apache-2.0
USE_LANGUAGES= # none
-BUILD_DEPENDS+= ${PYPKGPREFIX}-distlib:../../devel/py-distlib
+TOOL_DEPENDS+= ${PYPKGPREFIX}-distlib:../../devel/py-distlib
DEPENDS+= ${PYPKGPREFIX}-pint:../../wip/py-pint
DEPENDS+= ${PYPKGPREFIX}-pytz:../../time/py-pytz
diff --git a/py-swh-core/Makefile b/py-swh-core/Makefile
index b93dd88006..1940a85469 100644
--- a/py-swh-core/Makefile
+++ b/py-swh-core/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://forge.softwareheritage.org/diffusion/DCORE/
COMMENT= Software Heritage core utilities
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-deprecated>=1.2.7:../../devel/py-deprecated
DEPENDS+= ${PYPKGPREFIX}-yaml>=5.3.1:../../textproc/py-yaml
diff --git a/py-swh-deposit/Makefile b/py-swh-deposit/Makefile
index 43e1d75809..ca86291317 100644
--- a/py-swh-deposit/Makefile
+++ b/py-swh-deposit/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-xmltodict>=0:../../textproc/py-xmltodict
DEPENDS+= ${PYPKGPREFIX}-iso8601>=0.1.13:../../time/py-iso8601
diff --git a/py-swh-graph/Makefile b/py-swh-graph/Makefile
index c4af60c9ee..59ecde7a14 100644
--- a/py-swh-graph/Makefile
+++ b/py-swh-graph/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-aiohttp>=3.7.3:../../www/py-aiohttp
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-py4j>=0.10.9.1:../../wip/py-py4j
diff --git a/py-swh-icinga-plugins/Makefile b/py-swh-icinga-plugins/Makefile
index 6ebeb603c7..879ca54c78 100644
--- a/py-swh-icinga-plugins/Makefile
+++ b/py-swh-icinga-plugins/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
DEPENDS+= ${PYPKGPREFIX}-requests>=2.25.0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-swh-core>=0.10.0:../../wip/py-swh-core
diff --git a/py-swh-indexer/Makefile b/py-swh-indexer/Makefile
index 8198ada7ff..209f253ab7 100644
--- a/py-swh-indexer/Makefile
+++ b/py-swh-indexer/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-magic>=0.4.13:../../sysutils/py-magic
DEPENDS+= ${PYPKGPREFIX}-ld>=2.0.3:../../wip/py-ld
diff --git a/py-swh-journal/Makefile b/py-swh-journal/Makefile
index f1d8e33e66..2daf924efe 100644
--- a/py-swh-journal/Makefile
+++ b/py-swh-journal/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://forge.softwareheritage.org/diffusion/DJNL/
COMMENT= Software Heritage Journal utilities
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-msgpack>=1.0.0:../../devel/py-msgpack
DEPENDS+= ${PYPKGPREFIX}-tenacity>=6.2.0:../../devel/py-tenacity
DEPENDS+= ${PYPKGPREFIX}-swh-core>=0.10.0:../../wip/py-swh-core
diff --git a/py-swh-lister/Makefile b/py-swh-lister/Makefile
index 47302f62ae..97b4ff5bf1 100644
--- a/py-swh-lister/Makefile
+++ b/py-swh-lister/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-sqlalchemy>=1.3.20:../../databases/py-sqlalchemy
DEPENDS+= ${PYPKGPREFIX}-arrow>=0.15.8:../../time/py-arrow
DEPENDS+= ${PYPKGPREFIX}-debian>=0.1.38:../../wip/py-debian
diff --git a/py-swh-loader-core/Makefile b/py-swh-loader-core/Makefile
index b4851ab40b..ddd3e1de5a 100644
--- a/py-swh-loader-core/Makefile
+++ b/py-swh-loader-core/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-psutil>=5.7.3:../../sysutils/py-psutil
DEPENDS+= ${PYPKGPREFIX}-requests>=2.25.0:../../devel/py-requests
DEPENDS+= ${PYPKGPREFIX}-iso8601>=0.1.13:../../time/py-iso8601
diff --git a/py-swh-loader-git/Makefile b/py-swh-loader-git/Makefile
index 18b37d2441..d0d794faf1 100644
--- a/py-swh-loader-git/Makefile
+++ b/py-swh-loader-git/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-dulwich>=0.18.7:../../devel/py-dulwich
DEPENDS+= ${PYPKGPREFIX}-retrying>=0:../../wip/py-retrying
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
diff --git a/py-swh-loader-mercurial/Makefile b/py-swh-loader-mercurial/Makefile
index 30cf9067d3..af038c0d84 100644
--- a/py-swh-loader-mercurial/Makefile
+++ b/py-swh-loader-mercurial/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-billiard>=3.6.3.0:../../parallel/py-billiard
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-patool>=1.12:../../wip/py-patool
diff --git a/py-swh-loader-svn/Makefile b/py-swh-loader-svn/Makefile
index 89cbce859a..30319183ac 100644
--- a/py-swh-loader-svn/Makefile
+++ b/py-swh-loader-svn/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-retrying>=1.3.3:../../wip/py-retrying
DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.8.1:../../time/py-dateutil
diff --git a/py-swh-model/Makefile b/py-swh-model/Makefile
index fd299c8a83..6920311f12 100644
--- a/py-swh-model/Makefile
+++ b/py-swh-model/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://forge.softwareheritage.org/diffusion/DMOD/
COMMENT= Software Heritage data model
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-attrs>=19.3.0:../../devel/py-attrs
DEPENDS+= ${PYPKGPREFIX}-deprecated>=1.2.7:../../devel/py-deprecated
DEPENDS+= ${PYPKGPREFIX}-hypothesis>=5.41.5:../../devel/py-hypothesis
diff --git a/py-swh-objstorage-replayer/Makefile b/py-swh-objstorage-replayer/Makefile
index 17c9756e43..919b7514d4 100644
--- a/py-swh-objstorage-replayer/Makefile
+++ b/py-swh-objstorage-replayer/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-swh-core>=0.10.0:../../wip/py-swh-core
DEPENDS+= ${PYPKGPREFIX}-swh-storage>=0.13.1:../../wip/py-swh-storage
DEPENDS+= ${PYPKGPREFIX}-swh-journal>=0.4.2:../../wip/py-swh.journal
diff --git a/py-swh-objstorage/Makefile b/py-swh-objstorage/Makefile
index e40ad8af9d..3afc42a917 100644
--- a/py-swh-objstorage/Makefile
+++ b/py-swh-objstorage/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://forge.softwareheritage.org/diffusion/DOBJS
COMMENT= Software Heritage Object Storage
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-aiohttp>=3.7.3:../../www/py-aiohttp
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-swh-core>=0.10.0:../../wip/py-swh-core
diff --git a/py-swh-scheduler/Makefile b/py-swh-scheduler/Makefile
index f333b5f191..2e3e146439 100644
--- a/py-swh-scheduler/Makefile
+++ b/py-swh-scheduler/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://forge.softwareheritage.org/diffusion/DSCH/
COMMENT= Software Heritage Scheduler
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-attrs>=19.3.0:../../devel/py-attrs
DEPENDS+= ${PYPKGPREFIX}-celery>=4.3:../../net/py-celery
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
diff --git a/py-swh-storage/Makefile b/py-swh-storage/Makefile
index d48d380175..4a59f35d87 100644
--- a/py-swh-storage/Makefile
+++ b/py-swh-storage/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://forge.softwareheritage.org/diffusion/DSTO/
COMMENT= Software Heritage storage manager
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-flask>=1.1.2:../../www/py-flask
#DEPENDS+= ${PYPKGPREFIX}-psycopg2>=0:../../databases/py-psycopg2
diff --git a/py-swh-vault/Makefile b/py-swh-vault/Makefile
index 716a26d80d..23ce66c9c8 100644
--- a/py-swh-vault/Makefile
+++ b/py-swh-vault/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-flask>=1.1.2:../../www/py-flask
DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2.8.6:../../databases/py-psycopg2
diff --git a/py-swh-web-client/Makefile b/py-swh-web-client/Makefile
index 79f7ad85c4..ad52a1cd5a 100644
--- a/py-swh-web-client/Makefile
+++ b/py-swh-web-client/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE+= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-click>=7.1.2:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.8.1:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-requests>=2.25.0:../../devel/py-requests
diff --git a/py-swh-web/Makefile b/py-swh-web/Makefile
index 64e530c3fe..772df47f1f 100644
--- a/py-swh-web/Makefile
+++ b/py-swh-web/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=4.1.2:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4>=0:../../www/py-beautifulsoup4
DEPENDS+= ${PYPKGPREFIX}-cryptography>=3.2.1:../../security/py-cryptography
DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
diff --git a/py-symbolic-equation/Makefile b/py-symbolic-equation/Makefile
index bd71b7fa4e..5ea0644998 100644
--- a/py-symbolic-equation/Makefile
+++ b/py-symbolic-equation/Makefile
@@ -10,25 +10,25 @@ HOMEPAGE= https://github.com/goerz/symbolic_equation
COMMENT= Class for multiline symbolic equations in the Jupyter Notebook
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-black-[0-9]*:../../wip/py-black
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.2.1:../../devel/py-coverage
-BUILD_DEPENDS+= ${PYPKGPREFIX}-coveralls>=2.4.2:../../wip/py-coveralls
-BUILD_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.8.3:../../devel/py-flake8
-BUILD_DEPENDS+= ${PYPKGPREFIX}-gitpython>=3.1.8:../../devel/py-gitpython
-BUILD_DEPENDS+= ${PYPKGPREFIX}-isort>=4.3.21:../../devel/py-isort
-BUILD_DEPENDS+= ${PYPKGPREFIX}-ipython>=7.18.1:../../devel/py-ipython
-BUILD_DEPENDS+= ${PYPKGPREFIX}-jupyter_core>=4.6.3:../../devel/py-jupyter_core
-BUILD_DEPENDS+= ${PYPKGPREFIX}-nbsphinx>=0.7.1:../../wip/py-nbsphinx
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-nbval>=0.9.6:../../wip/py-test-nbval
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.7.1:../../wip/py-pre-commit
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pylint>=1.9.3:../../devel/py-pylint
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.5:../../devel/py-test
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.34.0:../../devel/py-test-xdist
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sympy>=1.6.2:../../math/py-sympy
-BUILD_DEPENDS+= ${PYPKGPREFIX}-twine>=1.13.0:../../net/py-twine
-BUILD_DEPENDS+= ${PYPKGPREFIX}-watermark>=2.0.2:../../wip/py-watermark
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.35.1:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-black-[0-9]*:../../wip/py-black
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coverage>=5.2.1:../../devel/py-coverage
+TOOL_DEPENDS+= ${PYPKGPREFIX}-coveralls>=2.4.2:../../wip/py-coveralls
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flake8>=3.8.3:../../devel/py-flake8
+TOOL_DEPENDS+= ${PYPKGPREFIX}-gitpython>=3.1.8:../../devel/py-gitpython
+TOOL_DEPENDS+= ${PYPKGPREFIX}-isort>=4.3.21:../../devel/py-isort
+TOOL_DEPENDS+= ${PYPKGPREFIX}-ipython>=7.18.1:../../devel/py-ipython
+TOOL_DEPENDS+= ${PYPKGPREFIX}-jupyter_core>=4.6.3:../../devel/py-jupyter_core
+TOOL_DEPENDS+= ${PYPKGPREFIX}-nbsphinx>=0.7.1:../../wip/py-nbsphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-nbval>=0.9.6:../../wip/py-test-nbval
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pre-commit>=2.7.1:../../wip/py-pre-commit
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pylint>=1.9.3:../../devel/py-pylint
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=5.3.5:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-xdist>=1.34.0:../../devel/py-test-xdist
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sympy>=1.6.2:../../math/py-sympy
+TOOL_DEPENDS+= ${PYPKGPREFIX}-twine>=1.13.0:../../net/py-twine
+TOOL_DEPENDS+= ${PYPKGPREFIX}-watermark>=2.0.2:../../wip/py-watermark
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.35.1:../../devel/py-wheel
DEPENDS+= ${PYPKGPREFIX}-uniseg>=0.7.1:../../wip/py-uniseg
diff --git a/py-symbolic/Makefile b/py-symbolic/Makefile
index d3d59513e6..9a17ff84a6 100644
--- a/py-symbolic/Makefile
+++ b/py-symbolic/Makefile
@@ -18,7 +18,7 @@ PYTHON_VERSIONED_DEPENDENCIES+= setuptools
DEPENDS+= ${PYPKGPREFIX}-milksnake>=0.1.5:../../wip/py-milksnake
DEPENDS+= ${PYPKGPREFIX}-cffi>=1.11.5:../../devel/py-cffi
DEPENDS+= ${PYPKGPREFIX}-cparser>=2.18:../../devel/py-cparser
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
.include "../../mk/bsd.prefs.mk"
#HAS_CONFIGURE= yes
diff --git a/py-symlens/Makefile b/py-symlens/Makefile
index cee5df3f6d..bd89fdab01 100644
--- a/py-symlens/Makefile
+++ b/py-symlens/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/simonsobs/symlens
COMMENT= Symbolic Mode Coupling
LICENSE= modified-bsd
-BUILD_DEPENDS+= # TODO: pytest-runner>=0
+TOOL_DEPENDS+= # TODO: pytest-runner>=0
TEST_DEPENDS+= # TODO: pytest>=0
USE_LANGUAGES= # none
diff --git a/py-tblib/Makefile b/py-tblib/Makefile
index 63bca6d734..87ba4e9d5d 100644
--- a/py-tblib/Makefile
+++ b/py-tblib/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/ionelmc/python-tblib/
COMMENT= Serialization library for Exceptions and Tracebacks
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
do-test:
diff --git a/py-test-metadata/Makefile b/py-test-metadata/Makefile
index c2ef0f2c94..0db153cac3 100644
--- a/py-test-metadata/Makefile
+++ b/py-test-metadata/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/pytest-dev/pytest-metadata
COMMENT= Plugin for test session metadata
LICENSE= mpl-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-test>=3.5.0:../../devel/py-test
diff --git a/py-test-repeat/Makefile b/py-test-repeat/Makefile
index 9a8210cc43..e1cf30210b 100644
--- a/py-test-repeat/Makefile
+++ b/py-test-repeat/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/pytest-dev/pytest-repeat
COMMENT= pytest plugin for repeating tests
LICENSE= mpl-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=0:../../devel/py-setuptools_scm
+TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=0:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-test>=6.1.1:../../devel/py-test
USE_LANGUAGES= # none
diff --git a/py-testfixtures/Makefile b/py-testfixtures/Makefile
index 71837fabc7..7ec86d69e3 100644
--- a/py-testfixtures/Makefile
+++ b/py-testfixtures/Makefile
@@ -12,8 +12,8 @@ LICENSE= mit
USE_LANGUAGES= # none
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.29.0:../../devel/py-wheel
-BUILD_DEPENDS+= ${PYPKGPREFIX}-twine>=1.13.0:../../net/py-twine
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.29.0:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-twine>=1.13.0:../../net/py-twine
DEPENDS+= ${PYPKGPREFIX}-test>=6.1.2:../../devel/py-test
DEPENDS+= ${PYPKGPREFIX}-test-cov>=2.10.1:../../devel/py-test-cov
DEPENDS+= ${PYPKGPREFIX}-test-django>=3.10.0:../../www/py-test-django
diff --git a/py-ua-parser/Makefile b/py-ua-parser/Makefile
index 0589627bb9..7141cf1819 100644
--- a/py-ua-parser/Makefile
+++ b/py-ua-parser/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/ua-parser/uap-python/
COMMENT= Python implementation of the UA Parser
LICENSE= apache-2.0
-BUILD_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+TOOL_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
.include "../../lang/python/egg.mk"
WRKSRC= ${WRKDIR}/ua-parser-0.8.0
diff --git a/py-update-checker/Makefile b/py-update-checker/Makefile
index 628806167c..c69898cf1d 100644
--- a/py-update-checker/Makefile
+++ b/py-update-checker/Makefile
@@ -12,9 +12,9 @@ LICENSE= modified-bsd
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-black>=0:../../textproc/py-black
-BUILD_DEPENDS+= ${PYPKGPREFIX}-flake8>=0:../../devel/py-flake8
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test>=2.7.3:../../devel/py-test
+TOOL_DEPENDS+= ${PYPKGPREFIX}-black>=0:../../textproc/py-black
+TOOL_DEPENDS+= ${PYPKGPREFIX}-flake8>=0:../../devel/py-flake8
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test>=2.7.3:../../devel/py-test
DEPENDS+= ${PYPKGPREFIX}-requests>=2.3.0:../../devel/py-requests
USE_LANGUAGES= # none
diff --git a/py-zlmdb/Makefile b/py-zlmdb/Makefile
index d22a2acac1..ca5f0c2c58 100644
--- a/py-zlmdb/Makefile
+++ b/py-zlmdb/Makefile
@@ -12,7 +12,7 @@ LICENSE= mit
PYTHON_VERSIONS_INCOMPATIBLE= 27
-BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
+TOOL_DEPENDS+= ${PYPKGPREFIX}-test-runner>=5.2:../../devel/py-test-runner
DEPENDS+= ${PYPKGPREFIX}-cbor2>=5.1.0:../../devel/py-cbor2
DEPENDS+= ${PYPKGPREFIX}-click>=7.0:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-txaio>=20.3.1:../../devel/py-txaio
diff --git a/pywm/Makefile b/pywm/Makefile
index 813fa1f111..2c2076cad5 100644
--- a/pywm/Makefile
+++ b/pywm/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.freenet.org.nz/python/pywm/
COMMENT= Window manager in Python
-BUILD_DEPENDS= ${PYPKGPREFIX}-pyrex>=0.8.1:../../lang/py-pyrex
+TOOL_DEPENDS= ${PYPKGPREFIX}-pyrex>=0.8.1:../../lang/py-pyrex
PY_PATCHPLIST= yes
PYDISTUTILSPKG= yes
diff --git a/pyzor/Makefile b/pyzor/Makefile
index d01b497bd5..7b8011e00d 100644
--- a/pyzor/Makefile
+++ b/pyzor/Makefile
@@ -15,7 +15,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx
USE_TOOLS+= gmake
-BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
REPLACE_PYTHON= scripts/pyzor scripts/pyzord
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/qemu-git/Makefile b/qemu-git/Makefile
index c1f8fd0418..2c4972f59b 100644
--- a/qemu-git/Makefile
+++ b/qemu-git/Makefile
@@ -20,7 +20,7 @@ FAKE_NCURSES= yes
UNLIMIT_RESOURCES= datasize
HAS_CONFIGURE= yes
-BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
+TOOL_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= pre-configure
diff --git a/qmc2/Makefile b/qmc2/Makefile
index fee9af0bfe..a0b4c69e18 100644
--- a/qmc2/Makefile
+++ b/qmc2/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://qmc2.arcadehits.net/wordpress/
COMMENT= Multi-platform GUI front end for MAME and MESS
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= rsync-[0-9]*:../../net/rsync
+TOOL_DEPENDS+= rsync-[0-9]*:../../net/rsync
WRKSRC= ${WRKDIR}/qmc2
USE_LANGUAGES= c c++
diff --git a/rakudo-star/Makefile b/rakudo-star/Makefile
index f399a40376..6140d88424 100644
--- a/rakudo-star/Makefile
+++ b/rakudo-star/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= https://rakudo.org/
COMMENT= Perl 6 reference implementation
LICENSE= artistic-2.0
-BUILD_DEPENDS+= MoarVM>=2020.10:../../devel/MoarVM
+TOOL_DEPENDS+= MoarVM>=2020.10:../../devel/MoarVM
.include "../../mk/bsd.prefs.mk"
diff --git a/riak14/Makefile b/riak14/Makefile
index 44860300a6..e02ef12d52 100644
--- a/riak14/Makefile
+++ b/riak14/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.basho.com/products_riak_overview.php
COMMENT= Distributed, highly available data store
LICENSE= apache-2.0
-BUILD_DEPENDS+= git-base-[0-9]*:../../devel/git-base
+TOOL_DEPENDS+= git-base-[0-9]*:../../devel/git-base
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/ripe-rpsl-objectlibrary/Makefile b/ripe-rpsl-objectlibrary/Makefile
index 8908ec4bf9..03de1eb0b3 100644
--- a/ripe-rpsl-objectlibrary/Makefile
+++ b/ripe-rpsl-objectlibrary/Makefile
@@ -16,7 +16,7 @@ BUILD_DIRS= ${WRKSRC} ${WRKSRC}/perl
USE_LIBTOOL= YES
-BUILD_DEPENDS+= p5-Net-Whois-RIPE-[0-9]*:../../wip/p5-Net-Whois-RIPE
+TOOL_DEPENDS+= p5-Net-Whois-RIPE-[0-9]*:../../wip/p5-Net-Whois-RIPE
post-configure: perl5-configure
diff --git a/rippled/Makefile b/rippled/Makefile
index bd5bacf1c0..7e0322d043 100644
--- a/rippled/Makefile
+++ b/rippled/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/ripple/rippled
COMMENT= Ripple peer-to-peer network daemon
#LICENSE= # TODO: (see mk/license.mk)
-BUILD_DEPENDS+= scons>=0.96.91:../../devel/scons
+TOOL_DEPENDS+= scons>=0.96.91:../../devel/scons
DEPENDS+= openssl>=1.0.1f:../../security/openssl
USE_LANGUAGES= c c++
diff --git a/roxterm/Makefile b/roxterm/Makefile
index 769bcc4088..26e6b12bb0 100644
--- a/roxterm/Makefile
+++ b/roxterm/Makefile
@@ -20,8 +20,8 @@ USE_TOOLS+= pkg-config gsed gmake
TOOLS_PLATFORM.gsed= #empty
.endif
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-BUILD_DEPENDS+= libxslt>=1.0.20:../../textproc/libxslt
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= libxslt>=1.0.20:../../textproc/libxslt
CONFIGURE_ENV+= ac_cv_prog_HAVE_PO4A=no
diff --git a/rstudio/Makefile b/rstudio/Makefile
index d9e95ea7f9..732167f06f 100644
--- a/rstudio/Makefile
+++ b/rstudio/Makefile
@@ -12,9 +12,9 @@ HOMEPAGE= https://github.com/rstudio/rstudio/tarball/v0.95.265/
COMMENT= Integrated Development Environment (IDE) for R
LICENSE= gnu-agpl-v3
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
-BUILD_DEPENDS+= gwt-2.4.0:../../www/gwt
-BUILD_DEPENDS+= gin-1.5:../../wip/gin
+TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
+TOOL_DEPENDS+= gwt-2.4.0:../../www/gwt
+TOOL_DEPENDS+= gin-1.5:../../wip/gin
# Force using "curl" for fetching the distribution file. It is only available
# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
diff --git a/rust/Makefile b/rust/Makefile
index 909c9a663b..635df4d24e 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -397,8 +397,8 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap
.endif
.if ${OPSYS} == "SunOS"
-BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils
-BUILD_DEPENDS+= gzip>=0:../../archivers/gzip
+TOOL_DEPENDS+= coreutils>=0:../../sysutils/coreutils
+TOOL_DEPENDS+= gzip>=0:../../archivers/gzip
TOOLS_CREATE+= md5sum
TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum
TOOLS_PLATFORM.gzcat= ${PREFIX}/bin/gzip -cd
@@ -657,7 +657,7 @@ stage0-bootstrap: install
.if (${MACHINE_PLATFORM:MNetBSD-*-i386} || \
${MACHINE_PLATFORM:MNetBSD-*-sparc64}) \
&& empty(OS_VERSION:M8.*)
-BUILD_DEPENDS+= compat80>=0:../../emulators/compat80
+TOOL_DEPENDS+= compat80>=0:../../emulators/compat80
.endif
.include "../../mk/atomic64.mk"
@@ -669,7 +669,7 @@ BUILD_DEPENDS+= compat80>=0:../../emulators/compat80
DEPENDS+= libatomic-links>=0:../../devel/libatomic-links
.endif
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+TOOL_DEPENDS+= cmake-[0-9]*:../../devel/cmake
.include "../../devel/cmake/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/tool.mk"
diff --git a/rygel/Makefile b/rygel/Makefile
index 91da2cb878..19dde4e228 100644
--- a/rygel/Makefile
+++ b/rygel/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://live.gnome.org/Rygel
COMMENT= UPnP AV MediaServer that allows sharing audio, video, and pictures
LICENSE= gnu-lgpl-v2
-BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/safekeep/Makefile b/safekeep/Makefile
index 5c326fa77b..5898823069 100644
--- a/safekeep/Makefile
+++ b/safekeep/Makefile
@@ -9,8 +9,8 @@ HOMEPAGE= http://safekeep.sourceforge.net/
COMMENT= Centralized and easy to use backup application
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
-BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
USE_LANGUAGES= # none
USE_TOOLS+= gmake
diff --git a/sbcl-git/Makefile b/sbcl-git/Makefile
index 9f78357e10..b3c5301052 100644
--- a/sbcl-git/Makefile
+++ b/sbcl-git/Makefile
@@ -42,14 +42,14 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
# Use "clisp -ansi -on-error abort" to make the build more reproducible,
# per Christophe Rhodes:
SBCL_BOOT_SYSTEM= clisp -norc -ansi -on-error abort
-BUILD_DEPENDS+= clisp-[0-9]*:../../lang/clisp
+TOOL_DEPENDS+= clisp-[0-9]*:../../lang/clisp
UNLIMIT_RESOURCES= datasize
.elif ${SBCL_BOOT_SYSTEM} == clisp
-BUILD_DEPENDS+= clisp-[0-9]*:../../lang/clisp
+TOOL_DEPENDS+= clisp-[0-9]*:../../lang/clisp
UNLIMIT_RESOURCES= datasize
.elif ${SBCL_BOOT_SYSTEM} == sbcl
# Get bootstrap version:
-BUILD_DEPENDS+= sbcl-[0-9]*:../../lang/sbcl
+TOOL_DEPENDS+= sbcl-[0-9]*:../../lang/sbcl
.endif
SUBST_CLASSES+= fix-paths
diff --git a/sbcl/Makefile b/sbcl/Makefile
index e33ff87c98..374296894b 100644
--- a/sbcl/Makefile
+++ b/sbcl/Makefile
@@ -44,10 +44,10 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
# Use "clisp -ansi -on-error abort" to make the build more reproducible,
# per Christophe Rhodes:
SBCL_BOOT_SYSTEM= clisp -norc -ansi -on-error abort
-BUILD_DEPENDS+= clisp-[0-9]*:../../lang/clisp
+TOOL_DEPENDS+= clisp-[0-9]*:../../lang/clisp
UNLIMIT_RESOURCES= datasize
.elif ${SBCL_BOOT_SYSTEM} == abcl
-BUILD_DEPENDS+= abcl-[0-9]*:../../lang/abcl
+TOOL_DEPENDS+= abcl-[0-9]*:../../lang/abcl
.endif
SUBST_CLASSES+= fix-paths
diff --git a/scsh-install-lib/Makefile b/scsh-install-lib/Makefile
index 053f15a920..7306cb2fcb 100644
--- a/scsh-install-lib/Makefile
+++ b/scsh-install-lib/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://lamp.epfl.ch/~schinz/scsh_packages/
COMMENT= SCSH installation library for third-party libraries
LICENSE= modified-bsd
-BUILD_DEPENDS+= scsh>=0.6:../../shells/scsh
+TOOL_DEPENDS+= scsh>=0.6:../../shells/scsh
NO_BUILD= yes
diff --git a/scsh-install-lib/Makefile.common b/scsh-install-lib/Makefile.common
index f49e384781..c7a890d1d3 100644
--- a/scsh-install-lib/Makefile.common
+++ b/scsh-install-lib/Makefile.common
@@ -8,8 +8,8 @@
# XXX: This should actually be moved to shells/scsh/Makefile.common or
# something
#
-BUILD_DEPENDS+= scsh>=0.6:../../shells/scsh
-BUILD_DEPENDS+= scsh-install-lib>=1:../../wip/scsh-install-lib
+TOOL_DEPENDS+= scsh>=0.6:../../shells/scsh
+TOOL_DEPENDS+= scsh-install-lib>=1:../../wip/scsh-install-lib
NO_BUILD= yes
diff --git a/scummvm-git/Makefile b/scummvm-git/Makefile
index 46ebae6695..727c328790 100644
--- a/scummvm-git/Makefile
+++ b/scummvm-git/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
+TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
.endif
YESTERDAY!= expr `date +%s` - 86399
diff --git a/scx/Makefile b/scx/Makefile
index 9605ba44a2..28a0a24649 100644
--- a/scx/Makefile
+++ b/scx/Makefile
@@ -17,8 +17,8 @@ CONFIGURE_ARGS+= --with-scsh-includes=${PREFIX}/include
#
# XXX Nasty quick hack. so sue me for wanting to get orion to work asap ;)
#
-BUILD_DEPENDS+= scsh>=0.6:../../shells/scsh
-BUILD_DEPENDS+= scsh-install-lib>=1:../../wip/scsh-install-lib
+TOOL_DEPENDS+= scsh>=0.6:../../shells/scsh
+TOOL_DEPENDS+= scsh-install-lib>=1:../../wip/scsh-install-lib
do-install:
cd ${WRKSRC}; \
diff --git a/sddm/Makefile b/sddm/Makefile
index b6c1d7a2ab..1376047b56 100644
--- a/sddm/Makefile
+++ b/sddm/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= https://github.com/sddm/sddm
COMMENT= QML based X11 and Wayland display manager
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
+TOOL_DEPENDS+= extra-cmake-modules-[0-9]*:../../devel/extra-cmake-modules
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils-[0-9]*:../../textproc/py-docutils
USE_CMAKE= yes
USE_LANGUAGES= c c++
diff --git a/simgrid/Makefile b/simgrid/Makefile
index 92d886cfd4..453a411cd4 100644
--- a/simgrid/Makefile
+++ b/simgrid/Makefile
@@ -20,7 +20,7 @@ USE_TOOLS+= perl
PKGSRC_FORTRAN= gfortran
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
.include "../../devel/libf2c/buildlink3.mk"
.include "../../graphics/graphviz/buildlink3.mk"
diff --git a/simulavr-git/Makefile b/simulavr-git/Makefile
index 1f35c9d03f..ab7eea58f2 100644
--- a/simulavr-git/Makefile
+++ b/simulavr-git/Makefile
@@ -9,8 +9,8 @@ HOMEPAGE= https://www.nongnu.org/simulavr/
COMMENT= Simulator for Atmel AVR microcontrollers
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
-BUILD_DEPENDS+= avr-libc-[0-9]*:../../wip/avr-libc
+TOOL_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
+TOOL_DEPENDS+= avr-libc-[0-9]*:../../wip/avr-libc
GIT_FLAGS?= --depth 1
@@ -75,7 +75,7 @@ post-install:
.include "../../wip/avr-gcc/buildlink3.mk"
#.include "../../devel/googletest/buildlink3.mk"
.include "../../devel/swig/buildlink3.mk"
-# See above BUILD_DEPENDS
+# See above TOOL_DEPENDS
#.include "../../wip/avr-libc/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../lang/python/pyversion.mk"
diff --git a/slurm-wlm-devel/Makefile b/slurm-wlm-devel/Makefile
index 63460136fc..7071d8b4fa 100644
--- a/slurm-wlm-devel/Makefile
+++ b/slurm-wlm-devel/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple Linux Utility for Resource Management
LICENSE= gnu-gpl-v2
-BUILD_DEPENDS+= man2html-[0-9]*:../../textproc/man2html
+TOOL_DEPENDS+= man2html-[0-9]*:../../textproc/man2html
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
diff --git a/smallbasic/Makefile.common b/smallbasic/Makefile.common
index a653a99c74..55e596b4a3 100644
--- a/smallbasic/Makefile.common
+++ b/smallbasic/Makefile.common
@@ -16,7 +16,7 @@ USE_TOOLS+= aclocal autoheader autoconf automake bash pkg-config
USE_LANGUAGES= c c++
# for xxd
-BUILD_DEPENDS+= vim-[0-9]*:../../editors/vim
+TOOL_DEPENDS+= vim-[0-9]*:../../editors/vim
GNU_CONFIGURE= YES
CONFIG_SHELL= ${BASH}
diff --git a/stardict/Makefile b/stardict/Makefile
index 5238f26f24..ba3fd65589 100644
--- a/stardict/Makefile
+++ b/stardict/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= rxg%NetBSD.org@localhost
HOMEPAGE= http://stardict.sourceforge.net/
COMMENT= Cross-Platform and international dictionary written in Gtk2
-BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
LICENSE= gnu-gpl-v3
diff --git a/stmd-git/Makefile b/stmd-git/Makefile
index 8ccbfa1419..90cd7cb995 100644
--- a/stmd-git/Makefile
+++ b/stmd-git/Makefile
@@ -12,7 +12,7 @@ LICENSE= modified-bsd
GIT_REPOSITORIES= stmd
GIT_REPO.stmd= https://github.com/jgm/stmd.git
-BUILD_DEPENDS+= re2c-[0-9]*:../../devel/re2c
+TOOL_DEPENDS+= re2c-[0-9]*:../../devel/re2c
WRKSRC= ${WRKDIR}/stmd
USE_TOOLS+= gmake
diff --git a/stratagus/Makefile b/stratagus/Makefile
index fd80aa4e92..74e12ec675 100644
--- a/stratagus/Makefile
+++ b/stratagus/Makefile
@@ -14,7 +14,7 @@ EXTRACT_USING= gtar
USE_CMAKE= yes
USE_LANGUAGES= c c++
-BUILD_DEPENDS+= tolua++-[0-9]*:../../wip/tolua++
+TOOL_DEPENDS+= tolua++-[0-9]*:../../wip/tolua++
CMAKE_ARGS+= -DENABLE_DEV=ON
CMAKE_ARGS+= -DWANT_METASERVER=OFF
diff --git a/strongswan/Makefile b/strongswan/Makefile
index 244d557920..157381fed4 100644
--- a/strongswan/Makefile
+++ b/strongswan/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS= --enable-kernel-pfkey \
--enable-cmd \
--with-group=wheel
-BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
+TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
.include "../../security/openssl/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
diff --git a/supermodel/Makefile b/supermodel/Makefile
index 8d0af4c239..b0ee1f3fdb 100644
--- a/supermodel/Makefile
+++ b/supermodel/Makefile
@@ -22,8 +22,8 @@ do-install:
cd ${WRKSRC} && \
${INSTALL_PROGRAM} bin/Supermodel ${DESTDIR}${PREFIX}/bin/Supermodel
-BUILD_DEPENDS+= glu-[0-9]*:../../graphics/glu
+TOOL_DEPENDS+= glu-[0-9]*:../../graphics/glu
.include "../../devel/zlib/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
-BUILD_DEPENDS+= MesaLib-[0-9]*:../../graphics/MesaLib
+TOOL_DEPENDS+= MesaLib-[0-9]*:../../graphics/MesaLib
.include "../../mk/bsd.pkg.mk"
diff --git a/sushi/Makefile b/sushi/Makefile
index 02a6d4a5b2..4a3e55387d 100644
--- a/sushi/Makefile
+++ b/sushi/Makefile
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_TOOLS+= intltool perl pkg-config
-BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
.include "../../www/webkit24-gtk/buildlink3.mk"
.include "../../x11/gtksourceview3/buildlink3.mk"
diff --git a/svt-vp9/Makefile b/svt-vp9/Makefile
index f8b692b176..19767d441e 100644
--- a/svt-vp9/Makefile
+++ b/svt-vp9/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= https://github.com/OpenVisualCloud/SVT-VP9/
COMMENT= VP9 encoder
LICENSE= modified-bsd
-BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
+TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
USE_TOOLS+= pkg-config
WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
diff --git a/syncthing-discosrv/Makefile b/syncthing-discosrv/Makefile
index 215f5c4709..6c0aada4c5 100644
--- a/syncthing-discosrv/Makefile
+++ b/syncthing-discosrv/Makefile
@@ -14,7 +14,7 @@ COMMENT= Syncthing discovery server
LICENSE= mit
EXTRACT_USING= bsdtar
-BUILD_DEPENDS+= go-[0-9]*:../../lang/go
+TOOL_DEPENDS+= go-[0-9]*:../../lang/go
NO_CONFIGURE= yes
USE_LANGUAGES= c # and go
GO_SRCPATH= github.com/syncthing/syncthing
diff --git a/syncthing-inotify/Makefile b/syncthing-inotify/Makefile
index df7847ba8c..f4ac0b41f9 100644
--- a/syncthing-inotify/Makefile
+++ b/syncthing-inotify/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/syncthing/syncthing-inotify
COMMENT= Inotify file watcher intended for use with Syncthing
LICENSE= mpl-2.0
-BUILD_DEPENDS+= go-[0-9]*:../../lang/go
+TOOL_DEPENDS+= go-[0-9]*:../../lang/go
DEPENDS+= syncthing>=0.11.0:../../net/syncthing
MAKE_ENV+= GOPATH=${PREFIX}/gopkg
diff --git a/syncthing-relaysrv/Makefile b/syncthing-relaysrv/Makefile
index 813880cd4b..d5faab2325 100644
--- a/syncthing-relaysrv/Makefile
+++ b/syncthing-relaysrv/Makefile
@@ -14,7 +14,7 @@ COMMENT= Syncthing relay server
LICENSE= mit
EXTRACT_USING= bsdtar
-BUILD_DEPENDS+= go-[0-9]*:../../lang/go
+TOOL_DEPENDS+= go-[0-9]*:../../lang/go
NO_CONFIGURE= yes
USE_LANGUAGES= c # and go
GO_SRCPATH= github.com/syncthing/syncthing
diff --git a/systemsettings/Makefile b/systemsettings/Makefile
index f3c999f17b..d87ae1f139 100644
--- a/systemsettings/Makefile
+++ b/systemsettings/Makefile
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2
.include "../../meta-pkgs/kde/plasma5.mk"
-BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
USE_TOOLS+= msgmerge
diff --git a/tardy/TODO b/tardy/TODO
index b73a07adfe..3adde63318 100644
--- a/tardy/TODO
+++ b/tardy/TODO
@@ -9,5 +9,5 @@
* add option 'testing' to mk/defaults/options.description
Does not seem to be quite the right way to handle this.
- Better would be per-phase DEPENDS variables, like there already are in BUILD_DEPENDS and
+ Better would be per-phase DEPENDS variables, like there already are in TOOL_DEPENDS and
DEPENDS.
diff --git a/tc-git/Makefile b/tc-git/Makefile
index 1f2b19f879..32dad22496 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -20,7 +20,7 @@ EMACS_MODULES= base
# Instead of USE_TOOLS+=, avoid to conflict with autoconf
USE_TOOLS= aclocal automake autoconf gmake makeinfo
GNU_CONFIGURE= YES
-BUILD_DEPENDS+= web2c-[0-9]*:../../print/web2c
+TOOL_DEPENDS+= web2c-[0-9]*:../../print/web2c
CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${EMACS_FLAVOR}}
diff --git a/tc-hasida-table/Makefile b/tc-hasida-table/Makefile
index eeb3901154..f918e0359a 100644
--- a/tc-hasida-table/Makefile
+++ b/tc-hasida-table/Makefile
@@ -12,7 +12,7 @@ LICENSE= 2-clause-bsd
USE_TOOLS+= perl
REPLACE_PERL= hasida-table
-# BUILD_DEPENDS+= ghostscript-cidfonts-ryumin-[0-9]*:../../fonts/ghostscript-cidfonts-ryumin
+# TOOL_DEPENDS+= ghostscript-cidfonts-ryumin-[0-9]*:../../fonts/ghostscript-cidfonts-ryumin
# BUILD_ENV+= PKG_OPTIONS.ghostscript+=disable-compile-inits
# .if empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mdisable-compile-inits) && \
diff --git a/tc/Makefile b/tc/Makefile
index b7742e7fd2..e392e8198d 100644
--- a/tc/Makefile
+++ b/tc/Makefile
@@ -20,7 +20,7 @@ EMACS_MODULES= base
# Instead of USE_TOOLS+=, avoid to conflict with autoconf
USE_TOOLS= aclocal automake autoconf gmake makeinfo
GNU_CONFIGURE= YES
-BUILD_DEPENDS+= web2c-[0-9]*:../../print/web2c
+TOOL_DEPENDS+= web2c-[0-9]*:../../print/web2c
CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${EMACS_FLAVOR}}
diff --git a/telegraf/Makefile b/telegraf/Makefile
index 27e4498363..705ed83642 100644
--- a/telegraf/Makefile
+++ b/telegraf/Makefile
@@ -26,7 +26,7 @@ SITES.${TELEGRAF_DEPENDENCIES}= https://bitbucket.org/hww3/influxdb/downloads/
USE_TOOLS+= gmake curl
-BUILD_DEPENDS+= go110-1.10.*:../../lang/go110
+TOOL_DEPENDS+= go110-1.10.*:../../lang/go110
# go language executables don't have SSP support
CHECK_SSP_SKIP= bin/*
diff --git a/telepathy-logger/Makefile b/telepathy-logger/Makefile
index 4ce275dc22..fd981e8c0c 100644
--- a/telepathy-logger/Makefile
+++ b/telepathy-logger/Makefile
@@ -19,7 +19,7 @@ CFLAGS.SunOS+= -std=c99 -D_XOPEN_SOURCE=600
PKGCONFIG_OVERRIDE+= extensions/tpl-extensions.pc.in
PKGCONFIG_OVERRIDE+= telepathy-logger/telepathy-logger-0.1.pc.in
-BUILD_DEPENDS= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+TOOL_DEPENDS= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
PYTHON_FOR_BUILD_ONLY= yes
PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.2.7
diff --git a/tendra.org-sid/Makefile b/tendra.org-sid/Makefile
index 996f206513..d4619ed17a 100644
--- a/tendra.org-sid/Makefile
+++ b/tendra.org-sid/Makefile
@@ -9,9 +9,9 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.tendra.org/wiki/SID
COMMENT= SID (Syntax Improving Device) is an LL(1) parser generator
-BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt
-BUILD_DEPENDS+= docbook-xml>=4.2nb4:../../textproc/docbook-xml
-BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt
+TOOL_DEPENDS+= docbook-xml>=4.2nb4:../../textproc/docbook-xml
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
USE_TOOLS+= perl
diff --git a/tengwar-ttf/Makefile b/tengwar-ttf/Makefile
index 847435224b..acd08f6259 100644
--- a/tengwar-ttf/Makefile
+++ b/tengwar-ttf/Makefile
@@ -13,7 +13,7 @@ HOMEPAGE= http://freetengwar.sourceforge.net/
COMMENT= Family of fonts covering J. R. R. Tolkien's Tengwar script
LICENSE= gnu-gpl-v3
-#BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
+#TOOL_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
diff --git a/thunderbird/mozilla-common.mk b/thunderbird/mozilla-common.mk
index f05cce2bfb..812208b7d9 100644
--- a/thunderbird/mozilla-common.mk
+++ b/thunderbird/mozilla-common.mk
@@ -106,7 +106,7 @@ CONFIGURE_ARGS+= --disable-updater
# RLBox WASM sandbox
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
# For wasm-ld command
-BUILD_DEPENDS+= lld-[0-9]*:../../wip/lld
+TOOL_DEPENDS+= lld-[0-9]*:../../wip/lld
.include "../../wip/wasi-libc/buildlink3.mk"
.include "../../wip/wasi-libcxx/buildlink3.mk"
# NB the exact versions of the clang and wasi-compiler-rt dependencies must
diff --git a/tilix/Makefile b/tilix/Makefile
index c119a7c785..159686afff 100644
--- a/tilix/Makefile
+++ b/tilix/Makefile
@@ -16,8 +16,8 @@ LICENSE= mpl-2.0
WRKSRC= ${WRKDIR}/tilix-1.9.3
USE_PKGLOCALEDIR= yes
-BUILD_DEPENDS+= dub-*:../../wip/dub
-BUILD_DEPENDS+= po4a-*:../../textproc/po4a
+TOOL_DEPENDS+= dub-*:../../wip/dub
+TOOL_DEPENDS+= po4a-*:../../textproc/po4a
USE_TOOLS+= pkg-config
diff --git a/tor-dev/options.mk b/tor-dev/options.mk
index f3d9af34dd..40a66ac034 100644
--- a/tor-dev/options.mk
+++ b/tor-dev/options.mk
@@ -17,7 +17,7 @@ PLIST_VARS+= doc openssl
### may not be wanted under certain circumstances.
###
.if !empty(PKG_OPTIONS:Mdoc)
-BUILD_DEPENDS+= asciidoc>=8.3.3:../../textproc/asciidoc
+TOOL_DEPENDS+= asciidoc>=8.3.3:../../textproc/asciidoc
CONFIGURE_ARGS+= --enable-asciidoc
PLIST.doc= yes
.else
diff --git a/tuxguitar/Makefile b/tuxguitar/Makefile
index 10c34ca63d..74a6b8c514 100644
--- a/tuxguitar/Makefile
+++ b/tuxguitar/Makefile
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/tuxguitar-src-1.2
USE_LANGUAGES= c c++
USE_JAVA2= yes
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
+TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
MAKE_PROGRAM= ant
MAKE_FILE= build.xml
diff --git a/tuxpaint-cvs/Makefile b/tuxpaint-cvs/Makefile
index 2079025b8b..8a9093bb64 100644
--- a/tuxpaint-cvs/Makefile
+++ b/tuxpaint-cvs/Makefile
@@ -10,7 +10,7 @@ COMMENT= Drawing program for small children
# program itself is gnu-gpl-v2, other licenses are packaged fonts
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd
-BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
+TOOL_DEPENDS+= gperf-[0-9]*:../../devel/gperf
CVS_ROOT.tuxpaint= :pserver:anonymous%tuxpaint.cvs.sourceforge.net@localhost:/cvsroot/tuxpaint
CVS_REPOSITORIES= tuxpaint
diff --git a/u-boot-full/Makefile b/u-boot-full/Makefile
index ee38b69976..110824ea71 100644
--- a/u-boot-full/Makefile
+++ b/u-boot-full/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
# Require the linux device tree compiler
-BUILD_DEPENDS= dtc>=1.4.1:../../sysutils/dtc
+TOOL_DEPENDS= dtc>=1.4.1:../../sysutils/dtc
AUTO_MKDIRS= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/u-boot-khadas-vim3/Makefile b/u-boot-khadas-vim3/Makefile
index 45ecde8dcc..df043be3a5 100644
--- a/u-boot-khadas-vim3/Makefile
+++ b/u-boot-khadas-vim3/Makefile
@@ -127,7 +127,7 @@ post-extract:
# XXX For now, we use the fip_create and aml_encrypt_gxb binaries
# from Hardkernel.
#
-BUILD_DEPENDS+= amlogic-meson-fwtools>=0.0:../../sysutils/amlogic-meson-fwtools
+TOOL_DEPENDS+= amlogic-meson-fwtools>=0.0:../../sysutils/amlogic-meson-fwtools
post-build:
cp ${WRKSRC}/u-boot.bin ${WRKSRC}/bl33.bin
diff --git a/u-boot-pinebook-crust/Makefile b/u-boot-pinebook-crust/Makefile
index be570968c0..67df7b54a6 100644
--- a/u-boot-pinebook-crust/Makefile
+++ b/u-boot-pinebook-crust/Makefile
@@ -18,7 +18,7 @@ PKGREVISION= 3
DISTINFO_FILE= ${.CURDIR}/../../sysutils/u-boot-pinebook/distinfo
PATCHDIR= ${.CURDIR}/../../sysutils/u-boot-pinebook/patches
-BUILD_DEPENDS+= crust-firmware-[0-9]*:../../sysutils/crust-firmware
+TOOL_DEPENDS+= crust-firmware-[0-9]*:../../sysutils/crust-firmware
post-extract:
${CP} ${PREFIX}/share/arm-trusted-firmware/sun50i_a64/bl31.bin ${WRKSRC}
diff --git a/unmo3/Makefile b/unmo3/Makefile
index 8143d255ee..cb5d4940ed 100644
--- a/unmo3/Makefile
+++ b/unmo3/Makefile
@@ -14,7 +14,7 @@ HOMEPAGE= https://www.un4seen.com/mo3.html
COMMENT= MO3 decoder
LICENSE= no-profit
-BUILD_DEPENDS+= upx>=1.24:../../archivers/upx
+TOOL_DEPENDS+= upx>=1.24:../../archivers/upx
ONLY_FOR_PLATFORM= NetBSD-*-i386
ONLY_FOR_PLATFORM+= Linux-*-i[3-6]86
diff --git a/uprof/Makefile b/uprof/Makefile
index f3f996a5a6..ee209891d3 100644
--- a/uprof/Makefile
+++ b/uprof/Makefile
@@ -34,5 +34,5 @@ pre-configure:
.include "../../devel/ncurses/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-BUILD_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
+TOOL_DEPENDS+= gnome-common-[0-9]*:../../devel/gnome-common
.include "../../mk/bsd.pkg.mk"
diff --git a/uzbl-git/Makefile b/uzbl-git/Makefile
index c5a275b255..b6d574fd4c 100644
--- a/uzbl-git/Makefile
+++ b/uzbl-git/Makefile
@@ -42,8 +42,8 @@ REPLACE_PYTHON+= examples/data/scripts/per-site-settings.py
REPLACE_PYTHON+= examples/data/scripts/scheme.py
.include "../../lang/python/application.mk"
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
-BUILD_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
# for uzbl-browser
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
diff --git a/v8-316/Makefile b/v8-316/Makefile
index ac6a7b8f5d..c680fb69d3 100644
--- a/v8-316/Makefile
+++ b/v8-316/Makefile
@@ -10,7 +10,7 @@ COMMENT= V8 JavaScript Engine
HOMEPAGE= http://code.google.com/p/v8
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
+TOOL_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
USE_LANGUAGES= c c++
USE_TOOLS+= gmake:run
diff --git a/v8/Makefile b/v8/Makefile
index 81f4da5d9e..c176e2c4e3 100644
--- a/v8/Makefile
+++ b/v8/Makefile
@@ -10,7 +10,7 @@ COMMENT= V8 JavaScript Engine
HOMEPAGE= http://code.google.com/p/v8
LICENSE= modified-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
+TOOL_DEPENDS+= ${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
USE_LANGUAGES= c c++
USE_TOOLS+= gmake:run
diff --git a/varnish-modules/Makefile b/varnish-modules/Makefile
index dbe1dbecad..0225135047 100644
--- a/varnish-modules/Makefile
+++ b/varnish-modules/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/varnish/varnish-modules/
COMMENT= Collection of modules extending Varnish VCL
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
USE_LIBTOOL= yes
USE_TOOLS+= aclocal autoconf automake gmake pkg-config
diff --git a/varnish-slash/Makefile b/varnish-slash/Makefile
index 64e7cae7e8..ba5071a7cc 100644
--- a/varnish-slash/Makefile
+++ b/varnish-slash/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= https://gitlab.com/uplex/varnish/slash
COMMENT= Storage Engines for Varnish-Cache
LICENSE= 2-clause-bsd
-BUILD_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+TOOL_DEPENDS+= autoconf-archive-[0-9]*:../../devel/autoconf-archive
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
USE_LIBTOOL= yes
USE_TOOLS+= aclocal autoconf automake gmake m4 pkg-config
diff --git a/vcsh/Makefile b/vcsh/Makefile
index 88322faf49..b1d1ff4d24 100644
--- a/vcsh/Makefile
+++ b/vcsh/Makefile
@@ -11,9 +11,9 @@ COMMENT= Version Control System for the home directory
LICENSE= gnu-gpl-v2
# TEST_DEPENDS
-BUILD_DEPENDS+= p5-Shell-Command-[0-9]*:../../wip/p5-Shell-Command
-BUILD_DEPENDS+= p5-Test-Most-[0-9]*:../../devel/p5-Test-Most
-BUILD_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
+TOOL_DEPENDS+= p5-Shell-Command-[0-9]*:../../wip/p5-Shell-Command
+TOOL_DEPENDS+= p5-Test-Most-[0-9]*:../../devel/p5-Test-Most
+TOOL_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff
DEPENDS+= git-base-[0-9]*:../../devel/git-base
USE_LANGUAGES= c
diff --git a/virtualbox-svn/Makefile b/virtualbox-svn/Makefile
index 53b10339aa..18000e0010 100644
--- a/virtualbox-svn/Makefile
+++ b/virtualbox-svn/Makefile
@@ -13,10 +13,10 @@ LICENSE= gnu-gpl-v2
DEPENDS+= cdrtools-[0-9]*:../../sysutils/cdrtools
-BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
-BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
-BUILD_DEPENDS+= kbuild-[0-9]*:../../devel/kbuild
-BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
+TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
+TOOL_DEPENDS+= nasm-[0-9]*:../../devel/nasm
+TOOL_DEPENDS+= kbuild-[0-9]*:../../devel/kbuild
+TOOL_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
@@ -31,7 +31,7 @@ USE_LANGUAGES+= c c++
.if ${OPSYS} == "Linux"
# Required by Linux build
-BUILD_DEPENDS+= makeself-[0-9]*:../../archivers/makeself
+TOOL_DEPENDS+= makeself-[0-9]*:../../archivers/makeself
.endif
SUBST_CLASSES+= paths
diff --git a/virtualbox/Makefile b/virtualbox/Makefile
index bde9cb124c..6f6fc3dd75 100644
--- a/virtualbox/Makefile
+++ b/virtualbox/Makefile
@@ -17,9 +17,9 @@ LICENSE= gnu-gpl-v2
DEPENDS+= cdrtools-[0-9]*:../../sysutils/cdrtools
-BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
-BUILD_DEPENDS+= kbuild-[0-9]*:../../devel/kbuild
-BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
+TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
+TOOL_DEPENDS+= kbuild-[0-9]*:../../devel/kbuild
+TOOL_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils
TOOL_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 # for xmllint
@@ -36,7 +36,7 @@ PYTHON_VERSIONS_ACCEPTED= 27
.if ${OPSYS} == "Linux"
# Required by Linux build
-BUILD_DEPENDS+= makeself-[0-9]*:../../archivers/makeself
+TOOL_DEPENDS+= makeself-[0-9]*:../../archivers/makeself
.endif
SUBST_CLASSES+= paths
diff --git a/vista-fonts/Makefile b/vista-fonts/Makefile
index 8dcc167318..f9a1b090ce 100644
--- a/vista-fonts/Makefile
+++ b/vista-fonts/Makefile
@@ -17,7 +17,7 @@ RESTRICTED= No redistribution in altered form
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
-BUILD_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract
+TOOL_DEPENDS+= cabextract-[0-9]*:../../archivers/cabextract
NO_CONFIGURE= yes
NO_BUILD= yes
diff --git a/wasi-libc-git/Makefile b/wasi-libc-git/Makefile
index 1a14e3ef69..be766163f9 100644
--- a/wasi-libc-git/Makefile
+++ b/wasi-libc-git/Makefile
@@ -10,7 +10,7 @@ GIT_REPO.wasi-libc= https://github.com/WebAssembly/wasi-libc.git
GIT_BRANCH.wasi-libc= main
WRKSRC= ${WRKDIR}/wasi-libc
-BUILD_DEPENDS+= clang-[0-9]*:../../lang/clang # webassembly backend required
+TOOL_DEPENDS+= clang-[0-9]*:../../lang/clang # webassembly backend required
MAINTAINER= dan%alt.md@localhost
HOMEPAGE= https://wasi.dev/
diff --git a/wasi-libcxx/Makefile b/wasi-libcxx/Makefile
index 4e51fb266f..1c5175c84e 100644
--- a/wasi-libcxx/Makefile
+++ b/wasi-libcxx/Makefile
@@ -22,7 +22,7 @@ EXTRA_DIST+= ${LIBCXX}${EXTRACT_SUFX}
SITES.${LIBCXX}${EXTRACT_SUFX}= \
${MASTER_SITES:=${GITHUB_PROJECT}/releases/download/${GITHUB_RELEASE}/}
-BUILD_DEPENDS+= lld-[0-9]*:../../wip/lld
+TOOL_DEPENDS+= lld-[0-9]*:../../wip/lld
# Workaround for header conflicts
BUILDLINK_TRANSFORM+= rm:-I/usr/include
diff --git a/wla-dx/options.mk b/wla-dx/options.mk
index c6afefff0d..074c845487 100644
--- a/wla-dx/options.mk
+++ b/wla-dx/options.mk
@@ -11,6 +11,6 @@ PLIST_VARS+= doc
.if !empty(PKG_OPTIONS:Mdoc)
PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx
-BUILD_DEPENDS+= py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx
+TOOL_DEPENDS+= py[0-9]*-sphinx-[0-9]*:../../textproc/py-sphinx
PLIST.doc= yes
.endif
diff --git a/wmc2d/Makefile b/wmc2d/Makefile
index eaa940e308..1493414c63 100644
--- a/wmc2d/Makefile
+++ b/wmc2d/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= http://wmc2d.sourceforge.net/
COMMENT= Dockapp to monitor coretemp temperature and cpufreq frequency
LICENSE= gnu-agpl-v3
-BUILD_DEPENDS+= libxcb-[0-9]*:../../x11/libxcb
+TOOL_DEPENDS+= libxcb-[0-9]*:../../x11/libxcb
USE_TOOLS+= gmake pkg-config
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
diff --git a/xbsql/Makefile b/xbsql/Makefile
index 3cb0a85378..6da7cddc8c 100644
--- a/xbsql/Makefile
+++ b/xbsql/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.rekallrevealed.org/packages/
COMMENT= SQL frontend for DB4 (DBF) files with xbase
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
+TOOL_DEPENDS+= bison-[0-9]*:../../devel/bison
USE_PKGLOCALEDIR= yes
diff --git a/xmms2/TODO b/xmms2/TODO
index e2257fbf6a..3682320370 100644
--- a/xmms2/TODO
+++ b/xmms2/TODO
@@ -1,6 +1,6 @@
- Support every possible plugin (src/plugins).
# Done with the exception of neuros-cooler-media and sc68.
- # BUILD_DEPENDS+= sc68>=2.3.0:../../wip/sc68
+ # TOOL_DEPENDS+= sc68>=2.3.0:../../wip/sc68
# Those need to be packaged.
- Test coreaudio, mac plugins on Darwin.
- Test waveout plugin on Interix.
diff --git a/xmms2/options.mk b/xmms2/options.mk
index 4d799c34c7..a31765d7ce 100644
--- a/xmms2/options.mk
+++ b/xmms2/options.mk
@@ -81,7 +81,7 @@ WITHOUT_PLUGINS+= flac
.endif
.if !empty(PKG_OPTIONS:Mgamin)
-BUILD_DEPENDS+= gamin-[0-9]*:../../sysutils/gamin
+TOOL_DEPENDS+= gamin-[0-9]*:../../sysutils/gamin
PLIST.gamin= yes
.else
WITHOUT_PLUGINS+= gamin
@@ -137,7 +137,7 @@ WITHOUT_PLUGINS+= mms
.endif
.if !empty(PKG_OPTIONS:Mlibmpg123)
-BUILD_DEPENDS+= libmpg123>=1.5.1:../../wip/libmpg123
+TOOL_DEPENDS+= libmpg123>=1.5.1:../../wip/libmpg123
.include "../../wip/libmpg123/buildlink3.mk"
PLIST.libmpg123= yes
.else
@@ -187,7 +187,7 @@ WITHOUT_PLUGINS+= pulse
.endif
.if !empty(PKG_OPTIONS:Mpyrex)
-BUILD_DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.8.1:../../lang/py-pyrex
+TOOL_DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.8.1:../../lang/py-pyrex
PYTHON_VERSIONS_ACCEPTED= 27 # py-pyrex
.include "../../lang/python/extension.mk"
PY_PATCHPLIST= yes
@@ -256,7 +256,7 @@ WITHOUT_PLUGINS+= tremor
.endif
.if !empty(PKG_OPTIONS:Mvalgrind)
-BUILD_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind
+TOOL_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind
#PLIST.valgrind= yes
.endif
diff --git a/xtreemfs-server/Makefile b/xtreemfs-server/Makefile
index 68ab868257..f8f90a9278 100644
--- a/xtreemfs-server/Makefile
+++ b/xtreemfs-server/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1.1.1 2011/11/08 01:42:14 tnn2 Exp $
#
-BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
+TOOL_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
PKGNAME= ${DISTNAME:S/XtreemFS/xtreemfs-server/}
diff --git a/zig-git/application.mk b/zig-git/application.mk
index 0b9e557f82..0aa8f56628 100644
--- a/zig-git/application.mk
+++ b/zig-git/application.mk
@@ -25,7 +25,7 @@ ZIGCPUMODE?= -Dcpu=baseline
ZIGBUILDARGS?=
ZIGTESTARGS?=
-BUILD_DEPENDS+= zig-git-[0-9]*:../../wip/zig-git
+TOOL_DEPENDS+= zig-git-[0-9]*:../../wip/zig-git
USE_LANGUAGES= c
#MAKE_ENV+= ZIG_GLOBAL_CACHE_DIR=${WRKSRC}/tmp
diff --git a/zmap/Makefile b/zmap/Makefile
index 911337452e..582dd116a2 100644
--- a/zmap/Makefile
+++ b/zmap/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= https://zmap.io/
COMMENT= Network scanner that scales to Internet-wide network studies
LICENSE= apache-2.0
-BUILD_DEPENDS+= gengetopt-[0-9]*:../../devel/gengetopt
+TOOL_DEPENDS+= gengetopt-[0-9]*:../../devel/gengetopt
USE_CMAKE= yes
USE_TOOLS+= yacc
Home |
Main Index |
Thread Index |
Old Index