From f8d7720ab3c06ec583f6bde03af2f4fa8b83271e Mon Sep 17 00:00:00 2001
From: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Tue, 30 Jul 2024 22:07:37 +0800
Subject: [PATCH] security/pecl-mcrypt: Fix build with php84

- While I'm here:
  - Fix indent
  - Remove outdated post-patch:

Approved by:	portmgr (blanket)
---
 security/pecl-mcrypt/Makefile          |  7 +------
 security/pecl-mcrypt/files/patch-php84 | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 security/pecl-mcrypt/files/patch-php84

diff --git a/security/pecl-mcrypt/Makefile b/security/pecl-mcrypt/Makefile
index 8c661d2758de..f85fd42af54c 100644
--- a/security/pecl-mcrypt/Makefile
+++ b/security/pecl-mcrypt/Makefile
@@ -12,11 +12,6 @@ LICENSE=	PHP301
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libmcrypt.so:security/libmcrypt
 
-USES=	php:pecl
-IGNORE_WITH_PHP=	84
-
-post-patch:
-	${REINPLACE_CMD} -e 's/RETURN_FALSE$$/RETURN_FALSE;/g' ${WRKSRC}/mcrypt.c
-	${REINPLACE_CMD} -e 's/RETURN_TRUE$$/RETURN_TRUE;/g' ${WRKSRC}/mcrypt.c
+USES=		php:pecl
 
 .include <bsd.port.mk>
diff --git a/security/pecl-mcrypt/files/patch-php84 b/security/pecl-mcrypt/files/patch-php84
new file mode 100644
index 000000000000..9d7ac9def9e6
--- /dev/null
+++ b/security/pecl-mcrypt/files/patch-php84
@@ -0,0 +1,14 @@
+--- mcrypt.c.orig	2023-12-19 10:55:02 UTC
++++ mcrypt.c
+@@ -38,7 +38,11 @@
+ #include "php_ini.h"
+ #include "php_globals.h"
+ #include "ext/standard/info.h"
++#if PHP_VERSION_ID >= 80400
++#include "ext/random/php_random.h"
++#else
+ #include "ext/standard/php_rand.h"
++#endif
+ #include "zend_smart_str.h"
+ #include "php_mcrypt_filter.h"
+