Index: branches/2020Q4/x11-servers/xwayland-devel/Makefile
===================================================================
--- branches/2020Q4/x11-servers/xwayland-devel/Makefile	(revision 556864)
+++ branches/2020Q4/x11-servers/xwayland-devel/Makefile	(revision 556865)
@@ -1,72 +1,75 @@
 # $FreeBSD$
 
 PORTNAME=	xwayland
 DISTVERSIONPREFIX=	xorg-server-
-DISTVERSION=	1.20.0-741
-DISTVERSIONSUFFIX=	-g96d19e898
+DISTVERSION=	1.20.0-789
+DISTVERSIONSUFFIX=	-g446ff2d31
 CATEGORIES=	x11-servers
 PKGNAMESUFFIX=	-devel
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	9e0086f99b39.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432
 PATCHFILES+=	5ac296eb6c4e.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_GITHUB=	yes
 USE_GL=		gbm gl
 USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 GH_ACCOUNT=	freedesktop
 GH_PROJECT=	xorg-xserver
-MESON_ARGS=	-Dxwayland=true \
+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 \
-		libdata/pkgconfig/xwayland.pc
+		libdata/pkgconfig/xwayland.pc \
+		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
 
 do-install:
-# Wayland compositors only use the binary
+# XXX Prevent Meson from installing unrelated files
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${BUILD_WRKSRC}/hw/xwayland/xwayland.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig
+	${INSTALL_MAN} ${BUILD_WRKSRC}/hw/xwayland/Xwayland.1 \
+		${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: branches/2020Q4/x11-servers/xwayland-devel/distinfo
===================================================================
--- branches/2020Q4/x11-servers/xwayland-devel/distinfo	(revision 556864)
+++ branches/2020Q4/x11-servers/xwayland-devel/distinfo	(revision 556865)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1601313384
-SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-741-g96d19e898_GH0.tar.gz) = 6359c523c08ffc2898592249c41e5c2c2ee15c871f3436a132f757b3e74aab10
-SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-741-g96d19e898_GH0.tar.gz) = 5107934
+TIMESTAMP = 1606832938
+SHA256 (freedesktop-xorg-xserver-xorg-server-1.20.0-789-g446ff2d31_GH0.tar.gz) = 05c5bfc0e1f2bc265e8c8e7402b583aba387f5db90e29315b101f58e4dd19b9e
+SIZE (freedesktop-xorg-xserver-xorg-server-1.20.0-789-g446ff2d31_GH0.tar.gz) = 5114983
 SHA256 (9e0086f99b39.patch) = f8af32f1aba1062e351fe43722816ba1dda43ae691bed8a0f855b58341ad8f6c
 SIZE (9e0086f99b39.patch) = 10714
 SHA256 (5ac296eb6c4e.patch) = ce85d0becf366c2a8835ae38347d1a4ce533affeab6f721af7838978fe4d4853
 SIZE (5ac296eb6c4e.patch) = 17729
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 556864)
+++ branches/2020Q4	(revision 556865)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r551246,553724,554339,554805,555063,555682,556316,556459-556460,556859