[pkgsrc/trunk]: pkgsrc/www/php4 ext/mssql/configure is created too late for p...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5b18af638eb
branches:  trunk
changeset: 568846:d5b18af638eb
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Dec 21 20:02:44 2009 +0000

description:
ext/mssql/configure is created too late for patching in other module
builds or the main www/php4 package. Patch the config.m4 source instead.

diffstat:

 www/php4/distinfo         |   4 ++--
 www/php4/patches/patch-av |  16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r 6b6437995658 -r d5b18af638eb www/php4/distinfo
--- a/www/php4/distinfo Mon Dec 21 19:55:01 2009 +0000
+++ b/www/php4/distinfo Mon Dec 21 20:02:44 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2009/12/14 19:50:41 joerg Exp $
+$NetBSD: distinfo,v 1.70 2009/12/21 20:02:44 joerg Exp $
 
 SHA1 (php-4.4.9.tar.bz2) = ab3d2205d756ddf93452b57bd6ce6a2014b1c374
 RMD160 (php-4.4.9.tar.bz2) = 0d77092efaccd8fe6efc16635be98c5d4ccfec66
@@ -15,4 +15,4 @@
 SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e
 SHA1 (patch-at) = f8b3aebd61fe2d5b5a994e1d973424a1ed397f63
 SHA1 (patch-au) = f9798aa440e174f65dde574c4f3b28183b3d18bc
-SHA1 (patch-av) = 925503f710f2fdf20d5aecfab39d448841c25e9f
+SHA1 (patch-av) = 1c743357a505b1cd0910c681bf892f0710310526
diff -r 6b6437995658 -r d5b18af638eb www/php4/patches/patch-av
--- a/www/php4/patches/patch-av Mon Dec 21 19:55:01 2009 +0000
+++ b/www/php4/patches/patch-av Mon Dec 21 20:02:44 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.5 2009/12/14 19:50:41 joerg Exp $
+$NetBSD: patch-av,v 1.6 2009/12/21 20:02:44 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; }
+--- ext/mssql/config.m4.orig   2009-12-21 19:57:57.000000000 +0000
++++ ext/mssql/config.m4
+@@ -9,32 +9,7 @@ PHP_ARG_WITH(mssql,for MSSQL support via
  
  if test "$PHP_MSSQL" != "no"; then
  
@@ -17,7 +17,7 @@
 -    done
 -
 -    if test -z "$FREETDS_INSTALLATION_DIR"; then
--      as_fn_error "Cannot find FreeTDS in known installation directories" "$LINENO" 5
+-      AC_MSG_ERROR(Cannot find FreeTDS in known installation directories)
 -    fi
 -
 -  elif test "$PHP_MSSQL" != "no"; then
@@ -25,12 +25,12 @@
 -    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
+-      AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
 -    fi
--  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
+-     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so])
 -  fi
 +  FREETDS_INSTALLATION_DIR=$PHP_MSSQL