socsvn commit: r237395 - in soc2012/jhagewood/diff: . diff

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Sun Jun 10 03:35:16 2012
New Revision: 237395
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237395

Log:

Modified:
  soc2012/jhagewood/diff/diff/diff.c
  soc2012/jhagewood/diff/hagewood-diff.patch

Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c	Sun Jun 10 03:33:47 2012	(r237394)
+++ soc2012/jhagewood/diff/diff/diff.c	Sun Jun 10 03:35:16 2012	(r237395)
@@ -129,7 +129,6 @@
 	{ "report-identical-files",	no_argument,		NULL,	's' },
 	{ "initial-tab",		no_argument,		NULL,	'T' },
 	{ "expand-tabs",		no_argument,		NULL,	't' },
-/* XXX: -u is incompatible with GNU version */
 	{ "unified",			optional_argument,	NULL,	'U' },
 	{ "version",			no_argument,		NULL,	'v' },
 /* XXX: UNIMPLEMENTED

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Sun Jun 10 03:33:47 2012	(r237394)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Sun Jun 10 03:35:16 2012	(r237395)
@@ -1,3 +1,14 @@
+diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c
+--- jhagewood/diff/diff-orig/diff.c	2012-06-10 03:31:05.000000000 -0400
++++ jhagewood/diff/diff/diff.c	2012-06-10 03:35:06.000000000 -0400
+@@ -129,7 +129,6 @@ static struct option longopts[] = {
+ 	{ "report-identical-files",	no_argument,		NULL,	's' },
+ 	{ "initial-tab",		no_argument,		NULL,	'T' },
+ 	{ "expand-tabs",		no_argument,		NULL,	't' },
+-/* XXX: -u is incompatible with GNU version */
+ 	{ "unified",			optional_argument,	NULL,	'U' },
+ 	{ "version",			no_argument,		NULL,	'v' },
+ /* XXX: UNIMPLEMENTED
 diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
 --- jhagewood/diff/diff-orig/diffreg.c	2012-06-10 03:31:05.000000000 -0400
 +++ jhagewood/diff/diff/diffreg.c	2012-06-10 03:31:05.000000000 -0400