remove i386Architecture from site.def; add uil-bad-grammar-fix

3 files changed, 113 insertions, 0 deletions

diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5
new file mode 100644
index 000000000000..ead704e865e9
--- /dev/null
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r5
@@ -0,0 +1 @@
+MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
diff --git a/x11-libs/openmotif/files/openmotif-2.1.30-uil-bad_grammar_fix.diff b/x11-libs/openmotif/files/openmotif-2.1.30-uil-bad_grammar_fix.diff
new file mode 100644
index 000000000000..19568a8c9cc0
--- /dev/null
+++ b/x11-libs/openmotif/files/openmotif-2.1.30-uil-bad_grammar_fix.diff
@@ -0,0 +1,35 @@
+--- motif/tools/wml/Uil.y.orig	Wed May 10 16:02:41 2000
++++ motif/tools/wml/Uil.y	Fri Feb  6 14:45:08 2004
+@@ -397,7 +397,7 @@
+     | 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
+     : STRING_TABLE
+     | COMPOUND_STRING_TABLE
+@@ -1049,7 +1049,7 @@
+  									sar_private_error( &$$ );
+  								  }
+ 							}
+-    ;
++
+      | value							{ $$ = $1; 
+  								  if ($$.b_type != sym_k_error_value)
+  								  {
+@@ -1058,12 +1058,12 @@
+  									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 */
+- 
++    ; 
+ 
+ value
+     : value_1
diff --git a/x11-libs/openmotif/files/site.def.1 b/x11-libs/openmotif/files/site.def.1
new file mode 100644
index 000000000000..ee7667250687
--- /dev/null
+++ b/x11-libs/openmotif/files/site.def.1
@@ -0,0 +1,77 @@
+XCOMM site:  $TOG: site.def /main/12 1997/07/02 17:52:18 samborn $
+
+/***************************************************************************
+ *                                                                         *
+ *		  X Consortium In-House Build Parameters                   *
+ *			Use at Your Own Risk				   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef SiteIConfigFiles
+# define SiteIConfigFiles $(IRULESRC)/host.def
+# define LocalConfigFiles host.def
+#endif
+
+#ifdef BeforeVendorCF
+
+# include <host.def>
+
+/* We will import x11. */
+# define ImportX11		YES
+
+# ifndef TopLevelProject
+#  define TopLevelProject	Motif
+# endif
+
+/* On systems where cpp doesn't expand correctly macros in include directives
+ * the two following macros need to be defined directly (accordingly to the
+ * TopLevelProject macro defined above).
+ */
+# if defined(SunArchitecture) || defined(AIXArchitecture) \
+     || defined(USLArchitecture) || defined(UXPArchitecture)
+#  ifndef ProjectRulesFile
+#   define ProjectRulesFile	<Motif.rules>
+#  endif
+#  ifndef ProjectTmplFile
+#   define ProjectTmplFile	<Motif.tmpl>
+#  endif
+# endif
+
+# ifdef AlphaArchitecture
+#  define HasDECCplusplus	YES
+# endif
+
+# ifdef HPArchitecture
+#  define HasHPCplusplus	YES
+# endif
+
+# if defined(SGIArchitecture)
+#  define MipsN32Architecture	YES
+# endif
+
+# ifdef SunArchitecture
+#  define HasSunCplusplus	YES
+# endif
+
+# if defined(UXPArchitecture) || defined(USLArchitecture) \
+     || defined(AIXArchitecture)
+#  define HasCplusplus		YES
+# endif
+
+#define LinuxDistribution LinuxUnknown
+#define i386Architecture	YES
+#endif /* BeforeVendorCF */
+
+#ifdef AfterVendorCF
+
+# define X11ProjectRoot	/usr/X11R6
+# define ProjectRoot	/usr/X11R6
+# define VirtualBindingsPath /usr/X11R6/lib/bindings
+
+# undef DefaultUserPath
+# define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin:/usr/local/bin/mh:/site/local/scripts
+
+#endif /* AfterVendorCF */
+#define YaccCmd bison --yacc
+
+