Skip to content

Commit b1b328f

Browse files
BjarneDMBjarneDM
committed
php85: new subport branch 8.5.0
On branch php84 Changes to be committed: Core 8.5.0 modified: _resources/port1.0/group/php-1.1.tcl 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/patch-php85-mysqlnd-connection.c.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-gmagick : patched for php >= 8.5 php-gearman : patched for php >= 8.5 php-amqp : patched for php >= 8.5 php-openswoole : 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-rar/Portfile modified: php/php-rrd/Portfile modified: php/php-swoole/Portfile 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-igbinary/Portfile modified: php/php-imagick/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-solr/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-xdebug/Portfile - 8.5.0alpha3 for now 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 ba8bc9c commit b1b328f

File tree

52 files changed

+369
-92
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

+369
-92
lines changed

‎_resources/port1.0/group/php-1.1.tcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ categories php lang
1111
# built. For unified extension ports (name begins with "php-") setting
1212
# php.branches is mandatory; there is no default. Example:
1313
#
14-
# php.branches 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
14+
# php.branches 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
1515
#
1616
# For unified ports, setting php.branches will create the subports.
1717
#
@@ -103,7 +103,7 @@ proc php._set_name {option action args} {
103103
# when the php port is updated.
104104

105105
options php.latest_stable_branch
106-
default php.latest_stable_branch 8.4
106+
default php.latest_stable_branch 8.5
107107

108108

109109
# php.default_branch: the branch of PHP for which the port should be installed

‎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: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -202,27 +202,19 @@ switch ${subport_branch} {
202202
size 13652564
203203
}
204204
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/
205+
epoch 2
206+
version 8.5.0
212207
use_xz yes
213-
checksums rmd160 5f073aa7112c483ffdfd295f7f5e44fec178f606 \
214-
sha256 4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954 \
215-
size 14311848
216-
217-
livecheck.url ${homepage}
218-
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
208+
checksums rmd160 ed3b423aff7f5d4ca1a51b35d866b243e6f55812 \
209+
sha256 39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e \
210+
size 14314552
219211
}
220212
}
221213
# 8.6 {
222214
# # When this becomes a stable version, remove the overrides for homepage,
223215
# # master_sites and livecheck, and update php.latest_stable_branch in the
224216
# # php-1.1 portgroup.
225-
# epoch 1
217+
# epoch 0
226218
# version 8.6.0RC1
227219
# homepage https://qa.php.net/
228220
# master_sites https://downloads.php.net/~saki/
@@ -523,7 +515,7 @@ subport ${php} {
523515
8.2.29 {revision 0}
524516
8.3.28 {revision 0}
525517
8.4.15 {revision 0}
526-
8.5.0RC5 {revision 0}
518+
8.5.0 {revision 0}
527519
}
528520

529521
depends_run port:php_select
@@ -689,7 +681,7 @@ subport ${php}-apache2handler {
689681
8.2.29 {revision 0}
690682
8.3.28 {revision 0}
691683
8.4.15 {revision 0}
692-
8.5.0RC5 {revision 0}
684+
8.5.0 {revision 0}
693685
}
694686

695687
description ${php} Apache 2 Handler SAPI
@@ -760,7 +752,7 @@ subport ${php}-cgi {
760752
8.2.29 {revision 0}
761753
8.3.28 {revision 0}
762754
8.4.15 {revision 0}
763-
8.5.0RC5 {revision 0}
755+
8.5.0 {revision 0}
764756
}
765757

766758
description ${php} CGI SAPI
@@ -806,7 +798,7 @@ subport ${php}-fpm {
806798
8.2.29 {revision 0}
807799
8.3.28 {revision 0}
808800
8.4.15 {revision 0}
809-
8.5.0RC5 {revision 0}
801+
8.5.0 {revision 0}
810802
}
811803

812804
description ${php} FPM SAPI
@@ -881,7 +873,7 @@ subport ${php}-calendar {
881873
8.2.29 {revision 0}
882874
8.3.28 {revision 0}
883875
8.4.15 {revision 0}
884-
8.5.0RC5 {revision 0}
876+
8.5.0 {revision 0}
885877
}
886878

887879
description a PHP extension for converting between different \
@@ -907,7 +899,7 @@ subport ${php}-curl {
907899
8.2.29 {revision 0}
908900
8.3.28 {revision 0}
909901
8.4.15 {revision 0}
910-
8.5.0RC5 {revision 0}
902+
8.5.0 {revision 0}
911903
}
912904

913905
categories-append net www
@@ -949,7 +941,7 @@ subport ${php}-dba {
949941
8.2.29 {revision 0}
950942
8.3.28 {revision 0}
951943
8.4.15 {revision 0}
952-
8.5.0RC5 {revision 0}
944+
8.5.0 {revision 0}
953945
}
954946

955947
categories-append databases
@@ -987,7 +979,7 @@ subport ${php}-enchant {
987979
8.2.29 {revision 0}
988980
8.3.28 {revision 0}
989981
8.4.15 {revision 0}
990-
8.5.0RC5 {revision 0}
982+
8.5.0 {revision 0}
991983
}
992984

993985
categories-append textproc devel
@@ -1044,7 +1036,7 @@ subport ${php}-exif {
10441036
8.2.29 {revision 0}
10451037
8.3.28 {revision 0}
10461038
8.4.15 {revision 0}
1047-
8.5.0RC5 {revision 0}
1039+
8.5.0 {revision 0}
10481040
}
10491041

10501042
categories-append graphics
@@ -1063,7 +1055,7 @@ subport ${php}-ffi {
10631055
8.2.29 {revision 0}
10641056
8.3.28 {revision 0}
10651057
8.4.15 {revision 0}
1066-
8.5.0RC5 {revision 0}
1058+
8.5.0 {revision 0}
10671059
}
10681060

10691061
categories-append devel
@@ -1097,7 +1089,7 @@ subport ${php}-ftp {
10971089
8.2.29 {revision 0}
10981090
8.3.28 {revision 0}
10991091
8.4.15 {revision 0}
1100-
8.5.0RC5 {revision 0}
1092+
8.5.0 {revision 0}
11011093
}
11021094

11031095
categories-append net
@@ -1137,7 +1129,7 @@ subport ${php}-gd {
11371129
8.2.29 {revision 0}
11381130
8.3.28 {revision 0}
11391131
8.4.15 {revision 0}
1140-
8.5.0RC5 {revision 0}
1132+
8.5.0 {revision 0}
11411133
}
11421134

11431135
categories-append graphics
@@ -1213,7 +1205,7 @@ subport ${php}-gettext {
12131205
8.2.29 {revision 0}
12141206
8.3.28 {revision 0}
12151207
8.4.15 {revision 0}
1216-
8.5.0RC5 {revision 0}
1208+
8.5.0 {revision 0}
12171209
}
12181210

12191211
categories-append devel
@@ -1245,7 +1237,7 @@ subport ${php}-gmp {
12451237
8.2.29 {revision 0}
12461238
8.3.28 {revision 0}
12471239
8.4.15 {revision 0}
1248-
8.5.0RC5 {revision 0}
1240+
8.5.0 {revision 0}
12491241
}
12501242

12511243
categories-append devel math
@@ -1283,7 +1275,7 @@ subport ${php}-iconv {
12831275
8.3.28 {revision 0}
12841276
8.4.15 {revision 0}
12851277
8.4.13 {revision 0}
1286-
8.5.0RC5 {revision 0}
1278+
8.5.0 {revision 0}
12871279
}
12881280

12891281
categories-append textproc
@@ -1359,7 +1351,7 @@ subport ${php}-intl {
13591351
8.2.29 {revision 0}
13601352
8.3.28 {revision 0}
13611353
8.4.15 {revision 0}
1362-
8.5.0RC5 {revision 0}
1354+
8.5.0 {revision 0}
13631355
}
13641356

13651357
categories-append devel
@@ -1431,7 +1423,7 @@ subport ${php}-ipc {
14311423
8.2.29 {revision 0}
14321424
8.3.28 {revision 0}
14331425
8.4.15 {revision 0}
1434-
8.5.0RC5 {revision 0}
1426+
8.5.0 {revision 0}
14351427
}
14361428

14371429
php.extensions shmop sysvmsg sysvsem sysvshm
@@ -1459,7 +1451,7 @@ subport ${php}-ldap {
14591451
8.2.29 {revision 0}
14601452
8.3.28 {revision 0}
14611453
8.4.15 {revision 0}
1462-
8.5.0RC5 {revision 0}
1454+
8.5.0 {revision 0}
14631455
}
14641456

14651457
categories-append databases
@@ -1501,7 +1493,7 @@ subport ${php}-mbstring {
15011493
8.2.29 {revision 0}
15021494
8.3.28 {revision 0}
15031495
8.4.15 {revision 0}
1504-
8.5.0RC5 {revision 0}
1496+
8.5.0 {revision 0}
15051497
}
15061498

15071499
categories-append textproc
@@ -1594,7 +1586,7 @@ subport ${php}-mysql {
15941586
8.2.29 {revision 0}
15951587
8.3.28 {revision 0}
15961588
8.4.15 {revision 0}
1597-
8.5.0RC5 {revision 0}
1589+
8.5.0 {revision 0}
15981590
}
15991591

16001592
php.extensions mysqli pdo_mysql
@@ -1618,6 +1610,11 @@ subport ${php}-mysql {
16181610

16191611
if {[vercmp ${branch} >= 5.3]} {
16201612
variant mysqlnd conflicts mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL Native Driver} {
1613+
if {[vercmp ${branch} >= 8.5]} {
1614+
patchfiles-append \
1615+
patch-${php}-mysqlnd-connection.c.diff
1616+
}
1617+
16211618
configure.args-append --with-pdo-mysql=mysqlnd
16221619

16231620
if {[vercmp ${branch} < 7.0]} {
@@ -1857,7 +1854,7 @@ subport ${php}-odbc {
18571854
8.2.29 {revision 0}
18581855
8.3.28 {revision 0}
18591856
8.4.15 {revision 0}
1860-
8.5.0RC5 {revision 0}
1857+
8.5.0 {revision 0}
18611858
}
18621859

18631860
php.extensions odbc pdo_odbc
@@ -1910,7 +1907,7 @@ subport ${php}-odbc {
19101907

19111908
# OPcache is integrated in php >= 8.5
19121909
# https://wiki.php.net/rfc/make_opcache_required
1913-
if {[vercmp ${branch} >= 5.5]} {
1910+
if {[vercmp ${branch} >= 5.5] && [vercmp ${branch} < 8.5]} {
19141911
subport ${php}-opcache {
19151912
switch -- ${version} {
19161913
5.5.38 {revision 1}
@@ -1986,7 +1983,7 @@ subport ${php}-openssl {
19861983
8.2.29 {revision 0}
19871984
8.3.28 {revision 0}
19881985
8.4.15 {revision 0}
1989-
8.5.0RC5 {revision 0}
1986+
8.5.0 {revision 0}
19901987
}
19911988

19921989
categories-append devel security
@@ -2044,7 +2041,7 @@ subport ${php}-oracle {
20442041
8.2.29 {revision 0}
20452042
8.3.28 {revision 0}
20462043
8.4.15 {revision 0}
2047-
8.5.0RC5 {revision 0}
2044+
8.5.0 {revision 0}
20482045
}
20492046

20502047
php.extensions oci8 pdo_oci
@@ -2089,7 +2086,7 @@ subport ${php}-pcntl {
20892086
8.2.29 {revision 0}
20902087
8.3.28 {revision 0}
20912088
8.4.15 {revision 0}
2092-
8.5.0RC5 {revision 0}
2089+
8.5.0 {revision 0}
20932090
}
20942091

20952092
categories-append sysutils
@@ -2124,7 +2121,7 @@ subport ${php}-posix {
21242121
8.2.29 {revision 0}
21252122
8.3.28 {revision 0}
21262123
8.4.15 {revision 0}
2127-
8.5.0RC5 {revision 0}
2124+
8.5.0 {revision 0}
21282125
}
21292126

21302127
categories-append sysutils
@@ -2153,7 +2150,7 @@ subport ${php}-postgresql {
21532150
8.2.29 {revision 0}
21542151
8.3.28 {revision 0}
21552152
8.4.15 {revision 0}
2156-
8.5.0RC5 {revision 0}
2153+
8.5.0 {revision 0}
21572154
}
21582155

21592156
php.extensions pgsql pdo_pgsql
@@ -2258,7 +2255,7 @@ subport ${php}-snmp {
22582255
8.2.29 {revision 0}
22592256
8.3.28 {revision 0}
22602257
8.4.15 {revision 0}
2261-
8.5.0RC5 {revision 0}
2258+
8.5.0 {revision 0}
22622259
}
22632260

22642261
categories-append sysutils
@@ -2290,7 +2287,7 @@ subport ${php}-soap {
22902287
8.2.29 {revision 0}
22912288
8.3.28 {revision 0}
22922289
8.4.15 {revision 0}
2293-
8.5.0RC5 {revision 0}
2290+
8.5.0 {revision 0}
22942291
}
22952292

22962293
categories-append net
@@ -2330,7 +2327,7 @@ subport ${php}-sockets {
23302327
8.2.29 {revision 0}
23312328
8.3.28 {revision 0}
23322329
8.4.15 {revision 0}
2333-
8.5.0RC5 {revision 0}
2330+
8.5.0 {revision 0}
23342331
}
23352332

23362333
categories-append net
@@ -2352,7 +2349,7 @@ subport ${php}-sodium {
23522349
8.2.29 {revision 0}
23532350
8.3.28 {revision 0}
23542351
8.4.15 {revision 0}
2355-
8.5.0RC5 {revision 0}
2352+
8.5.0 {revision 0}
23562353
}
23572354

23582355
php.extensions sodium
@@ -2393,7 +2390,7 @@ subport ${php}-sqlite {
23932390
8.2.29 {revision 0}
23942391
8.3.28 {revision 0}
23952392
8.4.15 {revision 0}
2396-
8.5.0RC5 {revision 0}
2393+
8.5.0 {revision 0}
23972394
}
23982395

23992396
php.extensions sqlite sqlite3 pdo_sqlite
@@ -2447,7 +2444,7 @@ subport ${php}-tidy {
24472444
8.2.29 {revision 0}
24482445
8.3.28 {revision 0}
24492446
8.4.15 {revision 0}
2450-
8.5.0RC5 {revision 0}
2447+
8.5.0 {revision 0}
24512448
}
24522449

24532450
categories-append www
@@ -2554,7 +2551,7 @@ subport ${php}-xsl {
25542551
8.2.29 {revision 0}
25552552
8.3.28 {revision 0}
25562553
8.4.15 {revision 0}
2557-
8.5.0RC5 {revision 0}
2554+
8.5.0 {revision 0}
25582555
}
25592556

25602557
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)