diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile
index 600fdf5930cc..19e19e866370 100644
--- a/x11-toolkits/wlroots/Makefile
+++ b/x11-toolkits/wlroots/Makefile
@@ -1,69 +1,78 @@
 PORTNAME=	wlroots
-DISTVERSION=	0.16.2
-PORTREVISION=	1
+DISTVERSION=	0.17.0
 CATEGORIES=	x11-toolkits
 
 PATCH_SITES+=	https://github.com/swaywm/${GL_PROJECT}/commit/:github
-PATCHFILES+=	fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
-PATCHFILES+=	29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
+PATCHFILES+=	10f80a8f1bb2.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
+PATCHFILES+=	3196c73d487f.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064
 PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Modular Wayland compositor library
 WWW=		https://gitlab.freedesktop.org/wlroots/wlroots
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	wayland-protocols>=1.27:graphics/wayland-protocols
-LIB_DEPENDS=	libudev.so:devel/libudev-devd \
-		libdrm.so:graphics/libdrm \
+BUILD_DEPENDS=	wayland-protocols>=1.32:graphics/wayland-protocols
+LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libwayland-server.so:graphics/wayland \
-		libseat.so:sysutils/seatd \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gl meson pkgconfig xorg
 USE_GITLAB=	yes
 USE_GL=		gbm
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 MESON_ARGS=	-Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,}
 
 OPTIONS_DEFINE=	DRM OPENGL VULKAN X11
 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11
 OPTIONS_SUB=	yes
 
 DRM_DESC=		KMS console support
 DRM_BUILD_DEPENDS=	hwdata>0:misc/hwdata
-DRM_LIB_DEPENDS=	libinput.so:x11/libinput
+DRM_LIB_DEPENDS=	libudev.so:devel/libudev-devd \
+			libliftoff.so:graphics/libliftoff \
+			libdisplay-info.so:sysutils/libdisplay-info \
+			libseat.so:sysutils/seatd \
+			libinput.so:x11/libinput
+DRM_MESON_ENABLED=	session
 DRM_VARS=		BACKENDS+="drm libinput"
 
 OPENGL_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
 OPENGL_USE=		GL=egl,glesv2
 OPENGL_VARS=		RENDERERS+=gles2
 
 VULKAN_DESC=		Vulkan renderer
 VULKAN_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 			vulkan-headers>0:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
 VULKAN_VARS=		RENDERERS+=vulkan
 
 X11_LIB_DEPENDS=	libxcb-errors.so:x11/xcb-util-errors \
 			libxcb-render-util.so:x11/xcb-util-renderutil \
 			libxcb-icccm.so:x11/xcb-util-wm
 X11_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			xwayland-devel>0:x11-servers/xwayland-devel
 X11_RUN_DEPENDS=	xwayland-devel>0:x11-servers/xwayland-devel
 X11_USE=		XORG=xcb
 X11_MESON_ENABLED=	xwayland
 X11_VARS=		BACKENDS+=x11
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} "/STR/s/meson.project_version()/'${DISTVERSIONFULL}'/" \
 		${WRKSRC}/include/wlr/meson.build
+# XXX Drop after FreeBSD 12.4 EOL around 2023-12-31
+# https://cgit.freebsd.org/src/commit/?id=d7535fb3e3cb
+	@if [ ${OPSYS} = FreeBSD -a ${OSVERSION} -lt 1300515 ]; then \
+		${REINPLACE_CMD} -e '/POSIX/s/199309/200112/' \
+		${WRKSRC}/render/gles2/pass.c \
+		${WRKSRC}/render/gles2/renderer.c \
+		${WRKSRC}/types/wlr_presentation_time.c; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo
index 5918d9a27d2e..5673d9671f93 100644
--- a/x11-toolkits/wlroots/distinfo
+++ b/x11-toolkits/wlroots/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1676068199
-SHA256 (wlroots-0.16.2.tar.bz2) = afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88
-SIZE (wlroots-0.16.2.tar.bz2) = 437628
-SHA256 (fc0854d5f256.patch) = ceaa947fd7f64b773c61d7a5a4bdcfe85a083a686d4356ff58d3666aa182e2a9
-SIZE (fc0854d5f256.patch) = 6013
-SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370ef052f5d97938c
-SIZE (29cb694655db.patch) = 4233
-SHA256 (f3ba14e49133.patch) = fb61329725f9482eae15100ae46c59159f39abc3324937e92fdf5065155944a9
-SIZE (f3ba14e49133.patch) = 1976
+TIMESTAMP = 1700582773
+SHA256 (wlroots-0.17.0.tar.bz2) = 0f0bb100b2277e6a0622bfe2594e4139b8462cb4c49ae883f042e8c4b1bdbc3e
+SIZE (wlroots-0.17.0.tar.bz2) = 452069
+SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5
+SIZE (10f80a8f1bb2.patch) = 6097
+SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc
+SIZE (3196c73d487f.patch) = 4243
diff --git a/x11-toolkits/wlroots/pkg-plist b/x11-toolkits/wlroots/pkg-plist
index 0698d8a43fcb..453bcf649184 100644
--- a/x11-toolkits/wlroots/pkg-plist
+++ b/x11-toolkits/wlroots/pkg-plist
@@ -1,103 +1,110 @@
 include/wlr/backend.h
 %%DRM%%include/wlr/backend/drm.h
 include/wlr/backend/headless.h
 include/wlr/backend/interface.h
 %%DRM%%include/wlr/backend/libinput.h
 include/wlr/backend/multi.h
-include/wlr/backend/session.h
+%%DRM%%include/wlr/backend/session.h
 include/wlr/backend/wayland.h
 %%X11%%include/wlr/backend/x11.h
 include/wlr/config.h
 include/wlr/interfaces/wlr_buffer.h
 include/wlr/interfaces/wlr_keyboard.h
 include/wlr/interfaces/wlr_output.h
 include/wlr/interfaces/wlr_pointer.h
 include/wlr/interfaces/wlr_switch.h
 include/wlr/interfaces/wlr_tablet_pad.h
 include/wlr/interfaces/wlr_tablet_tool.h
 include/wlr/interfaces/wlr_touch.h
 include/wlr/render/allocator.h
 include/wlr/render/dmabuf.h
 include/wlr/render/drm_format_set.h
 %%OPENGL%%include/wlr/render/egl.h
 %%OPENGL%%include/wlr/render/gles2.h
 include/wlr/render/interface.h
+include/wlr/render/pass.h
 include/wlr/render/pixman.h
+include/wlr/render/swapchain.h
 %%VULKAN%%include/wlr/render/vulkan.h
 include/wlr/render/wlr_renderer.h
 include/wlr/render/wlr_texture.h
 include/wlr/types/wlr_buffer.h
 include/wlr/types/wlr_compositor.h
+include/wlr/types/wlr_content_type_v1.h
 include/wlr/types/wlr_cursor.h
+include/wlr/types/wlr_cursor_shape_v1.h
 include/wlr/types/wlr_damage_ring.h
 include/wlr/types/wlr_data_control_v1.h
 include/wlr/types/wlr_data_device.h
 include/wlr/types/wlr_drm.h
 %%DRM%%include/wlr/types/wlr_drm_lease_v1.h
 include/wlr/types/wlr_export_dmabuf_v1.h
 include/wlr/types/wlr_foreign_toplevel_management_v1.h
+include/wlr/types/wlr_fractional_scale_v1.h
 include/wlr/types/wlr_fullscreen_shell_v1.h
 include/wlr/types/wlr_gamma_control_v1.h
-include/wlr/types/wlr_idle.h
 include/wlr/types/wlr_idle_inhibit_v1.h
 include/wlr/types/wlr_idle_notify_v1.h
 include/wlr/types/wlr_input_device.h
 include/wlr/types/wlr_input_inhibitor.h
 include/wlr/types/wlr_input_method_v2.h
 include/wlr/types/wlr_keyboard.h
 include/wlr/types/wlr_keyboard_group.h
 include/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h
 include/wlr/types/wlr_layer_shell_v1.h
 include/wlr/types/wlr_linux_dmabuf_v1.h
 include/wlr/types/wlr_matrix.h
 include/wlr/types/wlr_output.h
-include/wlr/types/wlr_output_damage.h
+include/wlr/types/wlr_output_layer.h
 include/wlr/types/wlr_output_layout.h
 include/wlr/types/wlr_output_management_v1.h
 include/wlr/types/wlr_output_power_management_v1.h
 include/wlr/types/wlr_pointer.h
 include/wlr/types/wlr_pointer_constraints_v1.h
 include/wlr/types/wlr_pointer_gestures_v1.h
 include/wlr/types/wlr_presentation_time.h
 include/wlr/types/wlr_primary_selection.h
 include/wlr/types/wlr_primary_selection_v1.h
 include/wlr/types/wlr_region.h
 include/wlr/types/wlr_relative_pointer_v1.h
 include/wlr/types/wlr_scene.h
 include/wlr/types/wlr_screencopy_v1.h
 include/wlr/types/wlr_seat.h
+include/wlr/types/wlr_security_context_v1.h
 include/wlr/types/wlr_server_decoration.h
 include/wlr/types/wlr_session_lock_v1.h
+include/wlr/types/wlr_shm.h
 include/wlr/types/wlr_single_pixel_buffer_v1.h
 include/wlr/types/wlr_subcompositor.h
-include/wlr/types/wlr_surface.h
 include/wlr/types/wlr_switch.h
 include/wlr/types/wlr_tablet_pad.h
 include/wlr/types/wlr_tablet_tool.h
 include/wlr/types/wlr_tablet_v2.h
+include/wlr/types/wlr_tearing_control_v1.h
 include/wlr/types/wlr_text_input_v3.h
 include/wlr/types/wlr_touch.h
 include/wlr/types/wlr_viewporter.h
 include/wlr/types/wlr_virtual_keyboard_v1.h
 include/wlr/types/wlr_virtual_pointer_v1.h
 include/wlr/types/wlr_xcursor_manager.h
 include/wlr/types/wlr_xdg_activation_v1.h
 include/wlr/types/wlr_xdg_decoration_v1.h
 include/wlr/types/wlr_xdg_foreign_registry.h
 include/wlr/types/wlr_xdg_foreign_v1.h
 include/wlr/types/wlr_xdg_foreign_v2.h
 include/wlr/types/wlr_xdg_output_v1.h
 include/wlr/types/wlr_xdg_shell.h
 include/wlr/util/addon.h
 include/wlr/util/box.h
 include/wlr/util/edges.h
 include/wlr/util/log.h
 include/wlr/util/region.h
 include/wlr/version.h
 include/wlr/xcursor.h
 %%X11%%include/wlr/xwayland.h
 %%X11%%include/wlr/xwayland/server.h
+%%X11%%include/wlr/xwayland/shell.h
 %%X11%%include/wlr/xwayland/xwayland.h
 lib/libwlroots.so
-lib/libwlroots.so.11
+lib/libwlroots.so.12
 libdata/pkgconfig/wlroots.pc
diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile
index 78b1231b8388..58dc491cb322 100644
--- a/x11-wm/cage/Makefile
+++ b/x11-wm/cage/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	cage
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.5
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	638d4fb71555.patch:-p1 # https://github.com/cage-kiosk/cage/pull/148
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland kiosk
 WWW=		https://www.hjdskes.nl/projects/cage/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.16.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	cage-kiosk
 PLIST_FILES=	bin/${PORTNAME}
 
 CONFLICTS_INSTALL=	${PORTNAME}-devel
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc>=1.9.2:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
 X11_MESON_TRUE=	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
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/cagebreak/Makefile b/x11-wm/cagebreak/Makefile
index 51939e4f9a19..38fb75b08a81 100644
--- a/x11-wm/cagebreak/Makefile
+++ b/x11-wm/cagebreak/Makefile
@@ -1,51 +1,53 @@
 PORTNAME=	cagebreak
 DISTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland tiling compositor inspired by ratpoison
 WWW=		https://github.com/project-repo/cagebreak
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libudev.so:devel/libudev-devd \
 		libwayland-server.so:graphics/wayland \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo pango
 GH_ACCOUNT=	project-repo
 MESON_ARGS=	-Dversion_override="${DISTVERSIONFULL}" # if snapshot
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/xdg/${PORTNAME}/config
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_TRUE=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
 			man/man5/${PORTNAME}-config.5.gz \
 			man/man7/${PORTNAME}-socket.7.gz
 
 X11_MESON_TRUE=	xwayland
 
 post-patch:
 # Respect PREFIX for system-wide config
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/${PORTNAME}.c \
 		${WRKSRC}/meson.build
 # Drop duplicate LICENSE installation
 	@${REINPLACE_CMD} -e '/install.*licenses/d' \
 		${WRKSRC}/meson.build
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/dwl/Makefile b/x11-wm/dwl/Makefile
index 46dd4375201f..3c7cc93e3366 100644
--- a/x11-wm/dwl/Makefile
+++ b/x11-wm/dwl/Makefile
@@ -1,71 +1,73 @@
 PORTNAME=	dwl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	dwm for Wayland
 WWW=		https://github.com/djpohly/dwl
 
 LICENSE=	CC0-1.0 GPLv3+ MIT
 LICENSE_COMB=	multi
 LICENSE_FILE_CC0-1.0=	${WRKSRC}/LICENSE.tinywl
 LICENSE_FILE_GPLv3+ =	${WRKSRC}/LICENSE
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE.dwm
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols \
 		wlroots>=0.16.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	djpohly
 EXTRA_PATCHES=	${${PORTNAME:tu}_PATCHES}
 MAKE_ARGS=	VERSION="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz \
 		share/wayland-sessions/${PORTNAME}.desktop
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	ADDONS DOCS X11
 OPTIONS_DEFAULT=ADDONS X11
 
 ADDONS_DESC=		Install extra applications: ${ADDONS_RUN_DEPENDS:C/\:.*//}
 ADDONS_RUN_DEPENDS?=	foot:x11/foot \
 			bemenu-run:x11/bemenu
 
 X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 X11_USES=		xorg
 X11_USE=		XORG=xcb
 X11_MAKE_ARGS=		XWAYLAND="-DXWAYLAND" XLIBS="xcb xcb-icccm"
 
 pre-everything::
 	@${ECHO_MSG} "To build ${PORTNAME} with your own config.h set ${PORTNAME:tu}_CONF variable"
 	@${ECHO_MSG} "either in ${.CURDIR:T}/Makefile.local, make.conf(5), environ(7) or command line e.g.,"
 	@${ECHO_MSG} "\$$ make install clean ${PORTNAME:tu}_CONF=/path/to/${PORTNAME}/config.h"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To apply your own patches set ${PORTNAME:tu}_PATCHES (like ${PORTNAME:tu}_CONF)"
 	@${ECHO_MSG} "to a list of files separated by space with optional -pX suffix e.g.,"
 	@${ECHO_MSG} "\$$ make install clean ${PORTNAME:tu}_PATCHES='/path/to/foo.patch:-p1'"
 
 post-extract:
 # .if exists(...) before bsd.port.mk ignores *_CONF in make.conf(5) and Makefile.local
 	@if [ -e "${${PORTNAME:tu}_CONF}" ]; then \
 		${ECHO_MSG} "Creating symlink: config.h -> ${${PORTNAME:tu}_CONF}"; \
 		${LN} -fs "${${PORTNAME:tu}_CONF}" ${WRKSRC}/config.h; \
 	fi
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \
 		${STAGEDIR}${PREFIX}/share/wayland-sessions
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" \
 		${STAGEDIR}${DOCSDIR})
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index 0877fa0897ae..b84f318656fd 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -1,90 +1,92 @@
 PORTNAME=	gamescope
 DISTVERSION=	3.13.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	SteamOS session compositing window manager
 WWW=		https://github.com/ValveSoftware/gamescope
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		glslangValidator:graphics/glslang \
 		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=1.17:graphics/wayland-protocols \
 		glm>0:math/glm \
 		hwdata>0:misc/hwdata \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libliftoff.so:graphics/libliftoff \
 		libvulkan.so:graphics/vulkan-loader \
 		libwayland-server.so:graphics/wayland \
 		libdisplay-info.so:sysutils/libdisplay-info \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	hwdata>0:misc/hwdata
 
 USES=		compiler:c++11-lib meson pkgconfig sdl xorg
 USE_GITHUB=	yes
 USE_SDL=	sdl2
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xmu xrender xres xtst xxf86vm
 GH_ACCOUNT=	ValveSoftware
 GH_TUPLE=	nothings:stb:5736b15:stb/subprojects/stb \
 		KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:spirv_headers/thirdparty/SPIRV-Headers \
 		Joshua-Ashton:reshade:v4.4.2-2572-g9fdbea68:reshade/src/reshade \
 		Joshua-Ashton:vkroots:d5ef31a:vkroots/subprojects/vkroots
 MESON_ARGS=	--force-fallback-for= # allow system wlroots + libliftoff
 MESON_ARGS+=	-Dbenchmark=disabled # gamescope_color_microbench isn't installed
 MESON_ARGS+=	-Denable_openvr_support=false # https://github.com/ValveSoftware/openvr/pull/564
 MESON_ARCH_FAMILY=	${ARCH:S/amd/x86_/:S/i3/x/:C/v[67]//:S/power/p/:S/le$//}
 PLIST_FILES=	bin/${PORTNAME} \
 		lib/libVkLayer_FROG_${PORTNAME}_wsi_${MESON_ARCH_FAMILY}.so \
 		share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.${MESON_ARCH_FAMILY}.json
 
 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
 
 post-extract:
 # Merge patch_directory for subprojects without meson.build
 	@(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..)
 
 .ifdef GH_TUPLE
 post-configure:
 	@${REINPLACE_CMD} 's/meson install/& \
 		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
 .endif
 
 # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo)
 .if ${CXX} == c++ && exists(/usr/lib/libc++.so)
 .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch)
 BUILD_DEPENDS+=	${CMAKE_BIN}:devel/cmake-core
 USES+=		llvm:min=16,build,export
 PATH:=		${LLVM_PREFIX}/bin:${PATH} # XXX _CMAKE_TOOLCHAIN_SUFFIX vs. devel/llvm*
 CONFIGURE_ENV+=	CC="${CC}" CXX="${CXX}" CPP="${CPP}"
 CMAKE_BIN=	${LOCALBASE}/bin/cmake
 
 # 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
 	@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
 .endif
 .endif # exists(/usr/lib/libc++.so)
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/kwinft/Makefile b/x11-wm/kwinft/Makefile
index 7535d04701aa..41dbf3b41b0f 100644
--- a/x11-wm/kwinft/Makefile
+++ b/x11-wm/kwinft/Makefile
@@ -1,71 +1,72 @@
 PORTNAME=	kwinft
 DISTVERSIONPREFIX=	${PORTNAME}@
 DISTVERSION=	5.27.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland compositor and X11 window manager
 WWW=		https://gitlab.com/kwinft/kwinft
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy \
 		libwayland-server.so:graphics/wayland \
 		libWraplandServer.so:graphics/wrapland \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon \
 		libxcb-cursor.so:x11/xcb-util-cursor \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-keysyms.so:x11/xcb-util-keysyms \
 		libxcb-icccm.so:x11/xcb-util-wm
 TEST_DEPENDS=	${qt-testlib_PORT:T}>0:${qt-testlib_PORT}
 
 CONFLICTS_INSTALL=	plasma5-kwin # bin/kwin_wayland
 
 USES=		cmake:testing gl kde:5 pkgconfig python:run qt:5 shebangfix xorg
 USE_GITLAB=	yes
 USE_GL=		egl
 USE_KDE=	ecm:build auth config configwidgets \
 		coreaddons crash dbusaddons decoration globalaccel i18n \
 		idletime kcmutils kdeclarative kio kscreenlocker newstuff \
 		notifications package plasma-framework service \
 		widgetsaddons windowsystem xmlgui
 USE_LDCONFIG=	yes
 USE_QT=		qmake:build buildtools:build core dbus declarative gui \
 		multimedia:run quickcontrols2:run widgets x11extras
 USE_XORG=	pixman x11 xcb xi
 SHEBANG_FILES=	effect/effects/*.py kconf_update/*.py kconf_update/*.pl
 PLIST_SUB=	VERSION=${PORTVERSION}
 LDFLAGS+=	-Wl,--as-needed # GL, ICE/SM/Xext, glib, intl, Qt5*, KF5*
 
 OPTIONS_DEFINE=	BREEZE DOCS QA11Y
 OPTIONS_DEFAULT=BREEZE QA11Y
 
 BREEZE_DESC=		Default window decoration plugin
 BREEZE_USE=		KDE=breeze
 BREEZE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Breeze
 
 DOCS_USE=		KDE=doctools:build
 DOCS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_KF5DocTools
 
 QA11Y_DESC=		Accessibility (focus tracking) for Zoom effect
 QA11Y_LIB_DEPENDS=	libqaccessibilityclient-qt5.so:accessibility/libqaccessibilityclient
 QA11Y_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_QAccessibilityClient
 
 post-patch:
 # Convert nodes from linprocfs(5) to procfs(5)
 # XXX kwinft lacks https://invent.kde.org/plasma/kwin/-/commit/1bc7afe8aaa9
 	@${REINPLACE_CMD} -e '/proc/,+1s,/exe,/file,' \
 		${WRKSRC}/base/wayland/filtered_display.cpp \
 		${WRKSRC}/desktop/kde/service_utils.h
 # Generic nodes are not supported by procfs(5)
 	@${REINPLACE_CMD} -e '/mounts/s,/proc,/compat/linux&,' \
 		${WRKSRC}/debug/perf/ftrace_impl.cpp
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile
index ac5cd42b9479..1f4465530d45 100644
--- a/x11-wm/labwc/Makefile
+++ b/x11-wm/labwc/Makefile
@@ -1,73 +1,75 @@
 PORTNAME=	labwc
 DISTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Wayland stacking compositor
 WWW=		https://github.com/labwc/labwc
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GNOME=	cairo libxml2 pango
 PLIST_FILES=	bin/${PORTNAME} \
 		share/wayland-sessions/${PORTNAME}.desktop
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES LIBRSVG2 MANPAGES NLS X11
 OPTIONS_DEFAULT=EXAMPLES LIBRSVG2 MANPAGES NLS X11
 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
 
 LIBRSVG2_USE=		GNOME=librsvg2
 LIBRSVG2_MESON_ENABLED=	svg
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz \
 			man/man5/${PORTNAME}-actions.5.gz \
 			man/man5/${PORTNAME}-config.5.gz \
 			man/man5/${PORTNAME}-menu.5.gz \
 			man/man5/${PORTNAME}-theme.5.gz
 
 NLS_USES=		gettext
 NLS_MESON_ENABLED=	nls
 NLS_PLIST_FILES=	share/locale/de/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/id/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/it/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/ka/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/pl/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/ru/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/sv/LC_MESSAGES/${PORTNAME}.mo \
 			share/locale/tr/LC_MESSAGES/${PORTNAME}.mo
 
 X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Force system dependencies
 	@${RM} ${WRKSRC}/subprojects/*.wrap
 # 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
 # Respect PREFIX for system-wide config and Openbox themes
 	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
 		-e 's,/usr/local,${PREFIX},' \
 		${WRKSRC}/docs/${PORTNAME}-config.5.scd \
 		${WRKSRC}/src/common/dir.c
 # Respect hier(7) for examples
 	@${REINPLACE_CMD} '/datadir/s/doc/examples/' \
 		${WRKSRC}/docs/meson.build
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 2e540d58feee..cef3d2020747 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	phoc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.33.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Phone compositor
 WWW=		https://gitlab.gnome.org/World/Phosh/phoc
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.15:graphics/wayland-protocols \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-glib-1.0.so:devel/json-glib \
 		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 gettext gl gnome meson pkgconfig python:build shebangfix xorg
 USE_GITLAB=	yes
 USE_GL=		glesv2
 USE_GNOME=	cairo gnomedesktop3
 USE_XORG=	pixman xcb
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World/Phosh
 GL_TUPLE=	https://gitlab.gnome.org:guidog:gmobile:v0.0.1-11-gff85498:gmobile/subprojects/gmobile
 SHEBANG_FILES=	build-aux/post_install.py
 MESON_ARGS=	-Dembed-wlroots=disabled
 PLIST_FILES=	bin/${PORTNAME} \
 		share/applications/sm.puri.Phoc.desktop \
 		share/icons/hicolor/symbolic/apps/sm.puri.Phoc.svg
 GLIB_SCHEMAS=	sm.puri.phoc.gschema.xml
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=MANPAGES
 
 MANPAGES_BUILD_DEPENDS=	rst2man:textproc/py-docutils
 MANPAGES_MESON_TRUE=	man
 MANPAGES_PLIST_FILES=	man/man1/${PORTNAME}.1.gz
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile
index 63428caba36f..9f00bb25adaa 100644
--- a/x11-wm/river/Makefile
+++ b/x11-wm/river/Makefile
@@ -1,80 +1,82 @@
 PORTNAME=	river
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Dynamic tiling Wayland compositor
 WWW=		https://github.com/riverwm/river
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>0:graphics/wayland-protocols \
 		wlroots>=0.16.0:x11-toolkits/wlroots \
 		zig>=0.10.0:lang/zig
 LIB_DEPENDS=	libevdev.so:devel/libevdev \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 GH_ACCOUNT=	riverwm
 GH_TUPLE=	ifreund:zig-pixman:4a49ba1:zig_pixman/deps/zig-pixman \
 		ifreund:zig-wayland:ace6aee:zig_wayland/deps/zig-wayland \
 		ifreund:zig-xkbcommon:bfd1f97:zig_xkbcommon/deps/zig-xkbcommon \
 		swaywm:zig-wlroots:04bcd67:zig_wlroots/deps/zig-wlroots
 MAKE_ENV=	DESTDIR="${STAGEDIR}"
 CONFIGURE_ARGS=	--prefix "${PREFIX}" \
 		${WITH_DEBUG:D:U-Drelease-fast} \
 		${WITH_PIE:D-Dpie} \
 		${STRIP:C/.+/-Dstrip/} \
 		-Dcpu=${CPUTYPE:Ubaseline} \
 		--verbose
 NO_INSTALL=	yes # strip(1) breaks runtime
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}ctl \
 		bin/${PORTNAME}tile \
 		libdata/pkgconfig/${PORTNAME}-protocols.pc \
 		share/${PORTNAME}-protocols/${PORTNAME}-layout-v3.xml \
 		share/bash-completion/completions/${PORTNAME}ctl \
 		share/fish/vendor_completions.d/${PORTNAME}ctl.fish \
 		share/zsh/site-functions/_${PORTNAME}ctl \
 		${NULL}
 
 # https://github.com/ziglang/zig/issues/12170 (pixman)
 MAKE_ENV+=	PKG_CONFIG_SYSTEM_LIBRARY_PATH="${LOCALBASE}/lib"
 
 OPTIONS_DEFINE=	MANPAGES X11
 OPTIONS_DEFAULT=MANPAGES X11
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_CONFIGURE_ON=	-Dman-pages=true
 MANPAGES_CONFIGURE_OFF=	-Dman-pages=false
 MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
 			share/man/man1/${PORTNAME}ctl.1.gz \
 			share/man/man1/${PORTNAME}tile.1.gz \
 			${NULL}
 
 X11_CONFIGURE_ON=	-Dxwayland=true
 X11_CONFIGURE_OFF=	-Dxwayland=false
 
 post-patch:
 # Respect devel/pkgconf default search
 	@${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \
 		${WRKSRC}/build.zig
 # Respect PREFIX in path references
 	@${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' \
 		${WRKSRC}/doc/${PORTNAME}ctl.1.scd
 
 do-build:
 	@(cd ${WRKSRC} && ${MAKE_ENV} zig build ${CONFIGURE_ARGS})
 
 do-test:
 	@(cd ${WRKSRC} && ${TEST_ENV} zig build test ${CONFIGURE_ARGS})
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile
index 6555cc8d30ad..3f5e75a792ff 100644
--- a/x11-wm/sway/Makefile
+++ b/x11-wm/sway/Makefile
@@ -1,72 +1,73 @@
 PORTNAME=	sway
 DISTVERSION?=	1.8.1
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-wm wayland
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 PATCHFILES+=	f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090
 .ifndef PKGNAMESUFFIX
 PATCHFILES+=	dee032d0a0ec.patch:-p1 # https://github.com/swaywm/sway/pull/7525
 .endif
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT?=	i3-compatible Wayland compositor
 WWW?=		https://swaywm.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.24:graphics/wayland-protocols \
 		wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libevdev.so:devel/libevdev \
 		libudev.so:devel/libudev-devd \
 		libpcre2-8.so:devel/pcre2 \
 		libwayland-egl.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libinput.so:x11/libinput \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gl gnome meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL+=	glesv2
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 GH_ACCOUNT?=	swaywm
 MESON_ARGS=	-Dsd-bus-provider=basu
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel ${PORTNAME}fx
 
 OPTIONS_DEFINE=	BASU MANPAGES PIXBUF SWAYBG X11
 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11
 OPTIONS_SUB=	yes
 
 BASU_DESC=		Tray in swaybar via basu
 BASU_LIB_DEPENDS=	libbasu.so:devel/basu
 BASU_MESON_ENABLED=	tray
 
 MANPAGES_BUILD_DEPENDS=	scdoc>=1.9.2:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 
 PIXBUF_USE=		GNOME=gdkpixbuf2
 PIXBUF_MESON_ENABLED=	gdk-pixbuf
 
 SWAYBG_DESC=		Default command to set background
 SWAYBG_RUN_DEPENDS=	swaybg:x11/swaybg
 
 X11_USE=		XORG=xcb
 X11_LIB_DEPENDS=	libxcb-icccm.so:x11/xcb-util-wm
 X11_MESON_ENABLED=	xwayland
 
 post-patch:
 # Let @sample handle default files under etc/
 	@${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \
 		${WRKSRC}/meson.build
 # 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
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile
index e368f3c454b2..ad5556bc24cd 100644
--- a/x11-wm/swayfx/Makefile
+++ b/x11-wm/swayfx/Makefile
@@ -1,20 +1,20 @@
 DISTVERSION=	0.3.2
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	${GH_PROJECT:S/${PORTNAME}//}
 
 PATCHFILES+=	c47aa61c6492.patch:-p1 # https://github.com/WillPower3309/swayfx/pull/209
 
 COMMENT=	Sway, but with eye candy!
 WWW=		https://github.com/WillPower3309/swayfx
 
 MASTERDIR=	${.CURDIR}/../sway
 DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 GH_ACCOUNT=	WillPower3309
 GH_PROJECT=	swayfx
 USE_GL=		egl
 
 CONFLICTS_INSTALL=	${PORTNAME} ${PORTNAME}-devel
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11-wm/wayfire-plugins-extra/Makefile b/x11-wm/wayfire-plugins-extra/Makefile
index 66439e7aa4be..c14b4017334d 100644
--- a/x11-wm/wayfire-plugins-extra/Makefile
+++ b/x11-wm/wayfire-plugins-extra/Makefile
@@ -1,43 +1,45 @@
 PORTNAME=	wayfire-plugins-extra
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Additional plugins for Wayfire
 WWW=		https://wayfire.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-scanner:graphics/wayland \
 		wayland-protocols>0:graphics/wayland-protocols \
 		wayfire>0:x11-wm/wayfire
 LIB_DEPENDS=	libwf-config.so:devel/wf-config \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots
 
 USES=		compiler:c++17-lang gnome meson pkgconfig
 USE_GITHUB=	yes
 USE_GITLAB=	nodefault
 USE_GNOME=	cairo glibmm
 GH_ACCOUNT=	WayfireWM
 GH_TUPLE=	timgott:wayfire-shadows:de32395:wayfire_shadows/subprojects/wayfire-shadows
 GL_TUPLE=	wayfireplugins:focus-request:bc41d54:focus_request/subprojects/focus-request \
 		wayfireplugins:windecor:f609ac0:windecor/subprojects/windecor
 MESON_ARGS=	-Denable_focus_request=true -Denable_wayfire_shadows=true
 
 OPTIONS_DEFINE=	LIBRSVG2
 OPTIONS_DEFAULT=LIBRSVG2
 OPTIONS_SUB=	yes
 
 LIBRSVG2_USE=		GNOME=librsvg2
 LIBRSVG2_MESON_TRUE=	enable_windecor
 
 post-patch:
 # Respect PREFIX for icons
 	@${REINPLACE_CMD} 's,/usr/share,${DATADIR:H},' \
 		${WRKSRC}/subprojects/windecor/deco-icontheme.cpp
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index 0e17853684e0..3aeaa42b99b0 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,67 +1,69 @@
 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
 
 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
 
 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
 
+.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk"
 .include <bsd.port.mk>