[csw-devel] SF.net SVN: gar:[8169] csw/mgar/pkg/gzip/trunk

[dmichelsen at users.sourceforge.net]

Revision: 8169
          http://gar.svn.sourceforge.net/gar/?rev=8169&view=rev
Author:   dmichelsen
Date:     2010-01-25 12:35:39 +0000 (Mon, 25 Jan 2010)

Log Message:
-----------
gzip: Force use of ggrep or zgrep won't work

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

Added Paths:
-----------
    csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch

Modified: csw/mgar/pkg/gzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gzip/trunk/Makefile	2010-01-25 12:13:20 UTC (rev 8168)
+++ csw/mgar/pkg/gzip/trunk/Makefile	2010-01-25 12:35:39 UTC (rev 8169)
@@ -8,10 +8,13 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
+PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.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 = CSWggrep
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
 TEST_TARGET = check

Modified: csw/mgar/pkg/gzip/trunk/checksums
===================================================================
--- csw/mgar/pkg/gzip/trunk/checksums	2010-01-25 12:13:20 UTC (rev 8168)
+++ csw/mgar/pkg/gzip/trunk/checksums	2010-01-25 12:35:39 UTC (rev 8169)
@@ -1 +1,2 @@
+54776a402c7f43e4ece76c96a8e6518d  0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
 e381b8506210c794278f5527cba0e765  gzip-1.4.tar.gz

Added: csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch	                        (rev 0)
+++ csw/mgar/pkg/gzip/trunk/files/0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch	2010-01-25 12:35:39 UTC (rev 8169)
@@ -0,0 +1,25 @@
+From 1cfa061d805fa9b65113df02030a1460b62b90e5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 25 Jan 2010 13:33:28 +0100
+Subject: [PATCH] Force ggrep as Solaris grep doesn't understand the flags
+
+---
+ zgrep.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/zgrep.in b/zgrep.in
+index a828bbc..94d04da 100644
+--- a/zgrep.in
++++ b/zgrep.in
+@@ -26,7 +26,7 @@ case $1 in
+ esac
+ PATH=$bindir:$PATH
+ 
+-grep='${GREP-grep}'
++grep='${GREP-/opt/csw/bin/ggrep}'
+ 
+ version='zgrep (gzip) @VERSION@
+ Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+-- 
+1.6.6
+


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