Skip to content

Commit cc80f97

Browse files
BjarneDMBjarneDM
committed
php85: new subport branch 8.5.0RC5
On branch php84 Changes to be committed: Core 8.5.0RC5 modified: lang/php/Portfile new file: lang/php/files/patch-php85-atomic.diff new file: lang/php/files/patch-php85-iODBC.diff new file: lang/php/files/patch-php85-sapi-fpm-php-fpm.conf.in.diff new file: lang/php/files/patch-php85-scripts-php-config.in.diff new file: lang/php/files/patch-php85-unixODBC.diff new file: lang/php/files/patch-php85-zend_string_equal_val.diff new file: lang/php/files/php85 find php -name Portfile \ | xargs -n 1 sed -i '' -E -e 's/^(php.branches .*8.4)$/\1 8.5/' remicollet/remirepo#307 Extensions that have been patched: php-memcache : patches for zend_smart_string php-jsmin : patch for zend_smart_string php-imagick : patch for zend_smart_string php-gmagick : patched for php >= 8.5 php-igbinary : patched for php >= 8.5 php-gearman : patched for php >= 8.5 php-amqp : patched for php >= 8.5 php-svm : patched for php >= 8.5 php-stomp : patched for php >= 8.5 Extensions that presently fail to install: modified: php/php-openswoole/Portfile modified: php/php-swoole/Portfile swoole/swoole-src#5898 modified: php/php-rar/Portfile modified: php/php-rrd/Portfile modified: php/php-solr/Portfile modified: php/php-xdebug/Portfile xdebug/xdebug#1032 Extensioan that presently install modified: devel/xapian-core/Portfile modified: php/php-APCu/Portfile modified: php/php-dbase/Portfile modified: php/php-event/Portfile modified: php/php-geoip/Portfile modified: php/php-imap/Portfile modified: php/php-lzf/Portfile modified: php/php-mailparse/Portfile modified: php/php-maxminddb/Portfile modified: php/php-mcrypt/Portfile modified: php/php-meminfo/Portfile modified: php/php-memcached/Portfile modified: php/php-mongodb/Portfile modified: php/php-mysql_xdevapi/Portfile modified: php/php-oauth/Portfile modified: php/php-pcov/Portfile modified: php/php-pspell/Portfile modified: php/php-psr/Portfile modified: php/php-raphf/Portfile modified: php/php-redis/Portfile modified: php/php-scrypt/Portfile modified: php/php-sqlsrv/Portfile modified: php/php-ssh2/Portfile modified: php/php-timezonedb/Portfile modified: php/php-uploadprogress/Portfile modified: php/php-uuid/Portfile modified: php/php-vld/Portfile modified: php/php-xhprof/Portfile modified: php/php-xmlrpc/Portfile modified: php/php-yaf/Portfile modified: php/php-yaz/Portfile modified: php/php-yaml/Portfile modified: php/php-zip/Portfile modified: php/php-zstd/Portfile
1 parent a800b79 commit cc80f97

File tree

52 files changed

+311
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+311
-62
lines changed

‎devel/xapian-core/Portfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ foreach v {5.28 5.30 5.32 5.34 5.36 5.38} {
149149
}
150150

151151
# PHP
152-
foreach v {8.0 8.1 8.2 8.3 8.4} {
152+
foreach v {8.0 8.1 8.2 8.3 8.4 8.5} {
153153
set v_no_dot [string map {. {}} ${v}]
154154
set php php${v_no_dot}
155155
subport ${php}-xapian "

‎lang/php/Portfile‎

Lines changed: 68 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ long_description PHP is a widely-used general-purpose scripting \
2626
categories lang php
2727

2828
# The list of PHP branches this port provides.
29-
php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
29+
php.branches 5.2 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4 8.5
3030

3131
# Fix for users specifying the subport name with the wrong case.
3232
set subport [string tolower ${subport}]
@@ -200,15 +200,30 @@ switch ${subport_branch} {
200200
checksums rmd160 b0cdcd4290d990389088e114a2e5e843d7a38e15 \
201201
sha256 bac90ee7cf738e814c89b6b27d4d2c4b70e50942a420837e1a22f5fd5f9867a3 \
202202
size 13643936
203+
}
204+
8.5 {
205+
# When this becomes a stable version, remove the overrides for homepage,
206+
# master_sites and livecheck, and update php.latest_stable_branch in the
207+
# php-1.1 portgroup.
208+
epoch 0
209+
version 8.5.0RC5
210+
homepage https://qa.php.net/
211+
master_sites https://downloads.php.net/~daniels/
212+
use_xz yes
213+
checksums rmd160 5f073aa7112c483ffdfd295f7f5e44fec178f606 \
214+
sha256 4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954 \
215+
size 14311848
203216

217+
livecheck.url ${homepage}
218+
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
204219
}
205220
}
206-
# 8.5 {
221+
# 8.6 {
207222
# # When this becomes a stable version, remove the overrides for homepage,
208223
# # master_sites and livecheck, and update php.latest_stable_branch in the
209224
# # php-1.1 portgroup.
210225
# epoch 1
211-
# version 8.5.0RC1
226+
# version 8.6.0RC1
212227
# homepage https://qa.php.net/
213228
# master_sites https://downloads.php.net/~saki/
214229
# use_xz yes
@@ -504,6 +519,7 @@ subport ${php} {
504519
8.2.29 {revision 0}
505520
8.3.27 {revision 0}
506521
8.4.14 {revision 0}
522+
8.5.0RC5 {revision 0}
507523
}
508524

509525
depends_run port:php_select
@@ -669,6 +685,7 @@ subport ${php}-apache2handler {
669685
8.2.29 {revision 0}
670686
8.3.27 {revision 0}
671687
8.4.14 {revision 0}
688+
8.5.0RC5 {revision 0}
672689
}
673690

674691
description ${php} Apache 2 Handler SAPI
@@ -734,6 +751,7 @@ subport ${php}-cgi {
734751
8.2.29 {revision 0}
735752
8.3.27 {revision 0}
736753
8.4.14 {revision 0}
754+
8.5.0RC5 {revision 0}
737755
}
738756

739757
description ${php} CGI SAPI
@@ -779,6 +797,7 @@ subport ${php}-fpm {
779797
8.2.29 {revision 0}
780798
8.3.27 {revision 0}
781799
8.4.14 {revision 0}
800+
8.5.0RC5 {revision 0}
782801
}
783802

784803
description ${php} FPM SAPI
@@ -853,6 +872,7 @@ subport ${php}-calendar {
853872
8.2.29 {revision 0}
854873
8.3.27 {revision 0}
855874
8.4.14 {revision 0}
875+
8.5.0RC5 {revision 0}
856876
}
857877

858878
description a PHP extension for converting between different \
@@ -878,6 +898,7 @@ subport ${php}-curl {
878898
8.2.29 {revision 0}
879899
8.3.27 {revision 0}
880900
8.4.14 {revision 0}
901+
8.5.0RC5 {revision 0}
881902
}
882903

883904
categories-append net www
@@ -919,6 +940,7 @@ subport ${php}-dba {
919940
8.2.29 {revision 0}
920941
8.3.27 {revision 0}
921942
8.4.14 {revision 0}
943+
8.5.0RC5 {revision 0}
922944
}
923945

924946
categories-append databases
@@ -956,6 +978,7 @@ subport ${php}-enchant {
956978
8.2.29 {revision 0}
957979
8.3.27 {revision 0}
958980
8.4.14 {revision 0}
981+
8.5.0RC5 {revision 0}
959982
}
960983

961984
categories-append textproc devel
@@ -1012,6 +1035,7 @@ subport ${php}-exif {
10121035
8.2.29 {revision 0}
10131036
8.3.27 {revision 0}
10141037
8.4.14 {revision 0}
1038+
8.5.0RC5 {revision 0}
10151039
}
10161040

10171041
categories-append graphics
@@ -1030,6 +1054,7 @@ subport ${php}-ffi {
10301054
8.2.29 {revision 0}
10311055
8.3.27 {revision 0}
10321056
8.4.14 {revision 0}
1057+
8.5.0RC5 {revision 0}
10331058
}
10341059

10351060
categories-append devel
@@ -1063,6 +1088,7 @@ subport ${php}-ftp {
10631088
8.2.29 {revision 0}
10641089
8.3.27 {revision 0}
10651090
8.4.14 {revision 0}
1091+
8.5.0RC5 {revision 0}
10661092
}
10671093

10681094
categories-append net
@@ -1102,6 +1128,7 @@ subport ${php}-gd {
11021128
8.2.29 {revision 0}
11031129
8.3.27 {revision 0}
11041130
8.4.14 {revision 0}
1131+
8.5.0RC5 {revision 0}
11051132
}
11061133

11071134
categories-append graphics
@@ -1177,6 +1204,7 @@ subport ${php}-gettext {
11771204
8.2.29 {revision 0}
11781205
8.3.27 {revision 0}
11791206
8.4.14 {revision 0}
1207+
8.5.0RC5 {revision 0}
11801208
}
11811209

11821210
categories-append devel
@@ -1208,6 +1236,7 @@ subport ${php}-gmp {
12081236
8.2.29 {revision 0}
12091237
8.3.27 {revision 0}
12101238
8.4.14 {revision 0}
1239+
8.5.0RC5 {revision 0}
12111240
}
12121241

12131242
categories-append devel math
@@ -1244,6 +1273,8 @@ subport ${php}-iconv {
12441273
8.2.29 {revision 0}
12451274
8.3.27 {revision 0}
12461275
8.4.14 {revision 0}
1276+
8.4.13 {revision 0}
1277+
8.5.0RC5 {revision 0}
12471278
}
12481279

12491280
categories-append textproc
@@ -1319,6 +1350,7 @@ subport ${php}-intl {
13191350
8.2.29 {revision 0}
13201351
8.3.27 {revision 0}
13211352
8.4.14 {revision 0}
1353+
8.5.0RC5 {revision 0}
13221354
}
13231355

13241356
categories-append devel
@@ -1390,6 +1422,7 @@ subport ${php}-ipc {
13901422
8.2.29 {revision 0}
13911423
8.3.27 {revision 0}
13921424
8.4.14 {revision 0}
1425+
8.5.0RC5 {revision 0}
13931426
}
13941427

13951428
php.extensions shmop sysvmsg sysvsem sysvshm
@@ -1417,6 +1450,7 @@ subport ${php}-ldap {
14171450
8.2.29 {revision 0}
14181451
8.3.27 {revision 0}
14191452
8.4.14 {revision 0}
1453+
8.5.0RC5 {revision 0}
14201454
}
14211455

14221456
categories-append databases
@@ -1455,9 +1489,9 @@ subport ${php}-mbstring {
14551489
7.4.33 {revision 0}
14561490
8.0.30 {revision 0}
14571491
8.1.33 {revision 0}
1458-
8.2.29 {revision 0}
14591492
8.3.27 {revision 0}
14601493
8.4.14 {revision 0}
1494+
8.5.0RC5 {revision 0}
14611495
}
14621496

14631497
categories-append textproc
@@ -1550,6 +1584,7 @@ subport ${php}-mysql {
15501584
8.2.29 {revision 0}
15511585
8.3.27 {revision 0}
15521586
8.4.14 {revision 0}
1587+
8.5.0RC5 {revision 0}
15531588
}
15541589

15551590
php.extensions mysqli pdo_mysql
@@ -1812,6 +1847,7 @@ subport ${php}-odbc {
18121847
8.2.29 {revision 0}
18131848
8.3.27 {revision 0}
18141849
8.4.14 {revision 0}
1850+
8.5.0RC5 {revision 0}
18151851
}
18161852

18171853
php.extensions odbc pdo_odbc
@@ -1824,26 +1860,26 @@ subport ${php}-odbc {
18241860
long_description ${description}
18251861

18261862
if {[vercmp ${branch} >= 5.3]} {
1827-
variant iodbc conflicts unixodbc description {Use iODBC} {
1828-
depends_lib-append port:libiodbc
1863+
variant iodbc conflicts unixodbc description {Use iODBC} {
1864+
depends_lib-append port:libiodbc
18291865

1830-
patchfiles-append patch-${php}-iODBC.diff
1866+
patchfiles-append patch-${php}-iODBC.diff
18311867

1832-
configure.args-append --with-pdo-odbc=iODBC,${prefix}
1833-
if {[vercmp ${branch} < 7.4]} {
1834-
configure.args-append --with-iODBC=${prefix}
1835-
} else {
1836-
depends_build-append path:bin/pkg-config:pkgconfig
1868+
configure.args-append --with-pdo-odbc=iODBC,${prefix}
1869+
if {[vercmp ${branch} < 7.4]} {
1870+
configure.args-append --with-iODBC=${prefix}
1871+
} else {
1872+
depends_build-append path:bin/pkg-config:pkgconfig
18371873

1838-
configure.args-append --with-iODBC
1874+
configure.args-append --with-iODBC
1875+
}
18391876
}
1840-
}
18411877

1842-
variant unixodbc conflicts iodbc description {Use unixODBC} {}
1878+
variant unixodbc conflicts iodbc description {Use unixODBC} {}
18431879

1844-
if {![variant_isset iodbc] && ![variant_isset unixodbc]} {
1845-
default_variants +unixodbc
1846-
}
1880+
if {![variant_isset iodbc] && ![variant_isset unixodbc]} {
1881+
default_variants +unixodbc
1882+
}
18471883
}
18481884

18491885
if {[variant_isset unixodbc] || [vercmp ${branch} < 5.3]} {
@@ -1862,6 +1898,8 @@ subport ${php}-odbc {
18621898
}
18631899
}
18641900

1901+
# OPcache is integrated in php >= 8.5
1902+
# https://wiki.php.net/rfc/make_opcache_required
18651903
if {[vercmp ${branch} >= 5.5]} {
18661904
subport ${php}-opcache {
18671905
switch -- ${version} {
@@ -1938,6 +1976,7 @@ subport ${php}-openssl {
19381976
8.2.29 {revision 0}
19391977
8.3.27 {revision 0}
19401978
8.4.14 {revision 0}
1979+
8.5.0RC5 {revision 0}
19411980
}
19421981

19431982
categories-append devel security
@@ -1995,6 +2034,7 @@ subport ${php}-oracle {
19952034
8.2.29 {revision 0}
19962035
8.3.27 {revision 0}
19972036
8.4.14 {revision 0}
2037+
8.5.0RC5 {revision 0}
19982038
}
19992039

20002040
php.extensions oci8 pdo_oci
@@ -2039,6 +2079,7 @@ subport ${php}-pcntl {
20392079
8.2.29 {revision 0}
20402080
8.3.27 {revision 0}
20412081
8.4.14 {revision 0}
2082+
8.5.0RC5 {revision 0}
20422083
}
20432084

20442085
categories-append sysutils
@@ -2073,6 +2114,7 @@ subport ${php}-posix {
20732114
8.2.29 {revision 0}
20742115
8.3.27 {revision 0}
20752116
8.4.14 {revision 0}
2117+
8.5.0RC5 {revision 0}
20762118
}
20772119

20782120
categories-append sysutils
@@ -2101,6 +2143,7 @@ subport ${php}-postgresql {
21012143
8.2.29 {revision 0}
21022144
8.3.27 {revision 0}
21032145
8.4.14 {revision 0}
2146+
8.5.0RC5 {revision 0}
21042147
}
21052148

21062149
php.extensions pgsql pdo_pgsql
@@ -2205,6 +2248,7 @@ subport ${php}-snmp {
22052248
8.2.29 {revision 0}
22062249
8.3.27 {revision 0}
22072250
8.4.14 {revision 0}
2251+
8.5.0RC5 {revision 0}
22082252
}
22092253

22102254
categories-append sysutils
@@ -2236,6 +2280,7 @@ subport ${php}-soap {
22362280
8.2.29 {revision 0}
22372281
8.3.27 {revision 0}
22382282
8.4.14 {revision 0}
2283+
8.5.0RC5 {revision 0}
22392284
}
22402285

22412286
categories-append net
@@ -2275,6 +2320,7 @@ subport ${php}-sockets {
22752320
8.2.29 {revision 0}
22762321
8.3.27 {revision 0}
22772322
8.4.14 {revision 0}
2323+
8.5.0RC5 {revision 0}
22782324
}
22792325

22802326
categories-append net
@@ -2296,6 +2342,7 @@ subport ${php}-sodium {
22962342
8.2.29 {revision 0}
22972343
8.3.27 {revision 0}
22982344
8.4.14 {revision 0}
2345+
8.5.0RC5 {revision 0}
22992346
}
23002347

23012348
php.extensions sodium
@@ -2336,6 +2383,7 @@ subport ${php}-sqlite {
23362383
8.2.29 {revision 0}
23372384
8.3.27 {revision 0}
23382385
8.4.14 {revision 0}
2386+
8.5.0RC5 {revision 0}
23392387
}
23402388

23412389
php.extensions sqlite sqlite3 pdo_sqlite
@@ -2389,6 +2437,7 @@ subport ${php}-tidy {
23892437
8.2.29 {revision 0}
23902438
8.3.27 {revision 0}
23912439
8.4.14 {revision 0}
2440+
8.5.0RC5 {revision 0}
23922441
}
23932442

23942443
categories-append www
@@ -2495,6 +2544,7 @@ subport ${php}-xsl {
24952544
8.2.29 {revision 0}
24962545
8.3.27 {revision 0}
24972546
8.4.14 {revision 0}
2547+
8.5.0RC5 {revision 0}
24982548
}
24992549

25002550
categories-append textproc

‎lang/php/files/patch-php85-atomic.diff‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Fix:
2+
3+
error: address argument to atomic operation must be a pointer to non-const _Atomic type ('const _Atomic(bool) *' invalid)
4+
5+
https://github.com/php/php-src/issues/8881
6+
https://github.com/php/php-src/pull/11931
7+
--- a/Zend/zend_atomic.h.orig 2024-02-13 09:41:14.000000000 -0600
8+
+++ b/Zend/zend_atomic.h 2024-03-03 17:16:17.000000000 -0600
9+
@@ -23,7 +23,7 @@
10+
((__GNUC__ == (x) && __GNUC_MINOR__ >= (y)) || (__GNUC__ > (x)))
11+
12+
/* Builtins are used to avoid library linkage */
13+
-#if __has_feature(c_atomic) && defined(__clang__)
14+
+#if __has_feature(c_atomic) && defined(__clang__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201710L
15+
#define HAVE_C11_ATOMICS 1
16+
#elif ZEND_GCC_PREREQ(4, 7)
17+
#define HAVE_GNUC_ATOMICS 1

0 commit comments

Comments
 (0)