diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2010-07-27 15:13:54 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2010-07-27 15:13:54 +0000 |
| commit | 49a746ede788f5fcf95cd62f98fd891625d15840 (patch) | |
| tree | f774949ed5b9db04e5310ffa8f9254c07cc012f3 /databases | |
| parent | 31da751ef4d9e4bcd2b72292e49d65314f04ba78 (diff) | |
| download | ports-49a746ede788f5fcf95cd62f98fd891625d15840.tar.gz ports-49a746ede788f5fcf95cd62f98fd891625d15840.zip | |
Update to 5.3.3 release:
- add FPM sapi (experimental) [1]
- add apache2filter sapi (experimental)
PR: ports/148956 [1]
Submitted by: mm
Notes
Notes:
svn path=/head/; revision=258339
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/php5-dba/files/patch-config.m4 | 27 | ||||
| -rw-r--r-- | databases/php5-mysqli/files/patch-php_mysqli_structs.h | 10 | ||||
| -rw-r--r-- | databases/php5-sybase_ct/files/patch-config.m4 | 11 |
3 files changed, 23 insertions, 25 deletions
diff --git a/databases/php5-dba/files/patch-config.m4 b/databases/php5-dba/files/patch-config.m4 index 02761b927e42..348c70ed3173 100644 --- a/databases/php5-dba/files/patch-config.m4 +++ b/databases/php5-dba/files/patch-config.m4 @@ -1,9 +1,17 @@ ---- config.m4.orig 2007-12-06 15:17:43.000000000 +0100 -+++ config.m4 2008-12-11 12:50:27.000000000 +0100 -@@ -280,6 +280,34 @@ +--- config.m4.orig 2010-06-09 19:33:44.000000000 +0200 ++++ config.m4 2010-07-26 15:58:40.000000000 +0200 +@@ -285,6 +285,42 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break ++ elif test -f "$i/include/db50/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db50/db.h ++ break ++ elif test -f "$i/include/db48/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db48/db.h ++ break + elif test -f "$i/include/db47/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db47/db.h @@ -32,15 +40,6 @@ + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db41/db.h + break - elif test -f "$i/include/db4.6/db.h"; then + elif test -f "$i/include/db5.0/db.h"; then THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db4.6/db.h -@@ -306,7 +334,7 @@ - break - fi - done -- PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) -+ PHP_DBA_DB_CHECK(4, db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) - fi - PHP_DBA_STD_RESULT(db4,Berkeley DB4) - + THIS_INCLUDE=$i/include/db5.0/db.h diff --git a/databases/php5-mysqli/files/patch-php_mysqli_structs.h b/databases/php5-mysqli/files/patch-php_mysqli_structs.h new file mode 100644 index 000000000000..d0daeee9ee54 --- /dev/null +++ b/databases/php5-mysqli/files/patch-php_mysqli_structs.h @@ -0,0 +1,10 @@ +--- php_mysqli_structs.h.orig 2010-07-26 15:52:54.000000000 +0200 ++++ php_mysqli_structs.h 2010-07-26 15:53:14.000000000 +0200 +@@ -54,6 +54,7 @@ + #define WE_HAD_MBSTATE_T + #endif + ++#define HAVE_ULONG 1 + #include <my_global.h> + + #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) diff --git a/databases/php5-sybase_ct/files/patch-config.m4 b/databases/php5-sybase_ct/files/patch-config.m4 deleted file mode 100644 index ef121d7c4730..000000000000 --- a/databases/php5-sybase_ct/files/patch-config.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- config.m4.orig 2009-03-26 09:53:49.000000000 +0100 -+++ config.m4 2009-03-26 09:55:35.000000000 +0100 -@@ -31,7 +31,7 @@ - fi - - PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD) -- if test -f $SYBASE_CT_INCDIR/tds.h; then -+ if test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then - PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD) - SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" - else |