<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/bd5a82bdc3ad487d6d9d9c7e365a73fa261941bc">https://github.com/macports/macports-ports/commit/bd5a82bdc3ad487d6d9d9c7e365a73fa261941bc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bd5a82bdc3ad487d6d9d9c7e365a73fa261941bc
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Dec 2 12:17:42 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> php74: Update to 7.4.13
</span>---
lang/php/Portfile | 86 +++++++++++-----------
lang/php/files/patch-php74-bison-re2c-version.diff | 8 +-
lang/php/files/patch-php74-iODBC.diff | 16 ++--
lang/php/files/patch-php74-implicit.diff | 16 ----
.../patch-php74-sapi-fpm-php-fpm.conf.in.diff | 6 +-
lang/php/files/patch-php74-unixODBC.diff | 16 ++--
6 files changed, 64 insertions(+), 84 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 e36f75314f8..8a232651bda 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;'>@@ -150,11 +150,11 @@ switch ${subport_branch} {
</span> }
7.4 {
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 7.4.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.4.13
</span> use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 73c684b5b1acdd296b471fd89d06cb205cfd57ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e82d2bcead05255f6b7d2ff4e2561bc334204955820cabc2457b5239fde96b76 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10311980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 ce0c280c209a53368b9ea784ba66be327d749485 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 aead303e3abac23106529560547baebbedba0bb2943b91d5aa08fff1f41680f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10319848
</span> }
8.0 {
# When this becomes a stable version, remove the overrides for homepage,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -220,14 +220,10 @@ if {[is_sapi_subport]} {
</span> patch.pre_args -p1
patchfiles-append patch-${php}-scripts-php-config.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} 7.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] == 0} {
</span> patchfiles-append \
patch-${php}-bison-re2c-version.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${branch} 7.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-${php}-implicit.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {[vercmp ${branch} 5.3] <= 0} {
patchfiles-append \
patch-${php}-configure.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -368,7 +364,7 @@ subport ${php} {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,7 +511,7 @@ subport ${php}-apache2handler {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -573,7 +569,7 @@ subport ${php}-cgi {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -613,7 +609,7 @@ subport ${php}-fpm {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -682,7 +678,7 @@ subport ${php}-calendar {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -702,7 +698,7 @@ subport ${php}-curl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -734,7 +730,7 @@ subport ${php}-dba {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -766,7 +762,7 @@ subport ${php}-enchant {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -811,7 +807,7 @@ subport ${php}-exif {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -832,7 +828,7 @@ subport ${php}-ftp {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -867,7 +863,7 @@ subport ${php}-gd {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -929,7 +925,7 @@ subport ${php}-gettext {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -955,7 +951,7 @@ subport ${php}-gmp {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -986,7 +982,7 @@ subport ${php}-iconv {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1012,7 +1008,7 @@ subport ${php}-imap {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1049,7 +1045,7 @@ subport ${php}-intl {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1092,7 +1088,7 @@ subport ${php}-ipc {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1114,7 +1110,7 @@ subport ${php}-ldap {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1150,7 +1146,7 @@ subport ${php}-mbstring {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1235,7 +1231,7 @@ subport ${php}-mysql {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1398,7 +1394,7 @@ subport ${php}-odbc {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1458,7 +1454,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 7.1.33 {revision 1}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1497,7 +1493,7 @@ subport ${php}-openssl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1551,7 +1547,7 @@ subport ${php}-oracle {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1589,7 +1585,7 @@ subport ${php}-pcntl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1618,7 +1614,7 @@ subport ${php}-posix {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1641,7 +1637,7 @@ subport ${php}-postgresql {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1769,7 +1765,7 @@ subport ${php}-pspell {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1795,7 +1791,7 @@ subport ${php}-snmp {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1821,7 +1817,7 @@ subport ${php}-soap {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1850,7 +1846,7 @@ subport ${php}-sockets {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1866,7 +1862,7 @@ subport ${php}-sodium {
</span> switch -- ${version} {
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1901,7 +1897,7 @@ subport ${php}-sqlite {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1949,7 +1945,7 @@ subport ${php}-tidy {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2008,7 +2004,7 @@ subport ${php}-xmlrpc {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2049,7 +2045,7 @@ subport ${php}-xsl {
</span> 7.1.33 {revision 0}
7.2.34 {revision 0}
7.3.25 {revision 0}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 7.4.12 {revision 0}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.13 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php74-bison-re2c-version.diff b/lang/php/files/patch-php74-bison-re2c-version.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index df06603d7d4..985d9a518fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php74-bison-re2c-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php74-bison-re2c-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> https://bugs.php.net/bug.php?id=78750
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.orig 2019-12-24 16:15:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure 2019-12-24 16:21:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5377,6 +5377,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.orig 2020-11-24 04:03:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2020-12-02 09:43:08.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5374,6 +5374,7 @@
</span> $as_echo_n "checking for bison version... " >&6; }
php_bison_version=$($YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | tr -d a-z)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ https://bugs.php.net/bug.php?id=78750
</span> ac_IFS=$IFS; IFS="."
set $php_bison_version
IFS=$ac_IFS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5474,6 +5475,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5471,6 +5472,7 @@
</span> $as_echo_n "checking for re2c version... " >&6; }
php_re2c_version=$($RE2C --version | cut -d ' ' -f 2 2>/dev/null)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php74-iODBC.diff b/lang/php/files/patch-php74-iODBC.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a3afeb033c..7beae37ebd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php74-iODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php74-iODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/odbc/config.m4 2015-04-17 20:15:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,6 +104,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2020-11-24 04:03:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2020-12-02 15:59:58.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>
+:<<'MACPORTS_DISABLED'
if test -z "$ODBC_TYPE"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH(adabas,,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -386,6 +387,7 @@
</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> fi
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php74-implicit.diff b/lang/php/files/patch-php74-implicit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e629e2cc48a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php74-implicit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.php.net/bug.php?id=80171
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.orig 2020-10-30 00:33:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure 2020-10-30 00:53:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83023,7 +83023,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts (dlerror ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit (status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php74-sapi-fpm-php-fpm.conf.in.diff b/lang/php/files/patch-php74-sapi-fpm-php-fpm.conf.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a6ff7df5ce..4e0afd89030 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php74-sapi-fpm-php-fpm.conf.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php74-sapi-fpm-php-fpm.conf.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sapi/fpm/php-fpm.conf.in.orig 2016-08-19 01:48:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sapi/fpm/php-fpm.conf.in 2016-08-20 10:16:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sapi/fpm/php-fpm.conf.in.orig 2020-11-24 04:03:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sapi/fpm/php-fpm.conf.in 2020-12-02 15:46:22.000000000 -0600
</span> @@ -14,14 +14,14 @@
; Pid file
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@
</span>
; Log level
; Possible Values: alert, error, warning, notice, debug
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,8 +77,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,8 +95,9 @@
</span> ; process.priority = -19
; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php74-unixODBC.diff b/lang/php/files/patch-php74-unixODBC.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b053ec7a0b7..c9b88cae0b2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php74-unixODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/files/patch-php74-unixODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/odbc/config.m4 2015-04-17 20:13:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -104,6 +104,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ext/odbc/config.m4.orig 2020-11-24 04:03:41.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2020-12-02 15:57:52.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>
+:<<'MACPORTS_DISABLED'
if test -z "$ODBC_TYPE"; then
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH(adabas,,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -446,6 +447,7 @@
</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> fi
fi
</pre><pre style='margin:0'>
</pre>