OpenPKG Specs / file diff

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/diffutils/diffutils.patch	Fri Aug 03 15:54:42 2012 +0200
     1.3 @@ -0,0 +1,77 @@
     1.4 +Index: lib/c-stack.c
     1.5 +--- lib/c-stack.c.orig	2011-08-28 13:55:52.000000000 +0200
     1.6 ++++ lib/c-stack.c	2012-05-12 10:06:32.000000000 +0200
     1.7 +@@ -35,6 +35,10 @@
     1.8 + 
     1.9 + #include <config.h>
    1.10 + 
    1.11 ++#if defined(__FreeBSD__)
    1.12 ++#include <sys/types.h>
    1.13 ++#endif
    1.14 ++
    1.15 + #ifndef __attribute__
    1.16 + # if __GNUC__ < 3
    1.17 + #  define __attribute__(x)
    1.18 +Index: man/diff3.1
    1.19 +--- man/diff3.1.orig	2011-09-02 17:19:12.000000000 +0200
    1.20 ++++ man/diff3.1	2012-05-12 10:06:32.000000000 +0200
    1.21 +@@ -39,6 +39,9 @@
    1.22 + \fB\-a\fR, \fB\-\-text\fR
    1.23 + treat all files as text
    1.24 + .TP
    1.25 ++\fB\-O\fR
    1.26 ++Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only)
    1.27 ++.TP
    1.28 + \fB\-\-strip\-trailing\-cr\fR
    1.29 + strip trailing carriage return on input
    1.30 + .TP
    1.31 +Index: src/diff3.c
    1.32 +--- src/diff3.c.orig	2011-07-03 22:42:54.000000000 +0200
    1.33 ++++ src/diff3.c	2012-05-12 10:06:32.000000000 +0200
    1.34 +@@ -158,6 +158,9 @@
    1.35 + /* If nonzero, show information for DIFF_2ND diffs.  */
    1.36 + static bool show_2nd;
    1.37 + 
    1.38 ++/* If nonzero, show information for DIFF_2ND on overlaps, too. */
    1.39 ++static bool show_2nd_on_overlap;
    1.40 ++
    1.41 + /* If nonzero, include `:wq' at the end of the script
    1.42 +    to write out the file being edited.   */
    1.43 + static bool finalwrite;
    1.44 +@@ -237,7 +240,7 @@
    1.45 +   textdomain (PACKAGE);
    1.46 +   c_stack_action (0);
    1.47 + 
    1.48 +-  while ((c = getopt_long (argc, argv, "aeimvx3AEL:TX", longopts, 0)) != -1)
    1.49 ++  while ((c = getopt_long (argc, argv, "aeimvx3AEL:TXO", longopts, 0)) != -1)
    1.50 +     {
    1.51 +       switch (c)
    1.52 + 	{
    1.53 +@@ -272,6 +275,9 @@
    1.54 + 	case 'e':
    1.55 + 	  incompat++;
    1.56 + 	  break;
    1.57 ++	case 'O':
    1.58 ++	  show_2nd_on_overlap = true;
    1.59 ++	  break;
    1.60 + 	case 'T':
    1.61 + 	  initial_tab = true;
    1.62 + 	  break;
    1.63 +@@ -1547,7 +1553,7 @@
    1.64 + 	  leading_dot = false;
    1.65 + 	  if (type == DIFF_ALL)
    1.66 + 	    {
    1.67 +-	      if (show_2nd)
    1.68 ++	      if (show_2nd || show_2nd_on_overlap)
    1.69 + 		{
    1.70 + 		  /* Append lines from FILE1.  */
    1.71 + 		  fprintf (outputfile, "||||||| %s\n", file1);
    1.72 +@@ -1686,7 +1692,7 @@
    1.73 + 			D_RELLEN (b, mapping[FILE0], i), outputfile);
    1.74 + 	    }
    1.75 + 
    1.76 +-	  if (show_2nd)
    1.77 ++	  if (show_2nd || show_2nd_on_overlap)
    1.78 + 	    {
    1.79 + 	      /* Put in lines from FILE1 with bracket.  */
    1.80 + 	      fprintf (outputfile, format_2nd, file1);