[csw-devel] SF.net SVN: gar:[6784] csw/mgar/pkg/colordiff/trunk

[dmichelsen at users.sourceforge.net]

Revision: 6784
          http://gar.svn.sourceforge.net/gar/?rev=6784&view=rev
Author:   dmichelsen
Date:     2009-10-08 13:27:06 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
colordiff: Force usage of GNU diff

Modified Paths:
--------------
    csw/mgar/pkg/colordiff/trunk/Makefile
    csw/mgar/pkg/colordiff/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch

Modified: csw/mgar/pkg/colordiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/colordiff/trunk/Makefile	2009-10-08 13:26:04 UTC (rev 6783)
+++ csw/mgar/pkg/colordiff/trunk/Makefile	2009-10-08 13:27:06 UTC (rev 6784)
@@ -11,11 +11,12 @@
 PATCHFILES = fix-entity-nesting.patch
 PATCHFILES += force-csw-perl.patch
 PATCHFILES += force-csw-less.patch
+PATCHFILES += force-csw-gdiff.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-REQUIRED_PKGS = CSWperl CSWless
+REQUIRED_PKGS = CSWdiffutils CSWperl CSWless
 
 CONFIGURE_SCRIPTS = 
 BUILD_ARGS = doc

Modified: csw/mgar/pkg/colordiff/trunk/checksums
===================================================================
--- csw/mgar/pkg/colordiff/trunk/checksums	2009-10-08 13:26:04 UTC (rev 6783)
+++ csw/mgar/pkg/colordiff/trunk/checksums	2009-10-08 13:27:06 UTC (rev 6784)
@@ -1,4 +1,5 @@
 31864847eaa4e900f72bbb6bbc64f1ec  colordiff-1.0.9.tar.gz
 d202632e9ec507e53445232a930c9c6f  fix-entity-nesting.patch
+4e078d43dfd8032c95699190c3bf9f16  force-csw-gdiff.patch
 94bb55618657dd39b3d4d1b8b321eac3  force-csw-less.patch
 b37c28fccba12407d69a9d856d81a396  force-csw-perl.patch

Added: csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch
===================================================================
--- csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch	                        (rev 0)
+++ csw/mgar/pkg/colordiff/trunk/files/force-csw-gdiff.patch	2009-10-08 13:27:06 UTC (rev 6784)
@@ -0,0 +1,12 @@
+diff -Naur colordiff-1.0.9.orig/colordiff.pl colordiff-1.0.9.patched/colordiff.pl
+--- colordiff-1.0.9.orig/colordiff.pl	2009-01-28 21:12:10.000000000 +0100
++++ colordiff-1.0.9.patched/colordiff.pl	2009-10-08 14:26:51.806222906 +0200
+@@ -178,7 +178,7 @@
+ my $exitcode = 0;
+ if ((defined $ARGV[0]) || (-t STDIN)) {
+     # More reliable way of pulling in arguments
+-    my $pid = open2(\*INPUTSTREAM, undef, "diff", @ARGV);
++    my $pid = open2(\*INPUTSTREAM, undef, "/opt/csw/bin/gdiff", @ARGV);
+     @inputstream = <INPUTSTREAM>;
+     close INPUTSTREAM;
+     waitpid $pid, 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.