[csw-devel] SF.net SVN: gar:[15498] csw/mgar/pkg/php5/trunk

[bdwalton at users.sourceforge.net]

Revision: 15498
          http://gar.svn.sourceforge.net/gar/?rev=15498&view=rev
Author:   bdwalton
Date:     2011-09-02 16:58:15 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
php5/trunk: drop a patch that is now merged upstream

Modified Paths:
--------------
    csw/mgar/pkg/php5/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch

Modified: csw/mgar/pkg/php5/trunk/Makefile
===================================================================
--- csw/mgar/pkg/php5/trunk/Makefile	2011-09-02 14:10:20 UTC (rev 15497)
+++ csw/mgar/pkg/php5/trunk/Makefile	2011-09-02 16:58:15 UTC (rev 15498)
@@ -46,8 +46,6 @@
 DISTFILES += httpd-php5.conf
 
 PATCHFILES += 0001-Strip-usr-ucblib-references.patch
-# this one is filed upstream: http://bugs.php.net/bug.php?id=54318
-PATCHFILES += 0002-Correct-non-portable-use-of-grep-q-in-configure.patch
 # technically this is only required in the ap2 modulation where we build the
 # postgres stuff, but protect the cgi modulation too
 PATCHFILES_isa-sparcv8-sapi-cgi += 0003-Force-the-PDO-pgsql-checks-to-use-32-bit-pg_config.patch

Deleted: csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch
===================================================================
--- csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch	2011-09-02 14:10:20 UTC (rev 15497)
+++ csw/mgar/pkg/php5/trunk/files/0002-Correct-non-portable-use-of-grep-q-in-configure.patch	2011-09-02 16:58:15 UTC (rev 15498)
@@ -1,29 +0,0 @@
-From 15a1fff863652aa6575aa1dcd44a5f31e4424873 Mon Sep 17 00:00:00 2001
-From: Ben Walton <bwalton at opencsw.org>
-Date: Sat, 19 Mar 2011 16:55:06 +0100
-Subject: [PATCH] Correct non-portable use of grep -q in configure
-
-Discard the stdout/stderr and test exit status instead.
-
-Signed-off-by: Ben Walton <bwalton at opencsw.org>
----
- configure |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 65da668..503369a 100755
---- a/configure
-+++ b/configure
-@@ -73068,7 +73068,8 @@ EOF
- 
-   echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
- echo "configure:73108: checking for openssl dependencies" >&5
--  if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
-+grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1
-+  if [ $? -eq 0 ] ; then
-     echo "$ac_t""yes" 1>&6
-         # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--- 
-1.7.3.2
-

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