diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index d29b4b8bba46..8440de73c2ae 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,78 +1,68 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	21.0.99.1-156
 DISTVERSIONSUFFIX=	-g38291fa86
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	42e34498f87a.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	0d56c27582a2.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	1f7b28547011.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Wayland client (development snapshot)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
 		wayland-protocols>=1.18:graphics/wayland-protocols
 LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy \
 		libwayland-client.so:graphics/wayland \
 		libxcvt.so:x11/libxcvt
 RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 		xkeyboard-config>0:x11/xkeyboard-config
 
 CONFLICTS_INSTALL=	${PORTNAME}
 
 USES=		compiler:c11 gl meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GH_ACCOUNT=	freedesktop
 GH_PROJECT=	xorg-xserver
-GH_TUPLE=	freedesktop:xorg-xorgproto:xorgproto-2021.4.99.2:xorgproto/subprojects/xorgproto
 MESON_ARGS=	-D${PORTNAME}=true \
 		-Dxorg=false \
 		-Dxnest=false \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland \
 		"@comment lib/xorg/protocol.txt" \
 		libdata/pkgconfig/xwayland.pc \
 		"@comment man/man1/Xserver.1.gz" \
 		man/man1/Xwayland.1.gz
 
 # Keep in sync with xorg-server
 FONTPATH_ROOT?=	${LOCALBASE}/share/fonts
 FONTPATHD?=	${PREFIX}/etc/X11/fontpath.d
 DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/misc/	\
 	${FONTPATH_ROOT}/TTF/ \
 	${FONTPATH_ROOT}/OTF/ \
 	${FONTPATH_ROOT}/Type1/ \
 	${FONTPATH_ROOT}/100dpi/ \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
 OPTIONS_DEFINE=	NVIDIA
 
 NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland
 NVIDIA_MESON_TRUE=	xwayland_eglstream
 
-.ifdef GH_TUPLE
-post-install:
-# https://github.com/mesonbuild/meson/issues/2550
-	@${RM} -r ${STAGEDIR}${PREFIX}/include/GL
-	@${RM} -r ${STAGEDIR}${PREFIX}/include/X11
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc/xorgproto
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 1e06562dc36f..7ccda9d0f153 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,11 +1,9 @@
 TIMESTAMP = 1640015830
 SHA256 (freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz) = c5adfcfd8e764c1a27d4d34b49a203e0ecb23360caab37b016ac81953f36b7bc
 SIZE (freedesktop-xorg-xserver-xorg-server-21.0.99.1-156-g38291fa86_GH0.tar.gz) = 5457201
-SHA256 (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = ea68fe40cf55247538fd3f0f891ef0ba229b541b56e0874b7efed60688228638
-SIZE (freedesktop-xorg-xorgproto-xorgproto-2021.4.99.2_GH0.tar.gz) = 981510
 SHA256 (42e34498f87a.patch) = 29df34103d68165f6284ad0a2f62873b6e824aa318b15a54fff20bb3c4207d4e
 SIZE (42e34498f87a.patch) = 10298
 SHA256 (0d56c27582a2.patch) = f3081ec0184c0cb764c4ec065d4e437e23741523cf77231f84d48253435ff49b
 SIZE (0d56c27582a2.patch) = 17449
 SHA256 (1f7b28547011.patch) = 9321edce7d8850289570c7f9135b9e791a1c3e18127a34b46ef1adf9e13b8c2a
 SIZE (1f7b28547011.patch) = 2466