diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile
index 36f53474ca9d..ec74a5e473a9 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=	5
+PORTREVISION=	6
 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_DragC.c b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_DragC.c
new file mode 100644
index 000000000000..8001ce0251a6
--- /dev/null
+++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_DragC.c
@@ -0,0 +1,76 @@
+--- lib/Xm/DragC.c.orig	2023-02-15 16:42:34.000000000 -0800
++++ lib/Xm/DragC.c	2023-12-04 15:58:13.960304000 -0800
+@@ -846,35 +846,18 @@
+   if (newStyle != oldStyle) 
+     {
+       /*
+-       * If we're not still waiting to hear from the window manager,
+-       * and we're not running dynamic, then we can grab.
++       * If we are in pixmap mode, release the grab.
+        */
+-      if ((dc->drag.trackingMode != XmDRAG_TRACK_WM_QUERY_PENDING) &&
+-	  (newStyle != XmDRAG_DYNAMIC) &&
+-	  (initiator != XmDRAG_DYNAMIC) &&
+-	  (initiator != XmDRAG_PREFER_DYNAMIC))
++      if (dc->drag.serverGrabbed)
+ 	{
+-	  if (!dc->drag.serverGrabbed)
+-	    {
+-	      XGrabServer(XtDisplay(dc));
+-	      dc->drag.serverGrabbed = True;
+-	      XtSetArg(args[0], XmNdragOverMode, XmPIXMAP);
+-	      XtSetValues( (Widget)dc->drag.curDragOver, args, 1);
+-	    }
++	  XUngrabServer(XtDisplay(dc));
++	  dc->drag.serverGrabbed = False;
++	  if (xmDisplay -> display.displayHasShapeExtension)
++	    XtSetArg(args[0], XmNdragOverMode, XmDRAG_WINDOW);
++	  else
++	    XtSetArg(args[0], XmNdragOverMode, XmCURSOR);
++	  XtSetValues( (Widget)dc->drag.curDragOver, args, 1);
+ 	}
+-      else
+-	{
+-	  if (dc->drag.serverGrabbed)
+-	    {
+-	      XUngrabServer(XtDisplay(dc));
+-	      dc->drag.serverGrabbed = False;
+-	      if (xmDisplay -> display.displayHasShapeExtension) 
+-		XtSetArg(args[0], XmNdragOverMode, XmDRAG_WINDOW);
+-	      else
+-		XtSetArg(args[0], XmNdragOverMode, XmCURSOR);
+-	      XtSetValues( (Widget)dc->drag.curDragOver, args, 1);
+-	    }
+-	}
+     }
+ }
+ 
+@@ -1687,23 +1670,13 @@
+   /* Build a new one */
+   i = 0;
+   /*
+-   * If this is the first call, tracking mode will be querypending
+-   * and we have to come up in cursor mode.  Otherwise, we come up
+-   * in cursor for dynamic and pixmap for preregister.
++   * Always come up in window mode (or cursor if SHAPE is not available).
+    */
+-  if ((dc->drag.trackingMode == XmDRAG_TRACK_WM_QUERY_PENDING) ||
+-      (dc->drag.activeProtocolStyle == XmDRAG_DYNAMIC))
+-    {
+-      if (dpy -> display.displayHasShapeExtension) 
+-	XtSetArg(args[i], XmNdragOverMode, XmDRAG_WINDOW);
+-      else
+-	XtSetArg(args[i], XmNdragOverMode, XmCURSOR); 
+-      i++;
+-    }
++  if (dpy -> display.displayHasShapeExtension)
++    XtSetArg(args[i], XmNdragOverMode, XmDRAG_WINDOW);
+   else
+-    {
+-      XtSetArg(args[i], XmNdragOverMode, XmPIXMAP); i++;
+-    }
++    XtSetArg(args[i], XmNdragOverMode, XmCURSOR);
++  i++;
+   
+   XtSetArg(args[i], XmNhotX, dc->core.x); i++;
+   XtSetArg(args[i], XmNhotY, dc->core.y); i++;
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 99fa75185d19..2723ca4a7381 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=	6
+PORTREVISION=	7
 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_DragC.c b/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
new file mode 100644
index 000000000000..4a96f46a04f4
--- /dev/null
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
@@ -0,0 +1,76 @@
+--- lib/Xm/DragC.c.orig	2017-08-16 17:38:43.000000000 -0700
++++ lib/Xm/DragC.c	2023-12-04 15:58:26.431030000 -0800
+@@ -846,35 +846,18 @@
+   if (newStyle != oldStyle) 
+     {
+       /*
+-       * If we're not still waiting to hear from the window manager,
+-       * and we're not running dynamic, then we can grab.
++       * If we are in pixmap mode, release the grab.
+        */
+-      if ((dc->drag.trackingMode != XmDRAG_TRACK_WM_QUERY_PENDING) &&
+-	  (newStyle != XmDRAG_DYNAMIC) &&
+-	  (initiator != XmDRAG_DYNAMIC) &&
+-	  (initiator != XmDRAG_PREFER_DYNAMIC))
++      if (dc->drag.serverGrabbed)
+ 	{
+-	  if (!dc->drag.serverGrabbed)
+-	    {
+-	      XGrabServer(XtDisplay(dc));
+-	      dc->drag.serverGrabbed = True;
+-	      XtSetArg(args[0], XmNdragOverMode, XmPIXMAP);
+-	      XtSetValues( (Widget)dc->drag.curDragOver, args, 1);
+-	    }
++	  XUngrabServer(XtDisplay(dc));
++	  dc->drag.serverGrabbed = False;
++	  if (xmDisplay -> display.displayHasShapeExtension)
++	    XtSetArg(args[0], XmNdragOverMode, XmDRAG_WINDOW);
++	  else
++	    XtSetArg(args[0], XmNdragOverMode, XmCURSOR);
++	  XtSetValues( (Widget)dc->drag.curDragOver, args, 1);
+ 	}
+-      else
+-	{
+-	  if (dc->drag.serverGrabbed)
+-	    {
+-	      XUngrabServer(XtDisplay(dc));
+-	      dc->drag.serverGrabbed = False;
+-	      if (xmDisplay -> display.displayHasShapeExtension) 
+-		XtSetArg(args[0], XmNdragOverMode, XmDRAG_WINDOW);
+-	      else
+-		XtSetArg(args[0], XmNdragOverMode, XmCURSOR);
+-	      XtSetValues( (Widget)dc->drag.curDragOver, args, 1);
+-	    }
+-	}
+     }
+ }
+ 
+@@ -1687,23 +1670,13 @@
+   /* Build a new one */
+   i = 0;
+   /*
+-   * If this is the first call, tracking mode will be querypending
+-   * and we have to come up in cursor mode.  Otherwise, we come up
+-   * in cursor for dynamic and pixmap for preregister.
++   * Always come up in window mode (or cursor if SHAPE is not available).
+    */
+-  if ((dc->drag.trackingMode == XmDRAG_TRACK_WM_QUERY_PENDING) ||
+-      (dc->drag.activeProtocolStyle == XmDRAG_DYNAMIC))
+-    {
+-      if (dpy -> display.displayHasShapeExtension) 
+-	XtSetArg(args[i], XmNdragOverMode, XmDRAG_WINDOW);
+-      else
+-	XtSetArg(args[i], XmNdragOverMode, XmCURSOR); 
+-      i++;
+-    }
++  if (dpy -> display.displayHasShapeExtension)
++    XtSetArg(args[i], XmNdragOverMode, XmDRAG_WINDOW);
+   else
+-    {
+-      XtSetArg(args[i], XmNdragOverMode, XmPIXMAP); i++;
+-    }
++    XtSetArg(args[i], XmNdragOverMode, XmCURSOR);
++  i++;
+   
+   XtSetArg(args[i], XmNhotX, dc->core.x); i++;
+   XtSetArg(args[i], XmNhotY, dc->core.y); i++;