diff options
Diffstat (limited to 'lang/php53/files')
| -rw-r--r-- | lang/php53/files/patch-Zend::zend.h | 12 | ||||
| -rw-r--r-- | lang/php53/files/patch-acinclude.m4 | 14 | ||||
| -rw-r--r-- | lang/php53/files/patch-configure | 82 | ||||
| -rw-r--r-- | lang/php53/files/patch-ext_standard_dns.h | 13 | ||||
| -rw-r--r-- | lang/php53/files/patch-main::php_config.h.in | 12 | ||||
| -rw-r--r-- | lang/php53/files/patch-main_SAPI.c | 20 | ||||
| -rw-r--r-- | lang/php53/files/patch-pear::Makefile.frag | 35 | ||||
| -rw-r--r-- | lang/php53/files/patch-pear::scripts::pearcmd.php | 20 | ||||
| -rw-r--r-- | lang/php53/files/patch-scripts::Makefile.frag | 25 | ||||
| -rw-r--r-- | lang/php53/files/patch-scripts::phpize.in | 15 |
10 files changed, 0 insertions, 248 deletions
diff --git a/lang/php53/files/patch-Zend::zend.h b/lang/php53/files/patch-Zend::zend.h deleted file mode 100644 index 50625c403417..000000000000 --- a/lang/php53/files/patch-Zend::zend.h +++ /dev/null @@ -1,12 +0,0 @@ ---- Zend/zend.h.orig Mon Dec 6 15:42:56 2004 -+++ Zend/zend.h Mon Dec 6 15:46:40 2004 -@@ -176,7 +176,7 @@ - #endif - - --#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) -+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) && !(defined(ZTS) && defined(__FreeBSD__)) - # define do_alloca(p) alloca(p) - # define free_alloca(p) - #else - diff --git a/lang/php53/files/patch-acinclude.m4 b/lang/php53/files/patch-acinclude.m4 deleted file mode 100644 index 32a0ca4c79c9..000000000000 --- a/lang/php53/files/patch-acinclude.m4 +++ /dev/null @@ -1,14 +0,0 @@ ---- acinclude.m4.orig Tue Jan 25 14:02:45 2005 -+++ acinclude.m4 Mon Apr 4 11:09:25 2005 -@@ -1681,9 +1681,9 @@ - unset OPENSSL_LIBDIR - - dnl Fallbacks for different configure options -- if test "$PHP_OPENSSL" != "no"; then -+ if test -n "$PHP_OPENSSL" && test "$PHP_OPENSSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_OPENSSL -- elif test "$PHP_IMAP_SSL" != "no"; then -+ elif test -n "$PHP_IMAP_SSL" && test "$PHP_IMAP_SSL" != "no"; then - PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - diff --git a/lang/php53/files/patch-configure b/lang/php53/files/patch-configure deleted file mode 100644 index a1219ce6bda7..000000000000 --- a/lang/php53/files/patch-configure +++ /dev/null @@ -1,82 +0,0 @@ ---- configure.orig Sun Apr 3 11:42:50 2005 -+++ configure Wed Apr 6 16:41:26 2005 -@@ -2805,7 +2805,7 @@ - save_LIBS=$LIBS - - if test -n "$ac_cv_pthreads_lib"; then -- LIBS="$LIBS -l$ac_cv_pthreads_lib" -+ LIBS="$LIBS $ac_cv_pthreads_lib" - fi - - if test -n "$ac_cv_pthreads_cflags"; then -@@ -11201,7 +11201,7 @@ - if test "$enable_maintainer_zts" = "yes"; then - - if test -n "$ac_cv_pthreads_lib"; then -- LIBS="$LIBS -l$ac_cv_pthreads_lib" -+ LIBS="$LIBS $ac_cv_pthreads_lib" - fi - - if test -n "$ac_cv_pthreads_cflags"; then -@@ -11218,8 +11218,6 @@ - case $host_alias in - *solaris*) - PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";; -- *freebsd*) -- PTHREAD_FLAGS="-D_REENTRANT -D_THREAD_SAFE";; - *linux*) - PTHREAD_FLAGS=-D_REENTRANT;; - *aix*) -@@ -80628,6 +80626,10 @@ - #line 80629 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -80685,6 +80687,10 @@ - #line 80686 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -80742,6 +80748,10 @@ - #line 80743 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -80837,6 +80847,10 @@ - #line 80838 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -92387,7 +92401,7 @@ - save_LIBS=$LIBS - - if test -n "$ac_cv_pthreads_lib"; then -- LIBS="$LIBS -l$ac_cv_pthreads_lib" -+ LIBS="$LIBS $ac_cv_pthreads_lib" - fi - - if test -n "$ac_cv_pthreads_cflags"; then diff --git a/lang/php53/files/patch-ext_standard_dns.h b/lang/php53/files/patch-ext_standard_dns.h deleted file mode 100644 index 1ea8751970c8..000000000000 --- a/lang/php53/files/patch-ext_standard_dns.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ext/standard/dns.h.orig Sun Jun 19 11:57:31 2005 -+++ ext/standard/dns.h Sun Jun 19 12:03:37 2005 -@@ -25,6 +25,10 @@ - - #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME - #define HAVE_DNS_FUNCS 1 -+#define res_ninit __res_ninit -+#define res_nmkquery __res_nmkquery -+#define res_nsend __res_nsend -+#define res_nclose __res_nclose - #endif - - PHP_FUNCTION(gethostbyaddr); diff --git a/lang/php53/files/patch-main::php_config.h.in b/lang/php53/files/patch-main::php_config.h.in deleted file mode 100644 index 3eed7c4acf66..000000000000 --- a/lang/php53/files/patch-main::php_config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- main/php_config.h.in.orig Mon Jul 12 16:30:37 2004 -+++ main/php_config.h.in Mon Jul 12 16:31:38 2004 -@@ -2362,6 +2362,9 @@ - /* */ - #undef SOLARIS_YP - -+/* Include external shared modules configurations */ -+#include "ext/php_config.h" -+ - /* Whether sprintf is broken */ - #undef ZEND_BROKEN_SPRINTF - diff --git a/lang/php53/files/patch-main_SAPI.c b/lang/php53/files/patch-main_SAPI.c deleted file mode 100644 index 12744ba48346..000000000000 --- a/lang/php53/files/patch-main_SAPI.c +++ /dev/null @@ -1,20 +0,0 @@ ---- main/SAPI.c.orig Fri Apr 15 10:31:02 2005 -+++ main/SAPI.c Fri Apr 15 10:34:11 2005 -@@ -569,7 +569,7 @@ - ptr++; - len--; - } --#if HAVE_ZLIB -+#if 1 - if(!strncmp(ptr, "image/", sizeof("image/")-1)) { - zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME); - } -@@ -716,7 +716,7 @@ - return SUCCESS; - } - --#if HAVE_ZLIB -+#if 1 - /* Add output compression headers at this late stage in order to make - it possible to switch it off inside the script. */ - diff --git a/lang/php53/files/patch-pear::Makefile.frag b/lang/php53/files/patch-pear::Makefile.frag deleted file mode 100644 index 082aa5e74fb8..000000000000 --- a/lang/php53/files/patch-pear::Makefile.frag +++ /dev/null @@ -1,35 +0,0 @@ ---- pear/Makefile.frag.orig Tue Sep 2 03:30:13 2003 -+++ pear/Makefile.frag Thu Apr 22 23:52:40 2004 -@@ -1,6 +1,7 @@ - # -*- makefile -*- - - peardir=$(PEAR_INSTALLDIR) -+XML_RPC_ver=1.2.2 - - # Skip all php.ini files altogether - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -@@ -13,10 +14,18 @@ - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" -- @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ -- $(MAKE) -s install-pear-installer install-pear-packages; \ -- else \ -- cat $(srcdir)/install-pear.txt; \ -- exit 5; \ -- fi -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/bootstrap \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/Archive \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/Console \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/XML \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC -+ @cp $(srcdir)/PEAR.php $(srcdir)/System.php \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap -+ @cp $(srcdir)/Archive/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Archive -+ @cp $(srcdir)/Console/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Console -+ @cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap -+ @cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap -+ @tar xf $(srcdir)/packages/XML_RPC-$(XML_RPC_ver).tar -+ @cp XML_RPC-$(XML_RPC_ver)/RPC.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML -+ @cp XML_RPC-$(XML_RPC_ver)/Server.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC - diff --git a/lang/php53/files/patch-pear::scripts::pearcmd.php b/lang/php53/files/patch-pear::scripts::pearcmd.php deleted file mode 100644 index d24ae913d4fe..000000000000 --- a/lang/php53/files/patch-pear::scripts::pearcmd.php +++ /dev/null @@ -1,20 +0,0 @@ ---- pear/scripts/pearcmd.php.orig Sun Jun 6 17:52:41 2004 -+++ pear/scripts/pearcmd.php Mon Jul 12 16:22:50 2004 -@@ -1,3 +1,4 @@ -+#!%%PREFIX%%/bin/php -nq - <?php - // - // +----------------------------------------------------------------------+ -@@ -24,9 +25,9 @@ - /** - * @nodep Gtk - */ --if ('@include_path@' != '@'.'include_path'.'@') { -- ini_set('include_path', '@include_path@'); --} -+dl('pcre.so'); -+dl('xml.so'); -+ini_set('include_path', '%%PREFIX%%/share/pear:%%PREFIX%%/share/pear/bootstrap'); - ini_set('allow_url_fopen', true); - if (!ini_get('safe_mode')) { - set_time_limit(0); diff --git a/lang/php53/files/patch-scripts::Makefile.frag b/lang/php53/files/patch-scripts::Makefile.frag deleted file mode 100644 index 7570701e6beb..000000000000 --- a/lang/php53/files/patch-scripts::Makefile.frag +++ /dev/null @@ -1,25 +0,0 @@ ---- scripts/Makefile.frag.orig Mon Feb 28 06:28:25 2005 -+++ scripts/Makefile.frag Fri Apr 1 15:42:21 2005 -@@ -34,21 +34,12 @@ - / \ - Zend/ \ - TSRM/ \ -- include/ \ - main/ \ - main/streams/ \ - regex/ \ -- ext/iconv/ \ - ext/libxml/ \ - ext/standard/ \ -- ext/session/ \ -- ext/dom/xml_common.h \ -- ext/xml/ \ -- ext/xml/expat/ \ -- ext/mbstring/ \ -- ext/mbstring/libmbfl/ \ -- ext/mbstring/libmbfl/mbfl/ \ -- ext/sqlite/libsqlite/src/sqlite.h -+ ext/spl/ - - install-headers: - -@for i in $(HEADER_DIRS); do \ diff --git a/lang/php53/files/patch-scripts::phpize.in b/lang/php53/files/patch-scripts::phpize.in deleted file mode 100644 index cab5309be743..000000000000 --- a/lang/php53/files/patch-scripts::phpize.in +++ /dev/null @@ -1,15 +0,0 @@ ---- scripts/phpize.in.orig Fri Apr 1 15:42:47 2005 -+++ scripts/phpize.in Fri Apr 1 15:43:04 2005 -@@ -102,9 +102,9 @@ - - phpize_autotools() - { -- aclocal || exit 1 -- autoconf || exit 1 -- autoheader || exit 1 -+ aclocal15 || exit 1 -+ autoconf253 || exit 1 -+ autoheader253 || exit 1 - } - - # Main script |