diff options
-rw-r--r-- | graphics/php53-gd/Makefile | 2 | ||||
-rw-r--r-- | graphics/php53-gd/files/patch-config.m4 | 11 | ||||
-rw-r--r-- | net/php53-soap/Makefile | 2 | ||||
-rw-r--r-- | net/php53-soap/files/patch-soap.c | 56 | ||||
-rw-r--r-- | sysutils/php53-posix/Makefile | 2 | ||||
-rw-r--r-- | sysutils/php53-posix/files/patch-posix.c | 38 | ||||
-rw-r--r-- | textproc/php53-wddx/Makefile | 2 | ||||
-rw-r--r-- | textproc/php53-wddx/files/patch-config.m4 | 22 | ||||
-rw-r--r-- | textproc/php53-wddx/files/patch-wddx.c | 40 | ||||
-rw-r--r-- | textproc/php53-xml/Makefile | 2 | ||||
-rw-r--r-- | textproc/php53-xml/files/patch-compat.c | 13 |
11 files changed, 190 insertions, 0 deletions
diff --git a/graphics/php53-gd/Makefile b/graphics/php53-gd/Makefile index aa7d473597f5..74c19850bc53 100644 --- a/graphics/php53-gd/Makefile +++ b/graphics/php53-gd/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + CATEGORIES= graphics MASTERDIR= ${.CURDIR}/../../lang/php53 diff --git a/graphics/php53-gd/files/patch-config.m4 b/graphics/php53-gd/files/patch-config.m4 new file mode 100644 index 000000000000..03b69a1c248a --- /dev/null +++ b/graphics/php53-gd/files/patch-config.m4 @@ -0,0 +1,11 @@ +--- config.m4.orig Mon May 30 01:16:41 2005 ++++ config.m4 Wed Dec 7 11:01:13 2005 +@@ -220,7 +220,7 @@ + ],[ + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + ],[ +- -L$GD_T1_DIR/$PHP_LIBDIR ++ -L$GD_T1_DIR/$PHP_LIBDIR -lm + ]) + fi + ]) diff --git a/net/php53-soap/Makefile b/net/php53-soap/Makefile index 532f4c95be82..537470b1e476 100644 --- a/net/php53-soap/Makefile +++ b/net/php53-soap/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + CATEGORIES= net MASTERDIR= ${.CURDIR}/../../lang/php53 diff --git a/net/php53-soap/files/patch-soap.c b/net/php53-soap/files/patch-soap.c new file mode 100644 index 000000000000..70b84d3a60e9 --- /dev/null +++ b/net/php53-soap/files/patch-soap.c @@ -0,0 +1,56 @@ +--- soap.c.orig Tue Oct 3 21:51:01 2006 ++++ soap.c Sat Nov 4 11:38:29 2006 +@@ -23,7 +23,7 @@ + #include "config.h" + #endif + #include "php_soap.h" +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + #include "ext/session/php_session.h" + #endif + #ifdef ZEND_ENGINE_2 +@@ -1577,7 +1577,7 @@ + soap_obj = service->soap_object; + function_table = &((Z_OBJCE_P(soap_obj))->function_table); + } else if (service->type == SOAP_CLASS) { +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + /* If persistent then set soap_obj from from the previous created session (if available) */ + if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { + zval **tmp_soap; +@@ -1664,7 +1664,7 @@ + } + efree(class_name); + } +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + /* If session then update session hash with new object */ + if (service->soap_class.persistance == SOAP_PERSISTENCE_SESSION) { + zval **tmp_soap_pp; +@@ -1762,7 +1762,7 @@ + if (service->type == SOAP_CLASS || service->type == SOAP_OBJECT) { + call_status = call_user_function(NULL, &soap_obj, &function_name, &retval, num_params, params TSRMLS_CC); + if (service->type == SOAP_CLASS) { +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + if (service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { + zval_ptr_dtor(&soap_obj); + soap_obj = NULL; +@@ -1788,7 +1788,7 @@ + soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); + } + if (service->type == SOAP_CLASS) { +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { + #else + if (soap_obj) { +@@ -1830,7 +1830,7 @@ + soap_server_fault_ex(function, EG(exception), NULL TSRMLS_CC); + } + if (service->type == SOAP_CLASS) { +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + if (soap_obj && service->soap_class.persistance != SOAP_PERSISTENCE_SESSION) { + #else + if (soap_obj) { diff --git a/sysutils/php53-posix/Makefile b/sysutils/php53-posix/Makefile index 5c4c83eb95d8..754a70273076 100644 --- a/sysutils/php53-posix/Makefile +++ b/sysutils/php53-posix/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + CATEGORIES= sysutils MASTERDIR= ${.CURDIR}/../../lang/php53 diff --git a/sysutils/php53-posix/files/patch-posix.c b/sysutils/php53-posix/files/patch-posix.c new file mode 100644 index 000000000000..d2365b249569 --- /dev/null +++ b/sysutils/php53-posix/files/patch-posix.c @@ -0,0 +1,38 @@ +--- posix.c.orig Fri Feb 23 00:40:39 2007 ++++ posix.c Sun May 13 17:52:27 2007 +@@ -838,7 +838,7 @@ + #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) + buflen = sysconf(_SC_GETGR_R_SIZE_MAX); + if (buflen < 1) { +- RETURN_FALSE; ++ buflen = 1024; + } + buf = emalloc(buflen); + g = &gbuf; +@@ -888,7 +888,7 @@ + + grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX); + if (grbuflen < 1) { +- RETURN_FALSE; ++ grbuflen = 1024; + } + + grbuf = emalloc(grbuflen); +@@ -955,7 +955,7 @@ + #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) + buflen = sysconf(_SC_GETPW_R_SIZE_MAX); + if (buflen < 1) { +- RETURN_FALSE; ++ buflen = 1024; + } + buf = emalloc(buflen); + pw = &pwbuf; +@@ -1004,7 +1004,7 @@ + #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R) + pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX); + if (pwbuflen < 1) { +- RETURN_FALSE; ++ pwbuflen = 1024; + } + pwbuf = emalloc(pwbuflen); + diff --git a/textproc/php53-wddx/Makefile b/textproc/php53-wddx/Makefile index f94f78e064cb..d8f85eeeeff5 100644 --- a/textproc/php53-wddx/Makefile +++ b/textproc/php53-wddx/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + CATEGORIES= textproc MASTERDIR= ${.CURDIR}/../../lang/php53 diff --git a/textproc/php53-wddx/files/patch-config.m4 b/textproc/php53-wddx/files/patch-config.m4 new file mode 100644 index 000000000000..08787003b8f9 --- /dev/null +++ b/textproc/php53-wddx/files/patch-config.m4 @@ -0,0 +1,22 @@ +--- config.m4.orig Mon Jul 26 09:05:10 2004 ++++ config.m4 Mon Jul 26 09:07:46 2004 +@@ -5,6 +5,9 @@ + PHP_ARG_ENABLE(wddx,whether to enable WDDX support, + [ --enable-wddx Enable WDDX support.]) + ++PHP_ARG_WITH(libxml-dir, libxml2 install dir, ++[ --with-libxml-dir=<DIR> WDDX: libxml2 install prefix], no, no) ++ + if test "$PHP_WDDX" != "no"; then + if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then + AC_MSG_WARN(Activating XML) +@@ -12,4 +15,9 @@ + fi + AC_DEFINE(HAVE_WDDX, 1, [ ]) + PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared) ++ ++ PHP_SETUP_LIBXML(WDDX_SHARED_LIBADD, [ ++ ], [ ++ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) ++ ]) + fi diff --git a/textproc/php53-wddx/files/patch-wddx.c b/textproc/php53-wddx/files/patch-wddx.c new file mode 100644 index 000000000000..a8a6a79fe47f --- /dev/null +++ b/textproc/php53-wddx/files/patch-wddx.c @@ -0,0 +1,40 @@ +--- wddx.c.orig Sun Jan 1 13:50:16 2006 ++++ wddx.c Mon Jan 16 12:56:21 2006 +@@ -18,6 +18,10 @@ + + /* $Id: wddx.c,v 1.119.2.8 2006/01/01 12:50:16 sniper Exp $ */ + ++#ifdef HAVE_CONFIG_H ++# include "config.h" ++#endif ++ + #include "php.h" + + #if HAVE_WDDX +@@ -223,7 +227,7 @@ + + #include "ext/session/php_session.h" + +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + /* {{{ PS_SERIALIZER_ENCODE_FUNC + */ + PS_SERIALIZER_ENCODE_FUNC(wddx) +@@ -302,7 +306,7 @@ + { + le_wddx = zend_register_list_destructors_ex(release_wddx_packet_rsrc, NULL, "wddx", module_number); + +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + php_session_register_serializer("wddx", + PS_SERIALIZER_ENCODE_NAME(wddx), + PS_SERIALIZER_DECODE_NAME(wddx)); +@@ -317,7 +321,7 @@ + PHP_MINFO_FUNCTION(wddx) + { + php_info_print_table_start(); +-#if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION) ++#if HAVE_PHP_SESSION + php_info_print_table_header(2, "WDDX Support", "enabled" ); + php_info_print_table_row(2, "WDDX Session Serializer", "enabled" ); + #else diff --git a/textproc/php53-xml/Makefile b/textproc/php53-xml/Makefile index 8302d759c1e8..7379b96eb211 100644 --- a/textproc/php53-xml/Makefile +++ b/textproc/php53-xml/Makefile @@ -5,6 +5,8 @@ # $FreeBSD$ # +PORTREVISION= 1 + CATEGORIES= textproc MASTERDIR= ${.CURDIR}/../../lang/php53 diff --git a/textproc/php53-xml/files/patch-compat.c b/textproc/php53-xml/files/patch-compat.c new file mode 100644 index 000000000000..02125961b20c --- /dev/null +++ b/textproc/php53-xml/files/patch-compat.c @@ -0,0 +1,13 @@ +--- compat.c.orig Tue Jul 20 10:55:02 2004 ++++ compat.c Tue Jul 20 10:55:55 2004 +@@ -16,6 +16,10 @@ + +----------------------------------------------------------------------+ + */ + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "php.h" + #if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT) + #include "expat_compat.h" |