[pkgsrc/trunk]: pkgsrc/www/php4 Patch away broken check for FreeTDS to allow ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f90ba5cc892
branches:  trunk
changeset: 568471:8f90ba5cc892
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Dec 14 19:50:41 2009 +0000

description:
Patch away broken check for FreeTDS to allow databases/php-mssql to work.

diffstat:

 www/php4/distinfo         |   3 ++-
 www/php4/patches/patch-av |  38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletions(-)

diffs (56 lines):

diff -r c0ee1712de1c -r 8f90ba5cc892 www/php4/distinfo
--- a/www/php4/distinfo Mon Dec 14 18:32:07 2009 +0000
+++ b/www/php4/distinfo Mon Dec 14 19:50:41 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2008/08/17 18:29:33 adrianp Exp $
+$NetBSD: distinfo,v 1.69 2009/12/14 19:50:41 joerg Exp $
 
 SHA1 (php-4.4.9.tar.bz2) = ab3d2205d756ddf93452b57bd6ce6a2014b1c374
 RMD160 (php-4.4.9.tar.bz2) = 0d77092efaccd8fe6efc16635be98c5d4ccfec66
@@ -15,3 +15,4 @@
 SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e
 SHA1 (patch-at) = f8b3aebd61fe2d5b5a994e1d973424a1ed397f63
 SHA1 (patch-au) = f9798aa440e174f65dde574c4f3b28183b3d18bc
+SHA1 (patch-av) = 925503f710f2fdf20d5aecfab39d448841c25e9f
diff -r c0ee1712de1c -r 8f90ba5cc892 www/php4/patches/patch-av
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/php4/patches/patch-av Mon Dec 14 19:50:41 2009 +0000
@@ -0,0 +1,38 @@
+$NetBSD: patch-av,v 1.5 2009/12/14 19:50:41 joerg Exp $
+
+--- ext/mssql/configure.orig   2009-12-14 20:38:39.000000000 +0100
++++ ext/mssql/configure
+@@ -3842,32 +3842,7 @@ $as_echo "$ext_output" >&6; }
+ 
+ if test "$PHP_MSSQL" != "no"; then
+ 
+-  FREETDS_INSTALLATION_DIR=""
+-  if test "$PHP_MSSQL" = "yes"; then
+-
+-    for i in /usr/local /usr; do
+-      if test -f $i/include/tds.h; then
+-        FREETDS_INSTALLATION_DIR=$i
+-        break
+-      fi
+-    done
+-
+-    if test -z "$FREETDS_INSTALLATION_DIR"; then
+-      as_fn_error "Cannot find FreeTDS in known installation directories" "$LINENO" 5
+-    fi
+-
+-  elif test "$PHP_MSSQL" != "no"; then
+-
+-    if test -f $PHP_MSSQL/include/tds.h; then
+-      FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+-    else
+-      as_fn_error "Directory $PHP_MSSQL is not a FreeTDS installation directory" "$LINENO" 5
+-    fi
+-  fi
+-
+-  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
+-     as_fn_error "Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.a|so" "$LINENO" 5
+-  fi
++  FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+ 
+   MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
+   MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib