diff -ruNd x11/props/patches/patch-ab x11/props/patches/patch-ab
--- x11/props/patches/patch-ab	Mon Jan  5 01:31:25 1998
+++ x11/props/patches/patch-ab	Mon Apr 10 02:29:25 2000
@@ -1,5 +1,5 @@
---- l10n_read.c.orig	Sat Nov  8 01:21:25 1997
-+++ l10n_read.c	Sun Nov  9 01:44:10 1997
+--- l10n_read.c.orig	Sat Nov  8 04:21:25 1997
++++ l10n_read.c	Mon Apr 10 02:29:13 2000
 @@ -18,7 +18,7 @@
  #include	"l10n_props.h"
  
@@ -9,14 +9,37 @@
  
  #define	NAME_SEPARATOR		'='
  #define	FIELD_SEPARATOR		'|'
-@@ -72,8 +72,9 @@
+@@ -67,20 +67,27 @@
+ 	char			line[MAX_LINE_LENGTH+1];
+ #endif
+ 	int			rcode = -1;
+-
++	char			*tmpc;
+ 
  	/*  
  	 * Find path for localization configuration files under
  	 * $OPENWINHOME/share/locale/<locale>/props
 + 	 * $OPENWINHOME/lib/X11/locale/<locale>/props
  	 */
 -	sprintf(fullpath, "%s/share/locale/%s/props/%s",
+-		getenv("OPENWINHOME"), locale, file_name);
++	if ((tmpc = getenv("OPENWINHOME")) == NULL) tmpc = "/usr/X11R6";
 +	sprintf(fullpath, "%s/lib/X11/locale/%s/props/%s",
- 		getenv("OPENWINHOME"), locale, file_name);
++		tmpc, locale, file_name);
  
  	if ((config_file = fopen(fullpath, "r")) == NULL)
+ 	{
+-		perror(fullpath);
+-		goto ret;
+-	}
++		sprintf(fullpath, "%s/lib/X11/locale/C/props/%s",
++			tmpc, file_name);
++
++		if ((config_file = fopen(fullpath, "r")) == NULL)
++		{
++			perror(fullpath);
++			goto ret;
++	}	}
+ 
+ 	/* 
+ 	 * Parse configuration file. 
diff -ruNd x11/props/patches/patch-ac x11/props/patches/patch-ac
--- x11/props/patches/patch-ac	Mon Jan  5 01:31:26 1998
+++ x11/props/patches/patch-ac	Mon Apr 10 02:05:05 2000
@@ -1,11 +1,21 @@
---- props.c.orig	Sun Nov  9 01:18:50 1997
-+++ props.c	Sun Nov  9 01:24:50 1997
-@@ -816,7 +816,7 @@
-     else
+--- props.c.orig	Sun Nov  9 04:18:50 1997
++++ props.c	Mon Apr 10 02:04:02 2000
+@@ -811,14 +811,11 @@
+ 
+     if ((openwin_dir = (char *)getenv("OPENWINHOME")) == NULL)
      {
-         strcpy(localepath, openwin_dir);
+-	fprintf(stderr, LOCALIZE("%s: $OPENWINHOME has not been set\n"), argv[0]);
+-    }
+-    else
+-    {
+-        strcpy(localepath, openwin_dir);
 -        strcat(localepath, "/lib/locale/");
-+        strcat(localepath, "/lib/X11/locale/C/");
-         bindtextdomain("props", localepath);
+-        bindtextdomain("props", localepath);
++	openwin_dir = "/usr/X11R6";
      }
++    strcpy(localepath, openwin_dir);
++    strcat(localepath, "/lib/X11/locale/C/");
++    bindtextdomain("props", localepath);
  
+     frame = xv_create(NULL, FRAME_CMD,
+ 		      XV_VISUAL_CLASS, PseudoColor,