diff --git a/astro/siril/Makefile b/astro/siril/Makefile
index de10cc9424b7..3fd1eed7c49b 100644
--- a/astro/siril/Makefile
+++ b/astro/siril/Makefile
@@ -1,54 +1,53 @@
 PORTNAME=	siril
 DISTVERSION=	1.0.6
 PORTREVISION=	9
 CATEGORIES=	astro graphics
 MASTER_SITES=	https://free-astro.org/download/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Astronomical image processing software
 WWW=		https://siril.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BROKEN_i386=	undefined reference to `__atomic_load' and `__atomic_compare_exchange' #`
 .if !exists(/usr/include/omp.h)
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 		libcfitsio.so:astro/cfitsio \
 		libconfig.so:devel/libconfig \
 		libexiv2.so:graphics/exiv2 \
 		libffms2.so:multimedia/ffms2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
 		libgsl.so:math/gsl \
 		libharfbuzz.so:print/harfbuzz \
 		libheif.so:graphics/libheif \
 		libjson-glib-1.0.so:devel/json-glib \
 		liblcms2.so:graphics/lcms2 \
 		libopencv_core.so:graphics/opencv \
 		libpng.so:graphics/png \
 		libraw.so:graphics/libraw \
 		librtprocess.so:graphics/librtprocess \
 		libtiff.so:graphics/tiff \
 		libwcs.so:astro/wcslib
 LIB_DEPENDS+=	libopencv_photo.so:graphics/opencv # for some reason, configure fails without opencv, but executable only links to opencv-core
 
-USES=		compiler:c++11-lang desktop-file-utils gettext \
+USES=		cmake:indirect compiler:c++11-lang desktop-file-utils gettext \
 		gnome meson pkgconfig jpeg shared-mime-info tar:bz2
 USE_GNOME=	atk cairo gdkpixbuf2 gtk30 intltool pango
 
 BINARY_ALIAS=	git=false
 
 OPTIONS_DEFINE=		CURL OPENMP
 OPTIONS_DEFAULT=	CURL OPENMP
 
 OPENMP_MESON_OFF=	-Dopenmp=false
 
 CURL_MESON_YES=		enable-libcurl
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 .include <bsd.port.mk>
diff --git a/audio/guidoar/Makefile b/audio/guidoar/Makefile
index a6a86f79a540..c2af3b7d08bf 100644
--- a/audio/guidoar/Makefile
+++ b/audio/guidoar/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=	guidoar
 PORTVERSION=	g20210127
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library to browse, transform and manipulate Guido scores
 WWW=		https://github.com/grame-cncm/guidoar
 
 LICENSE=	MPL20
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 
-USES=		gmake
+USES=		cmake:indirect gmake
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	grame-cncm
 GH_TAGNAME=	cf5681a
 
 BUILD_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${WRKSRC}/build
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libguidoar.so.1.00
 
 .include <bsd.port.mk>
diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index dafcc580f3ee..bbfd5d9cb16e 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -1,68 +1,70 @@
 PORTNAME=	sweethome3d
 PORTVERSION=	7.1
 CATEGORIES=	cad java
 MASTER_SITES=	SF/${PORTNAME}/SweetHome3D-source/${DISTNAME}/
 DISTNAME=	SweetHome3D-${PORTVERSION}-src
 DISTFILES=	${DISTNAME}.zip
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Free interior 3D design application
 WWW=		https://www.sweethome3d.com/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.TXT
 
-BUILD_DEPENDS=	cmake:devel/cmake-core java3d>=0:java/java3d
+BUILD_DEPENDS=	java3d>=0:java/java3d
 RUN_DEPENDS=	java3d>=0:java/java3d
 
+USES=		cmake:indirect
+
 USE_ANT=	yes
 USE_JAVA=	8
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	puybaret:yr
 GH_PROJECT=	libYafaRay:yr
 GH_TAGNAME=	ef20db1:yr
 
 ALL_TARGET=	jarExecutable
 JARNAME=	SweetHome3D-${PORTVERSION}.jar
 
 SUB_FILES=	sweethome3d.sh
 SUB_LIST=	JARNAME=${JARNAME}
 
 PLIST_FILES=	bin/sweethome3d \
 		${JAVAJARDIR}/${JARNAME} \
 		share/pixmaps/sweethome3d-icon.png
 
 DESKTOP_ENTRIES="Sweet Home 3D" "" "${PORTNAME}-icon" "${PORTNAME}" "" false
 
 build-yafaray:
 	@${SED} -e '/^set(WITH_/s,ON),OFF),' \
 		${WRKSRC_yr}/CMakeConfig/UserConfig.template \
 		> ${WRKSRC_yr}/CMakeConfig/UserConfig.txt
 	cd ${WRKSRC_yr} && cmake \
 		-DUSER_INSTALL_PREFIX:PATH=${BUILD_WRKSRC}/build/yafaray \
 		. && ${MAKE_CMD} VERBOSE=1 install
 	${MV} ${BUILD_WRKSRC}/build/yafaray/lib/* ${BUILD_WRKSRC}/lib/yafaray
 
 pre-build: build-yafaray
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} build
 	cd ${BUILD_WRKSRC} && ${JAVAH} -jni -o \
 		src/com/eteks/sweethome3d/j3d/YafarayRenderer.h -cp \
 		classes:lib/j3dcore.jar:lib/vecmath.jar:build/SweetHome3D.jar \
 		com.eteks.sweethome3d.j3d.YafarayRenderer
 	cd ${BUILD_WRKSRC} && ${CXX} ${CXXFLAGS} -fPIC -std=c++11 \
 		-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:tl} \
 		-I${WRKSRC_yr}/include \
 		src/com/eteks/sweethome3d/j3d/YafarayRenderer.cpp -shared \
 		-o lib/yafaray/libyafarayjni.so \
 		-Llib/yafaray -lyafaray_v3_core
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/install/${JARNAME} \
 		${STAGEDIR}${JAVAJARDIR}/${JARNAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/sweethome3d.sh \
 		${STAGEDIR}${PREFIX}/bin/sweethome3d
 	${INSTALL_DATA} ${WRKSRC}/deploy/SweetHome3DIcon32x32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/sweethome3d-icon.png
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-couchbase/Makefile b/databases/pecl-couchbase/Makefile
index 4d3fb26b1b0b..e9b2de931bd6 100644
--- a/databases/pecl-couchbase/Makefile
+++ b/databases/pecl-couchbase/Makefile
@@ -1,19 +1,17 @@
 PORTNAME=	couchbase
 PORTVERSION=	4.1.6
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/couchbase/couchbase-php-client/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Couchbase Server PHP extension
 WWW=		https://pecl.php.net/package/couchbase \
 		https://github.com/couchbase/couchbase-php-client
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
-
-USES=		compiler:c++17-lang php:build,pecl
+USES=		cmake:indirect compiler:c++17-lang php:build,pecl
 
 CONFIGURE_ARGS=	COUCHBASE_CMAKE_EXTRA="-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE=OFF"
 
 .include <bsd.port.mk>
diff --git a/devel/jiri/Makefile b/devel/jiri/Makefile
index 413ad8c4840a..93ca580ccd46 100644
--- a/devel/jiri/Makefile
+++ b/devel/jiri/Makefile
@@ -1,34 +1,33 @@
 PORTNAME=	jiri
 PORTVERSION=	g${TIMESTAMP:S/-/./g:C/T.*//g}
 PORTREVISION=	17
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/swills
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 DIST_SUBDIR=	jiri
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Tool for multi-repo development
 WWW=		https://fuchsia.googlesource.com/jiri
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 RUN_DEPENDS=	git:devel/git
 
-USES=		go:modules ninja:build
+USES=		cmake:indirect go:modules ninja:build
 
 GITHASH=	1eee1043d12d1baabae7f2466cc0b1646395e32c
 TIMESTAMP=	2020-08-28T00:00:00.000000
 PLIST_FILES=	bin/jiri
 USE_GITHUB=	nodefault
 GH_TUPLE=	golang:net:a7b16738d86b:golang_net/vendor/golang.org/x/net \
 		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync
 
 GO_TARGET=	./cmd/jiri
 GO_BUILDFLAGS=	-ldflags="\
 		-s -w \
 		-X fuchsia.googlesource.com/jiri/version.GitCommit=${GITHASH} \
 		-X fuchsia.googlesource.com/jiri/version.BuildTime=${TIMESTAMP}"
 
 .include <bsd.port.mk>
diff --git a/devel/py-keystone-engine/Makefile b/devel/py-keystone-engine/Makefile
index 11356d245488..961f86376252 100644
--- a/devel/py-keystone-engine/Makefile
+++ b/devel/py-keystone-engine/Makefile
@@ -1,45 +1,43 @@
 PORTNAME=	keystone-engine
 DISTVERSION=	0.9.1-3
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Keystone Assembler Engine with Python bindings
 WWW=		https://www.keystone-engine.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
-
-USES=		pkgconfig python
+USES=		cmake:indirect pkgconfig python
 USE_PYTHON=	distutils autoplist
 
 # setup.py loses track of its cwd when it switches over to the CMake build
 # process and searches in ${WRKSRC}/src/build/lib instead of ${WRKSRC}/build/lib
 # for the Python packages that were built before the CMake build process.
 pre-install:
 	@${CP} -r ${WRKSRC}/build/lib ${WRKSRC}/src/build/lib
 
 # Next problem: The compiled library is not installed automatically by setup.py
 # so it needs to be manually installed and stripped to the appropriate
 # directory.
 post-install:
 	${INSTALL_LIB} ${WRKSRC}/src/build/llvm/lib/libkeystone.so \
 	       	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/keystone
 
 # Even without the both fixes (or hacks?) that were applied beforehand the
 # .PLIST.pymodtmp has only the EGG files as a whole. Therefore the
 # .PLIST.pymodtmp has to be regenerated in some way - it's a rather "dirty"
 # hack to pass the stage-qa target.
 #
 # Another solution would a static pkg-plist but then the package has to be
 # bound to a specific Python version or multiple package must be created for
 # specific Python versions.
 post-stage:
 	@${FIND} ${STAGEDIR} -type f -o -type l | \
 	       	${SORT} | ${SED} -e 's|${STAGEDIR}||' \
        		> ${WRKDIR}/.PLIST.pymodtmp
 
 .include <bsd.port.mk>
diff --git a/devel/py-lief/Makefile b/devel/py-lief/Makefile
index 533a44a4d024..f848e0e0a02b 100644
--- a/devel/py-lief/Makefile
+++ b/devel/py-lief/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=	lief
 DISTVERSION=	0.12.3
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@nicandneal.net
 COMMENT=	Library to instrument executable formats
 WWW=		https://github.com/lief-project/lief
 
 LICENSE=	APACHE20
 
 # Note: cmake is needed to build, but distutils is used directly.
 # If USES= cmake is set, the build will not work.
-BUILD_DEPENDS=	cmake:devel/cmake-core
 
-USES=		python zip
+USES=		cmake:indirect python zip
 USE_PYTHON=	concurrent distutils
 
 PY_VER=		${PYTHON_VER:S/.//}
 PLIST_SUB=	PY_VER=${PY_VER}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/lief.cpython-${PY_VER}.so
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-aws-crt/Makefile b/devel/rubygem-aws-crt/Makefile
index 65e63bc0df42..229a612a3bc1 100644
--- a/devel/rubygem-aws-crt/Makefile
+++ b/devel/rubygem-aws-crt/Makefile
@@ -1,24 +1,23 @@
 PORTNAME=	aws-crt
 PORTVERSION=	0.2.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	AWS SDK for Ruby - Common Run Time
 WWW=		https://github.com/awslabs/aws-crt-ruby
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 RUN_DEPENDS=	rubygem-ffi>=0:devel/rubygem-ffi
 
-USES=		gem python:env shebangfix
+USES=		cmake:indirect gem python:env shebangfix
 
 SHEBANG_GLOB=	*.py *.sh
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/tmp/
 	${REINPLACE_CMD} -e '/${GEM_LIB_DIR}\/tmp\//d' ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/tinygo/Makefile b/devel/tinygo/Makefile
index a393cbcda437..ab69000c4194 100644
--- a/devel/tinygo/Makefile
+++ b/devel/tinygo/Makefile
@@ -1,97 +1,96 @@
 PORTNAME=	tinygo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.19.0
 PORTREVISION=	17
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Go compiler for small places
 WWW=		https://tinygo.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 TEST_DEPENDS=	qemu-system-arm:emulators/qemu
 
-USES=		gmake go:modules,run ninja:build python:build
+USES=		cmake:indirect gmake go:modules,run ninja:build python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tinygo-org
 GH_TUPLE=	\
 		blakesmith:ar:8bd4349a67f2:blakesmith_ar/vendor/github.com/blakesmith/ar \
 		bugst:go-serial:v1.1.2:bugst_go_serial/vendor/go.bug.st/serial \
 		chromedp:cdproto:dabd2f2e7693:chromedp_cdproto/vendor/github.com/chromedp/cdproto \
 		chromedp:chromedp:v0.6.4:chromedp_chromedp/vendor/github.com/chromedp/chromedp \
 		chromedp:sysutil:v1.0.0:chromedp_sysutil/vendor/github.com/chromedp/sysutil \
 		creack:goselect:v0.1.1:creack_goselect/vendor/github.com/creack/goselect \
 		davecgh:go-spew:v1.1.0:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		gobwas:httphead:v0.1.0:gobwas_httphead/vendor/github.com/gobwas/httphead \
 		gobwas:pool:v0.2.1:gobwas_pool/vendor/github.com/gobwas/pool \
 		gobwas:ws:v1.0.4:gobwas_ws/vendor/github.com/gobwas/ws \
 		golang:sys:4bcb84eeeb78:golang_sys/vendor/golang.org/x/sys \
 		golang:tools:b320d3a0f5a2:golang_tools/vendor/golang.org/x/tools \
 		google:shlex:c34317bd91bf:google_shlex/vendor/github.com/google/shlex \
 		josharian:intern:v1.0.0:josharian_intern/vendor/github.com/josharian/intern \
 		mailru:easyjson:v0.7.6:mailru_easyjson/vendor/github.com/mailru/easyjson \
 		marcinbor85:gohex:343a4b548892:marcinbor85_gohex/vendor/github.com/marcinbor85/gohex \
 		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.12:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		tinygo-org:go-llvm:e7b85195e81c:tinygo_org_go_llvm/vendor/tinygo.org/x/go-llvm
 
 # Device files and runtime are distributed as submodules
 GH_TUPLE+=	ARM-software:CMSIS:9fe411cef1ce:cmsis/lib/CMSIS \
 		NordicSemiconductor:nrfx:b5399066bd7f:nrfx/lib/nrfx \
 		WebAssembly:wasi-libc:c7465d22096f:wasi_libc/lib/wasi-libc \
 		avr-rust:avr-mcu:40d15c1c56c3:avr/lib/avr \
 		llvm-mirror:compiler-rt:df52202e77b1:compiler_rt/lib/compiler-rt \
 		picolibc:picolibc:3bf0a107362b:picolibc/lib/picolibc \
 		tinygo-org:cmsis-svd:9c35b6d9df1f:cmsis_svd/lib/cmsis-svd \
 		tinygo-org:stm32-svd:3a0b0829b70b:stm32_svd/lib/stm32-svd
 
 # Bundled LLVM
 GH_TUPLE+=	llvm:llvm-project:llvmorg-11.1.0:llvm/llvm-project
 
 OPTIONS_DEFINE=	AVR QEMU SIMAVR
 
 AVR_DESC=	AVR based processors support
 QEMU_DESC=	Install emulators/qemu for Cortex-M targets
 SIMAVR_DESC=	Install devel/simavr for AVR targets
 
 AVR_RUN_DEPENDS=	${LOCALBASE}/avr/include/stdint.h:devel/avr-libc \
 			avr-gcc:devel/avr-gcc \
 			avrdude:devel/avrdude
 AVR_VARS_OFF=		AVR=0
 
 QEMU_RUN_DEPENDS=	qemu-system-arm:emulators/qemu
 SIMAVR_RUN_DEPENDS=	simavr:devel/simavr
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		HOME=${WRKDIR} \
 		${GMAKE} llvm-build
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		GO=${GO_CMD} \
 		HOME=${WRKDIR} \
 		PATH=${WRKSRC}/llvm-build/bin:$$PATH \
 		${GMAKE} build/release
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/tinygo
 	cd ${WRKSRC}/build/release/tinygo && \
 		${MKDIR} ${STAGEDIR}${PREFIX}/tinygo/bin && \
 		${INSTALL_PROGRAM} bin/tinygo ${STAGEDIR}${PREFIX}/tinygo/bin && \
 		${COPYTREE_SHARE} "lib pkg src targets" ${STAGEDIR}${PREFIX}/tinygo
 	${RLN} ${STAGEDIR}${PREFIX}/tinygo/bin/tinygo ${STAGEDIR}${PREFIX}/bin
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} \
 		AVR=${AVR} \
 		GOCACHE=${WRKDIR}/.gocache \
 		PATH=${WRKSRC}/llvm-build/bin:$$PATH \
 		RISCV=0 \
 		TINYGO=${WRKSRC}/build/tinygo \
 		${GMAKE} test smoketest
 
 .include <bsd.port.mk>
diff --git a/devel/tomlplusplus/Makefile b/devel/tomlplusplus/Makefile
index b9c79dfd0b03..96154aef1615 100644
--- a/devel/tomlplusplus/Makefile
+++ b/devel/tomlplusplus/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	tomlplusplus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.4.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	TOML config parser and serializer for C++
 WWW=		https://marzer.github.io/tomlplusplus/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 TEST_DEPENDS=	catch>0:devel/catch
 
-USES=		compiler:c++17-lang meson pkgconfig
+USES=		cmake:indirect compiler:c++17-lang meson pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	marzer
 MESON_ARGS=	-Duse_vendored_libs=false
 
 post-patch:
 # Convert codeset from GNU to IANA
 	@${REINPLACE_CMD} 's/utf8/UTF-8/' ${WRKSRC}/tests/meson.build
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
 		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dbuild_tests=true"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile
index c3c65d3d1c4d..c778ea06a157 100644
--- a/graphics/waffle/Makefile
+++ b/graphics/waffle/Makefile
@@ -1,59 +1,57 @@
 PORTNAME=	waffle
 DISTVERSION=	1.6.1-15
 PORTREVISION=	4
 CATEGORIES=	graphics
 
 # Wayland xdg-shell support (to run on sway/wayfire/etc. that have removed wl-shell)
 PATCH_SITES=	https://gitlab.freedesktop.org/bl4ckb0ne/${PORTNAME}/-/commit/
 PATCHFILES=	39ad2b26f46e90cbae13a9cbc58e1f9df03f0980.patch:-p1 \
 		e4a1e7e9670b77d5b145520d60c4b7570fe3c6ea.patch:-p1 \
 		8c202f88ab4f0f851e3f19dd82bc6b5236120564.patch:-p1
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Library that allows to defer selection of an OpenGL API until runtime
 WWW=		https://www.waffle-gl.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
-
-USES=		compiler:c11 gl localbase meson pkgconfig python:build
+USES=		cmake:indirect compiler:c11 gl localbase meson pkgconfig python:build
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	mesa
 GL_TAGNAME=	2485a41c321a29463b5c0af7813c2d1046e2f925
 USE_GL=		egl gl
 USE_LDCONFIG=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/waffle1
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		DOCS GBM MANPAGES SURFACELESS WAYLAND X11
 OPTIONS_DEFAULT=	GBM MANPAGES SURFACELESS WAYLAND X11
 OPTIONS_SUB=		yes
 
 GBM_DESC=		GBM/DRM/KMS direct-on-hardware support
 SURFACELESS_DESC=	Surfaceless EGL support
 
 GBM_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 GBM_USE=		GL=gbm
 GBM_MESON_ENABLED=	gbm
 
 MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 MANPAGES_USES=		gnome
 MANPAGES_USE=		GNOME=libxslt:build
 MANPAGES_MESON_TRUE=	build-manpages
 
 SURFACELESS_MESON_ENABLED=	surfaceless_egl
 
 WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols \
 			wayland-scanner:graphics/wayland
 WAYLAND_LIB_DEPENDS=	libwayland-egl.so:graphics/wayland
 WAYLAND_MESON_ENABLED=	wayland
 
 X11_USES=		xorg
 X11_USE=		XORG=x11,xcb
 X11_MESON_ENABLED=	glx x11_egl
 
 .include <bsd.port.mk>
diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile
index 35add470069a..cb61a0f8389f 100644
--- a/java/openjfx14/Makefile
+++ b/java/openjfx14/Makefile
@@ -1,177 +1,176 @@
 PORTNAME=	openjfx
 DISTVERSION=	14.0.2.1+1
 PORTREVISION=	15
 CATEGORIES=	java x11-toolkits devel
 MASTER_SITES=	https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.7.1/:queries \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.7.1/:queryparser \
 		https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.7.1/:sandbox \
 		https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/:antlr
 PKGNAMESUFFIX=	14
 DISTFILES=	lucene-core-7.7.1.jar:core \
 		lucene-grouping-7.7.1.jar:grouping \
 		lucene-queries-7.7.1.jar:queries \
 		lucene-queryparser-7.7.1.jar:queryparser \
 		lucene-sandbox-7.7.1.jar:sandbox \
 		antlr4-4.7.2-complete.jar:antlr
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JavaFX SDK overlay for OpenJDK 11
 WWW=		https://openjdk.java.net/projects/openjfx/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	zip:archivers/zip \
 		apache-ant>0:devel/apache-ant \
 		gradle62>=6.2:devel/gradle62 \
 		${JAVALIBDIR}/junit.jar:java/junit
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-USES=		gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \
+USES=		cmake:indirect gettext-runtime gl gnome jpeg localbase:ldflags ninja pkgconfig \
 		sqlite xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openjdk
 GH_PROJECT=	jfx
 USE_GL=		gl
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
 USE_JAVA=	yes
 JAVA_VERSION=	11
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xtst xxf86vm
 
 CFLAGS+=	-Wno-unused-command-line-argument \
 		-Wno-int-conversion
 
 PLIST_SUB=	INSTALLDIR=${_INSTALLDIR}
 
 OPTIONS_DEFINE=	MEDIA SWT TEST WEBKIT
 OPTIONS_DEFAULT=	MEDIA WEBKIT
 OPTIONS_SUB=	yes
 
 MEDIA_DESC=	Media module
 SWT_DESC=	SWT support
 
 MEDIA_LIB_DEPENDS=	libavcodec.so.58:multimedia/ffmpeg4 \
 			libsndio.so:audio/sndio
 MEDIA_USES=	gmake
 MEDIA_VARS=	COMPILE_MEDIA=true
 
 SWT_BUILD_DEPENDS=	swt>0:x11-toolkits/swt
 SWT_RUN_DEPENDS=	swt>0:x11-toolkits/swt
 SWT_VARS=	COMPILE_SWT=true
 
 TEST_USES=	display:test
 TEST_VARS=	AWT_TEST=true FULL_TEST=true
 
 # Gradle calls CMake during the build
 WEBKIT_IMPLIES=	MEDIA
-WEBKIT_BUILD_DEPENDS=	cmake:devel/cmake-core
 WEBKIT_LIB_DEPENDS=	libicui18n.so:devel/icu
 WEBKIT_USES=	bison gmake gperf perl5 python:build ruby:build
 WEBKIT_USE=	GNOME=libxslt,libxml2 \
 		PERL5=build \
 		XORG=xcomposite,xdamage,xfixes,xrender,xt
 WEBKIT_VARS=	COMPILE_WEBKIT=true
 
 # Move Gradle's home below ${WRKDIR} instead of using ${HOME}/.gradle
 _GRADLE_ENV=	CC=${WRKDIR}/bin/ccwrapper \
 		CXX=${WRKDIR}/bin/cxxwrapper \
 		GRADLE_USER_HOME=${WRKDIR}/gradle-home \
 		JAVA_VERSION=${JAVA_VERSION}
 _GRADLE_RUN=	${SETENV} ${_GRADLE_ENV} gradle62 --no-daemon
 
 _INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 # Suppress errors with lld >= 17 due to undefined symbols.
 LDFLAGS+=	-Wl,--undefined-version
 
 post-extract:
 	${MKDIR} ${WRKDIR}/jars
 .for f in core grouping queries queryparser sandbox
 	${CP} ${DISTDIR}/lucene-${f}-7.7.1.jar ${WRKDIR}/jars
 .endfor
 	${CP} ${DISTDIR}/antlr4-4.7.2-complete.jar ${WRKDIR}/jars
 
 # The BSD Makefiles for GStreamer-lite and Jfxmedia are based on the
 # Linux versions.  Prepare the tree, so that we only see the changes
 # from Linux's Makefile in our own patches.
 pre-patch:
 	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/linux \
 		${WRKSRC}/modules/javafx.media/src/main/native/jfxmedia/projects/bsd
 	@${CP} -r ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux \
 		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/bsd
 
 post-patch:
 	@${MKDIR} ${WRKDIR}/bin
 	@${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CC} ${CFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/ccwrapper
 	@${PRINTF} '#!/bin/sh\nexport CCACHE_DIR=${CCACHE_DIR}\nexec ${CCACHE_BIN} ${CXX} ${CXXFLAGS} ${LDFLAGS} "$$@"\n' > ${WRKDIR}/bin/cxxwrapper
 	@${CHMOD} +x ${WRKDIR}/bin/ccwrapper ${WRKDIR}/bin/cxxwrapper
 	@${REINPLACE_CMD} -e 's|gcc|${WRKDIR}/bin/ccwrapper|g' \
 			  -e 's|g\+\+|${WRKDIR}/bin/cxxwrapper|g' \
 		${WRKSRC}/buildSrc/bsd.gradle
 # Add a *BSD native audio sink to GStreamer-lite instead of using the
 # bundled ALSA sink.  Currently we add an sndio sink, but this is an extension
 # point for eventually adding an OSS backend (or others) as an option as well.
 # If you add a new one make sure it registers itself as "bsdaudiosink" as defined
 # in modules/media/src/main/native/jfxmedia/platform/gstreamer/GstPipelineFactory.cpp
 	@${MKDIR} ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
 	@${CP} ${FILESDIR}/gstsndio.* ${FILESDIR}/sndiosink.* \
 		${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio
 	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/ext/bsdaudio && \
 		${LN} -s gstsndio.c gstbsdaudio.c && \
 		${LN} -s sndiosink.c bsdaudiosink.c
 # Pull Java dependencies from LOCALBASE
 	@${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/build.gradle ${WRKSRC}/buildSrc/build.gradle
 # Remove bundled libraries. We use the system's versions instead.
 	@cd ${WRKSRC}/modules/javafx.web/src/main/native/Source/ThirdParty && \
 		${RM} -r icu libxml libxslt sqlite
 	@${RM} -r ${WRKSRC}/modules/javafx.web/src/main/native/Source/WTF/icu
 	@cd ${WRKSRC}/modules/javafx.media/src/main/native/gstreamer/3rd_party && \
 		${RM} -r glib libffi
 # Environment variables gets lost so hardcode where we can find FFmpeg 4.x
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
 
 do-configure:
 	@${MKDIR} ${WRKDIR}/gradle-home
 	@${ECHO_CMD} "NUM_COMPILE_THREADS = ${MAKE_JOBS_NUMBER}" > ${WRKSRC}/gradle.properties
 	@${ECHO_CMD} "JFX_DEPS_URL = ${WRKDIR}/jars" > ${WRKSRC}/gradle.properties
 .for prop in COMPILE_MEDIA COMPILE_WEBKIT AWT_TEST FULL_TEST
 	@${ECHO_CMD} "${prop} = ${${prop}:Ufalse}" >> ${WRKSRC}/gradle.properties
 .endfor
 	@${ECHO_CMD} "BSD.compileSWT = ${COMPILE_SWT:Ufalse};" >> ${WRKSRC}/buildSrc/bsd.gradle
 
 # the java doc are not installed on FreeBSD so exclude the javadoc task
 # as it'll fail otherwise
 do-build:
 	@cd ${WRKSRC} && ${_GRADLE_RUN} zips --exclude-task javadoc
 
 # it's not recommended to install openjfx inside openjdk directory
 do-install:
 	@${MKDIR} ${STAGEDIR}${_INSTALLDIR} \
 		${STAGEDIR}${_INSTALLDIR}/lib \
 		${STAGEDIR}${_INSTALLDIR}/jmods
 	${INSTALL_DATA} ${WRKSRC}/build/javafx-exports.zip ${STAGEDIR}${_INSTALLDIR}
 	(cd ${WRKSRC}/build/artifacts/javafx-sdk-14.0.2.1/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/lib)
 	@${MV} ${STAGEDIR}${_INSTALLDIR}/lib/src.zip ${STAGEDIR}${_INSTALLDIR}/lib/javafx-src.zip
 	(cd ${WRKSRC}/build/artifacts/javafx-jmods-14.0.2.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${_INSTALLDIR}/jmods)
 	@${FIND} ${STAGEDIR}${_INSTALLDIR}/lib -name '*.so' -exec ${STRIP_CMD} \{\} \;
 
 do-test-TEST-on:
 	@cd ${WRKSRC} && ${_GRADLE_RUN} check test
 
 .include <bsd.port.mk>
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index d7568c882d81..568ec5e938a1 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -1,288 +1,287 @@
 PORTNAME=	rust
 PORTVERSION?=	1.77.0
 PORTREVISION?=	0
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
 		https://dev-static.rust-lang.org/dist/:src \
 		LOCAL/rust:bootstrap \
 		https://static.rust-lang.org/dist/:bootstrap
 DISTNAME?=	${PORTNAME}c-${PORTVERSION}-src
 DISTFILES?=	${NIGHTLY_DATE:D${NIGHTLY_DATE}/}${DISTNAME}${EXTRACT_SUFX}:src \
 		${_RUSTC_BOOTSTRAP}${EXTRACT_SUFX}:bootstrap \
 		${_RUST_STD_BOOTSTRAP}${EXTRACT_SUFX}:bootstrap \
 		${_CARGO_BOOTSTRAP}${EXTRACT_SUFX}:bootstrap
 DIST_SUBDIR?=	rust
 
 MAINTAINER=	rust@FreeBSD.org
 COMMENT=	Language with a focus on memory safety and concurrency
 WWW=		https://www.rust-lang.org/
 
 LICENSE=	APACHE20 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
 
 ONLY_FOR_ARCHS?=	aarch64 amd64 armv7 i386 powerpc64 powerpc64le powerpc \
 			riscv64
 ONLY_FOR_ARCHS_REASON?=	requires prebuilt bootstrap compiler
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
-USES=		cpe ninja:build pkgconfig python:build ssl tar:xz
+USES=		cmake:indirect cpe ninja:build pkgconfig python:build ssl tar:xz
 
 CPE_VENDOR=	rust-lang
 
 MAKE_ENV=	DESTDIR=${STAGEDIR} \
 		LIBGIT2_NO_PKG_CONFIG=1 \
 		OPENSSL_DIR="${OPENSSLBASE}"
 TEST_ENV=	${MAKE_ENV} \
 		ALLOW_NONZERO_RLIMIT_CORE=1
 
 CONFLICTS_INSTALL?=	rust-nightly
 
 # rustc stashes intermediary files in TMPDIR (default /tmp) which
 # might cause issues for users that for some reason space limit
 # their /tmp.  WRKDIR should have plenty of space.
 # ?= to allow users to still overwrite it in make.conf.
 TMPDIR?=	${WRKDIR}
 
 OPTIONS_DEFINE=		DOCS GDB LTO PORT_LLVM SOURCES WASM
 OPTIONS_DEFAULT=	SOURCES WASM
 
 GDB_DESC=	Install ports gdb (necessary for debugging rust programs)
 PORT_LLVM_DESC=	Build against devel/llvm instead of bundled copy (experimental)
 SOURCES_DESC=	Install source files
 WASM_DESC=	Build the WebAssembly target (wasm32-unknown-unknown)
 
 DOCS_VARS=		_RUST_BUILD_DOCS=true \
 			_COMPONENTS+="rust-docs-${_PACKAGE_VERS}-${_RUST_TARGET} rust-docs-json-${_PACKAGE_VERS}-${_RUST_TARGET}" \
 			_RUST_TOOLS+=rustdoc
 DOCS_VARS_OFF=		_RUST_BUILD_DOCS=false
 GDB_RUN_DEPENDS=	${LOCALBASE}/bin/gdb:devel/gdb
 PORT_LLVM_USES=		llvm:min=16,lib,noexport
 PORT_LLVM_MAKE_ENV=	RUSTFLAGS="-Lnative=${LOCALBASE}/lib"
 SOURCES_VARS=		_COMPONENTS+=rust-src-${_PACKAGE_VERS} \
 			_RUST_TOOLS+=src
 WASM_VARS=		_COMPONENTS+="rust-analysis-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-std-${_PACKAGE_VERS}-wasm32-unknown-unknown" \
 			_RUST_TARGETS+=wasm32-unknown-unknown
 
 # See WRKSRC/src/stage0.json for the date and version values
 BOOTSTRAPS_DATE?=		2024-02-08
 RUST_BOOTSTRAP_VERSION?=	1.76.0
 
 CARGO_VENDOR_DIR?=		${WRKSRC}/vendor
 
 # Rust's target arch string might be different from *BSD arch strings
 _RUST_ARCH_amd64=	x86_64
 _RUST_ARCH_i386=	i686
 _RUST_ARCH_riscv64=	riscv64gc
 _RUST_TARGET=		${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl}
 _RUST_TARGETS=		${_RUST_TARGET}
 _RUST_TOOLS=		analysis cargo clippy rust-analyzer rustdoc rustfmt
 
 _RUSTC_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
 _RUST_STD_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
 _CARGO_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET}
 
 _PACKAGE_VERS=		${NIGHTLY_DATE:?nightly:${PORTVERSION}}
 _COMPONENTS+=		cargo-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			clippy-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rustc-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rustfmt-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rust-analysis-${_PACKAGE_VERS}-${_RUST_TARGET} \
 			rust-std-${_PACKAGE_VERS}-${_RUST_TARGET}
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		is only for FreeBSD
 .endif
 
 .if ${ARCH} == powerpc
 LIB_DEPENDS+=	libatomic.so:lang/gcc${GCC_DEFAULT}
 MAKE_ENV+=	RUSTFLAGS="-L/usr/local/lib/gcc${GCC_DEFAULT}"
 .else
 MAKE_ENV+=	RUST_BACKTRACE=1
 .endif
 
 # rls doesn't build on rust nightly
 # rls needs 64-bit atomics: it doesn't build on powerpc
 .if !defined(NIGHTLY_DATE) && ${ARCH} != powerpc
 _RUST_TOOLS+=	rls
 _COMPONENTS+=	rls-${_PACKAGE_VERS}-${_RUST_TARGET}
 .endif
 
 # per https://rust-lang.github.io/rustup/concepts/components.html
 # rustc-dev is only usefull on nightly
 .if defined(NIGHTLY_DATE)
 _COMPONENTS+=	rustc-dev-${_PACKAGE_VERS}-${_RUST_TARGET}
 .endif
 
 .if ${PORT_OPTIONS:MWASM} && ${PORT_OPTIONS:MDOCS}
 _COMPONENTS+=	rust-docs-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-docs-json-${_PACKAGE_VERS}-wasm32-unknown-unknown
 .endif
 
 .ifdef QEMU_EMULATING
 IGNORE=	fails to build with qemu-user-static
 .endif
 
 .if make(makesum)
 DISTFILES:=	${DISTFILES:M*\:src} \
 		${ONLY_FOR_ARCHS:O:@_arch@${:!${MAKE} ARCH=${_arch} -V'DISTFILES:N*\:src'!}@}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's,gdb,${LOCALBASE}/bin/gdb,' ${WRKSRC}/src/etc/rust-gdb
 .if defined(NIGHTLY_DATE)
 	@${REINPLACE_CMD} 's/"rustfmt"/"nothx"/' ${WRKSRC}/src/stage0.json
 .endif
 # Disable vendor checksums
 	@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
 		${CARGO_VENDOR_DIR}/*/.cargo-checksum.json
 
 post-patch-PORT_LLVM-on:
 # WASM target hardcodes bundled lld
 	@${REINPLACE_CMD} 's|"rust-lld"|"wasm-ld${LLVM_VERSION}"|' \
 		${WRKSRC}/compiler/rustc_target/src/spec/base/wasm.rs
 
 do-configure:
 # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64
 	@${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \
 		${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh
 .for _component in cargo rust-std rustc
 	@cd ${WRKDIR}/${_component}-*-${OPSYS:tl} && \
 		${SH} install.sh --prefix=${WRKDIR}/bootstrap --verbose
 .endfor
 	@${ECHO_CMD} 'changelog-seen=2' > ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[build]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'build-dir="${WRKDIR}/_build"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'build-stage=2' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'doc-stage=2' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'test-stage=2' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'vendor=true' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'extended=true' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'python="${PYTHON_CMD}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'docs=${_RUST_BUILD_DOCS}' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'verbose=2' >> ${WRKSRC}/config.toml
 .if defined(NIGHTLY_DATE)
 	@${ECHO_CMD} 'profiler=true' >> ${WRKSRC}/config.toml
 .endif
 	@${ECHO_CMD} 'target=[${_RUST_TARGETS:@.target.@"${.target.}"@:ts,}]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cargo="${WRKDIR}/bootstrap/bin/cargo"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'rustc="${WRKDIR}/bootstrap/bin/rustc"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'tools=[${_RUST_TOOLS:@.tool.@"${.tool.}"@:ts,}]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[install]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'prefix="${PREFIX}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml
 .if ${PORT_OPTIONS:MWASM} && !${PORT_OPTIONS:MPORT_LLVM}
 	@${ECHO_CMD} 'lld=true' >> ${WRKSRC}/config.toml
 .else
 	@${ECHO_CMD} 'lld=false' >> ${WRKSRC}/config.toml
 .endif
 .if ${PORT_OPTIONS:MLTO}
 	@${ECHO_CMD} 'lto="thin"' >> ${WRKSRC}/config.toml
 .endif
 	@${ECHO_CMD} '[llvm]' >> ${WRKSRC}/config.toml
 .if ${PORT_OPTIONS:MLTO}
 	@${ECHO_CMD} 'thin-lto=true' >> ${WRKSRC}/config.toml
 .endif
 .if defined(WITH_CCACHE_BUILD) && !defined(NO_CCACHE)
 	@${ECHO_CMD} 'ccache="${CCACHE_BIN}"' >> ${WRKSRC}/config.toml
 .else
 	@${ECHO_CMD} 'ccache=false' >> ${WRKSRC}/config.toml
 .endif
 	@${ECHO_CMD} 'ninja=true' >> ${WRKSRC}/config.toml
 .if ${ARCH} == powerpc
 # Rust doesn't call the system compiler with the full version of the target.
 # This makes powerpc miscompile due to the secure-plt ABI change.
 # Additionally, force using ld.bfd to work around a linking problem in rustc_mir
 	@${PRINTF} '#!/bin/sh\nexec ${CC} "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/cc-wrapper
 	@${CHMOD} +x ${WRKDIR}/cc-wrapper
 	@${PRINTF} '#!/bin/sh\nexec ${CXX} "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/cxx-wrapper
 	@${CHMOD} +x ${WRKDIR}/cxx-wrapper
 	@${PRINTF} '#!/bin/sh\nexec ${CC} -fuse-ld=bfd "$$@" --target=powerpc-unknown-freebsd13.0' > ${WRKDIR}/ld-wrapper
 	@${CHMOD} +x ${WRKDIR}/ld-wrapper
 .endif
 .for _target in ${_RUST_TARGETS}
 	@${ECHO_CMD} '[target.${_target}]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'ar="${AR}"' >> ${WRKSRC}/config.toml
 .if ${ARCH} == powerpc
 	@${ECHO_CMD} 'cc="${WRKDIR}/cc-wrapper"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cxx="${WRKDIR}/cxx-wrapper"' >> ${WRKSRC}/config.toml
 .else
 	@${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml
 .endif
 .if ${ARCH} == powerpc
 	@${ECHO_CMD} 'linker="${WRKDIR}/ld-wrapper"' >> ${WRKSRC}/config.toml
 .else
 	@${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml
 .endif
 .if ${PORT_OPTIONS:MPORT_LLVM}
 	@${ECHO_CMD} 'llvm-config="${LOCALBASE}/bin/${LLVM_CONFIG}"' >> ${WRKSRC}/config.toml
 .endif
 .endfor
 	@${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml
 	@${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml
 .if defined(NIGHTLY_DATE)
 # Don't abort if optional tools fail to build
 	@${ECHO_CMD} 'missing-tools=true' >> ${WRKSRC}/config.toml
 .endif
 
 do-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py dist --jobs=${MAKE_JOBS_NUMBER}
 
 do-install:
 	${RM} -r ${WRKDIR}/_extractdist
 .for _c in ${_COMPONENTS}
 	${MKDIR} ${WRKDIR}/_extractdist
 	${TAR} xf ${WRKDIR}/_build/dist/${_c}.tar.xz -C ${WRKDIR}/_extractdist
 	cd ${WRKDIR}/_extractdist/${_c} && \
 		${SH} install.sh \
 		--docdir="${STAGEDIR}${DOCSDIR}" \
 		--mandir="${STAGEDIR}${PREFIX}/share/man" \
 		--prefix="${STAGEDIR}${PREFIX}"
 	${RM} -r ${WRKDIR}/_extractdist
 .endfor
 
 # We autogenerate the plist file.  We do that, instead of the
 # regular pkg-plist, because several libraries have a computed
 # filename based on the absolute path of the source files.  As it
 # is user-specific, we cannot know their filename in advance.
 	@${RM}	${STAGEDIR}${DOCSDIR}/*.old \
 		${STAGEDIR}${PREFIX}/lib/rustlib/components \
 		${STAGEDIR}${PREFIX}/lib/rustlib/install.log \
 		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \
 		${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \
 		${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
 	@${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib \
 		${STAGEDIR}${PREFIX}/libexec -exec ${FILE} -i {} + | \
 		${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX} -not -type d | \
 		${SED} -E -e 's,^${STAGEDIR}${PREFIX}/,,' \
 			-e 's,(share/man/man[1-9]/.*\.[0-9]),\1.gz,' >> ${TMPPLIST}
 
 post-install-DOCS-on:
 # Ignore any left behind empty directories in case some docs fail
 # to build (failures are ignored due to deny-warnings=false).
 	@${FIND} ${STAGEDIR}${DOCSDIR}/html -empty -type d | \
 		${SED} 's,^${STAGEDIR},@comment @dir ,' >> ${TMPPLIST}
 
 post-install-SOURCES-on:
 # Silence stage-qa warnings by sanitizing permissions on sources
 	@${FIND} ${STAGEDIR}${PREFIX}/lib/rustlib/src -type f -exec ${CHMOD} \
 		${SHAREMODE} {} +
 
 # Note that make test does not work when rust is already installed.
 do-test:
 	@cd ${WRKSRC} && \
 		${SETENV} ${TEST_ENV} ${PYTHON_CMD} x.py test --jobs=${MAKE_JOBS_NUMBER}
 
 .include <bsd.port.post.mk>
diff --git a/math/py-z3-solver/Makefile b/math/py-z3-solver/Makefile
index 846b2a1d1877..35c5a153dff6 100644
--- a/math/py-z3-solver/Makefile
+++ b/math/py-z3-solver/Makefile
@@ -1,36 +1,34 @@
 PORTNAME=	z3-solver
 DISTVERSIONPREFIX=	z3-
 DISTVERSION=	4.8.17
 PORTREVISION=	1
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python binding for Z3 Theorem Prover
 WWW=		https://github.com/Z3Prover/z3
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../../LICENSE.txt
 
 BROKEN_armv7=	fails to compile on 13.1 and 14: clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=268009
 BROKEN_riscv64=	fails to configure, see https://github.com/Z3Prover/z3/issues/6183
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
-
-USES=		compiler:c++11-lang python
+USES=		cmake:indirect compiler:c++11-lang python
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Z3Prover
 GH_PROJECT=	z3
 
 CFLAGS_armv7=	-fPIC
 
 WRKSRC_SUBDIR=	src/api/python
 
 # CAVEAT: There should have LIB_DEPENDS=libz3.so:math/z3, but currently it rebuilds all code, see https://github.com/Z3Prover/z3/issues/1767
 
 post-patch: # https://github.com/Z3Prover/z3/issues/2131
 	@${REINPLACE_CMD} 's|…|...|' ${WRKSRC}/../../ast/recfun_decl_plugin.h
 
 .include <bsd.port.mk>
diff --git a/multimedia/py-opentimelineio/Makefile b/multimedia/py-opentimelineio/Makefile
index 4f4e7f321e8e..feea202aa04b 100644
--- a/multimedia/py-opentimelineio/Makefile
+++ b/multimedia/py-opentimelineio/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	opentimelineio
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.0
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	API and interchange format for editorial timeline information
 WWW=		https://github.com/PixarAnimationStudios/OpenTimelineIO
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libImath-3_1.so:math/Imath
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>0:devel/py-pybind11@${PY_FLAVOR}
 
-USES=		compiler:c++14-lang python
+USES=		cmake:indirect compiler:c++14-lang python
 USE_PYTHON=	distutils concurrent # autoplist is broken, see https://github.com/PixarAnimationStudios/OpenTimelineIO/issues/1205
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PixarAnimationStudios
 GH_PROJECT=	OpenTimelineIO
 
 GH_TUPLE=	pybind:pybind11:e7e2c79f3f520f78ffc39fcb34f7919003102733:pybind_pybind11/src/deps/pybind11 \
 		Tencent:rapidjson:06d58b9e848c650114556a23294d0b6440078c61:Tencent_rapidjson/src/deps/rapidjson
 
 PORTSCOUT=	limit:^.*[0-9]$$ # should end with a digit to prevent tags like last_pure_python
 
 .include <bsd.port.mk>
diff --git a/multimedia/wlrobs/Makefile b/multimedia/wlrobs/Makefile
index ae8abf8cce69..6ea8d8d3c8a0 100644
--- a/multimedia/wlrobs/Makefile
+++ b/multimedia/wlrobs/Makefile
@@ -1,23 +1,22 @@
 PORTNAME=	wlrobs
 DISTVERSIONPREFIX=	v
 PORTVERSION=	1.1
 PORTREVISION=	3
 CATEGORIES=	multimedia wayland
 MASTER_SITES=	https://hg.sr.ht/~scoopta/${PORTNAME}/archive/${DISTVERSIONFULL:C/.*-//}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland screen capture plugin for obs-studio
 WWW=		https://hg.sr.ht/~scoopta/wlrobs
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING.md
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libobs.so:multimedia/obs-studio
 
-USES=		compiler:c11 meson pkgconfig
+USES=		cmake:indirect compiler:c11 meson pkgconfig
 DATADIR=	${PREFIX}/lib/obs-plugins
 PORTDATA=	lib${PORTNAME}.so
 
 .include <bsd.port.mk>
diff --git a/print/paps/Makefile b/print/paps/Makefile
index 3009f948d559..56765eb3b298 100644
--- a/print/paps/Makefile
+++ b/print/paps/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	paps
 PORTVERSION=	0.8.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	2
 CATEGORIES=	print
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UTF-8 to PostScript converter using Pango
 WWW=		https://paps.sourceforge.net/
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libfmt.so:devel/libfmt
 
-USES=		compiler:c++17-lang meson gnome pkgconfig python:env shebangfix
+USES=		cmake:indirect compiler:c++17-lang meson gnome pkgconfig python:env shebangfix
 USE_CXXSTD=	c++17
 USE_GITHUB=	yes
 GH_ACCOUNT=	dov
 USE_GNOME=	cairo pango
 
 SHEBANG_FILES=	${WRKSRC}/scripts/src-to-paps
 
 PLIST_FILES=	bin/paps share/man/man1/paps.1.gz
 
 post-install:
 	${ECHO_CMD} "bin/src-to-paps" >> ${TMPPLIST}
 	${ECHO_CMD} "share/paps/pango_markup.outlang" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/science/PETSc/Makefile b/science/PETSc/Makefile
index fc90a8d2ed33..17133cc86e4f 100644
--- a/science/PETSc/Makefile
+++ b/science/PETSc/Makefile
@@ -1,61 +1,60 @@
 PORTNAME=	PETSc
 DISTVERSION=	3.21.0
 CATEGORIES=	science devel
 MASTER_SITES=	http://web.cels.anl.gov/projects/petsc/download/release-snapshots/ # was: https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/
 DISTNAME=	${PORTNAME:tl}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Suite of data structures and routines from Argonne National Laboratory
 WWW=		https://www.mcs.anl.gov/petsc
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libblis.so:math/blis \
 		libmpich.so:net/mpich
 
-USES=		blaslapack fortran gmake python shebangfix xorg
+USES=		blaslapack cmake:indirect fortran gmake python shebangfix xorg
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-shared-libraries=1 \
 		--with-mpi-dir=${LOCALBASE} \
 		--with-python=1 --with-python-pkg-config=${LOCALBASE}/libdata/pkgconfig \
 		FCFLAGS="${FCFLAGS}" FFLAGS="${FCFLAGS}"	\
 		${CONFIGURE_ARGS_${ARCH}} CPPFLAGS="${CPPFLAGS}" \
 		AR=${AR} RANLIB=${RANLIB} \
 		MAKEFLAGS="${MAKEFLAGS}" LDFLAGS="${LDFLAGS}" LIBS=""
 CONFIGURE_ARGS_amd64=	CFLAGS="${CFLAGS} -msse2" CXXFLAGS="${CXXFLAGS} -msse2"
 CONFIGURE_ARGS_i386=	CFLAGS="${CFLAGS} -msse2" CXXFLAGS="${CXXFLAGS} -msse2"
 CONFIGURE_ARGS=	--with-64-bit-indices # as opposed to 32-bit indices that are default
 CONFIGURE_LOG=	configure.log
 USE_XORG=	x11
 MAKEFILE=	makefile
 SHEBANG_FILES=	configure lib/petsc/bin/*.py lib/petsc/bin/saws/SAWs.py lib/petsc/bin/saws/*.bash config/*.py	\
 		lib/petsc/bin/petscnagfor share/petsc/chkerrconvert.py
 USE_LDCONFIG=	yes
 TEST_TARGET=	test # 152 of 11396 tests (1.3%) fail due to missing files like /usr/local/share/petsc/datafiles/meshes/square_periodic.msh (tests expect the packe to be installed)
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 LDFLAGS+=	${LOCALBASE}/lib/libmpi.so
 
 DATADIR=	${PREFIX}/share/${PORTNAME:tl}
 PLIST_SUB=	SHLIB=${DISTVERSION} SHL=${DISTVERSION:C/\.[0-9]$//}
 
 OPTIONS_DEFINE=		METIS
 OPTIONS_DEFAULT=	METIS
 
 METIS_DESC=		Enable metis support for graph partitioning algorithms
 METIS_CONFIGURE_ON=	--with-metis=1 # --with-parmetis=1 to use include/parmetis.h
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpetsc.so.${DISTVERSION}
 	@${FIND} ${STAGEDIR}${PREFIX} -name "*.html" -delete
 	@cd ${STAGEDIR}${PREFIX} && ${RM} -r bin/win32fe lib/petsc/conf/uninstall.py
 	@${REINPLACE_CMD} -i '' -e 's|^PYTHON = .*|PYTHON = ${PYTHON_CMD}|' ${STAGEDIR}${PREFIX}/lib/petsc/conf/petscvariables
 	@${REINPLACE_CMD} -i '' -e 's|#!/.*|#!${PYTHON_CMD}|' ${STAGEDIR}${PREFIX}/lib/petsc/conf/reconfigure-arch-*-c-debug.py
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/petsc/bin/__pycache__ # stray directory
 
 # the file /usr/local/share/petsc/examples/config/gmakegen.py is expected by some dependencies, at least by math/slepc
 
 .include <bsd.port.mk>
diff --git a/science/nwchem/Makefile b/science/nwchem/Makefile
index 72a5f433ce63..30056991fd8f 100644
--- a/science/nwchem/Makefile
+++ b/science/nwchem/Makefile
@@ -1,115 +1,114 @@
 PORTNAME=	nwchem
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.2.2
 PORTREVISION=	1
 DISTVERSIONSUFFIX=	-release
 CATEGORIES=	science
 MASTER_SITES=	https://www.chemie.uni-bonn.de/pctc/mulliken-center/software/dft-d3/:dftd3 \
 		https://web.archive.org/web/20210527062154if_/https://www.chemie.uni-bonn.de/pctc/mulliken-center/software/dft-d3/:dft3 \
 		https://gitlab.com/libxc/libxc/-/archive/${LIBXC_VERSION}/:libxc
 DISTFILES=	dftd3.tgz:dft3 \
 		libxc-${LIBXC_VERSION}.tar.gz:libxc
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	High-performance computational chemistry software
 WWW=		https://nwchemgit.github.io/
 
 LICENSE=	ECL20
 LICENSE_NAME=	Educational Community License (ECL) 2.0
 LICENSE_FILE=	${WRKSRC}/../LICENSE.TXT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_aarch64=	fails to build: gfortran10: error: unrecognized command-line option '-m64'
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libblas.so:math/blas \
 		libga.so:devel/ga \
 		libhwloc.so:devel/hwloc2
 RUN_DEPENDS=	nwchem-data>0:science/nwchem-data
 TEST_DEPENDS=	bash:shells/bash
 
-USES=		fortran gettext-runtime gmake perl5 pkgconfig
+USES=		cmake:indirect fortran gettext-runtime gmake perl5 pkgconfig
 USE_PERL5=	build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	nwchemgit
 GH_TAGNAME=	a83175e # hotfix/release-7-2-0 branch fixing extremely long compilation time with gmake-4.4.1
 
 MAKEFILE=	GNUmakefile
 ARCH_64BIT=	${ARCH:C/.*64.*/64/:S/${ARCH}//}
 MAKE_ARGS=	NWCHEM_TOP=${WRKSRC}/.. NWCHEM_MODULES=all NWCHEM_LONG_PATHS=Y NWCHEM_TARGET=LINUX${ARCH_64BIT} USE_INTERNALBLAS=Y EXTERNAL_GA_PATH=${LOCALBASE} \
 		USE_64TO32=y
 
 SUB_FILES=	nwchemrc
 
 WRKSRC_SUBDIR=	src
 
 BINARY_ALIAS=	gcc=${CC} gfortran=gfortran${GCC_DEFAULT}
 BINARY_ALIAS+=	make=${GMAKE} # only for LIBXC
 
 PLIST_FILES=	bin/nwchem etc/nwchemrc
 
 LIBXC_VERSION=	6.1.0 # from src/libext/libxc/build_libxc.sh
 
 OPTIONS_DEFINE=			LIBXC PYTHON # more potential optional dependencies are listed in src/libext/GNUmakefile
 OPTIONS_DEFAULT=		LIBXC PYTHON BLAS_SIZE_4 MPICH # the MPI default should be the same as for the MPI option in math/scalapack and devel/ga
 OPTIONS_RADIO=			BLAS_SIZE MPI
 OPTIONS_RADIO_BLAS_SIZE=	BLAS_SIZE_4 BLAS_SIZE_8 # should be the same choice as in devel/ga and math/blas or math/openblasblas
 OPTIONS_RADIO_MPI=		NOMPI MPICH OPENMPI
 
 BLAS_SIZE_DESC=		BLAS_SIZE value to use during build (should be same as in devel/ga)
 BLAS_SIZE_4_DESC=	BLAS_SIZE=4
 BLAS_SIZE_4_MAKE_ARGS=	BLAS_SIZE=4
 BLAS_SIZE_8_BROKEN=	SEGVs on many examples, possibly due to the need to compile blas or openblas with the 8-byte-integers option
 BLAS_SIZE_8_DESC=	BLAS_SIZE=8
 BLAS_SIZE_8_MAKE_ARGS=	BLAS_SIZE=8
 
 NOMPI_DESC=		MPI isn't used
 NOMPI_BROKEN=		Fails to build without MPI
 
 MPICH_MAKE_ENV=		USE_MPI=Y
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 
 OPENMPI_MAKE_ENV=	USE_MPI=Y PATH=${LOCALBASE}/mpi/openmpi/bin:$${PATH} # mpif90 in path determines which MPI library to use, see https://www.nwchem-sw.org/index-php/Compiling_NWChem.html#MPI_variables
 OPENMPI_BUILD_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_RUN_DEPENDS=	openmpi>0:net/openmpi
 OPENMPI_VARS=		CONFLICTS_BUILD=mpich
 
 LIBXC_DESC=		Use libxc
-LIBXC_BUILD_DEPENDS=	cmake:devel/cmake-core
 LIBXC_MAKE_ENV=		USE_LIBXC=Y
 
 PYTHON_DESC=		Enable Python syntax in input files
 PYTHON_USES=		python
 PYTHON_MAKE_ENV=	PYTHONVERSION=${PYTHON_VER} NWCHEM_MODULES="all python"
 
 post-extract:
 	@${RM} ${WRKSRC}/atomscf/src.orig
 	# symlink the downloaded dftd3.tgz
 	@${LN} -s ${DISTDIR}/${DIST_SUBDIR}/dftd3.tgz ${WRKSRC}/nwpw/nwpwlib/nwpwxc/
 
 post-extract-LIBXC-on:
 	# symlink the downloaded libxc
 	@${LN} -s ${DISTDIR}/${DIST_SUBDIR}/libxc-${LIBXC_VERSION}.tar.gz ${WRKSRC}/libext/libxc/
 
 post-patch:
 	@${REINPLACE_CMD} 's|nwchrc="/etc/nwchemrc"|nwchrc="${PREFIX}/etc/nwchemrc"|' ${WRKSRC}/util/util_nwchemrc.F
 
 pre-build:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} nwchem_config
 
 pre-build-BLAS_SIZE_4-on:
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} 64_to_32
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/nwchemrc ${STAGEDIR}${PREFIX}/etc/nwchemrc
 	${INSTALL_PROGRAM} ${WRKSRC}/../bin/LINUX${ARCH_64BIT}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 do-test:
 	@cd ${WRKSRC}/../QA && NWCHEM_TOP=${WRKSRC}/.. NWCHEM_TARGET=LINUX64 ./doqmtests.mpi
 
 .include <bsd.port.mk>
diff --git a/science/py-dlib/Makefile b/science/py-dlib/Makefile
index fbc5dab5d8d1..aa3922ad7b3c 100644
--- a/science/py-dlib/Makefile
+++ b/science/py-dlib/Makefile
@@ -1,52 +1,51 @@
 PORTNAME=	dlib
 DISTVERSION=	19.24.2
 CATEGORIES=	science devel math python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Machine learning framework written in C++ (python bindings)
 WWW=		http://dlib.net
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/dlib/LICENSE.txt
 
-BUILD_DEPENDS=		cmake:devel/cmake-core
 LIB_DEPENDS=		${PY_BOOST} \
 			libpng.so:graphics/png
 
-USES=			compiler:c++11-lang pkgconfig python shebangfix
+USES=			cmake:indirect compiler:c++11-lang pkgconfig python shebangfix
 USE_PYTHON=		autoplist distutils
 SHEBANG_FILES=		python_examples/*.py
 
 OPTIONS_DEFINE=		X11 JPEG GIF SQLITE BLASLAPACK AVX
 OPTIONS_DEFAULT=	X11 JPEG GIF SQLITE
 
 BLASLAPACK_DESC=	Use Blas and Lapack libraries from ports
 AVX_DESC=		Use AVX instructions if supported by CPU
 
 X11_USES=		xorg
 X11_USE=		xorg=x11
 
 JPEG_USES=		jpeg
 JPEG_VARS_OFF=		jpegargs="--no DLIB_JPEG_SUPPORT"
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_VARS_OFF=		pngargs="--no DLIB_PNG_SUPPORT"
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_VARS_OFF=		gifargs="--no DLIB_GIF_SUPPORT"
 
 SQLITE_USES=		sqlite
 SQLITE_VARS_OFF=	sqliteargs="--no DLIB_LINK_WITH_SQLITE3"
 
 BLASLAPACK_USES=	blaslapack:openblas
 BLASLAPACK_VARS_OFF=	blaslapackargs="--no DLIB_USE_BLAS --no DLIB_USE_LAPACK --no DLIB_USE_MKL_FFT"
 
 AVX_VARS_OFF=		avxargs="--no USE_AVX_INSTRUCTIONS"
 
 PYDISTUTILS_BUILDARGS=	--set BOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} ${X11ARGS} ${JPEGARGS} ${PNGARGS} ${GIFARGS} ${SQLITEARGS} ${BLASLAPACKARGS} ${AVXARGS} ${BLASLAPACK}
 
 PLIST_SUB=		PYTHON2="@comment " PYTHON3=""
 
 .include <bsd.port.mk>
diff --git a/security/tfhe/Makefile b/security/tfhe/Makefile
index 7bd115693b20..fed4e788f2d9 100644
--- a/security/tfhe/Makefile
+++ b/security/tfhe/Makefile
@@ -1,31 +1,30 @@
 PORTNAME=	tfhe
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.0.1-30
 DISTVERSIONSUFFIX=	-ga085efe
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast Fully Homomorphic Encryption (FHE) library over the Torus
 WWW=		https://github.com/tfhe/tfhe
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 # because of arch-specific assembly
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 TEST_DEPENDS=	fftw3>0:math/fftw3 \
 		googletest>0:devel/googletest
 
-USES=		compiler:c++11-lang gmake localbase:ldflags
+USES=		cmake:indirect compiler:c++11-lang gmake localbase:ldflags
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 BINARY_ALIAS=	make=${GMAKE}
 
 TEST_TARGET=	test # -avx and -fma will fail where no such hardware optimization is available
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
 
 .include <bsd.port.mk>
diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile
index 26ca01925fb7..bcc8ce7f7ce5 100644
--- a/security/wazuh-agent/Makefile
+++ b/security/wazuh-agent/Makefile
@@ -1,203 +1,202 @@
 PORTNAME=	wazuh
 DISTVERSION=	4.7.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 MASTER_SITES=	https://packages.wazuh.com/deps/24/libraries/sources/:wazuh_sources
 PKGNAMESUFFIX=	-agent
 DISTFILES=	${EXTERNAL_DISTFILES}
 DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Security tool to monitor and check logs and intrusions (agent)
 WWW=		https://github.com/wazuh/wazuh
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 
-USES=		cpe gmake perl5 readline shebangfix sqlite:3 uidfix
+USES=		cmake:indirect cpe gmake perl5 readline shebangfix sqlite:3 uidfix
 
 USE_GITHUB=	yes
 GH_TUPLE=	alonsobsd:wazuh-freebsd:${WAZUH_EXTRAFILE_TAGNAME}:wazuh
 
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAKE_ARGS+=	TARGET=agent
 
 WAZUH_EXTRAFILE=	alonsobsd-${PORTNAME}-freebsd-${WAZUH_EXTRAFILE_TAGNAME}_GH0${EXTRACT_SUFX}
 WAZUH_EXTRAFILE_TAGNAME=cd0051b
 
 EXTERNAL_DISTFILES=	cJSON.tar.gz:wazuh_sources \
 			curl.tar.gz:wazuh_sources \
 			libdb.tar.gz:wazuh_sources \
 			libffi.tar.gz:wazuh_sources \
 			libyaml.tar.gz:wazuh_sources \
 			openssl.tar.gz:wazuh_sources \
 			procps.tar.gz:wazuh_sources \
 			sqlite.tar.gz:wazuh_sources \
 			zlib.tar.gz:wazuh_sources \
 			audit-userspace.tar.gz:wazuh_sources \
 			msgpack.tar.gz:wazuh_sources \
 			bzip2.tar.gz:wazuh_sources \
 			nlohmann.tar.gz:wazuh_sources \
 			googletest.tar.gz:wazuh_sources \
 			libpcre2.tar.gz:wazuh_sources \
 			libplist.tar.gz:wazuh_sources	\
 			libarchive.tar.gz:wazuh_sources \
 			popt.tar.gz:wazuh_sources
 
 OPTIONS_DEFAULT=	INOTIFY
 OPTIONS_DEFINE=		INOTIFY PRELUDE ZEROMQ
 
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 PRELUDE_LIB_DEPENDS=	libprelude.so:security/libprelude
 ZEROMQ_LIB_DEPENDS=	libczmq.so:net/czmq
 
 INOTIFY_DESC=	Kevent based real time monitoring
 PRELUDE_DESC=	Sensor support from Prelude SIEM
 ZEROMQ_DESC=	ZeroMQ support
 
 ZEROMQ_MAKE_ENV=	USE_ZEROMQ=yes
 PRELUDE_MAKE_ENV=	USE_PRELUDE=yes
 INOTIFY_MAKE_ENV=	USE_INOTIFY=yes
 INOTIFY_USES=	pkgconfig
 
 WAZUH_USER=	wazuh
 WAZUH_GROUP=	wazuh
 USERS=		${WAZUH_USER}
 GROUPS=		${WAZUH_GROUP}
 
 CONFLICTS=	ossec-* wazuh-manager
 SUB_FILES=	pkg-message
 
 WZBIN_FILES=	agent-auth manage_agents wazuh-agentd wazuh-execd wazuh-logcollector \
 		wazuh-modulesd
 
 WZARBIN_FILES=	default-firewall-drop pf npf ipfw firewalld-drop disable-account \
 		host-deny ip-customblock restart-wazuh route-null kaspersky wazuh-slack
 
 WAZUHMOD750=	/ /logs/wazuh /bin /lib /queue /queue/diff /queue/logcollector \
 		/queue/syscollector /queue/syscollector/db  /ruleset /ruleset/sca /wodles \
 		/active-response /active-response/bin /agentless /var /backup \
 		/wodles/aws /wodles/azure /wodles/docker /wodles/gcloud \
 		/wodles/gcloud/buckets /wodles/gcloud/pubsub
 
 WAZUHMOD770=	/etc/shared/default /logs /queue/alerts /queue/fim \
 		/queue/fim/db /queue/rids /queue/sockets /etc /etc/shared \
 		/var/run /var/upgrade /var/selinux /var/wodles /var/incoming
 
 WAZUHPREFIX=	/var/ossec
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 .for FILE in ${EXTERNAL_DISTFILES}
 	@cd ${WRKSRC}/src/external && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${FILE:S/:wazuh_sources//} ${EXTRACT_AFTER_ARGS}
 .endfor
 	@${MKDIR} ${WRKSRC}/ruleset/sca/freebsd
 	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${WAZUH_EXTRAFILE} ${EXTRACT_AFTER_ARGS}
 	@${MV} ${WRKDIR}/${PORTNAME}-freebsd-${WAZUH_EXTRAFILE_TAGNAME} ${WRKDIR}/wazuh-freebsd
 	@cd ${WRKDIR}/wazuh-freebsd/var/ossec/ruleset/sca && ${CP} *.yml ${WRKSRC}/ruleset/sca/freebsd/
 
 post-patch:
 	${REINPLACE_CMD} -e 's|CC=|CC?=|g' -e 's|AR=|AR?=|g' ${WRKSRC}/src/external/bzip2/Makefile
 
 do-build:
 	cd ${WRKSRC}/src/ && ${SETENV} ${MAKE_ENV} STAGEDIR=${STAGEDIR} \
 		${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/bin
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/lib
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/tmp
 
 .for DIRE in ${WAZUHMOD750}
 	${MKDIR} -m 0750 ${STAGEDIR}${WAZUHPREFIX}${DIRE}
 .endfor
 
 .for DIRE in ${WAZUHMOD770}
 	${MKDIR} -m 0770 ${STAGEDIR}${WAZUHPREFIX}${DIRE}
 .endfor
 
 .for FILE in ${WZBIN_FILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILE} ${STAGEDIR}${WAZUHPREFIX}/bin
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/src/syscheckd/build/bin/wazuh-syscheckd ${STAGEDIR}${WAZUHPREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/init/wazuh-client.sh ${STAGEDIR}${WAZUHPREFIX}/bin/wazuh-control
 
 	${TOUCH} ${STAGEDIR}${WAZUHPREFIX}/etc/localtime
 
 	${INSTALL_DATA} ${WRKSRC}/etc/internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/src/wazuh_modules/syscollector/norm_config.json ${STAGEDIR}${WAZUHPREFIX}/queue/syscollector
 	${INSTALL_DATA} ${WRKSRC}/etc/local_internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc/local_internal_options.conf.sample
 
 	${INSTALL_DATA} /dev/null ${STAGEDIR}${WAZUHPREFIX}/etc/client.keys.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/wpk_root.pem ${STAGEDIR}${WAZUHPREFIX}/etc/
 
 	${INSTALL_DATA} ${WRKSRC}/etc/ossec-agent.conf ${STAGEDIR}${WAZUHPREFIX}/etc/ossec.conf.sample
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/agentlessd/scripts/* ${STAGEDIR}${WAZUHPREFIX}/agentless/
 
 .for FILE in ${WZARBIN_FILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILE} ${STAGEDIR}${WAZUHPREFIX}/active-response/bin
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/src/wazuh-slack ${STAGEDIR}${WAZUHPREFIX}/active-response/bin
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/active-response/*.sh ${STAGEDIR}${WAZUHPREFIX}/active-response/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/active-response/*.py ${STAGEDIR}${WAZUHPREFIX}/active-response/bin
 
 	${INSTALL_PROGRAM} ${WRKSRC}/src/default-firewall-drop ${STAGEDIR}${WAZUHPREFIX}/active-response/bin/firewall-drop
 
 	${INSTALL_DATA} ${WRKSRC}/ruleset/rootcheck/db/*.txt ${STAGEDIR}${WAZUHPREFIX}/etc/shared
 
 	${INSTALL_DATA} ${WRKSRC}/ruleset/rootcheck/db/*.txt ${STAGEDIR}${WAZUHPREFIX}/etc/shared/default
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/__init__.py ${STAGEDIR}${WAZUHPREFIX}/wodles/__init__.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/utils.py ${STAGEDIR}${WAZUHPREFIX}/wodles/utils.py
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/aws/aws_s3.py ${STAGEDIR}${WAZUHPREFIX}/wodles/aws/aws-s3.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/aws/aws-s3
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/exceptions.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/exceptions.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/gcloud.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/gcloud.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/integration.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/integration.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/tools.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/tools.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/buckets/bucket.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/buckets/bucket.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/buckets/access_logs.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/buckets/access_logs.py
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/gcloud/pubsub/subscriber.py ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/pubsub/subscriber.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/gcloud/gcloud
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/docker-listener/DockerListener.py ${STAGEDIR}${WAZUHPREFIX}/wodles/docker/DockerListener.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/docker/DockerListener
 
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/azure/azure-logs.py ${STAGEDIR}${WAZUHPREFIX}/wodles/azure/azure-logs.py
 	${INSTALL_SCRIPT} ${WRKSRC}/framework/wrappers/generic_wrapper.sh ${STAGEDIR}${WAZUHPREFIX}/wodles/azure/azure-logs
 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/azure/orm.py ${STAGEDIR}${WAZUHPREFIX}/wodles/azure/orm.py
 
 	${INSTALL_DATA} ${WRKSRC}/ruleset/sca/generic/sca_unix_audit.yml ${STAGEDIR}${WAZUHPREFIX}/ruleset/sca/
 
 	${INSTALL_LIB} ${WRKSRC}/src/libwazuhext.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/libwazuhshared.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/shared_modules/dbsync/build/lib/libdbsync.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/shared_modules/rsync/build/lib/librsync.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/syscheckd/build/lib/libfimdb.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/wazuh_modules/syscollector/build/lib/libsyscollector.so ${STAGEDIR}${WAZUHPREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/src/data_provider/build/lib/libsysinfo.so ${STAGEDIR}${WAZUHPREFIX}/lib
 
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/etc/templates
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/src
 
 	cd ${WRKSRC}/etc/templates && ${COPYTREE_SHARE} config \
 		${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/etc/templates/
 	cd ${WRKSRC}/ruleset && ${COPYTREE_SHARE} sca \
 		${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/
 	cd ${WRKSRC}/src && ${COPYTREE_SHARE} init \
 		${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/src/
 
 	${INSTALL_SCRIPT} ${WRKSRC}/gen_ossec.sh ${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/
 	${INSTALL_SCRIPT} ${WRKSRC}/add_localfiles.sh ${STAGEDIR}${WAZUHPREFIX}/packages_files/agent_installation_scripts/
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-cchardet/Makefile b/textproc/py-cchardet/Makefile
index c24256ffd8b5..1597be57e53a 100644
--- a/textproc/py-cchardet/Makefile
+++ b/textproc/py-cchardet/Makefile
@@ -1,24 +1,22 @@
 PORTNAME=	cchardet
 PORTVERSION=	2.1.7
 PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	High speed universal character encoding detector
 WWW=		https://github.com/PyYoshi/cChardet
 
 LICENSE=	GPLv2 LGPL21 MPL11
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
-
-USES=		python
+USES=		cmake:indirect python
 USE_PYTHON=	autoplist concurrent distutils
 
 post-install:
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/textproc/uim-qt5/Makefile b/textproc/uim-qt5/Makefile
index 960eddcfb23d..ed798cd19212 100644
--- a/textproc/uim-qt5/Makefile
+++ b/textproc/uim-qt5/Makefile
@@ -1,36 +1,35 @@
 PKGNAMESUFFIX=	-qt5
 
 COMMENT=	Qt5 modules of uim input method
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libuim.so:textproc/uim
 
-USES=		compiler:c++11-lang gl iconv kde:5 libtool qt:5
+USES=		cmake:indirect compiler:c++11-lang gl iconv kde:5 libtool qt:5
 USE_GL=		gl
 USE_KDE=	plasma-framework \
 		ecm:build
 USE_QT=		buildtools:build core declarative gui network qmake:build widgets x11extras
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-qt5 --with-qt5-immodule
 CONFIGURE_ENV=	DATADIRNAME="share"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 UIM_SLAVE=	yes
 
 .if defined(WITHOUT_X11)
 IGNORE=		cannot be built without X11. Please, unset WITHOUT_X11
 .endif
 
 do-build:
 	(cd ${WRKSRC}/uim && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} libuim-x-util.la libuim-counted-init.la)
 	(cd ${WRKSRC}/replace && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
 	(cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD})
 
 do-install:
 	(cd ${WRKSRC}/qt5 && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} DESTDIR=${STAGEDIR} install-strip)
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/virglrenderer/Makefile b/x11/virglrenderer/Makefile
index 3372b0b9301c..bca55d489ecc 100644
--- a/x11/virglrenderer/Makefile
+++ b/x11/virglrenderer/Makefile
@@ -1,29 +1,28 @@
 PORTNAME=	virglrenderer
 DISTVERSION=	0.8.2
 PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	VirGL virtual OpenGL renderer
 WWW=		https://virgil3d.github.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_riscv64=		fails to build: ../src/gallium/include/pipe/p_config.h:171:2: Unknown Endianness
 
-BUILD_DEPENDS=	cmake:devel/cmake-core
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy
 
-USES=		compiler:c++11-lang cpe gl meson pkgconfig python
+USES=		cmake:indirect compiler:c++11-lang cpe gl meson pkgconfig python
 CPE_VENDOR=	${PORTNAME}_project
 USE_GITLAB=	yes
 USE_GL=		gbm
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	virgl
 GL_TAGNAME=	7d204f3927be65fb3365dce01dbcd04d447a4985
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 .include <bsd.port.mk>