From 75c614bb6b24726a2f666ff206c6e2379a9801ad Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 12 Mar 2016 23:52:19 +0000
Subject: [PATCH] grep: bump version to 2.24.

---
 .../{grep-2.23.recipe => grep-2.24.recipe}    | 20 +++++++++----------
 ...{grep-2.23.patchset => grep-2.24.patchset} |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename sys-apps/grep/{grep-2.23.recipe => grep-2.24.recipe} (72%)
 rename sys-apps/grep/patches/{grep-2.23.patchset => grep-2.24.patchset} (99%)

diff --git a/sys-apps/grep/grep-2.23.recipe b/sys-apps/grep/grep-2.24.recipe
similarity index 72%
rename from sys-apps/grep/grep-2.23.recipe
rename to sys-apps/grep/grep-2.24.recipe
index 7dc77756f..f33a78c8f 100644
--- a/sys-apps/grep/grep-2.23.recipe
+++ b/sys-apps/grep/grep-2.24.recipe
@@ -1,18 +1,17 @@
 SUMMARY="GNU regular expression matcher"
-DESCRIPTION="
-The grep command searches one or more input files for lines containing a match \
-to a specified pattern. By default, grep prints the matching lines.
-"
-HOMEPAGE="http://www.gnu.org/software/grep/"
+DESCRIPTION="The grep command searches one or more input files for lines \
+containing a match to a specified pattern. By default, grep prints the \
+matching lines."
+HOMEPAGE="https://www.gnu.org/software/grep/"
+COPYRIGHT="1992-2016 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-COPYRIGHT="1992-2014 Free Software Foundation, Inc."
-SOURCE_URI="http://ftp.gnu.org/gnu/grep/grep-$portVersion.tar.xz"
-CHECKSUM_SHA256="54fc478ee1ce17780109820ef30730c9e18715a949f7d5c6afc673adb2a56ecf"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
+SOURCE_URI="http://ftp.gnu.org/gnu/grep/grep-$portVersion.tar.xz"
+CHECKSUM_SHA256="f248beb9098c5aab94d2fdd03b5a21d705e5ba8a3ce4d8c9f607a670498eec14"
 PATCHES="grep-$portVersion.patchset"
 
+ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+
 PROVIDES="
 	grep = $portVersion compat >= 2
 	cmd:egrep = $portVersion compat >= 2
@@ -24,6 +23,7 @@ REQUIRES="
 	lib:libiconv
 	lib:libintl
 	"
+
 BUILD_REQUIRES="
 	devel:libiconv
 	devel:libintl
diff --git a/sys-apps/grep/patches/grep-2.23.patchset b/sys-apps/grep/patches/grep-2.24.patchset
similarity index 99%
rename from sys-apps/grep/patches/grep-2.23.patchset
rename to sys-apps/grep/patches/grep-2.24.patchset
index 4181a0694..dec865ccd 100644
--- a/sys-apps/grep/patches/grep-2.23.patchset
+++ b/sys-apps/grep/patches/grep-2.24.patchset
@@ -1,4 +1,4 @@
-From d2fc4a2aac245c78c2ab8dc9aa97ec283db65360 Mon Sep 17 00:00:00 2001
+From caa9ffa4f1340056db4dc3ce7d63b29393d676d7 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Wed, 4 Jun 2014 19:20:57 +0000
 Subject: gcc2 patch
@@ -57,7 +57,7 @@ index adc5de3..f397ff2 100644
      {
        dm = xmalloc (sizeof *dm);
 diff --git a/src/dfasearch.c b/src/dfasearch.c
-index e04a2df..815d4f6 100644
+index d348d44..cd33148 100644
 --- a/src/dfasearch.c
 +++ b/src/dfasearch.c
 @@ -95,11 +95,11 @@ kwsmusts (void)
@@ -110,7 +110,7 @@ index e04a2df..815d4f6 100644
  
    mb_start = buf;
    buflim = buf + size;
-@@ -444,7 +447,7 @@ EGexecute (char *buf, size_t size, size_t *match_size,
+@@ -445,7 +448,7 @@ EGexecute (char *buf, size_t size, size_t *match_size,
   success:
    len = end - beg;
   success_in_len:;