Skip to content

Commit a24ebbe

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-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 8efa080 commit a24ebbe

File tree

53 files changed

+374
-93
lines changed

Some content is hidden

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

53 files changed

+374
-93
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: 49 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/
@@ -295,6 +287,10 @@ if {[is_sapi_subport]} {
295287
patch.pre_args-replace -p0 -p1
296288
patchfiles-append patch-${php}-scripts-php-config.in.diff
297289

290+
if {[vercmp ${branch} >= 8.5]} {
291+
patchfiles-append \
292+
patch-${php}-atomic.diff
293+
}
298294
if {[vercmp ${branch} >= 8.2]} {
299295
patchfiles-append \
300296
patch-${php}-atomic.diff
@@ -519,7 +515,7 @@ subport ${php} {
519515
8.2.29 {revision 0}
520516
8.3.28 {revision 0}
521517
8.4.15 {revision 0}
522-
8.5.0RC5 {revision 0}
518+
8.5.0 {revision 0}
523519
}
524520

525521
depends_run port:php_select
@@ -685,7 +681,7 @@ subport ${php}-apache2handler {
685681
8.2.29 {revision 0}
686682
8.3.28 {revision 0}
687683
8.4.15 {revision 0}
688-
8.5.0RC5 {revision 0}
684+
8.5.0 {revision 0}
689685
}
690686

691687
description ${php} Apache 2 Handler SAPI
@@ -751,7 +747,7 @@ subport ${php}-cgi {
751747
8.2.29 {revision 0}
752748
8.3.28 {revision 0}
753749
8.4.15 {revision 0}
754-
8.5.0RC5 {revision 0}
750+
8.5.0 {revision 0}
755751
}
756752

757753
description ${php} CGI SAPI
@@ -797,7 +793,7 @@ subport ${php}-fpm {
797793
8.2.29 {revision 0}
798794
8.3.28 {revision 0}
799795
8.4.15 {revision 0}
800-
8.5.0RC5 {revision 0}
796+
8.5.0 {revision 0}
801797
}
802798

803799
description ${php} FPM SAPI
@@ -872,7 +868,7 @@ subport ${php}-calendar {
872868
8.2.29 {revision 0}
873869
8.3.28 {revision 0}
874870
8.4.15 {revision 0}
875-
8.5.0RC5 {revision 0}
871+
8.5.0 {revision 0}
876872
}
877873

878874
description a PHP extension for converting between different \
@@ -898,7 +894,7 @@ subport ${php}-curl {
898894
8.2.29 {revision 0}
899895
8.3.28 {revision 0}
900896
8.4.15 {revision 0}
901-
8.5.0RC5 {revision 0}
897+
8.5.0 {revision 0}
902898
}
903899

904900
categories-append net www
@@ -940,7 +936,7 @@ subport ${php}-dba {
940936
8.2.29 {revision 0}
941937
8.3.28 {revision 0}
942938
8.4.15 {revision 0}
943-
8.5.0RC5 {revision 0}
939+
8.5.0 {revision 0}
944940
}
945941

946942
categories-append databases
@@ -978,7 +974,7 @@ subport ${php}-enchant {
978974
8.2.29 {revision 0}
979975
8.3.28 {revision 0}
980976
8.4.15 {revision 0}
981-
8.5.0RC5 {revision 0}
977+
8.5.0 {revision 0}
982978
}
983979

984980
categories-append textproc devel
@@ -1035,7 +1031,7 @@ subport ${php}-exif {
10351031
8.2.29 {revision 0}
10361032
8.3.28 {revision 0}
10371033
8.4.15 {revision 0}
1038-
8.5.0RC5 {revision 0}
1034+
8.5.0 {revision 0}
10391035
}
10401036

10411037
categories-append graphics
@@ -1054,7 +1050,7 @@ subport ${php}-ffi {
10541050
8.2.29 {revision 0}
10551051
8.3.28 {revision 0}
10561052
8.4.15 {revision 0}
1057-
8.5.0RC5 {revision 0}
1053+
8.5.0 {revision 0}
10581054
}
10591055

10601056
categories-append devel
@@ -1088,7 +1084,7 @@ subport ${php}-ftp {
10881084
8.2.29 {revision 0}
10891085
8.3.28 {revision 0}
10901086
8.4.15 {revision 0}
1091-
8.5.0RC5 {revision 0}
1087+
8.5.0 {revision 0}
10921088
}
10931089

10941090
categories-append net
@@ -1128,7 +1124,7 @@ subport ${php}-gd {
11281124
8.2.29 {revision 0}
11291125
8.3.28 {revision 0}
11301126
8.4.15 {revision 0}
1131-
8.5.0RC5 {revision 0}
1127+
8.5.0 {revision 0}
11321128
}
11331129

11341130
categories-append graphics
@@ -1204,7 +1200,7 @@ subport ${php}-gettext {
12041200
8.2.29 {revision 0}
12051201
8.3.28 {revision 0}
12061202
8.4.15 {revision 0}
1207-
8.5.0RC5 {revision 0}
1203+
8.5.0 {revision 0}
12081204
}
12091205

12101206
categories-append devel
@@ -1236,7 +1232,7 @@ subport ${php}-gmp {
12361232
8.2.29 {revision 0}
12371233
8.3.28 {revision 0}
12381234
8.4.15 {revision 0}
1239-
8.5.0RC5 {revision 0}
1235+
8.5.0 {revision 0}
12401236
}
12411237

12421238
categories-append devel math
@@ -1274,7 +1270,7 @@ subport ${php}-iconv {
12741270
8.3.28 {revision 0}
12751271
8.4.15 {revision 0}
12761272
8.4.13 {revision 0}
1277-
8.5.0RC5 {revision 0}
1273+
8.5.0 {revision 0}
12781274
}
12791275

12801276
categories-append textproc
@@ -1350,7 +1346,7 @@ subport ${php}-intl {
13501346
8.2.29 {revision 0}
13511347
8.3.28 {revision 0}
13521348
8.4.15 {revision 0}
1353-
8.5.0RC5 {revision 0}
1349+
8.5.0 {revision 0}
13541350
}
13551351

13561352
categories-append devel
@@ -1422,7 +1418,7 @@ subport ${php}-ipc {
14221418
8.2.29 {revision 0}
14231419
8.3.28 {revision 0}
14241420
8.4.15 {revision 0}
1425-
8.5.0RC5 {revision 0}
1421+
8.5.0 {revision 0}
14261422
}
14271423

14281424
php.extensions shmop sysvmsg sysvsem sysvshm
@@ -1450,7 +1446,7 @@ subport ${php}-ldap {
14501446
8.2.29 {revision 0}
14511447
8.3.28 {revision 0}
14521448
8.4.15 {revision 0}
1453-
8.5.0RC5 {revision 0}
1449+
8.5.0 {revision 0}
14541450
}
14551451

14561452
categories-append databases
@@ -1492,7 +1488,7 @@ subport ${php}-mbstring {
14921488
8.2.29 {revision 0}
14931489
8.3.28 {revision 0}
14941490
8.4.15 {revision 0}
1495-
8.5.0RC5 {revision 0}
1491+
8.5.0 {revision 0}
14961492
}
14971493

14981494
categories-append textproc
@@ -1585,7 +1581,7 @@ subport ${php}-mysql {
15851581
8.2.29 {revision 0}
15861582
8.3.28 {revision 0}
15871583
8.4.15 {revision 0}
1588-
8.5.0RC5 {revision 0}
1584+
8.5.0 {revision 0}
15891585
}
15901586

15911587
php.extensions mysqli pdo_mysql
@@ -1609,6 +1605,11 @@ subport ${php}-mysql {
16091605

16101606
if {[vercmp ${branch} >= 5.3]} {
16111607
variant mysqlnd conflicts mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL Native Driver} {
1608+
if {[vercmp ${branch} >= 8.5]} {
1609+
patchfiles-append \
1610+
patch-${php}-mysqlnd-connection.c.diff
1611+
}
1612+
16121613
configure.args-append --with-pdo-mysql=mysqlnd
16131614

16141615
if {[vercmp ${branch} < 7.0]} {
@@ -1848,7 +1849,7 @@ subport ${php}-odbc {
18481849
8.2.29 {revision 0}
18491850
8.3.28 {revision 0}
18501851
8.4.15 {revision 0}
1851-
8.5.0RC5 {revision 0}
1852+
8.5.0 {revision 0}
18521853
}
18531854

18541855
php.extensions odbc pdo_odbc
@@ -1901,7 +1902,7 @@ subport ${php}-odbc {
19011902

19021903
# OPcache is integrated in php >= 8.5
19031904
# https://wiki.php.net/rfc/make_opcache_required
1904-
if {[vercmp ${branch} >= 5.5]} {
1905+
if {[vercmp ${branch} >= 5.5] && [vercmp ${branch} < 8.5]} {
19051906
subport ${php}-opcache {
19061907
switch -- ${version} {
19071908
5.5.38 {revision 1}
@@ -1977,7 +1978,7 @@ subport ${php}-openssl {
19771978
8.2.29 {revision 0}
19781979
8.3.28 {revision 0}
19791980
8.4.15 {revision 0}
1980-
8.5.0RC5 {revision 0}
1981+
8.5.0 {revision 0}
19811982
}
19821983

19831984
categories-append devel security
@@ -2035,7 +2036,7 @@ subport ${php}-oracle {
20352036
8.2.29 {revision 0}
20362037
8.3.28 {revision 0}
20372038
8.4.15 {revision 0}
2038-
8.5.0RC5 {revision 0}
2039+
8.5.0 {revision 0}
20392040
}
20402041

20412042
php.extensions oci8 pdo_oci
@@ -2080,7 +2081,7 @@ subport ${php}-pcntl {
20802081
8.2.29 {revision 0}
20812082
8.3.28 {revision 0}
20822083
8.4.15 {revision 0}
2083-
8.5.0RC5 {revision 0}
2084+
8.5.0 {revision 0}
20842085
}
20852086

20862087
categories-append sysutils
@@ -2115,7 +2116,7 @@ subport ${php}-posix {
21152116
8.2.29 {revision 0}
21162117
8.3.28 {revision 0}
21172118
8.4.15 {revision 0}
2118-
8.5.0RC5 {revision 0}
2119+
8.5.0 {revision 0}
21192120
}
21202121

21212122
categories-append sysutils
@@ -2144,7 +2145,7 @@ subport ${php}-postgresql {
21442145
8.2.29 {revision 0}
21452146
8.3.28 {revision 0}
21462147
8.4.15 {revision 0}
2147-
8.5.0RC5 {revision 0}
2148+
8.5.0 {revision 0}
21482149
}
21492150

21502151
php.extensions pgsql pdo_pgsql
@@ -2249,7 +2250,7 @@ subport ${php}-snmp {
22492250
8.2.29 {revision 0}
22502251
8.3.28 {revision 0}
22512252
8.4.15 {revision 0}
2252-
8.5.0RC5 {revision 0}
2253+
8.5.0 {revision 0}
22532254
}
22542255

22552256
categories-append sysutils
@@ -2281,7 +2282,7 @@ subport ${php}-soap {
22812282
8.2.29 {revision 0}
22822283
8.3.28 {revision 0}
22832284
8.4.15 {revision 0}
2284-
8.5.0RC5 {revision 0}
2285+
8.5.0 {revision 0}
22852286
}
22862287

22872288
categories-append net
@@ -2321,7 +2322,7 @@ subport ${php}-sockets {
23212322
8.2.29 {revision 0}
23222323
8.3.28 {revision 0}
23232324
8.4.15 {revision 0}
2324-
8.5.0RC5 {revision 0}
2325+
8.5.0 {revision 0}
23252326
}
23262327

23272328
categories-append net
@@ -2343,7 +2344,7 @@ subport ${php}-sodium {
23432344
8.2.29 {revision 0}
23442345
8.3.28 {revision 0}
23452346
8.4.15 {revision 0}
2346-
8.5.0RC5 {revision 0}
2347+
8.5.0 {revision 0}
23472348
}
23482349

23492350
php.extensions sodium
@@ -2384,7 +2385,7 @@ subport ${php}-sqlite {
23842385
8.2.29 {revision 0}
23852386
8.3.28 {revision 0}
23862387
8.4.15 {revision 0}
2387-
8.5.0RC5 {revision 0}
2388+
8.5.0 {revision 0}
23882389
}
23892390

23902391
php.extensions sqlite sqlite3 pdo_sqlite
@@ -2438,7 +2439,7 @@ subport ${php}-tidy {
24382439
8.2.29 {revision 0}
24392440
8.3.28 {revision 0}
24402441
8.4.15 {revision 0}
2441-
8.5.0RC5 {revision 0}
2442+
8.5.0 {revision 0}
24422443
}
24432444

24442445
categories-append www
@@ -2545,7 +2546,7 @@ subport ${php}-xsl {
25452546
8.2.29 {revision 0}
25462547
8.3.28 {revision 0}
25472548
8.4.15 {revision 0}
2548-
8.5.0RC5 {revision 0}
2549+
8.5.0 {revision 0}
25492550
}
25502551

25512552
categories-append textproc

0 commit comments

Comments
 (0)