git: 937147ce1af4 - main - lang/php85: Update version 8.5.4=>8.5.5

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=937147ce1af47bfa6f970f309a521d4288363ae1

commit 937147ce1af47bfa6f970f309a521d4288363ae1
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-04-11 12:18:40 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2026-04-11 13:38:01 +0000

    lang/php85: Update version 8.5.4=>8.5.5
    
    - Optionize JIT. JIT for opcache has been disabled by default. Make it
      and option to conditionally depend on capstone [1]
    
    Changelog: https://www.php.net/ChangeLog-8.php#8.5.5
    
    PR:             294233
    Reported by:    chris@chrullrich.net
---
 lang/php85/Makefile            | 10 ++++++----
 lang/php85/distinfo            |  6 +++---
 security/php85-sodium/Makefile |  1 -
 textproc/php85-xsl/Makefile    |  5 -----
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lang/php85/Makefile b/lang/php85/Makefile
index 80515c54af3c..45411b6f4ebb 100644
--- a/lang/php85/Makefile
+++ b/lang/php85/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	php85
-DISTVERSION=	8.5.4
+DISTVERSION=	8.5.5
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
@@ -18,8 +18,7 @@ PHP_VER=	85
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
-LIB_DEPENDS=	libcapstone.so:devel/capstone \
-		libpcre2-8.so:devel/pcre2
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
@@ -38,7 +37,7 @@ LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
-				MYSQLND NOASLR PCRE PHPDBG ZTS
+				MYSQLND NOASLR PCRE PHPDBG ZTS JIT
 OPTIONS_DEFAULT=	CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND PCRE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
@@ -57,6 +56,7 @@ CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
+JIT_DESC=		Enable JIT support for opcache
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PCRE_DESC=	Use system pcre instead of bundled one
@@ -77,6 +77,8 @@ FPM_CONFIGURE_ON=	--enable-fpm \
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php_fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
+JIT_LIB_DEPENDS=	libcapstone.so:devel/capstone
+JIT_CONFIGURE_ON=	--with-capstone --enable-opcache-jit=yes
 LINKTHR_LIBS=		-lpthread
 MYSQLND_CONFIGURE_ON=	--enable-mysqlnd
 NOASLR_USES=	elfctl
diff --git a/lang/php85/distinfo b/lang/php85/distinfo
index 6232aa2fd871..7f1649430a11 100644
--- a/lang/php85/distinfo
+++ b/lang/php85/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1773439908
-SHA256 (php-8.5.4.tar.xz) = c1569f1f543f6b025c583cdc0e730e5c5833c603618613f1aa8e75d1524b8c91
-SIZE (php-8.5.4.tar.xz) = 14348800
+TIMESTAMP = 1775901671
+SHA256 (php-8.5.5.tar.xz) = 95bec382f4bd00570a8ef52a58ec04d8d9b9a90494781f1c106d1b274a3902f2
+SIZE (php-8.5.5.tar.xz) = 14355236
diff --git a/security/php85-sodium/Makefile b/security/php85-sodium/Makefile
index cbbac741b261..aff3c5308849 100644
--- a/security/php85-sodium/Makefile
+++ b/security/php85-sodium/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	1
 CATEGORIES=	security
 
 MASTERDIR=	${.CURDIR}/../../lang/php85
diff --git a/textproc/php85-xsl/Makefile b/textproc/php85-xsl/Makefile
index 2b2ba0361e4c..f8ca53c17115 100644
--- a/textproc/php85-xsl/Makefile
+++ b/textproc/php85-xsl/Makefile
@@ -4,9 +4,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php85
 
 PKGNAMESUFFIX=	-xsl
 
-post-patch:
-	${REINPLACE_CMD} -e \
-		's|#include "../dom/xml_common.h"|#include "ext/dom/xml_common.h"|g' \
-		${WRKSRC}/php_xsl.h
-
 .include "${MASTERDIR}/Makefile"