From a3f5db9ff7e0dfc70b55501dbf0ef37e89803774 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sun, 17 Feb 2013 21:42:18 +0000
Subject: [PATCH] Add patch for grep-2.6.1 and fix bep so that it gets proper
 version source file.

---
 sys-apps/grep/grep-2.6.1.bep           | 10 +++++-----
 sys-apps/grep/patches/grep-2.6.1.patch | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 sys-apps/grep/patches/grep-2.6.1.patch

diff --git a/sys-apps/grep/grep-2.6.1.bep b/sys-apps/grep/grep-2.6.1.bep
index dfbd623d2..ec6be1fb0 100644
--- a/sys-apps/grep/grep-2.6.1.bep
+++ b/sys-apps/grep/grep-2.6.1.bep
@@ -1,24 +1,24 @@
 DESCRIPTION="GNU regular expression matcher" 
 HOMEPAGE="http://www.gnu.org/software/grep/" 
-SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.3.tar.gz"
-CHECKSUM_MD5="3095b57837b312f087c0680559de7f13"
+SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.1.tar.gz"
+CHECKSUM_MD5="8d1496da11029112a4d0986cbf09e26f"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND=""
 BUILD {
-	cd grep-2.6.3
+	cd grep-2.6.1
 	libtoolize --force --copy --install
 	./configure --prefix=`finddir B_COMMON_DIRECTORY`
 	make
 }
 
 INSTALL {
-	cd grep-2.6.3
+	cd grep-2.6.1
 	make install
 }
 
 TEST {
-	cd grep-2.6.3
+	cd grep-2.6.1
 	make check
 }
 
diff --git a/sys-apps/grep/patches/grep-2.6.1.patch b/sys-apps/grep/patches/grep-2.6.1.patch
new file mode 100644
index 000000000..8a08c6439
--- /dev/null
+++ b/sys-apps/grep/patches/grep-2.6.1.patch
@@ -0,0 +1,20 @@
+diff -urN grep-2.6.1/src/dfa.c grep-2.6.1-haiku/src/dfa.c
+--- grep-2.6.1/src/dfa.c	2010-03-25 06:28:54.056098816 -0700
++++ grep-2.6.1-haiku/src/dfa.c	2013-02-17 13:32:51.217055232 -0800
+@@ -2775,6 +2775,7 @@
+   unsigned char eol = eolbyte;	/* Likewise for eolbyte.  */
+   static int sbit[NOTCHAR];	/* Table for anding with d->success. */
+   static int sbit_init;
++  unsigned char saved_end;
+ 
+   if (! sbit_init)
+     {
+@@ -2792,7 +2793,7 @@
+   s = s1 = 0;
+   p = (unsigned char const *) begin;
+   trans = d->trans;
+-  unsigned char saved_end = *(unsigned char *) end;
++  saved_end = *(unsigned char *) end;
+   *end = eol;
+ 
+ #ifdef MBS_SUPPORT