<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b0ed618779c93d77b501c89e24745e93649776d5">https://github.com/macports/macports-ports/commit/b0ed618779c93d77b501c89e24745e93649776d5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b0ed618779c93d77b501c89e24745e93649776d5
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Jul 21 19:50:07 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> php84: New port, version 8.4.0alpha1
</span>---
_resources/port1.0/group/php-1.1.tcl | 2 +-
lang/php/Portfile | 54 +++++++++++++++++++---
lang/php/files/patch-php84-atomic.diff | 17 +++++++
...php84-conditional-Wno-implicit-fallthrough.diff | 38 +++++++++++++++
lang/php/files/patch-php84-iODBC.diff | 18 ++++++++
.../patch-php84-sapi-fpm-php-fpm.conf.in.diff | 39 ++++++++++++++++
.../files/patch-php84-scripts-php-config.in.diff | 11 +++++
lang/php/files/patch-php84-unixODBC.diff | 18 ++++++++
lang/php/files/php84 | 6 +++
9 files changed, 196 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/php-1.1.tcl b/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 235ab606cf9..68f0615d55b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/php-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ default categories php
</span> # built. For unified extension ports (name begins with "php-") setting
# php.branches is mandatory; there is no default. Example:
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
</span> #
# For unified ports, setting php.branches will create the subports.
#
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a50feb9d348..4049df1fc6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ long_description PHP is a widely-used general-purpose scripting \
</span> scripting.
# The list of PHP branches this port provides.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
</span>
# Fix for users specifying the subport name with the wrong case.
set subport [string tolower ${subport}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,11 +199,11 @@ switch ${subport_branch} {
</span> epoch 0
version 8.4.0alpha1
homepage https://qa.php.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://downloads.php.net/~eric/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://downloads.php.net/~saki/
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 8598a15b2acb35e1ae76df514179982ce2c3eb0e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1e7b5dcfebc4921ec44209c1e08ae71b6b10e5b1b6b895bb4f76b44486c705ed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12438800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 837665fad05f5d4d96abf0da9e23b2ee31bee053 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13351016
</span> livecheck.url ${homepage}
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -470,6 +470,7 @@ subport ${php} {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -631,6 +632,7 @@ subport ${php}-apache2handler {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -695,6 +697,7 @@ subport ${php}-cgi {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -739,6 +742,7 @@ subport ${php}-fpm {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -812,6 +816,7 @@ subport ${php}-calendar {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -836,6 +841,7 @@ subport ${php}-curl {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -876,6 +882,7 @@ subport ${php}-dba {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -912,6 +919,7 @@ subport ${php}-enchant {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -965,6 +973,7 @@ subport ${php}-exif {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -982,6 +991,7 @@ subport ${php}-ffi {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1014,6 +1024,7 @@ subport ${php}-ftp {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1052,6 +1063,7 @@ subport ${php}-gd {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1126,6 +1138,7 @@ subport ${php}-gettext {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1156,6 +1169,7 @@ subport ${php}-gmp {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1191,6 +1205,7 @@ subport ${php}-iconv {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1205,6 +1220,7 @@ subport ${php}-iconv {
</span> configure.args-append --with-iconv=${prefix}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${branch} < 8.4]} {
</span> subport ${php}-imap {
switch -- ${version} {
5.2.17 {revision 0}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1221,6 +1237,7 @@ subport ${php}-imap {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1245,6 +1262,7 @@ subport ${php}-imap {
</span> configure.env-append PHP_OPENSSL=yes
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
if {[vercmp ${branch} >= 5.3]} {
subport ${php}-intl {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1262,6 +1280,7 @@ subport ${php}-intl {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1325,6 +1344,7 @@ subport ${php}-ipc {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1351,6 +1371,7 @@ subport ${php}-ldap {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1391,6 +1412,7 @@ subport ${php}-mbstring {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1482,6 +1504,7 @@ subport ${php}-mysql {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1714,6 +1737,7 @@ subport ${php}-odbc {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1778,6 +1802,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1808,7 +1833,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> legacysupport.newest_darwin_requires_legacy 15
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} >= 8.1]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} >= 8.1] && [vercmp ${branch} < 8.4]} {
</span> patchfiles-append patch-${php}-opcache.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1838,6 +1863,7 @@ subport ${php}-openssl {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1879,6 +1905,7 @@ subport ${php}-openssl {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${branch} < 8.4]} {
</span> subport ${php}-oracle {
switch -- ${version} {
5.2.17 {revision 0}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1895,6 +1922,7 @@ subport ${php}-oracle {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1920,6 +1948,7 @@ subport ${php}-oracle {
</span> --with-pdo-oci=instantclient,${lib_dir},${library_version}
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
subport ${php}-pcntl {
switch -- ${version} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1937,6 +1966,7 @@ subport ${php}-pcntl {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1970,6 +2000,7 @@ subport ${php}-posix {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1997,6 +2028,7 @@ subport ${php}-postgresql {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2127,6 +2159,7 @@ subport ${php}-postgresql {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${branch} < 8.4]} {
</span> subport ${php}-pspell {
switch -- ${version} {
5.2.17 {revision 0}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2143,6 +2176,7 @@ subport ${php}-pspell {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2156,6 +2190,7 @@ subport ${php}-pspell {
</span>
configure.args-append --with-pspell=${prefix}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
subport ${php}-snmp {
switch -- ${version} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2173,6 +2208,7 @@ subport ${php}-snmp {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2203,6 +2239,7 @@ subport ${php}-soap {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2241,6 +2278,7 @@ subport ${php}-sockets {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2261,6 +2299,7 @@ subport ${php}-sodium {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2300,6 +2339,7 @@ subport ${php}-sqlite {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2352,6 +2392,7 @@ subport ${php}-tidy {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2457,6 +2498,7 @@ subport ${php}-xsl {
</span> 8.1.29 {revision 0}
8.2.21 {revision 0}
8.3.9 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php84-atomic.diff b/lang/php/files/patch-php84-atomic.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0bec0ecb7b2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php84-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: address argument to atomic operation must be a pointer to non-const _Atomic type ('const _Atomic(bool) *' invalid)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/8881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/11931
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_atomic.h.orig 2024-02-13 09:41:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_atomic.h 2024-03-03 17:16:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Builtins are used to avoid library linkage */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __has_feature(c_atomic) && defined(__clang__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __has_feature(c_atomic) && defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201710L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_C11_ATOMICS 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif ZEND_GCC_PREREQ(4, 7)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HAVE_GNUC_ATOMICS 1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php84-conditional-Wno-implicit-fallthrough.diff b/lang/php/files/patch-php84-conditional-Wno-implicit-fallthrough.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..243fac041a8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php84-conditional-Wno-implicit-fallthrough.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add -Wno-implicit-fallthrough conditionally.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/issues/13330
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/pull/13331
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/date/config0.m4 2024-07-02 08:43:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/date/config0.m4 2024-07-21 23:23:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,7 +4,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check for strtoll, atoll
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_FUNCS([strtoll atoll])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_DATE_CFLAGS="-Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/hash/config.m4 2024-07-02 08:43:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/hash/config.m4 2024-07-21 23:17:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHA3_DIR="sha3/generic32lc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Add -Wno-implicit-fallthrough flag as it happens on 32 bit builds
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_HASH_CFLAGS="-Wno-implicit-fallthrough"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_HASH_CFLAGS="-Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([yes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHA3_DIR="sha3/generic64lc"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ext/pcre/config0.m4 2024-07-02 08:43:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ext/pcre/config0.m4 2024-07-21 23:19:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -66,7 +66,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c pcre2lib/pcre2_substring.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough -DHAVE_CONFIG_H -DHAVE_MEMMOVE -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [PHP_PCRE_CFLAGS="-Wno-implicit-fallthrough"],,[-Werror])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -DHAVE_MEMMOVE -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE(PCRE2_CODE_UNIT_WIDTH, 8, [ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php84-iODBC.diff b/lang/php/files/patch-php84-iODBC.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ff43da7921f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php84-iODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2020-11-24 11:04:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2020-12-02 16:00:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,6 +99,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be defined.])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [0x0350])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++:<<'MACPORTS_DISABLED'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([adabas],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([[--with-adabas[=DIR]]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,6 +315,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACPORTS_DISABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([iodbc],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([--with-iodbc],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php84-sapi-fpm-php-fpm.conf.in.diff b/lang/php/files/patch-php84-sapi-fpm-php-fpm.conf.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..acdfeb5cce5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php84-sapi-fpm-php-fpm.conf.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sapi/fpm/php-fpm.conf.in.orig 2020-11-24 11:04:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sapi/fpm/php-fpm.conf.in 2020-12-02 15:27:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,14 +14,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Pid file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Default Value: none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-;pid = run/php-fpm.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++;pid = run/@PHP@/php-fpm.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Error log file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; If it's set to "syslog", log is sent to syslogd instead of being written
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; into a local file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Default Value: log/php-fpm.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-;error_log = log/php-fpm.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++error_log = log/@PHP@/php-fpm.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; syslog_facility is used to specify what type of program is logging the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; message. This lets syslogd specify that messages from different facilities
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; instances running on the same server, you can change the default value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; which must suit common needs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Default Value: php-fpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-;syslog.ident = php-fpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++syslog.ident = @PHP@-fpm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Log level
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Possible Values: alert, error, warning, notice, debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,8 +95,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; process.priority = -19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++; or for use with launchd.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Default Value: yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-;daemonize = yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++daemonize = no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Set open file descriptor rlimit for the master process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; Default Value: system defined value
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php84-scripts-php-config.in.diff b/lang/php/files/patch-php84-scripts-php-config.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f65e9a7671e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php84-scripts-php-config.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/scripts/php-config.in.orig 2024-07-02 08:43:13.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/php-config.in 2024-07-21 19:58:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vernum="@PHP_VERSION_ID@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_dir="@includedir@/php"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_dir="@orig_libdir@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++includes="-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I@prefix@/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ldflags="@PHP_LDFLAGS@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libs="@EXTRA_LIBS@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extension_dir="@EXTENSION_DIR@"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php84-unixODBC.diff b/lang/php/files/patch-php84-unixODBC.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6f86edd9fd4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php84-unixODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2020-11-24 11:04:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2020-12-02 15:27:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,6 +99,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ be defined.])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [0x0350])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++:<<'MACPORTS_DISABLED'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([adabas],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([[--with-adabas[=DIR]]],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -355,6 +356,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MACPORTS_DISABLED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([unixODBC],,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [AS_HELP_STRING([--with-unixODBC],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/php84 b/lang/php/files/php84
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a801167a9eb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/php84
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/php84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/php-config84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/phpize84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php84.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php-config84.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/phpize84.1.gz
</span></pre><pre style='margin:0'>
</pre>