diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 0653e6915922..a5b4eaa69e07 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -1,152 +1,152 @@
 PORTNAME=	xorg
 PORTVERSION=	21.1.4
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver
 DISTNAME=	xorg-server-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 LICENSE=	MIT
 
 FLAVORS=	xorg xnest xephyr xvfb
 FLAVOR?=	${FLAVORS:[1]}
 
 EXTRA_PATCHES=	${FILESDIR}/0002-xephyr_Dont_check_for_SeatId_anymore.patch:-p1
 
 USES=		compiler:c11 cpe gl meson pkgconfig tar:xz xorg
 USE_GL=		gl
 
 .if ${FLAVOR} == xephyr
 PORTNAME=	xephyr
 .elif  ${FLAVOR} == xorg
 PKGNAMESUFFIX=	-server
 SUB_FILES=	pkg-post-deinstall pkg-post-install
 PKGPOSTINSTALL= ${WRKDIR}/pkg-post-install
 PKGPOSTDEINSTALL=	${WRKDIR}/pkg-post-deinstall
 .elif ${FLAVOR} == xnest
 PORTEPOCH=	2
 PKGNAMESUFFIX= -nestserver
 .elif ${FLAVOR} == xvfb
 PKGNAMESUFFIX=	-vfbserver
 .endif
 
 .if ${FLAVOR} != xorg
 PLIST=
 PKGMESSAGE=
 BINARY_NAME=	${FLAVOR:C/^(.).*/\1/:tu}${FLAVOR:C/^.//}
 PLIST_FILES=	bin/${BINARY_NAME} \
 		man/man1/${BINARY_NAME}.1.gz
 PLIST_DIRS=	/var/lib/xkb /var/lib
 .endif
 
 DESCR=	${.CURDIR}/pkg-descr-${FLAVOR}
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
 RUN_DEPENDS+=	xkeyboard-config>=2.5:x11/xkeyboard-config \
 		xkbcomp:x11/xkbcomp \
 		${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri
 
 MESON_ARGS+=	-Dxwin=false \
 		-Dxquartz=false \
 		-Ddtrace=false \
 		-Dhal=false \
 		-Dsystemd_logind=false \
 		-Dxselinux=false \
 		-Dfallback_input_driver=libinput \
 		-Ddocs=false \
 		-Dudev_kms=false \
 		-Dxcsecurity=true \
 		-Dxkb_dir=${LOCALBASE}/share/X11/xkb \
 		-Dxkb_output_dir=/var/lib/xkb \
 		-D${FLAVOR}=true
 
 .for f in ${FLAVORS:N${FLAVOR}}
 MESON_ARGS+=	-D${f}=false
 .endfor
 
 .if ${FLAVOR} == xorg
 LIB_DEPENDS+=		libudev.so:devel/libudev-devd \
 			libxcvt.so:x11/libxcvt
 MESON_ARGS+=	-Dudev=true \
 		-Dlog_dir=/var/log \
 		-Dsuid_wrapper=true
 .else
 MESON_ARGS+=	-Dudev=false
 .endif
 
 .if ${FLAVOR} == xorg || ${FLAVOR} == xephyr
 MESON_ARGS+=	-Ddrm=true
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm \
 		libepoxy.so:graphics/libepoxy
 .endif
 
 .if ${FLAVOR} == xephyr
 LIB_DEPENDS+=	libxcb-render-util.so:x11/xcb-util-renderutil \
 		libxcb-image.so:x11/xcb-util-image \
 		libxcb-icccm.so:x11/xcb-util-wm \
 		libxcb-keysyms.so:x11/xcb-util-keysyms
 .endif
 
 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}
 MESON_ARGS+=	-Ddefault_font_path=${DEFAULT_FONTPATH_LIST:ts,}
 PLIST_SUB+=	FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}"
 
 USE_GL+=	gl
 USE_XORG+=	pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans
 CPE_VENDOR=	x.org
 CPE_PRODUCT=	xorg-server
 
 .if ${FLAVOR} == xorg
 USE_GL+=	gbm
 USE_XORG+=	pciaccess
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 MESON_ARGS+=	-Dsha1=libmd
 .endif
 
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
 .if ${ARCH} == "sparc64"
 PLIST_SUB+=	SPARC64=""
 .else
 PLIST_SUB+=	SPARC64="@comment "
 .endif
 
 .if ${FLAVOR} == xorg
 post-install:
 	# Avoid conflict with nvidia-driver, move libglx.so into .xorg directory
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
 	${MV} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so \
 		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
 	@${MKDIR} ${STAGEDIR}${FONTPATHD}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d
 	@${INSTALL_DATA} ${FILESDIR}/20-evdev-kbd.conf \
 		${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d
 	${MKDIR} -p ${STAGEDIR}/var/lib/xkb
 .else
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/xorg/protocol.txt
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/xorg
 	${RM} ${STAGEDIR}${PREFIX}/man/man1/Xserver.1
 	${MKDIR} -p ${STAGEDIR}/var/lib/xkb
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
index 5051539d3aeb..e65a3ee6c259 100644
--- a/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
+++ b/x11-servers/xorg-server/files/patch-hw_xfree86_os-support_meson.build
@@ -1,14 +1,22 @@
---- hw/xfree86/os-support/meson.build.orig	2022-07-12 13:27:57.000000000 +0000
-+++ hw/xfree86/os-support/meson.build	2022-08-08 23:22:53.349353000 +0000
-@@ -111,9 +111,9 @@
+--- hw/xfree86/os-support/meson.build.orig	2022-07-12 13:27:57 UTC
++++ hw/xfree86/os-support/meson.build
+@@ -96,6 +96,7 @@ elif host_machine.system().endswith('bsd')
+         'bsd/bsd_VTsw.c',
+         'bsd/bsd_bell.c',
+         'bsd/bsd_init.c',
++        'misc/SlowBcopy.c',
+ 	'shared/pm_noop.c'
+     ]
+ 
+@@ -111,9 +112,9 @@ elif host_machine.system().endswith('bsd')
          if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
              os_dep += cc.find_library('i386')
          endif
 -    elif host_machine.cpu_family() == 'arm'
 +    elif host_machine.cpu_family() == 'arm' or host_machine.cpu_family() == 'aarch64'
          srcs_xorg_os_support += 'bsd/arm_video.c'
 -    elif host_machine.cpu_family() == 'powerpc'
 +    elif host_machine.cpu_family() == 'ppc' or host_machine.cpu_family() == 'ppc64'
          srcs_xorg_os_support += 'bsd/ppc_video.c'
      elif host_machine.cpu_family() == 'sparc64'
          srcs_xorg_os_support += 'bsd/sparc64_video.c'