<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/630fbd12af5faba8636eda9874aac6fd0f83a410">https://github.com/macports/macports-ports/commit/630fbd12af5faba8636eda9874aac6fd0f83a410</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 630fbd1 php: Add php74 version 7.4.1
</span>630fbd1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 630fbd12af5faba8636eda9874aac6fd0f83a410
</span>Author: Chris Minett <1084019+chrisminett@users.noreply.github.com>
AuthorDate: Fri Jan 17 22:22:40 2020 +0000
<span style='display:block; white-space:pre;color:#404040;'> php: Add php74 version 7.4.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There have been many changes in the build process in this version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://www.php.net/manual/en/migration74.other-changes.php
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The names of many configure flags were changed and pkg-config is now
</span><span style='display:block; white-space:pre;color:#404040;'> used to find many dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> PEAR is now off by default; no need to use --without-pear anymore.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The hash extension is now always on; no need to use --enable-hash.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The mbstring extension now uses MacPorts oniguruma6 instead of a bundled
</span><span style='display:block; white-space:pre;color:#404040;'> copy.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The wddx extension was moved from core to PECL but there are no releases
</span><span style='display:block; white-space:pre;color:#404040;'> there yet. It may be resurrected as a separate php-wddx port later.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Ryan Schmidt <ryandesign@macports.org>
</span>---
lang/php/Portfile | 255 +++++++++++++++++----
lang/php/files/patch-php74-bison-re2c-version.diff | 19 ++
lang/php/files/patch-php74-iODBC.diff | 18 ++
.../patch-php74-sapi-fpm-php-fpm.conf.in.diff | 39 ++++
.../files/patch-php74-scripts-php-config.in.diff | 11 +
lang/php/files/patch-php74-unixODBC.diff | 18 ++
lang/php/files/php74 | 6 +
7 files changed, 316 insertions(+), 50 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 edbc222..2866715 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
</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
</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;'>@@ -149,11 +149,19 @@ switch ${subport_branch} {
</span> size 12102012
}
7.4 {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.4.1
</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 7d426a5d88d4e698dc98fc42556455617dc1e897 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 561bb866bdd509094be00f4ece7c3543ec971c4d878645ee81437e291cffc762 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10245600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.5 {
</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.
epoch 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 7.4.0alpha1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 7.5.0alpha1
</span> homepage https://qa.php.net/
master_sites https://downloads.php.net/~cmb/
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,6 +218,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:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] >= 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}-bison-re2c-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {[vercmp ${branch} 5.3] <= 0} {
patchfiles-append \
patch-${php}-configure.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,9 +252,7 @@ if {[is_sapi_subport]} {
</span> --enable-ctype \
--enable-dom \
--enable-filter \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-hash \
</span> --enable-json \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-libxml \
</span> --enable-pdo \
--enable-session \
--enable-simplexml \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -252,13 +262,21 @@ if {[is_sapi_subport]} {
</span> --enable-xmlwriter \
--with-bz2=${prefix} \
--with-mhash=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pcre-regex=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libxml-dir=${prefix} \
</span> --with-zlib=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-pear \
</span> --disable-cgi \
--disable-cli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-hash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-libxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libxml-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pcre-regex=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-pear
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libxml \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-external-pcre=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Ensure we don't regenerate the parsers even if flex/re2c/bison are installed.
configure.env LEX=true \
RE2C=true \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,6 +362,7 @@ subport ${php} {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
depends_run port:php_select
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,7 +425,11 @@ subport ${php} {
</span> # is compatible with PHP's which means PHP can be distributable.
variant libedit conflicts readline description {Build readline extension using libedit library} {
depends_lib-append port:libedit port:ncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-libedit=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libedit=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libedit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant readline conflicts libedit description {Build readline extension using readline library} {
depends_lib-append port:ncurses port:readline
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -486,6 +509,7 @@ subport ${php}-apache2handler {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
description ${php} Apache 2 Handler SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -543,6 +567,7 @@ subport ${php}-cgi {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
description ${php} CGI SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -582,6 +607,7 @@ subport ${php}-fpm {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
description ${php} FPM SAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -650,6 +676,7 @@ subport ${php}-calendar {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
description a PHP extension for converting between different \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -669,6 +696,7 @@ subport ${php}-curl {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append net www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -679,8 +707,14 @@ subport ${php}-curl {
</span> long_description ${description}
depends_lib-append port:curl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-curl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-curl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-curl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport ${php}-dba {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -694,6 +728,7 @@ subport ${php}-dba {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -725,6 +760,7 @@ subport ${php}-enchant {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append textproc devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -734,9 +770,15 @@ subport ${php}-enchant {
</span> long_description ${name} is ${description}, a common API for many spell libraries.
depends_lib-append port:enchant
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-enchant=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-enchant=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-enchant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
set docdir ${prefix}/share/doc/${subport}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -763,6 +805,7 @@ subport ${php}-exif {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -783,6 +826,7 @@ subport ${php}-ftp {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -808,6 +852,7 @@ subport ${php}-gd {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -820,22 +865,34 @@ subport ${php}-gd {
</span> port:jpeg \
port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-${php}-ext-gd-config.m4.diff
</span>
if {[vercmp ${branch} 5.2] <= 0} {
patchfiles-append patch-${php}-jpeg-9.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-freetype-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jpeg-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-png-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-zlib-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-gd-native-ttf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-gd-native-ttf
</span>
if {[vercmp ${branch} 7.0] >= 0} {
depends_lib-append port:webp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-webp-dir=${prefix}
</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 {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-${php}-ext-gd-config.m4.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-freetype-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jpeg-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-png-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-zlib-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-webp-dir=${prefix}
</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;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-freetype \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-jpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-webp
</span> }
if {[vercmp ${branch} 7.0] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -857,6 +914,7 @@ subport ${php}-gettext {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -882,6 +940,7 @@ subport ${php}-gmp {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append devel math
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -912,6 +971,7 @@ subport ${php}-iconv {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -937,6 +997,7 @@ subport ${php}-imap {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append mail
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -953,6 +1014,13 @@ subport ${php}-imap {
</span> configure.args-append --with-imap=${prefix} \
--with-imap-ssl=${prefix} \
--with-kerberos=${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugs.php.net/bug.php?id=79112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append PHP_OPENSSL=yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {[vercmp ${branch} 5.3] >= 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -966,6 +1034,7 @@ subport ${php}-intl {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -999,6 +1068,7 @@ subport ${php}-ipc {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions shmop sysvmsg sysvsem sysvshm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1020,6 +1090,7 @@ subport ${php}-ldap {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append databases
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1032,9 +1103,16 @@ subport ${php}-ldap {
</span>
depends_lib-append port:openldap \
port:cyrus-sasl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-ldap=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-ldap-sasl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-ldap=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-ldap-sasl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-ldap-sasl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport ${php}-mbstring {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1048,6 +1126,7 @@ subport ${php}-mbstring {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1056,6 +1135,12 @@ subport ${php}-mbstring {
</span> encodings
long_description ${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:oniguruma6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {[vercmp ${branch} 7.2] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1126,6 +1211,7 @@ subport ${php}-mysql {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions mysqli pdo_mysql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1288,6 +1374,7 @@ subport ${php}-odbc {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions odbc pdo_odbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1303,18 +1390,30 @@ subport ${php}-odbc {
</span> depends_lib-append port:libiodbc
patchfiles-append patch-${php}-iODBC.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-iODBC=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pdo-odbc=iODBC,${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pdo-odbc=iODBC,${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-iODBC=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-iODBC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant unixodbc conflicts iodbc description {Use unixODBC} {
depends_lib-append port:unixODBC
patchfiles-append patch-${php}-unixODBC.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-unixODBC=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pdo-odbc=unixODBC,${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-pdo-odbc=unixODBC,${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-unixODBC=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-unixODBC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
if {![variant_isset iodbc] && ![variant_isset unixodbc]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1331,6 +1430,7 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions.zend opcache
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1346,7 +1446,9 @@ if {[vercmp ${branch} 5.5] >= 0} {
</span> post-destroot {
set docdir ${destroot}${prefix}/share/doc/${subport}
xinstall -d ${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${destroot.dir} -m 644 README ${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${destroot.dir} -m 644 README ${docdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1362,6 +1464,7 @@ subport ${php}-openssl {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1380,8 +1483,7 @@ subport ${php}-openssl {
</span> move ${php.build_dirs}/config0.m4 ${php.build_dirs}/config.m4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-kerberos=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-openssl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-kerberos=${prefix}
</span>
if {[vercmp ${branch} 5.6] <= 0} {
openssl.branch 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1395,7 +1497,13 @@ subport ${php}-openssl {
</span> reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/ext/openssl/config.m4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --with-openssl=${prefix} --with-openssl=shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openssl=shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openssl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openssl
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1410,6 +1518,7 @@ subport ${php}-oracle {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions oci8 pdo_oci
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1447,6 +1556,7 @@ subport ${php}-pcntl {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1475,6 +1585,7 @@ subport ${php}-posix {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1497,6 +1608,7 @@ subport ${php}-postgresql {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions pgsql pdo_pgsql
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1603,6 +1715,7 @@ subport ${php}-pspell {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1628,6 +1741,7 @@ subport ${php}-snmp {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append sysutils
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1653,6 +1767,7 @@ subport ${php}-soap {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1662,8 +1777,12 @@ subport ${php}-soap {
</span> long_description ${description}
depends_lib-append port:libxml2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-libxml-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libxml-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
subport ${php}-sockets {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1677,6 +1796,7 @@ subport ${php}-sockets {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1692,6 +1812,7 @@ subport ${php}-sodium {
</span> switch -- ${version} {
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions sodium
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1705,7 +1826,13 @@ subport ${php}-sodium {
</span>
depends_lib-append port:libsodium
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sodium=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sodium=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sodium
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1720,6 +1847,7 @@ subport ${php}-sqlite {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
php.extensions sqlite sqlite3 pdo_sqlite
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1741,10 +1869,18 @@ subport ${php}-sqlite {
</span> post-extract {
move ${worksrcpath}/ext/sqlite3/config0.m4 ${worksrcpath}/ext/sqlite3/config.m4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sqlite3=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pdo-sqlite=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-sqlite-utf8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-sqlite-utf8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sqlite3=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pdo-sqlite=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-sqlite3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pdo-sqlite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1759,6 +1895,7 @@ subport ${php}-tidy {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append www
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1777,6 +1914,8 @@ subport ${php}-tidy {
</span> configure.args-append --with-tidy=${prefix}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# wddx was evicted from PHP core in version 7.4
</span> subport ${php}-wddx {
switch -- ${version} {
5.2.17 {revision 0}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1802,6 +1941,7 @@ subport ${php}-wddx {
</span> configure.args-append --with-libexpat-dir=${prefix} \
--with-libxml-dir=${prefix}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
subport ${php}-xmlrpc {
switch -- ${version} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1814,6 +1954,7 @@ subport ${php}-xmlrpc {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1826,11 +1967,18 @@ subport ${php}-xmlrpc {
</span> port:libxml2
depends_lib-append port:expat
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-iconv-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libexpat-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libxml-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-iconv-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libexpat-dir=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libxml-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-expat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
configure.cppflags-append [exec ${prefix}/bin/xml2-config --cflags]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1847,6 +1995,7 @@ subport ${php}-xsl {
</span> 7.1.33 {revision 0}
7.2.26 {revision 0}
7.3.13 {revision 0}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7.4.1 {revision 0}
</span> }
categories-append textproc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1857,9 +2006,15 @@ subport ${php}-xsl {
</span> long_description ${description}
depends_lib-append port:libxslt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-xsl=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 7.4] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-xsl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-xsl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cppflags-append -I${prefix}/include/${php}/php/ext/dom
}
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..df06603
</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-php74-bison-re2c-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugs.php.net/bug.php?id=78750
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.orig 2019-12-24 16:15:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure 2019-12-24 16:21:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5377,6 +5377,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for bison version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php_bison_version=$($YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | tr -d a-z)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [ -z "$php_bison_version" ] && php_bison_version=0.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_IFS=$IFS; IFS="."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $php_bison_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IFS=$ac_IFS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5474,6 +5475,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for re2c version... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ php_re2c_version=$($RE2C --version | cut -d ' ' -f 2 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [ -z "$php_re2c_version" ] && php_re2c_version=0.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_IFS=$IFS; IFS="."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set $php_re2c_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IFS=$ac_IFS
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6a3afeb
</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-php74-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 2015-04-15 13:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2015-04-17 20:15:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,6 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ --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:#e0ffe0;'>+ 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;'>+
</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;'>+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -386,6 +387,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-php74-sapi-fpm-php-fpm.conf.in.diff b/lang/php/files/patch-php74-sapi-fpm-php-fpm.conf.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3a6ff7d
</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-php74-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 2016-08-19 01:48:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 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;'>+@@ -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;'>+@@ -77,8 +77,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-php74-scripts-php-config.in.diff b/lang/php/files/patch-php74-scripts-php-config.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0f4315b
</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-php74-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-php74-unixODBC.diff b/lang/php/files/patch-php74-unixODBC.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b053ec7
</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-php74-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 2015-04-15 13:05:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ext/odbc/config.m4 2015-04-17 20:13:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -104,6 +104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [ --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:#e0ffe0;'>+ 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;'>+
</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;'>+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -446,6 +447,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/php74 b/lang/php/files/php74
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4e55047
</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/php74
</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/php74
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/php-config74
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+bin/phpize74
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php74.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/php-config74.1.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+share/man/man1/phpize74.1.gz
</span></pre><pre style='margin:0'>
</pre>