[csw-devel] SF.net SVN: gar:[15967] csw/mgar/pkg/wdiff/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15967
          http://gar.svn.sourceforge.net/gar/?rev=15967&view=rev
Author:   dmichelsen
Date:     2011-10-24 11:42:21 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
wdiff/trunk: Update to 1.0.1

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

Added Paths:
-----------
    csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch

Modified: csw/mgar/pkg/wdiff/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wdiff/trunk/Makefile	2011-10-24 09:42:07 UTC (rev 15966)
+++ csw/mgar/pkg/wdiff/trunk/Makefile	2011-10-24 11:42:21 UTC (rev 15967)
@@ -1,6 +1,6 @@
 # : Makefile 9089 2010-03-11 08:34:46Z wahwah $
 NAME = wdiff
-VERSION = 0.6.5
+VERSION = 1.0.1
 CATEGORIES = utils
 
 DESCRIPTION = A front end to diff for comparing files on a word per word basis
@@ -10,17 +10,14 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# File name regex to get notifications about upstream software releases
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+# Use patch until this is fixed:
+#   http://lists.gnu.org/archive/html/wdiff-bugs/2011-09/msg00006.html
+PATCHFILES += wdiff-1.0.1-testsuite.patch
 
 VENDOR_URL = http://www.gnu.org/software/wdiff/
 
-DEP_PKGS = CSWggettextrt
+RUNTIME_DEP_PKGS_CSWwdiff += CSWlibintl8
 
-CONFIGURE_ARGS = $(DIRPATHS)
-
-TEST_TARGET = check
-
 EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
 
 include gar/category.mk

Modified: csw/mgar/pkg/wdiff/trunk/checksums
===================================================================
--- csw/mgar/pkg/wdiff/trunk/checksums	2011-10-24 09:42:07 UTC (rev 15966)
+++ csw/mgar/pkg/wdiff/trunk/checksums	2011-10-24 11:42:21 UTC (rev 15967)
@@ -1 +1 @@
-1828209a14d01ad38c7267985f365cbf  wdiff-0.6.5.tar.gz
+c3b8e48a113fd064731d7372aae782f5  wdiff-1.0.1.tar.gz

Added: csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch
===================================================================
--- csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch	                        (rev 0)
+++ csw/mgar/pkg/wdiff/trunk/files/wdiff-1.0.1-testsuite.patch	2011-10-24 11:42:21 UTC (rev 15967)
@@ -0,0 +1,45 @@
+--- a/tests/wdiff.at
++++ b/tests/wdiff.at
+@@ -173,7 +173,7 @@
+ # Due to the istty call in the sources, we have to use screen here.
+ 
+ LC_ALL=C
+-AT_TESTED([wdiff diff screen env sed grep])
++AT_TESTED([wdiff diff screen env sed tr grep])
+ AT_DATA([foo.txt], [start foo end
+ ])
+ AT_DATA([bar.txt], [start bar end
+@@ -193,7 +193,7 @@
+ AT_SKIP_IF([grep 'terminal type.*not defined' screenlog.0])
+ # Need to work around a screen bug which might cause the first
+ # character to be lost: https://savannah.gnu.org/bugs/index.php?34200
+-AT_CHECK([sed 's/^ager/Pager/;s/\r//g;' screenlog.0], 0,
++AT_CHECK([tr -d '\r' < screenlog.0 | sed 's/^ager/Pager/'], 0,
+ [Pager starting.
+ Pager line start WfooX YbarZ end printed.
+ Pager now done.
+--- a/tests/testsuite
++++ b/tests/testsuite
+@@ -593,7 +593,8 @@
+ grep
+ diff
+ screen
+-sed'
++sed
++tr'
+ # As many question marks as there are digits in the last test group number.
+ # Used to normalize the test group numbers so that `ls' lists them in
+ # numerical order.
+@@ -2380,9 +2381,9 @@
+ # Need to work around a screen bug which might cause the first
+ # character to be lost: https://savannah.gnu.org/bugs/index.php?34200
+ { set +x
+-$as_echo "$at_srcdir/wdiff.at:196: sed 's/^ager/Pager/;s/\\r//g;' screenlog.0"
+-at_fn_check_prepare_trace "wdiff.at:196"
+-( $at_check_trace; sed 's/^ager/Pager/;s/\r//g;' screenlog.0
++$as_echo "$at_srcdir/wdiff.at:196: tr -d '\\r' < screenlog.0 | sed 's/^ager/Pager/'"
++at_fn_check_prepare_notrace 'a shell pipeline' "wdiff.at:196"
++( $at_check_trace; tr -d '\r' < screenlog.0 | sed 's/^ager/Pager/'
+ ) >>"$at_stdout" 2>>"$at_stderr"
+ at_status=$? at_failed=false
+ $at_check_filter

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