<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/100ea06b4d7fdda0cea40e814d9e18b23dfc83d5">https://github.com/macports/macports-ports/commit/100ea06b4d7fdda0cea40e814d9e18b23dfc83d5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 100ea06b4d7fdda0cea40e814d9e18b23dfc83d5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jun 20 01:02:08 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> php83: New subports, version 8.3.0alpha1
</span>---
lang/php/Portfile | 46 +++++++++++--
lang/php/files/patch-php83-atomic.diff | 76 ++++++++++++++++++++++
lang/php/files/patch-php83-iODBC.diff | 18 +++++
.../patch-php83-sapi-fpm-php-fpm.conf.in.diff | 39 +++++++++++
.../files/patch-php83-scripts-php-config.in.diff | 11 ++++
lang/php/files/patch-php83-unixODBC.diff | 18 +++++
lang/php/files/php83 | 6 ++
7 files changed, 209 insertions(+), 5 deletions(-)
<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 fa39f12509c..cbf49053b0a 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
</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
</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;'>@@ -191,11 +191,11 @@ switch ${subport_branch} {
</span> epoch 0
version 8.3.0alpha1
homepage https://qa.php.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites https://downloads.php.net/~pierrick/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://downloads.php.net/~jakub/
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 c3a0bd282473ef01e805502fe2adc649048c993b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7df01cbae615cccdc01a811094a74326119080e1141988fd57aeefd6b751165c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12276384
</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;'>@@ -437,6 +437,7 @@ subport ${php} {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,6 +598,7 @@ subport ${php}-apache2handler {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -664,6 +666,7 @@ subport ${php}-cgi {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -707,6 +710,7 @@ subport ${php}-fpm {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -779,6 +783,7 @@ subport ${php}-calendar {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -802,6 +807,7 @@ subport ${php}-curl {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -841,6 +847,7 @@ subport ${php}-dba {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -876,6 +883,7 @@ subport ${php}-enchant {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -928,6 +936,7 @@ subport ${php}-exif {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -944,6 +953,7 @@ subport ${php}-ffi {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -975,6 +985,7 @@ subport ${php}-ftp {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1012,6 +1023,7 @@ subport ${php}-gd {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1077,6 +1089,7 @@ subport ${php}-gettext {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1106,6 +1119,7 @@ subport ${php}-gmp {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1140,6 +1154,7 @@ subport ${php}-iconv {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1169,6 +1184,7 @@ subport ${php}-imap {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1209,6 +1225,7 @@ subport ${php}-intl {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1271,6 +1288,7 @@ subport ${php}-ipc {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1296,6 +1314,7 @@ subport ${php}-ldap {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1335,6 +1354,7 @@ subport ${php}-mbstring {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1425,6 +1445,7 @@ subport ${php}-mysql {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1620,6 +1641,7 @@ subport ${php}-odbc {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1683,6 +1705,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1738,6 +1761,7 @@ subport ${php}-openssl {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1794,6 +1818,7 @@ subport ${php}-oracle {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1835,6 +1860,7 @@ subport ${php}-pcntl {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1867,6 +1893,7 @@ subport ${php}-posix {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1893,6 +1920,7 @@ subport ${php}-postgresql {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2038,6 +2066,7 @@ subport ${php}-pspell {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2067,6 +2096,7 @@ subport ${php}-snmp {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2096,6 +2126,7 @@ subport ${php}-soap {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2128,6 +2159,7 @@ subport ${php}-sockets {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2147,6 +2179,7 @@ subport ${php}-sodium {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2185,6 +2218,7 @@ subport ${php}-sqlite {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2236,6 +2270,7 @@ subport ${php}-tidy {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2340,6 +2375,7 @@ subport ${php}-xsl {
</span> 8.0.29 {revision 0}
8.1.20 {revision 0}
8.2.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.3.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php83-atomic.diff b/lang/php/files/patch-php83-atomic.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..817caa82754
</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-php83-atomic.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,76 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://github.com/php/php-src/issues/8881
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Based on https://github.com/php/php-src/commit/f33d6cfb98790c7e38d8cdd5b343f42180064698.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_atomic.c.orig 2022-11-22 12:07:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_atomic.c 2022-12-06 14:46:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,13 +35,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_atomic_bool_store_ex(obj, desired);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ZEND_WIN32) || defined(HAVE_SYNC_ATOMICS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* On these platforms it is non-const due to underlying APIs. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ZEND_API bool zend_atomic_bool_load(zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return zend_atomic_bool_load_ex(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZEND_API bool zend_atomic_bool_load(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return zend_atomic_bool_load_ex(obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Zend/zend_atomic.h.orig 2022-11-22 12:07:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Zend/zend_atomic.h 2022-12-06 14:48:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,10 +70,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return InterlockedExchange8(&obj->value, desired);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* On this platform it is non-const due to Iterlocked API*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static zend_always_inline bool zend_atomic_bool_load_ex(zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Or'ing with false won't change the value. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return InterlockedOr8(&obj->value, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return InterlockedOr8(&((zend_atomic_bool *) obj)->value, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static zend_always_inline void zend_atomic_bool_store_ex(zend_atomic_bool *obj, bool desired) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,7 +88,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return __c11_atomic_load(&obj->value, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __c11_atomic_load(&((zend_atomic_bool *) obj)->value, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static zend_always_inline void zend_atomic_bool_store_ex(zend_atomic_bool *obj, bool desired) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool prev = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __atomic_load(&obj->value, &prev, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ __atomic_load(&((zend_atomic_bool *) obj)->value, &prev, __ATOMIC_SEQ_CST);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return prev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -130,9 +129,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return prev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static zend_always_inline bool zend_atomic_bool_load_ex(zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static zend_always_inline bool zend_atomic_bool_load_ex(const zend_atomic_bool *obj) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Or'ing false won't change the value */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return __sync_fetch_and_or(&obj->value, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return __sync_fetch_and_or(&((zend_atomic_bool *) obj)->value, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static zend_always_inline void zend_atomic_bool_store_ex(zend_atomic_bool *obj, bool desired) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,12 +166,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZEND_API bool zend_atomic_bool_exchange(zend_atomic_bool *obj, bool desired);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZEND_API void zend_atomic_bool_store(zend_atomic_bool *obj, bool desired);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(ZEND_WIN32) || defined(HAVE_SYNC_ATOMICS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* On these platforms it is non-const due to underlying APIs. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ZEND_API bool zend_atomic_bool_load(zend_atomic_bool *obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ZEND_API bool zend_atomic_bool_load(const zend_atomic_bool *obj);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ END_EXTERN_C()
</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-php83-iODBC.diff b/lang/php/files/patch-php83-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-php83-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-php83-sapi-fpm-php-fpm.conf.in.diff b/lang/php/files/patch-php83-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-php83-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-php83-scripts-php-config.in.diff b/lang/php/files/patch-php83-scripts-php-config.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0f4315bbbb7
</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-php83-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 2011-05-15 01:09:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/php-config.in 2011-10-04 05:45:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version="@PHP_VERSION@"
</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;'>+-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-php83-unixODBC.diff b/lang/php/files/patch-php83-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-php83-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/php83 b/lang/php/files/php83
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dd66351cc5a
</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/php83
</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/php83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/php-config83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/phpize83
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php83.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php-config83.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/phpize83.1.gz
</span></pre><pre style='margin:0'>
</pre>