git: db41b4a95491 - 2024Q2 - lang/php82: Update version 8.2.17=>8.2.18

The branch 2024Q2 has been updated by bofh:

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

commit db41b4a95491bb55a7fed775cf45f7c1c7f54899
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-04-17 12:55:42 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-04-17 12:55:42 +0000

    lang/php82: Update version 8.2.17=>8.2.18
    
    Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_2
    
    This is a DIRECT commit instead of merge commit as I have removed the
    GNU_CONFIGURE_MANPREFIX in an earlier commit to HEAD.
---
 lang/php82/Makefile     | 42 ++++++++++++++++++++----------------------
 lang/php82/distinfo     |  6 +++---
 www/php82-tidy/Makefile |  1 -
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index d369b5e27e4c..15d7041e8ac7 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	php82
-DISTVERSION=	8.2.17
+DISTVERSION=	8.2.18
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
@@ -21,26 +21,27 @@ CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
-GNU_CONFIGURE=		yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ARGS+=	--disable-all \
-			--program-prefix="" \
-			--with-config-file-scan-dir=${PREFIX}/etc/php \
-			--with-layout=GNU \
-			--with-libxml \
-			--with-openssl \
-			--with-password-argon2=${LOCALBASE}
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+CONFIGURE_ARGS+=	\
+		--disable-all \
+		--program-prefix="" \
+		--with-config-file-scan-dir=${PREFIX}/etc/php \
+		--with-layout=GNU \
+		--with-libxml \
+		--with-openssl \
+		--with-password-argon2=${LOCALBASE}
 
 USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
-LDFLAGS=	-L${OPENSSLLIB} -lcrypto -lssl
+LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-OPTIONS_DEFINE+=		CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
+OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND PCRE PHPDBG ZTS
-OPTIONS_DEFAULT=		CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND PCRE
+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)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
@@ -89,7 +90,7 @@ PHPDBG_VARS=		PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=	--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
-DESTDIRNAME=		INSTALL_ROOT
+DESTDIRNAME=	INSTALL_ROOT
 
 .if defined(PKGNAMEPREFIX)
 USES+=			apache
@@ -255,8 +256,8 @@ USE_GNOME=	libxml2
 
 .if ${PHP_MODNAME} == "enchant"
 LIB_DEPENDS+=   libenchant-2.so:textproc/enchant2
-CONFIGURE_ARGS+=	--with-enchant=${LOCALBASE}
-USES+=			pkgconfig
+CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
+USES+=		pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
@@ -359,8 +360,7 @@ BUILD_DEPENDS=		re2c:devel/re2c
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=	--with-ldap-sasl=${LOCALBASE} \
-			--with-ldap=${LOCALBASE}
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
 .endif
 
@@ -385,8 +385,7 @@ CONFIGURE_ARGS+=	--with-mysqli
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
-CONFIGURE_ARGS+=	--enable-odbc \
-			--with-unixODBC=${LOCALBASE}
+CONFIGURE_ARGS+=	--enable-odbc --with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
@@ -597,8 +596,7 @@ USE_PHP=	dom:build xml:build
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
-CONFIGURE_ARGS+=	--with-zip \
-			--with-zlib-dir=/usr
+CONFIGURE_ARGS+=	--with-zip --with-zlib-dir=/usr
 USES+=			pkgconfig
 .endif
 
diff --git a/lang/php82/distinfo b/lang/php82/distinfo
index 9d42eef3d21a..6600f3d313f6 100644
--- a/lang/php82/distinfo
+++ b/lang/php82/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710522211
-SHA256 (php-8.2.17.tar.xz) = 1cc4ef733ba58f6557db648012471f1916e5bac316303aa165535bedab08ee35
-SIZE (php-8.2.17.tar.xz) = 12092404
+TIMESTAMP = 1712934471
+SHA256 (php-8.2.18.tar.xz) = 44b306fc021e56441f691da6c3108788bd9e450f293b3bc70fcd64b08dd41a50
+SIZE (php-8.2.18.tar.xz) = 12089400
diff --git a/www/php82-tidy/Makefile b/www/php82-tidy/Makefile
index cd2825d897fc..3f907ae319b4 100644
--- a/www/php82-tidy/Makefile
+++ b/www/php82-tidy/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	1
 CATEGORIES=	www
 
 MASTERDIR=	${.CURDIR}/../../lang/php82