<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7807e88ed4d421422237690b08a081517af32a9e">https://github.com/macports/macports-ports/commit/7807e88ed4d421422237690b08a081517af32a9e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7807e88 php4: remove files directory
</span>7807e88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7807e88ed4d421422237690b08a081517af32a9e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Tue May 7 08:44:24 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> php4: remove files directory
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/commit/fbe2ae61eb4d6b340cbc9493065e29565d98c7f9
</span>---
lang/php4/files/mod_php.conf | 6 -----
lang/php4/files/patch-ext-openssl-openssl.c.diff | 31 ------------------------
lang/php4/files/patch-ext-standard-string.c.diff | 12 ---------
lang/php4/files/patch-jpeg-9.diff | 22 -----------------
lang/php4/files/patch-scripts-php-config.in.diff | 11 ---------
5 files changed, 82 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php4/files/mod_php.conf b/lang/php4/files/mod_php.conf
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 90b03f3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php4/files/mod_php.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<IfModule mod_php4.c>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AddType application/x-httpd-php .php
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AddType application/x-httpd-php-source .phps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</IfModule>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php4/files/patch-ext-openssl-openssl.c.diff b/lang/php4/files/patch-ext-openssl-openssl.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 233d255..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php4/files/patch-ext-openssl-openssl.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php4/php4-openssl.patch?rev=1.1;content-type=text%2Fplain
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- php-4.4.9/ext/openssl/openssl.c.org 2010-04-11 08:09:20.114283832 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ php-4.4.9/ext/openssl/openssl.c 2010-04-11 08:08:40.851370731 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -179,8 +179,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char default_ssl_conf_filename[MAXPATHLEN];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct php_x509_request {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OPENSSL_VERSION_NUMBER >= 0x10000002L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LHASH_OF(CONF_VALUE) * global_config; /* Global SSL config */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LHASH_OF(CONF_VALUE) * req_config; /* SSL config for this request */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LHASH * global_config; /* Global SSL config */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LHASH * req_config; /* SSL config for this request */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const EVP_MD * md_alg;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const EVP_MD * digest;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char * section_name,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -340,7 +345,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char * section_label,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char * config_filename,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const char * section,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LHASH * config TSRMLS_DC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OPENSSL_VERSION_NUMBER >= 0x10000002L
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LHASH_OF(CONF_VALUE) * config TSRMLS_DC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LHASH * config TSRMLS_DC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X509V3_CTX ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php4/files/patch-ext-standard-string.c.diff b/lang/php4/files/patch-ext-standard-string.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 503cc12..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php4/files/patch-ext-standard-string.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/standard/string.c.orig 2007-12-31 01:22:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/standard/string.c 2010-06-02 01:41:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_LIBINTL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <libintl.h> /* for LC_MESSAGES */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #ifdef setlocale
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # undef setlocale /* Uh, libintl, don't F* our symbols please */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "scanf.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "zend_API.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php4/files/patch-jpeg-9.diff b/lang/php4/files/patch-jpeg-9.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3b06cb8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php4/files/patch-jpeg-9.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with unpatched jpeg 9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-zend.h from PHP 5.2 and earlier uses #include <mach-o/dyld.h> which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-provides definitions of TRUE and FALSE that conflict with the ones
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-jpeg 9 will define. So tell jpeg we've already defined them, and what
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-their type is.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PHP 5.3 and later aren't affected because they no longer #include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<mach-o/dyld.h>; see <https://bugs.php.net/bug.php?id=42630>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ext/gd/libgd/gd_jpeg.c.orig 2004-03-29 12:21:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ext/gd/libgd/gd_jpeg.c 2017-10-16 20:11:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* 1.8.1: remove dependency on jinclude.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef ENUM_DYLD_BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HAVE_BOOLEAN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef enum DYLD_BOOL boolean;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "jpeglib.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "jerror.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php4/files/patch-scripts-php-config.in.diff b/lang/php4/files/patch-scripts-php-config.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 99c08c1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php4/files/patch-scripts-php-config.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/scripts/php-config.in.orig 2005-03-16 00:37:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/scripts/php-config.in 2009-10-06 01:58:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prefix="@prefix@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version="@PHP_VERSION@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- includedir="@includedir@/php"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I@prefix@/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ldflags="@PHP_LDFLAGS@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libs="@EXTRA_LIBS@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extension_dir='@EXTENSION_DIR@'
</span></pre><pre style='margin:0'>
</pre>