diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index 34993c4b05e6..187dc2614d3e 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,70 +1,76 @@
 PORTNAME=	wayfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
 PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599
 PATCHFILES+=	564b75a45d7c.patch:-p1 # https://github.com/WayfireWM/wayfire/pull/1943
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	3D Wayland compositor
 WWW=		https://wayfire.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		nlohmann-json>0:devel/nlohmann-json \
 		wf-config>=0.8.0<0.9.0:devel/wf-config \
 		${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
 		wayland-protocols>=1.12:graphics/wayland-protocols \
 		glm>=0.9.8:math/glm \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libinotify.so:devel/libinotify \
 		libwf-config.so:devel/wf-config \
 		libpng.so:graphics/png \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 TEST_DEPENDS=	doctest>0:devel/doctest
 
 USES=		compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		egl glesv2
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT=	WayfireWM
 GH_TUPLE=	WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \
 		WayfireWM:wf-utils:15f8e16:wfutils/subprojects/wf-utils
-MESON_ARGS=	-Dtests=disabled
+MESON_ARGS=	-Dtests=disabled -Dwf-touch:tests=disabled
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 
 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
 
+.ifdef GH_TUPLE
+post-configure:
+	@${REINPLACE_CMD} 's/meson install/& \
+		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
+.endif
+
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR}
 
 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
 
 # Keep override.mk in sync with x11/wcm + x11/wf-shell
 .include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/wayfire/files/patch-private-libs b/x11-wm/wayfire/files/patch-private-libs
deleted file mode 100644
index fe4665abebbf..000000000000
--- a/x11-wm/wayfire/files/patch-private-libs
+++ /dev/null
@@ -1,79 +0,0 @@
-wf-touch and wf-utils are untagged and have no other consumers. Keep
-it private to wayfire package for now.
-
---- meson.build.orig	2023-10-07 08:36:28 UTC
-+++ meson.build
-@@ -69,8 +69,8 @@ endif
- 	endif
- endif
- 
--wfutils = subproject('wf-utils').get_variable('wfutils')
--wftouch = subproject('wf-touch').get_variable('wftouch')
-+wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils')
-+wftouch = subproject('wf-touch', default_options: ['default_library=static']).get_variable('wftouch')
- 
- needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system())
- libinotify       = dependency('libinotify', required: needs_libinotify)
---- subprojects/wf-utils/meson.build.orig	2020-05-11 09:28:45 UTC
-+++ subprojects/wf-utils/meson.build
-@@ -34,9 +34,10 @@ lib_wfutils = library('wf-utils',
-     sources,
-     dependencies: [],
-     include_directories: wfutils_inc,
--    install: true,
-+    install: not meson.is_subproject(),
-     version: meson.project_version())
- 
-+if not meson.is_subproject()
- pkgconfig = import('pkgconfig')
- pkgconfig.generate(
-     libraries:    lib_wfutils,
-@@ -44,6 +45,7 @@ pkgconfig.generate(
-     filebase:     meson.project_name(),
-     name:         meson.project_name(),
-     description: 'Utilities library for Wayfire')
-+endif
- 
- install_headers([], subdir: 'wayfire/utils')
- 
-@@ -85,12 +87,14 @@ headers_root = [
- 'wayfire/variant.hpp',
- ]
- 
-+if not meson.is_subproject()
- install_headers(headers_action, subdir: 'wayfire/action')
- install_headers(headers_condition, subdir: 'wayfire/condition')
- install_headers(headers_lexer, subdir: 'wayfire/lexer')
- install_headers(headers_parser, subdir: 'wayfire/parser')
- install_headers(headers_rule, subdir: 'wayfire/rule')
- install_headers(headers_root, subdir: 'wayfire')
-+endif
- 
- # -------------------------------------------------------------------------------------------------
- # Unit tests
---- subprojects/wf-touch/meson.build.orig	2021-03-19 14:56:39 UTC
-+++ subprojects/wf-touch/meson.build
-@@ -6,18 +6,22 @@ project('wf-touch', ['cpp'],
- glm = dependency('glm')
- 
- wf_touch_inc_dirs = include_directories('.')
-+if not meson.is_subproject()
- install_headers([
- 'wayfire/touch/touch.hpp'],
- subdir: 'wayfire/touch')
-+endif
- 
- wftouch_lib = static_library('wftouch', ['src/touch.cpp', 'src/actions.cpp', 'src/math.cpp'],
--    dependencies: glm, install: true)
-+    dependencies: glm, install: not meson.is_subproject())
- 
- wftouch = declare_dependency(link_with: wftouch_lib,
-     include_directories: wf_touch_inc_dirs, dependencies: glm)
- 
-+if not meson.is_subproject()
- doctest = dependency('doctest', required: get_option('tests'))
- 
- if doctest.found()
-     subdir('test')
-+endif
- endif