Date: Mon, 8 Oct 2018 08:52:52 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481525 - in head: Mk Mk/Uses archivers/php73-bz2 archivers/php73-phar archivers/php73-zip archivers/php73-zlib converters/php73-iconv converters/php73-mbstring converters/php73-mbstrin... Message-ID: <201810080852.w988qqp8098951@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Mon Oct 8 08:52:51 2018 New Revision: 481525 URL: https://svnweb.freebsd.org/changeset/ports/481525 Log: Add PHP 7.3 RC2 to the ports-tree. Notable changes: - Switch from PCRE to PCRE2 - Many modules now require PCRE2 for building - graphics/php73-gd: X11 option is no longer default Changes to Mk/Uses/php.mk approved by ale Added: head/archivers/php73-bz2/ - copied from r477631, head/archivers/php72-bz2/ head/archivers/php73-phar/ - copied from r477631, head/archivers/php72-phar/ head/archivers/php73-zip/ - copied from r477631, head/archivers/php72-zip/ head/archivers/php73-zlib/ - copied from r477631, head/archivers/php72-zlib/ head/converters/php73-iconv/ - copied from r477631, head/converters/php72-iconv/ head/converters/php73-mbstring/ - copied from r477631, head/converters/php72-mbstring/ head/converters/php73-recode/ - copied from r477631, head/converters/php72-recode/ head/databases/php73-dba/ - copied from r477631, head/databases/php72-dba/ head/databases/php73-interbase/ - copied from r477631, head/databases/php72-interbase/ head/databases/php73-mysqli/ - copied from r477631, head/databases/php72-mysqli/ head/databases/php73-odbc/ - copied from r477631, head/databases/php72-odbc/ head/databases/php73-pdo/ - copied from r477631, head/databases/php72-pdo/ head/databases/php73-pdo_dblib/ - copied from r477631, head/databases/php72-pdo_dblib/ head/databases/php73-pdo_firebird/ - copied from r477631, head/databases/php72-pdo_firebird/ head/databases/php73-pdo_mysql/ - copied from r477631, head/databases/php72-pdo_mysql/ head/databases/php73-pdo_odbc/ - copied from r477631, head/databases/php72-pdo_odbc/ head/databases/php73-pdo_pgsql/ - copied from r477631, head/databases/php72-pdo_pgsql/ head/databases/php73-pdo_sqlite/ - copied from r477631, head/databases/php72-pdo_sqlite/ head/databases/php73-pgsql/ - copied from r477631, head/databases/php72-pgsql/ head/databases/php73-sqlite3/ - copied from r477631, head/databases/php72-sqlite3/ head/devel/php73-gettext/ - copied from r477631, head/devel/php72-gettext/ head/devel/php73-intl/ - copied from r477631, head/devel/php72-intl/ head/devel/php73-json/ - copied from r477631, head/devel/php72-json/ head/devel/php73-pcntl/ - copied from r477631, head/devel/php72-pcntl/ head/devel/php73-readline/ - copied from r477631, head/devel/php72-readline/ head/devel/php73-shmop/ - copied from r477631, head/devel/php72-shmop/ head/devel/php73-sysvmsg/ - copied from r477631, head/devel/php72-sysvmsg/ head/devel/php73-sysvsem/ - copied from r477631, head/devel/php72-sysvsem/ head/devel/php73-sysvshm/ - copied from r477631, head/devel/php72-sysvshm/ head/devel/php73-tokenizer/ - copied from r477631, head/devel/php72-tokenizer/ head/ftp/php73-curl/ - copied from r477631, head/ftp/php72-curl/ head/ftp/php73-ftp/ - copied from r477631, head/ftp/php72-ftp/ head/graphics/php73-exif/ - copied from r477631, head/graphics/php72-exif/ head/graphics/php73-gd/ - copied from r477631, head/graphics/php72-gd/ head/lang/php73/ - copied from r477631, head/lang/php72/ head/lang/php73-extensions/ - copied from r477631, head/lang/php72-extensions/ head/mail/php73-imap/ - copied from r477631, head/mail/php72-imap/ head/math/php73-bcmath/ - copied from r477631, head/math/php72-bcmath/ head/math/php73-gmp/ - copied from r477631, head/math/php72-gmp/ head/misc/php73-calendar/ - copied from r477631, head/misc/php72-calendar/ head/net-mgmt/php73-snmp/ - copied from r477631, head/net-mgmt/php72-snmp/ head/net/php73-ldap/ - copied from r477631, head/net/php72-ldap/ head/net/php73-soap/ - copied from r477631, head/net/php72-soap/ head/net/php73-sockets/ - copied from r477631, head/net/php72-sockets/ head/net/php73-xmlrpc/ - copied from r477631, head/net/php72-xmlrpc/ head/security/php73-filter/ - copied from r477631, head/security/php72-filter/ head/security/php73-hash/ - copied from r477631, head/security/php72-hash/ head/security/php73-openssl/ - copied from r477631, head/security/php72-openssl/ head/security/php73-sodium/ - copied from r477631, head/security/php72-sodium/ head/sysutils/php73-fileinfo/ - copied from r477631, head/sysutils/php72-fileinfo/ head/sysutils/php73-posix/ - copied from r477631, head/sysutils/php72-posix/ head/textproc/php73-ctype/ - copied from r477631, head/textproc/php72-ctype/ head/textproc/php73-dom/ - copied from r477631, head/textproc/php72-dom/ head/textproc/php73-enchant/ - copied from r477631, head/textproc/php72-enchant/ head/textproc/php73-pspell/ - copied from r477631, head/textproc/php72-pspell/ head/textproc/php73-simplexml/ - copied from r477631, head/textproc/php72-simplexml/ head/textproc/php73-wddx/ - copied from r477631, head/textproc/php72-wddx/ head/textproc/php73-xml/ - copied from r477631, head/textproc/php72-xml/ head/textproc/php73-xmlreader/ - copied from r477631, head/textproc/php72-xmlreader/ head/textproc/php73-xmlwriter/ - copied from r477631, head/textproc/php72-xmlwriter/ head/textproc/php73-xsl/ - copied from r477631, head/textproc/php72-xsl/ head/www/mod_php73/ - copied from r477631, head/www/mod_php72/ head/www/php73-opcache/ - copied from r477631, head/www/php72-opcache/ head/www/php73-session/ - copied from r477631, head/www/php72-session/ head/www/php73-tidy/ - copied from r477631, head/www/php72-tidy/ Deleted: head/lang/php73/files/patch-Zend_zend__hash.c head/lang/php73/files/patch-Zend_zend__hash.h head/lang/php73/files/patch-bug-76600-remove-mysql8-auth Modified: head/Mk/Uses/php.mk head/Mk/bsd.default-versions.mk head/archivers/php73-bz2/Makefile head/archivers/php73-phar/Makefile head/archivers/php73-zip/Makefile head/archivers/php73-zlib/Makefile head/converters/php73-iconv/Makefile head/converters/php73-mbstring/Makefile head/converters/php73-mbstring/files/patch-config.m4 head/converters/php73-recode/Makefile head/databases/php73-dba/Makefile head/databases/php73-interbase/Makefile head/databases/php73-mysqli/Makefile head/databases/php73-odbc/Makefile head/databases/php73-odbc/files/patch-config.m4 head/databases/php73-pdo/Makefile head/databases/php73-pdo_dblib/Makefile head/databases/php73-pdo_firebird/Makefile head/databases/php73-pdo_mysql/Makefile head/databases/php73-pdo_odbc/Makefile head/databases/php73-pdo_pgsql/Makefile head/databases/php73-pdo_sqlite/Makefile head/databases/php73-pgsql/Makefile head/databases/php73-sqlite3/Makefile head/devel/php73-gettext/Makefile head/devel/php73-intl/Makefile head/devel/php73-json/Makefile head/devel/php73-pcntl/Makefile head/devel/php73-readline/Makefile head/devel/php73-shmop/Makefile head/devel/php73-sysvmsg/Makefile head/devel/php73-sysvsem/Makefile head/devel/php73-sysvshm/Makefile head/devel/php73-tokenizer/Makefile head/ftp/php73-curl/Makefile head/ftp/php73-ftp/Makefile head/graphics/php73-exif/Makefile head/graphics/php73-gd/Makefile head/graphics/php73-gd/files/patch-config.m4 head/graphics/php73-gd/files/patch-gd.c head/lang/php56/Makefile head/lang/php70/Makefile head/lang/php71/Makefile head/lang/php72/Makefile head/lang/php73-extensions/Makefile head/lang/php73/Makefile head/lang/php73/Makefile.ext head/lang/php73/distinfo head/lang/php73/files/patch-acinclude.m4 head/lang/php73/files/patch-sapi_apache2handler_config.m4 head/lang/php73/files/patch-sapi_fpm_config.m4 head/lang/php73/pkg-plist head/mail/php73-imap/Makefile head/math/php73-bcmath/Makefile head/math/php73-gmp/Makefile head/misc/php73-calendar/Makefile head/net-mgmt/php73-snmp/Makefile head/net/php73-ldap/Makefile head/net/php73-soap/Makefile head/net/php73-sockets/Makefile head/net/php73-xmlrpc/Makefile head/security/php73-filter/Makefile head/security/php73-hash/Makefile head/security/php73-openssl/Makefile head/security/php73-sodium/Makefile head/sysutils/php73-fileinfo/Makefile head/sysutils/php73-posix/Makefile head/textproc/php73-ctype/Makefile head/textproc/php73-dom/Makefile head/textproc/php73-enchant/Makefile head/textproc/php73-pspell/Makefile head/textproc/php73-simplexml/Makefile head/textproc/php73-simplexml/files/patch-config.m4 head/textproc/php73-wddx/Makefile head/textproc/php73-xml/Makefile head/textproc/php73-xmlreader/Makefile head/textproc/php73-xmlwriter/Makefile head/textproc/php73-xsl/Makefile head/www/mod_php73/Makefile head/www/php73-opcache/Makefile head/www/php73-session/Makefile head/www/php73-tidy/Makefile Modified: head/Mk/Uses/php.mk ============================================================================== --- head/Mk/Uses/php.mk Mon Oct 8 08:30:57 2018 (r481524) +++ head/Mk/Uses/php.mk Mon Oct 8 08:52:51 2018 (r481525) @@ -96,7 +96,7 @@ DIST_SUBDIR= PECL PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 56 70 71 72 +_ALL_PHP_VERSIONS= 56 70 71 72 73 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -160,7 +160,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} == 72 +. if ${PHP_VER} == 73 +PHP_EXT_DIR= 20180731 +PHP_EXT_INC= pcre spl +. elif ${PHP_VER} == 72 PHP_EXT_DIR= 20170718 PHP_EXT_INC= pcre spl . elif ${PHP_VER} == 71 @@ -357,6 +360,7 @@ _USE_PHP_VER56= ${_USE_PHP_ALL} mssql mysql sybase_ct _USE_PHP_VER70= ${_USE_PHP_ALL} _USE_PHP_VER71= ${_USE_PHP_ALL} _USE_PHP_VER72= ${_USE_PHP_ALL} sodium +_USE_PHP_VER73= ${_USE_PHP_ALL} sodium bcmath_DEPENDS= math/php${PHP_VER}-bcmath . if ${PHP_VER} >= 70 Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Mon Oct 8 08:30:57 2018 (r481524) +++ head/Mk/bsd.default-versions.mk Mon Oct 8 08:52:51 2018 (r481525) @@ -76,7 +76,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .endif # Possible values: 9.3, 9.4, 9.5, 9.6, 10 PGSQL_DEFAULT?= 9.5 -# Possible values: 5.6, 7.0, 7.1, 7.2 +# Possible values: 5.6, 7.0, 7.1, 7.2, 7.3 PHP_DEFAULT?= 7.1 # Possible values: 2.7, 3.4, 3.5, 3.6, 3.7 PYTHON_DEFAULT?= 2.7 Modified: head/archivers/php73-bz2/Makefile ============================================================================== --- head/archivers/php72-bz2/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/archivers/php73-bz2/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -bz2 Modified: head/archivers/php73-phar/Makefile ============================================================================== --- head/archivers/php72-phar/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/archivers/php73-phar/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -phar Modified: head/archivers/php73-zip/Makefile ============================================================================== --- head/archivers/php72-zip/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/archivers/php73-zip/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -zip Modified: head/archivers/php73-zlib/Makefile ============================================================================== --- head/archivers/php72-zlib/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/archivers/php73-zlib/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -zlib Modified: head/converters/php73-iconv/Makefile ============================================================================== --- head/converters/php72-iconv/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/converters/php73-iconv/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -iconv Modified: head/converters/php73-mbstring/Makefile ============================================================================== --- head/converters/php72-mbstring/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/converters/php73-mbstring/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -mbstring Modified: head/converters/php73-mbstring/files/patch-config.m4 ============================================================================== --- head/converters/php72-mbstring/files/patch-config.m4 Mon Aug 20 06:48:55 2018 (r477631) +++ head/converters/php73-mbstring/files/patch-config.m4 Mon Oct 8 08:52:51 2018 (r481525) @@ -1,6 +1,6 @@ ---- config.m4.orig 2009-11-25 02:30:06.000000000 +0100 -+++ config.m4 2010-04-12 09:59:54.000000000 +0200 -@@ -43,6 +43,30 @@ +--- config.m4.orig 2018-09-25 09:08:02 UTC ++++ config.m4 +@@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ PHP_ADD_INCLUDE([$ext_builddir/$dir]) done @@ -31,21 +31,21 @@ if test "$ext_shared" = "no"; then PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) out="php_config.h" -@@ -80,7 +104,6 @@ +@@ -83,7 +107,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [ int foo(int x, ...) { - va_list va; - va_start(va, x); -- va_arg(va, int); - va_arg(va, char *); - va_arg(va, double); - return 0; -@@ -347,6 +370,9 @@ + va_list va; + va_start(va, x); +- va_arg(va, int); + va_arg(va, char *); + va_arg(va, double); + return 0; +@@ -334,6 +357,9 @@ PHP_ARG_WITH(onig, [for external oniguru [ --with-onig[=DIR] MBSTRING: Use external oniguruma. DIR is the oniguruma install prefix. - If DIR is not set, the bundled oniguruma will be used], no, no) + If DIR is not set, the bundled oniguruma will be used], no, no) +PHP_ARG_WITH(pcre-dir, pcre install prefix, +[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) + - if test "$PHP_MBSTRING" != "no"; then + if test "$PHP_MBSTRING" != "no"; then AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support]) Modified: head/converters/php73-recode/Makefile ============================================================================== --- head/converters/php72-recode/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/converters/php73-recode/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -recode Modified: head/databases/php73-dba/Makefile ============================================================================== --- head/databases/php72-dba/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-dba/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -dba Modified: head/databases/php73-interbase/Makefile ============================================================================== --- head/databases/php72-interbase/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-interbase/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -interbase Modified: head/databases/php73-mysqli/Makefile ============================================================================== --- head/databases/php72-mysqli/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-mysqli/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -mysqli Modified: head/databases/php73-odbc/Makefile ============================================================================== --- head/databases/php72-odbc/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-odbc/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -odbc Modified: head/databases/php73-odbc/files/patch-config.m4 ============================================================================== --- head/databases/php72-odbc/files/patch-config.m4 Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-odbc/files/patch-config.m4 Mon Oct 8 08:52:51 2018 (r481525) @@ -1,16 +1,16 @@ ---- config.m4.orig 2016-10-25 15:23:21 UTC +--- config.m4.orig 2018-09-25 09:07:57 UTC +++ config.m4 -@@ -100,13 +100,17 @@ dnl +@@ -97,6 +97,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,, [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0350. - Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0350) +@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,, if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(adabas,, @@ -19,7 +19,7 @@ AC_MSG_CHECKING([for Adabas support]) if test "$PHP_ADABAS" != "no"; then -@@ -135,7 +139,7 @@ fi +@@ -133,7 +136,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(sapdb,, @@ -28,7 +28,7 @@ AC_MSG_CHECKING([for SAP DB support]) if test "$PHP_SAPDB" != "no"; then -@@ -155,7 +159,7 @@ fi +@@ -153,7 +156,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(solid,, @@ -37,7 +37,7 @@ AC_MSG_CHECKING(for Solid support) if test "$PHP_SOLID" != "no"; then -@@ -182,7 +186,7 @@ fi +@@ -180,7 +183,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(ibm-db2,, @@ -46,17 +46,8 @@ AC_MSG_CHECKING(for IBM DB2 support) if test "$PHP_IBM_DB2" != "no"; then -@@ -221,7 +225,7 @@ fi - +@@ -220,7 +223,7 @@ fi if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(ODBCRouter,, --[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) -+[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no) - - AC_MSG_CHECKING(for ODBCRouter.com support) - if test "$PHP_ODBCROUTER" != "no"; then -@@ -244,7 +248,7 @@ fi - if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(empress,, [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)]) @@ -64,25 +55,16 @@ AC_MSG_CHECKING(for Empress support) if test "$PHP_EMPRESS" != "no"; then -@@ -270,7 +274,7 @@ if test -z "$ODBC_TYPE"; then +@@ -245,7 +248,7 @@ fi + if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(empress-bcs,, - [ --with-empress-bcs[=DIR] - Include Empress Local Access support [\$EMPRESSPATH] + [ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)]) + (Empress Version >= 8.60 required)], no, no) AC_MSG_CHECKING(for Empress local access support) if test "$PHP_EMPRESS_BCS" != "no"; then -@@ -310,7 +314,7 @@ fi - - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(birdstep,, --[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) -+[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) - - AC_MSG_CHECKING(for Birdstep support) - if test "$PHP_BIRDSTEP" != "no"; then -@@ -366,7 +370,7 @@ PHP_ARG_WITH(custom-odbc,, +@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,, running this configure script: CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" LDFLAGS=-lunix @@ -91,7 +73,7 @@ AC_MSG_CHECKING(for a custom ODBC support) if test "$PHP_CUSTOM_ODBC" != "no"; then -@@ -388,7 +392,7 @@ fi +@@ -314,7 +317,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(iodbc,, @@ -100,7 +82,7 @@ AC_MSG_CHECKING(for iODBC support) if test "$PHP_IODBC" != "no"; then -@@ -426,7 +430,7 @@ fi +@@ -352,7 +355,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(esoob,, @@ -109,7 +91,7 @@ AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) if test "$PHP_ESOOB" != "no"; then -@@ -448,7 +452,7 @@ fi +@@ -374,7 +377,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(unixODBC,, @@ -118,7 +100,7 @@ AC_MSG_CHECKING(for unixODBC support) if test "$PHP_UNIXODBC" != "no"; then -@@ -471,7 +475,7 @@ fi +@@ -397,7 +400,7 @@ fi if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(dbmaker,, Modified: head/databases/php73-pdo/Makefile ============================================================================== --- head/databases/php72-pdo/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pdo/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo Modified: head/databases/php73-pdo_dblib/Makefile ============================================================================== --- head/databases/php72-pdo_dblib/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pdo_dblib/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo_dblib Modified: head/databases/php73-pdo_firebird/Makefile ============================================================================== --- head/databases/php72-pdo_firebird/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pdo_firebird/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo_firebird Modified: head/databases/php73-pdo_mysql/Makefile ============================================================================== --- head/databases/php72-pdo_mysql/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pdo_mysql/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo_mysql Modified: head/databases/php73-pdo_odbc/Makefile ============================================================================== --- head/databases/php72-pdo_odbc/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pdo_odbc/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo_odbc Modified: head/databases/php73-pdo_pgsql/Makefile ============================================================================== --- head/databases/php72-pdo_pgsql/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pdo_pgsql/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo_pgsql Modified: head/databases/php73-pdo_sqlite/Makefile ============================================================================== --- head/databases/php72-pdo_sqlite/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pdo_sqlite/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pdo_sqlite Modified: head/databases/php73-pgsql/Makefile ============================================================================== --- head/databases/php72-pgsql/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-pgsql/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pgsql Modified: head/databases/php73-sqlite3/Makefile ============================================================================== --- head/databases/php72-sqlite3/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/databases/php73-sqlite3/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -sqlite3 Modified: head/devel/php73-gettext/Makefile ============================================================================== --- head/devel/php72-gettext/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-gettext/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -gettext Modified: head/devel/php73-intl/Makefile ============================================================================== --- head/devel/php72-intl/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-intl/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -intl Modified: head/devel/php73-json/Makefile ============================================================================== --- head/devel/php72-json/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-json/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -json Modified: head/devel/php73-pcntl/Makefile ============================================================================== --- head/devel/php72-pcntl/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-pcntl/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -pcntl Modified: head/devel/php73-readline/Makefile ============================================================================== --- head/devel/php72-readline/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-readline/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -readline Modified: head/devel/php73-shmop/Makefile ============================================================================== --- head/devel/php72-shmop/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-shmop/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -shmop Modified: head/devel/php73-sysvmsg/Makefile ============================================================================== --- head/devel/php72-sysvmsg/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-sysvmsg/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -sysvmsg Modified: head/devel/php73-sysvsem/Makefile ============================================================================== --- head/devel/php72-sysvsem/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-sysvsem/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -sysvsem Modified: head/devel/php73-sysvshm/Makefile ============================================================================== --- head/devel/php72-sysvshm/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-sysvshm/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -sysvshm Modified: head/devel/php73-tokenizer/Makefile ============================================================================== --- head/devel/php72-tokenizer/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/devel/php73-tokenizer/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -tokenizer Modified: head/ftp/php73-curl/Makefile ============================================================================== --- head/ftp/php72-curl/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/ftp/php73-curl/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -curl Modified: head/ftp/php73-ftp/Makefile ============================================================================== --- head/ftp/php72-ftp/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/ftp/php73-ftp/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -ftp Modified: head/graphics/php73-exif/Makefile ============================================================================== --- head/graphics/php72-exif/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/graphics/php73-exif/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -exif Modified: head/graphics/php73-gd/Makefile ============================================================================== --- head/graphics/php72-gd/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/graphics/php73-gd/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -2,7 +2,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php72 +MASTERDIR= ${.CURDIR}/../../lang/php73 PKGNAMESUFFIX= -gd Modified: head/graphics/php73-gd/files/patch-config.m4 ============================================================================== --- head/graphics/php72-gd/files/patch-config.m4 Mon Aug 20 06:48:55 2018 (r477631) +++ head/graphics/php73-gd/files/patch-config.m4 Mon Oct 8 08:52:51 2018 (r481525) @@ -1,6 +1,6 @@ ---- config.m4.orig 2018-07-17 05:35:52 UTC +--- config.m4.orig 2018-09-25 09:07:58 UTC +++ config.m4 -@@ -287,6 +287,7 @@ dnl enable the support in bundled GD library +@@ -285,6 +285,7 @@ dnl enable the support in bundled GD lib if test -n "$GD_XPM_DIR"; then AC_DEFINE(HAVE_GD_XPM, 1, [ ]) @@ -8,16 +8,16 @@ GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" fi -@@ -349,7 +350,7 @@ if test "$PHP_GD" != "no"; then +@@ -347,7 +348,7 @@ if test "$PHP_GD" != "no"; then - if test "$GD_MODULE_TYPE" = "builtin"; then + if test "$GD_MODULE_TYPE" = "builtin"; then PHP_ADD_BUILD_DIR($ext_builddir/libgd) - GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" + GDLIB_CFLAGS="-I../.. -I$ext_srcdir/libgd $GDLIB_CFLAGS" GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/" PHP_TEST_BUILD(foobar, [], [ -@@ -357,7 +358,7 @@ if test "$PHP_GD" != "no"; then +@@ -355,7 +356,7 @@ if test "$PHP_GD" != "no"; then ], [ $GD_SHARED_LIBADD ], [char foobar () {}]) else GD_HEADER_DIRS="ext/gd/" Modified: head/graphics/php73-gd/files/patch-gd.c ============================================================================== --- head/graphics/php72-gd/files/patch-gd.c Mon Aug 20 06:48:55 2018 (r477631) +++ head/graphics/php73-gd/files/patch-gd.c Mon Oct 8 08:52:51 2018 (r481525) @@ -1,6 +1,6 @@ ---- gd.c.orig 2018-07-17 05:35:52 UTC +--- gd.c.orig 2018-09-25 09:07:58 UTC +++ gd.c -@@ -53,7 +53,7 @@ +@@ -51,7 +51,7 @@ # include <Wingdi.h> #endif @@ -9,7 +9,7 @@ # include <X11/xpm.h> #endif -@@ -77,7 +77,7 @@ static int le_gd, le_gd_font; +@@ -75,7 +75,7 @@ static int le_gd, le_gd_font; # endif #endif @@ -18,7 +18,7 @@ # include "X11/xpm.h" #endif -@@ -325,7 +325,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxbm, 0) +@@ -322,7 +322,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatef ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() @@ -27,7 +27,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() -@@ -934,7 +934,7 @@ const zend_function_entry gd_functions[] = { +@@ -931,7 +931,7 @@ static const zend_function_entry gd_func #endif PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) @@ -36,7 +36,7 @@ PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) #endif PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) -@@ -1299,7 +1299,7 @@ PHP_MINFO_FUNCTION(gd) +@@ -1296,7 +1296,7 @@ PHP_MINFO_FUNCTION(gd) php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); #endif php_info_print_table_row(2, "WBMP Support", "enabled"); @@ -45,7 +45,7 @@ php_info_print_table_row(2, "XPM Support", "enabled"); { char tmp[12]; -@@ -1354,7 +1354,7 @@ PHP_FUNCTION(gd_info) +@@ -1351,7 +1351,7 @@ PHP_FUNCTION(gd_info) add_assoc_bool(return_value, "PNG Support", 0); #endif add_assoc_bool(return_value, "WBMP Support", 1); @@ -54,16 +54,16 @@ add_assoc_bool(return_value, "XPM Support", 1); #else add_assoc_bool(return_value, "XPM Support", 0); -@@ -2184,7 +2184,7 @@ PHP_FUNCTION(imagetypes) - ret |= 4; +@@ -2178,7 +2178,7 @@ PHP_FUNCTION(imagetypes) + ret |= PHP_IMG_PNG; #endif - ret |= 8; + ret |= PHP_IMG_WBMP; -#if defined(HAVE_GD_XPM) +#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - ret |= 16; + ret |= PHP_IMG_XPM; #endif #ifdef HAVE_GD_WEBP -@@ -2443,7 +2443,7 @@ static void _php_image_create_from(INTERNAL_FUNCTION_P +@@ -2446,7 +2446,7 @@ static void _php_image_create_from(INTER case PHP_GDIMG_TYPE_GD2PART: im = (*func_p)(fp, srcx, srcy, width, height); break; @@ -72,7 +72,7 @@ case PHP_GDIMG_TYPE_XPM: im = gdImageCreateFromXpm(file); break; -@@ -2525,7 +2525,7 @@ PHP_FUNCTION(imagecreatefromxbm) +@@ -2528,7 +2528,7 @@ PHP_FUNCTION(imagecreatefromxbm) } /* }}} */ Modified: head/lang/php56/Makefile ============================================================================== --- head/lang/php56/Makefile Mon Oct 8 08:30:57 2018 (r481524) +++ head/lang/php56/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -52,7 +52,7 @@ MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php55-5* php70-* +CONFLICTS= php55-5* php70-* php71-* php72-* php73-* DESTDIRNAME= INSTALL_ROOT Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php70/Makefile Mon Oct 8 08:30:57 2018 (r481524) +++ head/lang/php70/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -57,7 +57,7 @@ MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php56-* php71-* php72-* +CONFLICTS= php56-* php71-* php72-* php73-* DESTDIRNAME= INSTALL_ROOT Modified: head/lang/php71/Makefile ============================================================================== --- head/lang/php71/Makefile Mon Oct 8 08:30:57 2018 (r481524) +++ head/lang/php71/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -58,7 +58,7 @@ MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php56-* php70-* php72-* +CONFLICTS= php56-* php70-* php72-* php73-* DESTDIRNAME= INSTALL_ROOT Modified: head/lang/php72/Makefile ============================================================================== --- head/lang/php72/Makefile Mon Oct 8 08:30:57 2018 (r481524) +++ head/lang/php72/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -58,7 +58,7 @@ PHPDBG_DESC= Interactive PHP debugger LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php56-* php70-* php71-* +CONFLICTS= php56-* php70-* php71-* php73-* DESTDIRNAME= INSTALL_ROOT Modified: head/lang/php73-extensions/Makefile ============================================================================== --- head/lang/php72-extensions/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/lang/php73-extensions/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= php72 +PORTNAME= php73 PORTVERSION= 1.0 CATEGORIES= lang PKGNAMESUFFIX= -extensions @@ -9,8 +9,8 @@ MAINTAINER= tz@FreeBSD.org COMMENT= "meta-port" to install PHP extensions USES= metaport php -PHP_VER= 72 -IGNORE_WITH_PHP= 56 70 71 +PHP_VER= 73 +IGNORE_WITH_PHP= 56 70 71 72 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ Modified: head/lang/php73/Makefile ============================================================================== --- head/lang/php72/Makefile Mon Aug 20 06:48:55 2018 (r477631) +++ head/lang/php73/Makefile Mon Oct 8 08:52:51 2018 (r481525) @@ -1,10 +1,10 @@ # $FreeBSD$ -PORTNAME= php72 -DISTVERSION= 7.2.9 +PORTNAME= php73 +DISTVERSION= 7.3.0RC2 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= PHP/distributions +MASTER_SITES= https://downloads.php.net/~cmb/ DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org @@ -12,13 +12,13 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 -USES+= tar:xz cpe +USES+= tar:xz cpe gnome CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) -LIB_DEPENDS= libpcre.so:devel/pcre \ - libargon2.so:security/libargon2 +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 +LIB_DEPENDS= libargon2.so:security/libargon2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-layout=GNU \ @@ -55,7 +55,7 @@ PHPDBG_DESC= Interactive PHP debugger LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php56-* php70-* php71-* +CONFLICTS= php56-* php70-* php71-* php72-* DESTDIRNAME= INSTALL_ROOT @@ -155,7 +155,7 @@ pre-configure: .if !defined(PKGNAMEPREFIX) post-build: - @${ECHO_CMD} "PHP_VER=72" > ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_VER=73" > ${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=pcre spl" >> ${WRKDIR}/php.conf Modified: head/lang/php73/Makefile.ext ============================================================================== --- head/lang/php72/Makefile.ext Mon Aug 20 06:48:55 2018 (r477631) +++ head/lang/php73/Makefile.ext Mon Oct 8 08:52:51 2018 (r481525) @@ -4,8 +4,8 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -PHP_VER= 72 -IGNORE_WITH_PHP= 56 70 71 +PHP_VER= 73 +IGNORE_WITH_PHP= 56 70 71 72 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} @@ -17,7 +17,7 @@ EXTRACT_AFTER_ARGS?= ${EXTSUBDIR} .if ${PHP_MODNAME} == "bcmath" CONFIGURE_ARGS+=--enable-bcmath -PHP_HEADER_DIRS=libbcmath libbcmath/src +PHP_HEADER_DIRS=libbcmath/src .endif .if ${PHP_MODNAME} == "bz2" @@ -73,6 +73,7 @@ CONFIGURE_ARGS+=--enable-exif .endif .if ${PHP_MODNAME} == "fileinfo" +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 CONFIGURE_ARGS+=--enable-fileinfo \ --with-pcre-dir=${LOCALBASE} @@ -80,6 +81,7 @@ PHP_HEADER_DIRS= libmagic .endif .if ${PHP_MODNAME} == "filter" +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 CONFIGURE_ARGS+=--enable-filter \ --with-pcre-dir=${LOCALBASE} .endif @@ -104,10 +106,10 @@ CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \ --with-zlib-dir=/usr EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \ - php-${PORTVERSION}/ext/gd + php-${DISTVERSION}/ext/gd OPTIONS_DEFINE=TRUETYPE JIS WEBP X11 -OPTIONS_DEFAULT=TRUETYPE X11 +OPTIONS_DEFAULT=TRUETYPE TRUETYPE_DESC= Enable TrueType string function JIS_DESC= Enable JIS-mapped Japanese font support @@ -140,6 +142,7 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 OPTIONS_DEFINE= PANDA PANDA_DESC= Uses the forked panda-cclient instead of the original cclient @@ -213,6 +216,7 @@ USES+= ssl .if ${PHP_MODNAME} == "opcache" # This is needed by Zend extensions, keep before everything. PHP_MOD_PRIO= 10 +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 CONFIGURE_ARGS+=--enable-opcache USES+= localbase .endif @@ -274,12 +278,14 @@ USE_PHP= pdo:build .endif .if ${PHP_MODNAME} == "pgsql" +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 USES+= pgsql CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} .endif .if ${PHP_MODNAME} == "phar" +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 CONFIGURE_ARGS+=--enable-phar \ --with-pcre-dir=${LOCALBASE} @@ -317,6 +323,7 @@ CONFIGURE_ARGS+=--enable-shmop .endif .if ${PHP_MODNAME} == "simplexml" +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 CONFIGURE_ARGS+=--enable-simplexml \ --with-pcre-dir=${LOCALBASE} \ --with-libxml-dir=${LOCALBASE} @@ -432,6 +439,7 @@ USE_PHP= dom:build xml:build .endif .if ${PHP_MODNAME} == "zip" +BUILD_DEPENDS= pcre2>=2.31:devel/pcre2 LIB_DEPENDS+= libzip.so:archivers/libzip CONFIGURE_ARGS+=--enable-zip \ Modified: head/lang/php73/distinfo ============================================================================== --- head/lang/php72/distinfo Mon Aug 20 06:48:55 2018 (r477631) +++ head/lang/php73/distinfo Mon Oct 8 08:52:51 2018 (r481525) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534605874 -SHA256 (php-7.2.9.tar.xz) = 3585c1222e00494efee4f5a65a8e03a1e6eca3dfb834814236ee7f02c5248ae0 -SIZE (php-7.2.9.tar.xz) = 12126780 +TIMESTAMP = 1538038650 +SHA256 (php-7.3.0RC2.tar.xz) = f52692cb4f5144365a72c6ff698101035a27bceebf2d5a307ad82dd43ee9d751 +SIZE (php-7.3.0RC2.tar.xz) = 11924624 Modified: head/lang/php73/files/patch-acinclude.m4 ============================================================================== --- head/lang/php72/files/patch-acinclude.m4 Mon Aug 20 06:48:55 2018 (r477631) +++ head/lang/php73/files/patch-acinclude.m4 Mon Oct 8 08:52:51 2018 (r481525) @@ -1,6 +1,6 @@ ---- acinclude.m4.orig 2016-07-20 13:11:26 UTC +--- acinclude.m4.orig 2018-08-14 11:39:24 UTC +++ acinclude.m4 -@@ -985,15 +985,9 @@ dnl ------------------------------------ +@@ -971,15 +971,9 @@ dnl ------------------------------------ if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then dnl ---------------------------------------------- CLI static module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no @@ -19,7 +19,7 @@ EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir" fi PHP_ADD_BUILD_DIR($ext_builddir) -@@ -1043,12 +1037,6 @@ You either need to build $1 shared or bu +@@ -1029,12 +1023,6 @@ You either need to build $1 shared or bu build to be successful. ]) fi @@ -32,7 +32,7 @@ dnl Some systems require that we link $2 to $1 when building ]) -@@ -2975,8 +2963,7 @@ dnl in GNU Make which causes the .d file +@@ -2934,8 +2922,7 @@ dnl in GNU Make which causes the .d file $abs_srcdir/$ac_provsrc:; $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc @@ -42,7 +42,7 @@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj EOF -@@ -2995,12 +2982,12 @@ dnl Always attempt to create both PIC an +@@ -2954,12 +2941,12 @@ dnl Always attempt to create both PIC an $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS) echo "[#] Generated by Makefile for libtool" > \$[]@ @test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir @@ -57,7 +57,7 @@ echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\] else [\\] echo "non_pic_object='none'" >> \$[]@ [;\\] -@@ -3012,7 +2999,7 @@ EOF +@@ -2971,7 +2958,7 @@ EOF *) cat>>Makefile.objects<<EOF $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS) Modified: head/lang/php73/files/patch-sapi_apache2handler_config.m4 ============================================================================== --- head/lang/php72/files/patch-sapi_apache2handler_config.m4 Mon Aug 20 06:48:55 2018 (r477631) +++ head/lang/php73/files/patch-sapi_apache2handler_config.m4 Mon Oct 8 08:52:51 2018 (r481525) @@ -1,6 +1,6 @@ ---- sapi/apache2handler/config.m4.orig 2016-07-20 13:11:37 UTC +--- sapi/apache2handler/config.m4.orig 2018-08-14 11:39:14 UTC +++ sapi/apache2handler/config.m4 -@@ -67,7 +67,7 @@ if test "$PHP_APXS2" != "no"; then +@@ -65,7 +65,7 @@ if test "$PHP_APXS2" != "no"; then fi APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` Modified: head/lang/php73/files/patch-sapi_fpm_config.m4 ============================================================================== --- head/lang/php72/files/patch-sapi_fpm_config.m4 Mon Aug 20 06:48:55 2018 (r477631) +++ head/lang/php73/files/patch-sapi_fpm_config.m4 Mon Oct 8 08:52:51 2018 (r481525) @@ -1,14 +1,6 @@ ---- sapi/fpm/config.m4.orig 2016-07-20 13:11:36 UTC +--- sapi/fpm/config.m4.orig 2018-08-14 11:39:14 UTC *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810080852.w988qqp8098951>