svn commit: r552906 - in head: Mk/Uses archivers/php80-bz2 archivers/php80-phar archivers/php80-zip archivers/php80-zlib converters/php80-iconv converters/php80-mbstring databases/php80-dba databas...

Torsten Zuehlsdorff tz at FreeBSD.org
Wed Oct 21 22:59:04 UTC 2020 

Author: tz
Date: Wed Oct 21 22:58:51 2020
New Revision: 552906
URL: https://svnweb.freebsd.org/changeset/ports/552906

Log:
  Welcome PHP 8.0 RC 2 to the ports tree
  
  There are many greater changes including:
  - json is now part of core
  - xmlrpc is removed
  - More than 150 backward incompatible changes
  
  Have a look at: https://github.com/php/php-src/blob/php-8.0.0RC2/UPGRADING
  
  Reviewed by:	ale, mfechner, Pascal Christen
  Sponsored by:	PHP Update Service
  Differential Revision:	https://reviews.freebsd.org/D26848

Added:
  head/archivers/php80-bz2/
     - copied from r552359, head/archivers/php74-bz2/
  head/archivers/php80-phar/
     - copied from r552359, head/archivers/php74-phar/
  head/archivers/php80-zip/
     - copied from r552359, head/archivers/php74-zip/
  head/archivers/php80-zlib/
     - copied from r552359, head/archivers/php74-zlib/
  head/converters/php80-iconv/
     - copied from r552359, head/converters/php74-iconv/
  head/converters/php80-mbstring/
     - copied from r552359, head/converters/php74-mbstring/
  head/databases/php80-dba/
     - copied from r552359, head/databases/php74-dba/
  head/databases/php80-mysqli/
     - copied from r552359, head/databases/php74-mysqli/
  head/databases/php80-odbc/
     - copied from r552359, head/databases/php74-odbc/
  head/databases/php80-pdo/
     - copied from r552359, head/databases/php74-pdo/
  head/databases/php80-pdo_dblib/
     - copied from r552359, head/databases/php74-pdo_dblib/
  head/databases/php80-pdo_firebird/
     - copied from r552359, head/databases/php74-pdo_firebird/
  head/databases/php80-pdo_mysql/
     - copied from r552359, head/databases/php74-pdo_mysql/
  head/databases/php80-pdo_odbc/
     - copied from r552359, head/databases/php74-pdo_odbc/
  head/databases/php80-pdo_pgsql/
     - copied from r552359, head/databases/php74-pdo_pgsql/
  head/databases/php80-pdo_sqlite/
     - copied from r552359, head/databases/php74-pdo_sqlite/
  head/databases/php80-pgsql/
     - copied from r552359, head/databases/php74-pgsql/
  head/databases/php80-sqlite3/
     - copied from r552359, head/databases/php74-sqlite3/
  head/devel/php80-ffi/
     - copied from r552359, head/devel/php74-ffi/
  head/devel/php80-gettext/
     - copied from r552359, head/devel/php74-gettext/
  head/devel/php80-intl/
     - copied from r552359, head/devel/php74-intl/
  head/devel/php80-pcntl/
     - copied from r552359, head/devel/php74-pcntl/
  head/devel/php80-readline/
     - copied from r552359, head/devel/php74-readline/
  head/devel/php80-shmop/
     - copied from r552359, head/devel/php74-shmop/
  head/devel/php80-sysvmsg/
     - copied from r552359, head/devel/php74-sysvmsg/
  head/devel/php80-sysvsem/
     - copied from r552359, head/devel/php74-sysvsem/
  head/devel/php80-sysvshm/
     - copied from r552359, head/devel/php74-sysvshm/
  head/devel/php80-tokenizer/
     - copied from r552359, head/devel/php74-tokenizer/
  head/ftp/php80-curl/
     - copied from r552359, head/ftp/php74-curl/
  head/ftp/php80-ftp/
     - copied from r552359, head/ftp/php74-ftp/
  head/graphics/php80-exif/
     - copied from r552359, head/graphics/php74-exif/
  head/graphics/php80-gd/
     - copied from r552359, head/graphics/php74-gd/
  head/lang/php80/
     - copied from r552359, head/lang/php74/
  head/lang/php80-extensions/
     - copied from r552359, head/lang/php74-extensions/
  head/mail/php80-imap/
     - copied from r552359, head/mail/php74-imap/
  head/math/php80-bcmath/
     - copied from r552359, head/math/php74-bcmath/
  head/math/php80-gmp/
     - copied from r552359, head/math/php74-gmp/
  head/misc/php80-calendar/
     - copied from r552359, head/misc/php74-calendar/
  head/net-mgmt/php80-snmp/
     - copied from r552359, head/net-mgmt/php74-snmp/
  head/net/php80-ldap/
     - copied from r552359, head/net/php74-ldap/
  head/net/php80-soap/
     - copied from r552359, head/net/php74-soap/
  head/net/php80-sockets/
     - copied from r552359, head/net/php74-sockets/
  head/security/php80-filter/
     - copied from r552359, head/security/php74-filter/
  head/security/php80-openssl/
     - copied from r552359, head/security/php74-openssl/
  head/security/php80-sodium/
     - copied from r552359, head/security/php74-sodium/
  head/sysutils/php80-fileinfo/
     - copied from r552359, head/sysutils/php74-fileinfo/
  head/sysutils/php80-posix/
     - copied from r552359, head/sysutils/php74-posix/
  head/textproc/php80-ctype/
     - copied from r552359, head/textproc/php74-ctype/
  head/textproc/php80-dom/
     - copied from r552359, head/textproc/php74-dom/
  head/textproc/php80-enchant/
     - copied from r552359, head/textproc/php74-enchant/
  head/textproc/php80-enchant/files/
  head/textproc/php80-enchant/files/patch-enchant.c   (contents, props changed)
  head/textproc/php80-pspell/
     - copied from r552359, head/textproc/php74-pspell/
  head/textproc/php80-simplexml/
     - copied from r552359, head/textproc/php74-simplexml/
  head/textproc/php80-xml/
     - copied from r552359, head/textproc/php74-xml/
  head/textproc/php80-xmlreader/
     - copied from r552359, head/textproc/php74-xmlreader/
  head/textproc/php80-xmlwriter/
     - copied from r552359, head/textproc/php74-xmlwriter/
  head/textproc/php80-xsl/
     - copied from r552359, head/textproc/php74-xsl/
  head/www/mod_php80/
     - copied from r552359, head/www/mod_php74/
  head/www/php80-opcache/
     - copied from r552359, head/www/php74-opcache/
  head/www/php80-session/
     - copied from r552359, head/www/php74-session/
  head/www/php80-tidy/
     - copied from r552359, head/www/php74-tidy/
Deleted:
  head/databases/php80-mysqli/files/patch-mysqli.c
Modified:
  head/Mk/Uses/php.mk
  head/archivers/php80-bz2/Makefile
  head/archivers/php80-phar/Makefile
  head/archivers/php80-zip/Makefile
  head/archivers/php80-zlib/Makefile
  head/converters/php80-iconv/Makefile
  head/converters/php80-mbstring/Makefile
  head/databases/php80-dba/Makefile
  head/databases/php80-mysqli/Makefile
  head/databases/php80-mysqli/files/patch-mysqli__api.c
  head/databases/php80-odbc/Makefile
  head/databases/php80-pdo/Makefile
  head/databases/php80-pdo_dblib/Makefile
  head/databases/php80-pdo_firebird/Makefile
  head/databases/php80-pdo_mysql/Makefile
  head/databases/php80-pdo_odbc/Makefile
  head/databases/php80-pdo_pgsql/Makefile
  head/databases/php80-pdo_sqlite/Makefile
  head/databases/php80-pgsql/Makefile
  head/databases/php80-sqlite3/Makefile
  head/devel/php80-ffi/Makefile
  head/devel/php80-gettext/Makefile
  head/devel/php80-intl/Makefile
  head/devel/php80-pcntl/Makefile
  head/devel/php80-readline/Makefile
  head/devel/php80-shmop/Makefile
  head/devel/php80-sysvmsg/Makefile
  head/devel/php80-sysvsem/Makefile
  head/devel/php80-sysvshm/Makefile
  head/devel/php80-tokenizer/Makefile
  head/ftp/php80-curl/Makefile
  head/ftp/php80-ftp/Makefile
  head/graphics/php80-exif/Makefile
  head/graphics/php80-gd/Makefile
  head/graphics/php80-gd/files/patch-gd.c
  head/lang/php80-extensions/Makefile
  head/lang/php80-extensions/pkg-descr
  head/lang/php80/Makefile
  head/lang/php80/Makefile.ext
  head/lang/php80/distinfo
  head/lang/php80/files/patch-configure.ac
  head/lang/php80/files/patch-ext_mysqli_mysqli__api.c
  head/lang/php80/pkg-plist
  head/mail/php80-imap/Makefile
  head/math/php80-bcmath/Makefile
  head/math/php80-gmp/Makefile
  head/misc/php80-calendar/Makefile
  head/net-mgmt/php80-snmp/Makefile
  head/net/php80-ldap/Makefile
  head/net/php80-soap/Makefile
  head/net/php80-sockets/Makefile
  head/security/php80-filter/Makefile
  head/security/php80-openssl/Makefile
  head/security/php80-sodium/Makefile
  head/sysutils/php80-fileinfo/Makefile
  head/sysutils/php80-posix/Makefile
  head/textproc/php80-ctype/Makefile
  head/textproc/php80-dom/Makefile
  head/textproc/php80-enchant/Makefile
  head/textproc/php80-pspell/Makefile
  head/textproc/php80-simplexml/Makefile
  head/textproc/php80-xml/Makefile
  head/textproc/php80-xmlreader/Makefile
  head/textproc/php80-xmlwriter/Makefile
  head/textproc/php80-xsl/Makefile
  head/textproc/php80-xsl/files/patch-php_xsl.h
  head/www/mod_php80/Makefile
  head/www/php80-opcache/Makefile
  head/www/php80-session/Makefile
  head/www/php80-tidy/Makefile

Modified: head/Mk/Uses/php.mk
==============================================================================
--- head/Mk/Uses/php.mk	Wed Oct 21 22:49:51 2020	(r552905)
+++ head/Mk/Uses/php.mk	Wed Oct 21 22:58:51 2020	(r552906)
@@ -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 db
 		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}

Modified: head/archivers/php80-bz2/Makefile
==============================================================================
--- head/archivers/php74-bz2/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/archivers/php80-bz2/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-bz2
 

Modified: head/archivers/php80-phar/Makefile
==============================================================================
--- head/archivers/php74-phar/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/archivers/php80-phar/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-phar
 

Modified: head/archivers/php80-zip/Makefile
==============================================================================
--- head/archivers/php74-zip/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/archivers/php80-zip/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-zip
 

Modified: head/archivers/php80-zlib/Makefile
==============================================================================
--- head/archivers/php74-zlib/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/archivers/php80-zlib/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	archivers
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-zlib
 

Modified: head/converters/php80-iconv/Makefile
==============================================================================
--- head/converters/php74-iconv/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/converters/php80-iconv/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	converters
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-iconv
 

Modified: head/converters/php80-mbstring/Makefile
==============================================================================
--- head/converters/php74-mbstring/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/converters/php80-mbstring/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	converters
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-mbstring
 

Modified: head/databases/php80-dba/Makefile
==============================================================================
--- head/databases/php74-dba/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-dba/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-dba
 

Modified: head/databases/php80-mysqli/Makefile
==============================================================================
--- head/databases/php74-mysqli/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-mysqli/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-mysqli
 

Modified: head/databases/php80-mysqli/files/patch-mysqli__api.c
==============================================================================
--- head/databases/php74-mysqli/files/patch-mysqli__api.c	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-mysqli/files/patch-mysqli__api.c	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,13 +1,12 @@
---- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
+--- mysqli_api.c.orig	2020-09-29 22:36:51 UTC
 +++ mysqli_api.c
-@@ -31,8 +31,9 @@
+@@ -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
  
- #if !defined(MYSQLI_USE_MYSQLND)
- /* {{{ mysqli_tx_cor_options_to_string */
+ #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
+ 

Modified: head/databases/php80-odbc/Makefile
==============================================================================
--- head/databases/php74-odbc/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-odbc/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-odbc
 

Modified: head/databases/php80-pdo/Makefile
==============================================================================
--- head/databases/php74-pdo/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pdo/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo
 

Modified: head/databases/php80-pdo_dblib/Makefile
==============================================================================
--- head/databases/php74-pdo_dblib/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pdo_dblib/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo_dblib
 

Modified: head/databases/php80-pdo_firebird/Makefile
==============================================================================
--- head/databases/php74-pdo_firebird/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pdo_firebird/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo_firebird
 

Modified: head/databases/php80-pdo_mysql/Makefile
==============================================================================
--- head/databases/php74-pdo_mysql/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pdo_mysql/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo_mysql
 

Modified: head/databases/php80-pdo_odbc/Makefile
==============================================================================
--- head/databases/php74-pdo_odbc/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pdo_odbc/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo_odbc
 

Modified: head/databases/php80-pdo_pgsql/Makefile
==============================================================================
--- head/databases/php74-pdo_pgsql/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pdo_pgsql/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo_pgsql
 

Modified: head/databases/php80-pdo_sqlite/Makefile
==============================================================================
--- head/databases/php74-pdo_sqlite/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pdo_sqlite/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pdo_sqlite
 

Modified: head/databases/php80-pgsql/Makefile
==============================================================================
--- head/databases/php74-pgsql/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-pgsql/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pgsql
 

Modified: head/databases/php80-sqlite3/Makefile
==============================================================================
--- head/databases/php74-sqlite3/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/databases/php80-sqlite3/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	databases
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sqlite3
 

Modified: head/devel/php80-ffi/Makefile
==============================================================================
--- head/devel/php74-ffi/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-ffi/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-ffi
 

Modified: head/devel/php80-gettext/Makefile
==============================================================================
--- head/devel/php74-gettext/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-gettext/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-gettext
 

Modified: head/devel/php80-intl/Makefile
==============================================================================
--- head/devel/php74-intl/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-intl/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-intl
 

Modified: head/devel/php80-pcntl/Makefile
==============================================================================
--- head/devel/php74-pcntl/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-pcntl/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-pcntl
 

Modified: head/devel/php80-readline/Makefile
==============================================================================
--- head/devel/php74-readline/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-readline/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-readline
 

Modified: head/devel/php80-shmop/Makefile
==============================================================================
--- head/devel/php74-shmop/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-shmop/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-shmop
 

Modified: head/devel/php80-sysvmsg/Makefile
==============================================================================
--- head/devel/php74-sysvmsg/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-sysvmsg/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sysvmsg
 

Modified: head/devel/php80-sysvsem/Makefile
==============================================================================
--- head/devel/php74-sysvsem/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-sysvsem/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sysvsem
 

Modified: head/devel/php80-sysvshm/Makefile
==============================================================================
--- head/devel/php74-sysvshm/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-sysvshm/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sysvshm
 

Modified: head/devel/php80-tokenizer/Makefile
==============================================================================
--- head/devel/php74-tokenizer/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/devel/php80-tokenizer/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	devel
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-tokenizer
 

Modified: head/ftp/php80-curl/Makefile
==============================================================================
--- head/ftp/php74-curl/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/ftp/php80-curl/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	ftp
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-curl
 

Modified: head/ftp/php80-ftp/Makefile
==============================================================================
--- head/ftp/php74-ftp/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/ftp/php80-ftp/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	ftp
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-ftp
 

Modified: head/graphics/php80-exif/Makefile
==============================================================================
--- head/graphics/php74-exif/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/graphics/php80-exif/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	graphics
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-exif
 

Modified: head/graphics/php80-gd/Makefile
==============================================================================
--- head/graphics/php74-gd/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/graphics/php80-gd/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	graphics
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-gd
 

Modified: head/graphics/php80-gd/files/patch-gd.c
==============================================================================
--- head/graphics/php74-gd/files/patch-gd.c	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/graphics/php80-gd/files/patch-gd.c	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,6 +1,6 @@
---- gd.c.orig	2019-08-06 06:54:09 UTC
+--- gd.c.orig	2020-09-29 22:36:51 UTC
 +++ gd.c
-@@ -73,7 +73,7 @@ static int le_gd, le_gd_font;
+@@ -72,7 +72,7 @@ static int le_gd_font;
  # include FT_FREETYPE_H
  #endif
  
@@ -9,66 +9,3 @@
  # include "X11/xpm.h"
  #endif
  
-@@ -322,7 +322,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatef
- 	ZEND_ARG_INFO(0, filename)
- ZEND_END_ARG_INFO()
- 
--#if defined(HAVE_GD_XPM)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
- ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0)
- 	ZEND_ARG_INFO(0, filename)
- ZEND_END_ARG_INFO()
-@@ -935,7 +935,7 @@ static const zend_function_entry gd_func
- #endif
- 	PHP_FE(imagecreatefromwbmp,						arginfo_imagecreatefromwbmp)
- 	PHP_FE(imagecreatefromxbm,						arginfo_imagecreatefromxbm)
--#if defined(HAVE_GD_XPM)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
- 	PHP_FE(imagecreatefromxpm,						arginfo_imagecreatefromxpm)
- #endif
- 	PHP_FE(imagecreatefromgd,						arginfo_imagecreatefromgd)
-@@ -1312,7 +1312,7 @@ PHP_MINFO_FUNCTION(gd)
- #endif
- #endif
- 	php_info_print_table_row(2, "WBMP Support", "enabled");
--#if defined(HAVE_GD_XPM)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
- 	php_info_print_table_row(2, "XPM Support", "enabled");
- #if defined(HAVE_GD_BUNDLED)
- 	{
-@@ -1371,7 +1371,7 @@ PHP_FUNCTION(gd_info)
- 	add_assoc_bool(return_value, "PNG Support", 0);
- #endif
- 	add_assoc_bool(return_value, "WBMP Support", 1);
--#if defined(HAVE_GD_XPM)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
- 	add_assoc_bool(return_value, "XPM Support", 1);
- #else
- 	add_assoc_bool(return_value, "XPM Support", 0);
-@@ -2213,7 +2213,7 @@ PHP_FUNCTION(imagetypes)
- 	ret |= PHP_IMG_PNG;
- #endif
- 	ret |= PHP_IMG_WBMP;
--#if defined(HAVE_GD_XPM)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
- 	ret |= PHP_IMG_XPM;
- #endif
- #ifdef HAVE_GD_WEBP
-@@ -2487,7 +2487,7 @@ static void _php_image_create_from(INTER
- 			case PHP_GDIMG_TYPE_GD2PART:
- 				im = (*func_p)(fp, srcx, srcy, width, height);
- 				break;
--#if defined(HAVE_GD_XPM)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
- 			case PHP_GDIMG_TYPE_XPM:
- 				im = gdImageCreateFromXpm(file);
- 				break;
-@@ -2569,7 +2569,7 @@ PHP_FUNCTION(imagecreatefromxbm)
- }
- /* }}} */
- 
--#if defined(HAVE_GD_XPM)
-+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM)
- /* {{{ proto resource imagecreatefromxpm(string filename)
-    Create a new image from XPM file or URL */
- PHP_FUNCTION(imagecreatefromxpm)

Modified: head/lang/php80-extensions/Makefile
==============================================================================
--- head/lang/php74-extensions/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80-extensions/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTNAME=	php74
+PORTNAME=	php80
 PORTVERSION=	1.0
 CATEGORIES=	lang
 PKGNAMESUFFIX=	-extensions
@@ -9,12 +9,12 @@ MAINTAINER=	tz at FreeBSD.org
 COMMENT=	"meta-port" to install PHP extensions
 
 USES=		metaport php
-PHP_VER=	74
-IGNORE_WITH_PHP=	72 73
+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 JSON LDAP MBSTRING \
+		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 \
@@ -41,7 +41,6 @@ GMP_DESC=		GNU MP support
 ICONV_DESC=		iconv support
 IMAP_DESC=		IMAP support
 INTL_DESC=		Internationalization(ICU)
-JSON_DESC=		JavaScript Object Serialization support
 LDAP_DESC=		OpenLDAP support
 MBSTRING_DESC=		multibyte string support
 MYSQLI_DESC=		MySQLi database support
@@ -87,7 +86,6 @@ OPTIONS_DEFAULT=	CTYPE \
 			DOM \
 			FILTER \
 			ICONV \
-			JSON \
 			OPCACHE \
 			PDO \
 			PDO_SQLITE \

Modified: head/lang/php80-extensions/pkg-descr
==============================================================================
--- head/lang/php74-extensions/pkg-descr	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80-extensions/pkg-descr	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,4 +1,4 @@
-This is a "meta-port" to install the extensions for PHP 7.4.
+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,

Modified: head/lang/php80/Makefile
==============================================================================
--- head/lang/php74/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-PORTNAME=	php74
-DISTVERSION=	7.4.11
+PORTNAME=	php80
+DISTVERSION=	8.0.0RC2
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
-MASTER_SITES=   PHP/distributions
+MASTER_SITES=   https://downloads.php.net/~pollita/
 DISTNAME=	php-${DISTVERSION}
 
 MAINTAINER=	tz at FreeBSD.org
@@ -59,7 +59,7 @@ MYSQLND_DESC=	Build with MySQL Native Driver
 LINKTHR_DESC=	Link thread lib (for threaded extensions)
 ZTS_DESC=	Force Zend Thread Safety (ZTS) build
 
-CONFLICTS=	php71-* php72-* php73-*
+CONFLICTS=	php72-* php73-* php74-*
 
 DESTDIRNAME=	INSTALL_ROOT
 
@@ -99,8 +99,8 @@ CONFIGURE_ARGS+=--with-apxs2=${APXS}
 .endif
 PLIST=		${PKGDIR}/pkg-plist.mod
 PKGMESSAGE=	${PKGDIR}/pkg-message.mod
-MODULENAME=	libphp7
-SHORTMODNAME=	php7
+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
 
@@ -163,7 +163,7 @@ pre-configure:
 
 .if !defined(PKGNAMEPREFIX)
 post-build:
-	@${ECHO_CMD} "PHP_VER=74" > ${WRKDIR}/php.conf
+	@${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

Modified: head/lang/php80/Makefile.ext
==============================================================================
--- head/lang/php74/Makefile.ext	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80/Makefile.ext	Wed Oct 21 22:58:51 2020	(r552906)
@@ -4,8 +4,8 @@ COMMENT=	The ${PHP_MODNAME} shared extension for php
 
 USES+=	php:ext,noflavors
 PHP_MODNAME=	${PKGNAMESUFFIX:S/-//}
-PHP_VER=	74
-IGNORE_WITH_PHP= 72 73
+PHP_VER=	80
+IGNORE_WITH_PHP= 72 73 74
 
 EXTSUBDIR=	${DISTNAME}/ext/${PHP_MODNAME}
 WRKSRC=		${WRKDIR}/${EXTSUBDIR}

Modified: head/lang/php80/distinfo
==============================================================================
--- head/lang/php74/distinfo	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80/distinfo	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602192451
-SHA256 (php-7.4.11.tar.xz) = 5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce
-SIZE (php-7.4.11.tar.xz) = 10302076
+TIMESTAMP = 1603062674
+SHA256 (php-8.0.0RC2.tar.xz) = 97d8031ba1095c3222fc5725710ac18dc4f584e526cbcbfb2817146abb6891ec
+SIZE (php-8.0.0RC2.tar.xz) = 10713424

Modified: head/lang/php80/files/patch-configure.ac
==============================================================================
--- head/lang/php74/files/patch-configure.ac	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80/files/patch-configure.ac	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,14 +1,14 @@
---- configure.ac.orig	2019-08-06 06:54:06 UTC
+--- configure.ac.orig	2020-09-29 22:36:51 UTC
 +++ configure.ac
-@@ -105,6 +105,7 @@ extern "C++" {
- #endif
- #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */
+@@ -55,6 +55,7 @@ AH_BOTTOM([
  
+ #include <string.h>
+ 
 +#include <ext/php_config.h>
  #endif /* PHP_CONFIG_H */
  ])
  
-@@ -313,7 +314,6 @@ sinclude(Zend/Zend.m4)
+@@ -262,7 +263,6 @@ sinclude(Zend/Zend.m4)
  
  dnl ----------------------------------------------------------------------------
  
@@ -16,16 +16,16 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_BUILD_PROGRAM
-@@ -654,7 +654,7 @@ memmem \
+@@ -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 Check for getaddrinfo, should be a better way, but... Also check for working
- dnl getaddrinfo.
-@@ -1308,7 +1308,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
+ 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"`
@@ -34,7 +34,7 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1493,7 +1493,7 @@ PHP_SUBST(all_targets)
+@@ -1431,7 +1431,7 @@ PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  PHP_SUBST(install_binary_targets)
  

Modified: head/lang/php80/files/patch-ext_mysqli_mysqli__api.c
==============================================================================
--- head/lang/php74/files/patch-ext_mysqli_mysqli__api.c	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80/files/patch-ext_mysqli_mysqli__api.c	Wed Oct 21 22:58:51 2020	(r552906)
@@ -1,13 +1,12 @@
---- ext/mysqli/mysqli_api.c.orig	2019-12-17 10:29:23 UTC
+--- ext/mysqli/mysqli_api.c.orig	2020-09-29 22:36:51 UTC
 +++ ext/mysqli/mysqli_api.c
-@@ -31,8 +31,9 @@
+@@ -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
  
- #if !defined(MYSQLI_USE_MYSQLND)
- /* {{{ mysqli_tx_cor_options_to_string */
+ #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
+ 

Modified: head/lang/php80/pkg-plist
==============================================================================
--- head/lang/php74/pkg-plist	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/lang/php80/pkg-plist	Wed Oct 21 22:58:51 2020	(r552906)
@@ -17,24 +17,31 @@ 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
-%%DTRACE%%include/php/Zend/zend_dtrace_gen.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
@@ -45,6 +52,7 @@ 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
@@ -60,6 +68,7 @@ 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
@@ -75,6 +84,7 @@ 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
@@ -86,12 +96,13 @@ 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/libxml/php_libxml.h
 include/php/ext/hash/php_hash.h
 include/php/ext/hash/php_hash_adler32.h
 include/php/ext/hash/php_hash_crc32.h
@@ -106,6 +117,10 @@ 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
@@ -130,8 +145,8 @@ include/php/ext/hash/php_hash_whirlpool.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_wireprotocol.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
@@ -154,16 +169,19 @@ 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/cyr_convert.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
@@ -174,7 +192,6 @@ 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/microtime.h
 include/php/ext/standard/pack.h
 include/php/ext/standard/pageinfo.h
 include/php/ext/standard/php_array.h
@@ -187,16 +204,12 @@ 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_ftok.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_iptc.h
 include/php/ext/standard/php_lcg.h
-include/php/ext/standard/php_link.h
 include/php/ext/standard/php_mail.h
 include/php/ext/standard/php_math.h
-include/php/ext/standard/php_metaphone.h
 include/php/ext/standard/php_mt_rand.h
 include/php/ext/standard/php_net.h
 include/php/ext/standard/php_password.h
@@ -206,7 +219,6 @@ 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_type.h
 include/php/ext/standard/php_uuencode.h
 include/php/ext/standard/php_var.h
 include/php/ext/standard/php_versioning.h
@@ -215,9 +227,9 @@ 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/uniqid.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
@@ -259,12 +271,13 @@ 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/libphp7.so
+%%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

Modified: head/mail/php80-imap/Makefile
==============================================================================
--- head/mail/php74-imap/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/mail/php80-imap/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	mail
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-imap
 

Modified: head/math/php80-bcmath/Makefile
==============================================================================
--- head/math/php74-bcmath/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/math/php80-bcmath/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	math
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-bcmath
 

Modified: head/math/php80-gmp/Makefile
==============================================================================
--- head/math/php74-gmp/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/math/php80-gmp/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	math
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-gmp
 

Modified: head/misc/php80-calendar/Makefile
==============================================================================
--- head/misc/php74-calendar/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/misc/php80-calendar/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	misc
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-calendar
 

Modified: head/net-mgmt/php80-snmp/Makefile
==============================================================================
--- head/net-mgmt/php74-snmp/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/net-mgmt/php80-snmp/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	net-mgmt
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-snmp
 

Modified: head/net/php80-ldap/Makefile
==============================================================================
--- head/net/php74-ldap/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/net/php80-ldap/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	net
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-ldap
 

Modified: head/net/php80-soap/Makefile
==============================================================================
--- head/net/php74-soap/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/net/php80-soap/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	net
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-soap
 

Modified: head/net/php80-sockets/Makefile
==============================================================================
--- head/net/php74-sockets/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/net/php80-sockets/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	net
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sockets
 

Modified: head/security/php80-filter/Makefile
==============================================================================
--- head/security/php74-filter/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/security/php80-filter/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	security
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-filter
 

Modified: head/security/php80-openssl/Makefile
==============================================================================
--- head/security/php74-openssl/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/security/php80-openssl/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	security
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-openssl
 

Modified: head/security/php80-sodium/Makefile
==============================================================================
--- head/security/php74-sodium/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/security/php80-sodium/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	security
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-sodium
 

Modified: head/sysutils/php80-fileinfo/Makefile
==============================================================================
--- head/sysutils/php74-fileinfo/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/sysutils/php80-fileinfo/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	sysutils
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-fileinfo
 

Modified: head/sysutils/php80-posix/Makefile
==============================================================================
--- head/sysutils/php74-posix/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/sysutils/php80-posix/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@
 
 CATEGORIES=	sysutils
 
-MASTERDIR=	${.CURDIR}/../../lang/php74
+MASTERDIR=	${.CURDIR}/../../lang/php80
 
 PKGNAMESUFFIX=	-posix
 

Modified: head/textproc/php80-ctype/Makefile
==============================================================================
--- head/textproc/php74-ctype/Makefile	Wed Oct 14 23:05:51 2020	(r552359)
+++ head/textproc/php80-ctype/Makefile	Wed Oct 21 22:58:51 2020	(r552906)
@@ -2,7 +2,7 @@

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list