Index: head/x11-servers/xwayland-devel/Makefile
===================================================================
--- head/x11-servers/xwayland-devel/Makefile	(revision 540544)
+++ head/x11-servers/xwayland-devel/Makefile	(revision 540545)
@@ -1,71 +1,69 @@
 # $FreeBSD$
 
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
 DISTVERSION=	1.20.0-669
-DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
+DISTVERSIONSUFFIX=	-gb67052742
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
-PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	9e0086f99b39.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
-PATCHFILES+=	30ea6cb622e9.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	9e0086f99b39.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
+PATCHFILES+=	30ea6cb622e9.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
 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_GITHUB=	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_COMMIT=	b67052742980fd3ec669100048da71e09aa61358
+GH_ACCOUNT=	freedesktop
+GH_PROJECT=	xorg-xserver
 MESON_ARGS=	-Dxwayland=true \
 		-Dxorg=false \
 		-Dxnest=false \
 		-Dxvfb=false \
 		-Dudev=false \
 		-Dudev_kms=false \
 		-Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}"
 PLIST_FILES=	bin/Xwayland
 
 # 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
 
 do-install:
 # Wayland compositors only use the binary
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/x11-servers/xwayland-devel/distinfo
===================================================================
--- head/x11-servers/xwayland-devel/distinfo	(revision 540544)
+++ head/x11-servers/xwayland-devel/distinfo	(revision 540545)
@@ -1,7 +1,7 @@
 TIMESTAMP = 1593099139
-SHA256 (xorg-xserver-b67052742980fd3ec669100048da71e09aa61358_GL0.tar.gz) = 2c1a3ed63b00d7a13c54f432c2829f9d2d174d1dd92357c9eb7a94885f9e22f3
-SIZE (xorg-xserver-b67052742980fd3ec669100048da71e09aa61358_GL0.tar.gz) = 5103088
-SHA256 (9e0086f99b39.diff) = e8de09e5ca2e44dbd35924f353f903d7e3393e872732cdf0dfa638e566b43e4d
-SIZE (9e0086f99b39.diff) = 10299
-SHA256 (30ea6cb622e9.diff) = c568c39b302dea2271ffb9a711eb76154f920c17da2f90a275cf3d0535da27bf
-SIZE (30ea6cb622e9.diff) = 15620
+SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-669-gb67052742_GH0.tar.gz) = dc3f9d66825b2b2cb8717bad7f773190ee20042e379b030bc50d7ee00ce40b64
+SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-669-gb67052742_GH0.tar.gz) = 5105667
+SHA256 (9e0086f99b39.patch) = f8af32f1aba1062e351fe43722816ba1dda43ae691bed8a0f855b58341ad8f6c
+SIZE (9e0086f99b39.patch) = 10714
+SHA256 (30ea6cb622e9.patch) = 3a99b52b7f7a451daf0620b457aa041a95caddcdcc0ae73d7b8a1b30d19f14b0
+SIZE (30ea6cb622e9.patch) = 17585