[csw-devel] SF.net SVN: gar:[18081] csw/mgar/pkg/squid/branches/squid3

[wilbury at users.sourceforge.net]

Revision: 18081
          http://gar.svn.sourceforge.net/gar/?rev=18081&view=rev
Author:   wilbury
Date:     2012-05-23 09:12:24 +0000 (Wed, 23 May 2012)
Log Message:
-----------
squid/branches/squid3: Use egrep -q in place of grep -q

Modified Paths:
--------------
    csw/mgar/pkg/squid/branches/squid3/Makefile

Added Paths:
-----------
    csw/mgar/pkg/squid/branches/squid3/files/0006-Use-egrep-q-instead-of-grep-q.patch

Removed Paths:
-------------
    csw/mgar/pkg/squid/branches/squid3/files/0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch

Modified: csw/mgar/pkg/squid/branches/squid3/Makefile
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/Makefile	2012-05-23 09:09:09 UTC (rev 18080)
+++ csw/mgar/pkg/squid/branches/squid3/Makefile	2012-05-23 09:12:24 UTC (rev 18081)
@@ -41,12 +41,12 @@
 MASTER_SITES = http://www.squid-cache.org/Versions/v$(RELVER)/$(VERSION)/
 DISTFILES = squid-$(DISTVERSION).tar.bz2
 
-#PATCHFILES =  0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch
-#PATCHFILES += 0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch
-#PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch
-#PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch
-#PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch
-#PATCHFILES += 0006-Use-default-cache_dir.patch
+PATCHFILES =  0000-Use-opt-csw-bin-bash-for-bootstrap.sh.patch
+PATCHFILES += 0002-Link-against-OpenSSL-from-OpenCSW.patch
+PATCHFILES += 0003-Check-for-ber_pvt_opt_on-instead-of-main-in-libber.patch
+PATCHFILES += 0006-Replace-usr-local-squid-libexec-with-opt-csw-libexec.patch
+PATCHFILES += 0006-Use-default-cache_dir.patch
+PATCHFILES += 0006-Use-egrep-q-instead-of-grep-q.patch
 
 sysconfdir = /etc/opt/csw/$(NAME)
 

Deleted: csw/mgar/pkg/squid/branches/squid3/files/0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch	2012-05-23 09:09:09 UTC (rev 18080)
+++ csw/mgar/pkg/squid/branches/squid3/files/0001-Use-opt-csw-bin-ggrep-instead-of-egrep.patch	2012-05-23 09:12:24 UTC (rev 18081)
@@ -1,25 +0,0 @@
-From df2a86bd6846c1e741d0731476185fdd30004c6d Mon Sep 17 00:00:00 2001
-From: builder user <builder at opencsw.org>
-Date: Mon, 19 Sep 2011 16:02:06 +0200
-Subject: [PATCH] Use /opt/csw/bin/ggrep instead of egrep.
-
----
- bootstrap.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bootstrap.sh b/bootstrap.sh
-index e079783..6152fbc 100755
---- a/bootstrap.sh
-+++ b/bootstrap.sh
-@@ -76,7 +76,7 @@ bootstrap_libtoolize() {
- 
-     # TODO: when we have libtool2, tell libtoolize where to put its files
-     # instead of manualy moving files from ltdl to lib/libLtdl
--    if egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.ac
-+    if /opt/csw/bin/ggrep -E -q '^[[:space:]]*AC_LIBLTDL_' configure.ac
-     then
- 	ltdl="--ltdl"
-     else
--- 
-1.7.6
-

Added: csw/mgar/pkg/squid/branches/squid3/files/0006-Use-egrep-q-instead-of-grep-q.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0006-Use-egrep-q-instead-of-grep-q.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/0006-Use-egrep-q-instead-of-grep-q.patch	2012-05-23 09:12:24 UTC (rev 18081)
@@ -0,0 +1,39 @@
+From 7dfab56fe7e74c8df51c780c676f86174257f9b6 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Wed, 23 May 2012 11:09:05 +0200
+Subject: [PATCH] Use egrep -q instead of grep -q
+
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 02fc78c..2c307de 100755
+--- a/configure
++++ b/configure
+@@ -26652,7 +26652,7 @@ $as_echo "$SQUID_MAXFD (user-forced)" >&6; }
+ else
+   case $host in
+   i386-unknown-freebsd*)
+-      if echo "$LDFLAGS" | grep -q pthread; then
++      if echo "$LDFLAGS" | egrep -q pthread; then
+   	LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"`
+       fi
+   esac
+diff --git a/configure.ac b/configure.ac
+index 61cef5d..c8d4f6d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3492,7 +3492,7 @@ if test -n "$squid_filedescriptors_num" ; then
+ else
+   case $host in
+   i386-unknown-freebsd*)
+-      if echo "$LDFLAGS" | grep -q pthread; then
++      if echo "$LDFLAGS" | egrep -q pthread; then
+   	LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"`
+       fi
+   esac
+-- 
+1.7.10
+

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