From e8e20335626868be8eadcbdcdd786a2d16c88e16 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Wed, 31 Oct 2007 09:57:21 +0000
Subject: Rename yylval and yychar in autotools parser so they dont conflict
 with some other instance of the variables. Fixes PR pkg/35328

---
 devel/kdevelop-base/Makefile         |  3 ++-
 devel/kdevelop-base/distinfo         |  3 ++-
 devel/kdevelop-base/patches/patch-aj | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 devel/kdevelop-base/patches/patch-aj

(limited to 'devel')

diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index 051d8433b82..7f32c154b57 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2007/10/20 10:51:40 markd Exp $
+# $NetBSD: Makefile,v 1.67 2007/10/31 09:57:21 markd Exp $
 
 DISTNAME=	kdevelop-3.5.0
 PKGNAME=	kdevelop-base-3.5.0
+PKGREVISION=	1
 CATEGORIES=	devel kde
 
 HOMEPAGE=	http://www.kdevelop.org/
diff --git a/devel/kdevelop-base/distinfo b/devel/kdevelop-base/distinfo
index b100d1d07b6..e2bd9afa2bd 100644
--- a/devel/kdevelop-base/distinfo
+++ b/devel/kdevelop-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.33 2007/10/20 10:51:41 markd Exp $
+$NetBSD: distinfo,v 1.34 2007/10/31 09:57:21 markd Exp $
 
 SHA1 (kdevelop-3.5.0.tar.bz2) = e46eb17bcf83e9a31c120bd6b872347b7a606dcf
 RMD160 (kdevelop-3.5.0.tar.bz2) = fad1adda009eaa7fc6a6533a6bf211e3f1fa23fa
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 19d7b806fd3a5cd0c6cee76f434ea965ad3f01a9
 SHA1 (patch-ag) = 6ab90c041962bf999f3cfb2a704e91e2a2f205ba
 SHA1 (patch-ah) = fec4ba7d20ca75c2a4dc5942270cab899776a741
 SHA1 (patch-ai) = fa0b9b7bc82c9cf2e8ac32e873e7efd06bb75599
+SHA1 (patch-aj) = 49a8fa7b2061961f9a8a5993e2b8b06403798c08
diff --git a/devel/kdevelop-base/patches/patch-aj b/devel/kdevelop-base/patches/patch-aj
new file mode 100644
index 00000000000..da3b7059672
--- /dev/null
+++ b/devel/kdevelop-base/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.3 2007/10/31 09:57:21 markd Exp $
+
+--- buildtools/lib/parsers/autotools/autotools_yacc.cpp.orig	2005-09-10 20:21:44.000000000 +1200
++++ buildtools/lib/parsers/autotools/autotools_yacc.cpp
+@@ -33,6 +33,9 @@
+    define necessary library symbols; they are noted "INFRINGES ON
+    USER NAME SPACE" below.  */
+ 
++#define yylval autotools_yylval
++#define yychar autotools_yychar
++
+ /* Identify Bison output.  */
+ #define YYBISON 1
+ 
-- 
cgit v1.2.3