diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index a191056fbc41..7acb4bf79a9e 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,62 +1,47 @@
 PORTNAME=	gamescope
 DISTVERSION=	3.9
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	98bc90ecf55c.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	acc8a1bed4e8.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	afa1c085ebbf.patch:-p1 # https://github.com/Plagman/gamescope/pull/119
 PATCHFILES+=	d59836199ebe.patch:-p1 # https://github.com/Plagman/gamescope/issues/120
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Micro-compositor from SteamOS
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		evdev-proto>0:devel/evdev-proto \
 		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=1.17:graphics/wayland-protocols \
 		wlroots>=0.13.0<0.14.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libdrm.so:graphics/libdrm \
 		libvulkan.so:graphics/vulkan-loader \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c++11-lib meson pkgconfig sdl xorg
 USE_GITHUB=	yes
 USE_SDL=	sdl2
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm
 GH_ACCOUNT=	Plagman
 GH_TUPLE=	emersion:libliftoff:v0.1.0-3-g516cf94:libliftoff/subprojects/libliftoff \
 		nothings:stb:c0c9826:stb/subprojects/stb
 CPPFLAGS+=	-D_WITH_DPRINTF # XXX Remove after FreeBSD 11 EOL
 PLIST_FILES=	bin/${PORTNAME}
 
 OPTIONS_DEFINE=	PIPEWIRE
 OPTIONS_DEFAULT=PIPEWIRE
 
 PIPEWIRE_DESC=		Screen capture via PipeWire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_MESON_ENABLED=	pipewire
 
-# https://github.com/Plagman/gamescope/pull/202
-BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*} \
-		xwayland-devel>0:x11-servers/xwayland-devel
-LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
-		libudev.so:devel/libudev-devd \
-		libseat.so:sysutils/seatd \
-		libinput.so:x11/libinput \
-		libxcb-errors.so:x11/xcb-util-errors \
-		libxcb-render-util.so:x11/xcb-util-renderutil \
-		libxcb-icccm.so:x11/xcb-util-wm
-RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
-USE_XORG+=	pixman xcb
-USE_GL+=	gbm egl
-GH_TUPLE+=	swaywm:wlroots:0.13.0:wlroots/subprojects/wlroots
-PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
-
+.include "${.CURDIR}/Makefile.wlroots"
 .include <bsd.port.mk>
diff --git a/x11-wm/gamescope/Makefile.wlroots b/x11-wm/gamescope/Makefile.wlroots
new file mode 100644
index 000000000000..e7292ab2271e
--- /dev/null
+++ b/x11-wm/gamescope/Makefile.wlroots
@@ -0,0 +1,15 @@
+# https://github.com/Plagman/gamescope/pull/202
+BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*} \
+		xwayland-devel>0:x11-servers/xwayland-devel
+LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
+		libudev.so:devel/libudev-devd \
+		libseat.so:sysutils/seatd \
+		libinput.so:x11/libinput \
+		libxcb-errors.so:x11/xcb-util-errors \
+		libxcb-render-util.so:x11/xcb-util-renderutil \
+		libxcb-icccm.so:x11/xcb-util-wm
+RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
+USE_XORG+=	pixman xcb
+USE_GL+=	gbm egl
+GH_TUPLE+=	swaywm:wlroots:0.13.0:wlroots/subprojects/wlroots
+PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 431a952276d7..6410d99810d0 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -1,48 +1,35 @@
 PORTNAME=	phoc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
 PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Phone compositor
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wlroots>=0.12.0<0.13.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	${LOCALBASE}/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml:x11-wm/mutter
 
 USES=		compiler:c11 gl gnome meson pkgconfig python:build shebangfix xorg
 USE_GITLAB=	yes
 USE_GL=		glesv2
 USE_GNOME=	gnomedesktop3
 USE_XORG=	pixman xcb
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World/Phosh
 GL_COMMIT=	527689df1300277af2cdfc872474c8322e38f690
 SHEBANG_FILES=	build-aux/post_install.py
 CFLAGS+=	-Wno-error=format-nonliteral # clang
 PLIST_FILES=	bin/${PORTNAME}
 GLIB_SCHEMAS=	sm.puri.phoc.gschema.xml
 
-# https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
-BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*}
-LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
-		libudev.so:devel/libudev-devd \
-		libdrm.so:graphics/libdrm \
-		libseat.so:sysutils/seatd \
-		libxcb-errors.so:x11/xcb-util-errors \
-		libxcb-icccm.so:x11/xcb-util-wm
-RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
-USE_XORG+=	x11
-USE_GL+=	gbm egl
-GL_TUPLE+=	https://source.puri.sm:Librem5:wlroots:b2fd6d8dd88d67ee48be67f5be4ee614a5826b13:wlroots/subprojects/wlroots
-PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
-
+.include "${.CURDIR}/Makefile.wlroots"
 .include <bsd.port.mk>
diff --git a/x11-wm/phoc/Makefile.wlroots b/x11-wm/phoc/Makefile.wlroots
new file mode 100644
index 000000000000..d5a00a9f86cd
--- /dev/null
+++ b/x11-wm/phoc/Makefile.wlroots
@@ -0,0 +1,13 @@
+# https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*}
+LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
+		libudev.so:devel/libudev-devd \
+		libdrm.so:graphics/libdrm \
+		libseat.so:sysutils/seatd \
+		libxcb-errors.so:x11/xcb-util-errors \
+		libxcb-icccm.so:x11/xcb-util-wm
+RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
+USE_XORG+=	x11
+USE_GL+=	gbm egl
+GL_TUPLE+=	https://source.puri.sm:Librem5:wlroots:b2fd6d8dd88d67ee48be67f5be4ee614a5826b13:wlroots/subprojects/wlroots
+PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"