3 files changed, 46 insertions, 5 deletions
diff --git a/x11/openmotif/patches/patch-ag b/x11/openmotif/patches/patch-ag
index 0dbf64f6484..fc13d85d7de 100644
--- a/x11/openmotif/patches/patch-ag
+++ b/x11/openmotif/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2002/01/10 12:10:46 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2003/05/19 19:43:17 jschauma Exp $
 
---- config/cf/host.def.orig	Thu Jan 10 02:44:40 2002
-+++ config/cf/host.def
-@@ -1,17 +1,20 @@
+--- config/cf/host.def.orig	Mon May 19 14:04:32 2003
++++ config/cf/host.def	Mon May 19 14:06:39 2003
+@@ -1,17 +1,19 @@
  #ifdef BeforeVendorCF
  
 -#define TopLevelProject         Motif
@@ -15,7 +15,7 @@ $NetBSD: patch-ag,v 1.3 2002/01/10 12:10:46 jlam Exp $
 +#define X11ProjectRoot          $(X11BASE)
  #define VirtualBindingsPath     $(LIBDIR)/bindings
  #define ImportX11               YES
- #define USE_BYACC               YES
+-#define USE_BYACC               YES
  #define NoMessageCatalog        YES
  #define ForceNormalLib          YES
  #define HasVarDirectory         NO
diff --git a/x11/openmotif/patches/patch-au b/x11/openmotif/patches/patch-au
new file mode 100644
index 00000000000..3ac6d354d3b
--- /dev/null
+++ b/x11/openmotif/patches/patch-au
@@ -0,0 +1,25 @@
+$NetBSD: patch-au,v 1.1 2003/05/19 19:43:17 jschauma Exp $
+
+--- tools/wml/Uil.y.orig	Mon May 19 13:57:46 2003
++++ tools/wml/Uil.y	Mon May 19 13:58:48 2003
+@@ -396,6 +396,7 @@
+     | WIDE_CHARACTER		{ $$ = $1; $$.b_type = sym_k_wchar_string_value; }
+     | FONTSET			{ $$ = $1; $$.b_type = sym_k_fontset_value; }
+     | WIDGET			{ $$ = $1; $$.b_type = sym_k_widget_ref_value; }
++    ;
+ /* End for fixing CR 5888 */
+ 
+ string_table_type
+@@ -1058,10 +1059,11 @@
+  									sar_private_error( &$$ );
+  								  }
+  								}  
++	;
+   
+  non_export_value
+      : COLOR_TABLE LEFT_PAREN color_list RIGHT_PAREN		{ sar_make_color_table( &$$, &$3, &$1); }
+- 
++     ; 
+  /* END HaL fix CR 5427 */
+  
+ 
diff --git a/x11/openmotif/patches/patch-av b/x11/openmotif/patches/patch-av
new file mode 100644
index 00000000000..96afa00f5c4
--- /dev/null
+++ b/x11/openmotif/patches/patch-av
@@ -0,0 +1,16 @@
+$NetBSD: patch-av,v 1.1 2003/05/19 19:43:17 jschauma Exp $
+
+--- config/cf/linux.cf.orig	Mon May 19 14:30:58 2003
++++ config/cf/linux.cf	Mon May 19 14:30:22 2003
+@@ -1,6 +1,11 @@
+ XCOMM platform:  $TOG: linux.cf /main/36 1997/06/16 22:21:03 kaleb $
+ XCOMM platform:  $XFree86: xc/config/cf/linux.cf,v 3.57.2.19 1999/09/04 09:12:27 dawes Exp $
+ 
++#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(PREFIX)/lib -Wl,-rpath,$(X11PREFIX)/lib
++#ifndef ExtraLoadFlags
++#define ExtraLoadFlags          -Wl,-rpath,$(PREFIX)/lib -Wl,-rpath,$(X11PREFIX)/lib
++#endif
++
+ #ifndef LinuxElfDefault
+ #define LinuxElfDefault		YES
+ #endif