diffutils: add recipe for version 3.7.

sys-apps/diffutils/diffutils-3.7.recipe

@@ -16,12 +16,12 @@ You can use the sdiff command to merge two files interactively."
 HOMEPAGE="https://www.gnu.org/software/diffutils/"
 COPYRIGHT="1992-2016 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="http://ftpmirror.gnu.org/diffutils/diffutils-$portVersion.tar.xz"
-CHECKSUM_SHA256="dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533"
+CHECKSUM_SHA256="b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
 PATCHES="diffutils-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_gcc2 x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	diffutils = $portVersion
@@ -52,6 +52,10 @@ defineDebugInfoPackage diffutils \
 
 BUILD()
 {
+	export CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS"
+	export CXXFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS"
+	export LDFLAGS="-lposix_error_mapper"
+
 	runConfigure ./configure \
 		--disable-gcc-warnings
 	make $jobArgs
@@ -60,7 +64,6 @@ BUILD()
 INSTALL()
 {
 	make install
-	rm $libDir/charset.alias
 }
 
 TEST()

sys-apps/diffutils/patches/diffutils-3.7.patchset

@@ -1,11 +1,11 @@
-From 31c247d91833c10f184f7fb56b5c1cc9beaba20d Mon Sep 17 00:00:00 2001
+From 1b48015e64b818b631d3a283f66c998f4397ca42 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Tue, 9 Aug 2016 18:34:58 +0300
 Subject: gcc2 fixes
 
 
 diff --git a/src/dir.c b/src/dir.c
-index c8aa6a5..dc0897e 100644
+index 734603e..551c0fe 100644
 --- a/src/dir.c
 +++ b/src/dir.c
 @@ -265,6 +265,7 @@ diff_dirs (struct comparison const *cmp,
@@ -36,7 +36,7 @@ index c8aa6a5..dc0897e 100644
  		  {
  		    if (file_name_cmp (*p, file) == 0)
 diff --git a/src/io.c b/src/io.c
-index 410bfef..f0a0622 100644
+index 6c03c70..5705101 100644
 --- a/src/io.c
 +++ b/src/io.c
 @@ -281,6 +281,8 @@ find_and_hash_each_line (struct file_data *current)
@@ -58,10 +58,10 @@ index 410bfef..f0a0622 100644
  		  switch (c)
  		    {
 diff --git a/src/util.c b/src/util.c
-index 76872cb..5bfc59b 100644
+index 4f4d9bb..cddec11 100644
 --- a/src/util.c
 +++ b/src/util.c
-@@ -581,7 +581,7 @@ parse_diff_color (void)
+@@ -580,7 +580,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 */
@@ -70,7 +70,7 @@ index 76872cb..5bfc59b 100644
    if ((p = color_palette) == NULL || *p == '\0')
      return;
  
-@@ -594,7 +594,6 @@ parse_diff_color (void)
+@@ -593,7 +593,6 @@ parse_diff_color (void)
       advance.  */
    buf = color_buf = xstrdup (p);
  
@@ -79,20 +79,20 @@ index 76872cb..5bfc59b 100644
      {
        switch (state)
 -- 
-2.7.0
+2.19.1
 
 
-From 5de6ef5ec779393a878059f32495fffa8b004306 Mon Sep 17 00:00:00 2001
+From 6d10bf20e1007b091648dac23409e98319b242ca Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Sun, 21 Aug 2016 05:35:54 +0000
 Subject: additional gcc2 patch for diffutils-3.5.
 
 
 diff --git a/src/diff3.c b/src/diff3.c
-index b80aeb3..a5f37df 100644
+index ec414a9..59eebcd 100644
 --- a/src/diff3.c
 +++ b/src/diff3.c
-@@ -263,6 +263,7 @@ main (int argc, char **argv)
+@@ -264,6 +264,7 @@ main (int argc, char **argv)
    char *commonname;
    char **file;
    struct stat statb;
@@ -100,7 +100,7 @@ index b80aeb3..a5f37df 100644
  
    exit_failure = EXIT_TROUBLE;
    initialize_main (&argc, &argv);
-@@ -412,7 +413,6 @@ main (int argc, char **argv)
+@@ -415,7 +416,6 @@ main (int argc, char **argv)
    /* Invoke diff twice on two pairs of input files, combine the two
       diffs, and output them.  */
  
@@ -109,17 +109,17 @@ index b80aeb3..a5f37df 100644
    thread1 = process_diff (file[rev_mapping[FILE1]], commonname, &last_block, &b1);
    thread0 = process_diff (file[rev_mapping[FILE0]], commonname, &last_block, &b0);
 -- 
-2.9.3
+2.19.1
 
 
-From 8f779cc21a68ee37d4269dab5afe2bbf51707af8 Mon Sep 17 00:00:00 2001
+From 774ce1f5cc45b6ba07d907d6e447a5a14d00ac8e Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Sun, 21 Aug 2016 05:35:54 +0000
 Subject: replace /usr/bin/perl by /bin/perl in man/help2man.
 
 
 diff --git a/man/help2man b/man/help2man
-index e6207e5..a34496c 100755
+index 304985c..b6ed40b 100755
 --- a/man/help2man
 +++ b/man/help2man
 @@ -1,4 +1,4 @@
@@ -127,7 +127,7 @@ index e6207e5..a34496c 100755
 +#!/bin/perl -w
  
  # Generate a short man page from --help and --version output.
- # Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2016 Free Software Foundation,
+ # Copyright (C) 1997-2005, 2009-2011, 2013, 2015-2018 Free Software Foundation,
 -- 
-2.9.3
+2.19.1