diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2007-02-17 10:19:18 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2007-02-17 10:19:18 +0000 |
| commit | 0b08c6847401ed24f8d29b8521b753f2ae091f38 (patch) | |
| tree | 58f904eb8c02eacc7b3a584cb4b6ed3f390491ff | |
| parent | Update to 4.4.5 release. (diff) | |
Update patches for 4.4.5 release.
Notes
Notes:
svn path=/head/; revision=185364
| -rw-r--r-- | databases/php4-dba/files/patch-config.m4 | 16 | ||||
| -rw-r--r-- | ftp/php4-curl/Makefile | 2 | ||||
| -rw-r--r-- | ftp/php4-curl/files/patch-curl.c | 22 |
3 files changed, 10 insertions, 30 deletions
diff --git a/databases/php4-dba/files/patch-config.m4 b/databases/php4-dba/files/patch-config.m4 index e43d20dca6f0..b940a22c0d87 100644 --- a/databases/php4-dba/files/patch-config.m4 +++ b/databases/php4-dba/files/patch-config.m4 @@ -1,9 +1,13 @@ ---- config.m4.orig Sat Sep 25 23:32:20 2004 -+++ config.m4 Wed Jan 12 23:42:24 2005 -@@ -206,6 +206,18 @@ +--- config.m4.orig Tue Nov 28 12:41:35 2006 ++++ config.m4 Sat Feb 17 11:13:51 2007 +@@ -205,6 +205,22 @@ THIS_PREFIX=$i THIS_INCLUDE=$i/db4/db.h break ++ elif test -f "$i/include/db44/db.h"; then ++ THIS_PREFIX=$i ++ THIS_INCLUDE=$i/include/db44/db.h ++ break + elif test -f "$i/include/db43/db.h"; then + THIS_PREFIX=$i + THIS_INCLUDE=$i/include/db43/db.h @@ -19,12 +23,12 @@ elif test -f "$i/include/db4/db.h"; then THIS_PREFIX=$i THIS_INCLUDE=$i/include/db4/db.h -@@ -224,7 +236,7 @@ +@@ -223,7 +239,7 @@ break fi done -- PHP_DBA_DB_CHECK(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.3 db-4.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) +- PHP_DBA_DB_CHECK(4, 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.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db41 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) fi ]) AC_DBA_STD_RESULT(db4,Berkeley DB4) diff --git a/ftp/php4-curl/Makefile b/ftp/php4-curl/Makefile index 376245d6adad..d41004f301e6 100644 --- a/ftp/php4-curl/Makefile +++ b/ftp/php4-curl/Makefile @@ -11,6 +11,4 @@ MASTERDIR= ${.CURDIR}/../../lang/php4 PKGNAMESUFFIX= -curl -PORTREVISION= 2 - .include "${MASTERDIR}/Makefile" diff --git a/ftp/php4-curl/files/patch-curl.c b/ftp/php4-curl/files/patch-curl.c deleted file mode 100644 index 1c703f38578c..000000000000 --- a/ftp/php4-curl/files/patch-curl.c +++ /dev/null @@ -1,22 +0,0 @@ ---- curl.c.orig Wed Dec 6 11:12:37 2006 -+++ curl.c Wed Dec 6 11:13:27 2006 -@@ -258,7 +258,9 @@ - REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND); - REGISTER_CURL_CONSTANT(CURLOPT_NETRC); - REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION); -+#if CURLOPT_FTPASCII != 0 - REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII); -+#endif - REGISTER_CURL_CONSTANT(CURLOPT_PUT); - #if CURLOPT_MUTE != 0 - REGISTER_CURL_CONSTANT(CURLOPT_MUTE); -@@ -296,7 +298,9 @@ - REGISTER_CURL_CONSTANT(CURLOPT_FILETIME); - REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION); - REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION); -+#if CURLOPT_PASSWDFUNCTION != 0 - REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION); -+#endif - REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION); - REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS); - REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS); |