diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 353d4fc0a698..c2a62e3c621d 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -1,33 +1,31 @@
 PORTNAME=	xfs
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+DISTVERSION=	1.2.2
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org font server
-WWW=		https://www.x.org/
+WWW=		https://gitlab.freedesktop.org/xorg/app/xfs
 
-USES=		cpe gmake xorg xorg-cat:app
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		cpe gmake tar:xz xorg xorg-cat:app
 CPE_VENDOR=	x.org
 CPE_PRODUCT=	x_font_server
-USE_XORG=	libfs xfont2 xorgproto xtrans
+USE_XORG=	xfont2 xorgproto xtrans
 USE_RC_SUBR=	xfs
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--without-xmlto --without-fop
 
 post-patch:
 	${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in
-.if defined(WITHOUT_XFS_CACHE)
-	${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp
-.endif
 
 post-build:
 	@cd ${WRKSRC}/config/ && ${MAKE_CMD} config
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/fs
 	${INSTALL_SCRIPT} ${WRKSRC}/config/config \
 		${STAGEDIR}${PREFIX}/etc/X11/fs/config.sample
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xfs/distinfo b/x11-fonts/xfs/distinfo
index f78cc6064ddc..31ad5de253dd 100644
--- a/x11-fonts/xfs/distinfo
+++ b/x11-fonts/xfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513537424
-SHA256 (xorg/app/xfs-1.2.0.tar.bz2) = db2212115783498f8eeaaee1349461d6c4e9d2005e142bacd3a984fe57269860
-SIZE (xorg/app/xfs-1.2.0.tar.bz2) = 233957
+TIMESTAMP = 1750457952
+SHA256 (xorg/app/xfs-1.2.2.tar.xz) = b70bd46331e241b30e5e00dbdc2eabb7f3f8880cd44244acde13d7976d098ecc
+SIZE (xorg/app/xfs-1.2.2.tar.xz) = 220036
diff --git a/x11-fonts/xfs/pkg-descr b/x11-fonts/xfs/pkg-descr
index b1cd28954e9c..96cbb9c097ca 100644
--- a/x11-fonts/xfs/pkg-descr
+++ b/x11-fonts/xfs/pkg-descr
@@ -1 +1,4 @@
-This package contains the X.Org font server.
+Xfs is the X Window System font server. It supplies fonts to X Window
+System display servers. The server is usually run by a system
+administrator. Users may also wish to start private font servers for
+specific sets of fonts.