- Updated for current openmotif version

Changed files:
    openmotif-mwmrc.patch -> 1.2

diff --git a/openmotif-mwmrc.patch b/openmotif-mwmrc.patch
index 7db74538f8f067fbabd2bf64ba77306e3657dc52..9c9586658b6585f09c1089f6322778f1513b5a81 100644 (file)
--- a/openmotif-mwmrc.patch
+++ b/openmotif-mwmrc.patch
@@ -1,74 +1,79 @@
---- motif/clients/mwm/WmResParse.c~    Tue May  2 17:53:42 2000
-+++ motif/clients/mwm/WmResParse.c     Sat Jun 24 02:16:58 2000
-@@ -2395,7 +2395,5 @@
- #endif /* PANELIST */
- 
--#ifndef LIBDIR
--#define LIBDIR "/usr/lib/X11"
-+#define LIBDIR "/etc/X11/mwm"
--#endif
-     if (LANG != NULL)
-     {
---- motif/doc/man/man1/mwm.1~  Fri Apr 28 17:05:27 2000
-+++ motif/doc/man/man1/mwm.1   Sat Jun 24 02:19:14 2000
-@@ -1347,9 +1347,9 @@
+--- openmotif-2.2.3/doc/man/man1/mwm.1.orig    2002-01-05 16:21:11.000000000 +0100
++++ openmotif-2.2.3/doc/man/man1/mwm.1 2004-04-27 14:28:56.321713456 +0200
+@@ -678,8 +678,8 @@
+ \fB$HOME\fP/\fBconfigFile\fP\&. If the \fIconfigFile\fP pathname does not begin with "~/" or "/", \fBmwm\fP considers it to be relative to the current working directory\&. If
+ the \fIconfigFile\fP resource is not specified
+ or if that file does not exist, \fBmwm\fP uses several default
+-paths to find a configuration file\&. The order of the search is shown below: \fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP\(dg
+-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are
++paths to find a configuration file\&. The order of the search is shown below: \fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP\(dg
++\fB/etc/X11/mwm/system\&.mwmrc\fP\(dg Paths marked with \&'\(dg\&' are
+ implementation dependent\&.
+ .IP "\fIdeiconifyKeyFocus\fP\ (class\  \fIDeiconifyKeyFocus\fP)" 10
+ This resource applies only when the keyboard input focus policy is explicit\&.
+@@ -1344,9 +1344,9 @@
  function\&.
  .SS "Files"
  .PP
--\fB/usr/lib/X11/$LANG/system\&.mwmrc\fP
+-\fB/usr/X11R6/lib/X11/$LANG/system\&.mwmrc\fP
 +\fB/etc/X11/mwm/$LANG/system\&.mwmrc\fP
  .PP
--\fB/usr/lib/X11/system\&.mwmrc\fP
+-\fB/usr/X11R6/lib/X11/system\&.mwmrc\fP
 +\fB/etc/X11/mwm/system\&.mwmrc\fP
  .PP
- \fB/usr/lib/X11/app-defaults/Mwm\fP
+ \fB/usr/X11R6/lib/X11/app-defaults/Mwm\fP
  .PP
---- motif/doc/man/man4/mwmrc.4~        Fri Apr 28 17:05:28 2000
-+++ motif/doc/man/man4/mwmrc.4 Sat Jun 24 02:20:32 2000
-@@ -75,8 +75,8 @@
+--- openmotif-2.2.3/doc/man/man4/mwmrc.4.orig  2002-01-05 16:21:12.000000000 +0100
++++ openmotif-2.2.3/doc/man/man4/mwmrc.4       2004-04-27 14:27:22.349999328 +0200
+@@ -72,8 +72,8 @@
  .nf
  \f(CW$HOME/$LANG/\&.mwmrc
  $HOME/\&.mwmrc
--/usr/lib/X11/$LANG/system\&.mwmrc
--/usr/lib/X11/system\&.mwmrc\fR
+-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc
+-/usr/X11R6/lib/X11/system\&.mwmrc\fR
 +/etc/X11/mwm/$LANG/system\&.mwmrc
 +/etc/X11/mwm/system\&.mwmrc\fR
  .fi
  .PP
  .PP
-@@ -625,8 +625,8 @@
+@@ -84,7 +84,7 @@
+ be specified from the command line:
+ .PP
+ .nf
+-\f(CW/usr/X11R6/bin/X11/mwm -xrm "mwm*configFile: mymwmrc"\fR
++\f(CW/usr/X11R6/bin/mwm -xrm "mwm*configFile: mymwmrc"\fR
+ .fi
  .PP
+ .SS "Resource Types"
+@@ -626,8 +626,8 @@
+ .nf
  \fB$HOME/$LANG/\&.mwmrc
  $HOME/\&.mwmrc
--/usr/lib/X11/$LANG/system\&.mwmrc
--/usr/lib/X11/system\&.mwmrc
+-/usr/X11R6/lib/X11/$LANG/system\&.mwmrc
+-/usr/X11R6/lib/X11/system\&.mwmrc\fP
 +/etc/X11/mwm/$LANG/system\&.mwmrc
-+/wtc/X11/mwm/system\&.mwmrc
- $HOME/\&.mwm/errorlog\fP
++/etc/X11/mwm/system\&.mwmrc\fP
+ .fi
  .SH "RELATED INFORMATION"
  .PP
---- motif/clients/mwm/system.mwmrc~    Wed May  3 11:12:34 2000
-+++ motif/clients/mwm/system.mwmrc     Sat Jun 24 03:32:44 2000
-@@ -60,10 +60,10 @@
-       "Shuffle Down"          f.circle_down
-       "Refresh"               f.refresh
-       "Pack Icons"            f.pack_icons
--!     "Toggle Behavior..."    f.set_behavior
-+      "Toggle Behavior..."    f.set_behavior
-        no-label               f.separator
-       "Restart..."            f.restart
--!     "Quit..."               f.quit_mwm
-+      "Quit..."               f.quit_mwm
- 
- }
+--- openmotif-2.2.3/clients/mwm/WmResParse.c.orig      2002-05-17 17:21:53.000000000 +0200
++++ openmotif-2.2.3/clients/mwm/WmResParse.c   2004-04-27 14:17:31.153874800 +0200
+@@ -2403,7 +2403,7 @@
+ #endif /* PANELIST */
  
---- motif/clients/mwm/WmResource.c~    Tue May  2 17:53:42 2000
-+++ motif/clients/mwm/WmResource.c     Sat Jun 24 03:35:48 2000
-@@ -508,6 +508,7 @@
+ #ifndef LIBDIR
+-#define LIBDIR "/usr/lib/X11"
++#define LIBDIR "/etc/X11/mwm"
+ #endif
+     if (LANG != NULL)
+     {
+--- openmotif-2.2.3/clients/mwm/WmResource.c.orig      2002-01-10 21:55:37.000000000 +0100
++++ openmotif-2.2.3/clients/mwm/WmResource.c   2004-04-27 14:19:08.000151928 +0200
+@@ -513,6 +513,7 @@
        \"Pack Icons\"          f.pack_icons\n\
         no-label               f.separator\n\
        \"Restart...\"          f.restart\n\
-+      \"Quit...\"             f.quit_mwm\n\
++      \"Quit...\"             f.quit_mwm\n\
  }";
  char builtinRootMenu[] = BUILTINROOTMENU
  #else /* MCCABE */