git: e60e79b8a130 - 2026Q2 - lang/php84: Update version 8.4.19=>8.4.20

The branch 2026Q2 has been updated by bdrewery:

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

commit e60e79b8a1300434ffd4f8902cc18405be813bdc
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-04-11 12:10:45 +0000
Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
CommitDate: 2026-06-16 16:24:38 +0000

    lang/php84: Update version 8.4.19=>8.4.20
    
    - Remove xsltCleanupGlobals call in ext/xsl MSHUTDOWN [1]
    
    Changelog: https://www.php.net/ChangeLog-8.php#8.4.20
    
    PR:             277888
    Reported by:    wolfgang@lyxys.ka.sub.org
    
    (cherry picked from commit d2c33048b63e2be7534b46f38c7b1bd7fc09a376)
---
 lang/php84/Makefile                       |  2 +-
 lang/php84/distinfo                       |  6 +++---
 security/php84-sodium/Makefile            |  1 -
 textproc/php84-xsl/Makefile               |  5 -----
 textproc/php84-xsl/files/patch-php__xsl.c | 10 ++++++++++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/lang/php84/Makefile b/lang/php84/Makefile
index bb4f3f63ae0e..a5a8ef97156b 100644
--- a/lang/php84/Makefile
+++ b/lang/php84/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	php84
-DISTVERSION=	8.4.19
+DISTVERSION=	8.4.20
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
diff --git a/lang/php84/distinfo b/lang/php84/distinfo
index 7cf2e9c7445a..437436649da8 100644
--- a/lang/php84/distinfo
+++ b/lang/php84/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1773439888
-SHA256 (php-8.4.19.tar.xz) = 11f7164ab26d356c31f94d3d69cc0e0707d5d2d6494a221aaeae307c08eaaa1c
-SIZE (php-8.4.19.tar.xz) = 13684456
+TIMESTAMP = 1775901659
+SHA256 (php-8.4.20.tar.xz) = e454c6f7c89a42f41ebb06dc5c3578e8c8b5f1a3f0da6675665affab04e221f7
+SIZE (php-8.4.20.tar.xz) = 13685708
diff --git a/security/php84-sodium/Makefile b/security/php84-sodium/Makefile
index b9950e1808ac..ceaca574b586 100644
--- a/security/php84-sodium/Makefile
+++ b/security/php84-sodium/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	1
 CATEGORIES=	security
 
 MASTERDIR=	${.CURDIR}/../../lang/php84
diff --git a/textproc/php84-xsl/Makefile b/textproc/php84-xsl/Makefile
index 64d8e7f98be1..86ada9eef6c4 100644
--- a/textproc/php84-xsl/Makefile
+++ b/textproc/php84-xsl/Makefile
@@ -4,9 +4,4 @@ MASTERDIR=	${.CURDIR}/../../lang/php84
 
 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"
diff --git a/textproc/php84-xsl/files/patch-php__xsl.c b/textproc/php84-xsl/files/patch-php__xsl.c
new file mode 100644
index 000000000000..94e06fb66b1f
--- /dev/null
+++ b/textproc/php84-xsl/files/patch-php__xsl.c
@@ -0,0 +1,10 @@
+--- 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;
+ }