diff --git a/archivers/php83-phar/files/patch-config.m4 b/archivers/php83-phar/files/patch-config.m4
deleted file mode 100644
index b17f5099072c..000000000000
--- a/archivers/php83-phar/files/patch-config.m4
+++ /dev/null
@@ -1,41 +0,0 @@
---- config.m4.orig	2023-06-06 15:54:29 UTC
-+++ config.m4
-@@ -4,8 +4,38 @@ PHP_ARG_ENABLE([phar],
-     [Disable phar support])],
-   [yes])
- 
-+PHP_ARG_WITH(pcre-dir, pcre install prefix,
-+[  --with-pcre-dir           PHAR: pcre install prefix], no, no)
-+
-+
- if test "$PHP_PHAR" != "no"; then
-+
-+  dnl This is PECL build, check if bundled PCRE library is used
-+  old_CPPFLAGS=$CPPFLAGS
-+  CPPFLAGS=$INCLUDES
-+  AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+  ],[
-+    PHP_PCRE_REGEX=yes
-+  ],[
-+    AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+    ],[
-+      PHP_PCRE_REGEX=pecl
-+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
-+    ],[
-+      PHP_PCRE_REGEX=no
-+    ])
-+  ])
-+
-   PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-+  PHP_HASH=yes
-   AC_MSG_CHECKING([for phar openssl support])
-   if test "$PHP_OPENSSL_SHARED" = "yes"; then
-     AC_MSG_RESULT([no (shared openssl)])
diff --git a/databases/php83-dba/files/patch-config.m4 b/databases/php83-dba/files/patch-config.m4
index f93406046ff3..52274722f660 100644
--- a/databases/php83-dba/files/patch-config.m4
+++ b/databases/php83-dba/files/patch-config.m4
@@ -1,50 +1,26 @@
---- config.m4.orig	2023-06-06 15:54:29 UTC
+--- config.m4.orig	2023-11-07 20:02:05 UTC
 +++ config.m4
-@@ -387,6 +387,38 @@ if test "$PHP_DB4" != "no"; then
+@@ -387,6 +387,14 @@ if test "$PHP_DB4" != "no"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/db5.3/db.h
        break
 +    elif test -f "$i/include/db5/db.h"; then
 +      THIS_PREFIX=$i
 +      THIS_INCLUDE=$i/include/db5/db.h
 +      break
-+    elif test -f "$i/include/db48/db.h"; then
++    elif test -f "$i/include/db18/db.h"; then
 +      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db48/db.h
-+      break
-+    elif test -f "$i/include/db47/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db47/db.h
-+      break
-+    elif test -f "$i/include/db46/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db46/db.h
-+      break
-+    elif test -f "$i/include/db44/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db44/db.h
-+      break
-+    elif test -f "$i/include/db43/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db43/db.h
-+      break
-+    elif test -f "$i/include/db42/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db42/db.h
-+      break
-+    elif test -f "$i/include/db41/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db41/db.h
++      THIS_INCLUDE=$i/include/db18/db.h
 +      break
      elif test -f "$i/include/db5.1/db.h"; then
        THIS_PREFIX=$i
        THIS_INCLUDE=$i/include/db5.1/db.h
-@@ -429,7 +461,7 @@ if test "$PHP_DB4" != "no"; then
+@@ -429,7 +437,7 @@ if test "$PHP_DB4" != "no"; then
        break
      fi
    done
 -  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+  PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++  PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db-18 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
  fi
  PHP_DBA_STD_RESULT(db4,Berkeley DB4)
  
diff --git a/databases/php83-mysqli/files/patch-mysqli__api.c b/databases/php83-mysqli/files/patch-mysqli__api.c
deleted file mode 100644
index a100e8205fb6..000000000000
--- a/databases/php83-mysqli/files/patch-mysqli__api.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- mysqli_api.c.orig	2020-09-29 22:36:51 UTC
-+++ mysqli_api.c
-@@ -29,7 +29,9 @@
- #include "zend_smart_str.h"
- #include "php_mysqli_structs.h"
- #include "mysqli_priv.h"
-+#if defined(MYSQLI_USE_MYSQLND)
- #include "ext/mysqlnd/mysql_float_to_double.h"
-+#endif
- 
- #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
- 
diff --git a/databases/php83-odbc/files/patch-config.m4 b/databases/php83-odbc/files/patch-config.m4
index 1b28c64c9d69..7cb9492b32f9 100644
--- a/databases/php83-odbc/files/patch-config.m4
+++ b/databases/php83-odbc/files/patch-config.m4
@@ -1,112 +1,101 @@
---- config.m4.orig	2023-06-06 15:54:29 UTC
+--- config.m4.orig	2023-11-07 20:02:05 UTC
 +++ config.m4
-@@ -91,7 +91,10 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[
- dnl
- dnl configure options
- dnl
-+PHP_ARG_ENABLE(odbc,,
-+[  --enable-odbc             Enable ODBC support with selected driver])
- 
-+
- PHP_ARG_WITH([odbcver],,
-   [AS_HELP_STRING([[--with-odbcver[=HEX]]],
-     [Force support for the passed ODBC version. A hex number is expected,
-@@ -102,7 +105,7 @@ PHP_ARG_WITH([odbcver],,
+@@ -102,7 +102,7 @@ PHP_ARG_WITH([adabas],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([adabas],,
    [AS_HELP_STRING([[--with-adabas[=DIR]]],
 -    [Include Adabas D support [/usr/local]])])
 +    [Include Adabas D support [/usr/local]])], [no], [no])
  
    AC_MSG_CHECKING([for Adabas support])
    if test "$PHP_ADABAS" != "no"; then
-@@ -132,7 +135,7 @@ fi
+@@ -132,7 +132,7 @@ PHP_ARG_WITH([sapdb],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([sapdb],,
    [AS_HELP_STRING([[--with-sapdb[=DIR]]],
 -    [Include SAP DB support [/usr/local]])])
 +    [Include SAP DB support [/usr/local]])], [no], [no])
  
    AC_MSG_CHECKING([for SAP DB support])
    if test "$PHP_SAPDB" != "no"; then
-@@ -153,7 +156,7 @@ fi
+@@ -153,7 +153,7 @@ PHP_ARG_WITH([solid],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([solid],,
    [AS_HELP_STRING([[--with-solid[=DIR]]],
 -    [Include Solid support [/usr/local/solid]])])
 +    [Include Solid support [/usr/local/solid]])], [no], [no])
  
    AC_MSG_CHECKING(for Solid support)
    if test "$PHP_SOLID" != "no"; then
-@@ -181,7 +184,7 @@ fi
+@@ -181,7 +181,7 @@ PHP_ARG_WITH([ibm-db2],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([ibm-db2],,
    [AS_HELP_STRING([[--with-ibm-db2[=DIR]]],
 -    [Include IBM DB2 support [/home/db2inst1/sqllib]])])
 +    [Include IBM DB2 support [/home/db2inst1/sqllib]])], [no], [no])
  
    AC_MSG_CHECKING(for IBM DB2 support)
    if test "$PHP_IBM_DB2" != "no"; then
-@@ -222,7 +225,7 @@ if test -z "$ODBC_TYPE"; then
+@@ -222,7 +222,7 @@ PHP_ARG_WITH([empress],,
  PHP_ARG_WITH([empress],,
    [AS_HELP_STRING([[--with-empress[=DIR]]],
      [Include Empress support $EMPRESSPATH (Empress Version >= 8.60
 -    required)])])
 +    required)])], [no], [no])
  
    AC_MSG_CHECKING(for Empress support)
    if test "$PHP_EMPRESS" != "no"; then
-@@ -248,7 +251,7 @@ if test -z "$ODBC_TYPE"; then
+@@ -248,7 +248,7 @@ PHP_ARG_WITH([empress-bcs],,
  PHP_ARG_WITH([empress-bcs],,
    [AS_HELP_STRING([[--with-empress-bcs[=DIR]]],
      [Include Empress Local Access support $EMPRESSPATH (Empress Version >=
 -    8.60 required)])])
 +    8.60 required)])], [no], [no])
  
    AC_MSG_CHECKING(for Empress local access support)
    if test "$PHP_EMPRESS_BCS" != "no"; then
-@@ -294,7 +297,7 @@ PHP_ARG_WITH([custom-odbc],,
+@@ -294,7 +294,7 @@ PHP_ARG_WITH([custom-odbc],,
      your include dirs. For example, you should define following for Sybase SQL
      Anywhere 5.5.00 on QNX, prior to running this configure script:
      CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix
 -    CUSTOM_ODBC_LIBS="-ldblib -lodbc"])])
 +    CUSTOM_ODBC_LIBS="-ldblib -lodbc"])], [no], [no])
  
    AC_MSG_CHECKING(for a custom ODBC support)
    if test "$PHP_CUSTOM_ODBC" != "no"; then
-@@ -317,7 +320,7 @@ fi
+@@ -317,7 +317,7 @@ PHP_ARG_WITH([iodbc],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([iodbc],,
    [AS_HELP_STRING([--with-iodbc],
 -    [Include iODBC support])])
 +    [Include iODBC support])], [no], [no])
  
    AC_MSG_CHECKING(whether to build with iODBC support)
    if test "$PHP_IODBC" != "no"; then
-@@ -335,7 +338,7 @@ fi
+@@ -335,7 +335,7 @@ PHP_ARG_WITH([esoob],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([esoob],,
    [AS_HELP_STRING([[--with-esoob[=DIR]]],
 -    [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])])
 +    [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])], [no], [no])
  
    AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
    if test "$PHP_ESOOB" != "no"; then
-@@ -358,7 +361,7 @@ fi
+@@ -358,7 +358,7 @@ PHP_ARG_WITH([unixODBC],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([unixODBC],,
    [AS_HELP_STRING([--with-unixODBC],
 -    [Include unixODBC support])])
 +    [Include unixODBC support])], [no], [no])
  
    AC_MSG_CHECKING(whether to build with unixODBC support)
    if test "$PHP_UNIXODBC" != "no"; then
-@@ -386,7 +389,7 @@ fi
+@@ -386,7 +386,7 @@ PHP_ARG_WITH([dbmaker],,
  if test -z "$ODBC_TYPE"; then
  PHP_ARG_WITH([dbmaker],,
    [AS_HELP_STRING([[--with-dbmaker[=DIR]]],
 -    [Include DBMaker support])])
 +    [Include DBMaker support])], [no], [no])
  
    AC_MSG_CHECKING(for DBMaker support)
    if test "$PHP_DBMAKER" != "no"; then
diff --git a/devel/php83-readline/files/patch-config.m4 b/devel/php83-readline/files/patch-config.m4
deleted file mode 100644
index 1031a78360b1..000000000000
--- a/devel/php83-readline/files/patch-config.m4
+++ /dev/null
@@ -1,33 +0,0 @@
---- config.m4.orig	2023-06-06 15:54:29 UTC
-+++ config.m4
-@@ -3,16 +3,10 @@ PHP_ARG_WITH([libedit],
-   [AS_HELP_STRING([--with-libedit],
-     [Include libedit readline replacement (CLI/CGI only)])])
- 
--if test "$PHP_LIBEDIT" = "no"; then
-   PHP_ARG_WITH([readline],
-     [for readline support],
-     [AS_HELP_STRING([[--with-readline[=DIR]]],
-       [Include readline support (CLI/CGI only)])])
--else
--  dnl "register" the --with-readline option to prevent invalid "unknown
--  dnl configure option" warning
--  php_with_readline=no
--fi
- 
- if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
-   for i in $PHP_READLINE /usr/local /usr; do
-@@ -77,6 +71,13 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no
- 
-   AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
-   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
-+
-+  PHP_CHECK_LIBRARY(readline, rl_completion_matches,
-+  [
-+    AC_DEFINE(HAVE_RL_COMPLETION_MATCHES, 1, [ ])
-+  ],[],[
-+    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-+  ])
- 
- elif test "$PHP_LIBEDIT" != "no"; then
-   if test "$PHP_LIBEDIT" != "yes"; then
diff --git a/devel/php83-readline/files/patch-readline__cli.c b/devel/php83-readline/files/patch-readline__cli.c
deleted file mode 100644
index 650523302696..000000000000
--- a/devel/php83-readline/files/patch-readline__cli.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- readline_cli.c.orig	2023-06-06 15:54:29 UTC
-+++ readline_cli.c
-@@ -19,6 +19,10 @@
- #include "config.h"
- #endif
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
- 
- #ifndef HAVE_RL_COMPLETION_MATCHES
diff --git a/graphics/php83-gd/files/patch-gd.c b/graphics/php83-gd/files/patch-gd.c
deleted file mode 100644
index c5c0fe89f9d4..000000000000
--- a/graphics/php83-gd/files/patch-gd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gd.c.orig	2023-06-06 15:54:29 UTC
-+++ gd.c
-@@ -80,7 +80,7 @@
- # include FT_FREETYPE_H
- #endif
- 
--#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
- # include "X11/xpm.h"
- #endif
- 
diff --git a/lang/php83/Makefile b/lang/php83/Makefile
index d3f8f7f65a0b..060b7c772f72 100644
--- a/lang/php83/Makefile
+++ b/lang/php83/Makefile
@@ -1,652 +1,641 @@
 PORTNAME=	php83
-DISTVERSION=	8.3.0RC6
+DISTVERSION=	8.3.0
 CATEGORIES?=	lang devel www
-MASTER_SITES=	https://downloads.php.net/~jakub/ \
-	https://downloads.php.net/~eric/
+MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PHP Scripting Language (8.3.X branch)
 WWW=		https://www.php.net/
 
 LICENSE=	PHP301
 
-USES+=		compiler:c11 cpe gnome pkgconfig tar:xz
+USES+=		compiler:c11 cpe gnome localbase pkgconfig tar:xz
 CPE_PRODUCT=	php
 PHP_VER=	83
 
 CONFLICTS_INSTALL?=	php[0-9][0-9]${PKGNAMESUFFIX}
 
 .if !defined(PKGNAMESUFFIX)
+BUILD_DEPENDS=	re2c>0:devel/re2c
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
 		libpcre2-8.so:devel/pcre2
 
-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}
-DESTDIRNAME=		INSTALL_ROOT
-
-USES+=		autoreconf:build localbase ssl
+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} \
+		--with-external-pcre=${LOCALBASE}
+
+USES+=		autoreconf:build ssl
 USE_GNOME=	libxml2
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 # PR230207 Allow relocations against read-only segments (override lld default)
 LDFLAGS_i386=	-Wl,-z,notext
 
-OPTIONS_DEFINE+=		CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
+OPTIONS_DEFINE+=CGI CLI DEBUG DTRACE EMBED FPM IPV6 LINKTHR \
 				MYSQLND NOASLR PHPDBG ZTS
-OPTIONS_DEFAULT=		CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND
+OPTIONS_DEFAULT=	CGI CLI DTRACE EMBED FPM LINKTHR MYSQLND
 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-group=${WWWGRP} \
 			--with-fpm-user=${WWWOWN}
 FPM_VARS=		PHP_SAPI+=fpm \
 			USE_RC_SUBR+=php-fpm
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 LINKTHR_LIBS=		-lpthread
 NOASLR_USES=	elfctl
 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
+
 .if defined(PKGNAMEPREFIX)
 USES+=			apache
 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
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:NOASLR}
 .if ${PORT_OPTIONS:MCLI}
 ELF_FEATURES+=+noaslr:sapi/cli/php
 .endif
 .if ${PORT_OPTIONS:MCGI}
 ELF_FEATURES+=+noaslr:sapi/cgi/php-cgi
 .endif
 .if ${PORT_OPTIONS:MPHPDBG}
 ELF_FEATURES+=+noaslr:sapi/phpdbg/phpdbg
 .endif
 .if ${PORT_OPTIONS:MFPM}
 ELF_FEATURES+=+noaslr:sapi/fpm/php-fpm
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == riscv64
 CONFIGURE_ARGS+=	--without-pcre-jit
 .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
 
 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=${PHP_VER}" > ${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 random 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
 
 post-install-CLI-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php
 
 post-install-CGI-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/php-cgi
 
 post-install-EMBED-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/lib/libphp.so
 
 post-install-FPM-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/sbin/php-fpm
 
 post-install-PHPDBG-on:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/phpdbg
 
 .else
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 	${INSTALL_LIB} ${WRKSRC}/libs/${MODULENAME}.so \
 		${STAGEDIR}${PREFIX}/${APACHEMODDIR}
 .endif
 
 .else
 COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=		php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
 PHP_VER=	83
 IGNORE_WITH_PHP=	80 81 82
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${NONEXISTENT}
 
 EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
 
 TEST_TARGET=	test
 
 .if ${PHP_MODNAME} == "bcmath"
 CONFIGURE_ARGS+=	--enable-bcmath
 
 PHP_HEADER_DIRS=	libbcmath/src
 .endif
 
 .if ${PHP_MODNAME} == "bz2"
 CONFIGURE_ARGS+=	--with-bz2=/usr
 .endif
 
 .if ${PHP_MODNAME} == "calendar"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
 .if ${PHP_MODNAME} == "ctype"
 CONFIGURE_ARGS+=	--enable-ctype
 .endif
 
 .if ${PHP_MODNAME} == "curl"
 LIB_DEPENDS+=	libcurl.so:ftp/curl
 
 CONFIGURE_ARGS+=	--with-curl=${LOCALBASE}
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "dba"
 CONFIGURE_ARGS+=	--enable-dba
 
 OPTIONS_DEFINE=		CDB DB4 FLATFILE GDBM INIFILE LMDB QDBM TOKYO
 OPTIONS_DEFAULT=	CDB FLATFILE INIFILE
 
 CDB_DESC=	cdb database support
 DB4_DESC=	Berkeley DB4 support
 FLATFILE_DESC=	flatfile support
 GDBM_DESC=	GDBM database support
 INIFILE_DESC=	INI file support
 LMDB_DESC=	LMDB database support
 QDBM_DESC=	QDBM database support
 TOKYO_DESC=	Tokyo Cabinet database support
 
 CDB_CONFIGURE_OFF=	--without-cdb
 DB4_CONFIGURE_ON=	--with-db4=${LOCALBASE}
 DB4_USES=		bdb
 DB4_VARS=		WITH_BDB_HIGHEST=yes
 FLATFILE_CONFIGURE_ON=	--disable-flatfile
 GDBM_CONFIGURE_ARGS=	--with-gdbm=${LOCALBASE}
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
 INIFILE_CONFIGURE_OFF=	--disable-inifile
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
 LMDB_CONFIGURE_ARGS=	--with-lmdb=${LOCALBASE}
 QDBM_LIB_DEPENDS=	libqdbm.so:databases/qdbm
 QDBM_CONFIGURE_ARGS=	--with-qdbm=${LOCALBASE}
 TOKYO_LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 TOKYO_CONFIGURE_ON=	--with-tcadb=${LOCALBASE}
 
 PHP_HEADER_DIRS=	libcdb libflatfile libinifile
 .endif
 
 .if ${PHP_MODNAME} == "dom"
 CONFIGURE_ARGS+=	--enable-dom
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "enchant"
-LIB_DEPENDS+=		libenchant.so:textproc/enchant
-CONFIGURE_ARGS+=	--with-enchant=${LOCALBASE}
-USES+=			pkgconfig
+LIB_DEPENDS+=   libenchant-2.so:textproc/enchant2
+CONFIGURE_ARGS+=--with-enchant=${LOCALBASE}
+USES+=		pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "exif"
 CONFIGURE_ARGS+=	--enable-exif
 .endif
 
 .if ${PHP_MODNAME} == "ffi"
 LIB_DEPENDS=		libffi.so:devel/libffi
 CONFIGURE_ARGS+=	--with-ffi
 .endif
 
 .if ${PHP_MODNAME} == "fileinfo"
 CONFIGURE_ARGS+=	--enable-fileinfo
 
 PHP_HEADER_DIRS=	libmagic
 .endif
 
 .if ${PHP_MODNAME} == "filter"
 CONFIGURE_ARGS+=	--enable-filter
 .endif
 
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=	--enable-ftp
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		pkgconfig ssl
 .endif
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
 		libpng.so:graphics/png
 USES+=		jpeg
 
 CONFIGURE_ARGS+=	--enable-gd \
 			--with-external-gd
 
 EXTRACT_AFTER_ARGS=	--no-same-owner --no-same-permissions --exclude libgd \
 			php-${DISTVERSION}/ext/gd
 
 OPTIONS_DEFINE=	JIS WEBP X11
 
 JIS_DESC=		Enable JIS-mapped Japanese font support
 WEBP_DESC=		Enable WebP image format support
 X11_DESC=		Enable XPM support
 JIS_CONFIGURE_ON=	--enable-gd-jis-conv
 WEBP_CONFIGURE_ON=	--with-webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 X11_CONFIGURE_ON=	--with-xpm
 X11_USE=		XORG=xpm
 X11_USES=		xorg
 .endif
 
 .if ${PHP_MODNAME} == "gettext"
 CONFIGURE_ARGS+=	--with-gettext=${LOCALBASE}
 
 USES+=		gettext
 .endif
 
 .if ${PHP_MODNAME} == "gmp"
 LIB_DEPENDS+=	libgmp.so:math/gmp
 
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=	--with-iconv=${LOCALBASE}
 
 USES+=		iconv:translit
 .endif
 
 .if ${PHP_MODNAME} == "imap"
 PHP_MOD_PRIO=		30
-OPTIONS_RADIO=		CLIENT
-OPTIONS_RADIO_CLIENT=	CCLIENT PANDA
-OPTIONS_DEFAULT=	PANDA
-CCLIENT_DESC=		Uses the original but unmaintained cclient
-PANDA_DESC=		Uses the forked panda-cclient instead of the original cclient
-PANDA_LIB_DEPENDS=	libc-client.so.2010:mail/panda-cclient
-PANDA_LIB_DEPENDS_OFF=	libc-client4.so.9:mail/cclient
+LIB_DEPENDS+=	libc-client.so.2010:mail/panda-cclient
 
 CONFIGURE_ARGS+=	--with-imap-ssl=${OPENSSLBASE} \
 			--with-imap=${LOCALBASE}
 
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \
 		PHP_OPENSSL=yes
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "intl"
 LIB_DEPENDS=	libicui18n.so:devel/icu
 USES+=		pkgconfig
 CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
 .endif
 
 .if ${PHP_MODNAME} == "json"
 CONFIGURE_ARGS+=	--enable-json
 BUILD_DEPENDS=		re2c:devel/re2c
 .endif
 
 .if ${PHP_MODNAME} == "ldap"
-CONFIGURE_ARGS+=	--with-ldap-sasl=${LOCALBASE} \
-			--with-ldap=${LOCALBASE}
+LIB_DEPENDS+=libsasl2.so:security/cyrus-sasl2
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} --with-ldap-sasl=${LOCALBASE}
 USES+=	ldap
 .endif
 
 .if ${PHP_MODNAME} == "mbstring"
 
 CONFIGURE_ARGS+=	--enable-mbstring
 
 OPTIONS_DEFINE=		REGEX
 OPTIONS_DEFAULT=	REGEX
 
 REGEX_DESC=		Enable multibyte regex support
 REGEX_LIB_DEPENDS=	libonig.so:devel/oniguruma
 REGEX_CONFIGURE_OFF=	--disable-mbregex
 
 PHP_HEADER_DIRS=	libmbfl libmbfl/filters libmbfl/mbfl libmbfl/nls
 .endif
 
 .if ${PHP_MODNAME} == "mysqli"
-OPTIONS_DEFINE=		MYSQLND
-OPTIONS_DEFAULT=	MYSQLND
-
-MYSQLND_DESC=		Use MySQL Native Driver
-MYSQLND_CONFIGURE_ON=	--with-mysqli=mysqlnd
-MYSQLND_CONFIGURE_OFF=	--with-mysqli=${LOCALBASE}/bin/mysql_config
-MYSQLND_USES_OFF=	mysql
+CONFIGURE_ARGS+=	--with-mysqli
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 
-CONFIGURE_ARGS+=	--enable-odbc \
-			--with-unixODBC=${LOCALBASE}
+CONFIGURE_ARGS+= --with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
 CONFIGURE_ARGS+=        --enable-opcache
 .endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
 .endif
 
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=	--enable-pdo
 .endif
 
 .if ${PHP_MODNAME} == "pdo_dblib"
 CONFIGURE_ARGS+=	--with-pdo-dblib=${LOCALBASE}
 
 USE_PHP=	pdo:build
 
 OPTIONS_DEFINE=	MSSQL
 
 MSSQL_DESC=		Enable Microsoft SQL Server support
 MSSQL_LIB_DEPENDS=	libsybdb.so:databases/freetds
 MSSQL_LIB_DEPENDS_OFF=	libct.so:databases/freetds
 .endif
 
 .if ${PHP_MODNAME} == "pdo_firebird"
 CONFIGURE_ARGS+=	--with-pdo-firebird=${LOCALBASE}
 
 USES+=		firebird
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
 LIB_DEPENDS+=		libodbc.so:databases/unixODBC
 CONFIGURE_ARGS+=	--with-pdo-odbc=unixODBC,${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_mysql"
 OPTIONS_DEFINE=		MYSQLND
 OPTIONS_DEFAULT=	MYSQLND
 
 MYSQLND_DESC=		Use MySQL Native Driver
 
 MYSQLND_CONFIGURE_OFF=	--with-pdo-mysql=${LOCALBASE} \
 			--with-zlib-dir=/usr
 MYSQLND_USES_OFF=	mysql
 MYSQLND_CONFIGURE_ON=	--with-pdo-mysql=mysqlnd
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pdo-pgsql=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pdo_sqlite"
 USES+=			localbase sqlite
 CONFIGURE_ARGS+=	--with-pdo-sqlite=${LOCALBASE}
 
 USE_PHP=	pdo:build
 .endif
 
 .if ${PHP_MODNAME} == "pgsql"
 USES+=		pgsql
 
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "phar"
 CONFIGURE_ARGS+=	--enable-phar
 .endif
 
 .if ${PHP_MODNAME} == "posix"
 CONFIGURE_ARGS+=	--enable-posix
 .endif
 
 .if ${PHP_MODNAME} == "pspell"
 LIB_DEPENDS+=	libaspell.so:textproc/aspell
 
 CONFIGURE_ARGS+=	--with-pspell=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "readline"
-CONFIGURE_ARGS+=	--with-readline=/usr
-USES+=			readline
+CONFIGURE_ARGS+=--with-libedit
+USES+=		libedit
 .endif
 
 .if ${PHP_MODNAME} == "session"
 CONFIGURE_ARGS+=	--enable-session
 PHP_MOD_PRIO=		18
 .endif
 
 .if ${PHP_MODNAME} == "shmop"
 CONFIGURE_ARGS+=	--enable-shmop
 .endif
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=	--enable-simplexml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "snmp"
 CONFIGURE_ARGS+=	--with-snmp=${LOCALBASE}
 
 CONFIGURE_ENV+=	ac_cv_buggy_snprint_value="no"
 
 LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USES+=		ssl
 .endif
 
 .if ${PHP_MODNAME} == "soap"
 CONFIGURE_ARGS+=	--enable-soap
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "sockets"
 CONFIGURE_ARGS+=	--enable-sockets
 CONFIGURE_ENV+=	LOCAL_CREDS_PERSISTENT=yes
 .endif
 
 .if ${PHP_MODNAME} == "sodium"
 CONFIGURE_ARGS+=	--with-sodium=${LOCALBASE}
 LIB_DEPENDS+=		libsodium.so:security/libsodium
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3"
 USES+=			localbase pkgconfig sqlite
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "sysvmsg"
 CONFIGURE_ARGS+=	--enable-sysvmsg
 .endif
 
 .if ${PHP_MODNAME} == "sysvsem"
 CONFIGURE_ARGS+=	--enable-sysvsem
 .endif
 
 .if ${PHP_MODNAME} == "sysvshm"
 CONFIGURE_ARGS+=	--enable-sysvshm
 .endif
 
 .if ${PHP_MODNAME} == "tidy"
 CONFIGURE_ARGS+=	--with-tidy=${LOCALBASE}
 
 LIB_DEPENDS+=	libtidy.so:www/tidy-lib
 .endif
 
 .if ${PHP_MODNAME} == "tokenizer"
 CONFIGURE_ARGS+=	--enable-tokenizer
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 CONFIGURE_ARGS+=	--enable-xml
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xmlreader"
 CONFIGURE_ARGS+=	--enable-xmlreader
 
 USE_GNOME=	libxml2
 
 USE_PHP=	dom:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=	--with-iconv-dir=${LOCALBASE} \
 			--with-xmlrpc
 
 USES+=		iconv:translit
 USE_GNOME=	libxml2
 
 PHP_HEADER_DIRS=	libxmlrpc
 
 USE_PHP=	xml:build
 .endif
 
 .if ${PHP_MODNAME} == "xmlwriter"
 CONFIGURE_ARGS+=	--enable-xmlwriter
 
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
 
 .if ${PHP_MODNAME} == "xsl"
 CONFIGURE_ARGS+=	--with-xsl=${LOCALBASE}
 
 USE_GNOME=	libxslt
 USE_PHP=	dom:build xml:build
 .endif
 
 .if ${PHP_MODNAME} == "zip"
 LIB_DEPENDS+=	libzip.so:archivers/libzip
 
-CONFIGURE_ARGS+=	--with-zip \
-			--with-zlib-dir=/usr
+CONFIGURE_ARGS+=	--with-zip
 USES+=			pkgconfig
 .endif
 
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=	--with-zlib=/usr
 USES+=			pkgconfig
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache"
 CONFIGURE_ARGS+=--disable-opcache-jit
 .endif
 
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
 .if ${PHP_MODNAME} == "xml"
 post-extract:
 	@${MKDIR} ${WRKSRC}/ext/xml
 	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
 .endif
 .endif
 .include <bsd.port.post.mk>
diff --git a/lang/php83/distinfo b/lang/php83/distinfo
index 85b807cbb228..d6c31a4c1d21 100644
--- a/lang/php83/distinfo
+++ b/lang/php83/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1699700741
-SHA256 (php-8.3.0RC6.tar.xz) = 1e7b5dcfebc4921ec44209c1e08ae71b6b10e5b1b6b895bb4f76b44486c705ed
-SIZE (php-8.3.0RC6.tar.xz) = 12438800
+TIMESTAMP = 1700688940
+SHA256 (php-8.3.0.tar.xz) = 1db84fec57125aa93638b51bb2b15103e12ac196e2f960f0d124275b2687ea54
+SIZE (php-8.3.0.tar.xz) = 12431612
diff --git a/lang/php83/files/patch-ext_mysqli_mysqli__api.c b/lang/php83/files/patch-ext_mysqli_mysqli__api.c
deleted file mode 100644
index 535503954e3d..000000000000
--- a/lang/php83/files/patch-ext_mysqli_mysqli__api.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/mysqli/mysqli_api.c.orig	2020-09-29 22:36:51 UTC
-+++ ext/mysqli/mysqli_api.c
-@@ -29,7 +29,9 @@
- #include "zend_smart_str.h"
- #include "php_mysqli_structs.h"
- #include "mysqli_priv.h"
-+#if defined(MYSQLI_USE_MYSQLND)
- #include "ext/mysqlnd/mysql_float_to_double.h"
-+#endif
- 
- #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
- 
diff --git a/lang/php83/files/patch-ext_mysqli_mysqli__nonapi.c b/lang/php83/files/patch-ext_mysqli_mysqli__nonapi.c
deleted file mode 100644
index 83d0d8dfc8cb..000000000000
--- a/lang/php83/files/patch-ext_mysqli_mysqli__nonapi.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/mysqli/mysqli_nonapi.c.orig	2022-08-02 13:57:03 UTC
-+++ ext/mysqli/mysqli_nonapi.c
-@@ -26,7 +26,9 @@
- #include "php_ini.h"
- #include "ext/standard/info.h"
- #include "zend_smart_str.h"
-+#if defined(MYSQLI_USE_MYSQLND)
- #include "php_mysqli_structs.h"
-+#endif
- #include "mysqli_priv.h"
- #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
- 
diff --git a/lang/php83/files/patch-ext_mysqli_mysqli__prop.c b/lang/php83/files/patch-ext_mysqli_mysqli__prop.c
deleted file mode 100644
index bc201d57981e..000000000000
--- a/lang/php83/files/patch-ext_mysqli_mysqli__prop.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/mysqli/mysqli_prop.c.orig	2022-08-02 13:57:03 UTC
-+++ ext/mysqli/mysqli_prop.c
-@@ -24,7 +24,9 @@
- #include "php.h"
- #include "php_ini.h"
- #include "ext/standard/info.h"
-+#if defined(MYSQLI_USE_MYSQLND)
- #include "php_mysqli_structs.h"
-+#endif
- #include "mysqli_priv.h"
- 
- #define CHECK_STATUS(value, quiet) \
diff --git a/lang/php83/pkg-plist b/lang/php83/pkg-plist
index a01d7361c7c7..148b08bab605 100644
--- a/lang/php83/pkg-plist
+++ b/lang/php83/pkg-plist
@@ -1,318 +1,311 @@
 %%CLI%%bin/php
 %%CGI%%bin/php-cgi
 bin/php-config
 %%PHPDBG%%bin/phpdbg
 bin/phpize
 %%FPM%%sbin/php-fpm
 etc/php.conf
 etc/php.ini-development
 etc/php.ini-production
 %%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf
 %%FPM%%@sample etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf
 include/php/TSRM/TSRM.h
 include/php/TSRM/tsrm_win32.h
 include/php/Zend/Optimizer/zend_call_graph.h
 include/php/Zend/Optimizer/zend_cfg.h
 include/php/Zend/Optimizer/zend_dfg.h
 include/php/Zend/Optimizer/zend_dump.h
 include/php/Zend/Optimizer/zend_func_info.h
 include/php/Zend/Optimizer/zend_inference.h
 include/php/Zend/Optimizer/zend_optimizer.h
 include/php/Zend/Optimizer/zend_ssa.h
 include/php/Zend/zend.h
 include/php/Zend/zend_API.h
 include/php/Zend/zend_alloc.h
 include/php/Zend/zend_alloc_sizes.h
 include/php/Zend/zend_arena.h
 include/php/Zend/zend_ast.h
 include/php/Zend/zend_atomic.h
 include/php/Zend/zend_attributes.h
 include/php/Zend/zend_attributes_arginfo.h
 include/php/Zend/zend_bitset.h
 include/php/Zend/zend_build.h
 include/php/Zend/zend_builtin_functions.h
 include/php/Zend/zend_builtin_functions_arginfo.h
 include/php/Zend/zend_call_stack.h
 include/php/Zend/zend_closures.h
 include/php/Zend/zend_closures_arginfo.h
 include/php/Zend/zend_compile.h
 include/php/Zend/zend_config.h
 include/php/Zend/zend_config.w32.h
 include/php/Zend/zend_constants.h
 include/php/Zend/zend_constants_arginfo.h
 include/php/Zend/zend_cpuinfo.h
 include/php/Zend/zend_dtrace.h
 %%DTRACE%%include/php/Zend/zend_dtrace_gen.h
 include/php/Zend/zend_enum.h
 include/php/Zend/zend_enum_arginfo.h
 include/php/Zend/zend_errors.h
 include/php/Zend/zend_exceptions.h
 include/php/Zend/zend_exceptions_arginfo.h
 include/php/Zend/zend_execute.h
 include/php/Zend/zend_extensions.h
 include/php/Zend/zend_fibers.h
 include/php/Zend/zend_fibers_arginfo.h
 include/php/Zend/zend_float.h
 include/php/Zend/zend_gc.h
 include/php/Zend/zend_gdb.h
 include/php/Zend/zend_generators.h
 include/php/Zend/zend_generators_arginfo.h
 include/php/Zend/zend_globals.h
 include/php/Zend/zend_globals_macros.h
 include/php/Zend/zend_hash.h
 include/php/Zend/zend_highlight.h
 include/php/Zend/zend_hrtime.h
 include/php/Zend/zend_inheritance.h
 include/php/Zend/zend_ini.h
 include/php/Zend/zend_ini_parser.h
 include/php/Zend/zend_ini_scanner.h
 include/php/Zend/zend_ini_scanner_defs.h
 include/php/Zend/zend_interfaces.h
 include/php/Zend/zend_interfaces_arginfo.h
 include/php/Zend/zend_istdiostream.h
 include/php/Zend/zend_iterators.h
 include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_language_scanner_defs.h
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
 include/php/Zend/zend_long.h
 include/php/Zend/zend_map_ptr.h
 include/php/Zend/zend_max_execution_timer.h
 include/php/Zend/zend_mmap.h
 include/php/Zend/zend_modules.h
 include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_multiply.h
 include/php/Zend/zend_object_handlers.h
 include/php/Zend/zend_objects.h
 include/php/Zend/zend_objects_API.h
 include/php/Zend/zend_observer.h
 include/php/Zend/zend_operators.h
 include/php/Zend/zend_portability.h
 include/php/Zend/zend_ptr_stack.h
 include/php/Zend/zend_range_check.h
 include/php/Zend/zend_signal.h
 include/php/Zend/zend_smart_str.h
 include/php/Zend/zend_smart_str_public.h
 include/php/Zend/zend_smart_string.h
 include/php/Zend/zend_smart_string_public.h
 include/php/Zend/zend_sort.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_stream.h
 include/php/Zend/zend_string.h
 include/php/Zend/zend_strtod.h
 include/php/Zend/zend_strtod_int.h
 include/php/Zend/zend_system_id.h
 include/php/Zend/zend_type_info.h
 include/php/Zend/zend_types.h
 include/php/Zend/zend_variables.h
 include/php/Zend/zend_virtual_cwd.h
 include/php/Zend/zend_vm.h
 include/php/Zend/zend_vm_def.h
 include/php/Zend/zend_vm_execute.h
 include/php/Zend/zend_vm_handlers.h
 include/php/Zend/zend_vm_opcodes.h
 include/php/Zend/zend_vm_trace_handlers.h
 include/php/Zend/zend_vm_trace_lines.h
 include/php/Zend/zend_vm_trace_map.h
 include/php/Zend/zend_weakrefs.h
 include/php/Zend/zend_weakrefs_arginfo.h
 include/php/ext/date/lib/timelib.h
 include/php/ext/date/lib/timelib_config.h
 include/php/ext/date/php_date.h
 include/php/ext/hash/php_hash.h
 include/php/ext/hash/php_hash_adler32.h
 include/php/ext/hash/php_hash_crc32.h
 include/php/ext/hash/php_hash_fnv.h
 include/php/ext/hash/php_hash_gost.h
 include/php/ext/hash/php_hash_haval.h
 include/php/ext/hash/php_hash_joaat.h
 include/php/ext/hash/php_hash_md.h
 include/php/ext/hash/php_hash_murmur.h
 include/php/ext/hash/php_hash_ripemd.h
 include/php/ext/hash/php_hash_sha.h
 include/php/ext/hash/php_hash_sha3.h
 include/php/ext/hash/php_hash_snefru.h
 include/php/ext/hash/php_hash_tiger.h
 include/php/ext/hash/php_hash_whirlpool.h
 include/php/ext/hash/php_hash_xxhash.h
 include/php/ext/json/php_json.h
 include/php/ext/json/php_json_parser.h
 include/php/ext/json/php_json_scanner.h
 include/php/ext/libxml/php_libxml.h
 %%MYSQLND%%include/php/ext/mysqlnd/config-win.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysql_float_to_double.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_alloc.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_auth.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_block_alloc.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_charset.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_commands.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_connection.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_debug.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_enum_n_def.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ext_plugin.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_libmysql_compat.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_plugin.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_portability.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_priv.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_ps.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_read_buffer.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_result_meta.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_reverse_api.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_statistics.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_structs.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h
 %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h
 %%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h
-include/php/ext/pcre/pcre2lib/config.h
-include/php/ext/pcre/pcre2lib/pcre2.h
-include/php/ext/pcre/pcre2lib/pcre2_internal.h
-include/php/ext/pcre/pcre2lib/pcre2_intmodedep.h
-include/php/ext/pcre/pcre2lib/pcre2_jit_neon_inc.h
-include/php/ext/pcre/pcre2lib/pcre2_jit_simd_inc.h
-include/php/ext/pcre/pcre2lib/pcre2_ucp.h
 include/php/ext/pcre/php_pcre.h
 include/php/ext/random/php_random.h
 include/php/ext/spl/php_spl.h
 include/php/ext/spl/spl_array.h
 include/php/ext/spl/spl_directory.h
 include/php/ext/spl/spl_dllist.h
 include/php/ext/spl/spl_engine.h
 include/php/ext/spl/spl_exceptions.h
 include/php/ext/spl/spl_fixedarray.h
 include/php/ext/spl/spl_functions.h
 include/php/ext/spl/spl_heap.h
 include/php/ext/spl/spl_iterators.h
 include/php/ext/spl/spl_observer.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/basic_functions_arginfo.h
 include/php/ext/standard/crc32.h
 include/php/ext/standard/crc32_x86.h
 include/php/ext/standard/credits.h
 include/php/ext/standard/credits_ext.h
 include/php/ext/standard/credits_sapi.h
 include/php/ext/standard/crypt_blowfish.h
 include/php/ext/standard/crypt_freesec.h
 include/php/ext/standard/css.h
 include/php/ext/standard/datetime.h
 include/php/ext/standard/dir_arginfo.h
 include/php/ext/standard/dl.h
 include/php/ext/standard/dl_arginfo.h
 include/php/ext/standard/exec.h
 include/php/ext/standard/file.h
 include/php/ext/standard/file_arginfo.h
 include/php/ext/standard/flock_compat.h
 include/php/ext/standard/fsock.h
 include/php/ext/standard/head.h
 include/php/ext/standard/html.h
 include/php/ext/standard/html_tables.h
 include/php/ext/standard/info.h
 include/php/ext/standard/md5.h
 include/php/ext/standard/pack.h
 include/php/ext/standard/pageinfo.h
 include/php/ext/standard/php_array.h
 include/php/ext/standard/php_assert.h
 include/php/ext/standard/php_browscap.h
 include/php/ext/standard/php_crypt.h
 include/php/ext/standard/php_crypt_r.h
 include/php/ext/standard/php_dir.h
 include/php/ext/standard/php_dns.h
 include/php/ext/standard/php_ext_syslog.h
 include/php/ext/standard/php_filestat.h
 include/php/ext/standard/php_fopen_wrappers.h
 include/php/ext/standard/php_http.h
 include/php/ext/standard/php_image.h
 include/php/ext/standard/php_incomplete_class.h
 include/php/ext/standard/php_lcg.h
 include/php/ext/standard/php_mail.h
 include/php/ext/standard/php_math.h
 include/php/ext/standard/php_mt_rand.h
 include/php/ext/standard/php_net.h
 include/php/ext/standard/php_password.h
 include/php/ext/standard/php_rand.h
 include/php/ext/standard/php_random.h
 include/php/ext/standard/php_smart_string.h
 include/php/ext/standard/php_smart_string_public.h
 include/php/ext/standard/php_standard.h
 include/php/ext/standard/php_string.h
 include/php/ext/standard/php_uuencode.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
 include/php/ext/standard/proc_open.h
 include/php/ext/standard/quot_print.h
 include/php/ext/standard/scanf.h
 include/php/ext/standard/sha1.h
 include/php/ext/standard/streamsfuncs.h
 include/php/ext/standard/url.h
 include/php/ext/standard/url_scanner_ex.h
 include/php/ext/standard/user_filters_arginfo.h
 include/php/ext/standard/winver.h
 @touch include/php/ext/php_config.h
 @rmempty include/php/ext/php_config.h
 include/php/main/SAPI.h
 include/php/main/build-defs.h
 include/php/main/fastcgi.h
 include/php/main/fopen_wrappers.h
 include/php/main/http_status_codes.h
 include/php/main/main_arginfo.h
 include/php/main/php.h
 include/php/main/php_compat.h
 include/php/main/php_config.h
 include/php/main/php_content_types.h
 include/php/main/php_getopt.h
 include/php/main/php_globals.h
 include/php/main/php_ini.h
 include/php/main/php_ini_builder.h
 include/php/main/php_main.h
 include/php/main/php_memory_streams.h
 include/php/main/php_network.h
 include/php/main/php_odbc_utils.h
 include/php/main/php_open_temporary_file.h
 include/php/main/php_output.h
 include/php/main/php_reentrancy.h
 include/php/main/php_scandir.h
 include/php/main/php_streams.h
 include/php/main/php_syslog.h
 include/php/main/php_ticks.h
 include/php/main/php_variables.h
 include/php/main/php_version.h
 include/php/main/rfc1867.h
 include/php/main/snprintf.h
 include/php/main/spprintf.h
 include/php/main/streams/php_stream_context.h
 include/php/main/streams/php_stream_filter_api.h
 include/php/main/streams/php_stream_glob_wrapper.h
 include/php/main/streams/php_stream_mmap.h
 include/php/main/streams/php_stream_plain_wrapper.h
 include/php/main/streams/php_stream_transport.h
 include/php/main/streams/php_stream_userspace.h
 include/php/main/streams/php_streams_int.h
 include/php/main/streams/userspace_arginfo.h
 %%CLI%%include/php/sapi/cli/cli.h
 %%EMBED%%include/php/sapi/embed/php_embed.h
 %%EMBED%%lib/libphp.so
 lib/php/build/Makefile.global
 lib/php/build/ax_check_compile_flag.m4
 lib/php/build/ax_gcc_func_attribute.m4
 lib/php/build/config.guess
 lib/php/build/config.sub
 lib/php/build/gen_stub.php
 lib/php/build/libtool.m4
 lib/php/build/ltmain.sh
 lib/php/build/php.m4
 lib/php/build/php_cxx_compile_stdcxx.m4
 lib/php/build/phpize.m4
 lib/php/build/pkg.m4
 lib/php/build/run-tests.php
 lib/php/build/shtool
 %%CGI%%man/man1/php-cgi.1.gz
 man/man1/php-config.1.gz
 %%CLI%%man/man1/php.1.gz
 %%PHPDBG%%man/man1/phpdbg.1.gz
 man/man1/phpize.1.gz
 %%FPM%%man/man8/php-fpm.8.gz
 %%FPM%%share/php/fpm/status.html
diff --git a/mail/php83-imap/files/patch-config.m4 b/mail/php83-imap/files/patch-config.m4
deleted file mode 100644
index 18c6da8e6e00..000000000000
--- a/mail/php83-imap/files/patch-config.m4
+++ /dev/null
@@ -1,47 +0,0 @@
---- config.m4.orig	2023-06-06 15:54:29 UTC
-+++ config.m4
-@@ -117,6 +117,13 @@ PHP_ARG_WITH([imap-ssl],
-   [no],
-   [no])
- 
-+PHP_ARG_WITH([pcre-dir],
-+  [pcre install prefix],
-+  [AS_HELP_STRING([[--with-pcre-dir]],
-+    [IMAP: pcre install prefix])],
-+  [no],
-+  [no])
-+
- if test "$PHP_IMAP" != "no"; then
-     PHP_SUBST(IMAP_SHARED_LIBADD)
-     PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-@@ -131,6 +138,30 @@ if test "$PHP_IMAP" != "no"; then
-       el[]IMAP_INC_CHK(/c-client)
-       fi
-     done
-+
-+  dnl This is PECL build, check if bundled PCRE library is used
-+  old_CPPFLAGS=$CPPFLAGS
-+  CPPFLAGS=$INCLUDES
-+  AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+  ],[
-+    PHP_PCRE_REGEX=yes
-+  ],[
-+    AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+    ],[
-+      PHP_PCRE_REGEX=pecl
-+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
-+    ],[
-+      PHP_PCRE_REGEX=no
-+    ])
-+  ])
- 
-     dnl Check for c-client version 2004
-     AC_EGREP_HEADER(mail_fetch_overview_sequence, $IMAP_INC_DIR/mail.h, [
diff --git a/net/php83-sockets/files/patch-conversions.c b/net/php83-sockets/files/patch-conversions.c
deleted file mode 100644
index 999e26343986..000000000000
--- a/net/php83-sockets/files/patch-conversions.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- conversions.c.orig	2023-06-06 15:54:29 UTC
-+++ conversions.c
-@@ -1325,11 +1325,6 @@ static const field_descriptor descriptors_ucred[] = {
- 		{"uid", sizeof("uid"), 1, offsetof(struct sockcred2, sc_euid), from_zval_write_uid_t, to_zval_read_uid_t},
- 		/* the type gid_t is the same as uid_t: */
- 		{"gid", sizeof("gid"), 1, offsetof(struct sockcred2, sc_egid), from_zval_write_uid_t, to_zval_read_uid_t},
--#elif defined(LOCAL_CREDS)
--		{"pid", sizeof("pid"), 1, offsetof(struct sockcred, sc_pid), from_zval_write_pid_t, to_zval_read_pid_t},
--		{"uid", sizeof("uid"), 1, offsetof(struct sockcred, sc_euid), from_zval_write_uid_t, to_zval_read_uid_t},
--		/* the type gid_t is the same as uid_t: */
--		{"gid", sizeof("gid"), 1, offsetof(struct sockcred, sc_egid), from_zval_write_uid_t, to_zval_read_uid_t},
- #elif defined(ANC_CREDS_CMSGCRED)
- 		{"pid", sizeof("pid"), 1, offsetof(struct cmsgcred, cmcred_pid), from_zval_write_pid_t, to_zval_read_pid_t},
- 		{"uid", sizeof("uid"), 1, offsetof(struct cmsgcred, cmcred_uid), from_zval_write_uid_t, to_zval_read_uid_t},
diff --git a/sysutils/php83-fileinfo/files/patch-config.m4 b/sysutils/php83-fileinfo/files/patch-config.m4
deleted file mode 100644
index 042170100462..000000000000
--- a/sysutils/php83-fileinfo/files/patch-config.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- config.m4.orig	2023-06-06 15:54:29 UTC
-+++ config.m4
-@@ -4,6 +4,9 @@ PHP_ARG_ENABLE([fileinfo],
-     [Disable fileinfo support])],
-   [yes])
- 
-+PHP_ARG_WITH(pcre-dir, pcre install prefix,
-+[  --with-pcre-dir           FILEINFO: pcre install prefix], no, no)
-+
- if test "$PHP_FILEINFO" != "no"; then
- 
-   libmagic_sources=" \
-@@ -48,6 +51,8 @@ int main(void)
-     AC_MSG_NOTICE(using libmagic strcasestr implementation)
-     libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
-   ],[AC_MSG_RESULT([skipped, cross-compiling])])
-+
-+  PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
- 
-   PHP_NEW_EXTENSION(fileinfo, fileinfo.c php_libmagic.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
-   PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
diff --git a/sysutils/php83-posix/files/patch-posix.c b/sysutils/php83-posix/files/patch-posix.c
deleted file mode 100644
index bf034ba887b4..000000000000
--- a/sysutils/php83-posix/files/patch-posix.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- posix.c.orig	2023-06-06 15:54:29 UTC
-+++ posix.c
-@@ -779,7 +779,7 @@ PHP_FUNCTION(posix_getgrnam)
- #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX)
- 	buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
- 	if (buflen < 1) {
--		RETURN_FALSE;
-+		buflen = 1024;
- 	}
- 	buf = emalloc(buflen);
- try_again:
-@@ -835,7 +835,7 @@ PHP_FUNCTION(posix_getgrgid)
- 
- 	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
- 	if (grbuflen < 1) {
--		RETURN_FALSE;
-+		grbuflen = 1024;
- 	}
- 
- 	grbuf = emalloc(grbuflen);
-@@ -909,7 +909,7 @@ PHP_FUNCTION(posix_getpwnam)
- #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R)
- 	buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- 	if (buflen < 1) {
--		RETURN_FALSE;
-+		buflen = 1024;
- 	}
- 	buf = emalloc(buflen);
- 	pw = &pwbuf;
-@@ -964,7 +964,7 @@ PHP_FUNCTION(posix_getpwuid)
- #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R)
- 	pwbuflen = sysconf(_SC_GETPW_R_SIZE_MAX);
- 	if (pwbuflen < 1) {
--		RETURN_FALSE;
-+		pwbuflen = 1024;
- 	}
- 	pwbuf = emalloc(pwbuflen);
- 
diff --git a/textproc/php83-enchant/Makefile b/textproc/php83-enchant/Makefile
index 1cd5744b4173..3788e2909afd 100644
--- a/textproc/php83-enchant/Makefile
+++ b/textproc/php83-enchant/Makefile
@@ -1,7 +1,12 @@
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php83
 
 PKGNAMESUFFIX=	-enchant
 
+post-patch:
+	${REINPLACE_CMD} -e \
+		's|#include "../spl/spl_exceptions.h"|#include "ext/spl/spl_exceptions.h"|g' \
+		${WRKSRC}/enchant.c
+
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php83-enchant/files/patch-enchant.c b/textproc/php83-enchant/files/patch-enchant.c
deleted file mode 100644
index b43d7930efde..000000000000
--- a/textproc/php83-enchant/files/patch-enchant.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- enchant.c.orig	2023-06-06 15:54:29 UTC
-+++ enchant.c
-@@ -23,7 +23,7 @@
- #include "php_ini.h"
- #include "ext/standard/info.h"
- #include "Zend/zend_exceptions.h"
--#include "../spl/spl_exceptions.h"
-+#include "ext/spl/spl_exceptions.h"
- #include <enchant.h>
- #include "php_enchant.h"
- 
diff --git a/textproc/php83-simplexml/files/patch-config.m4 b/textproc/php83-simplexml/files/patch-config.m4
deleted file mode 100644
index 710e56e7b57c..000000000000
--- a/textproc/php83-simplexml/files/patch-config.m4
+++ /dev/null
@@ -1,41 +0,0 @@
---- config.m4.orig	2023-06-06 15:54:29 UTC
-+++ config.m4
-@@ -4,7 +4,38 @@ PHP_ARG_ENABLE([simplexml],
-     [Disable SimpleXML support])],
-   [yes])
- 
-+PHP_ARG_ENABLE([pcre-dir],
-+  [pcre install prefix],
-+  [AS_HELP_STRING([--with-pcre-dir],
-+    [SimpleXML: pcre install dir])],
-+  [no],
-+  [no])
-+
- if test "$PHP_SIMPLEXML" != "no"; then
-+
-+  dnl This is PECL build, check if bundled PCRE library is used
-+  old_CPPFLAGS=$CPPFLAGS
-+  CPPFLAGS=$INCLUDES
-+  AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+  ],[
-+    PHP_PCRE_REGEX=yes
-+  ],[
-+    AC_EGREP_CPP(yes,[
-+#include <main/php_config.h>
-+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
-+yes
-+#endif
-+    ],[
-+      PHP_PCRE_REGEX=pecl
-+      PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
-+    ],[
-+      PHP_PCRE_REGEX=no
-+    ])
-+  ])
- 
-   if test "$PHP_LIBXML" = "no"; then
-     AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --with-libxml])
diff --git a/textproc/php83-xsl/Makefile b/textproc/php83-xsl/Makefile
index f96e320bf41d..13cf30a12fa5 100644
--- a/textproc/php83-xsl/Makefile
+++ b/textproc/php83-xsl/Makefile
@@ -1,7 +1,12 @@
 CATEGORIES=	textproc
 
 MASTERDIR=	${.CURDIR}/../../lang/php83
 
 PKGNAMESUFFIX=	-xsl
 
+post-patch:
+	${REINPLACE_CMD} -e \
+		's|#include "../dom/xml_common.h"|#include "ext/dom/xml_common.h"|g' \
+		${WRKSRC}/php_xsl.h
+
 .include "${MASTERDIR}/Makefile"
diff --git a/textproc/php83-xsl/files/patch-php__xsl.h b/textproc/php83-xsl/files/patch-php__xsl.h
deleted file mode 100644
index 69f1140af49d..000000000000
--- a/textproc/php83-xsl/files/patch-php__xsl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- php_xsl.h.orig	2020-10-16 22:10:29 UTC
-+++ php_xsl.h
-@@ -37,7 +37,7 @@ extern zend_module_entry xsl_module_entr
- #include <libexslt/exsltconfig.h>
- #endif
- 
--#include "../dom/xml_common.h"
-+#include "ext/dom/xml_common.h"
- 
- #include <libxslt/extensions.h>
- #include <libxml/xpathInternals.h>