diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
index 7e336c3003a9..1f92b58fb127 100644
--- a/x11-servers/xwayland-devel/Makefile
+++ b/x11-servers/xwayland-devel/Makefile
@@ -1,80 +1,73 @@
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	21.0.99.1-1057
 DISTVERSIONSUFFIX=	-ga4d298d85
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	X11 server as Wayland client (development snapshot)
 WWW=		https://wayland.freedesktop.org/xserver.html
 
 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.30: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_GITLAB=	yes
 USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GL_SITE=	https://gitlab.freedesktop.org
 GL_ACCOUNT=	xorg
 GL_PROJECT=	xserver
-GL_TUPLE=	xorg/proto:xorgproto:xorgproto-2024.1:xorgproto/subprojects/xorgproto
 MESON_ARGS=	-D${PORTNAME}=true \
 		-Dxorg=false \
 		-Dxnest=false \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
 		-Dxcsecurity=true \
 		-Dxkb_output_dir=/var/lib/xkb \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland \
 		"@comment lib/xorg/protocol.txt" \
 		libdata/pkgconfig/xwayland.pc \
 		"@comment share/man/man1/Xserver.1.gz" \
 		share/man/man1/Xwayland.1.gz \
 		share/applications/org.freedesktop.Xwayland.desktop
 
 # 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=	CSD EI
 OPTIONS_DEFAULT=CSD EI
 
 CSD_DESC=		Client-side decorations via libdecor
 CSD_LIB_DEPENDS=	libdecor-0.so:x11-toolkits/libdecor
 CSD_MESON_TRUE=		libdecor
 
 EI_DESC=		Emulated input via libei
 EI_LIB_DEPENDS=		libei.so:x11/libei
 EI_MESON_OFF=		-Dxwayland_ei=false
 
-.ifdef GL_TUPLE
-post-configure:
-	@${REINPLACE_CMD} 's/meson install/& \
-		--skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
index 3dde716dd8b7..988a8c9cd5e3 100644
--- a/x11-servers/xwayland-devel/distinfo
+++ b/x11-servers/xwayland-devel/distinfo
@@ -1,5 +1,3 @@
 TIMESTAMP = 1715642088
 SHA256 (xserver-xorg-server-21.0.99.1-1057-ga4d298d85.tar.bz2) = 6b148134f1798c913ce802270e2b0946d7c381573140b51706ae26f59f00d04c
 SIZE (xserver-xorg-server-21.0.99.1-1057-ga4d298d85.tar.bz2) = 3712187
-SHA256 (xorgproto-xorgproto-2024.1.tar.bz2) = 3959b2d17d86dd9d165dc24d26f372ca64f27127cd381739366ba8383a6cd51a
-SIZE (xorgproto-xorgproto-2024.1.tar.bz2) = 775116
diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile
index 8271be8bad85..50ab69358a11 100644
--- a/x11/xorgproto/Makefile
+++ b/x11/xorgproto/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	xorgproto
-DISTVERSION=	2023.2
+DISTVERSION=	2024.1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X Window System unified protocol definitions
 WWW=		https://gitlab.freedesktop.org/xorg/proto/xorgproto
 
 LICENSE=	MIT
 
 USES=		tar:xz xorg-cat:proto
 
 NO_ARCH=	yes
 
 CONFIGURE_ARGS=	--without-fop \
 		--without-xmlto \
 		--without-xsltproc \
 		--disable-specs
 
 OPTIONS_DEFINE=	DOCS
 
 pre-patch:
 	@${MKDIR} ${WRKSRC}/man
 
 .include <bsd.port.mk>
diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo
index 275f43ec4d49..fe87b2b0eba8 100644
--- a/x11/xorgproto/distinfo
+++ b/x11/xorgproto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698309470
-SHA256 (xorg/proto/xorgproto-2023.2.tar.xz) = b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c
-SIZE (xorg/proto/xorgproto-2023.2.tar.xz) = 759040
+TIMESTAMP = 1711437392
+SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59
+SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500