diff --git a/deskutils/mindforger/Makefile b/deskutils/mindforger/Makefile
index b4d7ad86467e..1b5facf132db 100644
--- a/deskutils/mindforger/Makefile
+++ b/deskutils/mindforger/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	mindforger
 PORTVERSION=	1.54.0
 PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Thinking notebook and markdown editor
 WWW=		https://www.mindforger.com/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libhunspell-1.7.so:textproc/hunspell
 
 USES=		pkgconfig qmake qt:5
 USE_QT=		buildtools:build core declarative gui location network \
 		printsupport webchannel widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	dvorka
 GH_PROJECT=	cmark:cm
 GH_TAGNAME=	4ca8688:cm
 GH_SUBDIR=	deps/cmark-gfm:cm
 
 QMAKE_ARGS=	CONFIG+="mfnocxx"
 
 OPTIONS_DEFINE=	CMARK
 OPTIONS_DEFAULT=	CMARK
 CMARK_DESC=	CommonMark support (Markdown -> HTML rendering)
 
-CMARK_BUILD_DEPENDS=	cmake:devel/cmake-core
+CMARK_USES=	cmake:indirect
+CMAKE_OFF=	CMARK_SHARED CMARK_TESTS
 CMARK_QMAKE_OFF=	CONFIG+="mfnomd2html"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386
 USE_QT+=	webengine
 QMAKE_ARGS+=	CONFIG+="mfwebengine"
 .else
 USE_QT+=	webkit
 .endif
 
 pre-build-CMARK-on:
-	@cd ${WRKSRC_cm} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-		-DCMARK_TESTS:BOOL=OFF -DCMARK_SHARED:BOOL=OFF \
-		-B build && cmake --build build
+	@cd ${WRKSRC_cm} && ${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} \
+		${CMAKE_BIN} ${CMAKE_ARGS} -B build && \
+		${CMAKE_BIN} --build build
 
 post-patch:
 	@${REINPLACE_CMD} -e '/_WIN32/s,_APPLE,_${OPSYS},' \
 		${WRKSRC}/app/src/qt/note_view_presenter.cpp \
 		${WRKSRC}/app/src/qt/note_view_presenter.h \
 		${WRKSRC}/app/src/qt/outline_header_view_presenter.cpp
 	@${REINPLACE_CMD} -e 's/53/54/' ${WRKSRC}/lib/src/app_info.h
 	@${REINPLACE_CMD} -e 's/_current_dir_name(/cwd(nullptr, 0/' \
 		${WRKSRC}/lib/src/gear/file_utils.cpp
 
 .include <bsd.port.mk>
diff --git a/devel/py-Levenshtein/Makefile b/devel/py-Levenshtein/Makefile
index a15e266afb3e..f5fd15865286 100644
--- a/devel/py-Levenshtein/Makefile
+++ b/devel/py-Levenshtein/Makefile
@@ -1,26 +1,24 @@
 PORTNAME=	Levenshtein
 PORTVERSION=	0.22.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Fast computation of Levenshtein distance and string similarity
 WWW=		https://github.com/maxbachmann/Levenshtein
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scikit-build>=0.13:devel/py-scikit-build@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
-		cmake-core>0:devel/cmake-core
-
+		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}rapidfuzz>0:devel/py-rapidfuzz@${PY_FLAVOR}
 
-USES=		python
+USES=		cmake:indirect python
 USE_PYTHON=	autoplist pep517
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/Levenshtein/levenshtein*.so
 
 .include <bsd.port.mk>
diff --git a/graphics/py-pivy/Makefile b/graphics/py-pivy/Makefile
index e95e79c44754..1433c68ed6f8 100644
--- a/graphics/py-pivy/Makefile
+++ b/graphics/py-pivy/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	pivy
 PORTVERSION=	0.6.8
 PORTREVISION=	1
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Python binding for Coin
 WWW=		https://github.com/coin3d/pivy
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	cmake:devel/cmake-core \
-		swig:devel/swig
+BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libCoin.so:graphics/Coin \
 		libSoQt.so:x11-toolkits/soqt
 
-USES=		compiler:c11 python qt:5
+USES=		cmake:indirect compiler:c11 python qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	coin3d
 USE_PYTHON=	distutils
 USE_QT=		core gui opengl widgets
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile
index e3674857ea35..145bbcade594 100644
--- a/x11/waybar/Makefile
+++ b/x11/waybar/Makefile
@@ -1,187 +1,185 @@
 PORTNAME=	waybar
 DISTVERSION=	0.9.24
 PORTREVISION=	3
 CATEGORIES=	x11 wayland
 PKGNAMESUFFIX=	${FLAVOR:N${FLAVORS:[1]}:C/.+/-${FLAVOR}/}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	514d00803c91.patch:-p1 # https://github.com/Alexays/Waybar/pull/2949
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Highly customizable Wayland bar for Sway and wlroots-based compositors
 WWW=		https://github.com/Alexays/Waybar
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libdate-tz.so:devel/date \
 		libjsoncpp.so:devel/jsoncpp \
 		libfmt.so:devel/libfmt \
 		libspdlog.so:devel/spdlog \
 		libwayland-client.so:graphics/wayland \
 		libxkbregistry.so:x11/libxkbcommon
 TEST_DEPENDS=	catch>0:devel/catch
 
 FLAVORS=	default nopulse
 CONFLICTS_INSTALL=	${PORTNAME}*
 
 USES=		compiler:c++20-lang gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	gtkmm30
 GH_ACCOUNT=	Alexays
 GH_PROJECT=	Waybar
 MESON_ARGS=	${libnl systemd wireplumber tests:L:C/.*/-D&=disabled/}
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/xdg/${PORTNAME}/config \
 		etc/xdg/${PORTNAME}/style.css
 
 # XXX Add pkg-config support to devel/date
 .if exists(${.CURDIR}/files/date.pc.in)
 CONFIGURE_ENV+=	PKG_CONFIG_PATH="${WRKDIR}"
 SUB_FILES+=	date.pc
 .endif
 
 OPTIONS_DEFINE=		CAVA DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
 OPTIONS_DEFAULT=	CAVA DBUS EVDEV GLS ICONSFONT JACK MANPAGES MPD MPRIS PULSEAUDIO SNDIO UDEV UPOWER
 OPTIONS_EXCLUDE+=	CAVA # https://github.com/karlstav/cava/issues/487
 .if ${FLAVOR:U:M*nopulse}
 OPTIONS_EXCLUDE+=	PULSEAUDIO
 .endif
 
 CAVA_LIB_DEPENDS=	libcava.so:audio/cava
 CAVA_MESON_ENABLED=	cava
 
 DBUS_LIB_DEPENDS=	libdbusmenu-gtk3.so:devel/libdbusmenu
 DBUS_MESON_ENABLED=	dbusmenu-gtk
 
 EVDEV_DESC=		Keyboard state via libevdev
 EVDEV_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 EVDEV_LIB_DEPENDS=	libevdev.so:devel/libevdev \
 			libinotify.so:devel/libinotify \
 			libinput.so:x11/libinput
 EVDEV_MESON_ENABLED=	libevdev libinput
 
 GLS_DESC=		Use gtk-layer-shell library for popups support
 GLS_LIB_DEPENDS=	libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
 GLS_MESON_ENABLED=	gtk-layer-shell
 
 ICONSFONT_DESC=		Install Font Awesome to properly render icons
 ICONSFONT_RUN_DEPENDS=	font-awesome>0:x11-fonts/font-awesome
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_MESON_ENABLED=	jack
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	share/man/man5/${PORTNAME}-backlight-slider.5.gz \
 			share/man/man5/${PORTNAME}-backlight.5.gz \
 			share/man/man5/${PORTNAME}-battery.5.gz \
 			share/man/man5/${PORTNAME}-bluetooth.5.gz \
 			share/man/man5/${PORTNAME}-cava.5.gz \
 			share/man/man5/${PORTNAME}-clock.5.gz \
 			share/man/man5/${PORTNAME}-cpu.5.gz \
 			share/man/man5/${PORTNAME}-custom.5.gz \
 			share/man/man5/${PORTNAME}-disk.5.gz \
 			share/man/man5/${PORTNAME}-dwl-tags.5.gz \
 			share/man/man5/${PORTNAME}-gamemode.5.gz \
 			share/man/man5/${PORTNAME}-idle-inhibitor.5.gz \
 			share/man/man5/${PORTNAME}-image.5.gz \
 			share/man/man5/${PORTNAME}-inhibitor.5.gz \
 			share/man/man5/${PORTNAME}-keyboard-state.5.gz \
 			share/man/man5/${PORTNAME}-memory.5.gz \
 			share/man/man5/${PORTNAME}-mpd.5.gz \
 			share/man/man5/${PORTNAME}-mpris.5.gz \
 			share/man/man5/${PORTNAME}-network.5.gz \
 			share/man/man5/${PORTNAME}-pulseaudio-slider.5.gz \
 			share/man/man5/${PORTNAME}-pulseaudio.5.gz \
 			share/man/man5/${PORTNAME}-river-layout.5.gz \
 			share/man/man5/${PORTNAME}-river-mode.5.gz \
 			share/man/man5/${PORTNAME}-river-tags.5.gz \
 			share/man/man5/${PORTNAME}-river-window.5.gz \
 			share/man/man5/${PORTNAME}-sndio.5.gz \
 			share/man/man5/${PORTNAME}-states.5.gz \
 			share/man/man5/${PORTNAME}-sway-language.5.gz \
 			share/man/man5/${PORTNAME}-sway-mode.5.gz \
 			share/man/man5/${PORTNAME}-sway-scratchpad.5.gz \
 			share/man/man5/${PORTNAME}-sway-window.5.gz \
 			share/man/man5/${PORTNAME}-sway-workspaces.5.gz \
 			share/man/man5/${PORTNAME}-temperature.5.gz \
 			share/man/man5/${PORTNAME}-tray.5.gz \
 			share/man/man5/${PORTNAME}-upower.5.gz \
 			share/man/man5/${PORTNAME}-wireplumber.5.gz \
 			share/man/man5/${PORTNAME}-wlr-taskbar.5.gz \
 			share/man/man5/${PORTNAME}-wlr-workspaces.5.gz \
 			share/man/man5/${PORTNAME}.5.gz \
 			${NULL}
 
 MPD_DESC=		Music Player Daemon support
 MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient
 MPD_MESON_ENABLED=	mpd
 
 MPRIS_DESC=		Media Player Remote Interfacing Specification via playerctl
 MPRIS_LIB_DEPENDS=	libplayerctl.so:multimedia/playerctl
 MPRIS_MESON_ENABLED=	mpris
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_MESON_ENABLED=	pulseaudio
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_USES=		localbase:ldflags
 SNDIO_MESON_ENABLED=	sndio
 
 UDEV_DESC=		Monitor backlight level via libudev
 UDEV_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libudev.so:devel/libudev-devd
 UDEV_MESON_ENABLED=	libudev
 
 UPOWER_DESC=		Monitor battery capacity via UPower
 UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
 UPOWER_MESON_ENABLED=	upower_glib
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 # https://github.com/ConsoleKit2/ConsoleKit2/issues/150
 	@${REINPLACE_CMD} -e 's,/login1,/ConsoleKit/Manager,' \
 		-e 's,login1\([".]\),ConsoleKit\1,g' \
 		${WRKSRC}/src/modules/backlight.cpp \
 		${WRKSRC}/src/modules/gamemode.cpp \
 		${WRKSRC}/src/modules/inhibitor.cpp \
 		${WRKSRC}/src/modules/upower/upower.cpp \
 		${WRKSRC}/src/util/prepare_for_sleep.cpp
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/src/modules/wlr/taskbar.cpp
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
 		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 # XXX https://github.com/HowardHinnant/date/issues/799
 .if ${CXX} == c++ && exists(/usr/include/c++/v1/__chrono/concepts.h)
-BUILD_DEPENDS+=	${CMAKE_BIN}:devel/cmake-core
-CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CPP="${CPP}"
-CMAKE_BIN=	${LOCALBASE}/bin/cmake
+USES+=		cmake:indirect
+CMAKE_ARGS=	-B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
+CMAKE_OFF=	LIBCXX_INCLUDE_BENCHMARKS
+CMAKE_INSTALL_PREFIX=	${WRKDIR}/libcxx_prefix
 
 # XXX Move into separate port and standardize via USES
 GH_TUPLE+=	llvm:llvm-project:llvmorg-16.0.1:libcxx
 CXXFLAGS+=	-nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1
 # Don't link against new libc++ as it's not necessary
 #LDFLAGS+=	-nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt
 
 pre-configure:	bundled-libcxx
 bundled-libcxx:
-	@${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
-		-DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \
-		-DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \
-		-B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx
+	@${SETENVI} ${WRK_ENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS}
 	@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
 .endif # exists(/usr/include/c++/v1/__chrono/concepts.h)
 
 .include <bsd.port.mk>