Skip to content

Commit 007d718

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/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 53be33f commit 007d718

File tree

53 files changed

+283
-89
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

+283
-89
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: 38 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -206,23 +206,18 @@ switch ${subport_branch} {
206206
# master_sites and livecheck, and update php.latest_stable_branch in the
207207
# php-1.1 portgroup.
208208
epoch 0
209-
version 8.5.0RC5
210-
homepage https://qa.php.net/
211-
master_sites https://downloads.php.net/~daniels/
209+
version 8.5.0
212210
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
211+
checksums rmd160 ed3b423aff7f5d4ca1a51b35d866b243e6f55812 \
212+
sha256 39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e \
213+
size 14314552
219214
}
220215
}
221216
# 8.6 {
222217
# # When this becomes a stable version, remove the overrides for homepage,
223218
# # master_sites and livecheck, and update php.latest_stable_branch in the
224219
# # php-1.1 portgroup.
225-
# epoch 1
220+
# epoch 0
226221
# version 8.6.0RC1
227222
# homepage https://qa.php.net/
228223
# master_sites https://downloads.php.net/~saki/
@@ -519,7 +514,7 @@ subport ${php} {
519514
8.2.29 {revision 0}
520515
8.3.28 {revision 0}
521516
8.4.15 {revision 0}
522-
8.5.0RC5 {revision 0}
517+
8.5.0 {revision 0}
523518
}
524519

525520
depends_run port:php_select
@@ -685,7 +680,7 @@ subport ${php}-apache2handler {
685680
8.2.29 {revision 0}
686681
8.3.28 {revision 0}
687682
8.4.15 {revision 0}
688-
8.5.0RC5 {revision 0}
683+
8.5.0 {revision 0}
689684
}
690685

691686
description ${php} Apache 2 Handler SAPI
@@ -751,7 +746,7 @@ subport ${php}-cgi {
751746
8.2.29 {revision 0}
752747
8.3.28 {revision 0}
753748
8.4.15 {revision 0}
754-
8.5.0RC5 {revision 0}
749+
8.5.0 {revision 0}
755750
}
756751

757752
description ${php} CGI SAPI
@@ -797,7 +792,7 @@ subport ${php}-fpm {
797792
8.2.29 {revision 0}
798793
8.3.28 {revision 0}
799794
8.4.15 {revision 0}
800-
8.5.0RC5 {revision 0}
795+
8.5.0 {revision 0}
801796
}
802797

803798
description ${php} FPM SAPI
@@ -872,7 +867,7 @@ subport ${php}-calendar {
872867
8.2.29 {revision 0}
873868
8.3.28 {revision 0}
874869
8.4.15 {revision 0}
875-
8.5.0RC5 {revision 0}
870+
8.5.0 {revision 0}
876871
}
877872

878873
description a PHP extension for converting between different \
@@ -898,7 +893,7 @@ subport ${php}-curl {
898893
8.2.29 {revision 0}
899894
8.3.28 {revision 0}
900895
8.4.15 {revision 0}
901-
8.5.0RC5 {revision 0}
896+
8.5.0 {revision 0}
902897
}
903898

904899
categories-append net www
@@ -940,7 +935,7 @@ subport ${php}-dba {
940935
8.2.29 {revision 0}
941936
8.3.28 {revision 0}
942937
8.4.15 {revision 0}
943-
8.5.0RC5 {revision 0}
938+
8.5.0 {revision 0}
944939
}
945940

946941
categories-append databases
@@ -978,7 +973,7 @@ subport ${php}-enchant {
978973
8.2.29 {revision 0}
979974
8.3.28 {revision 0}
980975
8.4.15 {revision 0}
981-
8.5.0RC5 {revision 0}
976+
8.5.0 {revision 0}
982977
}
983978

984979
categories-append textproc devel
@@ -1035,7 +1030,7 @@ subport ${php}-exif {
10351030
8.2.29 {revision 0}
10361031
8.3.28 {revision 0}
10371032
8.4.15 {revision 0}
1038-
8.5.0RC5 {revision 0}
1033+
8.5.0 {revision 0}
10391034
}
10401035

10411036
categories-append graphics
@@ -1054,7 +1049,7 @@ subport ${php}-ffi {
10541049
8.2.29 {revision 0}
10551050
8.3.28 {revision 0}
10561051
8.4.15 {revision 0}
1057-
8.5.0RC5 {revision 0}
1052+
8.5.0 {revision 0}
10581053
}
10591054

10601055
categories-append devel
@@ -1088,7 +1083,7 @@ subport ${php}-ftp {
10881083
8.2.29 {revision 0}
10891084
8.3.28 {revision 0}
10901085
8.4.15 {revision 0}
1091-
8.5.0RC5 {revision 0}
1086+
8.5.0 {revision 0}
10921087
}
10931088

10941089
categories-append net
@@ -1128,7 +1123,7 @@ subport ${php}-gd {
11281123
8.2.29 {revision 0}
11291124
8.3.28 {revision 0}
11301125
8.4.15 {revision 0}
1131-
8.5.0RC5 {revision 0}
1126+
8.5.0 {revision 0}
11321127
}
11331128

11341129
categories-append graphics
@@ -1204,7 +1199,7 @@ subport ${php}-gettext {
12041199
8.2.29 {revision 0}
12051200
8.3.28 {revision 0}
12061201
8.4.15 {revision 0}
1207-
8.5.0RC5 {revision 0}
1202+
8.5.0 {revision 0}
12081203
}
12091204

12101205
categories-append devel
@@ -1236,7 +1231,7 @@ subport ${php}-gmp {
12361231
8.2.29 {revision 0}
12371232
8.3.28 {revision 0}
12381233
8.4.15 {revision 0}
1239-
8.5.0RC5 {revision 0}
1234+
8.5.0 {revision 0}
12401235
}
12411236

12421237
categories-append devel math
@@ -1274,7 +1269,7 @@ subport ${php}-iconv {
12741269
8.3.28 {revision 0}
12751270
8.4.15 {revision 0}
12761271
8.4.13 {revision 0}
1277-
8.5.0RC5 {revision 0}
1272+
8.5.0 {revision 0}
12781273
}
12791274

12801275
categories-append textproc
@@ -1350,7 +1345,7 @@ subport ${php}-intl {
13501345
8.2.29 {revision 0}
13511346
8.3.28 {revision 0}
13521347
8.4.15 {revision 0}
1353-
8.5.0RC5 {revision 0}
1348+
8.5.0 {revision 0}
13541349
}
13551350

13561351
categories-append devel
@@ -1422,7 +1417,7 @@ subport ${php}-ipc {
14221417
8.2.29 {revision 0}
14231418
8.3.28 {revision 0}
14241419
8.4.15 {revision 0}
1425-
8.5.0RC5 {revision 0}
1420+
8.5.0 {revision 0}
14261421
}
14271422

14281423
php.extensions shmop sysvmsg sysvsem sysvshm
@@ -1450,7 +1445,7 @@ subport ${php}-ldap {
14501445
8.2.29 {revision 0}
14511446
8.3.28 {revision 0}
14521447
8.4.15 {revision 0}
1453-
8.5.0RC5 {revision 0}
1448+
8.5.0 {revision 0}
14541449
}
14551450

14561451
categories-append databases
@@ -1492,7 +1487,7 @@ subport ${php}-mbstring {
14921487
8.2.29 {revision 0}
14931488
8.3.28 {revision 0}
14941489
8.4.15 {revision 0}
1495-
8.5.0RC5 {revision 0}
1490+
8.5.0 {revision 0}
14961491
}
14971492

14981493
categories-append textproc
@@ -1585,7 +1580,7 @@ subport ${php}-mysql {
15851580
8.2.29 {revision 0}
15861581
8.3.28 {revision 0}
15871582
8.4.15 {revision 0}
1588-
8.5.0RC5 {revision 0}
1583+
8.5.0 {revision 0}
15891584
}
15901585

15911586
php.extensions mysqli pdo_mysql
@@ -1848,7 +1843,7 @@ subport ${php}-odbc {
18481843
8.2.29 {revision 0}
18491844
8.3.28 {revision 0}
18501845
8.4.15 {revision 0}
1851-
8.5.0RC5 {revision 0}
1846+
8.5.0 {revision 0}
18521847
}
18531848

18541849
php.extensions odbc pdo_odbc
@@ -1977,7 +1972,7 @@ subport ${php}-openssl {
19771972
8.2.29 {revision 0}
19781973
8.3.28 {revision 0}
19791974
8.4.15 {revision 0}
1980-
8.5.0RC5 {revision 0}
1975+
8.5.0 {revision 0}
19811976
}
19821977

19831978
categories-append devel security
@@ -2035,7 +2030,7 @@ subport ${php}-oracle {
20352030
8.2.29 {revision 0}
20362031
8.3.28 {revision 0}
20372032
8.4.15 {revision 0}
2038-
8.5.0RC5 {revision 0}
2033+
8.5.0 {revision 0}
20392034
}
20402035

20412036
php.extensions oci8 pdo_oci
@@ -2080,7 +2075,7 @@ subport ${php}-pcntl {
20802075
8.2.29 {revision 0}
20812076
8.3.28 {revision 0}
20822077
8.4.15 {revision 0}
2083-
8.5.0RC5 {revision 0}
2078+
8.5.0 {revision 0}
20842079
}
20852080

20862081
categories-append sysutils
@@ -2115,7 +2110,7 @@ subport ${php}-posix {
21152110
8.2.29 {revision 0}
21162111
8.3.28 {revision 0}
21172112
8.4.15 {revision 0}
2118-
8.5.0RC5 {revision 0}
2113+
8.5.0 {revision 0}
21192114
}
21202115

21212116
categories-append sysutils
@@ -2144,7 +2139,7 @@ subport ${php}-postgresql {
21442139
8.2.29 {revision 0}
21452140
8.3.28 {revision 0}
21462141
8.4.15 {revision 0}
2147-
8.5.0RC5 {revision 0}
2142+
8.5.0 {revision 0}
21482143
}
21492144

21502145
php.extensions pgsql pdo_pgsql
@@ -2249,7 +2244,7 @@ subport ${php}-snmp {
22492244
8.2.29 {revision 0}
22502245
8.3.28 {revision 0}
22512246
8.4.15 {revision 0}
2252-
8.5.0RC5 {revision 0}
2247+
8.5.0 {revision 0}
22532248
}
22542249

22552250
categories-append sysutils
@@ -2281,7 +2276,7 @@ subport ${php}-soap {
22812276
8.2.29 {revision 0}
22822277
8.3.28 {revision 0}
22832278
8.4.15 {revision 0}
2284-
8.5.0RC5 {revision 0}
2279+
8.5.0 {revision 0}
22852280
}
22862281

22872282
categories-append net
@@ -2321,7 +2316,7 @@ subport ${php}-sockets {
23212316
8.2.29 {revision 0}
23222317
8.3.28 {revision 0}
23232318
8.4.15 {revision 0}
2324-
8.5.0RC5 {revision 0}
2319+
8.5.0 {revision 0}
23252320
}
23262321

23272322
categories-append net
@@ -2343,7 +2338,7 @@ subport ${php}-sodium {
23432338
8.2.29 {revision 0}
23442339
8.3.28 {revision 0}
23452340
8.4.15 {revision 0}
2346-
8.5.0RC5 {revision 0}
2341+
8.5.0 {revision 0}
23472342
}
23482343

23492344
php.extensions sodium
@@ -2384,7 +2379,7 @@ subport ${php}-sqlite {
23842379
8.2.29 {revision 0}
23852380
8.3.28 {revision 0}
23862381
8.4.15 {revision 0}
2387-
8.5.0RC5 {revision 0}
2382+
8.5.0 {revision 0}
23882383
}
23892384

23902385
php.extensions sqlite sqlite3 pdo_sqlite
@@ -2438,7 +2433,7 @@ subport ${php}-tidy {
24382433
8.2.29 {revision 0}
24392434
8.3.28 {revision 0}
24402435
8.4.15 {revision 0}
2441-
8.5.0RC5 {revision 0}
2436+
8.5.0 {revision 0}
24422437
}
24432438

24442439
categories-append www
@@ -2545,7 +2540,7 @@ subport ${php}-xsl {
25452540
8.2.29 {revision 0}
25462541
8.3.28 {revision 0}
25472542
8.4.15 {revision 0}
2548-
8.5.0RC5 {revision 0}
2543+
8.5.0 {revision 0}
25492544
}
25502545

25512546
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

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
--- ext/odbc/config.m4.orig 2025-10-17 02:21:26
2+
+++ ext/odbc/config.m4 2025-10-17 02:37:19
3+
@@ -11,6 +11,7 @@
4+
dnl configure options
5+
dnl
6+
7+
+:<<'MACPORTS_DISABLED'
8+
AS_VAR_IF([ODBC_TYPE],, [
9+
PHP_ARG_WITH([ibm-db2],
10+
[for IBM DB2 support],
11+
@@ -71,6 +72,7 @@
12+
[Define to 1 if the odbc extension uses custom ODBC installation.])
13+
])
14+
])
15+
+MACPORTS_DISABLED
16+
17+
AS_VAR_IF([ODBC_TYPE],, [
18+
PHP_ARG_WITH([iodbc],

0 commit comments

Comments
 (0)