<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/985d9081eefd9771b7fe6154b38053544cc0d7c6">https://github.com/macports/macports-ports/commit/985d9081eefd9771b7fe6154b38053544cc0d7c6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 985d9081eefd9771b7fe6154b38053544cc0d7c6
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Sun Sep 29 21:04:25 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> php84: Update to 8.4.0RC1
</span>---
lang/php/Portfile | 82 ++++++++++++++++----------------
lang/php/files/patch-php84-iODBC.diff | 24 +++++-----
lang/php/files/patch-php84-unixODBC.diff | 24 +++++-----
3 files changed, 65 insertions(+), 65 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 85ceb2c1fd8..9ff8aefaf5b 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;'>@@ -196,14 +196,14 @@ switch ${subport_branch} {
</span> # When this becomes a stable version, remove the overrides for homepage,
# master_sites and livecheck, and update php.latest_stable_branch in the
# php-1.1 portgroup.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- epoch 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 8.4.0beta4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.4.0RC1
</span> homepage https://qa.php.net/
master_sites https://downloads.php.net/~saki/
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 101e9f6e023b5ec7eafb010b41057c73cfbcc70a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bafb6f5c10a0b34ed5f2ff28eb12bc4154ffef4c04534c03e993e1c951fb9d22 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 13459160
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 be0e3528c5e5551c06686f0c2fe42d57bc9ffe91 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0b3db6af3e0643e310c9c32b407faf4be6fe265c0f37c5b2fed911d6e9ab046e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 13510864
</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;'>@@ -473,7 +473,7 @@ subport ${php} {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -635,7 +635,7 @@ subport ${php}-apache2handler {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -700,7 +700,7 @@ subport ${php}-cgi {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -745,7 +745,7 @@ subport ${php}-fpm {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -819,7 +819,7 @@ subport ${php}-calendar {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -844,7 +844,7 @@ subport ${php}-curl {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -885,7 +885,7 @@ subport ${php}-dba {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -922,7 +922,7 @@ subport ${php}-enchant {
</span> 8.1.29 {revision 1}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -978,7 +978,7 @@ subport ${php}-exif {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -996,7 +996,7 @@ subport ${php}-ffi {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1029,7 +1029,7 @@ subport ${php}-ftp {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1068,7 +1068,7 @@ subport ${php}-gd {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1143,7 +1143,7 @@ subport ${php}-gettext {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1174,7 +1174,7 @@ subport ${php}-gmp {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1210,7 +1210,7 @@ subport ${php}-iconv {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1242,7 +1242,7 @@ subport ${php}-imap {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1285,7 +1285,7 @@ subport ${php}-intl {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1349,7 +1349,7 @@ subport ${php}-ipc {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1376,7 +1376,7 @@ subport ${php}-ldap {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1417,7 +1417,7 @@ subport ${php}-mbstring {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1509,7 +1509,7 @@ subport ${php}-mysql {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1742,7 +1742,7 @@ subport ${php}-odbc {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1807,7 +1807,7 @@ if {[vercmp ${branch} >= 5.5]} {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1868,7 +1868,7 @@ subport ${php}-openssl {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1927,7 +1927,7 @@ subport ${php}-oracle {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1971,7 +1971,7 @@ subport ${php}-pcntl {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2005,7 +2005,7 @@ subport ${php}-posix {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2033,7 +2033,7 @@ subport ${php}-postgresql {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2097,7 +2097,7 @@ subport ${php}-pspell {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2129,7 +2129,7 @@ subport ${php}-snmp {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2160,7 +2160,7 @@ subport ${php}-soap {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2199,7 +2199,7 @@ subport ${php}-sockets {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2220,7 +2220,7 @@ subport ${php}-sodium {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2260,7 +2260,7 @@ subport ${php}-sqlite {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2313,7 +2313,7 @@ subport ${php}-tidy {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2419,7 +2419,7 @@ subport ${php}-xsl {
</span> 8.1.29 {revision 0}
8.2.23 {revision 0}
8.3.11 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 8.4.0beta4 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.4.0RC1 {revision 0}
</span> }
categories-append textproc
<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><span style='display:block; white-space:pre;color:#808080;'>index ff43da7921f..b5f95c2b844 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php84-iODBC.diff
</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;'>@@ -1,18 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/odbc/config.m4.orig 2020-11-24 11:04:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/odbc/config.m4 2020-12-02 16:00:42.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,6 +99,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2024-09-24 10:59:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2024-09-30 03:06:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,6 +113,7 @@
</span> be defined.])],
[0x0350])
+:<<'MACPORTS_DISABLED'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH([adabas],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([[--with-adabas[=DIR]]],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,6 +315,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_VAR_IF([ODBC_TYPE],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([adabas],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [for Adabas support],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,6 +306,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span>
+MACPORTS_DISABLED
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH([iodbc],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--with-iodbc],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_VAR_IF([ODBC_TYPE],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([iodbc],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [whether to build with iODBC support],
</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><span style='display:block; white-space:pre;color:#808080;'>index 6f86edd9fd4..5454f6a365f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php84-unixODBC.diff
</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;'>@@ -1,18 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/odbc/config.m4.orig 2020-11-24 11:04:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/odbc/config.m4 2020-12-02 15:27:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,6 +99,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2024-09-24 10:59:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2024-09-30 03:04:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,6 +113,7 @@
</span> be defined.])],
[0x0350])
+:<<'MACPORTS_DISABLED'
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH([adabas],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([[--with-adabas[=DIR]]],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -355,6 +356,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_VAR_IF([ODBC_TYPE],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([adabas],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [for Adabas support],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -339,6 +340,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span>
+MACPORTS_DISABLED
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH([unixODBC],,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--with-unixODBC],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AS_VAR_IF([ODBC_TYPE],, [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_ARG_WITH([unixODBC],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [whether to build with unixODBC support],
</span></pre><pre style='margin:0'>
</pre>