# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1344002082 -7200
# Node ID 153370aaf13fe7e4a8d6185632cfa23537ccb48e
# Parent  c5fbc773861c90191b40c94a5608fc1c2352bf8c
Import package vendor original specs for necessary manipulations.

diff -r c5fbc773861c -r 153370aaf13f diffutils/diffutils.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/diffutils/diffutils.patch	Fri Aug 03 15:54:42 2012 +0200
@@ -0,0 +1,77 @@
+Index: lib/c-stack.c
+--- lib/c-stack.c.orig	2011-08-28 13:55:52.000000000 +0200
++++ lib/c-stack.c	2012-05-12 10:06:32.000000000 +0200
+@@ -35,6 +35,10 @@
+ 
+ #include <config.h>
+ 
++#if defined(__FreeBSD__)
++#include <sys/types.h>
++#endif
++
+ #ifndef __attribute__
+ # if __GNUC__ < 3
+ #  define __attribute__(x)
+Index: man/diff3.1
+--- man/diff3.1.orig	2011-09-02 17:19:12.000000000 +0200
++++ man/diff3.1	2012-05-12 10:06:32.000000000 +0200
+@@ -39,6 +39,9 @@
+ \fB\-a\fR, \fB\-\-text\fR
+ treat all files as text
+ .TP
++\fB\-O\fR
++Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only)
++.TP
+ \fB\-\-strip\-trailing\-cr\fR
+ strip trailing carriage return on input
+ .TP
+Index: src/diff3.c
+--- src/diff3.c.orig	2011-07-03 22:42:54.000000000 +0200
++++ src/diff3.c	2012-05-12 10:06:32.000000000 +0200
+@@ -158,6 +158,9 @@
+ /* If nonzero, show information for DIFF_2ND diffs.  */
+ static bool show_2nd;
+ 
++/* If nonzero, show information for DIFF_2ND on overlaps, too. */
++static bool show_2nd_on_overlap;
++
+ /* If nonzero, include `:wq' at the end of the script
+    to write out the file being edited.   */
+ static bool finalwrite;
+@@ -237,7 +240,7 @@
+   textdomain (PACKAGE);
+   c_stack_action (0);
+ 
+-  while ((c = getopt_long (argc, argv, "aeimvx3AEL:TX", longopts, 0)) != -1)
++  while ((c = getopt_long (argc, argv, "aeimvx3AEL:TXO", longopts, 0)) != -1)
+     {
+       switch (c)
+ 	{
+@@ -272,6 +275,9 @@
+ 	case 'e':
+ 	  incompat++;
+ 	  break;
++	case 'O':
++	  show_2nd_on_overlap = true;
++	  break;
+ 	case 'T':
+ 	  initial_tab = true;
+ 	  break;
+@@ -1547,7 +1553,7 @@
+ 	  leading_dot = false;
+ 	  if (type == DIFF_ALL)
+ 	    {
+-	      if (show_2nd)
++	      if (show_2nd || show_2nd_on_overlap)
+ 		{
+ 		  /* Append lines from FILE1.  */
+ 		  fprintf (outputfile, "||||||| %s\n", file1);
+@@ -1686,7 +1692,7 @@
+ 			D_RELLEN (b, mapping[FILE0], i), outputfile);
+ 	    }
+ 
+-	  if (show_2nd)
++	  if (show_2nd || show_2nd_on_overlap)
+ 	    {
+ 	      /* Put in lines from FILE1 with bracket.  */
+ 	      fprintf (outputfile, format_2nd, file1);
diff -r c5fbc773861c -r 153370aaf13f diffutils/diffutils.spec
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/diffutils/diffutils.spec	Fri Aug 03 15:54:42 2012 +0200
@@ -0,0 +1,79 @@
+##
+##  diffutils.spec -- OpenPKG RPM Package Specification
+##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
+##
+##  Permission to use, copy, modify, and distribute this software for
+##  any purpose with or without fee is hereby granted, provided that
+##  the above copyright notice and this permission notice appear in all
+##  copies.
+##
+##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+##  SUCH DAMAGE.
+##
+
+#   package information
+Name:         diffutils
+Summary:      GNU Diff Utilities
+URL:          http://www.gnu.org/software/diffutils/
+Vendor:       Free Software Foundation
+Packager:     OpenPKG Foundation e.V.
+Distribution: OpenPKG Community
+Class:        BASE
+Group:        Patching
+License:      GPL
+Version:      3.2
+Release:      20120512
+
+#   list of sources
+Source0:      ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
+Patch0:       diffutils.patch
+
+#   build information
+BuildPreReq:  OpenPKG, openpkg >= 20100101, texinfo, make, gcc
+PreReq:       OpenPKG, openpkg >= 20100101
+
+%description
+    The GNU set of diff utilities: cmp, diff, diff3 and sdiff.
+
+%track
+    prog diffutils = {
+        version   = %{version}
+        url       = ftp://ftp.gnu.org/gnu/diffutils/
+        regex     = diffutils-(__VER__)\.tar\.gz
+    }
+
+%prep
+    %setup -q
+    %patch -p0
+
+%build
+    CC="%{l_cc}" \
+    CFLAGS="%{l_cflags -O}" \
+    ./configure \
+        --prefix=%{l_prefix} \
+        --mandir=%{l_prefix}/man \
+        --infodir=%{l_prefix}/info \
+        --disable-nls
+    %{l_make} %{l_mflags -O}
+
+%install
+    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/charset.alias
+    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+%files -f files
+
+%clean
+