diff options
| author | joerg <joerg@pkgsrc.org> | 2009-12-21 20:02:44 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-12-21 20:02:44 +0000 |
| commit | ff4df208b78b3a6e87841d386417705c4a95d96b (patch) | |
| tree | 6fba91b518c1d013db36bc039c6c8b8b464fb0b4 | |
| parent | a847501d668b99426a41459b53384c40f2aafddd (diff) | |
| download | pkgsrc-ff4df208b78b3a6e87841d386417705c4a95d96b.tar.gz | |
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.
| -rw-r--r-- | www/php4/distinfo | 4 | ||||
| -rw-r--r-- | www/php4/patches/patch-av | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/www/php4/distinfo b/www/php4/distinfo index 5a97aadf5a9..4d0719d8e73 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -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-ak) = 1f9fbe26c7329e1d18eec053499ee2d574b5b970 SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e SHA1 (patch-at) = f8b3aebd61fe2d5b5a994e1d973424a1ed397f63 SHA1 (patch-au) = f9798aa440e174f65dde574c4f3b28183b3d18bc -SHA1 (patch-av) = 925503f710f2fdf20d5aecfab39d448841c25e9f +SHA1 (patch-av) = 1c743357a505b1cd0910c681bf892f0710310526 diff --git a/www/php4/patches/patch-av b/www/php4/patches/patch-av index de881d32dd4..0a453c484e1 100644 --- a/www/php4/patches/patch-av +++ b/www/php4/patches/patch-av @@ -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 @@ $NetBSD: patch-av,v 1.5 2009/12/14 19:50:41 joerg Exp $ - 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 @@ $NetBSD: patch-av,v 1.5 2009/12/14 19:50:41 joerg Exp $ - 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 |