@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2023/07/01 08:37:45 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2023/07/01 14:19:45 nia Exp $
 
 DISTNAME=	bulk-large-20211103
 CATEGORIES=	meta-pkgs
@@ -31,105 +31,105 @@
 #
 # 1. Packages used by a lot of other packages
 #
-TOOL_DEPENDS+=	taglib-[0-9]*:../../audio/taglib
-TOOL_DEPENDS+=	gmp-[0-9]*:../../devel/gmp
-TOOL_DEPENDS+=	heirloom-libcommon-[0-9]*:../../devel/heirloom-libcommon
-TOOL_DEPENDS+=	libgetopt-[0-9]*:../../devel/libgetopt
-TOOL_DEPENDS+=	ocaml-[0-9]*:../../lang/ocaml
-TOOL_DEPENDS+=	gst-plugins1-base-[0-9]*:../../multimedia/gst-plugins1-base
-TOOL_DEPENDS+=	gstreamer1-[0-9]*:../../multimedia/gstreamer1
-TOOL_DEPENDS+=	libsoup-[0-9]*:../../net/libsoup
-TOOL_DEPENDS+=	dbus-[0-9]*:../../sysutils/dbus
-TOOL_DEPENDS+=	dbus-glib-[0-9]*:../../sysutils/dbus-glib
-TOOL_DEPENDS+=	aspell-[0-9]*:../../textproc/aspell
-TOOL_DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-TOOL_DEPENDS+=	qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
-TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
+DEPENDS+=	taglib-[0-9]*:../../audio/taglib
+DEPENDS+=	gmp-[0-9]*:../../devel/gmp
+DEPENDS+=	heirloom-libcommon-[0-9]*:../../devel/heirloom-libcommon
+DEPENDS+=	libgetopt-[0-9]*:../../devel/libgetopt
+DEPENDS+=	ocaml-[0-9]*:../../lang/ocaml
+DEPENDS+=	gst-plugins1-base-[0-9]*:../../multimedia/gst-plugins1-base
+DEPENDS+=	gstreamer1-[0-9]*:../../multimedia/gstreamer1
+DEPENDS+=	libsoup-[0-9]*:../../net/libsoup
+DEPENDS+=	dbus-[0-9]*:../../sysutils/dbus
+DEPENDS+=	dbus-glib-[0-9]*:../../sysutils/dbus-glib
+DEPENDS+=	aspell-[0-9]*:../../textproc/aspell
+DEPENDS+=	${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
+DEPENDS+=	qt5-qtbase-[0-9]*:../../x11/qt5-qtbase
+DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
 #
 # 2. Applications
 #
-TOOL_DEPENDS+=	quassel-[0-9]*:../../chat/quassel
-TOOL_DEPENDS+=	asterisk>=16:../../comms/asterisk16
-TOOL_DEPENDS+=	avr-gcc-[0-9]*:../../cross/avr-gcc
-TOOL_DEPENDS+=	avr-libc-[0-9]*:../../cross/avr-libc
-TOOL_DEPENDS+=	avr-gdb-[0-9]*:../../cross/avr-gdb
-TOOL_DEPENDS+=	mariadb-server>=10.5<10.6:../../databases/mariadb105-server
-TOOL_DEPENDS+=	mariadb-server>=10.6<10.7:../../databases/mariadb106-server
-TOOL_DEPENDS+=	postgresql13-[0-9]*:../../databases/postgresql13
-TOOL_DEPENDS+=	abiword-[0-9]*:../../editors/abiword
-TOOL_DEPENDS+=	emacs26>=26<27:../../editors/emacs26
-TOOL_DEPENDS+=	emacs-packages-[0-9]*:../../editors/emacs-packages
-TOOL_DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
-TOOL_DEPENDS+=	p5-Padre-[0-9]*:../../editors/p5-Padre
-TOOL_DEPENDS+=	glusterfs-[0-9]*:../../filesystems/glusterfs
-TOOL_DEPENDS+=	tahoe-lafs-[0-9]*:../../filesystems/tahoe-lafs
-TOOL_DEPENDS+=	blender-[0-9]*:../../graphics/blender
-TOOL_DEPENDS+=	gimp-[0-9]*:../../graphics/gimp
-TOOL_DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
-TOOL_DEPENDS+=	claws-mail-[0-9]*:../../mail/claws-mail
-TOOL_DEPENDS+=	evolution-[0-9]*:../../mail/evolution
-TOOL_DEPENDS+=	${PHP_PKG_PREFIX}-roundcube-[0-9]*:../../mail/roundcube
-TOOL_DEPENDS+=	squirrelmail-[0-9]*:../../mail/squirrelmail
-TOOL_DEPENDS+=	thunderbird-[0-9]*:../../mail/thunderbird
-TOOL_DEPENDS+=	thunderbird-l10n-[0-9]*:../../mail/thunderbird-l10n
-TOOL_DEPENDS+=	R-[0-9]*:../../math/R
-TOOL_DEPENDS+=	octave-[0-9]*:../../math/octave
-TOOL_DEPENDS+=	zyGrib-[0-9]*:../../misc/zyGrib
-TOOL_DEPENDS+=	mpv-[0-9]*:../../multimedia/mpv
-TOOL_DEPENDS+=	cups-[0-9]*:../../print/cups
-TOOL_DEPENDS+=	atril-[0-9]*:../../print/atril
-TOOL_DEPENDS+=	lilypond-[0-9]*:../../print/lilypond
-TOOL_DEPENDS+=	mit-krb5-appl-[0-9]*:../../security/mit-krb5-appl
-TOOL_DEPENDS+=	FlightCrew-[0-9]*:../../textproc/FlightCrew
-TOOL_DEPENDS+=	clearsilver-[0-9]*:../../www/clearsilver
-TOOL_DEPENDS+=	mediawiki-[0-9]*:../../www/mediawiki
-TOOL_DEPENDS+=	${RUBY_PKGPREFIX}-rails52>=5.2.4.5:../../www/ruby-rails52
-TOOL_DEPENDS+=	${RUBY_PKGPREFIX}-rails60>=6.0.3.5:../../www/ruby-rails60
-TOOL_DEPENDS+=	${RUBY_PKGPREFIX}-rails61>=6.1.3:../../www/ruby-rails61
+DEPENDS+=	quassel-[0-9]*:../../chat/quassel
+DEPENDS+=	asterisk>=16:../../comms/asterisk16
+DEPENDS+=	avr-gcc-[0-9]*:../../cross/avr-gcc
+DEPENDS+=	avr-libc-[0-9]*:../../cross/avr-libc
+DEPENDS+=	avr-gdb-[0-9]*:../../cross/avr-gdb
+DEPENDS+=	mariadb-server>=10.5<10.6:../../databases/mariadb105-server
+DEPENDS+=	mariadb-server>=10.6<10.7:../../databases/mariadb106-server
+DEPENDS+=	postgresql13-[0-9]*:../../databases/postgresql13
+DEPENDS+=	abiword-[0-9]*:../../editors/abiword
+DEPENDS+=	emacs26>=26<27:../../editors/emacs26
+DEPENDS+=	emacs-packages-[0-9]*:../../editors/emacs-packages
+DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
+DEPENDS+=	p5-Padre-[0-9]*:../../editors/p5-Padre
+DEPENDS+=	glusterfs-[0-9]*:../../filesystems/glusterfs
+DEPENDS+=	tahoe-lafs-[0-9]*:../../filesystems/tahoe-lafs
+DEPENDS+=	blender-[0-9]*:../../graphics/blender
+DEPENDS+=	gimp-[0-9]*:../../graphics/gimp
+DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
+DEPENDS+=	claws-mail-[0-9]*:../../mail/claws-mail
+DEPENDS+=	evolution-[0-9]*:../../mail/evolution
+DEPENDS+=	${PHP_PKG_PREFIX}-roundcube-[0-9]*:../../mail/roundcube
+DEPENDS+=	squirrelmail-[0-9]*:../../mail/squirrelmail
+DEPENDS+=	thunderbird-[0-9]*:../../mail/thunderbird
+DEPENDS+=	thunderbird-l10n-[0-9]*:../../mail/thunderbird-l10n
+DEPENDS+=	R-[0-9]*:../../math/R
+DEPENDS+=	octave-[0-9]*:../../math/octave
+DEPENDS+=	zyGrib-[0-9]*:../../misc/zyGrib
+DEPENDS+=	mpv-[0-9]*:../../multimedia/mpv
+DEPENDS+=	cups-[0-9]*:../../print/cups
+DEPENDS+=	atril-[0-9]*:../../print/atril
+DEPENDS+=	lilypond-[0-9]*:../../print/lilypond
+DEPENDS+=	mit-krb5-appl-[0-9]*:../../security/mit-krb5-appl
+DEPENDS+=	FlightCrew-[0-9]*:../../textproc/FlightCrew
+DEPENDS+=	clearsilver-[0-9]*:../../www/clearsilver
+DEPENDS+=	mediawiki-[0-9]*:../../www/mediawiki
+DEPENDS+=	${RUBY_PKGPREFIX}-rails52>=5.2.4.5:../../www/ruby-rails52
+DEPENDS+=	${RUBY_PKGPREFIX}-rails60>=6.0.3.5:../../www/ruby-rails60
+DEPENDS+=	${RUBY_PKGPREFIX}-rails61>=6.1.3:../../www/ruby-rails61
 
 #
 # 3. Libraries
 #
-TOOL_DEPENDS+=	db5-[0-9]*:../../databases/db5
-TOOL_DEPENDS+=	heimdal-[0-9]*:../../security/heimdal
-TOOL_DEPENDS+=	mit-krb5-[0-9]*:../../security/mit-krb5
+DEPENDS+=	db5-[0-9]*:../../databases/db5
+DEPENDS+=	heimdal-[0-9]*:../../security/heimdal
+DEPENDS+=	mit-krb5-[0-9]*:../../security/mit-krb5
 
 #
 # 4. TeX
 #
-TOOL_DEPENDS+=	texlive-collection-fontsrecommended-[0-9]*:../../meta-pkgs/texlive-collection-fontsrecommended
-TOOL_DEPENDS+=	texlive-collection-fontsrecommended-doc-[0-9]*:../../meta-pkgs/texlive-collection-fontsrecommended-doc
-TOOL_DEPENDS+=	texlive-collection-basic-[0-9]*:../../meta-pkgs/texlive-collection-basic
-TOOL_DEPENDS+=	texlive-collection-basic-doc-[0-9]*:../../meta-pkgs/texlive-collection-basic-doc
-TOOL_DEPENDS+=	texlive-collection-plaingeneric-[0-9]*:../../meta-pkgs/texlive-collection-plaingeneric
-TOOL_DEPENDS+=	texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
-TOOL_DEPENDS+=	texlive-collection-latex-doc-[0-9]*:../../meta-pkgs/texlive-collection-latex-doc
+DEPENDS+=	texlive-collection-fontsrecommended-[0-9]*:../../meta-pkgs/texlive-collection-fontsrecommended
+DEPENDS+=	texlive-collection-fontsrecommended-doc-[0-9]*:../../meta-pkgs/texlive-collection-fontsrecommended-doc
+DEPENDS+=	texlive-collection-basic-[0-9]*:../../meta-pkgs/texlive-collection-basic
+DEPENDS+=	texlive-collection-basic-doc-[0-9]*:../../meta-pkgs/texlive-collection-basic-doc
+DEPENDS+=	texlive-collection-plaingeneric-[0-9]*:../../meta-pkgs/texlive-collection-plaingeneric
+DEPENDS+=	texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
+DEPENDS+=	texlive-collection-latex-doc-[0-9]*:../../meta-pkgs/texlive-collection-latex-doc
 
 #
 # 5. Desktops
 #
-TOOL_DEPENDS+=	deforaos-desktop-[0-9]*:../../meta-pkgs/deforaos-desktop
-TOOL_DEPENDS+=	gnustep-[0-9]*:../../meta-pkgs/gnustep
-TOOL_DEPENDS+=	mate-[0-9]*:../../meta-pkgs/mate
-TOOL_DEPENDS+=	windowmaker-desktop-[0-9]*:../../meta-pkgs/windowmaker-desktop
-TOOL_DEPENDS+=	xfce4-[0-9]*:../../meta-pkgs/xfce4
-TOOL_DEPENDS+=	xfce4-extras-[0-9]*:../../meta-pkgs/xfce4-extras
-TOOL_DEPENDS+=	xview-[0-9]*:../../x11/xview
+DEPENDS+=	deforaos-desktop-[0-9]*:../../meta-pkgs/deforaos-desktop
+DEPENDS+=	gnustep-[0-9]*:../../meta-pkgs/gnustep
+DEPENDS+=	mate-[0-9]*:../../meta-pkgs/mate
+DEPENDS+=	windowmaker-desktop-[0-9]*:../../meta-pkgs/windowmaker-desktop
+DEPENDS+=	xfce4-[0-9]*:../../meta-pkgs/xfce4
+DEPENDS+=	xfce4-extras-[0-9]*:../../meta-pkgs/xfce4-extras
+DEPENDS+=	xview-[0-9]*:../../x11/xview
 
 #
 # 6. NetBSD/pkgsrc developer tools
 #
-TOOL_DEPENDS+=	netbsd-doc-[0-9]*:../../meta-pkgs/netbsd-doc
-TOOL_DEPENDS+=	netbsd-doc-print-[0-9]*:../../meta-pkgs/netbsd-doc-print
-TOOL_DEPENDS+=	netbsd-www-[0-9]*:../../meta-pkgs/netbsd-www
-TOOL_DEPENDS+=	pkg_developer-[0-9]*:../../meta-pkgs/pkg_developer
-TOOL_DEPENDS+=	pkgsrc-guide-tools-[0-9]*:../../meta-pkgs/pkgsrc-guide-tools
+DEPENDS+=	netbsd-doc-[0-9]*:../../meta-pkgs/netbsd-doc
+DEPENDS+=	netbsd-doc-print-[0-9]*:../../meta-pkgs/netbsd-doc-print
+DEPENDS+=	netbsd-www-[0-9]*:../../meta-pkgs/netbsd-www
+DEPENDS+=	pkg_developer-[0-9]*:../../meta-pkgs/pkg_developer
+DEPENDS+=	pkgsrc-guide-tools-[0-9]*:../../meta-pkgs/pkgsrc-guide-tools
 
 #
 # 7. Complete X.org
 #
-TOOL_DEPENDS+=	modular-xorg-[0-9]*:../../meta-pkgs/modular-xorg
+DEPENDS+=	modular-xorg-[0-9]*:../../meta-pkgs/modular-xorg
 
 
 #
@@ -140,8 +140,8 @@
 #
 
 # We are supposed to be a superset of bulk-medium and bulk-small.
-TOOL_DEPENDS+=	bulk-medium-[0-9]*:../../meta-pkgs/bulk-medium
-TOOL_DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
+DEPENDS+=	bulk-medium-[0-9]*:../../meta-pkgs/bulk-medium
+DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
 
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	27 37 38

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2023/07/01 08:35:09 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2023/07/01 14:19:45 nia Exp $
 
 DISTNAME=	bulk-medium-20230701
 CATEGORIES=	meta-pkgs
@@ -43,170 +43,170 @@
 #
 # 1. Applications
 #
-TOOL_DEPENDS+=	cdparanoia-[0-9]*:../../audio/cdparanoia
-TOOL_DEPENDS+=	flac-[0-9]*:../../audio/flac
-TOOL_DEPENDS+=	flac123-[0-9]*:../../audio/flac123
-TOOL_DEPENDS+=	lame-[0-9]*:../../audio/lame
-TOOL_DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
-TOOL_DEPENDS+=	sox-[0-9]*:../../audio/sox
-TOOL_DEPENDS+=	vorbis-tools-[0-9]*:../../audio/vorbis-tools
-TOOL_DEPENDS+=	jabberd>=2:../../chat/jabberd2
-TOOL_DEPENDS+=	sirc-[0-9]*:../../chat/sirc
-TOOL_DEPENDS+=	hexchat-[0-9]*:../../chat/hexchat
-TOOL_DEPENDS+=	fribidi-[0-9]*:../../converters/fribidi
-TOOL_DEPENDS+=	mariadb-client>=10.5<10.6:../../databases/mariadb105-client
-TOOL_DEPENDS+=	mariadb-client>=10.6<10.7:../../databases/mariadb106-client
-TOOL_DEPENDS+=	openldap-client-[0-9]*:../../databases/openldap-client
-TOOL_DEPENDS+=	git-[0-9]*:../../devel/git
-TOOL_DEPENDS+=	git-base-[0-9]*:../../devel/git-base
-TOOL_DEPENDS+=	git-docs-[0-9]*:../../devel/git-docs
-TOOL_DEPENDS+=	mercurial-[0-9]*:../../devel/mercurial
-TOOL_DEPENDS+=	emacs25>=25<26:../../editors/emacs25
-TOOL_DEPENDS+=	emacs-packages-[0-9]*:../../editors/emacs-packages
-TOOL_DEPENDS+=	nvi-[0-9]*:../../editors/nvi
-TOOL_DEPENDS+=	vim-gtk3-[0-9]*:../../editors/vim-gtk3
-TOOL_DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
-TOOL_DEPENDS+=	qemu-[0-9]*:../../emulators/qemu
-TOOL_DEPENDS+=	simh-[0-9]*:../../emulators/simh
-TOOL_DEPENDS+=	tme-[0-9]*:../../emulators/tme
-TOOL_DEPENDS+=	wine-[0-9]*:../../emulators/wine
-TOOL_DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
-TOOL_DEPENDS+=	gnuplot-[0-9]*:../../graphics/gnuplot
-TOOL_DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
-TOOL_DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
-TOOL_DEPENDS+=	gawk-[0-9]*:../../lang/gawk
-TOOL_DEPENDS+=	php>=7.4<7.5:../../lang/php74
-TOOL_DEPENDS+=	php>=8.0<8.1:../../lang/php80
-TOOL_DEPENDS+=	php>=8.1<8.2:../../lang/php81
-TOOL_DEPENDS+=	php>=8.2<8.3:../../lang/php82
-TOOL_DEPENDS+=	ruby30-base-[0-9]*:../../lang/ruby30-base
-TOOL_DEPENDS+=	ruby31-base-[0-9]*:../../lang/ruby31-base
-TOOL_DEPENDS+=	ruby32-base-[0-9]*:../../lang/ruby32-base
-TOOL_DEPENDS+=	openjdk8-[0-9]*:../../lang/openjdk8
-TOOL_DEPENDS+=	openjdk11-[0-9]*:../../lang/openjdk11
-TOOL_DEPENDS+=	python310-[0-9]*:../../lang/python310
-TOOL_DEPENDS+=	tcl-[0-9]*:../../lang/tcl
-TOOL_DEPENDS+=	fetchmail-[0-9]*:../../mail/fetchmail
-TOOL_DEPENDS+=	imap-uw-[0-9]*:../../mail/imap-uw
-TOOL_DEPENDS+=	mailman-[0-9]*:../../mail/mailman
-TOOL_DEPENDS+=	mhonarc-[0-9]*:../../mail/mhonarc
-TOOL_DEPENDS+=	mutt-[0-9]*:../../mail/mutt
-TOOL_DEPENDS+=	alpine-[0-9]*:../../mail/alpine
-TOOL_DEPENDS+=	spamassassin-[0-9]*:../../mail/spamassassin
-TOOL_DEPENDS+=	bind>=9.16<9.17:../../net/bind916
-TOOL_DEPENDS+=	clive-[0-9]*:../../net/clive
-TOOL_DEPENDS+=	nmap-[0-9]*:../../net/nmap
-TOOL_DEPENDS+=	samba>=4.2:../../net/samba4
-TOOL_DEPENDS+=	wpa_supplicant-[0-9]*:../../net/wpa_supplicant
-TOOL_DEPENDS+=	xymon-[0-9]*:../../net/xymon
-TOOL_DEPENDS+=	xymonclient-[0-9]*:../../net/xymonclient
-TOOL_DEPENDS+=	youtube-dl-[0-9]*:../../net/youtube-dl
-TOOL_DEPENDS+=	lintpkgsrc-[0-9]*:../../pkgtools/lintpkgsrc
-TOOL_DEPENDS+=	pkglint-[0-9]*:../../pkgtools/pkglint
-TOOL_DEPENDS+=	ghostscript-agpl-[0-9]*:../../print/ghostscript-agpl
-TOOL_DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
-TOOL_DEPENDS+=	xpdf-[0-9]*:../../print/xpdf
-TOOL_DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
-TOOL_DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
-TOOL_DEPENDS+=	desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
-TOOL_DEPENDS+=	xe-guest-utilities-[0-9]*:../../sysutils/xe-guest-utilities
-TOOL_DEPENDS+=	xenkernel413-[0-9]*:../../sysutils/xenkernel413
-TOOL_DEPENDS+=	xentools413-[0-9]*:../../sysutils/xentools413
-TOOL_DEPENDS+=	ispell-[0-9]*:../../textproc/ispell
-TOOL_DEPENDS+=	seamonkey-[0-9]*:../../www/seamonkey
-TOOL_DEPENDS+=	xlockmore-[0-9]*:../../x11/xlockmore
+DEPENDS+=	cdparanoia-[0-9]*:../../audio/cdparanoia
+DEPENDS+=	flac-[0-9]*:../../audio/flac
+DEPENDS+=	flac123-[0-9]*:../../audio/flac123
+DEPENDS+=	lame-[0-9]*:../../audio/lame
+DEPENDS+=	mpg123-[0-9]*:../../audio/mpg123
+DEPENDS+=	sox-[0-9]*:../../audio/sox
+DEPENDS+=	vorbis-tools-[0-9]*:../../audio/vorbis-tools
+DEPENDS+=	jabberd>=2:../../chat/jabberd2
+DEPENDS+=	sirc-[0-9]*:../../chat/sirc
+DEPENDS+=	hexchat-[0-9]*:../../chat/hexchat
+DEPENDS+=	fribidi-[0-9]*:../../converters/fribidi
+DEPENDS+=	mariadb-client>=10.5<10.6:../../databases/mariadb105-client
+DEPENDS+=	mariadb-client>=10.6<10.7:../../databases/mariadb106-client
+DEPENDS+=	openldap-client-[0-9]*:../../databases/openldap-client
+DEPENDS+=	git-[0-9]*:../../devel/git
+DEPENDS+=	git-base-[0-9]*:../../devel/git-base
+DEPENDS+=	git-docs-[0-9]*:../../devel/git-docs
+DEPENDS+=	mercurial-[0-9]*:../../devel/mercurial
+DEPENDS+=	emacs25>=25<26:../../editors/emacs25
+DEPENDS+=	emacs-packages-[0-9]*:../../editors/emacs-packages
+DEPENDS+=	nvi-[0-9]*:../../editors/nvi
+DEPENDS+=	vim-gtk3-[0-9]*:../../editors/vim-gtk3
+DEPENDS+=	xemacs-packages-[0-9]*:../../editors/xemacs-packages
+DEPENDS+=	qemu-[0-9]*:../../emulators/qemu
+DEPENDS+=	simh-[0-9]*:../../emulators/simh
+DEPENDS+=	tme-[0-9]*:../../emulators/tme
+DEPENDS+=	wine-[0-9]*:../../emulators/wine
+DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+=	gnuplot-[0-9]*:../../graphics/gnuplot
+DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	gawk-[0-9]*:../../lang/gawk
+DEPENDS+=	php>=7.4<7.5:../../lang/php74
+DEPENDS+=	php>=8.0<8.1:../../lang/php80
+DEPENDS+=	php>=8.1<8.2:../../lang/php81
+DEPENDS+=	php>=8.2<8.3:../../lang/php82
+DEPENDS+=	ruby30-base-[0-9]*:../../lang/ruby30-base
+DEPENDS+=	ruby31-base-[0-9]*:../../lang/ruby31-base
+DEPENDS+=	ruby32-base-[0-9]*:../../lang/ruby32-base
+DEPENDS+=	openjdk8-[0-9]*:../../lang/openjdk8
+DEPENDS+=	openjdk11-[0-9]*:../../lang/openjdk11
+DEPENDS+=	python310-[0-9]*:../../lang/python310
+DEPENDS+=	tcl-[0-9]*:../../lang/tcl
+DEPENDS+=	fetchmail-[0-9]*:../../mail/fetchmail
+DEPENDS+=	imap-uw-[0-9]*:../../mail/imap-uw
+DEPENDS+=	mailman-[0-9]*:../../mail/mailman
+DEPENDS+=	mhonarc-[0-9]*:../../mail/mhonarc
+DEPENDS+=	mutt-[0-9]*:../../mail/mutt
+DEPENDS+=	alpine-[0-9]*:../../mail/alpine
+DEPENDS+=	spamassassin-[0-9]*:../../mail/spamassassin
+DEPENDS+=	bind>=9.16<9.17:../../net/bind916
+DEPENDS+=	clive-[0-9]*:../../net/clive
+DEPENDS+=	nmap-[0-9]*:../../net/nmap
+DEPENDS+=	samba>=4.2:../../net/samba4
+DEPENDS+=	wpa_supplicant-[0-9]*:../../net/wpa_supplicant
+DEPENDS+=	xymon-[0-9]*:../../net/xymon
+DEPENDS+=	xymonclient-[0-9]*:../../net/xymonclient
+DEPENDS+=	youtube-dl-[0-9]*:../../net/youtube-dl
+DEPENDS+=	lintpkgsrc-[0-9]*:../../pkgtools/lintpkgsrc
+DEPENDS+=	pkglint-[0-9]*:../../pkgtools/pkglint
+DEPENDS+=	ghostscript-agpl-[0-9]*:../../print/ghostscript-agpl
+DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
+DEPENDS+=	xpdf-[0-9]*:../../print/xpdf
+DEPENDS+=	gnupg-[0-9]*:../../security/gnupg
+DEPENDS+=	gnupg2-[0-9]*:../../security/gnupg2
+DEPENDS+=	desktop-file-utils-[0-9]*:../../sysutils/desktop-file-utils
+DEPENDS+=	xe-guest-utilities-[0-9]*:../../sysutils/xe-guest-utilities
+DEPENDS+=	xenkernel413-[0-9]*:../../sysutils/xenkernel413
+DEPENDS+=	xentools413-[0-9]*:../../sysutils/xentools413
+DEPENDS+=	ispell-[0-9]*:../../textproc/ispell
+DEPENDS+=	seamonkey-[0-9]*:../../www/seamonkey
+DEPENDS+=	xlockmore-[0-9]*:../../x11/xlockmore
 
 #
 # 2. Archivers and build tools
 #
-TOOL_DEPENDS+=	pigz-[0-9]*:../../archivers/pigz
-TOOL_DEPENDS+=	cmake-[0-9]*:../../devel/cmake
-TOOL_DEPENDS+=	imake-[0-9]*:../../devel/imake
-TOOL_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
-TOOL_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
-TOOL_DEPENDS+=	icon-naming-utils-[0-9]*:../../graphics/icon-naming-utils
+DEPENDS+=	pigz-[0-9]*:../../archivers/pigz
+DEPENDS+=	cmake-[0-9]*:../../devel/cmake
+DEPENDS+=	imake-[0-9]*:../../devel/imake
+DEPENDS+=	nasm-[0-9]*:../../devel/nasm
+DEPENDS+=	yasm-[0-9]*:../../devel/yasm
+DEPENDS+=	icon-naming-utils-[0-9]*:../../graphics/icon-naming-utils
 
 #
 # 3. Commonly used libraries
 #
-TOOL_DEPENDS+=	SDL2_mixer-[0-9]*:../../audio/SDL2_mixer
-TOOL_DEPENDS+=	opusfile-[0-9]*:../../audio/opusfile
-TOOL_DEPENDS+=	libvorbis-[0-9]*:../../audio/libvorbis
-TOOL_DEPENDS+=	gdbm-[0-9]*:../../databases/gdbm
-TOOL_DEPENDS+=	p5-BDB-[0-9]*:../../databases/p5-BDB
-TOOL_DEPENDS+=	p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
-TOOL_DEPENDS+=	p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
-TOOL_DEPENDS+=	p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
-TOOL_DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
-TOOL_DEPENDS+=	${PYPKGPREFIX}-bsddb3-[0-9]*:../../databases/py-bsddb3
-TOOL_DEPENDS+=	${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm
-TOOL_DEPENDS+=	${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql
-TOOL_DEPENDS+=	${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
-TOOL_DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
-TOOL_DEPENDS+=	SDL2-[0-9]*:../../devel/SDL2
-TOOL_DEPENDS+=	atk-[0-9]*:../../devel/atk
-TOOL_DEPENDS+=	boehm-gc-[0-9]*:../../devel/boehm-gc
-TOOL_DEPENDS+=	glib2-[0-9]*:../../devel/glib2
-TOOL_DEPENDS+=	libelf-[0-9]*:../../devel/libelf
-TOOL_DEPENDS+=	libf2c-[0-9]*:../../devel/libf2c
-TOOL_DEPENDS+=	libidn2-[0-9]*:../../devel/libidn2
-TOOL_DEPENDS+=	libltdl-[0-9]*:../../devel/libltdl
-TOOL_DEPENDS+=	libusb1-[0-9]*:../../devel/libusb1
-TOOL_DEPENDS+=	ncurses-[0-9]*:../../devel/ncurses
-TOOL_DEPENDS+=	ncursesw-[0-9]*:../../devel/ncursesw
-TOOL_DEPENDS+=	pango-[0-9]*:../../devel/pango
-TOOL_DEPENDS+=	pcre-[0-9]*:../../devel/pcre
-TOOL_DEPENDS+=	popt-[0-9]*:../../devel/popt
-TOOL_DEPENDS+=	fuse-[0-9]*:../../filesystems/fuse
-TOOL_DEPENDS+=	perfuse-[0-9]*:../../filesystems/perfuse
-TOOL_DEPENDS+=	SDL2_image-[0-9]*:../../graphics/SDL2_image
-TOOL_DEPENDS+=	cairo-[0-9]*:../../graphics/cairo
-TOOL_DEPENDS+=	gdk-pixbuf2-[0-9]*:../../graphics/gdk-pixbuf2
-TOOL_DEPENDS+=	glew-[0-9]*:../../graphics/glew
-TOOL_DEPENDS+=	openjpeg-[0-9]*:../../graphics/openjpeg
-TOOL_DEPENDS+=	lcms-[0-9]*:../../graphics/lcms
-TOOL_DEPENDS+=	lcms2-[0-9]*:../../graphics/lcms2
+DEPENDS+=	SDL2_mixer-[0-9]*:../../audio/SDL2_mixer
+DEPENDS+=	opusfile-[0-9]*:../../audio/opusfile
+DEPENDS+=	libvorbis-[0-9]*:../../audio/libvorbis
+DEPENDS+=	gdbm-[0-9]*:../../databases/gdbm
+DEPENDS+=	p5-BDB-[0-9]*:../../databases/p5-BDB
+DEPENDS+=	p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
+DEPENDS+=	p5-DBD-mysql-[0-9]*:../../databases/p5-DBD-mysql
+DEPENDS+=	p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
+DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
+DEPENDS+=	${PYPKGPREFIX}-bsddb3-[0-9]*:../../databases/py-bsddb3
+DEPENDS+=	${PYPKGPREFIX}-gdbm-[0-9]*:../../databases/py-gdbm
+DEPENDS+=	${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql
+DEPENDS+=	${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	SDL2-[0-9]*:../../devel/SDL2
+DEPENDS+=	atk-[0-9]*:../../devel/atk
+DEPENDS+=	boehm-gc-[0-9]*:../../devel/boehm-gc
+DEPENDS+=	glib2-[0-9]*:../../devel/glib2
+DEPENDS+=	libelf-[0-9]*:../../devel/libelf
+DEPENDS+=	libf2c-[0-9]*:../../devel/libf2c
+DEPENDS+=	libidn2-[0-9]*:../../devel/libidn2
+DEPENDS+=	libltdl-[0-9]*:../../devel/libltdl
+DEPENDS+=	libusb1-[0-9]*:../../devel/libusb1
+DEPENDS+=	ncurses-[0-9]*:../../devel/ncurses
+DEPENDS+=	ncursesw-[0-9]*:../../devel/ncursesw
+DEPENDS+=	pango-[0-9]*:../../devel/pango
+DEPENDS+=	pcre-[0-9]*:../../devel/pcre
+DEPENDS+=	popt-[0-9]*:../../devel/popt
+DEPENDS+=	fuse-[0-9]*:../../filesystems/fuse
+DEPENDS+=	perfuse-[0-9]*:../../filesystems/perfuse
+DEPENDS+=	SDL2_image-[0-9]*:../../graphics/SDL2_image
+DEPENDS+=	cairo-[0-9]*:../../graphics/cairo
+DEPENDS+=	gdk-pixbuf2-[0-9]*:../../graphics/gdk-pixbuf2
+DEPENDS+=	glew-[0-9]*:../../graphics/glew
+DEPENDS+=	openjpeg-[0-9]*:../../graphics/openjpeg
+DEPENDS+=	lcms-[0-9]*:../../graphics/lcms
+DEPENDS+=	lcms2-[0-9]*:../../graphics/lcms2
 .include "../../graphics/librsvg/available.mk"
 .if ${LIBRSVG_TYPE} == "rust"
-TOOL_DEPENDS+=	librsvg-[0-9]*:../../graphics/librsvg
+DEPENDS+=	librsvg-[0-9]*:../../graphics/librsvg
 .else
-TOOL_DEPENDS+=	librsvg-[0-9]*:../../graphics/librsvg-c
+DEPENDS+=	librsvg-[0-9]*:../../graphics/librsvg-c
 .endif
-TOOL_DEPENDS+=	blas-[0-9]*:../../math/blas
-TOOL_DEPENDS+=	lapack-[0-9]*:../../math/lapack
-TOOL_DEPENDS+=	boost-[0-9]*:../../meta-pkgs/boost
-TOOL_DEPENDS+=	ffmpeg4-[0-9]*:../../multimedia/ffmpeg4
-TOOL_DEPENDS+=	libogg-[0-9]*:../../multimedia/libogg
-TOOL_DEPENDS+=	libpcap-[0-9]*:../../net/libpcap
-TOOL_DEPENDS+=	libsoup-[0-9]*:../../net/libsoup
-TOOL_DEPENDS+=	poppler-[0-9]*:../../print/poppler
-TOOL_DEPENDS+=	poppler-includes-[0-9]*:../../print/poppler-includes
-TOOL_DEPENDS+=	cyrus-sasl-[0-9]*:../../security/cyrus-sasl
-TOOL_DEPENDS+=	openssl-[0-9]*:../../security/openssl
-TOOL_DEPENDS+=	tcp_wrappers-[0-9]*:../../security/tcp_wrappers
-TOOL_DEPENDS+=	libnotify-[0-9]*:../../sysutils/libnotify
-TOOL_DEPENDS+=	gtk3+-[0-9]*:../../x11/gtk3
-TOOL_DEPENDS+=	motif-[0-9]*:../../x11/motif
-TOOL_DEPENDS+=	tk-[0-9]*:../../x11/tk
+DEPENDS+=	blas-[0-9]*:../../math/blas
+DEPENDS+=	lapack-[0-9]*:../../math/lapack
+DEPENDS+=	boost-[0-9]*:../../meta-pkgs/boost
+DEPENDS+=	ffmpeg4-[0-9]*:../../multimedia/ffmpeg4
+DEPENDS+=	libogg-[0-9]*:../../multimedia/libogg
+DEPENDS+=	libpcap-[0-9]*:../../net/libpcap
+DEPENDS+=	libsoup-[0-9]*:../../net/libsoup
+DEPENDS+=	poppler-[0-9]*:../../print/poppler
+DEPENDS+=	poppler-includes-[0-9]*:../../print/poppler-includes
+DEPENDS+=	cyrus-sasl-[0-9]*:../../security/cyrus-sasl
+DEPENDS+=	openssl-[0-9]*:../../security/openssl
+DEPENDS+=	tcp_wrappers-[0-9]*:../../security/tcp_wrappers
+DEPENDS+=	libnotify-[0-9]*:../../sysutils/libnotify
+DEPENDS+=	gtk3+-[0-9]*:../../x11/gtk3
+DEPENDS+=	motif-[0-9]*:../../x11/motif
+DEPENDS+=	tk-[0-9]*:../../x11/tk
 
 #
 # 4. Linux compat packages
 #
-TOOL_DEPENDS+=	suse>=13.1:../../meta-pkgs/suse131
+DEPENDS+=	suse>=13.1:../../meta-pkgs/suse131
 
 #
 # 5. Desktop infrastructure and support services
 #
-TOOL_DEPENDS+=	eawpatches-[0-9]*:../../audio/eawpatches
-TOOL_DEPENDS+=	mpg123-pulse-[0-9]*:../../audio/mpg123-pulse
-TOOL_DEPENDS+=	pulseaudio-[0-9]*:../../audio/pulseaudio
-TOOL_DEPENDS+=	shared-mime-info-[0-9]*:../../databases/shared-mime-info
-TOOL_DEPENDS+=	hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
+DEPENDS+=	eawpatches-[0-9]*:../../audio/eawpatches
+DEPENDS+=	mpg123-pulse-[0-9]*:../../audio/mpg123-pulse
+DEPENDS+=	pulseaudio-[0-9]*:../../audio/pulseaudio
+DEPENDS+=	shared-mime-info-[0-9]*:../../databases/shared-mime-info
+DEPENDS+=	hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
 
 #
 # 6. Other very small packages
 #
-TOOL_DEPENDS+=	${LUA_PKGPREFIX}-stdlib-[0-9]*:../../devel/lua-stdlib
+DEPENDS+=	${LUA_PKGPREFIX}-stdlib-[0-9]*:../../devel/lua-stdlib
 
 #
 # Note that (unlike in bulk-small) we make no effort to list or track
@@ -216,7 +216,7 @@
 #
 
 # We are supposed to be a superset of bulk-small.
-TOOL_DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
+DEPENDS+=	bulk-small-[0-9]*:../../meta-pkgs/bulk-small
 
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	27 37 38

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2023/06/13 18:24:45 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2023/07/01 14:19:45 nia Exp $
 
 DISTNAME=	bulk-small-20230601
 CATEGORIES=	meta-pkgs
@@ -36,7 +36,7 @@
 
 #
 # XXX: A few of these packages are commonly built in. The simple
-# TOOL_DEPENDS logic here will cause more or less useless packages to be
+# DEPENDS logic here will cause more or less useless packages to be
 # built anyway and then not used, which is a waste of build cycles. It
 # would be good to figure out a way to fix this so these packages only
 # get built when they aren't builtin.
@@ -54,93 +54,93 @@
 # newer, as those versions of emacs take longer to build than this
 # entire package's time budget.
 #
-TOOL_DEPENDS+=	ircII-[0-9]*:../../chat/ircII
-TOOL_DEPENDS+=	irssi-[0-9]*:../../chat/irssi
-TOOL_DEPENDS+=	irssi-icb-[0-9]*:../../chat/irssi-icb
-TOOL_DEPENDS+=	weechat-[0-9]*:../../chat/weechat
-TOOL_DEPENDS+=	base64-[0-9]*:../../converters/base64
-TOOL_DEPENDS+=	mpack-[0-9]*:../../converters/mpack
-TOOL_DEPENDS+=	emacs21>=21<22:../../editors/emacs21
-TOOL_DEPENDS+=	nano-[0-9]*:../../editors/nano
-TOOL_DEPENDS+=	vim-[0-9]*:../../editors/vim
-TOOL_DEPENDS+=	vim-share-[0-9]*:../../editors/vim-share
-TOOL_DEPENDS+=	mutt>=1.5:../../mail/mutt
-TOOL_DEPENDS+=	procmail-[0-9]*:../../mail/procmail
-TOOL_DEPENDS+=	screen-[0-9]*:../../misc/screen
-TOOL_DEPENDS+=	rsync-[0-9]*:../../net/rsync
-TOOL_DEPENDS+=	wget-[0-9]*:../../net/wget
-TOOL_DEPENDS+=	pkg_chk-[0-9]*:../../pkgtools/pkg_chk
-TOOL_DEPENDS+=	pkg_rolling-replace-[0-9]*:../../pkgtools/pkg_rolling-replace
-TOOL_DEPENDS+=	pkgin-[0-9]*:../../pkgtools/pkgin
-TOOL_DEPENDS+=	enscript-[0-9]*:../../print/enscript
-TOOL_DEPENDS+=	ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
-TOOL_DEPENDS+=	papersize-[0-9]*:../../print/papersize
-TOOL_DEPENDS+=	${PYPKGPREFIX}-pspdfutils-[0-9]*:../../print/py-pspdfutils
-TOOL_DEPENDS+=	sudo-[0-9]*:../../security/sudo
-TOOL_DEPENDS+=	stunnel-[0-9]*:../../security/stunnel
-TOOL_DEPENDS+=	bash-[0-9]*:../../shells/bash
-TOOL_DEPENDS+=	tcsh-[0-9]*:../../shells/tcsh
-TOOL_DEPENDS+=	zsh-[0-9]*:../../shells/zsh
-TOOL_DEPENDS+=	icewm>=1.2<1.3:../../wm/icewm
-TOOL_DEPENDS+=	fluxbox-[0-9]*:../../wm/fluxbox
-TOOL_DEPENDS+=	apache>=2.4:../../www/apache24
-TOOL_DEPENDS+=	bozohttpd-[0-9]*:../../www/bozohttpd
-TOOL_DEPENDS+=	curl-[0-9]*:../../www/curl
-TOOL_DEPENDS+=	xlockmore-lite-[0-9]*:../../x11/xlockmore-lite
+DEPENDS+=	ircII-[0-9]*:../../chat/ircII
+DEPENDS+=	irssi-[0-9]*:../../chat/irssi
+DEPENDS+=	irssi-icb-[0-9]*:../../chat/irssi-icb
+DEPENDS+=	weechat-[0-9]*:../../chat/weechat
+DEPENDS+=	base64-[0-9]*:../../converters/base64
+DEPENDS+=	mpack-[0-9]*:../../converters/mpack
+DEPENDS+=	emacs21>=21<22:../../editors/emacs21
+DEPENDS+=	nano-[0-9]*:../../editors/nano
+DEPENDS+=	vim-[0-9]*:../../editors/vim
+DEPENDS+=	vim-share-[0-9]*:../../editors/vim-share
+DEPENDS+=	mutt>=1.5:../../mail/mutt
+DEPENDS+=	procmail-[0-9]*:../../mail/procmail
+DEPENDS+=	screen-[0-9]*:../../misc/screen
+DEPENDS+=	rsync-[0-9]*:../../net/rsync
+DEPENDS+=	wget-[0-9]*:../../net/wget
+DEPENDS+=	pkg_chk-[0-9]*:../../pkgtools/pkg_chk
+DEPENDS+=	pkg_rolling-replace-[0-9]*:../../pkgtools/pkg_rolling-replace
+DEPENDS+=	pkgin-[0-9]*:../../pkgtools/pkgin
+DEPENDS+=	enscript-[0-9]*:../../print/enscript
+DEPENDS+=	ghostscript-gpl-[0-9]*:../../print/ghostscript-gpl
+DEPENDS+=	papersize-[0-9]*:../../print/papersize
+DEPENDS+=	${PYPKGPREFIX}-pspdfutils-[0-9]*:../../print/py-pspdfutils
+DEPENDS+=	sudo-[0-9]*:../../security/sudo
+DEPENDS+=	stunnel-[0-9]*:../../security/stunnel
+DEPENDS+=	bash-[0-9]*:../../shells/bash
+DEPENDS+=	tcsh-[0-9]*:../../shells/tcsh
+DEPENDS+=	zsh-[0-9]*:../../shells/zsh
+DEPENDS+=	icewm>=1.2<1.3:../../wm/icewm
+DEPENDS+=	fluxbox-[0-9]*:../../wm/fluxbox
+DEPENDS+=	apache>=2.4:../../www/apache24
+DEPENDS+=	bozohttpd-[0-9]*:../../www/bozohttpd
+DEPENDS+=	curl-[0-9]*:../../www/curl
+DEPENDS+=	xlockmore-lite-[0-9]*:../../x11/xlockmore-lite
 
 #
 # 2. Base packages for the very popular languages that enormous
 # numbers of other packages depend on.
 #
-TOOL_DEPENDS+=	perl>=5:../../lang/perl5
-TOOL_DEPENDS+=	python38-[0-9]*:../../lang/python38
+DEPENDS+=	perl>=5:../../lang/perl5
+DEPENDS+=	python38-[0-9]*:../../lang/python38
 
 #
 # 3. Archivers and build tools.
 #
-TOOL_DEPENDS+=		bsdtar-[0-9]*:../../archivers/bsdtar
-TOOL_DEPENDS+=		bzip2-[0-9]*:../../archivers/bzip2
-TOOL_DEPENDS+=		gtar-base-[0-9]*:../../archivers/gtar-base
-TOOL_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
-TOOL_DEPENDS+=		xz-[0-9]*:../../archivers/xz
-TOOL_DEPENDS+=		zip-[0-9]*:../../archivers/zip
-TOOL_DEPENDS+=		autoconf-[0-9]*:../../devel/autoconf
-TOOL_DEPENDS+=		automake-[0-9]*:../../devel/automake
-TOOL_DEPENDS+=		bison-[0-9]*:../../devel/bison
-TOOL_DEPENDS+=		flex-[0-9]*:../../devel/flex
-TOOL_DEPENDS+=		gmake-[0-9]*:../../devel/gmake
-TOOL_DEPENDS+=		libtool-base-[0-9]*:../../devel/libtool-base
-TOOL_DEPENDS+=		m4-[0-9]*:../../devel/m4
-#TOOL_DEPENDS+=	osabi-[0-9]*:../../pkgtools/osabi
-TOOL_DEPENDS+=		pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup
+DEPENDS+=	bsdtar-[0-9]*:../../archivers/bsdtar
+DEPENDS+=	bzip2-[0-9]*:../../archivers/bzip2
+DEPENDS+=	gtar-base-[0-9]*:../../archivers/gtar-base
+DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
+DEPENDS+=	xz-[0-9]*:../../archivers/xz
+DEPENDS+=	zip-[0-9]*:../../archivers/zip
+DEPENDS+=	autoconf-[0-9]*:../../devel/autoconf
+DEPENDS+=	automake-[0-9]*:../../devel/automake
+DEPENDS+=	bison-[0-9]*:../../devel/bison
+DEPENDS+=	flex-[0-9]*:../../devel/flex
+DEPENDS+=	gmake-[0-9]*:../../devel/gmake
+DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
+DEPENDS+=	m4-[0-9]*:../../devel/m4
+#DEPENDS+=	osabi-[0-9]*:../../pkgtools/osabi
+DEPENDS+=	pkg_tarup-[0-9]*:../../pkgtools/pkg_tarup
 
 .include "../../mk/bsd.prefs.mk"
 
 .if ${X11_TYPE} == "native"
-TOOL_DEPENDS+=	x11-links-[0-9]*:../../pkgtools/x11-links
+DEPENDS+=	x11-links-[0-9]*:../../pkgtools/x11-links
 .endif
 
 #
 # 4. Core widely-used libraries.
 #
-TOOL_DEPENDS+=	libiconv-[0-9]*:../../converters/libiconv
-TOOL_DEPENDS+=	db4-[0-9]*:../../databases/db4
-TOOL_DEPENDS+=	gdbm-[0-9]*:../../databases/gdbm
-TOOL_DEPENDS+=	sqlite3-[0-9]*:../../databases/sqlite3
-TOOL_DEPENDS+=	gettext-lib-[0-9]*:../../devel/gettext-lib
-TOOL_DEPENDS+=	readline-[0-9]*:../../devel/readline
-TOOL_DEPENDS+=	zlib-[0-9]*:../../devel/zlib
-TOOL_DEPENDS+=	gd-[0-9]*:../../graphics/gd
-TOOL_DEPENDS+=	giflib-[0-9]*:../../graphics/giflib
+DEPENDS+=	libiconv-[0-9]*:../../converters/libiconv
+DEPENDS+=	db4-[0-9]*:../../databases/db4
+DEPENDS+=	gdbm-[0-9]*:../../databases/gdbm
+DEPENDS+=	sqlite3-[0-9]*:../../databases/sqlite3
+DEPENDS+=	gettext-lib-[0-9]*:../../devel/gettext-lib
+DEPENDS+=	readline-[0-9]*:../../devel/readline
+DEPENDS+=	zlib-[0-9]*:../../devel/zlib
+DEPENDS+=	gd-[0-9]*:../../graphics/gd
+DEPENDS+=	giflib-[0-9]*:../../graphics/giflib
 .include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_DEPMETHOD.${JPEG_DEFAULT}=	build
-TOOL_DEPENDS+=	png-[0-9]*:../../graphics/png
-TOOL_DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
-TOOL_DEPENDS+=	gnutls-[0-9]*:../../security/gnutls
-TOOL_DEPENDS+=	expat-[0-9]*:../../textproc/expat
-TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
-TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
-TOOL_DEPENDS+=	xmlcatmgr-[0-9]*:../../textproc/xmlcatmgr
+DEPENDS+=	png-[0-9]*:../../graphics/png
+DEPENDS+=	tiff-[0-9]*:../../graphics/tiff
+DEPENDS+=	gnutls-[0-9]*:../../security/gnutls
+DEPENDS+=	expat-[0-9]*:../../textproc/expat
+DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
+DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+DEPENDS+=	xmlcatmgr-[0-9]*:../../textproc/xmlcatmgr
 
 #
 # 5. Depends.
@@ -154,20 +154,20 @@
 # out for native X11; it will of course work for pkgsrc X11 also but
 # take somewhat longer.
 #
-TOOL_DEPENDS+=	lzo-[0-9]*:../../archivers/lzo		# required by gnutls
-TOOL_DEPENDS+=	gmp-[0-9]*:../../devel/gmp		# required by nettle
-TOOL_DEPENDS+=	libcfg+-[0-9]*:../../devel/libcfg+	# required by gnutls
-TOOL_DEPENDS+=	libffi-[0-9]*:../../devel/libffi	# required by python
-TOOL_DEPENDS+=	libidn-[0-9]*:../../devel/libidn	# required by curl
-TOOL_DEPENDS+=	ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
+DEPENDS+=	lzo-[0-9]*:../../archivers/lzo		# required by gnutls
+DEPENDS+=	gmp-[0-9]*:../../devel/gmp		# required by nettle
+DEPENDS+=	libcfg+-[0-9]*:../../devel/libcfg+	# required by gnutls
+DEPENDS+=	libffi-[0-9]*:../../devel/libffi	# required by python
+DEPENDS+=	libidn-[0-9]*:../../devel/libidn	# required by curl
+DEPENDS+=	ghostscript-fonts-[0-9]*:../../fonts/ghostscript-fonts
 							# req'd by ghostscript
-TOOL_DEPENDS+=	f2c-[0-9]*:../../lang/f2c		# req'd by libtool-base
-TOOL_DEPENDS+=	libpaper-[0-9]*:../../print/libpaper	# req'd by ghostscript
-TOOL_DEPENDS+=	libgcrypt-[0-9]*:../../security/libgcrypt # required by libxslt
-TOOL_DEPENDS+=	libgpg-error-[0-9]*:../../security/libgpg-error
+DEPENDS+=	f2c-[0-9]*:../../lang/f2c		# req'd by libtool-base
+DEPENDS+=	libpaper-[0-9]*:../../print/libpaper	# req'd by ghostscript
+DEPENDS+=	libgcrypt-[0-9]*:../../security/libgcrypt # required by libxslt
+DEPENDS+=	libgpg-error-[0-9]*:../../security/libgpg-error
 							# required by libgcrypt
-TOOL_DEPENDS+=	libtasn1-[0-9]*:../../security/libtasn1	# required by gnutls
-TOOL_DEPENDS+=	nettle-[0-9]*:../../security/nettle	# required by gnutls
+DEPENDS+=	libtasn1-[0-9]*:../../security/libtasn1	# required by gnutls
+DEPENDS+=	nettle-[0-9]*:../../security/nettle	# required by gnutls
 
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/06/06 12:41:54 riastradh Exp $
+# $NetBSD: Makefile,v 1.15 2023/07/01 14:19:45 nia Exp $
 
 DISTNAME=	bulk-test-boost-20230121
 CATEGORIES=	meta-pkgs
@@ -19,43 +19,43 @@
 # The current list is mostly arbitrary, resulting from a grep of the
 # pkgsrc tree.
 
-TOOL_DEPENDS+=		abiword-[0-9]*:../../editors/abiword
-TOOL_DEPENDS+=		bitcoin-[0-9]*:../../finance/bitcoin
-TOOL_DEPENDS+=		blender-[0-9]*:../../graphics/blender
-TOOL_DEPENDS+=		botan>=2.11:../../security/botan2
-TOOL_DEPENDS+=		dnsdist-[0-9]*:../../net/dnsdist
-TOOL_DEPENDS+=		emulationstation-[0-9]*:../../emulators/emulationstation
-TOOL_DEPENDS+=		gnucash-[0-9]*:../../finance/gnucash
-TOOL_DEPENDS+=		gnuradio-core-[0-9]*:../../ham/gnuradio-core
-TOOL_DEPENDS+=		gource-[0-9]*:../../graphics/gource
-TOOL_DEPENDS+=		gpick-[0-9]*:../../graphics/gpick
-TOOL_DEPENDS+=		icinga2-[0-9]*:../../net/icinga2
-TOOL_DEPENDS+=		inkscape-[0-9]*:../../graphics/inkscape
-TOOL_DEPENDS+=		innoextract-[0-9]*:../../archivers/innoextract
-TOOL_DEPENDS+=		kicad-[0-9]*:../../cad/kicad
-TOOL_DEPENDS+=		krita-[0-9]*:../../graphics/krita
-TOOL_DEPENDS+=		libclucene-[0-9]*:../../textproc/libclucene
-TOOL_DEPENDS+=		libftdi1-[0-9]*:../../devel/libftdi1
-TOOL_DEPENDS+=		librecad-[0-9]*:../../cad/librecad
-TOOL_DEPENDS+=		libreoffice-[0-9]*:../../misc/libreoffice
-TOOL_DEPENDS+=		mongodb-[0-9]*:../../databases/mongodb
-TOOL_DEPENDS+=		mumble-[0-9]*:../../chat/mumble
-TOOL_DEPENDS+=		musicpd-[0-9]*:../../audio/musicpd
-TOOL_DEPENDS+=		mysql-server>=5.7<8.0:../../databases/mysql57-server
-TOOL_DEPENDS+=		ncmpcpp-[0-9]*:../../audio/ncmpcpp
-TOOL_DEPENDS+=		osm2pgsql-[0-9]*:../../geography/osm2pgsql
-TOOL_DEPENDS+=		openscad-[0-9]*:../../cad/openscad
-TOOL_DEPENDS+=		poppler-glib-[0-9]*:../../print/poppler-glib
-TOOL_DEPENDS+=		powerdns-[0-9]*:../../net/powerdns
-TOOL_DEPENDS+=		powerdns-recursor-[0-9]*:../../net/powerdns-recursor
-TOOL_DEPENDS+=		qbittorrent-[0-9]*:../../net/qbittorrent
-TOOL_DEPENDS+=		quassel-[0-9]*:../../chat/quassel
-TOOL_DEPENDS+=		scribus>=1.5:../../print/scribus-qt5
-TOOL_DEPENDS+=		source-highlight-[0-9]*:../../textproc/source-highlight
-TOOL_DEPENDS+=		strawberry-[0-9]*:../../audio/strawberry
-TOOL_DEPENDS+=		tcpflow-[0-9]*:../../net/tcpflow
-TOOL_DEPENDS+=		ugrep-[0-9]*:../../textproc/ugrep
-TOOL_DEPENDS+=		xsd-[0-9]*:../../devel/xsd
-TOOL_DEPENDS+=		znc-[0-9]*:../../chat/znc
+DEPENDS+=	abiword-[0-9]*:../../editors/abiword
+DEPENDS+=	bitcoin-[0-9]*:../../finance/bitcoin
+DEPENDS+=	blender-[0-9]*:../../graphics/blender
+DEPENDS+=	botan>=2.11:../../security/botan2
+DEPENDS+=	dnsdist-[0-9]*:../../net/dnsdist
+DEPENDS+=	emulationstation-[0-9]*:../../emulators/emulationstation
+DEPENDS+=	gnucash-[0-9]*:../../finance/gnucash
+DEPENDS+=	gnuradio-core-[0-9]*:../../ham/gnuradio-core
+DEPENDS+=	gource-[0-9]*:../../graphics/gource
+DEPENDS+=	gpick-[0-9]*:../../graphics/gpick
+DEPENDS+=	icinga2-[0-9]*:../../net/icinga2
+DEPENDS+=	inkscape-[0-9]*:../../graphics/inkscape
+DEPENDS+=	innoextract-[0-9]*:../../archivers/innoextract
+DEPENDS+=	kicad-[0-9]*:../../cad/kicad
+DEPENDS+=	krita-[0-9]*:../../graphics/krita
+DEPENDS+=	libclucene-[0-9]*:../../textproc/libclucene
+DEPENDS+=	libftdi1-[0-9]*:../../devel/libftdi1
+DEPENDS+=	librecad-[0-9]*:../../cad/librecad
+DEPENDS+=	libreoffice-[0-9]*:../../misc/libreoffice
+DEPENDS+=	mongodb-[0-9]*:../../databases/mongodb
+DEPENDS+=	mumble-[0-9]*:../../chat/mumble
+DEPENDS+=	musicpd-[0-9]*:../../audio/musicpd
+DEPENDS+=	mysql-server>=5.7<8.0:../../databases/mysql57-server
+DEPENDS+=	ncmpcpp-[0-9]*:../../audio/ncmpcpp
+DEPENDS+=	osm2pgsql-[0-9]*:../../geography/osm2pgsql
+DEPENDS+=	openscad-[0-9]*:../../cad/openscad
+DEPENDS+=	poppler-glib-[0-9]*:../../print/poppler-glib
+DEPENDS+=	powerdns-[0-9]*:../../net/powerdns
+DEPENDS+=	powerdns-recursor-[0-9]*:../../net/powerdns-recursor
+DEPENDS+=	qbittorrent-[0-9]*:../../net/qbittorrent
+DEPENDS+=	quassel-[0-9]*:../../chat/quassel
+DEPENDS+=	scribus>=1.5:../../print/scribus-qt5
+DEPENDS+=	source-highlight-[0-9]*:../../textproc/source-highlight
+DEPENDS+=	strawberry-[0-9]*:../../audio/strawberry
+DEPENDS+=	tcpflow-[0-9]*:../../net/tcpflow
+DEPENDS+=	ugrep-[0-9]*:../../textproc/ugrep
+DEPENDS+=	xsd-[0-9]*:../../devel/xsd
+DEPENDS+=	znc-[0-9]*:../../chat/znc
 
 .include "../../mk/bsd.pkg.mk"

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/06 12:41:54 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2023/07/01 14:19:45 nia Exp $
 
 DISTNAME=	bulk-test-go-20220924
 CATEGORIES=	meta-pkgs
@@ -14,117 +14,117 @@
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-TOOL_DEPENDS+=	coyim-[0-9]*:../../chat/coyim
-TOOL_DEPENDS+=	matterircd-[0-9]*:../../chat/matterircd
-TOOL_DEPENDS+=	gomuks-[0-9]*:../../chat/gomuks
-TOOL_DEPENDS+=	go-ldap-[0-9]*:../../databases/go-ldap
-TOOL_DEPENDS+=	influxdb-[0-9]*:../../databases/influxdb
-TOOL_DEPENDS+=	postgres_exporter-[0-9]*:../../databases/postgres_exporter
-TOOL_DEPENDS+=	prometheus-[0-9]*:../../databases/prometheus
-TOOL_DEPENDS+=	mysqld_exporter-[0-9]*:../../databases/mysqld_exporter
-TOOL_DEPENDS+=	promscale-[0-9]*:../../databases/promscale
-TOOL_DEPENDS+=	timescaledb-tune-[0-9]*:../../databases/timescaledb-tune
-TOOL_DEPENDS+=	asmfmt-[0-9]*:../../devel/asmfmt
-TOOL_DEPENDS+=	go-tools-[0-9]*:../../devel/go-tools
-TOOL_DEPENDS+=	go-flags-svent-[0-9]*:../../devel/go-flags-svent
-TOOL_DEPENDS+=	go-nbreader-[0-9]*:../../devel/go-nbreader
-TOOL_DEPENDS+=	golint-[0-9]*:../../devel/golint
-TOOL_DEPENDS+=	go-review-[0-9]*:../../devel/go-review
-TOOL_DEPENDS+=	go-ed25519-[0-9]*:../../devel/go-ed25519
-TOOL_DEPENDS+=	go-goptlib-[0-9]*:../../devel/go-goptlib
-TOOL_DEPENDS+=	go-siphash-[0-9]*:../../devel/go-siphash
-TOOL_DEPENDS+=	go-sys-[0-9]*:../../devel/go-sys
-TOOL_DEPENDS+=	go-golang-lru-[0-9]*:../../devel/go-golang-lru
-TOOL_DEPENDS+=	opa-[0-9]*:../../devel/opa
-TOOL_DEPENDS+=	git-lfs-[0-9]*:../../devel/git-lfs
-TOOL_DEPENDS+=	go-gopkgs-[0-9]*:../../devel/go-gopkgs
-TOOL_DEPENDS+=	go-gocode-[0-9]*:../../devel/go-gocode
-TOOL_DEPENDS+=	go-goreturns-[0-9]*:../../devel/go-goreturns
-TOOL_DEPENDS+=	go-pty-[0-9]*:../../devel/go-pty
-TOOL_DEPENDS+=	mob-[0-9]*:../../devel/mob
-TOOL_DEPENDS+=	go-logrus-[0-9]*:../../devel/go-logrus
-TOOL_DEPENDS+=	gopls-[0-9]*:../../devel/gopls
-TOOL_DEPENDS+=	go-gox-[0-9]*:../../devel/go-gox
-TOOL_DEPENDS+=	go-xerrors-[0-9]*:../../devel/go-xerrors
-TOOL_DEPENDS+=	errcheck-[0-9]*:../../devel/errcheck
-TOOL_DEPENDS+=	conftest-[0-9]*:../../devel/conftest
-TOOL_DEPENDS+=	golangci-lint-[0-9]*:../../devel/golangci-lint
-TOOL_DEPENDS+=	go-wire-[0-9]*:../../devel/go-wire
-TOOL_DEPENDS+=	goredo-[0-9]*:../../devel/goredo
-TOOL_DEPENDS+=	go-impl-[0-9]*:../../devel/go-impl
-TOOL_DEPENDS+=	gotests-[0-9]*:../../devel/gotests
-TOOL_DEPENDS+=	go-staticcheck-[0-9]*:../../devel/go-staticcheck
-TOOL_DEPENDS+=	gomodifytags-[0-9]*:../../devel/gomodifytags
-TOOL_DEPENDS+=	lazygit-[0-9]*:../../devel/lazygit
-TOOL_DEPENDS+=	nancy-[0-9]*:../../devel/nancy
-TOOL_DEPENDS+=	packr-[0-9]*:../../devel/packr
-TOOL_DEPENDS+=	reftools-[0-9]*:../../devel/reftools
-TOOL_DEPENDS+=	micro-[0-9]*:../../editors/micro
-TOOL_DEPENDS+=	gif2png-[0-9]*:../../graphics/gif2png
-TOOL_DEPENDS+=	postforward-[0-9]*:../../mail/postforward
-TOOL_DEPENDS+=	amfora-[0-9]*:../../net/amfora
-TOOL_DEPENDS+=	hub-[0-9]*:../../net/hub
-TOOL_DEPENDS+=	go-net-[0-9]*:../../net/go-net
-TOOL_DEPENDS+=	gh-[0-9]*:../../net/gh
-TOOL_DEPENDS+=	syncthing-[0-9]*:../../net/syncthing
-TOOL_DEPENDS+=	dnscrypt-proxy2-[0-9]*:../../net/dnscrypt-proxy2
-TOOL_DEPENDS+=	go-websocket-[0-9]*:../../net/go-websocket
-TOOL_DEPENDS+=	go-dnstap-[0-9]*:../../net/go-dnstap
-TOOL_DEPENDS+=	obfs4proxy-[0-9]*:../../net/obfs4proxy
-TOOL_DEPENDS+=	rclone-[0-9]*:../../net/rclone
-TOOL_DEPENDS+=	terraform-[0-9]*:../../net/terraform
-TOOL_DEPENDS+=	terraform-provider-aws-[0-9]*:../../net/terraform-provider-aws
-TOOL_DEPENDS+=	terraform-provider-local-[0-9]*:../../net/terraform-provider-local
-TOOL_DEPENDS+=	terraform-provider-random-[0-9]*:../../net/terraform-provider-random
-TOOL_DEPENDS+=	terraform-provider-kubernetes-[0-9]*:../../net/terraform-provider-kubernetes
-TOOL_DEPENDS+=	terraform-provider-null-[0-9]*:../../net/terraform-provider-null
-TOOL_DEPENDS+=	amazon-ecs-cli-[0-9]*:../../net/amazon-ecs-cli
-TOOL_DEPENDS+=	bombadillo-[0-9]*:../../net/bombadillo
-TOOL_DEPENDS+=	czds-[0-9]*:../../net/czds
-TOOL_DEPENDS+=	gvproxy-[0-9]*:../../net/gvproxy
-TOOL_DEPENDS+=	gunison-[0-9]*:../../net/gunison
-TOOL_DEPENDS+=	kubectl-[0-9]*:../../net/kubectl
-TOOL_DEPENDS+=	nats-server-[0-9]*:../../net/nats-server
-TOOL_DEPENDS+=	mangos-[0-9]*:../../net/mangos
-TOOL_DEPENDS+=	terraform-provider-vultr-[0-9]*:../../net/terraform-provider-vultr
-TOOL_DEPENDS+=	terraform-provider-archive-[0-9]*:../../net/terraform-provider-archive
-TOOL_DEPENDS+=	terraform-provider-template-[0-9]*:../../net/terraform-provider-template
-TOOL_DEPENDS+=	vultr-cli-[0-9]*:../../net/vultr-cli
-TOOL_DEPENDS+=	pkglint-[0-9]*:../../pkgtools/pkglint
-TOOL_DEPENDS+=	2fa-[0-9]*:../../security/2fa
-TOOL_DEPENDS+=	age-[0-9]*:../../security/age
-TOOL_DEPENDS+=	amass-[0-9]*:../../security/amass
-TOOL_DEPENDS+=	go-crypto-[0-9]*:../../security/go-crypto
-TOOL_DEPENDS+=	go-mkcert-[0-9]*:../../security/go-mkcert
-TOOL_DEPENDS+=	go-asn1-ber-[0-9]*:../../security/go-asn1-ber
-TOOL_DEPENDS+=	vault-[0-9]*:../../security/vault
-TOOL_DEPENDS+=	authelia-[0-9]*:../../security/authelia
-TOOL_DEPENDS+=	trufflehog-[0-9]*:../../security/trufflehog
-TOOL_DEPENDS+=	elvish-[0-9]*:../../shells/elvish
-TOOL_DEPENDS+=	fzf-[0-9]*:../../sysutils/fzf
-TOOL_DEPENDS+=	beats-[0-9]*:../../sysutils/beats
-TOOL_DEPENDS+=	consul-[0-9]*:../../sysutils/consul
-TOOL_DEPENDS+=	lf-[0-9]*:../../sysutils/lf
-TOOL_DEPENDS+=	go-goreman-[0-9]*:../../sysutils/goreman
-TOOL_DEPENDS+=	node_exporter-[0-9]*:../../sysutils/node_exporter
-TOOL_DEPENDS+=	vultr-[0-9]*:../../sysutils/vultr
-TOOL_DEPENDS+=	direnv-[0-9]*:../../sysutils/direnv
-TOOL_DEPENDS+=	restic-[0-9]*:../../sysutils/restic
-TOOL_DEPENDS+=	go-text-[0-9]*:../../textproc/go-text
-TOOL_DEPENDS+=	sift-[0-9]*:../../textproc/sift
-TOOL_DEPENDS+=	go-md2man-[0-9]*:../../textproc/go-md2man
-TOOL_DEPENDS+=	go-mmark-[0-9]*:../../textproc/go-mmark
-TOOL_DEPENDS+=	go-kr-text-[0-9]*:../../textproc/go-kr-text
-TOOL_DEPENDS+=	glow-[0-9]*:../../textproc/glow
-TOOL_DEPENDS+=	pup-[0-9]*:../../www/pup
-TOOL_DEPENDS+=	caddy-[0-9]*:../../www/caddy
-TOOL_DEPENDS+=	go-ffuf-[0-9]*:../../www/go-ffuf
-TOOL_DEPENDS+=	gitea-[0-9]*:../../www/gitea
-TOOL_DEPENDS+=	grafana-[0-9]*:../../www/grafana
-TOOL_DEPENDS+=	go-minify-[0-9]*:../../www/go-minify
-TOOL_DEPENDS+=	go-hugo-[0-9]*:../../www/hugo
-TOOL_DEPENDS+=	apisprout-[0-9]*:../../www/apisprout
-TOOL_DEPENDS+=	jira-cli-[0-9]*:../../www/jira-cli
-TOOL_DEPENDS+=	restish-[0-9]*:../../www/restish
+DEPENDS+=	coyim-[0-9]*:../../chat/coyim
+DEPENDS+=	matterircd-[0-9]*:../../chat/matterircd
+DEPENDS+=	gomuks-[0-9]*:../../chat/gomuks
+DEPENDS+=	go-ldap-[0-9]*:../../databases/go-ldap
+DEPENDS+=	influxdb-[0-9]*:../../databases/influxdb
+DEPENDS+=	postgres_exporter-[0-9]*:../../databases/postgres_exporter
+DEPENDS+=	prometheus-[0-9]*:../../databases/prometheus
+DEPENDS+=	mysqld_exporter-[0-9]*:../../databases/mysqld_exporter
+DEPENDS+=	promscale-[0-9]*:../../databases/promscale
+DEPENDS+=	timescaledb-tune-[0-9]*:../../databases/timescaledb-tune
+DEPENDS+=	asmfmt-[0-9]*:../../devel/asmfmt
+DEPENDS+=	go-tools-[0-9]*:../../devel/go-tools
+DEPENDS+=	go-flags-svent-[0-9]*:../../devel/go-flags-svent
+DEPENDS+=	go-nbreader-[0-9]*:../../devel/go-nbreader
+DEPENDS+=	golint-[0-9]*:../../devel/golint
+DEPENDS+=	go-review-[0-9]*:../../devel/go-review
+DEPENDS+=	go-ed25519-[0-9]*:../../devel/go-ed25519
+DEPENDS+=	go-goptlib-[0-9]*:../../devel/go-goptlib
+DEPENDS+=	go-siphash-[0-9]*:../../devel/go-siphash
+DEPENDS+=	go-sys-[0-9]*:../../devel/go-sys
+DEPENDS+=	go-golang-lru-[0-9]*:../../devel/go-golang-lru
+DEPENDS+=	opa-[0-9]*:../../devel/opa
+DEPENDS+=	git-lfs-[0-9]*:../../devel/git-lfs
+DEPENDS+=	go-gopkgs-[0-9]*:../../devel/go-gopkgs
+DEPENDS+=	go-gocode-[0-9]*:../../devel/go-gocode
+DEPENDS+=	go-goreturns-[0-9]*:../../devel/go-goreturns
+DEPENDS+=	go-pty-[0-9]*:../../devel/go-pty
+DEPENDS+=	mob-[0-9]*:../../devel/mob
+DEPENDS+=	go-logrus-[0-9]*:../../devel/go-logrus
+DEPENDS+=	gopls-[0-9]*:../../devel/gopls
+DEPENDS+=	go-gox-[0-9]*:../../devel/go-gox
+DEPENDS+=	go-xerrors-[0-9]*:../../devel/go-xerrors
+DEPENDS+=	errcheck-[0-9]*:../../devel/errcheck
+DEPENDS+=	conftest-[0-9]*:../../devel/conftest
+DEPENDS+=	golangci-lint-[0-9]*:../../devel/golangci-lint
+DEPENDS+=	go-wire-[0-9]*:../../devel/go-wire
+DEPENDS+=	goredo-[0-9]*:../../devel/goredo
+DEPENDS+=	go-impl-[0-9]*:../../devel/go-impl
+DEPENDS+=	gotests-[0-9]*:../../devel/gotests
+DEPENDS+=	go-staticcheck-[0-9]*:../../devel/go-staticcheck
+DEPENDS+=	gomodifytags-[0-9]*:../../devel/gomodifytags
+DEPENDS+=	lazygit-[0-9]*:../../devel/lazygit
+DEPENDS+=	nancy-[0-9]*:../../devel/nancy
+DEPENDS+=	packr-[0-9]*:../../devel/packr
+DEPENDS+=	reftools-[0-9]*:../../devel/reftools
+DEPENDS+=	micro-[0-9]*:../../editors/micro
+DEPENDS+=	gif2png-[0-9]*:../../graphics/gif2png
+DEPENDS+=	postforward-[0-9]*:../../mail/postforward
+DEPENDS+=	amfora-[0-9]*:../../net/amfora
+DEPENDS+=	hub-[0-9]*:../../net/hub
+DEPENDS+=	go-net-[0-9]*:../../net/go-net
+DEPENDS+=	gh-[0-9]*:../../net/gh
+DEPENDS+=	syncthing-[0-9]*:../../net/syncthing
+DEPENDS+=	dnscrypt-proxy2-[0-9]*:../../net/dnscrypt-proxy2
+DEPENDS+=	go-websocket-[0-9]*:../../net/go-websocket
+DEPENDS+=	go-dnstap-[0-9]*:../../net/go-dnstap
+DEPENDS+=	obfs4proxy-[0-9]*:../../net/obfs4proxy
+DEPENDS+=	rclone-[0-9]*:../../net/rclone
+DEPENDS+=	terraform-[0-9]*:../../net/terraform
+DEPENDS+=	terraform-provider-aws-[0-9]*:../../net/terraform-provider-aws
+DEPENDS+=	terraform-provider-local-[0-9]*:../../net/terraform-provider-local
+DEPENDS+=	terraform-provider-random-[0-9]*:../../net/terraform-provider-random
+DEPENDS+=	terraform-provider-kubernetes-[0-9]*:../../net/terraform-provider-kubernetes
+DEPENDS+=	terraform-provider-null-[0-9]*:../../net/terraform-provider-null
+DEPENDS+=	amazon-ecs-cli-[0-9]*:../../net/amazon-ecs-cli
+DEPENDS+=	bombadillo-[0-9]*:../../net/bombadillo
+DEPENDS+=	czds-[0-9]*:../../net/czds
+DEPENDS+=	gvproxy-[0-9]*:../../net/gvproxy
+DEPENDS+=	gunison-[0-9]*:../../net/gunison
+DEPENDS+=	kubectl-[0-9]*:../../net/kubectl
+DEPENDS+=	nats-server-[0-9]*:../../net/nats-server
+DEPENDS+=	mangos-[0-9]*:../../net/mangos
+DEPENDS+=	terraform-provider-vultr-[0-9]*:../../net/terraform-provider-vultr
+DEPENDS+=	terraform-provider-archive-[0-9]*:../../net/terraform-provider-archive
+DEPENDS+=	terraform-provider-template-[0-9]*:../../net/terraform-provider-template
+DEPENDS+=	vultr-cli-[0-9]*:../../net/vultr-cli
+DEPENDS+=	pkglint-[0-9]*:../../pkgtools/pkglint
+DEPENDS+=	2fa-[0-9]*:../../security/2fa
+DEPENDS+=	age-[0-9]*:../../security/age
+DEPENDS+=	amass-[0-9]*:../../security/amass
+DEPENDS+=	go-crypto-[0-9]*:../../security/go-crypto
+DEPENDS+=	go-mkcert-[0-9]*:../../security/go-mkcert
+DEPENDS+=	go-asn1-ber-[0-9]*:../../security/go-asn1-ber
+DEPENDS+=	vault-[0-9]*:../../security/vault
+DEPENDS+=	authelia-[0-9]*:../../security/authelia
+DEPENDS+=	trufflehog-[0-9]*:../../security/trufflehog
+DEPENDS+=	elvish-[0-9]*:../../shells/elvish
+DEPENDS+=	fzf-[0-9]*:../../sysutils/fzf
+DEPENDS+=	beats-[0-9]*:../../sysutils/beats
+DEPENDS+=	consul-[0-9]*:../../sysutils/consul
+DEPENDS+=	lf-[0-9]*:../../sysutils/lf
+DEPENDS+=	go-goreman-[0-9]*:../../sysutils/goreman
+DEPENDS+=	node_exporter-[0-9]*:../../sysutils/node_exporter
+DEPENDS+=	vultr-[0-9]*:../../sysutils/vultr
+DEPENDS+=	direnv-[0-9]*:../../sysutils/direnv
+DEPENDS+=	restic-[0-9]*:../../sysutils/restic
+DEPENDS+=	go-text-[0-9]*:../../textproc/go-text
+DEPENDS+=	sift-[0-9]*:../../textproc/sift
+DEPENDS+=	go-md2man-[0-9]*:../../textproc/go-md2man
+DEPENDS+=	go-mmark-[0-9]*:../../textproc/go-mmark
+DEPENDS+=	go-kr-text-[0-9]*:../../textproc/go-kr-text
+DEPENDS+=	glow-[0-9]*:../../textproc/glow
+DEPENDS+=	pup-[0-9]*:../../www/pup
+DEPENDS+=	caddy-[0-9]*:../../www/caddy
+DEPENDS+=	go-ffuf-[0-9]*:../../www/go-ffuf
+DEPENDS+=	gitea-[0-9]*:../../www/gitea
+DEPENDS+=	grafana-[0-9]*:../../www/grafana
+DEPENDS+=	go-minify-[0-9]*:../../www/go-minify
+DEPENDS+=	go-hugo-[0-9]*:../../www/hugo
+DEPENDS+=	apisprout-[0-9]*:../../www/apisprout
+DEPENDS+=	jira-cli-[0-9]*:../../www/jira-cli
+DEPENDS+=	restish-[0-9]*:../../www/restish
 
 .include "../../mk/bsd.pkg.mk"