From 9c9414ec0ba106965ea08fd3922463f02dd781b2 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 3 May 2012 05:14:18 +0000
Subject: [PATCH] Update diffutils to 3.2

---
 sys-apps/diffutils/diffutils-3.2.bep          | 28 +++++++++++++
 .../diffutils/patches/diffutils-3.2.patch     | 39 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 sys-apps/diffutils/diffutils-3.2.bep
 create mode 100644 sys-apps/diffutils/patches/diffutils-3.2.patch

diff --git a/sys-apps/diffutils/diffutils-3.2.bep b/sys-apps/diffutils/diffutils-3.2.bep
new file mode 100644
index 000000000..9e9e9c088
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.2.bep
@@ -0,0 +1,28 @@
+DESCRIPTION="Tools to make diffs and compare files." 
+HOMEPAGE="http://www.gnu.org/software/diffutils/" 
+SRC_URI="http://ftp.gnu.org/pub/gnu/diffutils/diffutils-3.2.tar.gz"
+CHECKSUM_MD5="22e4deef5d8949a727b159d6bc65c1cc"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd diffutils-3.2
+	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
+	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
+	--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \
+	--infodir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/info"
+	make
+}
+
+INSTALL {
+	cd diffutils-3.2
+	make install
+}
+
+TEST {
+	cd diffutils-3.2
+	make check
+}
+
+LICENSE="GNU GPL v3"
+COPYRIGHT="1992-2011 Free Software Foundation, Inc."
diff --git a/sys-apps/diffutils/patches/diffutils-3.2.patch b/sys-apps/diffutils/patches/diffutils-3.2.patch
new file mode 100644
index 000000000..c339d2a1d
--- /dev/null
+++ b/sys-apps/diffutils/patches/diffutils-3.2.patch
@@ -0,0 +1,39 @@
+diff -up diffutils-3.2/gnulib-tests/test-dup2.c.orig diffutils-3.2/gnulib-tests/test-dup2.c
+--- diffutils-3.2/gnulib-tests/test-dup2.c.orig	2011-03-26 06:47:07.008126464 -0600
++++ diffutils-3.2/gnulib-tests/test-dup2.c	2012-05-02 23:07:17.022806528 -0600
+@@ -181,6 +181,7 @@ main (void)
+ 
+   /* On systems that distinguish between text and binary mode, dup2
+      reuses the mode of the source.  */
++#if O_BINARY
+   setmode (fd, O_BINARY);
+   ASSERT (is_mode (fd, O_BINARY));
+   ASSERT (dup2 (fd, fd + 1) == fd + 1);
+@@ -195,6 +196,6 @@ main (void)
+   ASSERT (close (fd + 1) == 0);
+   ASSERT (close (fd) == 0);
+   ASSERT (unlink (file) == 0);
+-
++#endif
+   return 0;
+ }
+diff -up diffutils-3.2/gnulib-tests/test-fcntl.c.orig diffutils-3.2/gnulib-tests/test-fcntl.c
+--- diffutils-3.2/gnulib-tests/test-fcntl.c.orig	2011-01-03 14:06:23.006815744 -0700
++++ diffutils-3.2/gnulib-tests/test-fcntl.c	2012-05-02 23:07:17.025952256 -0600
+@@ -293,6 +293,7 @@ main (void)
+   ASSERT (is_mode (fd + 2, O_BINARY));
+   ASSERT (close (fd) == 0);
+ 
++#if O_TEXT
+   setmode (fd + 2, O_TEXT);
+   ASSERT (fcntl (fd + 2, F_DUPFD, fd + 1) == fd + 1);
+   ASSERT (!is_open (fd));
+@@ -313,7 +314,7 @@ main (void)
+   ASSERT (is_mode (fd, O_TEXT));
+   ASSERT (is_mode (fd + 2, O_TEXT));
+   ASSERT (close (fd + 2) == 0);
+-
++#endif
+   /* Test F_GETFD.  */
+   errno = 0;
+   ASSERT (fcntl (-1, F_GETFD) == -1);