diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
index 4c8ae7ea950e..ce04b0f393be 100644
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -110,7 +110,7 @@ DIST_SUBDIR=	PECL
 
 PHPBASE?=	${LOCALBASE}
 
-_ALL_PHP_VERSIONS=	72 73 74
+_ALL_PHP_VERSIONS=	72 73 74 80
 
 # Make the already installed PHP the default one.
 .  if exists(${PHPBASE}/etc/php.conf)
@@ -178,7 +178,10 @@ PHP_VER=	${FLAVOR:S/^php//}
 	(${FLAVOR:Mphp[0-9][0-9]} && ${FLAVOR} != ${FLAVORS:[1]})
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync.
-.    if ${PHP_VER} == 74
+.    if ${PHP_VER} == 80
+PHP_EXT_DIR=   20200930
+PHP_EXT_INC=    hash pcre spl
+.    elif ${PHP_VER} == 74
 PHP_EXT_DIR=   20190902
 PHP_EXT_INC=    hash pcre spl
 .    elif ${PHP_VER} == 73
@@ -377,11 +380,12 @@ _USE_PHP_ALL=	bcmath bitset bz2 calendar ctype curl dba dom \
 		pdo_odbc pdo_pgsql pdo_sqlite phar pgsql posix \
 		pspell radius readline redis session shmop simplexml snmp soap\
 		sockets spl sqlite3 sysvmsg sysvsem sysvshm \
-		tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib
+		tidy tokenizer xml xmlreader xmlwriter xsl zip zlib
 # version specific components
-_USE_PHP_VER72=	${_USE_PHP_ALL} interbase recode sodium wddx
-_USE_PHP_VER73=	${_USE_PHP_ALL} interbase recode sodium wddx
-_USE_PHP_VER74=	${_USE_PHP_ALL} ffi sodium
+_USE_PHP_VER72=	${_USE_PHP_ALL} interbase recode sodium xmlrpc wddx
+_USE_PHP_VER73=	${_USE_PHP_ALL} interbase recode sodium xmlrpc wddx
+_USE_PHP_VER74=	${_USE_PHP_ALL} ffi sodium xmlrpc
+_USE_PHP_VER80=	${_USE_PHP_ALL} ffi sodium
 
 bcmath_DEPENDS=	math/php${PHP_VER}-bcmath
 bitset_DEPENDS=	math/pecl-bitset@${PHP_FLAVOR}
diff --git a/archivers/php80-bz2/Makefile b/archivers/php80-bz2/Makefile
new file mode 100644
index 000000000000..5af405016e27
--- /dev/null
+++ b/archivers/php80-bz2/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	archivers
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-bz2
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php80-phar/Makefile b/archivers/php80-phar/Makefile
new file mode 100644
index 000000000000..2140a910db5d
--- /dev/null
+++ b/archivers/php80-phar/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	archivers
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-phar
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php80-phar/files/patch-config.m4 b/archivers/php80-phar/files/patch-config.m4
new file mode 100644
index 000000000000..1aba3bd9a5a8
--- /dev/null
+++ b/archivers/php80-phar/files/patch-config.m4
@@ -0,0 +1,41 @@
+--- config.m4.orig	2016-06-21 19:56:50 UTC
++++ config.m4
+@@ -4,8 +4,38 @@ dnl config.m4 for extension phar
+ PHP_ARG_ENABLE(phar, for phar archive support,
+ [  --disable-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_HASH_SHARED" != "yes"; then
+     if test "$PHP_HASH" != "no"; then
diff --git a/archivers/php80-zip/Makefile b/archivers/php80-zip/Makefile
new file mode 100644
index 000000000000..832bbe3d4574
--- /dev/null
+++ b/archivers/php80-zip/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	archivers
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-zip
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php80-zlib/Makefile b/archivers/php80-zlib/Makefile
new file mode 100644
index 000000000000..88d49ae52311
--- /dev/null
+++ b/archivers/php80-zlib/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	archivers
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-zlib
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/archivers/php80-zlib/files/patch-zlib.c b/archivers/php80-zlib/files/patch-zlib.c
new file mode 100644
index 000000000000..be02c50d1df6
--- /dev/null
+++ b/archivers/php80-zlib/files/patch-zlib.c
@@ -0,0 +1,10 @@
+--- zlib.c.orig	2016-06-21 19:57:08 UTC
++++ zlib.c
+@@ -1480,6 +1480,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib)
+ /* {{{ PHP_RINIT_FUNCTION */
+ static PHP_RINIT_FUNCTION(zlib)
+ {
++	ZLIBG(output_compression) = 0;
+ 	ZLIBG(compression_coding) = 0;
+     if (!ZLIBG(handler_registered)) {
+         ZLIBG(output_compression) = ZLIBG(output_compression_default);
diff --git a/converters/php80-iconv/Makefile b/converters/php80-iconv/Makefile
new file mode 100644
index 000000000000..cf268da7b50b
--- /dev/null
+++ b/converters/php80-iconv/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	converters
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-iconv
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/converters/php80-mbstring/Makefile b/converters/php80-mbstring/Makefile
new file mode 100644
index 000000000000..aeaa499b2e22
--- /dev/null
+++ b/converters/php80-mbstring/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	converters
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-mbstring
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/converters/php80-mbstring/files/patch-config.m4 b/converters/php80-mbstring/files/patch-config.m4
new file mode 100644
index 000000000000..a3e5c14477a3
--- /dev/null
+++ b/converters/php80-mbstring/files/patch-config.m4
@@ -0,0 +1,44 @@
+--- config.m4.orig	2019-08-06 06:54:10 UTC
++++ config.m4
+@@ -37,6 +37,31 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
+ 
+   out="php_config.h"
+ 
++  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 "$ext_shared" != "no" && test -f "$ext_builddir/config.h.in"; then
+     out="$abs_builddir/config.h"
+   fi
+@@ -200,6 +225,9 @@ PHP_ARG_ENABLE([mbregex],
+   [yes],
+   [no])
+ 
++PHP_ARG_WITH(pcre-dir, pcre install prefix,
++[  --with-pcre-dir           MBSTRING: pcre install prefix], no, no)
++
+ if test "$PHP_MBSTRING" != "no"; then
+   AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
+ 
diff --git a/databases/php80-dba/Makefile b/databases/php80-dba/Makefile
new file mode 100644
index 000000000000..ac2d9ccad359
--- /dev/null
+++ b/databases/php80-dba/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-dba
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-dba/files/patch-config.m4 b/databases/php80-dba/files/patch-config.m4
new file mode 100644
index 000000000000..30f662138374
--- /dev/null
+++ b/databases/php80-dba/files/patch-config.m4
@@ -0,0 +1,50 @@
+--- config.m4.orig	2016-01-06 15:14:47 UTC
++++ config.m4
+@@ -324,6 +324,38 @@ 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
++      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
++      break
+     elif test -f "$i/include/db5.1/db.h"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db5.1/db.h
+@@ -366,7 +398,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)])
+ fi
+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
+ 
diff --git a/databases/php80-mysqli/Makefile b/databases/php80-mysqli/Makefile
new file mode 100644
index 000000000000..29dd8411d1e2
--- /dev/null
+++ b/databases/php80-mysqli/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-mysqli
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-mysqli/files/patch-mysqli__api.c b/databases/php80-mysqli/files/patch-mysqli__api.c
new file mode 100644
index 000000000000..a100e8205fb6
--- /dev/null
+++ b/databases/php80-mysqli/files/patch-mysqli__api.c
@@ -0,0 +1,12 @@
+--- 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/php80-mysqli/files/patch-php_mysqli_structs.h b/databases/php80-mysqli/files/patch-php_mysqli_structs.h
new file mode 100644
index 000000000000..68568dd214fd
--- /dev/null
+++ b/databases/php80-mysqli/files/patch-php_mysqli_structs.h
@@ -0,0 +1,20 @@
+--- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
++++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
+@@ -36,7 +36,7 @@
+ #define FALSE 0
+ #endif
+ 
+-#ifdef MYSQLI_USE_MYSQLND
++#if defined(MYSQLI_USE_MYSQLND)
+ #include "ext/mysqlnd/mysqlnd.h"
+ #include "mysqli_mysqlnd.h"
+ #else
+@@ -53,6 +53,8 @@
+ #undef HAVE_MBSTATE_T
+ #define WE_HAD_MBSTATE_T
+ #endif
++
++typedef zend_ulong ulong;
+ 
+ #if defined(ulong) && !defined(HAVE_ULONG)
+ #define HAVE_ULONG
diff --git a/databases/php80-odbc/Makefile b/databases/php80-odbc/Makefile
new file mode 100644
index 000000000000..3f3763a6893c
--- /dev/null
+++ b/databases/php80-odbc/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-odbc
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-odbc/files/patch-config.m4 b/databases/php80-odbc/files/patch-config.m4
new file mode 100644
index 000000000000..04efc6ded7c9
--- /dev/null
+++ b/databases/php80-odbc/files/patch-config.m4
@@ -0,0 +1,111 @@
+--- config.m4.orig	2019-08-06 06:54:18 UTC
++++ config.m4
+@@ -91,6 +91,9 @@ 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]]],
+@@ -102,7 +105,7 @@ PHP_ARG_WITH([odbcver],,
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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],,
+     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
+ 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
+ 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
+ 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
+ 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/databases/php80-pdo/Makefile b/databases/php80-pdo/Makefile
new file mode 100644
index 000000000000..5b7e2bdefdbd
--- /dev/null
+++ b/databases/php80-pdo/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pdo
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_dblib/Makefile b/databases/php80-pdo_dblib/Makefile
new file mode 100644
index 000000000000..2f758fd1c6e5
--- /dev/null
+++ b/databases/php80-pdo_dblib/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pdo_dblib
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_firebird/Makefile b/databases/php80-pdo_firebird/Makefile
new file mode 100644
index 000000000000..8296897b4c7c
--- /dev/null
+++ b/databases/php80-pdo_firebird/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pdo_firebird
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_mysql/Makefile b/databases/php80-pdo_mysql/Makefile
new file mode 100644
index 000000000000..90750d910e58
--- /dev/null
+++ b/databases/php80-pdo_mysql/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pdo_mysql
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_odbc/Makefile b/databases/php80-pdo_odbc/Makefile
new file mode 100644
index 000000000000..4076e183fec9
--- /dev/null
+++ b/databases/php80-pdo_odbc/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pdo_odbc
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_pgsql/Makefile b/databases/php80-pdo_pgsql/Makefile
new file mode 100644
index 000000000000..26abe3104ede
--- /dev/null
+++ b/databases/php80-pdo_pgsql/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pdo_pgsql
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_sqlite/Makefile b/databases/php80-pdo_sqlite/Makefile
new file mode 100644
index 000000000000..f5ad6819dc90
--- /dev/null
+++ b/databases/php80-pdo_sqlite/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pdo_sqlite
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pgsql/Makefile b/databases/php80-pgsql/Makefile
new file mode 100644
index 000000000000..6ed29ca82e99
--- /dev/null
+++ b/databases/php80-pgsql/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pgsql
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-sqlite3/Makefile b/databases/php80-sqlite3/Makefile
new file mode 100644
index 000000000000..e377f0f21e6a
--- /dev/null
+++ b/databases/php80-sqlite3/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-sqlite3
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-ffi/Makefile b/devel/php80-ffi/Makefile
new file mode 100644
index 000000000000..2f8cf08434e2
--- /dev/null
+++ b/devel/php80-ffi/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-ffi
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-gettext/Makefile b/devel/php80-gettext/Makefile
new file mode 100644
index 000000000000..fe1f05852297
--- /dev/null
+++ b/devel/php80-gettext/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-gettext
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-intl/Makefile b/devel/php80-intl/Makefile
new file mode 100644
index 000000000000..0f945ccf026b
--- /dev/null
+++ b/devel/php80-intl/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-intl
+
+USES=		compiler:c++11-lib
+USE_CXXSTD=	gnu++11
+
+CPPFLAGS+=	-DU_USING_ICU_NAMESPACE=1
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-pcntl/Makefile b/devel/php80-pcntl/Makefile
new file mode 100644
index 000000000000..78e499be0e9f
--- /dev/null
+++ b/devel/php80-pcntl/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pcntl
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-readline/Makefile b/devel/php80-readline/Makefile
new file mode 100644
index 000000000000..4f0b5b5240cd
--- /dev/null
+++ b/devel/php80-readline/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-readline
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-readline/files/patch-config.m4 b/devel/php80-readline/files/patch-config.m4
new file mode 100644
index 000000000000..93799734a3e3
--- /dev/null
+++ b/devel/php80-readline/files/patch-config.m4
@@ -0,0 +1,33 @@
+--- config.m4.orig	2019-08-06 06:54:14 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
+@@ -78,6 +72,13 @@ if test "$PHP_READLINE" && test "$PHP_RE
+   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
+     AC_MSG_WARN([libedit directory ignored, rely on pkg-config])
diff --git a/devel/php80-readline/files/patch-readline_cli.c b/devel/php80-readline/files/patch-readline_cli.c
new file mode 100644
index 000000000000..02f55974f9b0
--- /dev/null
+++ b/devel/php80-readline/files/patch-readline_cli.c
@@ -0,0 +1,13 @@
+--- readline_cli.c.orig	2012-03-02 16:40:26.000000000 +0100
++++ readline_cli.c	2012-03-02 16:40:43.000000000 +0100
+@@ -19,6 +19,10 @@
+ 
+ /* $Id: readline_cli.c 321634 2012-01-01 13:15:04Z felipe $ */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "php.h"
+ 
+ #ifndef HAVE_RL_COMPLETION_MATCHES
diff --git a/devel/php80-shmop/Makefile b/devel/php80-shmop/Makefile
new file mode 100644
index 000000000000..9f8975eb0c13
--- /dev/null
+++ b/devel/php80-shmop/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-shmop
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-sysvmsg/Makefile b/devel/php80-sysvmsg/Makefile
new file mode 100644
index 000000000000..5a587c4b8aee
--- /dev/null
+++ b/devel/php80-sysvmsg/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-sysvmsg
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-sysvsem/Makefile b/devel/php80-sysvsem/Makefile
new file mode 100644
index 000000000000..220be597d291
--- /dev/null
+++ b/devel/php80-sysvsem/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-sysvsem
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-sysvshm/Makefile b/devel/php80-sysvshm/Makefile
new file mode 100644
index 000000000000..edd4f4d75940
--- /dev/null
+++ b/devel/php80-sysvshm/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-sysvshm
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/php80-tokenizer/Makefile b/devel/php80-tokenizer/Makefile
new file mode 100644
index 000000000000..426f0414b51a
--- /dev/null
+++ b/devel/php80-tokenizer/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	devel
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-tokenizer
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/ftp/php80-curl/Makefile b/ftp/php80-curl/Makefile
new file mode 100644
index 000000000000..8c4830bb559a
--- /dev/null
+++ b/ftp/php80-curl/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	ftp
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-curl
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/ftp/php80-ftp/Makefile b/ftp/php80-ftp/Makefile
new file mode 100644
index 000000000000..4ef837b91dec
--- /dev/null
+++ b/ftp/php80-ftp/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+CATEGORIES=	ftp
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-ftp
+
+TEST_TARGET=    test
+
+post-patch:
+	@${REINPLACE_CMD} s/HAVE_OPENSSL_EXT/__FreeBSD__/ \
+		${WRKSRC}/ftp.* ${WRKSRC}/php_ftp.*
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/php80-exif/Makefile b/graphics/php80-exif/Makefile
new file mode 100644
index 000000000000..41170b155f1a
--- /dev/null
+++ b/graphics/php80-exif/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	graphics
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-exif
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/php80-gd/Makefile b/graphics/php80-gd/Makefile
new file mode 100644
index 000000000000..de2d56a179cf
--- /dev/null
+++ b/graphics/php80-gd/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+CATEGORIES=	graphics
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-gd
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
+
+LIB_DEPENDS+=	libgd.so:graphics/gd
diff --git a/graphics/php80-gd/files/patch-gd.c b/graphics/php80-gd/files/patch-gd.c
new file mode 100644
index 000000000000..37de5d8772fc
--- /dev/null
+++ b/graphics/php80-gd/files/patch-gd.c
@@ -0,0 +1,11 @@
+--- gd.c.orig	2020-09-29 22:36:51 UTC
++++ gd.c
+@@ -72,7 +72,7 @@ static int le_gd_font;
+ # 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/php80-extensions/Makefile b/lang/php80-extensions/Makefile
new file mode 100644
index 000000000000..05b636918d6a
--- /dev/null
+++ b/lang/php80-extensions/Makefile
@@ -0,0 +1,110 @@
+# $FreeBSD$
+
+PORTNAME=	php80
+PORTVERSION=	1.0
+CATEGORIES=	lang
+PKGNAMESUFFIX=	-extensions
+
+MAINTAINER=	tz@FreeBSD.org
+COMMENT=	"meta-port" to install PHP extensions
+
+USES=		metaport php
+PHP_VER=	80
+IGNORE_WITH_PHP=	72 73 74
+
+OPTIONS_DEFINE=	BCMATH BZ2 CALENDAR CTYPE CURL DBA \
+		DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \
+		GMP ICONV INTL IMAP LDAP MBSTRING \
+		MYSQLI \
+		ODBC OPCACHE OPENSSL PCNTL PDF PDO PDO_DBLIB PDO_FIREBIRD \
+		PDO_MYSQL PDO_ODBC PDO_PGSQL PDO_SQLITE PGSQL PHAR POSIX \
+		PSPELL READLINE SESSION SHMOP SIMPLEXML SNMP SOAP \
+		SOCKETS SODIUM SQLITE3 SYSVMSG SYSVSEM SYSVSHM \
+		TIDY TOKENIZER XML XMLREADER XMLRPC XMLWRITER XSL \
+		ZIP ZLIB
+
+BCMATH_DESC=		bc style precision math functions
+BZ2_DESC=		bzip2 library support
+CALENDAR_DESC=		calendar conversion support
+CTYPE_DESC=		ctype functions
+CURL_DESC=		CURL support
+DBA_DESC=		dba support
+DOM_DESC=		DOM support
+ENCHANT_DESC=		Enchant spelling support
+EXIF_DESC=		EXIF support
+FILEINFO_DESC=		fileinfo support
+FILTER_DESC=		input filter support
+FTP_DESC=		FTP support
+GD_DESC=		GD library support
+GETTEXT_DESC=		gettext library support
+GMP_DESC=		GNU MP support
+ICONV_DESC=		iconv support
+IMAP_DESC=		IMAP support
+INTL_DESC=		Internationalization(ICU)
+LDAP_DESC=		OpenLDAP support
+MBSTRING_DESC=		multibyte string support
+MYSQLI_DESC=		MySQLi database support
+ODBC_DESC=		ODBC support
+OPCACHE_DESC=		OPcache support
+OPENSSL_DESC=		OpenSSL support
+PCNTL_DESC=		pcntl support (CLI only)
+PDF_DESC=		PDFlib support (implies GD)
+PDO_DESC=		PHP Data Objects Interface (PDO)
+PDO_DBLIB_DESC=		PDO DBLIB-DB driver
+PDO_FIREBIRD_DESC=	PDO Firebird driver
+PDO_MYSQL_DESC=		PDO MySQL driver
+PDO_ODBC_DESC=		PDO ODBC driver
+PDO_PGSQL_DESC=		PDO PostgreSQL driver
+PDO_SQLITE_DESC=	PDO sqlite driver
+PGSQL_DESC=		PostgreSQL database support
+PHAR_DESC=		phar support
+POSIX_DESC=		POSIX-like functions
+PSPELL_DESC=		pspell support
+READLINE_DESC=		readline support (CLI only)
+SESSION_DESC=		session support
+SHMOP_DESC=		shmop support
+SIMPLEXML_DESC=		simplexml support
+SNMP_DESC=		SNMP support
+SOAP_DESC=		SOAP support
+SOCKETS_DESC=		sockets support
+SODIUM_DESC=		Sodium encryption support
+SQLITE3_DESC=		sqlite3 support
+SYSVMSG_DESC=		System V message support
+SYSVSEM_DESC=		System V semaphore support
+SYSVSHM_DESC=		System V shared memory support
+TIDY_DESC=		TIDY support
+TOKENIZER_DESC=		tokenizer support
+XML_DESC=		XML support
+XMLREADER_DESC=		XMLReader support
+XMLRPC_DESC=		XMLRPC-EPI support
+XMLWRITER_DESC=		XMLWriter support
+XSL_DESC=		XSL support (Implies DOM)
+ZIP_DESC=		ZIP support
+ZLIB_DESC=		ZLIB support
+
+OPTIONS_DEFAULT=	CTYPE \
+			DOM \
+			FILTER \
+			ICONV \
+			OPCACHE \
+			PDO \
+			PDO_SQLITE \
+			PHAR \
+			POSIX \
+			SESSION \
+			SIMPLEXML \
+			SQLITE3 \
+			TOKENIZER \
+			XML \
+			XMLREADER \
+			XMLWRITER
+
+.include <bsd.port.options.mk>
+
+.for opt in ${OPTIONS_DEFINE}
+.	if ${PORT_OPTIONS:M${opt}}
+USE_PHP+=	${opt:tl}
+.	endif
+.endfor
+
+.include <bsd.port.mk>
diff --git a/lang/php80-extensions/pkg-descr b/lang/php80-extensions/pkg-descr
new file mode 100644
index 000000000000..6e2c985b2932
--- /dev/null
+++ b/lang/php80-extensions/pkg-descr
@@ -0,0 +1,7 @@
+This is a "meta-port" to install the extensions for PHP 8.0
+
+Defaults to:
+ctype, dom, filter, iconv, json, opcache, pdo, pdo_sqlite, phar, posix,
+session, simplexml, sqlite3, tokenizer, xml, xmlreader and xmlwriter.
+
+WWW: https://www.php.net/
diff --git a/lang/php80/Makefile b/lang/php80/Makefile
new file mode 100644
index 000000000000..f3588ea083ca
--- /dev/null
+++ b/lang/php80/Makefile
@@ -0,0 +1,189 @@
+# $FreeBSD$
+
+PORTNAME=	php80
+DISTVERSION=	8.0.0RC2
+PORTREVISION?=	0
+CATEGORIES?=	lang devel www
+MASTER_SITES=   https://downloads.php.net/~pollita/
+DISTNAME=	php-${DISTVERSION}
+
+MAINTAINER=	tz@FreeBSD.org
+COMMENT=	PHP Scripting Language
+
+LICENSE=	PHP301
+
+USES+=		compiler:c11 tar:xz cpe gnome pkgconfig
+CPE_PRODUCT=	php
+NO_OPTIONS_SORT=yes
+
+.if !defined(PKGNAMESUFFIX)
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
+		libargon2.so:security/libargon2
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-layout=GNU \
+		--with-config-file-scan-dir=${PREFIX}/etc/php \
+		--disable-all \
+		--with-libxml \
+		--with-password-argon2=${LOCALBASE} \
+		--program-prefix=""
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+USES+=		autoreconf:build
+USE_GNOME=	libxml2
+
+# 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_powerpc=		DTRACE
+OPTIONS_EXCLUDE_powerpc64=		DTRACE
+OPTIONS_EXCLUDE_sparc64=	DTRACE
+OPTIONS_SUB=	yes
+
+CLI_DESC=	Build CLI version
+CGI_DESC=	Build CGI version
+FPM_DESC=	Build FPM version
+EMBED_DESC=	Build embedded library
+PHPDBG_DESC=	Interactive PHP debugger
+MYSQLND_DESC=	Build with MySQL Native Driver
+LINKTHR_DESC=	Link thread lib (for threaded extensions)
+ZTS_DESC=	Force Zend Thread Safety (ZTS) build
+
+CONFLICTS=	php72-* php73-* php74-*
+
+DESTDIRNAME=	INSTALL_ROOT
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MMYSQLND}
+CONFIGURE_ARGS+=--enable-mysqlnd
+.endif
+
+.if ${PORT_OPTIONS:MCLI}
+PHP_SAPI+=	cli
+.else
+CONFIGURE_ARGS+=--disable-cli
+.endif
+
+.if ${PORT_OPTIONS:MCGI}
+PHP_SAPI+=	cgi
+.else
+CONFIGURE_ARGS+=--disable-cgi
+.endif
+
+.if ${PORT_OPTIONS:MFPM}
+PHP_SAPI+=	fpm
+USE_RC_SUBR+=	php-fpm
+CONFIGURE_ARGS+=--enable-fpm \
+		--with-fpm-user=${WWWOWN} \
+		--with-fpm-group=${WWWGRP}
+.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=	php8
+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:MEMBED}
+PHP_SAPI+=	embed
+CONFIGURE_ARGS+=--enable-embed
+.endif
+
+.if ${PORT_OPTIONS:MPHPDBG}
+PHP_SAPI+=	phpdbg
+CONFIGURE_ARGS+=--enable-phpdbg
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=--enable-phpdbg-debug
+.endif
+.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"
+
+.if ${PORT_OPTIONS:MLINKTHR}
+LIBS+=		-lpthread
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=--enable-debug
+.endif
+
+.if ${PORT_OPTIONS:MZTS}
+CONFIGURE_ARGS+=--enable-maintainer-zts
+CONFIGURE_ENV+=	pthreads_working="yes"
+.endif
+
+.if ${PORT_OPTIONS:MDTRACE}
+CONFIGURE_ARGS+=--enable-dtrace
+PLIST_SUB+=	DTRACE=""
+.else
+PLIST_SUB+=	DTRACE="@comment "
+.endif
+
+.if empty(PORT_OPTIONS:MIPV6)
+CONFIGURE_ARGS+=--disable-ipv6
+.endif
+
+post-patch:
+	@${TOUCH} ${WRKSRC}/ext/php_config.h
+	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
+.if ${PORT_OPTIONS:MFPM}
+	@${REINPLACE_CMD} -e "s|^;\(pid\)|\1|;s|^;\(pm\.[a-z_]*_servers\)|\1|" \
+		${WRKSRC}/sapi/fpm/php-fpm.conf.in
+.endif
+
+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} "PHP_EXT_INC=hash pcre spl" >> ${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
+
+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/Makefile.ext b/lang/php80/Makefile.ext
new file mode 100644
index 000000000000..bafb34446ef5
--- /dev/null
+++ b/lang/php80/Makefile.ext
@@ -0,0 +1,559 @@
+# $FreeBSD$
+
+COMMENT=	The ${PHP_MODNAME} shared extension for php
+
+USES+=	php:ext,noflavors
+PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
+PHP_VER=	80
+IGNORE_WITH_PHP= 72 73 74
+
+EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
+WRKSRC=		${WRKDIR}/${EXTSUBDIR}
+PATCHDIR=	${.CURDIR}/files
+PLIST=		${NONEXISTENT}
+
+EXTRACT_AFTER_ARGS?=	${EXTSUBDIR}
+
+.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 GDBM QDBM TOKYO INIFILE FLATFILE LMDB
+OPTIONS_DEFAULT=CDB INIFILE FLATFILE
+
+CDB_DESC=	cdb database support
+DB4_DESC=	Berkeley DB4 support
+GDBM_DESC=	GDBM database support
+QDBM_DESC=	QDBM database support
+TOKYO_DESC=	Tokyo Cabinet database support
+INIFILE_DESC=	INI file support
+FLATFILE_DESC=	flatfile support
+LMDB_DESC=	LMDB database support
+
+PHP_HEADER_DIRS=	libcdb libflatfile libinifile
+.endif
+
+.if ${PHP_MODNAME} == "dom"
+CONFIGURE_ARGS+=--enable-dom \
+		--with-libxml-dir=${LOCALBASE}
+
+USES+=		pkgconfig
+USE_GNOME=	libxml2
+.endif
+
+.if ${PHP_MODNAME} == "enchant"
+LIB_DEPENDS+=   libenchant.so:textproc/enchant
+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+=--enable-ffi
+.endif
+
+.if ${PHP_MODNAME} == "fileinfo"
+CONFIGURE_ARGS+=--enable-fileinfo \
+		--with-pcre-dir=${LOCALBASE}
+
+PHP_HEADER_DIRS=	libmagic
+.endif
+
+.if ${PHP_MODNAME} == "filter"
+CONFIGURE_ARGS+=--enable-filter \
+		--with-pcre-dir=${LOCALBASE}
+.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+=		ssl pkgconfig
+.endif
+
+.if ${PHP_MODNAME} == "gd"
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+		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=TRUETYPE JIS WEBP X11
+OPTIONS_DEFAULT=TRUETYPE
+
+TRUETYPE_DESC=	Enable TrueType string function
+JIS_DESC=	Enable JIS-mapped Japanese font support
+WEBP_DESC=  Enable WebP image format support
+X11_DESC=	Enable XPM support
+
+.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
+
+CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
+		--with-pcre-dir=${LOCALBASE} \
+		--with-imap-ssl=${OPENSSLBASE}
+
+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"
+CONFIGURE_ARGS+=--with-intl=${LOCALBASE}
+LIB_DEPENDS=	libicui18n.so:devel/icu
+USES+=		pkgconfig
+.endif
+
+.if ${PHP_MODNAME} == "json"
+CONFIGURE_ARGS+=--enable-json
+BUILD_DEPENDS=  re2c:devel/re2c
+.endif
+
+.if ${PHP_MODNAME} == "ldap"
+CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
+
+USE_OPENLDAP=	yes
+
+. ifdef(WANT_OPENLDAP_SASL)
+CONFIGURE_ARGS+=--with-ldap-sasl=${LOCALBASE}
+. endif
+.endif
+
+.if ${PHP_MODNAME} == "mbstring"
+
+CONFIGURE_ARGS+=--enable-mbstring \
+		--with-pcre-dir=${LOCALBASE}
+
+OPTIONS_DEFINE=	REGEX
+OPTIONS_DEFAULT=REGEX
+
+REGEX_DESC=	Enable multibyte regex support
+
+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
+.endif
+
+.if ${PHP_MODNAME} == "odbc"
+LIB_DEPENDS+=	libodbc.so:databases/unixODBC
+
+CONFIGURE_ARGS+=--enable-odbc \
+		--with-unixODBC=${LOCALBASE}
+.endif
+
+.if ${PHP_MODNAME} == "openssl"
+USES+=			ssl
+CONFIGURE_ARGS+=	--with-openssl
+CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
+			OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
+.endif
+
+.if ${PHP_MODNAME} == "opcache"
+# This is needed by Zend extensions, keep before everything.
+PHP_MOD_PRIO=	10
+CONFIGURE_ARGS+=--enable-opcache
+USES+=	localbase
+.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
+.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
+
+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 \
+		--with-pcre-dir=${LOCALBASE}
+.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
+.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 \
+		--with-pcre-dir=${LOCALBASE} \
+		--with-libxml-dir=${LOCALBASE}
+
+USES+=		pkgconfig
+USE_GNOME=	libxml2
+.endif
+
+.if ${PHP_MODNAME} == "snmp"
+CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} \
+		--with-openssl-dir=${OPENSSLBASE}
+
+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 \
+		--with-libxml-dir=${LOCALBASE}
+
+USES+=		pkgconfig
+USE_GNOME=	libxml2
+.endif
+
+.if ${PHP_MODNAME} == "sockets"
+CONFIGURE_ARGS+=--enable-sockets
+.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 \
+		--with-libxml-dir=${LOCALBASE}
+
+USES+=		pkgconfig
+USE_GNOME=	libxml2
+.endif
+
+.if ${PHP_MODNAME} == "xmlreader"
+CONFIGURE_ARGS+=--enable-xmlreader \
+		--with-libxml-dir=${LOCALBASE}
+
+USE_GNOME=	libxml2
+
+USE_PHP=	dom:build
+.endif
+
+.if ${PHP_MODNAME} == "xmlrpc"
+CONFIGURE_ARGS+=--with-xmlrpc \
+		--with-libxml-dir=${LOCALBASE} \
+		--with-iconv-dir=${LOCALBASE}
+
+USES+=		iconv:translit
+USE_GNOME=	libxml2
+
+PHP_HEADER_DIRS=libxmlrpc
+
+USE_PHP=	xml:build
+.endif
+
+.if ${PHP_MODNAME} == "xmlwriter"
+CONFIGURE_ARGS+=--enable-xmlwriter \
+                --with-libxml-dir=${LOCALBASE}
+
+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+=--enable-zip \
+		--with-zlib-dir=/usr \
+		--with-pcre-dir=${LOCALBASE} \
+		--with-libzip=${LOCALBASE}
+USES+=		pkgconfig
+.endif
+
+.if ${PHP_MODNAME} == "zlib"
+CONFIGURE_ARGS+=--with-zlib=/usr
+USES+=		pkgconfig
+.endif
+
+.include <bsd.port.options.mk>
+
+.if ${PHP_MODNAME} == "dba"
+.	if empty(PORT_OPTIONS:MCDB)
+CONFIGURE_ARGS+=--without-cdb
+.	endif
+.	if ${PORT_OPTIONS:MDB4}
+CONFIGURE_ARGS+=--with-db4=${LOCALBASE}
+
+USES+=			bdb
+WITH_BDB_HIGHEST=	yes
+.	endif
+.	if ${PORT_OPTIONS:MGDBM}
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
+
+CONFIGURE_ARGS+=--with-gdbm=${LOCALBASE}
+.	endif
+.	if ${PORT_OPTIONS:MQDBM}
+LIB_DEPENDS+=	libqdbm.so:databases/qdbm
+
+CONFIGURE_ARGS+=--with-qdbm=${LOCALBASE}
+.	endif
+.	if ${PORT_OPTIONS:MTOKYO}
+LIB_DEPENDS+=	libtokyocabinet.so:databases/tokyocabinet
+
+CONFIGURE_ARGS+=--with-tcadb=${LOCALBASE}
+.	endif
+.	if empty(PORT_OPTIONS:MINIFILE)
+CONFIGURE_ARGS+=--disable-inifile
+.	endif
+.	if empty(PORT_OPTIONS:MFLATFILE)
+CONFIGURE_ARGS+=--disable-flatfile
+.	endif
+
+.	if ${PORT_OPTIONS:MLMDB}
+LIB_DEPENDS+=	liblmdb.so:databases/lmdb
+CONFIGURE_ARGS+=	--with-lmdb=${LOCALBASE}
+.endif
+.endif
+
+.if ${PHP_MODNAME} == "mysqli"
+.	if ${PORT_OPTIONS:MMYSQLND}
+CONFIGURE_ARGS+=--with-mysqli=mysqlnd
+.	else
+CONFIGURE_ARGS+=--with-mysqli=${LOCALBASE}/bin/mysql_config
+USES+=	mysql
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "pdo_mysql"
+.	if ${PORT_OPTIONS:MMYSQLND}
+CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
+.	else
+CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \
+		--with-zlib-dir=/usr
+USES+=	mysql
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "gd"
+.	if ${PORT_OPTIONS:MJIS}
+CONFIGURE_ARGS+=--enable-gd-jis-conv
+.	endif
+.   if ${PORT_OPTIONS:MWEBP}
+LIB_DEPENDS+=   libwebp.so:graphics/webp
+
+CONFIGURE_ARGS+=--with-webp
+.   endif
+.	if ${PORT_OPTIONS:MX11}
+USES+=		xorg
+USE_XORG=	xpm
+
+CONFIGURE_ARGS+=--with-xpm
+.	endif
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${PHP_MODNAME} == "imap"
+.	if ${PORT_OPTIONS:MPANDA}
+LIB_DEPENDS+=	libc-client4.so.10:mail/panda-cclient
+.	else
+LIB_DEPENDS+=	libc-client4.so.9:mail/cclient
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "mbstring"
+.	if ${PORT_OPTIONS:MREGEX}
+LIB_DEPENDS+=	libonig.so:devel/oniguruma
+CONFIGURE_ARGS+=--with-onig=${LOCALBASE}
+.	else
+CONFIGURE_ARGS+=--disable-mbregex
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "openssl" || ${PHP_MODNAME} == "sqlite3"
+post-extract:
+	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
+.endif
+
+.if ${PHP_MODNAME} == "pdo_dblib"
+.	if ${PORT_OPTIONS:MMSSQL}
+LIB_DEPENDS+=	libsybdb.so:databases/freetds
+.	else
+LIB_DEPENDS+=	libct.so:databases/freetds
+.	endif
+.endif
+
+.if ${PHP_MODNAME} == "xml"
+post-extract:
+	@${MKDIR} ${WRKSRC}/ext/xml
+	@${CP} ${WRKSRC}/expat_compat.h ${WRKSRC}/ext/xml
+.endif
+
+.if ${PHP_MODNAME} == "zlib"
+post-extract:
+	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
+.endif
diff --git a/lang/php80/distinfo b/lang/php80/distinfo
new file mode 100644
index 000000000000..1de4065e737e
--- /dev/null
+++ b/lang/php80/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1603062674
+SHA256 (php-8.0.0RC2.tar.xz) = 97d8031ba1095c3222fc5725710ac18dc4f584e526cbcbfb2817146abb6891ec
+SIZE (php-8.0.0RC2.tar.xz) = 10713424
diff --git a/lang/php80/files/patch-build_Makefile.global b/lang/php80/files/patch-build_Makefile.global
new file mode 100644
index 000000000000..4b838d157941
--- /dev/null
+++ b/lang/php80/files/patch-build_Makefile.global
@@ -0,0 +1,19 @@
+--- build/Makefile.global.orig	2019-08-06 06:54:07 UTC
++++ build/Makefile.global
+@@ -89,14 +89,14 @@ test: all
+ 	@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+ 		INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \
+ 		if test "$$INI_FILE"; then \
+-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
++			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_FILE" > $(top_builddir)/tmp-php.ini || :; \
+ 		else \
+ 			echo > $(top_builddir)/tmp-php.ini; \
+ 		fi; \
+ 		INI_SCANNED_PATH=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r '$$a = explode(",\n", trim(php_ini_scanned_files())); echo $$a[0];' 2> /dev/null`; \
+ 		if test "$$INI_SCANNED_PATH"; then \
+ 			INI_SCANNED_PATH=`$(top_srcdir)/build/shtool path -d $$INI_SCANNED_PATH`; \
+-			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini; \
++			$(EGREP) -h -v $(PHP_DEPRECATED_DIRECTIVES_REGEX) "$$INI_SCANNED_PATH"/*.ini >> $(top_builddir)/tmp-php.ini || :; \
+ 		fi; \
+ 		TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
+ 		TEST_PHP_SRCDIR=$(top_srcdir) \
diff --git a/lang/php80/files/patch-configure.ac b/lang/php80/files/patch-configure.ac
new file mode 100644
index 000000000000..77f7449ad90f
--- /dev/null
+++ b/lang/php80/files/patch-configure.ac
@@ -0,0 +1,45 @@
+--- configure.ac.orig	2020-09-29 22:36:51 UTC
++++ configure.ac
+@@ -55,6 +55,7 @@ AH_BOTTOM([
+ 
+ #include <string.h>
+ 
++#include <ext/php_config.h>
+ #endif /* PHP_CONFIG_H */
+ ])
+ 
+@@ -262,7 +263,6 @@ sinclude(Zend/Zend.m4)
+ 
+ dnl ----------------------------------------------------------------------------
+ 
+-PTHREADS_CHECK
+ PHP_HELP_SEPARATOR([SAPI modules:])
+ PHP_SHLIB_SUFFIX_NAMES
+ PHP_BUILD_PROGRAM
+@@ -602,7 +602,7 @@ memmem \
+ AX_FUNC_WHICH_GETHOSTBYNAME_R
+ 
+ dnl Some systems (like OpenSolaris) do not have nanosleep in libc.
+-PHP_CHECK_FUNC_LIB(nanosleep, rt)
++PHP_CHECK_FUNC(nanosleep, rt)
+ 
+ dnl Haiku does not have network api in libc.
+ PHP_CHECK_FUNC_LIB(setsockopt, network)
+@@ -1244,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+ EXPANDED_DATADIR=$datadir
+ EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
+ EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
+-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
++INCLUDE_PATH=.:${prefix}/share/pear
+ 
+ exec_prefix=$old_exec_prefix
+ libdir=$old_libdir
+@@ -1431,7 +1431,7 @@ PHP_SUBST(all_targets)
+ PHP_SUBST(install_targets)
+ PHP_SUBST(install_binary_targets)
+ 
+-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
++PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
+ 
+ PHP_ADD_SOURCES(TSRM, TSRM.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ 
diff --git a/lang/php80/files/patch-ext_mysqli_mysqli__api.c b/lang/php80/files/patch-ext_mysqli_mysqli__api.c
new file mode 100644
index 000000000000..535503954e3d
--- /dev/null
+++ b/lang/php80/files/patch-ext_mysqli_mysqli__api.c
@@ -0,0 +1,12 @@
+--- 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/php80/files/patch-ext_mysqli_mysqli__nonapi.c b/lang/php80/files/patch-ext_mysqli_mysqli__nonapi.c
new file mode 100644
index 000000000000..9baa04218bf9
--- /dev/null
+++ b/lang/php80/files/patch-ext_mysqli_mysqli__nonapi.c
@@ -0,0 +1,12 @@
+--- ext/mysqli/mysqli_nonapi.c.orig	2020-01-09 11:40:57 UTC
++++ ext/mysqli/mysqli_nonapi.c
+@@ -28,7 +28,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 SAFE_STR(a) ((a)?a:"")
diff --git a/lang/php80/files/patch-ext_mysqli_mysqli__prop.c b/lang/php80/files/patch-ext_mysqli_mysqli__prop.c
new file mode 100644
index 000000000000..37d47a304440
--- /dev/null
+++ b/lang/php80/files/patch-ext_mysqli_mysqli__prop.c
@@ -0,0 +1,12 @@
+--- ext/mysqli/mysqli_prop.c.orig	2020-01-09 11:40:11 UTC
++++ ext/mysqli/mysqli_prop.c
+@@ -26,7 +26,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) \
diff --git a/lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h b/lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h
new file mode 100644
index 000000000000..f0e33efd03aa
--- /dev/null
+++ b/lang/php80/files/patch-ext_mysqli_php__mysqli__structs.h
@@ -0,0 +1,11 @@
+--- ext/mysqli/php_mysqli_structs.h.orig	2019-12-17 10:29:23 UTC
++++ ext/mysqli/php_mysqli_structs.h
+@@ -36,7 +36,7 @@
+ #define FALSE 0
+ #endif
+ 
+-#ifdef MYSQLI_USE_MYSQLND
++#if defined(MYSQLI_USE_MYSQLND)
+ #include "ext/mysqlnd/mysqlnd.h"
+ #include "mysqli_mysqlnd.h"
+ #else
diff --git a/lang/php80/files/patch-sapi_apache2handler_config.m4 b/lang/php80/files/patch-sapi_apache2handler_config.m4
new file mode 100644
index 000000000000..5b0cfb9d4591
--- /dev/null
+++ b/lang/php80/files/patch-sapi_apache2handler_config.m4
@@ -0,0 +1,11 @@
+--- sapi/apache2handler/config.m4.orig	2018-08-14 11:39:14 UTC
++++ sapi/apache2handler/config.m4
+@@ -65,7 +65,7 @@ if test "$PHP_APXS2" != "no"; then
+   fi
+ 
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+-  if test -z `$APXS -q SYSCONFDIR`; then
++  if true; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -i -n php7"
diff --git a/lang/php80/files/patch-sapi_fpm_config.m4 b/lang/php80/files/patch-sapi_fpm_config.m4
new file mode 100644
index 000000000000..e88c204384ae
--- /dev/null
+++ b/lang/php80/files/patch-sapi_fpm_config.m4
@@ -0,0 +1,11 @@
+--- sapi/fpm/config.m4.orig	2018-08-14 11:39:14 UTC
++++ sapi/fpm/config.m4
+@@ -319,7 +319,7 @@ AC_DEFUN([AC_FPM_LQ],
+     AC_MSG_RESULT([no])
+   ])
+ 
+-  if test "$have_lq" = "tcp_info"; then
++  if test "$have_lq" = "so_listenq"; then
+     AC_DEFINE([HAVE_LQ_TCP_INFO], 1, [do we have TCP_INFO?])
+   fi
+ 
diff --git a/lang/php80/files/patch-sapi_fpm_www.conf.in b/lang/php80/files/patch-sapi_fpm_www.conf.in
new file mode 100644
index 000000000000..c7e7fe399854
--- /dev/null
+++ b/lang/php80/files/patch-sapi_fpm_www.conf.in
@@ -0,0 +1,17 @@
+--- sapi/fpm/www.conf.in.orig	2019-01-26 15:54:27 UTC
++++ sapi/fpm/www.conf.in
+@@ -27,10 +27,14 @@ group = @php_fpm_group@
+ ; Valid syntaxes are:
+ ;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+ ;                            a specific port;
++;   '0.0.0.0:port'         - to listen on a TCP socket to all IPv4 addresses on
++;                            a specific port;
+ ;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+ ;                            a specific port;
+ ;   'port'                 - to listen on a TCP socket to all addresses
+ ;                            (IPv6 and IPv4-mapped) on a specific port;
++;                            Note: IPv4-mapped addresses are disabled by-default in
++;                                  FreeBSD for security reasons;
+ ;   '/path/to/unix/socket' - to listen on a unix socket.
+ ; Note: This value is mandatory.
+ listen = 127.0.0.1:9000
diff --git a/lang/php80/files/php-fpm.in b/lang/php80/files/php-fpm.in
new file mode 100644
index 000000000000..1c9d7f5c81ba
--- /dev/null
+++ b/lang/php80/files/php-fpm.in
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: php-fpm
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable php-fpm:
+# php_fpm_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="php_fpm"
+rcvar=php_fpm_enable
+
+start_precmd="php_fpm_prestart"
+restart_precmd="php_fpm_checkconfig"
+reload_precmd="php_fpm_checkconfig"
+configtest_cmd="php_fpm_checkconfig"
+
+load_rc_config "$name"
+
+: ${php_fpm_enable="NO"}
+: ${php_fpm_umask=""}
+
+extra_commands="reload configtest logrotate"
+
+command="%%PREFIX%%/sbin/php-fpm"
+pidfile="/var/run/php-fpm.pid"
+sig_stop="QUIT"
+sig_reload="USR2"
+logrotate_cmd="php_fpm_logrotate"
+
+required_files="%%PREFIX%%/etc/php-fpm.conf"
+
+php_fpm_logrotate() {
+        if [ -z "$rc_pid" ]; then
+                _run_rc_notrunning
+                return 1
+        fi
+        echo "Rotating logs $name."
+        kill -USR1 $rc_pid
+}
+
+php_fpm_checkconfig()
+{
+        echo "Performing sanity check on php-fpm configuration:"
+        eval ${command} -t
+}
+
+php_fpm_prestart()
+{
+	php_fpm_checkconfig
+	checkconfig=$?
+	if [ $checkconfig -ne 0  ]; then
+		return $checkconfig
+	fi
+
+	if [ ! -z "$php_fpm_umask"  ]; then
+		echo "Setting umask to: ${php_fpm_umask}"
+		umask $php_fpm_umask
+	fi
+}
+
+run_rc_command "$1"
diff --git a/lang/php80/pkg-descr b/lang/php80/pkg-descr
new file mode 100644
index 000000000000..ea14e767e1c9
--- /dev/null
+++ b/lang/php80/pkg-descr
@@ -0,0 +1,8 @@
+PHP, which stands for "PHP: Hypertext Preprocessor" is a widely-used Open
+Source general-purpose scripting language that is especially suited for
+Web development and can be embedded into HTML.  Its syntax draws upon C,
+Java, and Perl, and is easy to learn.  The main goal of the language is to
+allow web developers to write dynamically generated webpages quickly, but
+you can do much more with PHP.
+
+WWW: https://www.php.net/
diff --git a/lang/php80/pkg-message.mod b/lang/php80/pkg-message.mod
new file mode 100644
index 000000000000..a0c2c87889a7
--- /dev/null
+++ b/lang/php80/pkg-message.mod
@@ -0,0 +1,19 @@
+******************************************************************************
+
+Make sure index.php is part of your DirectoryIndex.
+
+You should add the following to your Apache configuration file:
+
+<FilesMatch "\.php$">
+    SetHandler application/x-httpd-php
+</FilesMatch>
+<FilesMatch "\.phps$">
+    SetHandler application/x-httpd-php-source
+</FilesMatch>
+
+******************************************************************************
+
+If you are building PHP-based ports in poudriere(8) or Synth with ZTS enabled,
+add WITH_MPM=event to /etc/make.conf to prevent build failures.
+
+******************************************************************************
diff --git a/lang/php80/pkg-plist b/lang/php80/pkg-plist
new file mode 100644
index 000000000000..3525e605597e
--- /dev/null
+++ b/lang/php80/pkg-plist
@@ -0,0 +1,295 @@
+%%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/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_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_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_cpuinfo.h
+include/php/Zend/zend_dtrace.h
+include/php/Zend/zend_dtrace_gen.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_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_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_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_ts_hash.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_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/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/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/flock_compat.h
+include/php/ext/standard/fsock.h
+include/php/ext/standard/head.h
+include/php/ext/standard/hrtime.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
+@postexec touch %D/include/php/ext/php_config.h
+@postunexec [ -s %D/include/php/ext/php_config.h ] || rm %D/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/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_main.h
+include/php/main/php_memory_streams.h
+include/php/main/php_network.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_stdint.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
+%%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/lang/php80/pkg-plist.mod b/lang/php80/pkg-plist.mod
new file mode 100644
index 000000000000..8939be6d3d5e
--- /dev/null
+++ b/lang/php80/pkg-plist.mod
@@ -0,0 +1,3 @@
+%%APACHEMODDIR%%/%%AP_MODULE%%
+@postexec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
+@preunexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f
diff --git a/mail/php80-imap/Makefile b/mail/php80-imap/Makefile
new file mode 100644
index 000000000000..192a85fe2bba
--- /dev/null
+++ b/mail/php80-imap/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	mail
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-imap
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/mail/php80-imap/files/patch-config.m4 b/mail/php80-imap/files/patch-config.m4
new file mode 100644
index 000000000000..b2a153543fe3
--- /dev/null
+++ b/mail/php80-imap/files/patch-config.m4
@@ -0,0 +1,47 @@
+--- config.m4.orig	2019-08-20 14:09:27 UTC
++++ config.m4
+@@ -105,6 +105,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)
+@@ -120,6 +127,30 @@ if test "$PHP_IMAP" != "no"; then
+       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, [
+       AC_DEFINE(HAVE_IMAP2004,1,[ ])
diff --git a/math/php80-bcmath/Makefile b/math/php80-bcmath/Makefile
new file mode 100644
index 000000000000..f5843fa20652
--- /dev/null
+++ b/math/php80-bcmath/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	math
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-bcmath
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/math/php80-gmp/Makefile b/math/php80-gmp/Makefile
new file mode 100644
index 000000000000..8feb1ff445af
--- /dev/null
+++ b/math/php80-gmp/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	math
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-gmp
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/misc/php80-calendar/Makefile b/misc/php80-calendar/Makefile
new file mode 100644
index 000000000000..b6fa3deb8a8a
--- /dev/null
+++ b/misc/php80-calendar/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	misc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-calendar
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/php80-snmp/Makefile b/net-mgmt/php80-snmp/Makefile
new file mode 100644
index 000000000000..31bad9f4439d
--- /dev/null
+++ b/net-mgmt/php80-snmp/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	net-mgmt
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-snmp
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/php80-ldap/Makefile b/net/php80-ldap/Makefile
new file mode 100644
index 000000000000..eab839a64f10
--- /dev/null
+++ b/net/php80-ldap/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	net
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-ldap
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/php80-soap/Makefile b/net/php80-soap/Makefile
new file mode 100644
index 000000000000..617b83853e56
--- /dev/null
+++ b/net/php80-soap/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	net
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-soap
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/php80-sockets/Makefile b/net/php80-sockets/Makefile
new file mode 100644
index 000000000000..e122120571cb
--- /dev/null
+++ b/net/php80-sockets/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	net
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-sockets
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/php80-filter/Makefile b/security/php80-filter/Makefile
new file mode 100644
index 000000000000..0fa7322dcf69
--- /dev/null
+++ b/security/php80-filter/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	security
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-filter
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/php80-openssl/Makefile b/security/php80-openssl/Makefile
new file mode 100644
index 000000000000..e1f1b4c185c4
--- /dev/null
+++ b/security/php80-openssl/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	security
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-openssl
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/php80-sodium/Makefile b/security/php80-sodium/Makefile
new file mode 100644
index 000000000000..39a2a64d0c15
--- /dev/null
+++ b/security/php80-sodium/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	security
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-sodium
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/php80-fileinfo/Makefile b/sysutils/php80-fileinfo/Makefile
new file mode 100644
index 000000000000..4d282be3baf1
--- /dev/null
+++ b/sysutils/php80-fileinfo/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	sysutils
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-fileinfo
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/php80-fileinfo/files/patch-config.m4 b/sysutils/php80-fileinfo/files/patch-config.m4
new file mode 100644
index 000000000000..1348023ccf64
--- /dev/null
+++ b/sysutils/php80-fileinfo/files/patch-config.m4
@@ -0,0 +1,21 @@
+--- config.m4.orig	2010-09-07 15:45:30.000000000 +0200
++++ config.m4	2010-09-07 15:46:50.000000000 +0200
+@@ -4,6 +4,9 @@
+ PHP_ARG_ENABLE(fileinfo, for fileinfo support,
+ [  --disable-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=" \
+@@ -13,6 +16,8 @@
+     libmagic/is_tar.c libmagic/magic.c libmagic/print.c \
+     libmagic/readcdf.c libmagic/readelf.c libmagic/softmagic.c"
+ 
++  PHP_ADD_INCLUDE($PHP_PCRE_DIR/include)
++
+   PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
+   PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
+ 
diff --git a/sysutils/php80-posix/Makefile b/sysutils/php80-posix/Makefile
new file mode 100644
index 000000000000..9779ec11789a
--- /dev/null
+++ b/sysutils/php80-posix/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	sysutils
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-posix
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/php80-posix/files/patch-posix.c b/sysutils/php80-posix/files/patch-posix.c
new file mode 100644
index 000000000000..d2365b249569
--- /dev/null
+++ b/sysutils/php80-posix/files/patch-posix.c
@@ -0,0 +1,38 @@
+--- posix.c.orig	Fri Feb 23 00:40:39 2007
++++ posix.c	Sun May 13 17:52:27 2007
+@@ -838,7 +838,7 @@
+ #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);
+ 	g = &gbuf;
+@@ -888,7 +888,7 @@
+ 	
+ 	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ 	if (grbuflen < 1) {
+-		RETURN_FALSE;
++		grbuflen = 1024;
+ 	}
+ 
+ 	grbuf = emalloc(grbuflen);
+@@ -955,7 +955,7 @@
+ #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;
+@@ -1004,7 +1004,7 @@
+ #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/php80-ctype/Makefile b/textproc/php80-ctype/Makefile
new file mode 100644
index 000000000000..87f7f09b1368
--- /dev/null
+++ b/textproc/php80-ctype/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	textproc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-ctype
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-dom/Makefile b/textproc/php80-dom/Makefile
new file mode 100644
index 000000000000..9bf16dd397cb
--- /dev/null
+++ b/textproc/php80-dom/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	textproc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-dom
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-enchant/Makefile b/textproc/php80-enchant/Makefile
new file mode 100644
index 000000000000..ffd4e9533509
--- /dev/null
+++ b/textproc/php80-enchant/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	textproc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-enchant
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-enchant/files/patch-enchant.c b/textproc/php80-enchant/files/patch-enchant.c
new file mode 100644
index 000000000000..fb4da55c99de
--- /dev/null
+++ b/textproc/php80-enchant/files/patch-enchant.c
@@ -0,0 +1,11 @@
+--- enchant.c.orig	2020-10-18 21:29:39 UTC
++++ enchant.c
+@@ -24,7 +24,7 @@
+ #include "ext/standard/info.h"
+ #include "Zend/zend_interfaces.h"
+ #include "Zend/zend_exceptions.h"
+-#include "../spl/spl_exceptions.h"
++#include "ext/spl/spl_exceptions.h"
+ #include <enchant.h>
+ #include "php_enchant.h"
+ #include "enchant_arginfo.h"
diff --git a/textproc/php80-pspell/Makefile b/textproc/php80-pspell/Makefile
new file mode 100644
index 000000000000..598bb807582f
--- /dev/null
+++ b/textproc/php80-pspell/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	textproc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-pspell
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-simplexml/Makefile b/textproc/php80-simplexml/Makefile
new file mode 100644
index 000000000000..5ebb35523209
--- /dev/null
+++ b/textproc/php80-simplexml/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	textproc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-simplexml
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-simplexml/files/patch-config.m4 b/textproc/php80-simplexml/files/patch-config.m4
new file mode 100644
index 000000000000..88638f7dccf4
--- /dev/null
+++ b/textproc/php80-simplexml/files/patch-config.m4
@@ -0,0 +1,42 @@
+--- config.m4.orig	2019-08-06 06:54:07 UTC
++++ config.m4
+@@ -4,8 +4,39 @@ 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])
+   fi
diff --git a/textproc/php80-xml/Makefile b/textproc/php80-xml/Makefile
new file mode 100644
index 000000000000..c145eaf687b0
--- /dev/null
+++ b/textproc/php80-xml/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	textproc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-xml
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-xml/files/patch-compat.c b/textproc/php80-xml/files/patch-compat.c
new file mode 100644
index 000000000000..02125961b20c
--- /dev/null
+++ b/textproc/php80-xml/files/patch-compat.c
@@ -0,0 +1,13 @@
+--- compat.c.orig	Tue Jul 20 10:55:02 2004
++++ compat.c	Tue Jul 20 10:55:55 2004
+@@ -16,6 +16,10 @@
+    +----------------------------------------------------------------------+
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #include "php.h"
+ #if defined(HAVE_LIBXML) && defined(HAVE_XML) && !defined(HAVE_LIBEXPAT)
+ #include "expat_compat.h"
diff --git a/textproc/php80-xmlreader/Makefile b/textproc/php80-xmlreader/Makefile
new file mode 100644
index 000000000000..0b8e3ad9a40a
--- /dev/null
+++ b/textproc/php80-xmlreader/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+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
new file mode 100644
index 000000000000..03ddb2b39c19
--- /dev/null
+++ b/textproc/php80-xmlwriter/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+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
new file mode 100644
index 000000000000..755288f93e44
--- /dev/null
+++ b/textproc/php80-xsl/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	textproc
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-xsl
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/php80-xsl/files/patch-php_xsl.h b/textproc/php80-xsl/files/patch-php_xsl.h
new file mode 100644
index 000000000000..69f1140af49d
--- /dev/null
+++ b/textproc/php80-xsl/files/patch-php_xsl.h
@@ -0,0 +1,11 @@
+--- 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>
diff --git a/www/mod_php80/Makefile b/www/mod_php80/Makefile
new file mode 100644
index 000000000000..83e0daf46a55
--- /dev/null
+++ b/www/mod_php80/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+CATEGORIES=	www devel
+PKGNAMEPREFIX=	mod_
+
+MAINTAINER=	ports@FreeBSD.org
+
+PHP_PORT=	lang/php80
+MASTERDIR=	${.CURDIR}/../../${PHP_PORT}
+
+OPTIONS_DEFINE=	AP2FILTER
+AP2FILTER_DESC=	Use Apache 2.x filter interface (experimental)
+OPTIONS_EXCLUDE=CGI CLI FPM EMBED
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/php80-opcache/Makefile b/www/php80-opcache/Makefile
new file mode 100644
index 000000000000..0d2446b02c47
--- /dev/null
+++ b/www/php80-opcache/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+CATEGORIES=	www
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-opcache
+
+TEST_TARGET=    test
+
+USES=	php:zend,noflavors
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/php80-session/Makefile b/www/php80-session/Makefile
new file mode 100644
index 000000000000..f12077271d4b
--- /dev/null
+++ b/www/php80-session/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	www
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-session
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/php80-tidy/Makefile b/www/php80-tidy/Makefile
new file mode 100644
index 000000000000..096b12d1178d
--- /dev/null
+++ b/www/php80-tidy/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+CATEGORIES=	www
+
+MASTERDIR=	${.CURDIR}/../../lang/php80
+
+PKGNAMESUFFIX=	-tidy
+
+TEST_TARGET=    test
+
+.include "${MASTERDIR}/Makefile"