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

[wilbury at users.sourceforge.net]

Revision: 18085
          http://gar.svn.sourceforge.net/gar/?rev=18085&view=rev
Author:   wilbury
Date:     2012-05-23 10:39:57 +0000 (Wed, 23 May 2012)
Log Message:
-----------
squid/branches/squid3: Do not use norunpath

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

Added Paths:
-----------
    csw/mgar/pkg/squid/branches/squid3/files/0006-Use-usr-xpg4-bin-egrep.patch

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

Modified: csw/mgar/pkg/squid/branches/squid3/Makefile
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/Makefile	2012-05-23 10:25:42 UTC (rev 18084)
+++ csw/mgar/pkg/squid/branches/squid3/Makefile	2012-05-23 10:39:57 UTC (rev 18085)
@@ -46,7 +46,7 @@
 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
+PATCHFILES += 0006-Use-usr-xpg4-bin-egrep.patch
 
 sysconfdir = /etc/opt/csw/$(NAME)
 
@@ -81,8 +81,6 @@
 
 TEST_TARGET = 
 
-EXTRA_LINKER_FLAGS += -norunpath
-
 SAMPLECONF = squid.conf
 SAMPLECONF += cachemgr.conf
 SAMPLECONF += mime.conf

Deleted: 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	2012-05-23 10:25:42 UTC (rev 18084)
+++ csw/mgar/pkg/squid/branches/squid3/files/0006-Use-egrep-q-instead-of-grep-q.patch	2012-05-23 10:39:57 UTC (rev 18085)
@@ -1,39 +0,0 @@
-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" | /usr/xpg4/bin/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" | /usr/xpg4/bin/egrep -q pthread; then
-   	LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"`
-       fi
-   esac
--- 
-1.7.10
-

Added: csw/mgar/pkg/squid/branches/squid3/files/0006-Use-usr-xpg4-bin-egrep.patch
===================================================================
--- csw/mgar/pkg/squid/branches/squid3/files/0006-Use-usr-xpg4-bin-egrep.patch	                        (rev 0)
+++ csw/mgar/pkg/squid/branches/squid3/files/0006-Use-usr-xpg4-bin-egrep.patch	2012-05-23 10:39:57 UTC (rev 18085)
@@ -0,0 +1,53 @@
+From 0badaafded0de5167f5dac91253c15ac222ad839 Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Wed, 23 May 2012 12:29:43 +0200
+Subject: [PATCH] Use /usr/xpg4/bin/egrep
+
+---
+ bootstrap.sh |    2 +-
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/bootstrap.sh b/bootstrap.sh
+index e079783..4736194 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 /usr/xpg4/bin/egrep -q '^[[:space:]]*AC_LIBLTDL_' configure.ac
+     then
+ 	ltdl="--ltdl"
+     else
+diff --git a/configure b/configure
+index 02fc78c..47d339f 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" | /usr/xpg4/bin/egrep -q pthread; then
+   	LDFLAGS=`echo $LDFLAGS | sed -e "s/-pthread//"`
+       fi
+   esac
+diff --git a/configure.ac b/configure.ac
+index 61cef5d..131ae1a 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" | /usr/xpg4/bin/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.