diffutils: bump to 3.5, BUILD_PREREQ+=cmd:perl for man/help2man. (#778)

sys-apps/diffutils/diffutils-3.5.recipe

@@ -2,8 +2,8 @@ SUMMARY="Several programs for finding differences between files"
 DESCRIPTION="You can use the diff command to show differences between two \
 files, or each corresponding file in two directories. diff outputs \
 differences between files line by line in any of several formats, selectable \
-by command line options. This set of differences is often called a ‘diff’ or \
-‘patch’.
+by command line options. This set of differences is often called a 'diff' or \
+'patch'.
 You can use the cmp command to show the offsets and line numbers where two \
 files differ. cmp can also show all the characters that differ between the two \
 files, side by side.
@@ -13,12 +13,14 @@ the differences between the original and the two changed versions, and can \
 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"
+HOMEPAGE="https://www.gnu.org/software/diffutils/"
 COPYRIGHT="1992-2016 Free Software Foundation, Inc."
-HOMEPAGE="http://www.gnu.org/software/diffutils/"
-SOURCE_URI="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-$portVersion.tar.xz"
-CHECKSUM_SHA256="db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2"
+LICENSE="GNU GPL v3"
 REVISION="1"
+SOURCE_URI="http://ftpmirror.gnu.org/diffutils/diffutils-$portVersion.tar.xz"
+CHECKSUM_SHA256="dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533"
+PATCHES="diffutils-$portVersion.patchset"
+
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
@@ -31,6 +33,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	"
+
 BUILD_REQUIRES="
 	haiku_devel
 	"
@@ -38,12 +41,9 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
 	cmd:awk
-	cmd:sed
-	cmd:grep
+	cmd:perl
 	"
 
-PATCHES="diffutils-$portVersion.patchset"
-
 defineDebugInfoPackage diffutils \
 	$binDir/cmp \
 	$binDir/diff \
@@ -53,7 +53,7 @@ defineDebugInfoPackage diffutils \
 BUILD()
 {
 	runConfigure ./configure \
-	--disable-gcc-warnings
+		--disable-gcc-warnings
 	make
 }
 

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

@@ -58,10 +58,10 @@ index 410bfef..f0a0622 100644
  		  switch (c)
  		    {
 diff --git a/src/util.c b/src/util.c
-index d7b8925..4d0e472 100644
+index 76872cb..5bfc59b 100644
 --- a/src/util.c
 +++ b/src/util.c
-@@ -583,7 +583,7 @@ parse_diff_color (void)
+@@ -581,7 +581,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 d7b8925..4d0e472 100644
    if ((p = color_palette) == NULL || *p == '\0')
      return;
  
-@@ -596,7 +596,6 @@ parse_diff_color (void)
+@@ -594,7 +594,6 @@ parse_diff_color (void)
       advance.  */
    buf = color_buf = xstrdup (p);
  
@@ -81,3 +81,53 @@ index d7b8925..4d0e472 100644
 -- 
 2.7.0
 
+
+From 5de6ef5ec779393a878059f32495fffa8b004306 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
+--- a/src/diff3.c
++++ b/src/diff3.c
+@@ -263,6 +263,7 @@ main (int argc, char **argv)
+   char *commonname;
+   char **file;
+   struct stat statb;
++  char *b0, *b1;
+ 
+   exit_failure = EXIT_TROUBLE;
+   initialize_main (&argc, &argv);
+@@ -412,7 +413,6 @@ main (int argc, char **argv)
+   /* Invoke diff twice on two pairs of input files, combine the two
+      diffs, and output them.  */
+ 
+-  char *b0, *b1;
+   commonname = file[rev_mapping[FILEC]];
+   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
+
+
+From 8f779cc21a68ee37d4269dab5afe2bbf51707af8 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
+--- a/man/help2man
++++ b/man/help2man
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/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,
+-- 
+2.9.3
+