diff --git a/x11-toolkits/open-motif-devel/files/patch-acinclude.m4 b/x11-toolkits/open-motif-devel/files/patch-acinclude.m4
index 10b61badcffc..2d2b8243f5d3 100644
--- a/x11-toolkits/open-motif-devel/files/patch-acinclude.m4
+++ b/x11-toolkits/open-motif-devel/files/patch-acinclude.m4
@@ -1,16 +1,16 @@
---- acinclude.m4.orig	2023-02-15 16:42:34.000000000 -0800
-+++ acinclude.m4	2023-12-04 15:48:14.815249000 -0800
-@@ -50,7 +50,12 @@
+--- acinclude.m4.orig	2023-02-16 00:42:34 UTC
++++ acinclude.m4
+@@ -50,7 +50,12 @@ AC_DEFUN([AM_FUNC_VOID_SPRINTF],
  AC_DEFUN([AM_FUNC_VOID_SPRINTF],
  [AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf,
  [AC_TRY_RUN([#include <stdio.h>
 -int sprintf(); main() { exit(sprintf(".")); }],
 +int main() {
 +  char buf[1];
 +  int i = sprintf(buf, "");
 +  return 0;
 +}
 +],
    ac_cv_func_void_sprintf=no, ac_cv_func_void_sprintf=yes, ac_cv_func_void_sprintf=yes)])
  if test $ac_cv_func_void_sprintf = no; then
    AC_DEFINE(VOID_SPRINTF,1,
diff --git a/x11-toolkits/open-motif-devel/files/patch-clients__uil__UilDefI.h b/x11-toolkits/open-motif-devel/files/patch-clients__uil__UilDefI.h
index 372e8d628a37..02fd1e17f139 100644
--- a/x11-toolkits/open-motif-devel/files/patch-clients__uil__UilDefI.h
+++ b/x11-toolkits/open-motif-devel/files/patch-clients__uil__UilDefI.h
@@ -1,11 +1,11 @@
---- clients/uil/UilDefI.h.orig	2012-10-22 07:50:39.000000000 -0700
-+++ clients/uil/UilDefI.h	2012-10-26 15:18:31.064731493 -0700
-@@ -270,7 +270,7 @@
+--- clients/uil/UilDefI.h.orig	2023-02-16 00:42:34 UTC
++++ clients/uil/UilDefI.h
+@@ -263,7 +263,7 @@ extern char* uil_mmove(char*, char*, int);
  #include "UilIODef.h"
  #include "UilDiagDef.h"
  #include "UilSarDef.h"
 -#if defined(linux) || defined(__APPLE__)
 +#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__)
  #define YYSTYPE yystype
  #endif
  #include "UilLexPars.h"
diff --git a/x11-toolkits/open-motif-devel/files/patch-configure.ac b/x11-toolkits/open-motif-devel/files/patch-configure.ac
index b2a72792d9a8..91389b290e87 100644
--- a/x11-toolkits/open-motif-devel/files/patch-configure.ac
+++ b/x11-toolkits/open-motif-devel/files/patch-configure.ac
@@ -1,11 +1,11 @@
---- configure.ac.orig	2012-10-22 16:50:39.000000000 +0200
-+++ configure.ac	2014-01-27 22:38:58.000000000 +0100
-@@ -164,7 +164,7 @@
+--- configure.ac.orig	2023-02-16 00:42:34 UTC
++++ configure.ac
+@@ -164,7 +164,7 @@ then
  if test x$GCC = xyes
  then
      CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
 -    if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
 +    if ! $CC -v 2>&1 | grep clang > /dev/null && test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
          CFLAGS="$CFLAGS -fno-tree-ter"
      fi
  fi
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
index 8001ce0251a6..48173871ea3e 100644
--- a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_DragC.c
+++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_DragC.c
@@ -1,76 +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 @@
+--- lib/Xm/DragC.c.orig	2023-02-16 00:42:34 UTC
++++ lib/Xm/DragC.c
+@@ -846,35 +846,18 @@ ValidateDragOver(
    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 @@
+@@ -1687,23 +1670,13 @@ NewScreen(
    /* 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-devel/files/patch-lib_Xm_MenuShell.c b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_MenuShell.c
index af501e746451..4408c28c37bd 100644
--- a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_MenuShell.c
+++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_MenuShell.c
@@ -1,10 +1,10 @@
---- lib/Xm/MenuShell.c.orig	2023-02-15 16:42:34.000000000 -0800
-+++ lib/Xm/MenuShell.c	2023-12-04 15:33:32.718284000 -0800
-@@ -988,6 +988,7 @@
+--- lib/Xm/MenuShell.c.orig	2023-02-16 00:42:34 UTC
++++ lib/Xm/MenuShell.c
+@@ -988,6 +988,7 @@ ForceMenuPaneOnScreen(
     if (bottomEdgeOfMenu >= (Position)dispHeight)
     {
        if (pulldown_button && XtParent(pulldown_button) &&
 +		XmIsRowColumn(XtParent(pulldown_button)) &&
  	  (RC_Type(XtParent(pulldown_button)) == XmMENU_BAR))
        {
  	 Position y_temp = *y;
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
index 45fe127e420c..a9f275edd41a 100644
--- a/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c
+++ b/x11-toolkits/open-motif-devel/files/patch-lib_Xm_XmRenderT.c
@@ -1,15 +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 @@
+--- lib/Xm/XmRenderT.c.orig	2023-02-16 00:42:34 UTC
++++ lib/Xm/XmRenderT.c
+@@ -2091,10 +2091,9 @@ ValidateAndLoadFont(XmRendition rend, Display *display
  						  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-devel/files/patch-lib__Xm__ColorS.c b/x11-toolkits/open-motif-devel/files/patch-lib__Xm__ColorS.c
index 2e70cc3035fb..749f29e79dd7 100644
--- a/x11-toolkits/open-motif-devel/files/patch-lib__Xm__ColorS.c
+++ b/x11-toolkits/open-motif-devel/files/patch-lib__Xm__ColorS.c
@@ -1,22 +1,22 @@
---- lib/Xm/ColorS.c.orig	2005-12-17 16:54:03.000000000 +0300
-+++ lib/Xm/ColorS.c	2011-01-16 00:48:05.000000000 +0300
-@@ -41,6 +41,10 @@
+--- lib/Xm/ColorS.c.orig	2023-02-16 00:42:34 UTC
++++ lib/Xm/ColorS.c
+@@ -56,6 +56,10 @@
  
  #define SUPERCLASS ((WidgetClass) &xmManagerClassRec)
  
 +#ifndef LIBDIR
 +#define LIBDIR "/usr/local/lib/X11"
 +#endif
 +
  /************************************************************
   *       MACROS
   ************************************************************/
-@@ -131,7 +135,7 @@
+@@ -146,7 +150,7 @@ static XtResource resources[] =
    {
      XmNrgbFile, XmCString, XmRString,
      sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file),
 -    XmRString, (XtPointer) "/usr/lib/X11/rgb.txt"
 +    XmRString, (XtPointer) LIBDIR"/rgb.txt"
    },
  #endif
    {
diff --git a/x11-toolkits/open-motif/files/patch-acinclude.m4 b/x11-toolkits/open-motif/files/patch-acinclude.m4
index 0b2e3c8d1a8f..5fc543393e1b 100644
--- a/x11-toolkits/open-motif/files/patch-acinclude.m4
+++ b/x11-toolkits/open-motif/files/patch-acinclude.m4
@@ -1,16 +1,16 @@
---- acinclude.m4.orig	2017-08-27 19:29:50.000000000 -0700
-+++ acinclude.m4	2023-12-04 15:48:12.951361000 -0800
-@@ -50,7 +50,12 @@
+--- acinclude.m4.orig	2017-12-05 12:46:16 UTC
++++ acinclude.m4
+@@ -50,7 +50,12 @@ AC_DEFUN([AM_FUNC_VOID_SPRINTF],
  AC_DEFUN([AM_FUNC_VOID_SPRINTF],
  [AC_CACHE_CHECK(whether sprintf returns void, ac_cv_func_void_sprintf,
  [AC_TRY_RUN([#include <stdio.h>
 -int sprintf(); main() { exit(sprintf(".")); }],
 +int main() {
 +  char buf[1];
 +  int i = sprintf(buf, "");
 +  return 0;
 +}
 +],
    ac_cv_func_void_sprintf=no, ac_cv_func_void_sprintf=yes, ac_cv_func_void_sprintf=yes)])
  if test $ac_cv_func_void_sprintf = no; then
    AC_DEFINE(VOID_SPRINTF,1,
diff --git a/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h b/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
index 372e8d628a37..1b462b9d19a4 100644
--- a/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
+++ b/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
@@ -1,11 +1,11 @@
---- clients/uil/UilDefI.h.orig	2012-10-22 07:50:39.000000000 -0700
-+++ clients/uil/UilDefI.h	2012-10-26 15:18:31.064731493 -0700
-@@ -270,7 +270,7 @@
+--- clients/uil/UilDefI.h.orig	2017-12-05 12:46:16 UTC
++++ clients/uil/UilDefI.h
+@@ -263,7 +263,7 @@ extern char* uil_mmove(char*, char*, int);
  #include "UilIODef.h"
  #include "UilDiagDef.h"
  #include "UilSarDef.h"
 -#if defined(linux) || defined(__APPLE__)
 +#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__)
  #define YYSTYPE yystype
  #endif
  #include "UilLexPars.h"
diff --git a/x11-toolkits/open-motif/files/patch-configure.ac b/x11-toolkits/open-motif/files/patch-configure.ac
index b2a72792d9a8..2da49dd1e518 100644
--- a/x11-toolkits/open-motif/files/patch-configure.ac
+++ b/x11-toolkits/open-motif/files/patch-configure.ac
@@ -1,11 +1,11 @@
---- configure.ac.orig	2012-10-22 16:50:39.000000000 +0200
-+++ configure.ac	2014-01-27 22:38:58.000000000 +0100
-@@ -164,7 +164,7 @@
+--- configure.ac.orig	2017-12-05 12:46:16 UTC
++++ configure.ac
+@@ -160,7 +160,7 @@ then
  if test x$GCC = xyes
  then
      CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
 -    if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
 +    if ! $CC -v 2>&1 | grep clang > /dev/null && test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
          CFLAGS="$CFLAGS -fno-tree-ter"
      fi
  fi
diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c b/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
index 4a96f46a04f4..ef6a2ade197a 100644
--- a/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_DragC.c
@@ -1,76 +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 @@
+--- lib/Xm/DragC.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/DragC.c
+@@ -846,35 +846,18 @@ ValidateDragOver(
    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 @@
+@@ -1687,23 +1670,13 @@ NewScreen(
    /* 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/files/patch-lib_Xm_MenuShell.c b/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c
index af94efe107ae..793f27cee134 100644
--- a/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_MenuShell.c
@@ -1,10 +1,10 @@
---- lib/Xm/MenuShell.c.orig	2017-08-16 17:38:43.000000000 -0700
-+++ lib/Xm/MenuShell.c	2023-12-04 15:33:35.350531000 -0800
-@@ -988,6 +988,7 @@
+--- lib/Xm/MenuShell.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/MenuShell.c
+@@ -988,6 +988,7 @@ ForceMenuPaneOnScreen(
     if (bottomEdgeOfMenu >= (Position)dispHeight)
     {
        if (pulldown_button && XtParent(pulldown_button) &&
 +		XmIsRowColumn(XtParent(pulldown_button)) &&
  	  (RC_Type(XtParent(pulldown_button)) == XmMENU_BAR))
        {
  	 Position y_temp = *y;
diff --git a/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
index 84b92bd900b7..5c0291dbe59d 100644
--- a/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
+++ b/x11-toolkits/open-motif/files/patch-lib_Xm_XmRenderT.c
@@ -1,15 +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 @@
+--- lib/Xm/XmRenderT.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/XmRenderT.c
+@@ -2091,10 +2091,9 @@ ValidateAndLoadFont(XmRendition rend, Display *display
  						  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/files/patch-lib__Xm__ColorS.c b/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
index 2e70cc3035fb..1fe1879c0b7e 100644
--- a/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
+++ b/x11-toolkits/open-motif/files/patch-lib__Xm__ColorS.c
@@ -1,22 +1,22 @@
---- lib/Xm/ColorS.c.orig	2005-12-17 16:54:03.000000000 +0300
-+++ lib/Xm/ColorS.c	2011-01-16 00:48:05.000000000 +0300
-@@ -41,6 +41,10 @@
+--- lib/Xm/ColorS.c.orig	2017-12-05 12:46:16 UTC
++++ lib/Xm/ColorS.c
+@@ -56,6 +56,10 @@
  
  #define SUPERCLASS ((WidgetClass) &xmManagerClassRec)
  
 +#ifndef LIBDIR
 +#define LIBDIR "/usr/local/lib/X11"
 +#endif
 +
  /************************************************************
   *       MACROS
   ************************************************************/
-@@ -131,7 +135,7 @@
+@@ -146,7 +150,7 @@ static XtResource resources[] =
    {
      XmNrgbFile, XmCString, XmRString,
      sizeof(String), XtOffsetOf(XmColorSelectorRec, cs.rgb_file),
 -    XmRString, (XtPointer) "/usr/lib/X11/rgb.txt"
 +    XmRString, (XtPointer) LIBDIR"/rgb.txt"
    },
  #endif
    {