diff --git a/lang/php80/Makefile b/lang/php80/Makefile
index af3a05a4b654..8e441c1ec5c0 100644
--- a/lang/php80/Makefile
+++ b/lang/php80/Makefile
@@ -1,163 +1,163 @@
 PORTNAME=	php80
-DISTVERSION=	8.0.17
-PORTREVISION?=	3
+DISTVERSION=	8.0.18
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP
 DISTNAME=	php-${DISTVERSION}
 DIST_SUBDIR=	php
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	PHP Scripting Language
 
 LICENSE=	PHP301
 
 USES+=		compiler:c11 tar:xz cpe gnome pkgconfig
 CPE_PRODUCT=	php
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libargon2.so:security/libargon2
 
 GNU_CONFIGURE=	yes
 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
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MYSQLND LINKTHR ZTS
 OPTIONS_DEFAULT=CLI CGI FPM EMBED MYSQLND LINKTHR DTRACE
 OPTIONS_EXCLUDE_DragonFly=	DTRACE
 # ld(1) fails to link probes: Relocations in generic ELF (EM: 0)
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 # dt_modtext:opensolaris/ib/libdtrace/common/dt_link.c: arm not impemented
 OPTIONS_EXCLUDE_armv6=		DTRACE
 OPTIONS_EXCLUDE_armv7=		DTRACE
 # Bug 197128:  No ASM code for MIPS/MIPS64, disable FPM
 OPTIONS_EXCLUDE_mips=		DTRACE FPM
 OPTIONS_EXCLUDE_mips64=		DTRACE FPM
 OPTIONS_EXCLUDE_powerpc64=		${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
 OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
 OPTIONS_EXCLUDE_riscv64=	DTRACE
 OPTIONS_EXCLUDE_sparc64=	DTRACE
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 
 CGI_DESC=	Build CGI version
 CLI_DESC=	Build CLI version
 EMBED_DESC=	Build embedded library
 FPM_DESC=	Build FPM version
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 MYSQLND_DESC=	Build with MySQL Native Driver
 PHPDBG_DESC=	Interactive PHP debugger
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
 CGI_CONFIGURE_OFF=--disable-cgi
 CGI_VARS=	PHP_SAPI+=cgi
 CLI_CONFIGURE_OFF=--disable-cli
 CLI_VARS=	PHP_SAPI+=cli
 DEBUG_CONFIGURE_ON=--enable-debug
 DTRACE_CONFIGURE_ON=--enable-dtrace
 EMBED_CONFIGURE_ON=--enable-embed
 EMBED_VARS=	PHP_SAPI+=embed
 FPM_CONFIGURE_ON=--enable-fpm \
 		--with-fpm-user=${WWWOWN} \
 		--with-fpm-group=${WWWGRP}
 FPM_VARS=	PHP_SAPI+=fpm USE_RC_SUBR+=php-fpm
 IPV6_CONFIGURE_OFF=--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 MYSQLND_CONFIGURE_ON=--enable-mysqlnd
 PHPDBG_CONFIGURE_ON=--enable-phpdbg
 PHPDBG_VARS=	PHP_SAPI+=phpdbg
 ZTS_CONFIGURE_ON=--enable-zts
 ZTS_CONFIGURE_ENV=	pthreads_working="yes"
 
 DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 CONFIGURE_ARGS+=--without-pcre-jit
 .endif
 
 .if defined(PKGNAMEPREFIX)
 USES+=		apache:2.2+
 .include "${PORTSDIR}/Mk/Uses/apache.mk"
 .if ${PORT_OPTIONS:MAP2FILTER}
 CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
 .else
 CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
 MODULENAME=	libphp
 SHORTMODNAME=	php
 WARNING=	"!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
 .endif
 
 .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=--enable-phpdbg-debug
 .endif
 
 .if ${PORT_OPTIONS:MCLI} || ${PORT_OPTIONS:MEMBED}
 PLIST_SUB+=	SAPI_INC=""
 .else
 PLIST_SUB+=	SAPI_INC="@comment "
 .endif
 
 CONFIGURE_ENV+=	ac_cv_decimal_fp_supported="no" \
 		lt_cv_path_SED="sed" \
 		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/ext/php_config.h
 	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
 
 post-patch-FPM-on:
 	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
 		${WRKSRC}/sapi/fpm/php-fpm.conf.in
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} MAKE=${MAKE_CMD} ./buildconf --force)
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
 	@${ECHO_CMD} "PHP_VER=80" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} -n "PHP_EXT_DIR=" >> ${WRKDIR}/php.conf
 	@${SH} ${WRKSRC}/scripts/php-config --extension-dir | ${SED} -ne 's,^${PREFIX}/lib/php/,,p' >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_EXT_INC=hash json openssl pcre spl" >> ${WRKDIR}/php.conf
 
 test: build
 	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/php.ini-development ${WRKSRC}/php.ini-production \
 		${WRKDIR}/php.conf ${STAGEDIR}/${PREFIX}/etc
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 .include "${MASTERDIR}/Makefile.ext"
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/php80/distinfo b/lang/php80/distinfo
index f99e765748ca..1348869ba78b 100644
--- a/lang/php80/distinfo
+++ b/lang/php80/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647565520
-SHA256 (php/php-8.0.17.tar.xz) = 4e7d94bb3d144412cb8b2adeb599fb1c6c1d7b357b0d0d0478dc5ef53532ebc5
-SIZE (php/php-8.0.17.tar.xz) = 10771016
+TIMESTAMP = 1650059162
+SHA256 (php/php-8.0.18.tar.xz) = db161652cacae4b31c347fbf2e17b80656473cb365f2bb3460c4552f5647e2e7
+SIZE (php/php-8.0.18.tar.xz) = 10871224
diff --git a/net/php80-soap/Makefile b/net/php80-soap/Makefile
index 9a0a799c40b2..9188b01d8760 100644
--- a/net/php80-soap/Makefile
+++ b/net/php80-soap/Makefile
@@ -1,10 +1,9 @@
-PORTREVISION=	2
 CATEGORIES=	net
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-soap
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-dom/Makefile b/textproc/php80-dom/Makefile
index 465c04b6a30a..b91d1ceaee6b 100644
--- a/textproc/php80-dom/Makefile
+++ b/textproc/php80-dom/Makefile
@@ -1,10 +1,9 @@
-PORTREVISION=	2
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-dom
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-simplexml/Makefile b/textproc/php80-simplexml/Makefile
index ab152fc45c46..c8bbfd273d84 100644
--- a/textproc/php80-simplexml/Makefile
+++ b/textproc/php80-simplexml/Makefile
@@ -1,10 +1,9 @@
-PORTREVISION=	2
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-simplexml
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-xml/Makefile b/textproc/php80-xml/Makefile
index 3c3a531c95db..343ee8b24d53 100644
--- a/textproc/php80-xml/Makefile
+++ b/textproc/php80-xml/Makefile
@@ -1,10 +1,9 @@
-PORTREVISION=	2
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-xml
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-xmlreader/Makefile b/textproc/php80-xmlreader/Makefile
index 05b128e304ff..870b8cc7314a 100644
--- a/textproc/php80-xmlreader/Makefile
+++ b/textproc/php80-xmlreader/Makefile
@@ -1,10 +1,9 @@
-PORTREVISION=	2
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-xmlreader
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-xmlwriter/Makefile b/textproc/php80-xmlwriter/Makefile
index daf6533e625f..c98b7578e0b3 100644
--- a/textproc/php80-xmlwriter/Makefile
+++ b/textproc/php80-xmlwriter/Makefile
@@ -1,10 +1,9 @@
-PORTREVISION=	2
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-xmlwriter
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-xsl/Makefile b/textproc/php80-xsl/Makefile
index 4fdc773adc76..5b29c0a1c9ad 100644
--- a/textproc/php80-xsl/Makefile
+++ b/textproc/php80-xsl/Makefile
@@ -1,10 +1,9 @@
-PORTREVISION=	2
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-xsl
 
 TEST_TARGET=	test
 
 .include "${MASTERDIR}/Makefile"