git: 75abef9182da - 2026Q2 - lang/php84: Update version 8.4.20=>8.4.21

From: Bryan Drewery <bdrewery_at_FreeBSD.org>
Date: Tue, 16 Jun 2026 17:08:05 UTC
The branch 2026Q2 has been updated by bdrewery:

URL: https://cgit.FreeBSD.org/ports/commit/?id=75abef9182dab156d4169142258c730c3ff9d1b5

commit 75abef9182dab156d4169142258c730c3ff9d1b5
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-05-13 08:46:45 +0000
Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
CommitDate: 2026-06-16 16:25:03 +0000

    lang/php84: Update version 8.4.20=>8.4.21
    
    - 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.4.21
    
    PR:             294233 [1]
    Reported by:    chris@chrullrich.net [1]
    MFH:            2026Q2
    
    (cherry picked from commit 4d065f8528ecb6b364dac20f2e4e68a5b1915d5b)
---
 lang/php84/Makefile                       | 12 +++++++++---
 lang/php84/distinfo                       |  6 +++---
 textproc/php84-xsl/files/patch-php__xsl.c | 10 ----------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/lang/php84/Makefile b/lang/php84/Makefile
index a5a8ef97156b..0ddc401bbd6d 100644
--- a/lang/php84/Makefile
+++ b/lang/php84/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	php84
-DISTVERSION=	8.4.20
+DISTVERSION=	8.4.21
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
@@ -398,10 +398,16 @@ CONFIGURE_ARGS+= --with-unixODBC=${LOCALBASE}
 .  endif
 
 .  if ${PHP_MODNAME} == "opcache"
-LIB_DEPENDS+=	libcapstone.so:devel/capstone
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
-CONFIGURE_ARGS+=        --enable-opcache --with-capstone
+CONFIGURE_ARGS+=        --enable-opcache
+
+OPTIONS_DEFINE=	JIT
+
+JIT_DESC=		Enable JIT support for opcache
+
+JIT_LIB_DEPENDS=	libcapstone.so:devel/capstone
+JIT_CONFIGURE_ON=	--with-capstone --enable-opcache-jit=yes
 .  endif
 
 .  if ${PHP_MODNAME} == "pcntl"
diff --git a/lang/php84/distinfo b/lang/php84/distinfo
index 437436649da8..9ff47430e175 100644
--- a/lang/php84/distinfo
+++ b/lang/php84/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1775901659
-SHA256 (php-8.4.20.tar.xz) = e454c6f7c89a42f41ebb06dc5c3578e8c8b5f1a3f0da6675665affab04e221f7
-SIZE (php-8.4.20.tar.xz) = 13685708
+TIMESTAMP = 1778658376
+SHA256 (php-8.4.21.tar.xz) = 7cf5d8ab12c3b2016875bcfaec71bef1ef0b07bed6148f2c447577074431f984
+SIZE (php-8.4.21.tar.xz) = 13718684
diff --git a/textproc/php84-xsl/files/patch-php__xsl.c b/textproc/php84-xsl/files/patch-php__xsl.c
deleted file mode 100644
index 94e06fb66b1f..000000000000
--- a/textproc/php84-xsl/files/patch-php__xsl.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- php_xsl.c.orig	2026-04-11 12:14:52 UTC
-+++ php_xsl.c
-@@ -323,7 +323,6 @@ PHP_MSHUTDOWN_FUNCTION(xsl)
- 	xsltUnregisterExtModuleFunction ((const xmlChar *) "function",
- 				   (const xmlChar *) "http://php.net/xsl");
- 	xsltSetGenericErrorFunc(NULL, NULL);
--	xsltCleanupGlobals();
- 
- 	return SUCCESS;
- }