diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile
index af75b8488417..2c82369b7860 100644
--- a/x11/xorg-cf-files/Makefile
+++ b/x11/xorg-cf-files/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	xorg-cf-files
 PORTVERSION=	1.0.8
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org cf files for use with imake builds
 
 LICENSE=	MIT
 
 USES=		tar:xz xorg-cat:util
 
 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/files/patch-Imake.tmpl b/x11/xorg-cf-files/files/patch-Imake.tmpl
index 45cca872bcb2..0f4f081713a5 100644
--- a/x11/xorg-cf-files/files/patch-Imake.tmpl
+++ b/x11/xorg-cf-files/files/patch-Imake.tmpl
@@ -1,20 +1,29 @@
---- Imake.tmpl.orig	2021-08-02 01:00:38 UTC
+--- Imake.tmpl.orig	2023-02-22 02:28:43 UTC
 +++ Imake.tmpl
+@@ -890,7 +890,7 @@ TCLIBDIR = TclLibDir
+ #endif
+ #ifndef ManDirectoryRoot
+ #ifdef ProjectRoot
+-#define ManDirectoryRoot Concat(ProjectRoot,/man)
++#define ManDirectoryRoot Concat(ProjectRoot,/share/man)
+ #else
+ #define ManDirectoryRoot SystemManDirectory
+ #endif
 @@ -1823,7 +1823,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
         CXXOPTIONS = CplusplusOptions
        CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
         CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
 -         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
 +         CXXFLAGS += $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
  #endif
           COMPRESS = CompressCmd
            GZIPCMD = GzipCmd
 @@ -2073,7 +2073,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
   */
        ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
         ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
 -           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
 +           CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
          LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
           LDPRELIB = LdPreLib $(INSTALLED_LIBS)
          LDPOSTLIB = LdPostLib