Add a couple of new fixes and use the unified xview port.

PR:		9700
Submitted by:	Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>

1 files changed, 52 insertions, 5 deletions

diff --git a/x11-toolkits/xview-clients/files/patch-ab b/x11-toolkits/xview-clients/files/patch-ab
index 4378cb66ce2a..4879eb3a153b 100644
--- a/x11-toolkits/xview-clients/files/patch-ab
+++ b/x11-toolkits/xview-clients/files/patch-ab
@@ -1,8 +1,22 @@
-diff -c /usr/ports/x11/xview-config/work/xview3.2p1-X11R6/clients/olwm/screen.c screen.c
-*** /usr/ports/x11/xview-config/work/xview3.2p1-X11R6/clients/olwm/screen.c	Tue Oct  8 23:31:04 1996
---- olwm/screen.c	Mon Jan  1 23:54:12 1996
+*** clients/olwm/screen.c.orig	Tue Jun 29 00:11:56 1993
+--- clients/olwm/screen.c	Mon Jan 25 22:33:08 1999
 ***************
-*** 220,225 ****
+*** 111,116 ****
+--- 111,122 ----
+  static XrmQuark stippledRubberBandsCQ;
+  static XrmQuark stippledRubberBandsIQ;
+  
++ static updateScreenWorkspaceColor();
++ static updateScreenWindowColor();
++ static updateScreenForegroundColor();
++ static updateScreenBackgroundColor();
++ static updateScreenBorderColor();
++ static updateScreenGlyphFont();
+  
+  /*-------------------------------------------------------------------------
+   *	Local Functions
+***************
+*** 214,219 ****
 --- 220,226 ----
   		     	case PseudoColor:
   			case GrayScale:
@@ -11,4 +25,37 @@ diff -c /usr/ports/x11/xview-config/work/xview3.2p1-X11R6/clients/olwm/screen.c
   		    		return True;
   				/*NOTREACHED*/
   		    		break;
-
+***************
+*** 460,466 ****
+   * 	Construct bitmap search path as follows:
+   *		$OPENWINHOME/etc/workspace/patterns
+   *		$OPENWINHOME/include/X11/include/bitmaps
+!  *		/usr/X11/include/X11/include/bitmaps
+   *
+   * REMIND: this should be cleaned up so that it doesn't use a fixed-size 
+   * array.
+--- 467,473 ----
+   * 	Construct bitmap search path as follows:
+   *		$OPENWINHOME/etc/workspace/patterns
+   *		$OPENWINHOME/include/X11/include/bitmaps
+!  *		/usr/X11R6/include/X11/include/bitmaps
+   *
+   * REMIND: this should be cleaned up so that it doesn't use a fixed-size 
+   * array.
+***************
+*** 483,489 ****
+  	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
+  	bitmapSearchPath[i++] = MemNewString(bmPath);
+  
+! 	bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
+  
+  	bitmapSearchPath[i] = (char *)NULL;
+  }
+--- 490,496 ----
+  	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
+  	bitmapSearchPath[i++] = MemNewString(bmPath);
+  
+! 	bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps");
+  
+  	bitmapSearchPath[i] = (char *)NULL;
+  }