diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index 2c82369b7860..738965c9c3c6 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,19 +1,16 @@
 PORTNAME=	xorg-cf-files
-PORTVERSION=	1.0.8
-PORTREVISION=	1
+DISTVERSION=	1.0.9
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.org cf files for use with imake builds
+COMMENT=	Imake configuration files & templates
+WWW=		https://gitlab.freedesktop.org/xorg/util/cf
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		tar:xz xorg-cat:util
+USES=		tar:xz xorg-cat:util,meson
 
 NO_ARCH=	yes
 
-post-patch:
-		@${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \
-			${WRKSRC}/X11.tmpl
-
 .include <bsd.port.mk>
diff --git a/x11/xorg-cf-files/distinfo b/x11/xorg-cf-files/distinfo
index 23705d5b2238..381094e81911 100644
--- a/x11/xorg-cf-files/distinfo
+++ b/x11/xorg-cf-files/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1686217434
-SHA256 (xorg/util/xorg-cf-files-1.0.8.tar.xz) = 7408955defcfab0f44d1bedd4ec0c20db61914917ad17bfc1f1c9bf56acc17b9
-SIZE (xorg/util/xorg-cf-files-1.0.8.tar.xz) = 290280
+TIMESTAMP = 1778382918
+SHA256 (xorg/util/xorg-cf-files-1.0.9.tar.xz) = 07716eb1fe1fd1f8a1d6588457db0101cae70cb896d49dc65978c97b148ce976
+SIZE (xorg/util/xorg-cf-files-1.0.9.tar.xz) = 174740
diff --git a/x11/xorg-cf-files/pkg-descr b/x11/xorg-cf-files/pkg-descr
index e0bb5bcf11a3..11a1bc4c2a6d 100644
--- a/x11/xorg-cf-files/pkg-descr
+++ b/x11/xorg-cf-files/pkg-descr
@@ -1 +1,5 @@
-X.org cf files for use with imake based builds.
+The xorg-cf-files package contains the data files for the imake utility,
+defining the known settings for a wide variety of platforms (many of
+which have not been verified or tested in almost two decades), and for
+many of the libraries formerly delivered in the X.Org monolithic
+releases.