<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/1ec146267e9b2168703dc99f92641f218bdfaca4">https://github.com/macports/macports-ports/commit/1ec146267e9b2168703dc99f92641f218bdfaca4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1ec146267e9 php81: New subports, version 8.1.0alpha1
</span>1ec146267e9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1ec146267e9b2168703dc99f92641f218bdfaca4
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Jun 14 05:34:47 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> php81: New subports, version 8.1.0alpha1
</span>---
lang/php/Portfile | 60 +++++++++++++++++++++-
lang/php/files/patch-php81-configure.diff | 13 +++++
lang/php/files/patch-php81-iODBC.diff | 18 +++++++
.../patch-php81-main-streams-plain_wrapper.c.diff | 15 ++++++
.../patch-php81-sapi-fpm-php-fpm.conf.in.diff | 39 ++++++++++++++
.../files/patch-php81-scripts-php-config.in.diff | 11 ++++
lang/php/files/patch-php81-scripts-phpize.m4.diff | 28 ++++++++++
lang/php/files/patch-php81-unixODBC.diff | 18 +++++++
lang/php/files/php81 | 6 +++
9 files changed, 206 insertions(+), 2 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 f066ac416f4..ba1ad7de1fc 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;'>@@ -21,7 +21,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
</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
</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;'>@@ -171,6 +171,21 @@ switch ${subport_branch} {
</span> epoch 0
version 8.1.0alpha1
homepage https://qa.php.net/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites https://downloads.php.net/~patrickallaert/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5475f5bd2665578c73cca4f811f57bfa31a3ff7b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 131a81ef9e0d62ba3b5ed81d530a4ff38d256ff12acec243d6afb5b39a85cb79 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11237796
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.2 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # When this becomes a stable version, remove the overrides for homepage,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # master_sites and livecheck, and update php.latest_stable_branch in the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # php-1.1 portgroup.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 8.2.0alpha1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ homepage https://qa.php.net/
</span> master_sites https://downloads.php.net/~carusogabriel/
use_xz yes
checksums rmd160 0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,7 +216,7 @@ if {[vercmp ${major} 5] > 0} {
</span> dist_subdir php${major}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp ${branch} 8.0] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${branch} 8.0] >= 0} {
</span> # https://bugs.php.net/80197
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -244,6 +259,12 @@ 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:#e0ffe0;'>+ if {[vercmp ${branch} 8.1] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-${php}-configure.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-${php}-main-streams-plain_wrapper.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-${php}-scripts-phpize.m4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[vercmp ${branch} 7.0] >= 0 && [vercmp ${branch} 7.2] <= 0} {
patchfiles-append \
patch-${php}-implicit.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -414,6 +435,7 @@ subport ${php} {
</span> 7.3.28 {revision 1}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -564,6 +586,7 @@ subport ${php}-apache2handler {
</span> 7.3.28 {revision 1}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -629,6 +652,7 @@ subport ${php}-cgi {
</span> 7.3.28 {revision 1}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -670,6 +694,7 @@ subport ${php}-fpm {
</span> 7.3.28 {revision 1}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -740,6 +765,7 @@ subport ${php}-calendar {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -761,6 +787,7 @@ subport ${php}-curl {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -798,6 +825,7 @@ subport ${php}-dba {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -831,6 +859,7 @@ subport ${php}-enchant {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -881,6 +910,7 @@ subport ${php}-exif {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -903,6 +933,7 @@ subport ${php}-ftp {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -939,6 +970,7 @@ subport ${php}-gd {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1002,6 +1034,7 @@ subport ${php}-gettext {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1029,6 +1062,7 @@ subport ${php}-gmp {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1061,6 +1095,7 @@ subport ${php}-iconv {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1088,6 +1123,7 @@ subport ${php}-imap {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1126,6 +1162,7 @@ subport ${php}-intl {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1170,6 +1207,7 @@ subport ${php}-ipc {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1193,6 +1231,7 @@ subport ${php}-ldap {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1230,6 +1269,7 @@ subport ${php}-mbstring {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1316,6 +1356,7 @@ subport ${php}-mysql {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1472,6 +1513,7 @@ subport ${php}-odbc {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1533,6 +1575,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1579,6 +1622,7 @@ subport ${php}-openssl {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1634,6 +1678,7 @@ subport ${php}-oracle {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1673,6 +1718,7 @@ subport ${php}-pcntl {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1703,6 +1749,7 @@ subport ${php}-posix {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1727,6 +1774,7 @@ subport ${php}-postgresql {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1856,6 +1904,7 @@ subport ${php}-pspell {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1883,6 +1932,7 @@ subport ${php}-snmp {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1910,6 +1960,7 @@ subport ${php}-soap {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1940,6 +1991,7 @@ subport ${php}-sockets {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1957,6 +2009,7 @@ subport ${php}-sodium {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1993,6 +2046,7 @@ subport ${php}-sqlite {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2042,6 +2096,7 @@ subport ${php}-tidy {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2144,6 +2199,7 @@ subport ${php}-xsl {
</span> 7.3.28 {revision 0}
7.4.20 {revision 0}
8.0.7 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8.1.0alpha1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php81-configure.diff b/lang/php/files/patch-php81-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..448dae68cc1
</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-php81-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix building opcache extension with phpize.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/bug.php?id=81136
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/a297c66cfbfecdeeee83d9a08e049839d8f34423
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure 2021-06-08 11:24:50.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2021-06-14 05:09:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93599,6 +93599,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for header_file in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_call_graph.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_cfg.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zend_dfg.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_dump.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_func_info.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zend_inference.h \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php81-iODBC.diff b/lang/php/files/patch-php81-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-php81-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-php81-main-streams-plain_wrapper.c.diff b/lang/php/files/patch-php81-main-streams-plain_wrapper.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0fd40bab771
</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-php81-main-streams-plain_wrapper.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix building on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/bug.php?id=81130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/e69729f2ba02ddc26c70b4bd88ef86c0a2277bdc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/main/streams/plain_wrapper.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/main/streams/plain_wrapper.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,6 +60,9 @@ extern int php_get_gid_by_name(const char *name, gid_t *gid);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define PLAIN_WRAP_BUF_SIZE(st) (st)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if !defined(HAVE_FDATASYNC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define fdatasync fsync
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // The symbol is present, however not in the headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern int fdatasync(int);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</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;color:#808080;'>diff --git a/lang/php/files/patch-php81-sapi-fpm-php-fpm.conf.in.diff b/lang/php/files/patch-php81-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-php81-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-php81-scripts-php-config.in.diff b/lang/php/files/patch-php81-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-php81-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-php81-scripts-phpize.m4.diff b/lang/php/files/patch-php81-scripts-phpize.m4.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7a3311dc2dc
</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-php81-scripts-phpize.m4.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix building opcache extension with phpize.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/bug.php?id=81133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/php/php-src/commit/edc0d76a9d2f9a9e14630efdabacf09dd37a9609
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/scripts/phpize.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/scripts/phpize.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,6 +170,14 @@ CXXFLAGS_CLEAN='$(CXXFLAGS)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$prefix" = "NONE" && prefix="/usr/local"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "$exec_prefix" = "NONE" && exec_prefix='$(prefix)'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "$cross_compiling" = yes ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_CHECKING(for native build C compiler)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_CHECK_PROGS(BUILD_CC, [gcc clang c99 c89 cc cl],none)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT($BUILD_CC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BUILD_CC=$CC
</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;'>+ PHP_SUBST(PHP_MODULES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SUBST(PHP_ZEND_EX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,6 +210,7 @@ PHP_SUBST(SHARED_LIBTOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SUBST(LIBTOOL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SUBST(SHELL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_SUBST(INSTALL_HEADERS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PHP_SUBST(BUILD_CC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_GEN_BUILD_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PHP_GEN_GLOBAL_MAKEFILE
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php81-unixODBC.diff b/lang/php/files/patch-php81-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-php81-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/php81 b/lang/php/files/php81
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f4dfa298189
</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/php81
</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/php81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/php-config81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/phpize81
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php81.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php-config81.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/phpize81.1.gz
</span></pre><pre style='margin:0'>
</pre>