[csw-devel] SF.net SVN: gar:[9550] csw/mgar/pkg/grep/trunk

[dmichelsen at users.sourceforge.net]

Revision: 9550
          http://gar.svn.sourceforge.net/gar/?rev=9550&view=rev
Author:   dmichelsen
Date:     2010-04-06 09:02:05 +0000 (Tue, 06 Apr 2010)

Log Message:
-----------
grep: Update to 2.6.3 after patch has been accepted upstream

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

Removed Paths:
-------------
    csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch

Modified: csw/mgar/pkg/grep/trunk/Makefile
===================================================================
--- csw/mgar/pkg/grep/trunk/Makefile	2010-04-06 01:36:49 UTC (rev 9549)
+++ csw/mgar/pkg/grep/trunk/Makefile	2010-04-06 09:02:05 UTC (rev 9550)
@@ -1,5 +1,5 @@
 GARNAME = grep
-GARVERSION = 2.6.2
+GARVERSION = 2.6.3
 CATEGORIES = utils
 
 DESCRIPTION = GNU grep
@@ -17,10 +17,6 @@
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES = $(DISTNAME).tar.xz
 
-# Force bash until this is fixed:
-#   http://savannah.gnu.org/bugs/?29381
-PATCHFILES = 0001-Force-bash-on-specific-tests.patch
-
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.xz
 

Modified: csw/mgar/pkg/grep/trunk/checksums
===================================================================
--- csw/mgar/pkg/grep/trunk/checksums	2010-04-06 01:36:49 UTC (rev 9549)
+++ csw/mgar/pkg/grep/trunk/checksums	2010-04-06 09:02:05 UTC (rev 9550)
@@ -1,2 +1 @@
-ec7aaf616278291af91f582d9bcfa64f  0001-Force-bash-on-specific-tests.patch
-b2d5841757ab065b28d0ff4c7ca2eca8  grep-2.6.2.tar.xz
+69a3bf508a3f14d12369e0e1c7a92763  grep-2.6.3.tar.xz

Deleted: csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch
===================================================================
--- csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch	2010-04-06 01:36:49 UTC (rev 9549)
+++ csw/mgar/pkg/grep/trunk/files/0001-Force-bash-on-specific-tests.patch	2010-04-06 09:02:05 UTC (rev 9550)
@@ -1,60 +0,0 @@
-From 6a802824b4484fb354caf9ece683f9b83f65d648 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Tue, 30 Mar 2010 10:01:44 +0200
-Subject: [PATCH] Force bash on specific tests
-
----
- tests/bre.sh          |    2 +-
- tests/ere.sh          |    2 +-
- tests/spencer1-locale |    2 +-
- tests/spencer1.sh     |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/bre.sh b/tests/bre.sh
-index 0a1153b..e511805 100755
---- a/tests/bre.sh
-+++ b/tests/bre.sh
-@@ -14,5 +14,5 @@ failures=0
- 
- ${AWK-awk} -f $srcdir/bre.awk $srcdir/bre.tests > bre.script
- 
--sh bre.script && exit $failures
-+bash bre.script && exit $failures
- exit 1
-diff --git a/tests/ere.sh b/tests/ere.sh
-index 2ebdc63..208582b 100755
---- a/tests/ere.sh
-+++ b/tests/ere.sh
-@@ -15,5 +15,5 @@ failures=0
- 
- ${AWK-awk} -f $srcdir/ere.awk $srcdir/ere.tests > ere.script
- 
--sh ere.script && exit $failures
-+bash ere.script && exit $failures
- exit 1
-diff --git a/tests/spencer1-locale b/tests/spencer1-locale
-index fa9909d..6da7165 100755
---- a/tests/spencer1-locale
-+++ b/tests/spencer1-locale
-@@ -19,6 +19,6 @@ ${AWK-awk} -v extra_locale=$LOCALE_FR_UTF8 \
-     -f "$abs_srcdir/spencer1-locale.awk" "$abs_srcdir/spencer1.tests" \
-   > spencer1-locale.script || fail=1
- 
--sh spencer1-locale.script || fail=1
-+bash spencer1-locale.script || fail=1
- 
- Exit $fail
-diff --git a/tests/spencer1.sh b/tests/spencer1.sh
-index 0bd6bd1..47325d2 100755
---- a/tests/spencer1.sh
-+++ b/tests/spencer1.sh
-@@ -15,5 +15,5 @@ failures=0
- 
- ${AWK-awk} -f $srcdir/spencer1.awk $srcdir/spencer1.tests > spencer1.script
- 
--sh spencer1.script && exit $failures
-+bash spencer1.script && exit $failures
- exit 1
--- 
-1.7.0
-


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