summaryrefslogtreecommitdiff
path: root/x11/openmotif
diff options
context:
space:
mode:
authorjschauma <jschauma>2003-06-12 13:39:58 +0000
committerjschauma <jschauma>2003-06-12 13:39:58 +0000
commit0f7853e3c1db28d553f0c701a569a2437cd31b5b (patch)
treecbbb28ca13659bb22b66f6b4d96e4cca564297b7 /x11/openmotif
parent71afc05b85d4d2e6e357fa00dfc22e286ae788e6 (diff)
downloadpkgsrc-0f7853e3c1db28d553f0c701a569a2437cd31b5b.tar.gz
Apply one more patch to satisfy some GNU bison versions on Linux.
This closes PR pkg/19860.
Diffstat (limited to 'x11/openmotif')
-rw-r--r--x11/openmotif/distinfo4
-rw-r--r--x11/openmotif/patches/patch-au16
2 files changed, 13 insertions, 7 deletions
diff --git a/x11/openmotif/distinfo b/x11/openmotif/distinfo
index 0929571af98..c4916a7b6af 100644
--- a/x11/openmotif/distinfo
+++ b/x11/openmotif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/05/19 19:43:17 jschauma Exp $
+$NetBSD: distinfo,v 1.11 2003/06/12 13:39:58 jschauma Exp $
SHA1 (openmotif/openmotif2.1.30.tar.gz) = 34fc82fdf0e200525864665e179246ef64082dcc
Size (openmotif/openmotif2.1.30.tar.gz) = 17711487 bytes
@@ -32,5 +32,5 @@ SHA1 (patch-aq) = f06bde8d2151c3b60fce74e663b7eead965758a8
SHA1 (patch-ar) = 496fc6e3ba956f9103fbee6be221af44a26e2afd
SHA1 (patch-as) = f59bb1583bb3445e2420b667f6fb30595bca7ce6
SHA1 (patch-at) = d75e7b060797997f47f0da3099e53d5d8e5c6c68
-SHA1 (patch-au) = 12691e159a788b4dca191f747eaacc18710d2696
+SHA1 (patch-au) = 3559258736a8534b930750294bc0865a17a51e7e
SHA1 (patch-av) = 2729c9edbcbbb62016305a1f0293684b805ce50d
diff --git a/x11/openmotif/patches/patch-au b/x11/openmotif/patches/patch-au
index 3ac6d354d3b..f7bf03e124d 100644
--- a/x11/openmotif/patches/patch-au
+++ b/x11/openmotif/patches/patch-au
@@ -1,7 +1,5 @@
-$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
+--- tools/wml/Uil.y.orig Wed May 3 05:13:06 2000
++++ tools/wml/Uil.y Wed Jun 11 17:40:36 2003
@@ -396,6 +396,7 @@
| WIDE_CHARACTER { $$ = $1; $$.b_type = sym_k_wchar_string_value; }
| FONTSET { $$ = $1; $$.b_type = sym_k_fontset_value; }
@@ -10,7 +8,15 @@ $NetBSD: patch-au,v 1.1 2003/05/19 19:43:17 jschauma Exp $
/* End for fixing CR 5888 */
string_table_type
-@@ -1058,10 +1059,11 @@
+@@ -1049,7 +1050,6 @@
+ sar_private_error( &$$ );
+ }
+ }
+- ;
+ | value { $$ = $1;
+ if ($$.b_type != sym_k_error_value)
+ {
+@@ -1058,10 +1058,11 @@
sar_private_error( &$$ );
}
}