From 3819b8f142a40590959123b2515fe9e2ccbd8b6e Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 9 Aug 2016 18:38:45 +0300
Subject: [PATCH] diffutils: bump version

---
 ...futils-3.3.recipe => diffutils-3.4.recipe} | 10 ++---
 ...ls-3.3.patchset => diffutils-3.4.patchset} | 41 ++++++++++++++-----
 2 files changed, 36 insertions(+), 15 deletions(-)
 rename sys-apps/diffutils/{diffutils-3.3.recipe => diffutils-3.4.recipe} (85%)
 rename sys-apps/diffutils/patches/{diffutils-3.3.patchset => diffutils-3.4.patchset} (54%)

diff --git a/sys-apps/diffutils/diffutils-3.3.recipe b/sys-apps/diffutils/diffutils-3.4.recipe
similarity index 85%
rename from sys-apps/diffutils/diffutils-3.3.recipe
rename to sys-apps/diffutils/diffutils-3.4.recipe
index a0a444885..ff268d543 100644
--- a/sys-apps/diffutils/diffutils-3.3.recipe
+++ b/sys-apps/diffutils/diffutils-3.4.recipe
@@ -14,11 +14,11 @@ produce a merged file that contains both persons' changes together with \
 warnings about conflicts.
 You can use the sdiff command to merge two files interactively."
 LICENSE="GNU GPL v3"
-COPYRIGHT="1992-2013 Free Software Foundation, Inc."
+COPYRIGHT="1992-2016 Free Software Foundation, Inc."
 HOMEPAGE="http://www.gnu.org/software/diffutils/"
-SOURCE_URI="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-3.3.tar.xz"
-CHECKSUM_SHA256="a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c"
-REVISION="4"
+SOURCE_URI="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-$portVersion.tar.xz"
+CHECKSUM_SHA256="db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2"
+REVISION="1"
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
@@ -42,7 +42,7 @@ BUILD_PREREQUIRES="
 	cmd:grep
 	"
 
-PATCHES="diffutils-3.3.patchset"
+PATCHES="diffutils-$portVersion.patchset"
 
 defineDebugInfoPackage diffutils \
 	$binDir/cmp \
diff --git a/sys-apps/diffutils/patches/diffutils-3.3.patchset b/sys-apps/diffutils/patches/diffutils-3.4.patchset
similarity index 54%
rename from sys-apps/diffutils/patches/diffutils-3.3.patchset
rename to sys-apps/diffutils/patches/diffutils-3.4.patchset
index 6580d79ec..2654034ca 100644
--- a/sys-apps/diffutils/patches/diffutils-3.3.patchset
+++ b/sys-apps/diffutils/patches/diffutils-3.4.patchset
@@ -1,14 +1,14 @@
-From c648aa48039deac1e3e1e031eaedd74c3428493f Mon Sep 17 00:00:00 2001
+From 31c247d91833c10f184f7fb56b5c1cc9beaba20d Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
-Date: Sat, 19 Oct 2013 23:34:25 -0600
+Date: Tue, 9 Aug 2016 18:34:58 +0300
 Subject: gcc2 fixes
 
 
 diff --git a/src/dir.c b/src/dir.c
-index 7f647b0..e9526ac 100644
+index c8aa6a5..dc0897e 100644
 --- a/src/dir.c
 +++ b/src/dir.c
-@@ -249,6 +249,7 @@ diff_dirs (struct comparison const *cmp,
+@@ -265,6 +265,7 @@ diff_dirs (struct comparison const *cmp,
        /* Loop while files remain in one or both dirs.  */
        while (*names[0] || *names[1])
  	{
@@ -16,7 +16,7 @@ index 7f647b0..e9526ac 100644
  	  /* Compare next name in dir 0 with next name in dir 1.
  	     At the end of a dir,
  	     pretend the "next name" in that dir is very large.  */
-@@ -289,7 +290,7 @@ diff_dirs (struct comparison const *cmp,
+@@ -305,7 +306,7 @@ diff_dirs (struct comparison const *cmp,
  		}
  	    }
  
@@ -25,7 +25,7 @@ index 7f647b0..e9526ac 100644
  				   0 < nameorder ? 0 : *names[0]++,
  				   nameorder < 0 ? 0 : *names[1]++);
  	  if (val < v1)
-@@ -347,7 +348,8 @@ find_dir_file_pathname (char const *dir, char const *file)
+@@ -363,7 +364,8 @@ find_dir_file_pathname (char const *dir, char const *file)
  	    match = file; /* longjmp may mess up MATCH.  */
  	  else
  	    {
@@ -36,10 +36,10 @@ index 7f647b0..e9526ac 100644
  		  {
  		    if (file_name_cmp (*p, file) == 0)
 diff --git a/src/io.c b/src/io.c
-index 463ee35..965cd3b 100644
+index 410bfef..f0a0622 100644
 --- a/src/io.c
 +++ b/src/io.c
-@@ -274,6 +274,8 @@ find_and_hash_each_line (struct file_data *current)
+@@ -281,6 +281,8 @@ find_and_hash_each_line (struct file_data *current)
  	    size_t column = 0;
  	    while ((c = *p++) != '\n')
  	      {
@@ -48,7 +48,7 @@ index 463ee35..965cd3b 100644
  		if (ig_white_space & IGNORE_TRAILING_SPACE
  		    && isspace (c))
  		  {
-@@ -288,8 +290,6 @@ find_and_hash_each_line (struct file_data *current)
+@@ -295,8 +297,6 @@ find_and_hash_each_line (struct file_data *current)
  		    while (isspace (c1));
  		  }
  
@@ -57,6 +57,27 @@ index 463ee35..965cd3b 100644
  		if (ig_white_space & IGNORE_TAB_EXPANSION)
  		  switch (c)
  		    {
+diff --git a/src/util.c b/src/util.c
+index d7b8925..4d0e472 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -583,7 +583,7 @@ parse_diff_color (void)
+   int ind_no;			/* Indicator number */
+   char label[3];		/* Indicator label */
+   struct color_ext_type *ext;	/* Extension we are working on */
+-
++  enum parse_state state = PS_START;
+   if ((p = color_palette) == NULL || *p == '\0')
+     return;
+ 
+@@ -596,7 +596,6 @@ parse_diff_color (void)
+      advance.  */
+   buf = color_buf = xstrdup (p);
+ 
+-  enum parse_state state = PS_START;
+   while (true)
+     {
+       switch (state)
 -- 
-1.8.3.4
+2.7.0