From 5d3d24ece5e379d4ec3e4ba1cc4f652046a937e5 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Fri, 1 Jun 2012 19:42:33 +0000
Subject: [PATCH] Updated bison to 2.5

---
 sys-devel/bison/bison-2.5.bep           | 29 +++++++++++++++++++++++++
 sys-devel/bison/patches/bison-2.5.patch | 29 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 sys-devel/bison/bison-2.5.bep
 create mode 100644 sys-devel/bison/patches/bison-2.5.patch

diff --git a/sys-devel/bison/bison-2.5.bep b/sys-devel/bison/bison-2.5.bep
new file mode 100644
index 000000000..324664600
--- /dev/null
+++ b/sys-devel/bison/bison-2.5.bep
@@ -0,0 +1,29 @@
+DESCRIPTION="bison - A yacc-compatible parser generator" 
+HOMEPAGE="http://www.gnu.org/software/bison/bison.html" 
+SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz"
+CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd bison-2.5
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
+		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
+		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+		--disable-nls
+	make
+}
+
+INSTALL {
+	cd bison-2.5
+	make install
+}
+
+TEST {
+	cd bison-2.5
+	make check
+}
+
+LICENSE="GNU GPL v3"
+COPYRIGHT="1992-2011 Free Software Foundation, Inc."
diff --git a/sys-devel/bison/patches/bison-2.5.patch b/sys-devel/bison/patches/bison-2.5.patch
new file mode 100644
index 000000000..cf4f0c08e
--- /dev/null
+++ b/sys-devel/bison/patches/bison-2.5.patch
@@ -0,0 +1,29 @@
+diff -urN bison-2.5/src/location.c bison-2.5-haiku/src/location.c
+--- bison-2.5/src/location.c	2011-05-01 22:17:32.046137344 +0000
++++ bison-2.5-haiku/src/location.c	2012-06-01 18:19:15.538443776 +0000
+@@ -144,11 +144,11 @@
+   /* Must search in reverse since the file name field may
+    * contain `.' or `:'.  */
+   char *delim = mbsrchr (loc_str, '.');
+-  aver (delim);
++  aver (delim != NULL);
+   *delim = '\0';
+   bound->column = atoi (delim+1);
+   delim = mbsrchr (loc_str, ':');
+-  aver (delim);
++  aver (delim != NULL);
+   *delim = '\0';
+   bound->line = atoi (delim+1);
+   bound->file = uniqstr_new (loc_str);
+diff -urN bison-2.5/src/muscle-tab.c bison-2.5-haiku/src/muscle-tab.c
+--- bison-2.5/src/muscle-tab.c	2011-05-14 22:17:12.043253760 +0000
++++ bison-2.5-haiku/src/muscle-tab.c	2012-06-01 18:16:05.827326464 +0000
+@@ -336,7 +336,7 @@
+ {
+   location loc;
+   char const *value = muscle_find_const (key);
+-  aver (value);
++  aver (value != NULL);
+   aver (*value == '[');
+   aver (*++value == '[');
+   while (*++value)