Skip to content

Commit ecc2768

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-amqp : patched for php >= 8.5 php-gmagick : patched for php >= 8.5 php-gearman : patched for php >= 8.5 php-jsmin : patch for zend_smart_string php-memcache : patches for zend_smart_string php-openswoole : patched for php >= 8.1 php-svm : patched for php >= 8.5 php-stomp : patched for php >= 8.5 php-swoole : patched for php >= 8.1 Extensions that presently fail to install: modified: php/php-rar/Portfile modified: php/php-rrd/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 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 16fc3fa commit ecc2768

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/
@@ -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}-mysqlnd-connection.c.diff
293+
}
298294
if {[vercmp ${branch} >= 8.2]} {
299295
patchfiles-append \
300296
patch-${php}-atomic.diff
@@ -523,7 +519,7 @@ subport ${php} {
523519
8.2.29 {revision 0}
524520
8.3.28 {revision 0}
525521
8.4.15 {revision 0}
526-
8.5.0RC5 {revision 0}
522+
8.5.0 {revision 0}
527523
}
528524

529525
depends_run port:php_select
@@ -689,7 +685,7 @@ subport ${php}-apache2handler {
689685
8.2.29 {revision 0}
690686
8.3.28 {revision 0}
691687
8.4.15 {revision 0}
692-
8.5.0RC5 {revision 0}
688+
8.5.0 {revision 0}
693689
}
694690

695691
description ${php} Apache 2 Handler SAPI
@@ -760,7 +756,7 @@ subport ${php}-cgi {
760756
8.2.29 {revision 0}
761757
8.3.28 {revision 0}
762758
8.4.15 {revision 0}
763-
8.5.0RC5 {revision 0}
759+
8.5.0 {revision 0}
764760
}
765761

766762
description ${php} CGI SAPI
@@ -806,7 +802,7 @@ subport ${php}-fpm {
806802
8.2.29 {revision 0}
807803
8.3.28 {revision 0}
808804
8.4.15 {revision 0}
809-
8.5.0RC5 {revision 0}
805+
8.5.0 {revision 0}
810806
}
811807

812808
description ${php} FPM SAPI
@@ -881,7 +877,7 @@ subport ${php}-calendar {
881877
8.2.29 {revision 0}
882878
8.3.28 {revision 0}
883879
8.4.15 {revision 0}
884-
8.5.0RC5 {revision 0}
880+
8.5.0 {revision 0}
885881
}
886882

887883
description a PHP extension for converting between different \
@@ -907,7 +903,7 @@ subport ${php}-curl {
907903
8.2.29 {revision 0}
908904
8.3.28 {revision 0}
909905
8.4.15 {revision 0}
910-
8.5.0RC5 {revision 0}
906+
8.5.0 {revision 0}
911907
}
912908

913909
categories-append net www
@@ -949,7 +945,7 @@ subport ${php}-dba {
949945
8.2.29 {revision 0}
950946
8.3.28 {revision 0}
951947
8.4.15 {revision 0}
952-
8.5.0RC5 {revision 0}
948+
8.5.0 {revision 0}
953949
}
954950

955951
categories-append databases
@@ -987,7 +983,7 @@ subport ${php}-enchant {
987983
8.2.29 {revision 0}
988984
8.3.28 {revision 0}
989985
8.4.15 {revision 0}
990-
8.5.0RC5 {revision 0}
986+
8.5.0 {revision 0}
991987
}
992988

993989
categories-append textproc devel
@@ -1044,7 +1040,7 @@ subport ${php}-exif {
10441040
8.2.29 {revision 0}
10451041
8.3.28 {revision 0}
10461042
8.4.15 {revision 0}
1047-
8.5.0RC5 {revision 0}
1043+
8.5.0 {revision 0}
10481044
}
10491045

10501046
categories-append graphics
@@ -1063,7 +1059,7 @@ subport ${php}-ffi {
10631059
8.2.29 {revision 0}
10641060
8.3.28 {revision 0}
10651061
8.4.15 {revision 0}
1066-
8.5.0RC5 {revision 0}
1062+
8.5.0 {revision 0}
10671063
}
10681064

10691065
categories-append devel
@@ -1097,7 +1093,7 @@ subport ${php}-ftp {
10971093
8.2.29 {revision 0}
10981094
8.3.28 {revision 0}
10991095
8.4.15 {revision 0}
1100-
8.5.0RC5 {revision 0}
1096+
8.5.0 {revision 0}
11011097
}
11021098

11031099
categories-append net
@@ -1137,7 +1133,7 @@ subport ${php}-gd {
11371133
8.2.29 {revision 0}
11381134
8.3.28 {revision 0}
11391135
8.4.15 {revision 0}
1140-
8.5.0RC5 {revision 0}
1136+
8.5.0 {revision 0}
11411137
}
11421138

11431139
categories-append graphics
@@ -1213,7 +1209,7 @@ subport ${php}-gettext {
12131209
8.2.29 {revision 0}
12141210
8.3.28 {revision 0}
12151211
8.4.15 {revision 0}
1216-
8.5.0RC5 {revision 0}
1212+
8.5.0 {revision 0}
12171213
}
12181214

12191215
categories-append devel
@@ -1245,7 +1241,7 @@ subport ${php}-gmp {
12451241
8.2.29 {revision 0}
12461242
8.3.28 {revision 0}
12471243
8.4.15 {revision 0}
1248-
8.5.0RC5 {revision 0}
1244+
8.5.0 {revision 0}
12491245
}
12501246

12511247
categories-append devel math
@@ -1283,7 +1279,7 @@ subport ${php}-iconv {
12831279
8.3.28 {revision 0}
12841280
8.4.15 {revision 0}
12851281
8.4.13 {revision 0}
1286-
8.5.0RC5 {revision 0}
1282+
8.5.0 {revision 0}
12871283
}
12881284

12891285
categories-append textproc
@@ -1359,7 +1355,7 @@ subport ${php}-intl {
13591355
8.2.29 {revision 0}
13601356
8.3.28 {revision 0}
13611357
8.4.15 {revision 0}
1362-
8.5.0RC5 {revision 0}
1358+
8.5.0 {revision 0}
13631359
}
13641360

13651361
categories-append devel
@@ -1431,7 +1427,7 @@ subport ${php}-ipc {
14311427
8.2.29 {revision 0}
14321428
8.3.28 {revision 0}
14331429
8.4.15 {revision 0}
1434-
8.5.0RC5 {revision 0}
1430+
8.5.0 {revision 0}
14351431
}
14361432

14371433
php.extensions shmop sysvmsg sysvsem sysvshm
@@ -1459,7 +1455,7 @@ subport ${php}-ldap {
14591455
8.2.29 {revision 0}
14601456
8.3.28 {revision 0}
14611457
8.4.15 {revision 0}
1462-
8.5.0RC5 {revision 0}
1458+
8.5.0 {revision 0}
14631459
}
14641460

14651461
categories-append databases
@@ -1501,7 +1497,7 @@ subport ${php}-mbstring {
15011497
8.2.29 {revision 0}
15021498
8.3.28 {revision 0}
15031499
8.4.15 {revision 0}
1504-
8.5.0RC5 {revision 0}
1500+
8.5.0 {revision 0}
15051501
}
15061502

15071503
categories-append textproc
@@ -1594,7 +1590,7 @@ subport ${php}-mysql {
15941590
8.2.29 {revision 0}
15951591
8.3.28 {revision 0}
15961592
8.4.15 {revision 0}
1597-
8.5.0RC5 {revision 0}
1593+
8.5.0 {revision 0}
15981594
}
15991595

16001596
php.extensions mysqli pdo_mysql
@@ -1618,6 +1614,7 @@ subport ${php}-mysql {
16181614

16191615
if {[vercmp ${branch} >= 5.3]} {
16201616
variant mysqlnd conflicts mysql51 mysql55 mysql56 mysql57 mysql8 mariadb10 mariadb11 percona description {Use MySQL Native Driver} {
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

0 commit comments

Comments
 (0)