diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile
index d34714852e78..298f7c6f06f1 100644
--- a/x11-toolkits/open-motif-devel/Makefile
+++ b/x11-toolkits/open-motif-devel/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	open-motif
 PORTVERSION=	${COMMIT_DATE}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
 WWW=		https://motif.ics.com/
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cschuber
 GH_PROJECT=	motif
 GH_TAGNAME=	0f556b08
 COMMIT_DATE=	2023.02.16
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif
 CONFLICTS_INSTALL=	open-motif
 
 USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig xorg
 USE_XORG=	x11 xaw xbitmaps xext xft xt xmu xrender sm ice
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libXmu.so:x11-toolkits/libXmu
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-printing=no
 CPPFLAGS+=	-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # fix sections
 	@${FIND} ${WRKSRC}/doc/man/man1 -name '*.1' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|user cmd|1|'
 	@${FIND} ${WRKSRC}/doc/man/man3 -name '*.3' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|library call|3|'
 # mwmrc is not a kernel interface!!
 	@cd ${WRKSRC}/doc/man && ${CP} -f man4/mwmrc.4 man5/mwmrc.5
 	@${FIND} ${WRKSRC}/doc/man/man5 -name '*.5' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|special file|5| ; \
 		 s|file formats|5|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in BUGREPORT README RELNOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c
new file mode 100644
index 000000000000..45fe127e420c
--- /dev/null
+++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c
@@ -0,0 +1,15 @@
+--- lib/Xm/XmRenderT.c.orig	2023-02-15 16:42:34.000000000 -0800
++++ lib/Xm/XmRenderT.c	2023-12-04 15:42:20.894104000 -0800
+@@ -2091,10 +2091,9 @@
+ 						  static int count_rend=0, num_rend;
+ 						  num_rend = GetSameRenditions(rend_cache, rend, count_rend);
+ 
+-						  if (num_rend>=0)
++						  if(num_rend >= 0 && (display == _XmRendDisplay(rend_cache[num_rend]))) {
+ 							  _XmRendXftFont(rend) = _XmRendXftFont(rend_cache[num_rend]);
+-						  else
+-						  {
++						  } else {
+ #endif
+ 		    _XmRendPattern(rend) = FcPatternCreate();
+ 		    if (_XmRendFontName(rend))
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 47eb20ebd003..e90595a26679 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	open-motif
 PORTVERSION=	2.3.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 # MASTER_SITES=	SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/
 MASTER_SITES=	SF/motif/Motif%20${PORTVERSION}%20Source%20Code/
 DISTNAME=	motif-${PORTVERSION}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
 WWW=		https://motif.ics.com/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	lesstif
 CONFLICTS_INSTALL=	open-motif-devel
 
 USES=		autoreconf gmake iconv jpeg libtool:keepla pkgconfig xorg
 USE_XORG=	x11 xaw xbitmaps xext xft xt xmu xrender sm ice
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libXmu.so:x11-toolkits/libXmu
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-printing=no
 CPPFLAGS+=	-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI -I${PREFIX}/include
 USE_CSTD=	gnu89
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # fix sections
 	@${FIND} ${WRKSRC}/doc/man/man1 -name '*.1' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|user cmd|1|'
 	@${FIND} ${WRKSRC}/doc/man/man3 -name '*.3' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|library call|3|'
 # mwmrc is not a kernel interface!!
 	@cd ${WRKSRC}/doc/man && ${CP} -f man4/mwmrc.4 man5/mwmrc.5
 	@${FIND} ${WRKSRC}/doc/man/man5 -name '*.5' -maxdepth 1 | \
 		${XARGS} ${REINPLACE_CMD} -e 's|special file|5| ; \
 		 s|file formats|5|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in BUGREPORT README RELNOTES
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
new file mode 100644
index 000000000000..84b92bd900b7
--- /dev/null
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
@@ -0,0 +1,15 @@
+--- lib/Xm/XmRenderT.c.orig	2017-03-27 15:24:31.000000000 -0700
++++ lib/Xm/XmRenderT.c	2023-12-04 15:42:22.406098000 -0800
+@@ -2091,10 +2091,9 @@
+ 						  static int count_rend=0, num_rend;
+ 						  num_rend = GetSameRenditions(rend_cache, rend, count_rend);
+ 
+-						  if (num_rend>=0)
++						  if(num_rend >= 0 && (display == _XmRendDisplay(rend_cache[num_rend]))) {
+ 							  _XmRendXftFont(rend) = _XmRendXftFont(rend_cache[num_rend]);
+-						  else
+-						  {
++						  } else {
+ #endif
+ 		    _XmRendPattern(rend) = FcPatternCreate();
+ 		    if (_XmRendFontName(rend))