[pkgsrc/trunk]: pkgsrc/cad fix fallout from bison-2.0 update

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2142bab1404f
branches:  trunk
changeset: 489954:2142bab1404f
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Mar 01 00:13:44 2005 +0000

description:
fix fallout from bison-2.0 update

diffstat:

 cad/covered-current/distinfo         |   3 ++-
 cad/covered-current/patches/patch-ad |  35 +++++++++++++++++++++++++++++++++++
 cad/covered/distinfo                 |   3 ++-
 cad/covered/patches/patch-ab         |  35 +++++++++++++++++++++++++++++++++++
 4 files changed, 74 insertions(+), 2 deletions(-)

diffs (104 lines):

diff -r e080c0a27144 -r 2142bab1404f cad/covered-current/distinfo
--- a/cad/covered-current/distinfo      Mon Feb 28 23:30:48 2005 +0000
+++ b/cad/covered-current/distinfo      Tue Mar 01 00:13:44 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 14:59:23 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/01 00:13:45 dmcmahill Exp $
 
 SHA1 (covered-20040325.tar.gz) = 6bfa1a9c377cb1ae61364cfd5f3db57396cea16c
 RMD160 (covered-20040325.tar.gz) = 76b19272152ad515cb3ce1ad999fe3e97320c122
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 0ffd830e411c00d5fa1776f14e949362b2d2980f
 SHA1 (patch-ab) = 6dbade601b82b67f8bd00cdc859d6c7766e771b6
 SHA1 (patch-ac) = 0312e60734890c4e2b1da07ac3346cba6151dd5e
+SHA1 (patch-ad) = 5baa34bb31e8118ec656d022ee548987741e2c52
diff -r e080c0a27144 -r 2142bab1404f cad/covered-current/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/covered-current/patches/patch-ad      Tue Mar 01 00:13:44 2005 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ad,v 1.1 2005/03/01 00:13:45 dmcmahill Exp $
+
+--- src/parser.y.orig  2004-03-16 05:45:43.000000000 +0000
++++ src/parser.y       2005-02-28 21:12:13.000000000 +0000
+@@ -62,10 +62,24 @@
+    values. I need to supply an explicit version to account for the
+    text field, that otherwise won't be copied. */
+-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
+-  Current.first_line   = Rhs[1].first_line;      \
+-  Current.first_column = Rhs[1].first_column;    \
+-  Current.last_line    = Rhs[N].last_line;       \
+-  Current.last_column  = Rhs[N].last_column;     \
+-  Current.text         = Rhs[1].text;
++
++# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
++    do                                                                  \
++      if (N)                                                            \
++        {                                                               \
++          (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;         \
++          (Current).first_column = YYRHSLOC(Rhs, 1).first_column;       \
++          (Current).last_line    = YYRHSLOC(Rhs, N).last_line;          \
++          (Current).last_column  = YYRHSLOC(Rhs, N).last_column;        \
++          (Current).text         = YYRHSLOC(Rhs, 1).text;               \
++        }                                                               \
++      else                                                              \
++        {                                                               \
++          (Current).first_line   = (Current).last_line   =              \
++            YYRHSLOC(Rhs, 0).last_line;                                 \
++          (Current).first_column = (Current).last_column =              \
++            YYRHSLOC(Rhs, 0).last_column;                               \
++          (Current).text         = YYRHSLOC(Rhs, 0).text;               \
++        }                                                               \
++    while (0)
+ 
+ %}
diff -r e080c0a27144 -r 2142bab1404f cad/covered/distinfo
--- a/cad/covered/distinfo      Mon Feb 28 23:30:48 2005 +0000
+++ b/cad/covered/distinfo      Tue Mar 01 00:13:44 2005 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 14:59:23 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/03/01 00:13:44 dmcmahill Exp $
 
 SHA1 (covered-0.3.tar.gz) = 10c9231dd4cb2bf8cc28403d28b654c958b3b24e
 RMD160 (covered-0.3.tar.gz) = a9a0e82ca790a82934d3e07cf16fb401c09f8f7f
 Size (covered-0.3.tar.gz) = 758152 bytes
 SHA1 (patch-aa) = 0ffd830e411c00d5fa1776f14e949362b2d2980f
+SHA1 (patch-ab) = 5baa34bb31e8118ec656d022ee548987741e2c52
diff -r e080c0a27144 -r 2142bab1404f cad/covered/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/cad/covered/patches/patch-ab      Tue Mar 01 00:13:44 2005 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ab,v 1.1 2005/03/01 00:13:44 dmcmahill Exp $
+
+--- src/parser.y.orig  2004-03-16 05:45:43.000000000 +0000
++++ src/parser.y       2005-02-28 21:12:13.000000000 +0000
+@@ -62,10 +62,24 @@
+    values. I need to supply an explicit version to account for the
+    text field, that otherwise won't be copied. */
+-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
+-  Current.first_line   = Rhs[1].first_line;      \
+-  Current.first_column = Rhs[1].first_column;    \
+-  Current.last_line    = Rhs[N].last_line;       \
+-  Current.last_column  = Rhs[N].last_column;     \
+-  Current.text         = Rhs[1].text;
++
++# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
++    do                                                                  \
++      if (N)                                                            \
++        {                                                               \
++          (Current).first_line   = YYRHSLOC(Rhs, 1).first_line;         \
++          (Current).first_column = YYRHSLOC(Rhs, 1).first_column;       \
++          (Current).last_line    = YYRHSLOC(Rhs, N).last_line;          \
++          (Current).last_column  = YYRHSLOC(Rhs, N).last_column;        \
++          (Current).text         = YYRHSLOC(Rhs, 1).text;               \
++        }                                                               \
++      else                                                              \
++        {                                                               \
++          (Current).first_line   = (Current).last_line   =              \
++            YYRHSLOC(Rhs, 0).last_line;                                 \
++          (Current).first_column = (Current).last_column =              \
++            YYRHSLOC(Rhs, 0).last_column;                               \
++          (Current).text         = YYRHSLOC(Rhs, 0).text;               \
++        }                                                               \
++    while (0)
+ 
+ %}