diff -ruNd x11-toolkits/xview-clients/patches/patch-aa x11-toolkits/xview-clients/patches/patch-aa
--- x11-toolkits/xview-clients/patches/patch-aa	Wed May  5 03:22:16 1999
+++ x11-toolkits/xview-clients/patches/patch-aa	Wed Oct 27 04:27:15 1999
@@ -58,29 +58,6 @@
   
   /* ----------------------------------------------------------------------
    *      SetCmdStream
-*** clients/olwm/gettext.h.orig	Tue Jun 29 00:11:46 1993
---- clients/olwm/gettext.h	Mon Jan 25 19:35:08 1999
-***************
-*** 27,33 ****
-  #include <stdio.h>
-  #include <sys/types.h>
-  #include <sys/param.h>
-!  
-  struct domain_binding {
-      char    *domain_name;
-      char    *binding;
---- 27,37 ----
-  #include <stdio.h>
-  #include <sys/types.h>
-  #include <sys/param.h>
-! 
-! #if !defined(LC_MESSAGES) && defined(LC_RESPONSE)
-! #define LC_MESSAGES LC_RESPONSE
-! #endif
-! 
-  struct domain_binding {
-      char    *domain_name;
-      char    *binding;
 diff -rc ../old/xview3.2p1-X11R6/clients/olwm/i18n.h olwm/i18n.h
 *** ../old/xview3.2p1-X11R6/clients/olwm/i18n.h	Tue Jun 29 01:11:48 1993
 --- clients/olwm/i18n.h	Sun Nov 20 13:38:57 1994
@@ -346,40 +323,3 @@
   #include <memory.h>
   #include <stdio.h>
   #include <sys/types.h>
-*** clients/olwm/defaults.c.orig	Tue Jun 29 07:11:43 1993
---- clients/olwm/defaults.c	Mon Feb 27 00:59:03 1995
-***************
-*** 25,33 ****
-  #include <X11/Xutil.h>
-  #include <X11/Xatom.h>
-  #include <X11/Xresource.h>
-! #ifdef OW_I18N_L4
-  #include <sys/param.h>
-! #endif
-  
-  #include "i18n.h"
-  #include "ollocale.h"
---- 25,33 ----
-  #include <X11/Xutil.h>
-  #include <X11/Xatom.h>
-  #include <X11/Xresource.h>
-! /* #ifdef OW_I18N_L4 */
-  #include <sys/param.h>
-! /* #endif */
-  
-  #include "i18n.h"
-  #include "ollocale.h"
-***************
-*** 80,86 ****
---- 80,90 ----
-  	if (homedir != NULL) {
-  	    (void) strcpy(filename, homedir);
-  	    (void) strcat(filename, "/.Xdefaults-");
-+ #if (defined(BSD) && (BSD >= 199103))
-+ 	    if (0 == gethostname(hostname, sizeof(hostname))) {
-+ #else
-  	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
-+ #endif
-  		(void) strcat(filename, hostname);
-  		fileDB = XrmGetFileDatabase(filename);
-  	    }
diff -ruNd x11-toolkits/xview-clients/patches/patch-bb x11-toolkits/xview-clients/patches/patch-bb
--- x11-toolkits/xview-clients/patches/patch-bb	Thu Jan  1 03:00:00 1970
+++ x11-toolkits/xview-clients/patches/patch-bb	Wed Oct 27 03:48:14 1999
@@ -0,0 +1,44 @@
+--- clients/olwm/defaults.c.orig	Tue Jun 29 09:11:43 1993
++++ clients/olwm/defaults.c	Wed Oct 27 03:43:12 1999
+@@ -25,9 +25,9 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <X11/Xresource.h>
+-#ifdef OW_I18N_L4
++/* #ifdef OW_I18N_L4 */
+ #include <sys/param.h>
+-#endif
++/* #endif */
+ 
+ #include "i18n.h"
+ #include "ollocale.h"
+@@ -80,7 +80,11 @@
+ 	if (homedir != NULL) {
+ 	    (void) strcpy(filename, homedir);
+ 	    (void) strcat(filename, "/.Xdefaults-");
++#if (defined(BSD) && (BSD >= 199103))
++	    if (0 == gethostname(hostname, sizeof(hostname))) {
++#else
+ 	    if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
++#endif
+ 		(void) strcat(filename, hostname);
+ 		fileDB = XrmGetFileDatabase(filename);
+ 	    }
+@@ -133,7 +137,7 @@
+ 		return appDB;
+ 	}
+ 
+-	(void) sprintf(filename, "/usr/lib/X11/app-defaults/%s/Olwm", locale);
++	(void) sprintf(filename, "/usr/X11R6/lib/X11/app-defaults/%s/Olwm", locale);
+ 	appDB = XrmGetFileDatabase(filename);
+ 	if (appDB != NULL)
+ 	    return appDB;
+@@ -148,7 +152,7 @@
+ 	    return appDB;
+     }
+ 
+-    appDB = XrmGetFileDatabase("/usr/lib/X11/app-defaults/Olwm");
++    appDB = XrmGetFileDatabase("/usr/X11R6/lib/X11/app-defaults/Olwm");
+     return appDB;
+ }
+ 
diff -ruNd x11-toolkits/xview-clients/patches/patch-bc x11-toolkits/xview-clients/patches/patch-bc
--- x11-toolkits/xview-clients/patches/patch-bc	Thu Jan  1 03:00:00 1970
+++ x11-toolkits/xview-clients/patches/patch-bc	Wed Oct 27 03:51:05 1999
@@ -0,0 +1,11 @@
+--- clients/olwm/fontset.c.orig	Tue Jun 29 09:11:46 1993
++++ clients/olwm/fontset.c	Wed Oct 27 03:50:49 1999
+@@ -208,7 +208,7 @@
+ 
+ 	if (notFound)
+ 	{
+-        	(void) sprintf(filename, "/usr/lib/X11/app-defaults/%s/%s",
++        	(void) sprintf(filename, "/usr/X11R6/lib/X11/app-defaults/%s/%s",
+ 			locale, FONT_SETS);
+ 	}
+ 
diff -ruNd x11-toolkits/xview-clients/patches/patch-bd x11-toolkits/xview-clients/patches/patch-bd
--- x11-toolkits/xview-clients/patches/patch-bd	Thu Jan  1 03:00:00 1970
+++ x11-toolkits/xview-clients/patches/patch-bd	Wed Oct 27 04:08:17 1999
@@ -0,0 +1,24 @@
+--- clients/olwm/gettext.h.orig	Tue Jun 29 09:11:46 1993
++++ clients/olwm/gettext.h	Wed Oct 27 04:06:34 1999
+@@ -13,7 +13,7 @@
+ #define _OLWM_GETTEXT_H
+ 
+ #define DEFAULT_DOMAIN	"default"
+-#define DEFAULT_BINDING "/usr/lib/locale\n"
++#define DEFAULT_BINDING "/usr/X11R6/share/locale\n"
+ #define COOKIE 0xFF
+ #define BINDINGLISTDELIM '\n'
+ 
+@@ -27,7 +27,11 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+- 
++
++#if !defined(LC_MESSAGES) && defined(LC_RESPONSE)
++#define LC_MESSAGES LC_RESPONSE
++#endif
++
+ struct domain_binding {
+     char    *domain_name;
+     char    *binding;