diff --git a/archivers/pecl-rar/Makefile b/archivers/pecl-rar/Makefile
index cf47a51b4001..85932a8f14fd 100644
--- a/archivers/pecl-rar/Makefile
+++ b/archivers/pecl-rar/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	rar
 PORTVERSION=	4.2.0
 PORTREVISION=	1
 CATEGORIES=	archivers pear
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	PECL extension to create and read RAR files
 WWW=		https://pecl.php.net/package/rar
 
 LICENSE=	PHP301
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-12-31
 
 USES=		compiler:c11 php:build,pecl
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	81 82 83
 
 CONFIGURE_ARGS=	--enable-rar
 
 .include <bsd.port.mk>
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index 4361f20522c0..21418257f8d9 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	phpbb
 PORTVERSION=	2.0.23
 CATEGORIES=	chinese www
 MASTER_SITES=	LOCAL/chinsan/php/ \
 		http://freebsd.ee.ccu.edu.tw/
 PKGNAMESUFFIX=	-tw
 DISTNAME=	phpBB-tw-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Traditional Chinese version of phpBB
 WWW=		https://www.phpbb.com/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
 
 CONFLICTS_INSTALL=	phpbb phpbb3 zh-phpbb3-tw # share/doc/phpbb/AUTHORS share/doc/phpbb/CHANGELOG.html
 USES=		dos2unix php
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 # Get HOSTNAME
 .if exists(/sbin/sysctl)
 HOSTNAME!=	/sbin/sysctl -n kern.hostname
 .else
 HOSTNAME!=	/usr/sbin/sysctl -n kern.hostname
 .endif
 
 # The phpBB2 port supports a number of variables that may be tweaked at build
 # time.  Perform a "make options" to see more information on these variables.
 #
 WWWDOCROOT?=	www
 PHPBB_URL?=	phpBB2
 #
 # End of user-configurable variables.
 
 # Set/override/append to variables from bsd.port.mk:
 #
 WRKSRC=		${WRKDIR}/phpBB2
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PHPBB_URL="${PHPBB_URL}" \
 		PHPBBDIR="${PHPBBDIR}" \
 		HOSTNAME="${HOSTNAME}" \
 		DELETEFILES="${EXCEPTFILES}"
 PHPBB_VER=	${PORTVERSION:S/.//g:S/.//g}
 PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 PLIST_SUB+=	PHPBB_VER=${PHPBB_VER}
 
 # Set custom variables:
 #
 PHPBBDIR=	${WWWDOCROOT}/${PHPBB_URL}
 PKGOPTS=	${FILESDIR}/pkg-opts
 EXCEPTFILES=	${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/install.php \
 		${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/upgrade.php \
 		${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/update_to_latest.php
 
 OPTIONS_DEFINE=	DOCS
 
 options:
 	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
 	@ ${CAT} ${PKGOPTS}
 
 pre-everything::
 .if !defined(BATCH)
 	@ ${TEST} -r ${PKGOPTS} && \
 	  (${ECHO_MSG} '-------------------------------------------------------------------------'; \
 	   ${ECHO_MSG} 'Perform a "make options" to see a list of available installation options.'; \
 	   ${ECHO_MSG} '-------------------------------------------------------------------------')
 .endif
 
 post-patch:
 	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBB_URL}/templates#" \
 	  ${WRKSRC}/docs/*.html
 	@${RM} `${FIND} ${WRKSRC} -name '*.orig'`
 
 do-install:
 	@ ${MKDIR} -m 0775 ${STAGEDIR}${PREFIX}/${PHPBBDIR}
 	@ cd ${WRKSRC} && ${FIND} * \( -name config.php \
 	  ${EXCEPTFILES:S/^/-o -name /} \
 	  -o -name docs -a -prune -o -name contrib -a -prune \) -o -print \
 	  | ${TAR} cTf - - | ${TAR} xUCf ${STAGEDIR}${PREFIX}/${PHPBBDIR} -
 	@ ${TOUCH} ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php
 	@ ${MKDIR} ${STAGEDIR}${DATADIR}/contrib
 	@ cd ${WRKSRC} && ${INSTALL_DATA} ${EXCEPTFILES} ${STAGEDIR}${DATADIR}
 	@ cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/contrib
 
 #	@ cd ${DATADIR} && ${INSTALL} -c -o ${WWWOWN} -g ${WWWGRP} \
 #	  ${EXCEPTFILES} ${PREFIX}/${PHPBBDIR}
 	@ ${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@ cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \! -name \*.bak \
 	  \! -name COPYING -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \;
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-couchbase/Makefile b/databases/pecl-couchbase/Makefile
index b40b80f2d960..e2f672e955aa 100644
--- a/databases/pecl-couchbase/Makefile
+++ b/databases/pecl-couchbase/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	couchbase
 PORTVERSION=	4.1.4
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/couchbase/couchbase-php-client/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Couchbase Server PHP extension
 WWW=		https://pecl.php.net/package/couchbase \
 		https://github.com/couchbase/couchbase-php-client
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	cmake:devel/cmake-core
 
 USES=		compiler:c++17-lang php:build,pecl
+IGNORE_WITH_PHP=	83
 
 CONFIGURE_ARGS=	COUCHBASE_CMAKE_EXTRA="-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE=OFF"
 
 .include <bsd.port.mk>
diff --git a/devel/ioncube/Makefile b/devel/ioncube/Makefile
index 52e1e0beb91a..0b312bdfada2 100644
--- a/devel/ioncube/Makefile
+++ b/devel/ioncube/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	ioncube
 DISTVERSION=	12.0.5
 CATEGORIES=	devel
 MASTER_SITES=	http://downloads.ioncube.com/loader_downloads/ \
 		http://downloads2.ioncube.com/loader_downloads/ \
 		http://dl.ispsystem.info/ioncube/${DISTVERSION}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}_loaders_fre_${VER}_${ARCH:S,i386,x86,:S,amd64,x86-64,}
 DIST_SUBDIR=	${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	svyatoslav.lempert@gmail.com
 COMMENT=	Loader for ionCube-encoded PHP files
 WWW=		https://www.ioncube.com/
 
 LICENSE=	IONCUBE-PHP-LOADER
 LICENSE_NAME=	ionCube PHP Loader
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 IGNORE_DragonFly=	is unsupported on DragonFly
 ONLY_FOR_ARCHS=	amd64 i386
 USES=		php:flavors
-IGNORE_WITH_PHP=	80 82
+IGNORE_WITH_PHP=	80 82 83
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 VER=	11
 
 PHP_INSTVER=	${PHP_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/
 	${INSTALL_DATA} ${WRKSRC}/ioncube_loader_fre_${PHP_INSTVER}.so \
 		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader.so
 	${INSTALL_DATA} ${WRKSRC}/ioncube_loader_fre_${PHP_INSTVER}_ts.so \
 		${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader_ts.so
 # Put it before opcache, like the previous pkg-message was saying
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/php
 	@${ECHO_CMD} "[Zend]" > ${STAGEDIR}${PREFIX}/etc/php/ext-05-ioncube.ini
 	@${ECHO_CMD} "zend_extension=${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader.so" >> ${STAGEDIR}${PREFIX}/etc/php/ext-05-ioncube.ini
 	@${ECHO_CMD} "zend_extension_ts=${PREFIX}/lib/php/${PHP_EXT_DIR}/ioncube/ioncube_loader_ts.so" >> ${STAGEDIR}${PREFIX}/etc/php/ext-05-ioncube.ini
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-runkit7/Makefile b/devel/pecl-runkit7/Makefile
index af79afef623d..95c522372ac6 100644
--- a/devel/pecl-runkit7/Makefile
+++ b/devel/pecl-runkit7/Makefile
@@ -1,13 +1,14 @@
 PORTNAME=	runkit7
 PORTVERSION=	4.0.0a6
 CATEGORIES=	devel
 
 MAINTAINER=	vikashb@where-ever.za.net
 COMMENT=	Extension to replace, rename, and remove user functions and classes
 WWW=		https://github.com/runkit7/runkit7
 
 LICENSE=	PHP301
 
 USES=		compiler:c11 php:pecl
+IGNORE_WITH_PHP=	83
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile
index 1e8381752a1e..539baec7ec56 100644
--- a/devel/pecl-swoole/Makefile
+++ b/devel/pecl-swoole/Makefile
@@ -1,34 +1,35 @@
 PORTNAME=	swoole
 PORTVERSION=	5.0.3
 CATEGORIES=	devel net
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Asynchronous, concurrent, and distributed networking framework
 WWW=		https://pecl.php.net/package/swoole
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c11 localbase:ldflags php:build,pecl ssl
+IGNORE_WITH_PHP=	83
 
 CONFIGURE_ARGS+=	--enable-mysqlnd
 
 OPTIONS_DEFINE=		BROTLI CARES CURL HTTP2 JSON PGSQL SOCKETS
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 CARES_CONFIGURE_ON=	--enable-cares
 HTTP2_CONFIGURE_ON=	--enable-http2 \
 			--enable-openssl
 SOCKETS_USE=		PHP=sockets:build
 SOCKETS_DESC=		Use native php sockets extension
 SOCKETS_CONFIGURE_ON=	--enable-sockets
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ON=	--enable-swoole-curl
 CURL_USE=		PHP=curl
 JSON_CONFIGURE_ON=	--enable-swoole-json
 JSON_USES=		php:build
 PGSQL_CONFIGURE_ON=	--enable-swoole-pgsql
 PGSQL_USES=		pgsql
 BROTLI_CONFIGURE_ON=	--enable-brotli
 BROTLI_LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-uv/Makefile b/devel/pecl-uv/Makefile
index 38f3ebea8508..3b8984fe61f2 100644
--- a/devel/pecl-uv/Makefile
+++ b/devel/pecl-uv/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	uv
 PORTVERSION=	0.2.4
 PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	PHP wrapper for libuv
 WWW=		https://pecl.php.net/package/uv
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-12-31
 
 LIB_DEPENDS=	libuv.so:devel/libuv
 
 USES=		php:pecl
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	81 82 83
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-vld/Makefile b/devel/pecl-vld/Makefile
index 74cb444b9863..a40b3661827c 100644
--- a/devel/pecl-vld/Makefile
+++ b/devel/pecl-vld/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	vld
 PORTVERSION=	0.18.0
 CATEGORIES=	devel pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Dump the internal representation of PHP scripts
 WWW=		https://pecl.php.net/package/vld
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		php:pecl
 
 CONFIGURE_ARGS=	--enable-vld
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-xdebug/Makefile b/devel/pecl-xdebug/Makefile
index dacbc2532d66..4d080d07963d 100644
--- a/devel/pecl-xdebug/Makefile
+++ b/devel/pecl-xdebug/Makefile
@@ -1,17 +1,19 @@
 PORTNAME=	xdebug
 DISTVERSION=	3.2.1
 CATEGORIES=	devel pear
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	Xdebug extension for PHP
 WWW=		https://www.xdebug.org/
 
 LICENSE=	PHP30
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFIGURE_ARGS=	--enable-xdebug
 USES=		php:pecl,zend tar:tgz
+IGNORE_WITH_PHP=	83
+
+CONFIGURE_ARGS=	--enable-xdebug
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>
diff --git a/devel/pecl-zookeeper/Makefile b/devel/pecl-zookeeper/Makefile
index d4d1c83a8d7f..b7bb12b1b0a9 100644
--- a/devel/pecl-zookeeper/Makefile
+++ b/devel/pecl-zookeeper/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	zookeeper
 PORTVERSION=	1.0.0
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP extension for interfacing with Apache ZooKeeper
 WWW=		https://pecl.php.net/package/zookeeper
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	libzookeeper>=3.5.0:devel/libzookeeper
 LIB_DEPENDS=	libzookeeper_mt.so:devel/libzookeeper
 
 USES=		php:pecl
 USE_PHP=	session:build
 
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 PORTDATA=	zookeeper-api.php
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/zookeeper-api.php ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/graphics/php-facedetect/Makefile b/graphics/php-facedetect/Makefile
index ad7954e3a196..f7cfc5973d6e 100644
--- a/graphics/php-facedetect/Makefile
+++ b/graphics/php-facedetect/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	facedetect
 PORTVERSION=	1.1
 PORTREVISION=	15
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Face detection extension for PHP using OpenCV library
 WWW=		https://www.xarg.org/project/php-facedetect/
 
 LICENSE=	PHP30
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-12-31
 
 LIB_DEPENDS=	libopencv_objdetect.so:graphics/opencv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	infusion
 GH_PROJECT=	PHP-Facedetect
 GH_TAGNAME=	2a8974b
 
 LIBS+=		-lopencv_core
 
 USES=		compiler:c11 localbase php:ext pkgconfig
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	81 82 83
 
 CONFIGURE_ARGS+=	--with-facedetect
 
 .include <bsd.port.mk>
diff --git a/mail/phplist/Makefile b/mail/phplist/Makefile
index 4d4906da7b94..6b1113b1075a 100644
--- a/mail/phplist/Makefile
+++ b/mail/phplist/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	phplist
 DISTVERSION=	3.6.12
 CATEGORIES=	mail www
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Full-featured open-source newsletter manager
 WWW=		https://www.phplist.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 
 USES=		cpe tar:tgz php:web,flavors
 USE_PHP=	curl gd gettext iconv imap mbstring mysqli session xml zlib
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	phplist
 
 PLIST_SUB=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP}
 PORTDOCS=	CONTRIBUTING.md COPYING INSTALL PEOPLE README.md TODO UPGRADE VERSION
 
 OPTIONS_DEFINE=	DOCS
 
 PEARDIR?=	${LOCALBASE}/share/pear
 
 post-extract:
 	@${MV} ${WRKSRC}/public_html/lists/config/config.php ${WRKSRC}/public_html/lists/config/config.php.sample
 
 # Note: there is file(s) with non-ascii filenames. So it's difficult to add
 # such files to pkg-plist. That's why there is find with delete
 #
 do-install:
 	@${FIND} ${WRKSRC}/public_html/ -type f -regex '.*[^!-~].*' -delete
 	@${FIND} ${WRKSRC}/public_html/ -type l -delete
 	@${FIND} ${WRKSRC}/public_html/ -type d -empty -delete
 	${MKDIR} ${STAGEDIR}${WWWDIR}/
 	(cd ${WRKSRC}/public_html/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 	${INSTALL_SCRIPT} ${WRKDIR}/phplist ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-automatic_addressbook/Makefile b/mail/roundcube-automatic_addressbook/Makefile
index 2cbfb37d4d3c..ae2167f41916 100644
--- a/mail/roundcube-automatic_addressbook/Makefile
+++ b/mail/roundcube-automatic_addressbook/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	automatic_addressbook
 PORTVERSION=	0.4.3
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	andrej@ebert.su
 COMMENT=	Roundcube webmail automatic addressbook plugin
 WWW=		https://github.com/sblaisot/automatic_addressbook
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=0.8:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	sblaisot
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 WWWDIR=		${RCDIR}/plugins/automatic_addressbook
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 RCDIR=		${PREFIX}/www/roundcube
 
 SUB_FILES=	pkg-message
 SUB_LIST=	PLUGINDIR=${WWWDIR} \
 		RCDIR=${RCDIR}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-calendar-kolab/Makefile b/mail/roundcube-calendar-kolab/Makefile
index 78b1643c53d5..1226cce92eaa 100644
--- a/mail/roundcube-calendar-kolab/Makefile
+++ b/mail/roundcube-calendar-kolab/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	calendar
 PORTVERSION=	3.5.11
 CATEGORIES=	mail
 MASTER_SITES=	https://cgit.kolab.org/roundcubemail-plugins-kolab/snapshot/
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	-kolab${PHP_PKGNAMESUFFIX}
 DISTNAME=	roundcubemail-plugins-kolab-${DISTVERSION}
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Roundcube Calendar plugin from Kolab
 WWW=		https://docs.kolab.org/webmail-user-guide/roundcubemail/_plugins/calendar/index.html
 
 LICENSE=	AGPLv3
 
 BUILD_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 WWWDIR=		${PREFIX}/www/roundcube/plugins
 
 post-patch:
 	${REINPLACE_CMD} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 	    ${WRKSRC}/plugins/calendar/config.inc.php.dist
 	${RM} ${WRKSRC}/plugins/calendar/config.inc.php.dist.*
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 .for d in calendar libcalendaring libkolab
 	(cd ${WRKSRC}/plugins && ${COPYTREE_SHARE} $d ${STAGEDIR}${WWWDIR}/)
 .endfor
 	${INSTALL_DATA} ${FILESDIR}/libkolab.min.css \
 		${STAGEDIR}${WWWDIR}/libkolab/skins/elastic/
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-carddav/Makefile b/mail/roundcube-carddav/Makefile
index 7f00ee177d1a..da6ebd12deae 100644
--- a/mail/roundcube-carddav/Makefile
+++ b/mail/roundcube-carddav/Makefile
@@ -1,34 +1,34 @@
 PORTNAME=	carddav
 PORTVERSION=	4.4.4
 DISTVERSIONPREFIX=v
 CATEGORIES=	mail
 MASTER_SITES=	https://github.com/mstilkerich/rcmcarddav/releases/download/${DISTVERSIONFULL}/
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Roundcube CardDAV plugin
 WWW=		https://github.com/mstilkerich/rcmcarddav
 
 LICENSE=	GPLv2
 
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 BUILD_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.5:mail/roundcube@${PHP_FLAVOR}
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.5:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_PHP=	curl dom simplexml sockets tokenizer xml xmlreader xmlwriter
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 WWWDIR=		${PREFIX}/www/roundcube/plugins/carddav
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}/)
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-classic/Makefile b/mail/roundcube-classic/Makefile
index 87cf0081b3ea..06480039e6cf 100644
--- a/mail/roundcube-classic/Makefile
+++ b/mail/roundcube-classic/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	classic
 DISTVERSION=	1.6.0
 CATEGORIES?=	mail www
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Larry skin/theme for Rouncube webmail
 WWW=		https://github.com/roundcube/classic/
 
 LICENSE=	GPLv3+
 
 USES=		cpe php:flavors
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.6.0:mail/roundcube@${PHP_FLAVOR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 CPE_PRODUCT=	webmail
 CPE_VENDOR=	roundcube
 
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 WWWDIR=		${PREFIX}/www/${PKGNAMEPREFIX:S/-//}/skins/${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PKGNAMEPREFIX:S/-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 	@(cd ${WRKSRC}; ${FIND} . -not -type d) | ${SORT} | \
 		${SED} -e 's,^\.,${WWWDIR_REL},' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-contextmenu/Makefile b/mail/roundcube-contextmenu/Makefile
index 45087f590081..396890871963 100644
--- a/mail/roundcube-contextmenu/Makefile
+++ b/mail/roundcube-contextmenu/Makefile
@@ -1,32 +1,32 @@
 PORTNAME=	contextmenu
 PORTVERSION=	3.3.1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	moiseev@mezonplus.ru
 COMMENT=	RoundCube webmail contextmenu plugin
 WWW=		https://github.com/johndoh/roundcube-contextmenu
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.5.0:mail/roundcube@${PHP_FLAVOR}
 
 USES=	php:flavors
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JohnDoh
 GH_PROJECT=	roundcube-contextmenu
 
 PLUGINDIR=	${WWWDIR:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
 RCDIR_REL=	${WWWDIR_REL:S,/${PORTNAME}$$,,}/roundcube
 PLIST_SUB=	RCDIR_REL="${RCDIR_REL}"
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PLUGINDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${PLUGINDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-html5_notifier/Makefile b/mail/roundcube-html5_notifier/Makefile
index 00116faae691..8a6083693235 100644
--- a/mail/roundcube-html5_notifier/Makefile
+++ b/mail/roundcube-html5_notifier/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	html5_notifier
 PORTVERSION=	0.6.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	HTML5 desktop notifier plugin for roundcube
 WWW=		https://github.com/stremlau/html5_notifier
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	stremlau
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 WWWDIR=		${PREFIX}/www/roundcube/plugins/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-larry/Makefile b/mail/roundcube-larry/Makefile
index 008bea429375..a7cdec1814a1 100644
--- a/mail/roundcube-larry/Makefile
+++ b/mail/roundcube-larry/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	larry
 DISTVERSION=	1.6.0
 CATEGORIES?=	mail www
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Larry skin/theme for Rouncube webmail
 WWW=		https://github.com/roundcube/larry/
 
 LICENSE=	GPLv3+
 
 USES=		cpe php:flavors
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.6.0:mail/roundcube@${PHP_FLAVOR}
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 CPE_PRODUCT=	webmail
 CPE_VENDOR=	roundcube
 
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 WWWDIR=		${PREFIX}/www/${PKGNAMEPREFIX:S/-//}/skins/${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	${PKGNAMEPREFIX:S/-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 	@(cd ${WRKSRC}; ${FIND} . -not -type d) | ${SORT} | \
 		${SED} -e 's,^\.,${WWWDIR_REL},' >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-login_info/Makefile b/mail/roundcube-login_info/Makefile
index 63da19cd87e8..cbb031d91bd9 100644
--- a/mail/roundcube-login_info/Makefile
+++ b/mail/roundcube-login_info/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	login_info
 DISTVERSION=	1.5.1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Roundcube login info plugin
 WWW=		https://github.com/marneu/login_info/README.md
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 WWWDIR=		${LOCALBASE}/www/roundcube
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	marneu
 GH_TAGNAME=	b4e8a29
 
 #WRKSRC=		${WRKDIR}/login_info
 
 PLUGDIR=	${WWWDIR}/plugins/login_info
 PLIST_SUB+=	PLUGDIR="www/roundcube/plugins/login_info"
 
 do-install:
 	@${ECHO} "Installing in ${PLUGDIR}"
 	${MKDIR} ${STAGEDIR}/${PLUGDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${PLUGDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-sauserprefs/Makefile b/mail/roundcube-sauserprefs/Makefile
index 1fdfbbb59c35..a5bb5a2fd9b1 100644
--- a/mail/roundcube-sauserprefs/Makefile
+++ b/mail/roundcube-sauserprefs/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	sauserprefs
 PORTVERSION=	1.20
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	stb@lassitu.de
 COMMENT=	Roundcube plugin to manage SpamAssassin prefs
 WWW=		http://www.tehinterweb.co.uk/roundcube/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.5:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 WWWDIR=		${PREFIX}/www/roundcube/plugins/sauserprefs
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	JohnDoh
 GH_PROJECT=	${PKGNAMEPREFIX}${PORTNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}/${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-thunderbird_labels/Makefile b/mail/roundcube-thunderbird_labels/Makefile
index f24fcb3172c4..a52e05f1d158 100644
--- a/mail/roundcube-thunderbird_labels/Makefile
+++ b/mail/roundcube-thunderbird_labels/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	thunderbird_labels
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	moiseev@mezonplus.ru
 COMMENT=	Thunderbird Labels plugin for RoundCube webmail
 WWW=		https://github.com/mike-kfed/roundcube-thunderbird_labels
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.4.0:mail/roundcube@${PHP_FLAVOR}
 
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 USES=		php:flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mike-kfed
 GH_PROJECT=	roundcube-thunderbird_labels
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLUGINDIR=	${WWWDIR:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
 PLUGINDIR_REL=	${WWWDIR_REL:S,/${PORTNAME}$$,,}/roundcube/plugins/${PORTNAME}
 PLIST_SUB=	PLUGINDIR_REL="${PLUGINDIR_REL}"
 
 OPTIONS_DEFINE=	DOCS
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist: build
 	make makeplist | \
 	${SED} \
 	    -e "s,^\(%%PLUGINDIR_REL%%/config\.inc\.php\.sample$$\),@sample \1," \
 	    -e "s,^\(%%PLUGINDIR_REL%%/docs/\),%%PORTDOCS%%\1," \
 	    >${.CURDIR}/pkg-plist.tmp
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PLUGINDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PLUGINDIR}
 	cd ${STAGEDIR}${PLUGINDIR} && \
 		${MV} config.inc.php.dist config.inc.php.sample && \
 		${RM} coffee2js.sh docs/_config.yml && \
 		${RM} -r coffeescripts
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-twofactor_gauthenticator/Makefile b/mail/roundcube-twofactor_gauthenticator/Makefile
index aab1470d92ea..b679824812f6 100644
--- a/mail/roundcube-twofactor_gauthenticator/Makefile
+++ b/mail/roundcube-twofactor_gauthenticator/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	twofactor_gauthenticator
 PORTVERSION=	g20220911
 CATEGORIES=	mail security
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	Roundcube TOTP auth plugin
 WWW=		https://github.com/alexandregz/twofactor_gauthenticator
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	alexandregz
 GH_TAGNAME=	06e21b0
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
 WWWDIR=		${PREFIX}/www/roundcube/plugins/${PORTNAME}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 	cd ${STAGEDIR}${WWWDIR} && \
 		${MV} config.inc.php.dist config.inc.php.sample
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-veximaccountadmin/Makefile b/mail/roundcube-veximaccountadmin/Makefile
index 31ada091ac3e..f5ae3ed591d9 100644
--- a/mail/roundcube-veximaccountadmin/Makefile
+++ b/mail/roundcube-veximaccountadmin/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	veximaccountadmin
 PORTVERSION=	0.1.20171224
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Roundcube vexim account admin plugin
 WWW=		http://axel.sjostedt.no/misc/dev/roundcube/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.3:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 WWWDIR=		${PREFIX}/www/roundcube
 REINPLACE_ARGS=	-i ''
 NO_BUILD=	yes
 
 PLIST_SUB+=	PLUGINDIR="${PLUGINDIR}"
 PLUGINDIR=	${WWWDIR}/plugins/${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vexim
 GH_PROJECT=	Roundcube-Plugin-VeximAccountAdmin
 GH_TAGNAME=	3912bd9
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/new rcube_mdb2/new rcube_db/g' ${WRKSRC}/veximaccountadmin.php
 
 do-install:
 	@${ECHO} "Installing in ${PLUGINDIR}"
 	${MKDIR} ${STAGEDIR}/${PLUGINDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${PLUGINDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube-yubikey_auth/Makefile b/mail/roundcube-yubikey_auth/Makefile
index 4e2020831ccd..ab4eea66aba3 100644
--- a/mail/roundcube-yubikey_auth/Makefile
+++ b/mail/roundcube-yubikey_auth/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	yubikey_auth
 PORTVERSION=	g20180404
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	vidar@karlsen.tech
 COMMENT=	Roundcube yubikey auth plugin
 WWW=		https://github.com/northox/roundcube-yubikey-plugin
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 RUN_DEPENDS=	roundcube${PHP_PKGNAMESUFFIX}>=1.0:mail/roundcube@${PHP_FLAVOR}
 
 USES=		php:flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	northox
 GH_PROJECT=	roundcube-yubikey-plugin
 GH_TAGNAME=	383bbb3
 USE_PHP=	curl
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 WWWDIR=		${PREFIX}/www/roundcube/plugins/roundcube_yubikey_authentication
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's/roundcube_yubikey_plugin/YubiKey OTP/g' \
 		${WRKSRC}/yubikey.js
 	${REINPLACE_CMD} \
 		-e "s/array('yubikey_authentication')/array('roundcube_yubikey_authentication')/g" \
 		-e 's,plugins/yubikey_authentication,plugins/roundcube_yubikey_authentication,g' \
 		${WRKSRC}/README.md
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${PAX} -r -w . ${STAGEDIR}${WWWDIR}
 	cd ${STAGEDIR}${WWWDIR} && \
 		${MV} config.inc.php config.inc.php.sample
 
 .include <bsd.port.mk>
diff --git a/mail/roundcube/Makefile b/mail/roundcube/Makefile
index 1017de67e7a1..75db30b5b28a 100644
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	roundcube
 DISTVERSION=	1.6.1
 PORTEPOCH=	1
 CATEGORIES?=	mail www
 MASTER_SITES=	https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}mail-${DISTVERSION}-complete
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	Fully skinnable XHTML/CSS webmail written in PHP
 WWW=		https://roundcube.net/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe php:web,flavors
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}mail-${DISTVERSION}
 
 RCUBECOMP=	SQL config .htaccess index.php installer logs \
 		plugins program skins temp vendor
 PORTDOCS=	CHANGELOG.md INSTALL README.md UPGRADING
 
 CPE_PRODUCT=	webmail
 CPE_VENDOR=	roundcube
 
 USE_PHP=	mbstring session iconv dom xml intl zip filter fileinfo exif ctype
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 OPTIONS_DEFINE=	LDAP GD PSPELL NSC DOCS EXAMPLES
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL
 
 DB_DESC=	Database backend
 MYSQL_DESC=	Use MySQL backend
 PGSQL_DESC=	Use PostgreSQL backend
 SQLITE_DESC=	Use SQLite backend
 LDAP_DESC=	Enable LDAP support (address book)
 GD_DESC=	Enable GD support (image conversion)
 PSPELL_DESC=	Enable PSpell support (internal spellcheck)
 NSC_DESC=	Install network spellchecker
 
 GD_VARS=	use_php+=gd
 LDAP_VARS=	use_php+=ldap
 MYSQL_VARS=	use_php+=pdo_mysql
 NSC_IMPLIES=	PSPELL
 NSC_VARS=	use_php+=simplexml
 PGSQL_VARS=	use_php+=pdo_pgsql
 PSPELL_VARS=	use_php+=pspell
 SQLITE_VARS=	use_php+=pdo_sqlite
 
 SUB_FILES=	newsyslog.conf
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -type f -delete
 do-install:
 	-${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}
 .for i in ${RCUBECOMP}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR}
 .endfor
 	@(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \
 		${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST}
 	@${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} '@postexec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \
 		>> ${TMPPLIST}
 
 do-install-NSC-on:
 	@${INSTALL_DATA} ${FILESDIR}/spellchecker.php ${STAGEDIR}${WWWDIR}
 	@${ECHO_CMD} '${WWWDIR_REL}/spellchecker.php' >> ${TMPPLIST}
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/newsyslog.conf ${STAGEDIR}${EXAMPLESDIR}
 	@${ECHO_CMD} '@dir etc/newsyslog.conf.d' \
 		>> ${TMPPLIST}
 	@${ECHO_CMD} '@sample ${EXAMPLESDIR}/newsyslog.conf etc/newsyslog.conf.d/roundcube.conf' \
 		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile
index 02721808b083..9e2b560a2a3d 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	change-sqlpass
 PORTVERSION=	3.3
 PORTREVISION=	3
 CATEGORIES=	mail www
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows users to change their passwords stored in a SQL database
 WWW=		https://www.squirrelmail.org/plugin_view.php?id=25
 
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 USE_SM_COMPAT=	yes
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index 65a0337e8409..41261cbb3aae 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	sasql
 PORTVERSION=	3.2.0
 PORTREVISION=	3
 CATEGORIES=	mail www
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit SpamAssassin settings stored in an SQL DB
 WWW=		https://www.squirrelmail.org
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:databases/pear-DB@${PHP_FLAVOR}
 
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/\($$imap_server_type == 'cyrus'\)/\1 || \$$imap_server_type == 'courier'/g" \
 		-e 's/session_register/sqsession_register/g' \
 		${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/sasql_hooks.php
 	-@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/*.bak ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/.cvsignore
 
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile
index 879c49e3956b..621b378b1386 100644
--- a/net-mgmt/glpi-plugins-fusioninventory-server/Makefile
+++ b/net-mgmt/glpi-plugins-fusioninventory-server/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	server
 PORTVERSION=	${GLPI_VER}.${FUNV_VER}
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 PKGNAMEPREFIX=	glpi-plugins-fusioninventory-
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Plugin of glpi to get information of networking devices
 WWW=		https://fusioninventory.org/
 
 LICENSE=	AGPLv3
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-12-31
 
 RUN_DEPENDS=	glpi>=9.5:www/glpi
 
 USES=		gettext php shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	fusioninventory
 GH_PROJECT=	fusioninventory-for-glpi
 GH_TAGNAME=	glpi090+${FUNV_VER}
 USE_PHP=	fileinfo simplexml
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	81 82 83
 
 GLPI_VER=	9.5.0
 FUNV_VER=	1.5
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SHEBANG_FILES=	lib/mustache.js-2.0.0/hooks/install-hooks.sh \
 		scripts/get_agent_jobs.php scripts/cleanup_repository.php \
 		scripts/prepare_jobs.php scripts/get_job_logs.php \
 		tools/extract_template.sh
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 GLPIPLUGINDIR?=	www/glpi/plugins
 
 .include <bsd.port.pre.mk>
 do-install:
 	@${MKDIR} -m 0755 ${STAGEDIR}${PREFIX}/${GLPIPLUGINDIR}
 	@${CP} -R ${WRKSRC} ${STAGEDIR}${PREFIX}/${GLPIPLUGINDIR}/fusioninventory
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
index 320d04284a2f..f08c0ef82291 100644
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -1,216 +1,216 @@
 PORTNAME=	librenms
 PORTVERSION=	23.5.0
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	LOCAL/dvl:vendor
 DISTFILES=	${PORTNAME}-vendor-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX}:vendor
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
 WWW=		https://www.librenms.org
 
 LICENSE=	GPLv3
 
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 # perhaps we also need python-memcache python-mysqldb
 RUN_DEPENDS+=	${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dotenv>0:www/py-python-dotenv@${PY_FLAVOR} \
 		bash:shells/bash \
 		dot:graphics/graphviz \
 		rrdtool:databases/rrdtool \
 		snmpget:net-mgmt/net-snmp \
 		sudo:security/sudo
 
 USES=		cpe php python shebangfix
 USE_GITHUB=	yes
 USE_PHP=	ctype curl dom fileinfo filter gd ldap mbstring \
 		mysqli pdo pdo_mysql phar posix readline session simplexml snmp \
 		sockets tokenizer xml xmlwriter zip
 USE_RC_SUBR=	librenms
 
 SHEBANG_FILES=	../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php \
 		poller-wrapper.py poller.php scripts/auth_test.php \
 		scripts/check_requirements.py \
 		scripts/dynamic_check_requirements.py scripts/github-remove \
 		scripts/ifAlias \
 		scripts/Migration/Standard_Conversion/convert_no_xml.sh \
 		scripts/Migration/Standard_Conversion/destwork_no_xml.sh \
 		scripts/Migration/Standard_Conversion/mkdir.sh \
 		scripts/Migration/XML_Conversion/convert.sh \
 		scripts/Migration/XML_Conversion/destwork.sh \
 		scripts/Migration/XML_Conversion/mkdir.sh \
 		scripts/removespikes.php scripts/removespikes.pl \
 		scripts/watchmaillog/watchmaillog.pl
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES+=	librenms.cron pkg-message
 SUB_LIST+=	GROUP="${WWWGRP}" \
 		PHP="${PHPBASE}/bin/php" \
 		PYTHON=${PYTHON_CMD} \
 		USER="${WWWOWN}" \
 		WWWDIR="${WWWDIR}"
 
 USERS=		www
 
 PORTDOCS=	*
 PORTEXAMPLES=	snmpd.conf.example
 
 DBDIR=		/var/db/${PORTNAME}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS \
 			NMAP WMIC X11
 OPTIONS_DEFAULT=	FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC
 
 FPING_DESC=	Enable fping support ping monitoring
 IPMITOOL_DESC=	Enable support for monitoring hardware IPMI
 MYSQLD_DESC=	Use local MySQL server
 WMIC_DESC=	Enable support for WMI polling
 
 FPING_RUN_DEPENDS=	fping:net/fping
 IPMITOOL_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
 LIBVIRT_RUN_DEPENDS=	virsh:devel/libvirt
 MYSQLD_USES=		mysql:server
 MYSQLD_USES_OFF=	mysql:client
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 NMAP_RUN_DEPENDS=	nmap:security/nmap
 WMIC_RUN_DEPENDS=	wmic:net-mgmt/wmi-client
 X11_RUN_DEPENDS=	mtr:net/mtr
 X11_RUN_DEPENDS_OFF=	mtr:net/mtr-nox11
 X11_USES=		magick:6
 X11_USES_OFF=		magick:6,nox11
 
 _ROOT_FILES=		addhost.php alerts.php artisan \
 			billing-calculate.php check-services.php composer.json \
 			composer.lock config.php.default config_to_json.php \
 			cronic daily.php delhost.php discovery-wrapper.py \
 			discovery.php dist-pollers.php irc.php \
 			librenms-service.py mkdocs.yml pbin.sh phpunit.xml \
 			ping.php poll-billing.php poller.php poller-wrapper.py \
 			renamehost.php snmp-scan.py snmptrap.php syslog.php \
 			validate.php
 _SCRIPT_FILES=		daily.sh lnms
 # _RELEASE_TIMESTAMP is used for a patch inside the vendor code
 # it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01
 # It sits here so you remember to update it with each release
 _RELEASE_TIMESTAMP=	1684510339
 _ROOT_DIRS=		LibreNMS app bootstrap config database doc html \
 			includes licenses mibs misc resources routes scripts \
 			sql-schema tests
 _DOCS=			AUTHORS.md CHANGELOG.md CONTRIBUTING.md LICENSE.txt \
 			README.md
 
 # these are directories which require a generic @DIR entry in pkg-plist
 _STORAGE_DIRS=	app app/public debugbar framework framework/cache \
 		framework/cache/data framework/sessions framework/testing \
 		framework/views logs
 # these are directories which require a generic @DIR entry in pkg-plist
 _OTHER_DIRS=	database/seeders/config html/plugins html/js/lang \
 		resources/views/overview/custom tests/Browser/console \
 		tests/Browser/screenshots \
 		vendor/librenms/laravel-vue-i18n-generator/tests/output \
 		vendor/symfony/string/Resources/bin
 
 
 post-patch:
 	${REINPLACE_CMD}    's|%%LOCALBASE%%|${LOCALBASE}|g'                  ${WRKSRC}/LibreNMS/Validations/Php.php
 	${REINPLACE_CMD}    's|%%LOCALBASE%%|${LOCALBASE}|g'                  ${WRKSRC}/LibreNMS/Util/Version.php
 	${REINPLACE_CMD}    's|%%PORTVERSION%%|${PORTVERSION}|g'              ${WRKSRC}/LibreNMS/Util/Version.php
 	${REINPLACE_CMD}    's|%%RELEASE_TIMESTAMP%%|${_RELEASE_TIMESTAMP}|g' ${WRKSRC}/LibreNMS/Util/Version.php
 	${REINPLACE_CMD}    's|%%LOCALBASE%%|${LOCALBASE}|g'                  ${WRKSRC}/includes/html/output/capture.inc.php
 	${REINPLACE_CMD}    's|%%LOCALBASE%%|${LOCALBASE}|g'                  ${WRKSRC}/config.php.default
 	${REINPLACE_CMD}    's|%%LOCALBASE%%|${LOCALBASE}|g'                  ${WRKSRC}/poller-wrapper.py
 	${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php
 	${RM} -rf ${WRKSRC}/logs
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${WWWDIR} ${STAGEDIR}/${PREFIX}/etc/cron.d
 .for dir in ${_ROOT_DIRS}
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir}
 	(cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir})
 .endfor
 .for f in ${_ROOT_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
 .endfor
 .for f in ${_SCRIPT_FILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
 .endfor
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/vendor
 	(cd ${WRKDIR}/${PORTNAME}-vendor-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/vendor)
 
 # As of 1.66_1, the package installs bootstrap/cache
 # This was previously left to the code to populate.
 # That causese problems when the code doesn't do that update.
 	${MV} ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache/* ${STAGEDIR}/${WWWDIR}/bootstrap/cache/
 	${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/bootstrap-cache
 
 # similarly with html/js/lang
 	${MV} ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang/* ${STAGEDIR}/${WWWDIR}/html/js/lang/
 	${RM} -rf ${STAGEDIR}/${WWWDIR}/vendor/html-js-lang
 
 # Make daily.sh executable
 #	${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/daily.sh
 # lnms does not fall into any other +x category
 #	${CHMOD} 0755 ${STAGEDIR}/${WWWDIR}/lnms
 # Files in scripts dir should be executable
 	${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \;
 # Ensure PHP and Python scripts are executable
 	${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \
 	       '*.php' -exec ${CHMOD} +x {} \;
 # these values should be outside the www tree now
 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DBDIR}
 	${MKDIR} ${STAGEDIR}${DBDIR}/storage
 	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 	(cd ${STAGEDIR}/${WWWDIR} && ${LN} -s ../../../..${DBDIR}/storage)
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for f in ${_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}/${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR}
 .endfor
 
 post-install:
 	${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' -or -name '.gitignore' ')' -delete
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${INSTALL_DATA}	${WRKDIR}/librenms.cron ${STAGEDIR}/${PREFIX}/etc/cron.d/librenms
 
 # we do this file separately because it needs a different chmod/chown
 # it will eventually contains secrets
 	${INSTALL_DATA} ${WRKSRC}/.env.example ${STAGEDIR}/${WWWDIR}
 	${ECHO_CMD} "@dir(www,www,0775) ${DBDIR}/storage"     >> ${TMPPLIST}
 	${ECHO_CMD} "@dir(www,www,0775) ${DBDIR}"             >> ${TMPPLIST}
 	${ECHO_CMD} "@dir(www,www,0775) /var/log/${PORTNAME}" >> ${TMPPLIST}
 	${ECHO_CMD} "@(root,www,0750) ${WWWDIR}/.env.example" >> ${TMPPLIST}
 
 	${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/bootstrap/cache" >> ${TMPPLIST}
 	${ECHO_CMD} "@dir(www,www,0775) /var/run/${PORTNAME}"      >> ${TMPPLIST}
 .for f in ${_STORAGE_DIRS}
 	${MKDIR} ${STAGEDIR}/${DBDIR}/storage/${f}
 	${ECHO_CMD} "@dir(root,www,0775) ${DBDIR}/storage/${f}" >> ${TMPPLIST}
 .endfor
 .for f in ${_OTHER_DIRS}
 	${ECHO_CMD} "@dir(root,www,0775) ${WWWDIR}/${f}" >> ${TMPPLIST}
 .endfor
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} ${FILESDIR}/newsyslog.conf.sample ${STAGEDIR}/${PREFIX}/etc/newsyslog.conf.d/librenms.conf.sample
 	${ECHO_CMD} "@dir etc/newsyslog.conf.d" >> ${TMPPLIST}
 	${ECHO_CMD} "@dir etc/cron.d"           >> ${TMPPLIST}
 	${ECHO_CMD} "etc/cron.d/librenms"       >> ${TMPPLIST}
 
 	${ECHO_CMD} "@sample etc/newsyslog.conf.d/librenms.conf.sample" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/nagiosql/Makefile b/net-mgmt/nagiosql/Makefile
index de03ea152c18..7b8f35eedce1 100644
--- a/net-mgmt/nagiosql/Makefile
+++ b/net-mgmt/nagiosql/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	nagiosql
 PORTVERSION=	3.5.0.20230311
 CATEGORIES=	net-mgmt www
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Web based administration tool for Nagios
 WWW=		https://gitlab.com/wizonet/nagiosql
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 USES=		cpe gettext mysql php:web tar:bzip2
 USE_PHP=	filter gettext mysqli session simplexml
 USE_GITLAB=	yes
 GL_ACCOUNT=	wizonet
 GL_COMMIT=	7e40440fa5e0a4a81a3a40c2895b248bfabcdd84
 
 USERS?=		nagios
 GROUPS?=	nagios
 NAGIOSUSER?=	nagios
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
 PEARDIR?=	${LOCALBASE}/share/pear
 
 OPTIONS_DEFINE=	CURL FTP NAGIOS4
 CURL_DESC=	Configure with cURL support
 FTP_DESC=	Configure with FTP support
 NAGIOS4_DESC=	Configure with Nagios 4
 
 CURL_USE=	PHP=curl
 FTP_USE=	PHP=ftp
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNAGIOS4}
 RUN_DEPENDS=	${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR} \
 		nagios:net-mgmt/nagios4
 .else
 RUN_DEPENDS=	${PEARDIR}/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR} \
 		nagios:net-mgmt/nagios
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e "s|'/etc/nagiosql/|'${ETCDIR}/|g" \
 		-e "s|/opt/nagios/etc/objects/|${LOCALBASE}/etc/nagios/objects/|" \
 		-e "s|/opt/nagios/bin/nagios|${LOCALBASE}/bin/nagios|" \
 		-e "s|/var/nagios/nagios.lock|/var/spool/nagios/nagios.lock|" \
 		-e "s|/var/nagios/rw/nagios.cmd|/var/spool/nagios/rw/nagios.cmd|" \
 		-e "s|nagios/etc/|etc/nagios/|" \
 		-e "s|nagiosql/etc/|${ETCDIR}/|" \
 		-e "s|>/etc/nagiosql|>${ETCDIR}|g" \
 		-e "s|>/etc/nagios/|>${LOCALBASE}/etc/nagios/|g" \
 		${WRKSRC}/install/sql/nagiosQL_v32_db_mysql.sql
 
 	${REINPLACE_CMD} -e "s|\"/etc/|\"${LOCALBASE}/etc/|" \
 		${WRKSRC}/install/install.php
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/ssh
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/hosts
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/services
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/backup
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/backup/hosts
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/backup/services
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/backup/ssh
 	@${MKDIR} ${STAGEDIR}/var/spool/nagios
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "! ( -name *\.orig -o -name *\.bak )")
 
 post-install:
 	${FIND} -s ${STAGEDIR}${WWWDIR} -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -type f | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${ETCDIR} -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/#@dir #' >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${ETCDIR} -type f | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(nagios,nagios,0775) /var/spool/nagios" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
index 6c0bce1875ea..d00d69f5b340 100644
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -1,135 +1,135 @@
 # Observium version can be found by looking at ${WRKSRC}/includes/definitions/version.inc.php
 
 PORTNAME=	observium
 PORTVERSION=	0.19.8
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.observium.org/
 DISTNAME=	${PORTNAME}-community-latest
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
 WWW=		https://observium.org
 
 LICENSE=	EULA
 LICENSE_NAME=	"Observium License Version 1.0"
 LICENSE_FILE=	${WRKSRC}/LICENSE.COMMUNITY
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		cpe php:cli,flavors python:3.5+ shebangfix
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 SHEBANG_FILES=	\
 		poller-wrapper.py \
 		poller.php \
 		scripts/
 
 USE_PHP=	ctype filter gd iconv mcrypt mysqli posix session snmp tokenizer xml zlib
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 RUN_DEPENDS+=	rrdtool:databases/rrdtool \
 		dot:graphics/graphviz \
 		mtr:net/mtr-nox11 \
 		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \
 		snmpget:net-mgmt/net-snmp \
 		sudo:security/sudo
 LIB_DEPENDS+=	libpng.so:graphics/png
 
 OPTIONS_DEFINE=	APACHEMOD DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC
 OPTIONS_DEFAULT=	APACHEMOD FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SUBVERSION WMIC
 APACHEMOD_DESC=	Use PHP with Apache 2.4+ module
 FPING_DESC=	Enable fping support ping monitoring
 IPMITOOL_DESC=	Enable support for monitoring hardware IPMI
 MYSQLD_DESC=	Use local MySQL server
 WMIC_DESC=	Enable support for WMI polling
 PYPOLLER_DESC=	Enable Python Poller Wrapper
 
 FPING_RUN_DEPENDS=	fping:net/fping
 IPMITOOL_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
 LIBVIRT_RUN_DEPENDS=	virsh:devel/libvirt
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 NMAP_RUN_DEPENDS=	nmap:security/nmap
 PYPOLLER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.3.13:databases/py-mysqlclient@${PY_FLAVOR}
 SUBVERSION_RUN_DEPENDS=	svn:devel/subversion
 WMIC_RUN_DEPENDS=	wmic:net-mgmt/wmi-client
 
 .include <bsd.port.options.mk>
 
 SUB_FILES+=	pkg-message observium.conf.sample
 SUB_LIST+=	PHP="${PREFIX}/bin/php" PYTHON="${PYTHON_CMD}"
 
 ROOT_FILES=	add_device.php adduser.php alerter.php \
 		check-errors.php check-services.php config_to_json.php \
 		config.php.default delete_device.php discovery.php housekeeping.php \
 		irc.php poller-wrapper.py poller.php rename_device.php \
 		snmp.conf.example snmpd.conf.example \
 		snmptrap.php snmptrap.php syslog.php test_alert.php test_code.php VERSION
 ROOT_DIRS=	html includes libs logs mibs rrd scripts templates tests update
 
 PORTDOCS=	INSTALL README VERSION
 PORTEXAMPLES=	snmp.conf.example snmpd.conf.example
 
 .if ${PORT_OPTIONS:MAPACHEMOD}
 USES+=	apache:run
 .endif
 .if !defined(PACKAGE_BUILDING)
 USES+=	php:mod
 .else
 # Package builder doesn't create php5 with module
 USES+=	php:web
 .endif
 
 .if ${PORT_OPTIONS:MMYSQLD}
 USES+=	mysql:server
 .else
 USES+=	mysql:client
 .endif
 
 post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php
 	${FIND} ${WRKSRC} -type d -empty -delete
 	${MKDIR} ${WRKSRC}/logs ${WRKSRC}/rrd
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${WWWDIR} ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes
 	${INSTALL_DATA} ${WRKDIR}/observium.conf.sample ${STAGEDIR}/${PREFIX}/${APACHEETCDIR}/Includes
 .for dir in ${ROOT_DIRS}
 	${MKDIR} ${STAGEDIR}/${WWWDIR}/${dir}
 	(cd ${WRKSRC}/${dir} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/${dir})
 .endfor
 .for f in ${ROOT_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
 .endfor
 # Files in scripts dir should be executable
 	${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \;
 # Ensure PHP and Python scripts are executable
 	${FIND} ${STAGEDIR}/${WWWDIR} -type f -name '*.py' -or -type f -name \
 		'*.php' -exec ${CHMOD} +x {} \;
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${DOCSDIR}
 .endfor
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${EXAMPLESDIR}
 .endfor
 
 post-install:
 	@${ECHO_CMD}  "@sample ${APACHEETCDIR}/Includes/observium.conf.sample" >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${WWWDIR} -type f '(' -name '*.orig' -or -name '*.bak' ')' -delete
 	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/logs" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(www,www,0775) ${WWWDIR}/rrd" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/phpipam/Makefile b/net-mgmt/phpipam/Makefile
index 487be208bdf2..af161da1bd55 100644
--- a/net-mgmt/phpipam/Makefile
+++ b/net-mgmt/phpipam/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	phpipam
 DISTVERSION=	1.5.2
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	jake@xz.cx
 COMMENT=	PHP IP Address Management IPv4/IPv6
 WWW=		https://phpipam.net/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
 
 USES=		cpe gettext php:web tar:
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 USE_GITHUB=	yes
 GH_TAGNAME=	be8a2c4
 
 USE_PHP=	ctype curl dom filter gd gettext gmp iconv mbstring mcrypt \
 		pcntl pdo pdo_mysql posix session simplexml sockets
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 CFGFILE=	config.php
 
 SUB_FILES=	pkg-message
 SUB_LIST=	DISTNAME=${DISTNAME}
 
 OPTIONS_DEFINE=	LDAP
 
 LDAP_USE=	PHP=ldap
 
 pre-install:
 	@if [ -f ${WRKSRC}/${CFGFILE} ]; then \
 	${MV} ${WRKSRC}/${CFGFILE} ${WRKSRC}/${CFGFILE}.sample ; \
 	fi
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} \
 		"! -name *.orig")
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/phpweathermap/Makefile b/net-mgmt/phpweathermap/Makefile
index 36bd92d47e1c..ceb06be09d8f 100644
--- a/net-mgmt/phpweathermap/Makefile
+++ b/net-mgmt/phpweathermap/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	phpweathermap
 PORTVERSION=	0.97a
 PORTREVISION=	3
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.network-weathermap.com/files/
 DISTNAME=	php-weathermap-${PORTVERSION}
 
 MAINTAINER=	hhyou@cs.nctu.edu.tw
 COMMENT=	Network visualisation tool with web editor
 WWW=		https://www.network-weathermap.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/Console/Getopt.php:devel/pear@${PHP_FLAVOR} \
 		rrdtool:databases/rrdtool
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		php zip
 USE_PHP=	gd
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 WM_FILES=	HTML_ImageMap.class.php WeatherMap.functions.php \
 		WeatherMapLink.class.php WeatherMapNode.class.php \
 		Weathermap.class.php weathermap.conf
 
 WM_WWW_FILES=	overlib.js editor-config.php-dist editor.css \
 		editor.inc.php editor.js editor.php
 
 WM_WWW_DIRS=	editor-resources images docs
 
 PORTDOCS=	CHANGES COPYING README
 WRKSRC=		${WRKDIR}/weathermap
 
 SUB_FILES=	pkg-message
 
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/editor.php
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g' \
 			    -e 's|%%PREFIX%%|${PREFIX}|'  ${WRKSRC}/weathermap
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${DATADIR}/www/configs
 	@${INSTALL_SCRIPT} ${WRKSRC}/weathermap ${STAGEDIR}/${PREFIX}/bin/phpweathermap
 	@for i in ${WM_FILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}/${DATADIR}/$$i; \
 	done
 	@for i in ${WM_WWW_FILES}; do \
 		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}/${DATADIR}/www/$$i; \
 	done
 	@${CP} -R ${WRKSRC}/lib ${STAGEDIR}/${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "${WM_WWW_DIRS}" ${STAGEDIR}/${DATADIR}/www)
 
 do-install-EXAMPLES-on:
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "random-bits" ${STAGEDIR}/${EXAMPLESDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/pecl-amqp/Makefile b/net/pecl-amqp/Makefile
index d789425c4996..c38a14a9c65c 100644
--- a/net/pecl-amqp/Makefile
+++ b/net/pecl-amqp/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	amqp
 PORTVERSION=	1.11.0
 PORTREVISION=	1
 CATEGORIES=	net pear
 
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	PHP extension for AMQP API
 WWW=		https://pecl.php.net/package/amqp
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	librabbitmq.so:net/rabbitmq-c
 
 USES=		php:pecl localbase
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 .include <bsd.port.mk>
diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index 97d7e6c5fb31..fc35282dc586 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	mailzu
 DISTVERSION=	0.8rc3
 PORTREVISION=	9
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	MailZu_${DISTVERSION:S/rc/RC/}
 
 MAINTAINER=	ports@bsdserwis.com
 COMMENT=	Simple and intuitive web interface to manage amavisd-new quarantine
 WWW=		https://sourceforge.net/projects/mailzu/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/amavisd:security/amavisd-new \
 		${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
 		${PEARDIR}/Mail/mime.php:mail/pear-Mail_Mime@${PHP_FLAVOR} \
 		${PEARDIR}/Mail/mimeDecode.php:mail/pear-Mail_mimeDecode@${PHP_FLAVOR} \
 		${PEARDIR}/Net/Socket.php:net/pear-Net_Socket@${PHP_FLAVOR}
 
 USES=		php:flavors,web
 USE_PHP=	sockets
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 PLIST_SUB=	WWWGRP="${WWWGRP}" \
 		WWWOWN="${WWWOWN}"
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS IMAP LDAP
 OPTIONS_DEFAULT=	MYSQL
 OPTIONS_MULTI=		SQL
 OPTIONS_MULTI_SQL=	MYSQL PGSQL
 
 IMAP_DESC=	Use IMAP auth backend
 LDAP_DESC=	Use LDAP auth backend
 MYSQL_DESC=	Use MySQL database storage/auth backend (default)
 PGSQL_DESC=	Use PostgreSQL database/auth storage backend
 SQL_DESC=	SQL sotage backend
 
 IMAP_USE=	PHP=imap
 LDAP_USE=	PHP=ldap
 MYSQL_USE=	PHP=mysqli
 PGSQL_USE=	PHP=pgsql
 
 PEARDIR?=	${LOCALBASE}/share/pear
 
 post-patch:
 	${INSTALL_DATA} ${FILESDIR}/pl.*.php ${WRKSRC}/lang/
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.php ${WRKSRC}/*.js ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "config contrib img lang lib templates" \
 		${STAGEDIR}${WWWDIR} "! -name '*.orig'")
 	(cd ${WRKSRC} && ${COPYTREE_BIN} scripts ${STAGEDIR}${WWWDIR})
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/snuffleupagus/Makefile b/security/snuffleupagus/Makefile
index 0db1814d6885..760ea57d8f80 100644
--- a/security/snuffleupagus/Makefile
+++ b/security/snuffleupagus/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	snuffleupagus
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.3
 CATEGORIES=	security
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	franco@opnsense.org
 COMMENT=	Security module for PHP
 WWW=		https://snuffleupagus.readthedocs.io/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 USES=		localbase:ldflags php:build,ext
 USE_GITHUB=	yes
 GH_ACCOUNT=	jvoisin
 USE_PHP=	session:build
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 CONFIGURE_ARGS=	--enable-snuffleupagus
 
 TEST_TARGET=	test
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 WRKSRC_SUBDIR=	src
 
 .include <bsd.port.mk>
diff --git a/www/glpi/Makefile b/www/glpi/Makefile
index cfc77b167b34..a47b1067bb21 100644
--- a/www/glpi/Makefile
+++ b/www/glpi/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	glpi
 PORTVERSION=	10.0.7
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/glpi-project/glpi/releases/download/${PORTVERSION}/
 
 MAINTAINER=	mathias@monnerville.com
 COMMENT=	Free IT and asset management software
 WWW=		https://glpi-project.org/
 
 LICENSE=	GPLv2
 
 USES=		cpe gettext php tar:tgz
 CPE_VENDOR=	glpi-project
 USE_PHP=	bz2 ctype curl exif fileinfo gd iconv intl mbstring \
 		mysqli opcache session simplexml sodium xml xmlrpc zip zlib \
 		dom filter
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	GLPIDIR=${GLPIDIR} PREFIX=${PREFIX}
 GLPIDIR?=	www/${PORTNAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=	LDAP IMAP
 OPTIONS_DEFAULT=	LDAP IMAP
 
 IMAP_DESC=	IMAP support
 IMAP_USE=	PHP=imap
 LDAP_USE=	PHP=ldap
 
 post-extract:
 	${FIND} ${WRKSRC} \( -name '*~' -o -name '*.orig' -o -name '*.rej' \) -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 171fcd073818..22ad1de0beab 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -1,126 +1,126 @@
 PORTNAME=	ilias
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.2
 CATEGORIES=	www education
 PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Powerful, dynamic, PHP and MySQL based e-learning platform
 WWW=		https://www.ilias.de
 
 LICENSE=	GPLv2
 
 # Will switch to version 9 snapshots before the removal
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-12-31
 
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	81 82 83
 
 LIB_DEPENDS=	libpng.so:graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/HTML/Template/IT.php:devel/pear-HTML_Template_IT@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/MDB2.php:databases/pear-MDB2@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/PEAR.php:devel/pear@${PHP_FLAVOR} \
 		${UNZIP_CMD}:archivers/unzip \
 		composer:devel/php-composer2@${PHP_FLAVOR} \
 		sudo:security/sudo \
 		zip:archivers/zip
 
 USES=		cpe jpeg magick:6,run php:flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	ILIAS-eLearning
 GH_PROJECT=	ILIAS
 USE_PHP=	curl dom gd ldap fileinfo \
 		pdo_mysql session simplexml soap \
 		tokenizer xmlrpc xmlwriter xsl zlib
 
 CONFLICTS=	ilias6
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ILIASFILESDIR=${ILIASFILESDIR}
 
 PLIST=		${WRKDIR}/plist
 PLIST_SUB=	ILIASFILESDIR=${ILIASFILESDIR}
 
 OPTIONS_DEFINE=	CHECKER MAIL
 
 CHECKER_RUN_DEPENDS=	${LOCALBASE}/share/pear/HTTP/Request.php:www/pear-HTTP_Request@${PHP_FLAVOR}
 MAIL_RUN_DEPENDS=	${LOCALBASE}/share/pear/Mail.php:mail/pear-Mail@${PHP_FLAVOR}
 
 ILIASDIR=	www/ilias
 ILIASFILESDIR=	www/iliasfiles
 
 EXTRA_FILES=	%%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/mime \
 		%%WWWDIR%%/Modules/Chatroom/chat/node_modules/.bin/uuid \
 		%%WWWDIR%%/node_modules/.bin/_mocha \
 		%%WWWDIR%%/node_modules/.bin/acorn \
 		%%WWWDIR%%/node_modules/.bin/atob \
 		%%WWWDIR%%/node_modules/.bin/browserslist \
 		%%WWWDIR%%/node_modules/.bin/browserslist-lint \
 		%%WWWDIR%%/node_modules/.bin/errno \
 		%%WWWDIR%%/node_modules/.bin/escodegen \
 		%%WWWDIR%%/node_modules/.bin/esgenerate \
 		%%WWWDIR%%/node_modules/.bin/esparse \
 		%%WWWDIR%%/node_modules/.bin/esvalidate \
 		%%WWWDIR%%/node_modules/.bin/flat \
 		%%WWWDIR%%/node_modules/.bin/gl-style-composite \
 		%%WWWDIR%%/node_modules/.bin/gl-style-format \
 		%%WWWDIR%%/node_modules/.bin/gl-style-migrate \
 		%%WWWDIR%%/node_modules/.bin/gl-style-validate \
 		%%WWWDIR%%/node_modules/.bin/he \
 		%%WWWDIR%%/node_modules/.bin/image-size \
 		%%WWWDIR%%/node_modules/.bin/js-yaml \
 		%%WWWDIR%%/node_modules/.bin/jsesc \
 		%%WWWDIR%%/node_modules/.bin/json5 \
 		%%WWWDIR%%/node_modules/.bin/lessc \
 		%%WWWDIR%%/node_modules/.bin/loose-envify \
 		%%WWWDIR%%/node_modules/.bin/mime \
 		%%WWWDIR%%/node_modules/.bin/mkdirp \
 		%%WWWDIR%%/node_modules/.bin/mocha \
 		%%WWWDIR%%/node_modules/.bin/nanoid \
 		%%WWWDIR%%/node_modules/.bin/needle \
 		%%WWWDIR%%/node_modules/.bin/node-gyp \
 		%%WWWDIR%%/node_modules/.bin/node-ninja \
 		%%WWWDIR%%/node_modules/.bin/nopt \
 		%%WWWDIR%%/node_modules/.bin/pbf \
 		%%WWWDIR%%/node_modules/.bin/parser \
 		%%WWWDIR%%/node_modules/.bin/prebuild \
 		%%WWWDIR%%/node_modules/.bin/regjsparser \
 		%%WWWDIR%%/node_modules/.bin/rimraf \
 		%%WWWDIR%%/node_modules/.bin/rc \
 		%%WWWDIR%%/node_modules/.bin/rollup \
 		%%WWWDIR%%/node_modules/.bin/semver \
 		%%WWWDIR%%/node_modules/.bin/terser \
 		%%WWWDIR%%/node_modules/.bin/which \
 		%%WWWDIR%%/node_modules/@babel/core/node_modules/.bin/semver \
 		%%WWWDIR%%/node_modules/@babel/helper-compilation-targets/node_modules/.bin/semver \
 		%%WWWDIR%%/node_modules/@babel/helper-define-polyfill-provider/node_modules/.bin/semver \
 		%%WWWDIR%%/node_modules/@babel/preset-env/node_modules/.bin/semver \
 		%%WWWDIR%%/node_modules/babel-plugin-polyfill-corejs2/node_modules/.bin/semver \
 		%%WWWDIR%%/node_modules/acorn-globals/node_modules/.bin/acorn \
 		%%WWWDIR%%/node_modules/regjsparser/node_modules/.bin/jsesc
 
 pre-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
 	@${ECHO_CMD} "@mode 755" >> ${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${ILIASDIR}?g" >> ${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${ILIASDIR}?g" >> ${PLIST}
 .for i in ${EXTRA_FILES}
 	@${ECHO_CMD} ${i} >> ${PLIST}
 .endfor
 	@${ECHO_CMD} "${ILIASFILESDIR}/config.json" >> ${PLIST}
 	@${ECHO_CMD} @dir ${ILIASFILESDIR} >> ${PLIST}
 	@${ECHO_CMD} "@mode" >> ${PLIST}
 	@${ECHO_CMD} "@group" >> ${PLIST}
 	@${ECHO_CMD} "@owner" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${ILIASFILESDIR}
 	@${CP} ${FILESDIR}/config.json ${STAGEDIR}${PREFIX}/${ILIASFILESDIR}
 
 .include <bsd.port.mk>
diff --git a/www/moodle311/Makefile b/www/moodle311/Makefile
index f6150345a43e..38c46691c9ba 100644
--- a/www/moodle311/Makefile
+++ b/www/moodle311/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	moodle
 PORTVERSION=	3.11.14
 CATEGORIES=	www education
 MASTER_SITES=	SF/moodle/Moodle/stable311/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Course management system based on social constructionism
 WWW=		https://www.moodle.org/
 
 LICENSE=	GPLv3
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-06-30
 
 CONFLICTS=	moodle39-3.9.[0-9]* moodle40-4.0.[0-9]* moodle41-4.1.[0-9]* \
 		moodle42-4.2
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom fileinfo filter gd iconv intl mbstring \
 		opcache session simplexml soap sodium tokenizer \
 		xml xmlreader xmlrpc zip zlib
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	81 82 83
 
 WRKSRC=		${WRKDIR}/moodle
 
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
 OPTIONS_DEFINE=		LDAP
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_USES=	mysql
 MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 LDAP_USE=	php=ldap
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
 SUB_LIST=	MOODLEDIR=${MOODLEDIR} \
 		MOODLEDATADIR=${MOODLEDATADIR}
 
 MOODLEDIR?=	www/moodle
 MOODLEDATADIR?=	moodledata
 
 pre-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
 	@${ECHO_CMD} "@mode 755" >> ${PLIST}
 	@${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST}
 	@${ECHO_CMD} "@mode" >> ${PLIST}
 	@${ECHO_CMD} "@group" >> ${PLIST}
 	@${ECHO_CMD} "@owner" >> ${PLIST}
 
 #  Here for safety I do not set moodle diretory 0755 permission
 #  It require user write config.php manually then.
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/moodle40/Makefile b/www/moodle40/Makefile
index e78d2c6e525d..b8a89c6e3a1e 100644
--- a/www/moodle40/Makefile
+++ b/www/moodle40/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	moodle
 PORTVERSION=	4.0.8
 CATEGORIES=	www education
 MASTER_SITES=	SF/moodle/Moodle/stable400/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Course management system based on social constructionism
 WWW=		https://www.moodle.org/
 
 LICENSE=	GPLv3
 
 DEPRECATED=	Requires php80 which is set to expire on 2023-11-26
 EXPIRATION_DATE=	2023-06-30
 
 CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle41-4.1.[0-9]* \
 		moodle42-4.2
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom exif fileinfo filter gd \
 		iconv intl mbstring opcache \
 		session simplexml soap sodium tokenizer \
 		xml xmlreader xmlrpc zip zlib
-IGNORE_WITH_PHP=	81 82
+IGNORE_WITH_PHP=	81 82 83
 
 WRKSRC=		${WRKDIR}/moodle
 
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
 OPTIONS_DEFINE=		LDAP
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_USES=	mysql
 MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 LDAP_USE=	php=ldap
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
 SUB_LIST=	MOODLEDIR=${MOODLEDIR} \
 		MOODLEDATADIR=${MOODLEDATADIR}
 
 MOODLEDIR?=	www/moodle
 MOODLEDATADIR?=	moodledata
 
 pre-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
 	@${ECHO_CMD} "@mode 755" >> ${PLIST}
 	@${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST}
 	@${ECHO_CMD} "@mode" >> ${PLIST}
 	@${ECHO_CMD} "@group" >> ${PLIST}
 	@${ECHO_CMD} "@owner" >> ${PLIST}
 
 #  Here for safety I do not set moodle diretory 0755 permission
 #  It require user write config.php manually then.
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/moodle41/Makefile b/www/moodle41/Makefile
index 989aaa883255..8e9602c0d73b 100644
--- a/www/moodle41/Makefile
+++ b/www/moodle41/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	moodle
 PORTVERSION=	4.1.3
 CATEGORIES=	www education
 MASTER_SITES=	SF/moodle/Moodle/stable401/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Course management system based on social constructionism
 WWW=		https://www.moodle.org/
 
 LICENSE=	GPLv3
 
 CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle40-4.0.[0-9]* \
 		moodle42-4.2
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom exif fileinfo filter gd \
 		iconv intl mbstring opcache \
 		session simplexml soap sodium tokenizer \
 		xml xmlreader xmlrpc zip zlib
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 WRKSRC=		${WRKDIR}/moodle
 
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
 OPTIONS_DEFINE=		LDAP
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_USES=	mysql
 MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 LDAP_USE=	php=ldap
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
 SUB_LIST=	MOODLEDIR=${MOODLEDIR} \
 		MOODLEDATADIR=${MOODLEDATADIR}
 
 MOODLEDIR?=	www/moodle
 MOODLEDATADIR?=	moodledata
 
 pre-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
 	@${ECHO_CMD} "@mode 755" >> ${PLIST}
 	@${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST}
 	@${ECHO_CMD} "@mode" >> ${PLIST}
 	@${ECHO_CMD} "@group" >> ${PLIST}
 	@${ECHO_CMD} "@owner" >> ${PLIST}
 
 #  Here for safety I do not set moodle diretory 0755 permission
 #  It require user write config.php manually then.
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/moodle42/Makefile b/www/moodle42/Makefile
index 78ab79f6560c..c9c1b8fa40f2 100644
--- a/www/moodle42/Makefile
+++ b/www/moodle42/Makefile
@@ -1,62 +1,62 @@
 PORTNAME=	moodle
 PORTVERSION=	4.2
 CATEGORIES=	www education
 MASTER_SITES=	SF/moodle/Moodle/stable402/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Course management system based on social constructionism
 WWW=		https://www.moodle.org/
 
 LICENSE=	GPLv3
 
 CONFLICTS=	moodle39-3.9.[0-9]* moodle311-3.11.[0-9]* moodle40-4.0.[0-9]* \
 		moodle41-4.1.[0-9]*
 
 USES=		cpe php:flavors tar:tgz
 USE_PHP=	ctype curl dom exif fileinfo filter gd \
 		iconv intl mbstring opcache \
 		session simplexml soap sodium tokenizer \
 		xml xmlreader xmlrpc zip zlib
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 WRKSRC=		${WRKDIR}/moodle
 
 OPTIONS_SINGLE=		BACKEND
 OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
 OPTIONS_DEFINE=		LDAP
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_USES=	mysql
 MYSQL_USE=	php=mysqli
 PGSQL_USE=	php=pgsql
 LDAP_USE=	php=ldap
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
 SUB_FILES=	pkg-message
 SUB_LIST=	MOODLEDIR=${MOODLEDIR} \
 		MOODLEDATADIR=${MOODLEDATADIR}
 
 MOODLEDIR?=	www/moodle
 MOODLEDATADIR?=	moodledata
 
 pre-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
 	@${ECHO_CMD} "@mode 755" >> ${PLIST}
 	@${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST}
 	@${ECHO_CMD} "@mode" >> ${PLIST}
 	@${ECHO_CMD} "@group" >> ${PLIST}
 	@${ECHO_CMD} "@owner" >> ${PLIST}
 
 #  Here for safety I do not set moodle diretory 0755 permission
 #  It require user write config.php manually then.
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/nibbleblog/Makefile b/www/nibbleblog/Makefile
index 311409024381..7fd5732e5bad 100644
--- a/www/nibbleblog/Makefile
+++ b/www/nibbleblog/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	nibbleblog
 PORTVERSION=	3.0.2
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/v${PORTVERSION}/
 DISTNAME=	nibbleblogv302
 
 MAINTAINER=	marekholienka@gmail.com
 COMMENT=	Lightweight blog system for general use
 WWW=		https://www.nibbleblog.com/
 
 RUN_DEPENDS=	pear:devel/pear@${PHP_FLAVOR}
 
 USES=		cpe php zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 USE_PHP=	session filter xml simplexml gd
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	APACHE LIGHTTPD
 OPTIONS_DEFAULT=	APACHE
 
 APACHE_USES=		apache:run
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CP} -r ${WRKDIR}/${PORTNAME}/ ${STAGEDIR}${WWWDIR}
 
 .include <bsd.port.mk>
diff --git a/www/osticket/Makefile b/www/osticket/Makefile
index 6674dbfd9c65..f4568e605623 100644
--- a/www/osticket/Makefile
+++ b/www/osticket/Makefile
@@ -1,38 +1,38 @@
 PORTNAME=	osticket
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17.3
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/osTicket/osTicket/releases/download/v${DISTVERSION}/
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 DISTNAME=	osTicket-v${DISTVERSION}
 
 MAINTAINER=	otis@FreeBSD.org
 COMMENT=	Widely-used open source support ticket system
 WWW=		https://osticket.com/
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apcu.so:devel/pecl-APCu@${PHP_FLAVOR}
 
 USES=		cpe php:web zip
 CPE_VENDOR=	enhancesoft
 USE_PHP=	ctype curl dom fileinfo filter gd gettext iconv imap intl \
 		mbstring mysqli opcache phar session xml zip
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	WWGRP=${WWWGRP} \
 		WWWOWN=${WWWOWN}
 
 WRKSRC=		${WRKDIR}/upload
 
 PLIST_SUB=	WWWGRP=${WWWGRP} \
 		WWWOWN=${WWWOWN}
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 	${MV} ${STAGEDIR}${WWWDIR}/include/ost-sampleconfig.php \
 	  ${STAGEDIR}${WWWDIR}/include/ost-config.php.sample
 
 .include <bsd.port.mk>
diff --git a/www/pecl-yaf/Makefile b/www/pecl-yaf/Makefile
index 4de02e447df8..ce14f4c7f153 100644
--- a/www/pecl-yaf/Makefile
+++ b/www/pecl-yaf/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	yaf
 PORTVERSION=	3.3.5
 CATEGORIES=	www
 
 MAINTAINER=	sunpoet@freeBSD.org
 COMMENT=	MVC framework written as a C PHP extension
 WWW=		https://pecl.php.net/package/yaf
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpcre.so:devel/pcre
 
 USES=		localbase php:pecl
 
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 .include <bsd.port.mk>
diff --git a/www/pecl-yar/Makefile b/www/pecl-yar/Makefile
index c66ea384a2c8..e0d56d02d729 100644
--- a/www/pecl-yar/Makefile
+++ b/www/pecl-yar/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	yar
 PORTVERSION=	2.3.2
 CATEGORIES=	www
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Yar (Yet another RPC framework) is a light, concurrent RPC framework
 WWW=		https://pecl.php.net/package/yar
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl
 
 USES=		localbase:ldflags php:build,pecl
 USE_PHP=	curl
 
-IGNORE_WITH_PHP=82
+IGNORE_WITH_PHP=82 83
 
 OPTIONS_DEFINE=	MSGPACK
 OPTIONS_DEFAULT=MSGPACK
 MSGPACK_DESC=	Enable MSGPACK module
 
 MSGPACK_BUILD_DEPENDS=	${PECL_PKGNAMEPREFIX}msgpack>=0:devel/pecl-msgpack@${PHP_FLAVOR}
 MSGPACK_RUN_DEPENDS=	${PECL_PKGNAMEPREFIX}msgpack>=0:devel/pecl-msgpack@${PHP_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index b17e28543602..7f810f1931cb 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -1,83 +1,83 @@
 PORTNAME=	phpbb
 PORTVERSION=	2.0.23
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/phpBB%202/phpBB%20v${PORTVERSION}
 DISTNAME=	phpBB-${PORTVERSION}
 
 MAINTAINER=	liukang@cn.freebsd.org
 COMMENT=	PHP-based bulletin board / discussion forum system
 WWW=		https://www.phpbb.com/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:devel/pear@${PHP_FLAVOR}
 
 CONFLICTS=	phpbb-tw
 
 USES=		cpe tar:bzip2 php
-IGNORE_WITH_PHP=	82
+IGNORE_WITH_PHP=	82 83
 
 # The phpBB2 port supports a number of variables that may be tweaked at build
 # time.  Perform a "make options" to see more information on these variables.
 #
 WWWDOCROOT?=	www
 PHPBBURL?=	phpBB2
 #
 # End of user-configurable variables.
 
 # Set/override/append to variables from bsd.port.mk:
 #
 WRKSRC=		${WRKDIR}/phpBB2
 NO_BUILD=	yes
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	PHPBBURL="${PHPBBURL}" \
 		PHPBBDIR="${PHPBBDIR}" \
 		DELETEFILES="${EXCEPTFILES:S,${STAGEDIR},,g}"
 PHPBB_VER=	${PORTVERSION:S/.//g:S/.//g}
 PLIST_SUB+=	PHPBBDIR=${PHPBBDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 PLIST_SUB+=	PHPBB_VER=${PHPBB_VER}
 
 # Set custom variables:
 #
 PHPBBDIR=	${WWWDOCROOT}/${PHPBBURL}
 PKGOPTS=	${FILESDIR}/pkg-opts
 EXCEPTFILES=	${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/install.php \
 		${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/upgrade.php \
 		${STAGEDIR}${PREFIX}/${PHPBBDIR}/install/update_to_latest.php
 
 OPTIONS_DEFINE=	DOCS
 
 options:
 	@ ${ECHO_MSG} "===>  Build options for ${PKGNAME}:"
 	@ ${CAT} ${PKGOPTS}
 
 pre-everything::
 .if !defined(BATCH)
 	@ ${TEST} -r ${PKGOPTS} && \
 	  (${ECHO_MSG} '-------------------------------------------------------------------------'; \
 	   ${ECHO_MSG} 'Perform a "make options" to see a list of available installation options.'; \
 	   ${ECHO_MSG} '-------------------------------------------------------------------------')
 .endif
 
 post-patch:
 	@ ${REINPLACE_CMD} -e "s#\.\./templates#/${PHPBBURL}/templates#" \
 	  ${WRKSRC}/docs/*.html
 	@${FIND} ${WRKSRC} -name '*.orig' -or -name '*.bak' -delete
 
 do-install:
 	@${MKDIR} -m 0775 ${STAGEDIR}${PREFIX}/${PHPBBDIR}
 	@cd ${WRKSRC} && ${FIND} * \( -name config.php \
 	  ${EXCEPTFILES:S/^/-o -name /} \
 	  -o -name docs -a -prune -o -name contrib -a -prune \) -o -print \
 	  | ${TAR} cTf - - | ${TAR} xUCf ${STAGEDIR}${PREFIX}/${PHPBBDIR} -
 	@${INSTALL_DATA} ${WRKSRC}/config.php ${STAGEDIR}${PREFIX}/${PHPBBDIR}/config.php.example
 	@${MKDIR} ${STAGEDIR}${DATADIR}/contrib
 	@cd ${WRKSRC} && ${INSTALL_DATA} ${EXCEPTFILES} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/contrib && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/contrib
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/docs && ${FIND} * -type f -maxdepth 0 \
 	  \! -name COPYING -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR} \;
 
 .include <bsd.port.mk>
diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile
index 03c24ec96749..e07a14b78599 100644
--- a/www/thundersnarf/Makefile
+++ b/www/thundersnarf/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	thundersnarf
 PORTVERSION=	1.3
 PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.tracanelli.com.br/l/dev/thunder/ \
 		LOCAL/jmelo
 
 MAINTAINER=	eksffa@freebsdbrasil.com.br
 COMMENT=	Web reporting and trending analysis for Thunder Cache Pro
 WWW=		http://www.thundercache.com.br
 
 OPTIONS_DEFINE=	APACHE PHP PGSQL DOCS
 OPTIONS_DEFAULT=APACHE PHP PGSQL
 APACHE_DESC=	Install apache for reporting viewing
 PHP_DESC=	Install PHP for reporting generating
 PGSQL_DESC=	Install PostgreSQL (report data storing)
 
 USES=		tar:bzip2
 
 PHP_USES=	php
-PHP_VARS=	IGNORE_WITH_PHP=81 82
+PHP_VARS=	IGNORE_WITH_PHP=81 82 83
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_SUB=	OWNER=${WWWOWN} GROUP=${WWWGRP}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPACHE}
 USES+=		apache:run
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
 USES+=		pgsql
 WANT_PGSQL=	server
 .endif
 
 .if ${PORT_OPTIONS:MPHP}
 USE_PHP+=	curl bcmath pdo mcrypt session pgsql spl dom xmlrpc ctype simplexml soap
 .  if ${PORT_OPTIONS:MPGSQL}
 USE_PHP+=	pdo_pgsql pgsql
 .  endif
 .endif
 
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 SUB_FILES=	pkg-message
 
 post-extract:
 	# Present on FreeBSD 8 and 9 after extraction
 	@${RM} ${WRKSRC}/protected/data/bin/._thundersnarf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/protected/data/bin/thundersnarf* \
 		${STAGEDIR}${PREFIX}/bin/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README.pt_BR
 
 .include <bsd.port.mk>
diff --git a/www/typo3-12/Makefile b/www/typo3-12/Makefile
index 7b29884fea6d..e5be07726180 100644
--- a/www/typo3-12/Makefile
+++ b/www/typo3-12/Makefile
@@ -1,78 +1,78 @@
 PORTNAME=	typo3
 PORTVERSION=	${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
 #PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://typo3.azureedge.net/typo3/${PORTVERSION}/
 PKGNAMESUFFIX=	-${PORT_V_MAJOR}${PHP_PKGNAMESUFFIX}
 DISTNAME=	${PORTNAME}_src-${PORTVERSION}
 
 MAINTAINER=	freebsd-ports@charlieroot.de
 COMMENT=	Typo3 content management system
 WWW=		https://typo3.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 IGNORE_WITH_MYSQL=	56 57 101m 102m
-IGNORE_WITH_PHP=	80 82
+IGNORE_WITH_PHP=	80 82 83
 
 USES=		cpe php:web,flavors shebangfix
 USE_PHP=	ctype dom fileinfo filter gd intl \
 		mbstring openssl pdo session simplexml \
 		tokenizer xml zip zlib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_src-${PORTVERSION}
 SHEBANG_GLOB=	*.sh *.php
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTSCOUT=	limit:^${PORT_V_MAJOR}\.${PORT_V_MINOR}\.
 SUB_FILES=	pkg-message
 SUB_LIST+=	PREFIX=${PREFIX} \
 		TYPO3WWW=${TYPO3WWW} \
 		TYPO3DIR=${TYPO3DIR}
 
 PORT_V_MAJOR=	12
 PORT_V_MINOR=	4
 PORT_V_PATCH=	1
 
 TYPO3DIR=	www/${PORTNAME}-${PORT_V_MAJOR}
 
 OPTIONS_DEFINE=	CURL GMP IMAGICK MYSQL POSTGRES SQLITE
 OPTIONS_DEFAULT=MYSQL
 
 IMAGICK_DESC=	${IMAGEMAGICK_DESC}
 MBSTRING_DESC=	${MULTIBYTE_DESC}
 MYSQL_DESC=	Use MySQL as DBMS
 POSTGRES_DESC=	Use PostgreSQL as DBMS
 SQLITE_DESC=	Use SQLite as DBMS
 
 CURL_USE=	PHP=curl
 GMP_USE=	PHP=gmp
 MYSQL_USE=	PHP=mysqli
 POSTGRES_USE=	PHP=pgsql
 SQLITE_USE=	PHP=sqlite3
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGICK}
 .if ${PORT_OPTIONS:MX11}
 USES+=		magick:7,run
 .else
 USES+=		magick:7,run,nox11
 .endif
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TYPO3DIR}
 
 post-install:
 	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode 755" >> ${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${TYPO3DIR}?g" >>${TMPPLIST}
 	@${FIND} -s -d ${WRKSRC} -type d  | ${SED} "s?${WRKSRC}?@dir ${TYPO3DIR}?g" >> ${TMPPLIST}
 	@${ECHO_CMD} "@mode" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
 
 .include <bsd.port.mk>