Index: Mk/Uses/php.mk =================================================================== --- Mk/Uses/php.mk +++ Mk/Uses/php.mk @@ -110,7 +110,7 @@ PHPBASE?= ${LOCALBASE} -_ALL_PHP_VERSIONS= 71 72 73 +_ALL_PHP_VERSIONS= 71 72 73 74 # Make the already installed PHP the default one. . if exists(${PHPBASE}/etc/php.conf) @@ -174,7 +174,10 @@ (${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} == 73 +. if ${PHP_VER} == 74 +PHP_EXT_DIR= 20190902 +PHP_EXT_INC= pcre spl +. elif ${PHP_VER} == 73 PHP_EXT_DIR= 20180731 PHP_EXT_INC= pcre spl . elif ${PHP_VER} == 72 @@ -367,17 +370,18 @@ # non-version specific components _USE_PHP_ALL= bcmath bitset bz2 calendar ctype curl dba dom \ enchant exif fileinfo filter ftp gd gettext gmp \ - hash iconv igbinary imap interbase intl json ldap mbstring mcrypt \ + iconv igbinary imap intl json ldap mbstring mcrypt \ memcache memcached mysqli odbc opcache \ openssl pcntl pcre pdf pdo pdo_dblib pdo_firebird pdo_mysql \ pdo_odbc pdo_pgsql pdo_sqlite phar pgsql posix \ - pspell radius readline recode redis session shmop simplexml snmp soap\ + pspell radius readline redis session shmop simplexml snmp soap\ sockets spl sqlite3 sysvmsg sysvsem sysvshm \ - tidy tokenizer wddx xml xmlreader xmlrpc xmlwriter xsl zip zlib + tidy tokenizer xml xmlreader xmlrpc xmlwriter xsl zip zlib # version specific components -_USE_PHP_VER71= ${_USE_PHP_ALL} -_USE_PHP_VER72= ${_USE_PHP_ALL} sodium -_USE_PHP_VER73= ${_USE_PHP_ALL} sodium +_USE_PHP_VER71= ${_USE_PHP_ALL} hash interbase recode wddx +_USE_PHP_VER72= ${_USE_PHP_ALL} hash interbase recode sodium wddx +_USE_PHP_VER73= ${_USE_PHP_ALL} hash interbase recode sodium wddx +_USE_PHP_VER74= ${_USE_PHP_ALL} ffi sodium bcmath_DEPENDS= math/php${PHP_VER}-bcmath bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR} @@ -390,6 +394,7 @@ dom_DEPENDS= textproc/php${PHP_VER}-dom enchant_DEPENDS= textproc/php${PHP_VER}-enchant exif_DEPENDS= graphics/php${PHP_VER}-exif +fileinfo_DEPENDS= devel/php${PHP_VER}-ffi fileinfo_DEPENDS= sysutils/php${PHP_VER}-fileinfo filter_DEPENDS= security/php${PHP_VER}-filter ftp_DEPENDS= ftp/php${PHP_VER}-ftp Index: Mk/bsd.default-versions.mk =================================================================== --- Mk/bsd.default-versions.mk +++ Mk/bsd.default-versions.mk @@ -82,7 +82,7 @@ .endif # Possible values: 9.4, 9.5, 9.6, 10, 11, 12 PGSQL_DEFAULT?= 11 -# Possible values: 7.1, 7.2, 7.3 +# Possible values: 7.1, 7.2, 7.3, 7.4 PHP_DEFAULT?= 7.2 # Possible values: 2.7, 3.5, 3.6, 3.7 PYTHON_DEFAULT?= 3.6 Index: archivers/Makefile =================================================================== --- archivers/Makefile +++ archivers/Makefile @@ -163,6 +163,10 @@ SUBDIR += php73-phar SUBDIR += php73-zip SUBDIR += php73-zlib + SUBDIR += php74-bz2 + SUBDIR += php74-phar + SUBDIR += php74-zip + SUBDIR += php74-zlib SUBDIR += pigz SUBDIR += pixz SUBDIR += plzip Index: archivers/php74-bz2/Makefile =================================================================== --- archivers/php74-bz2/Makefile +++ archivers/php74-bz2/Makefile @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -bz2 Index: archivers/php74-phar/Makefile =================================================================== --- archivers/php74-phar/Makefile +++ archivers/php74-phar/Makefile @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -phar Index: archivers/php74-zip/Makefile =================================================================== --- archivers/php74-zip/Makefile +++ archivers/php74-zip/Makefile @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -zip Index: archivers/php74-zlib/Makefile =================================================================== --- archivers/php74-zlib/Makefile +++ archivers/php74-zlib/Makefile @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -zlib Index: converters/Makefile =================================================================== --- converters/Makefile +++ converters/Makefile @@ -148,6 +148,8 @@ SUBDIR += php73-iconv SUBDIR += php73-mbstring SUBDIR += php73-recode + SUBDIR += php74-iconv + SUBDIR += php74-mbstring SUBDIR += psiconv SUBDIR += py-bcode SUBDIR += py-bencode.py Index: converters/php74-iconv/Makefile =================================================================== --- converters/php74-iconv/Makefile +++ converters/php74-iconv/Makefile @@ -2,7 +2,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -iconv Index: converters/php74-mbstring/Makefile =================================================================== --- converters/php74-mbstring/Makefile +++ converters/php74-mbstring/Makefile @@ -2,7 +2,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -mbstring Index: converters/php74-mbstring/files/patch-config.m4 =================================================================== --- converters/php74-mbstring/files/patch-config.m4 +++ converters/php74-mbstring/files/patch-config.m4 @@ -1,9 +1,9 @@ ---- config.m4.orig 2018-09-25 09:08:02 UTC +--- config.m4.orig 2019-08-06 06:54:10 UTC +++ config.m4 -@@ -41,6 +41,30 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ - PHP_ADD_INCLUDE([$ext_builddir/$dir]) - done +@@ -37,6 +37,31 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [ + out="php_config.h" + + dnl This is PECL build, check if bundled PCRE library is used + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$INCLUDES @@ -28,20 +28,13 @@ + ]) + ]) + - if test "$ext_shared" = "no"; then - PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES) - out="php_config.h" -@@ -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; -@@ -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 test "$ext_shared" != "no" && test -f "$ext_builddir/config.h.in"; then + out="$abs_builddir/config.h" + fi +@@ -200,6 +225,9 @@ PHP_ARG_ENABLE([mbregex], + [yes], + [no]) +PHP_ARG_WITH(pcre-dir, pcre install prefix, +[ --with-pcre-dir MBSTRING: pcre install prefix], no, no) Index: databases/Makefile =================================================================== --- databases/Makefile +++ databases/Makefile @@ -656,6 +656,18 @@ SUBDIR += php73-pdo_sqlite SUBDIR += php73-pgsql SUBDIR += php73-sqlite3 + SUBDIR += php74-dba + SUBDIR += php74-mysqli + SUBDIR += php74-odbc + SUBDIR += php74-pdo + SUBDIR += php74-pdo_dblib + SUBDIR += php74-pdo_firebird + SUBDIR += php74-pdo_mysql + SUBDIR += php74-pdo_odbc + SUBDIR += php74-pdo_pgsql + SUBDIR += php74-pdo_sqlite + SUBDIR += php74-pgsql + SUBDIR += php74-sqlite3 SUBDIR += phpliteadmin SUBDIR += phpminiadmin SUBDIR += phpmyadmin Index: databases/php74-dba/Makefile =================================================================== --- databases/php74-dba/Makefile +++ databases/php74-dba/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -dba Index: databases/php74-mysqli/Makefile =================================================================== --- databases/php74-mysqli/Makefile +++ databases/php74-mysqli/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -mysqli Index: databases/php74-odbc/Makefile =================================================================== --- databases/php74-odbc/Makefile +++ databases/php74-odbc/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -odbc Index: databases/php74-odbc/files/patch-config.m4 =================================================================== --- databases/php74-odbc/files/patch-config.m4 +++ databases/php74-odbc/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2018-09-25 09:07:57 UTC +--- config.m4.orig 2019-08-06 06:54:18 UTC +++ config.m4 -@@ -97,6 +97,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS +@@ -91,6 +91,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS dnl dnl configure options dnl @@ -8,104 +8,104 @@ +[ --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. -@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,, - + PHP_ARG_WITH([odbcver],, + [AS_HELP_STRING([[--with-odbcver[=HEX]]], +@@ -102,7 +105,7 @@ PHP_ARG_WITH([odbcver],, if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(adabas,, --[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) -+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no) + PHP_ARG_WITH([adabas],, + [AS_HELP_STRING([[--with-adabas[=DIR]]], +- [Include Adabas D support [/usr/local]])]) ++ [Include Adabas D support [/usr/local]])], [no], [no]) AC_MSG_CHECKING([for Adabas support]) if test "$PHP_ADABAS" != "no"; then -@@ -133,7 +136,7 @@ fi - +@@ -132,7 +135,7 @@ fi if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(sapdb,, --[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) -+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) + PHP_ARG_WITH([sapdb],, + [AS_HELP_STRING([[--with-sapdb[=DIR]]], +- [Include SAP DB support [/usr/local]])]) ++ [Include SAP DB support [/usr/local]])], [no], [no]) AC_MSG_CHECKING([for SAP DB support]) if test "$PHP_SAPDB" != "no"; then @@ -153,7 +156,7 @@ fi - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(solid,, --[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) -+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) + PHP_ARG_WITH([solid],, + [AS_HELP_STRING([[--with-solid[=DIR]]], +- [Include Solid support [/usr/local/solid]])]) ++ [Include Solid support [/usr/local/solid]])], [no], [no]) AC_MSG_CHECKING(for Solid support) if test "$PHP_SOLID" != "no"; then -@@ -180,7 +183,7 @@ fi - +@@ -181,7 +184,7 @@ fi if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(ibm-db2,, --[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) -+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) + PHP_ARG_WITH([ibm-db2],, + [AS_HELP_STRING([[--with-ibm-db2[=DIR]]], +- [Include IBM DB2 support [/home/db2inst1/sqllib]])]) ++ [Include IBM DB2 support [/home/db2inst1/sqllib]])], [no], [no]) AC_MSG_CHECKING(for IBM DB2 support) if test "$PHP_IBM_DB2" != "no"; then -@@ -220,7 +223,7 @@ fi - if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(empress,, - [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) +@@ -222,7 +225,7 @@ if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH([empress],, + [AS_HELP_STRING([[--with-empress[=DIR]]], + [Include Empress support $EMPRESSPATH (Empress Version >= 8.60 +- required)])]) ++ required)])], [no], [no]) AC_MSG_CHECKING(for Empress support) if test "$PHP_EMPRESS" != "no"; then -@@ -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] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) +@@ -248,7 +251,7 @@ if test -z "$ODBC_TYPE"; then + PHP_ARG_WITH([empress-bcs],, + [AS_HELP_STRING([[--with-empress-bcs[=DIR]]], + [Include Empress Local Access support $EMPRESSPATH (Empress Version >= +- 8.60 required)])]) ++ 8.60 required)])], [no], [no]) AC_MSG_CHECKING(for Empress local access support) if test "$PHP_EMPRESS_BCS" != "no"; then -@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,, - running this configure script: - CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" - LDFLAGS=-lunix -- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) -+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) +@@ -294,7 +297,7 @@ PHP_ARG_WITH([custom-odbc],, + your include dirs. For example, you should define following for Sybase SQL + Anywhere 5.5.00 on QNX, prior to running this configure script: + CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix +- CUSTOM_ODBC_LIBS="-ldblib -lodbc"])]) ++ CUSTOM_ODBC_LIBS="-ldblib -lodbc"])], [no], [no]) AC_MSG_CHECKING(for a custom ODBC support) if test "$PHP_CUSTOM_ODBC" != "no"; then -@@ -314,7 +317,7 @@ fi - +@@ -317,7 +320,7 @@ fi if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(iodbc,, --[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) -+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) + PHP_ARG_WITH([iodbc],, + [AS_HELP_STRING([--with-iodbc], +- [Include iODBC support])]) ++ [Include iODBC support])], [no], [no]) - AC_MSG_CHECKING(for iODBC support) + AC_MSG_CHECKING(whether to build with iODBC support) if test "$PHP_IODBC" != "no"; then -@@ -352,7 +355,7 @@ fi - +@@ -335,7 +338,7 @@ fi if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(esoob,, --[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) -+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) + PHP_ARG_WITH([esoob],, + [AS_HELP_STRING([[--with-esoob[=DIR]]], +- [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])]) ++ [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])], [no], [no]) AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) if test "$PHP_ESOOB" != "no"; then -@@ -374,7 +377,7 @@ fi - +@@ -358,7 +361,7 @@ fi if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(unixODBC,, --[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) -+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no) + PHP_ARG_WITH([unixODBC],, + [AS_HELP_STRING([--with-unixODBC], +- [Include unixODBC support])]) ++ [Include unixODBC support])], [no], [no]) - AC_MSG_CHECKING(for unixODBC support) + AC_MSG_CHECKING(whether to build with unixODBC support) if test "$PHP_UNIXODBC" != "no"; then -@@ -397,7 +400,7 @@ fi - +@@ -386,7 +389,7 @@ fi if test -z "$ODBC_TYPE"; then - PHP_ARG_WITH(dbmaker,, --[ --with-dbmaker[=DIR] Include DBMaker support]) -+[ --with-dbmaker[=DIR] Include DBMaker support], no, no) + PHP_ARG_WITH([dbmaker],, + [AS_HELP_STRING([[--with-dbmaker[=DIR]]], +- [Include DBMaker support])]) ++ [Include DBMaker support])], [no], [no]) AC_MSG_CHECKING(for DBMaker support) if test "$PHP_DBMAKER" != "no"; then Index: databases/php74-pdo/Makefile =================================================================== --- databases/php74-pdo/Makefile +++ databases/php74-pdo/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo Index: databases/php74-pdo_dblib/Makefile =================================================================== --- databases/php74-pdo_dblib/Makefile +++ databases/php74-pdo_dblib/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_dblib Index: databases/php74-pdo_firebird/Makefile =================================================================== --- databases/php74-pdo_firebird/Makefile +++ databases/php74-pdo_firebird/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_firebird Index: databases/php74-pdo_mysql/Makefile =================================================================== --- databases/php74-pdo_mysql/Makefile +++ databases/php74-pdo_mysql/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_mysql Index: databases/php74-pdo_odbc/Makefile =================================================================== --- databases/php74-pdo_odbc/Makefile +++ databases/php74-pdo_odbc/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_odbc Index: databases/php74-pdo_pgsql/Makefile =================================================================== --- databases/php74-pdo_pgsql/Makefile +++ databases/php74-pdo_pgsql/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_pgsql Index: databases/php74-pdo_sqlite/Makefile =================================================================== --- databases/php74-pdo_sqlite/Makefile +++ databases/php74-pdo_sqlite/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_sqlite Index: databases/php74-pgsql/Makefile =================================================================== --- databases/php74-pgsql/Makefile +++ databases/php74-pgsql/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pgsql Index: databases/php74-sqlite3/Makefile =================================================================== --- databases/php74-sqlite3/Makefile +++ databases/php74-sqlite3/Makefile @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sqlite3 Index: devel/Makefile =================================================================== --- devel/Makefile +++ devel/Makefile @@ -3933,6 +3933,17 @@ SUBDIR += php73-sysvsem SUBDIR += php73-sysvshm SUBDIR += php73-tokenizer + SUBDIR += php74-gettext + SUBDIR += php74-ffi + SUBDIR += php74-intl + SUBDIR += php74-json + SUBDIR += php74-pcntl + SUBDIR += php74-readline + SUBDIR += php74-shmop + SUBDIR += php74-sysvmsg + SUBDIR += php74-sysvsem + SUBDIR += php74-sysvshm + SUBDIR += php74-tokenizer SUBDIR += phpbt SUBDIR += phpsh SUBDIR += phpunit6 Index: devel/php74-ffi/Makefile =================================================================== --- devel/php74-ffi/Makefile +++ devel/php74-ffi/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +CATEGORIES= devel + +MASTERDIR= ${.CURDIR}/../../lang/php74 + +PKGNAMESUFFIX= -ffi + +TEST_TARGET= test + +.include "${MASTERDIR}/Makefile" Index: devel/php74-gettext/Makefile =================================================================== --- devel/php74-gettext/Makefile +++ devel/php74-gettext/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -gettext Index: devel/php74-intl/Makefile =================================================================== --- devel/php74-intl/Makefile +++ devel/php74-intl/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -intl Index: devel/php74-json/Makefile =================================================================== --- devel/php74-json/Makefile +++ devel/php74-json/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -json Index: devel/php74-pcntl/Makefile =================================================================== --- devel/php74-pcntl/Makefile +++ devel/php74-pcntl/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pcntl Index: devel/php74-readline/Makefile =================================================================== --- devel/php74-readline/Makefile +++ devel/php74-readline/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -readline Index: devel/php74-readline/files/patch-config.m4 =================================================================== --- devel/php74-readline/files/patch-config.m4 +++ devel/php74-readline/files/patch-config.m4 @@ -1,22 +1,25 @@ ---- config.m4.orig 2019-02-05 13:10:04 UTC +--- config.m4.orig 2019-08-06 06:54:14 UTC +++ config.m4 -@@ -3,13 +3,8 @@ dnl config.m4 for extension readline - PHP_ARG_WITH(libedit,for libedit readline replacement, - [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) +@@ -3,16 +3,10 @@ PHP_ARG_WITH([libedit], + [AS_HELP_STRING([--with-libedit], + [Include libedit readline replacement (CLI/CGI only)])]) -if test "$PHP_LIBEDIT" = "no"; then - PHP_ARG_WITH(readline,for readline support, - [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) + PHP_ARG_WITH([readline], + [for readline support], + [AS_HELP_STRING([[--with-readline[=DIR]]], + [Include readline support (CLI/CGI only)])]) -else -- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning +- dnl "register" the --with-readline option to prevent invalid "unknown +- dnl configure option" warning - php_with_readline=no -fi if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then for i in $PHP_READLINE /usr/local /usr; do -@@ -72,6 +67,13 @@ if test "$PHP_READLINE" && test "$PHP_RE - -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS - ]) +@@ -78,6 +72,13 @@ if test "$PHP_READLINE" && test "$PHP_RE + AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ]) + AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) + PHP_CHECK_LIBRARY(readline, rl_completion_matches, + [ @@ -25,6 +28,6 @@ + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + - AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) - elif test "$PHP_LIBEDIT" != "no"; then + if test "$PHP_LIBEDIT" != "yes"; then + AC_MSG_WARN([libedit directory ignored, rely on pkg-config]) Index: devel/php74-shmop/Makefile =================================================================== --- devel/php74-shmop/Makefile +++ devel/php74-shmop/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -shmop Index: devel/php74-sysvmsg/Makefile =================================================================== --- devel/php74-sysvmsg/Makefile +++ devel/php74-sysvmsg/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sysvmsg Index: devel/php74-sysvsem/Makefile =================================================================== --- devel/php74-sysvsem/Makefile +++ devel/php74-sysvsem/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sysvsem Index: devel/php74-sysvshm/Makefile =================================================================== --- devel/php74-sysvshm/Makefile +++ devel/php74-sysvshm/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sysvshm Index: devel/php74-tokenizer/Makefile =================================================================== --- devel/php74-tokenizer/Makefile +++ devel/php74-tokenizer/Makefile @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -tokenizer Index: ftp/Makefile =================================================================== --- ftp/Makefile +++ ftp/Makefile @@ -67,6 +67,8 @@ SUBDIR += php72-ftp SUBDIR += php73-curl SUBDIR += php73-ftp + SUBDIR += php74-curl + SUBDIR += php74-ftp SUBDIR += phpwebftp SUBDIR += proftpd SUBDIR += proftpd-mod_vroot Index: ftp/php74-curl/Makefile =================================================================== --- ftp/php74-curl/Makefile +++ ftp/php74-curl/Makefile @@ -2,7 +2,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -curl Index: ftp/php74-ftp/Makefile =================================================================== --- ftp/php74-ftp/Makefile +++ ftp/php74-ftp/Makefile @@ -2,7 +2,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -ftp Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -761,6 +761,8 @@ SUBDIR += php72-gd SUBDIR += php73-exif SUBDIR += php73-gd + SUBDIR += php74-exif + SUBDIR += php74-gd SUBDIR += phplot SUBDIR += picpuz SUBDIR += piddle Index: graphics/php74-exif/Makefile =================================================================== --- graphics/php74-exif/Makefile +++ graphics/php74-exif/Makefile @@ -2,7 +2,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -exif Index: graphics/php74-gd/Makefile =================================================================== --- graphics/php74-gd/Makefile +++ graphics/php74-gd/Makefile @@ -2,7 +2,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -gd Index: graphics/php74-gd/files/patch-gd.c =================================================================== --- graphics/php74-gd/files/patch-gd.c +++ graphics/php74-gd/files/patch-gd.c @@ -1,18 +1,9 @@ ---- gd.c.orig 2018-09-25 09:07:58 UTC +--- gd.c.orig 2019-08-06 06:54:09 UTC +++ gd.c -@@ -51,7 +51,7 @@ - # include +@@ -73,7 +73,7 @@ static int le_gd, le_gd_font; + # include FT_FREETYPE_H #endif --#ifdef HAVE_GD_XPM -+#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) - # include - #endif - -@@ -75,7 +75,7 @@ static int le_gd, le_gd_font; - # endif - #endif - -#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) +#if defined(HAVE_XPM) && defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED) # include "X11/xpm.h" @@ -27,7 +18,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_imagecreatefromxpm, 0) ZEND_ARG_INFO(0, filename) ZEND_END_ARG_INFO() -@@ -931,7 +931,7 @@ static const zend_function_entry gd_func +@@ -935,7 +935,7 @@ static const zend_function_entry gd_func #endif PHP_FE(imagecreatefromwbmp, arginfo_imagecreatefromwbmp) PHP_FE(imagecreatefromxbm, arginfo_imagecreatefromxbm) @@ -36,16 +27,16 @@ PHP_FE(imagecreatefromxpm, arginfo_imagecreatefromxpm) #endif PHP_FE(imagecreatefromgd, arginfo_imagecreatefromgd) -@@ -1296,7 +1296,7 @@ PHP_MINFO_FUNCTION(gd) - php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString()); +@@ -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) { - char tmp[12]; -@@ -1351,7 +1351,7 @@ PHP_FUNCTION(gd_info) +@@ -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); @@ -54,7 +45,7 @@ add_assoc_bool(return_value, "XPM Support", 1); #else add_assoc_bool(return_value, "XPM Support", 0); -@@ -2178,7 +2178,7 @@ PHP_FUNCTION(imagetypes) +@@ -2213,7 +2213,7 @@ PHP_FUNCTION(imagetypes) ret |= PHP_IMG_PNG; #endif ret |= PHP_IMG_WBMP; @@ -63,7 +54,7 @@ ret |= PHP_IMG_XPM; #endif #ifdef HAVE_GD_WEBP -@@ -2446,7 +2446,7 @@ static void _php_image_create_from(INTER +@@ -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; @@ -72,7 +63,7 @@ case PHP_GDIMG_TYPE_XPM: im = gdImageCreateFromXpm(file); break; -@@ -2528,7 +2528,7 @@ PHP_FUNCTION(imagecreatefromxbm) +@@ -2569,7 +2569,7 @@ PHP_FUNCTION(imagecreatefromxbm) } /* }}} */ Index: lang/Makefile =================================================================== --- lang/Makefile +++ lang/Makefile @@ -284,6 +284,8 @@ SUBDIR += php72-extensions SUBDIR += php73 SUBDIR += php73-extensions + SUBDIR += php74 + SUBDIR += php74-extensions SUBDIR += picoc SUBDIR += plexil SUBDIR += pocl Index: lang/php74-extensions/Makefile =================================================================== --- lang/php74-extensions/Makefile +++ lang/php74-extensions/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= php73 +PORTNAME= php74 PORTVERSION= 1.0 CATEGORIES= lang PKGNAMESUFFIX= -extensions @@ -9,18 +9,18 @@ COMMENT= "meta-port" to install PHP extensions USES= metaport php -PHP_VER= 73 -IGNORE_WITH_PHP= 71 72 +PHP_VER= 74 +IGNORE_WITH_PHP= 71 72 73 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ - GMP HASH ICONV INTL IMAP INTERBASE JSON LDAP MBSTRING \ + GMP ICONV INTL IMAP JSON LDAP MBSTRING \ MYSQLI \ ODBC OPCACHE OPENSSL PCNTL PDF PDO PDO_DBLIB PDO_FIREBIRD \ PDO_MYSQL PDO_ODBC PDO_PGSQL PDO_SQLITE PGSQL PHAR POSIX \ - PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \ + PSPELL READLINE SESSION SHMOP SIMPLEXML SNMP SOAP \ SOCKETS SODIUM SQLITE3 SYSVMSG SYSVSEM SYSVSHM \ - TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \ + TIDY TOKENIZER XML XMLREADER XMLRPC XMLWRITER XSL \ ZIP ZLIB BCMATH_DESC= bc style precision math functions @@ -38,11 +38,9 @@ GD_DESC= GD library support GETTEXT_DESC= gettext library support GMP_DESC= GNU MP support -HASH_DESC= HASH Message Digest Framework ICONV_DESC= iconv support IMAP_DESC= IMAP support INTL_DESC= Internationalization(ICU) -INTERBASE_DESC= Interbase 6 database support (Firebird) JSON_DESC= JavaScript Object Serialization support LDAP_DESC= OpenLDAP support MBSTRING_DESC= multibyte string support @@ -64,7 +62,6 @@ POSIX_DESC= POSIX-like functions PSPELL_DESC= pspell support READLINE_DESC= readline support (CLI only) -RECODE_DESC= recode support SESSION_DESC= session support SHMOP_DESC= shmop support SIMPLEXML_DESC= simplexml support @@ -78,7 +75,6 @@ SYSVSHM_DESC= System V shared memory support TIDY_DESC= TIDY support TOKENIZER_DESC= tokenizer support -WDDX_DESC= WDDX support (implies XML) XML_DESC= XML support XMLREADER_DESC= XMLReader support XMLRPC_DESC= XMLRPC-EPI support @@ -90,7 +86,6 @@ OPTIONS_DEFAULT= CTYPE \ DOM \ FILTER \ - HASH \ ICONV \ JSON \ OPCACHE \ Index: lang/php74/Makefile =================================================================== --- lang/php74/Makefile +++ lang/php74/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -PORTNAME= php73 -DISTVERSION= 7.3.8 +PORTNAME= php74 +DISTVERSION= 7.4.0RC1 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= PHP/distributions +MASTER_SITES= https://downloads.php.net/~derick/ DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE= PHP301 -USES+= tar:xz cpe gnome +USES+= tar:xz cpe gnome pkgconfig CPE_PRODUCT= php NO_OPTIONS_SORT=yes @@ -24,9 +24,7 @@ CONFIGURE_ARGS+=--with-layout=GNU \ --with-config-file-scan-dir=${PREFIX}/etc/php \ --disable-all \ - --enable-libxml \ - --with-libxml-dir=${LOCALBASE} \ - --with-pcre-regex=${LOCALBASE} \ + --with-libxml \ --with-password-argon2=${LOCALBASE} \ --program-prefix="" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" @@ -60,7 +58,7 @@ LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php56-* php70-* php71-* php72-* +CONFLICTS= php71-* php72-* php73-* DESTDIRNAME= INSTALL_ROOT @@ -164,7 +162,7 @@ .if !defined(PKGNAMEPREFIX) post-build: - @${ECHO_CMD} "PHP_VER=73" > ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_VER=74" > ${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 Index: lang/php74/Makefile.ext =================================================================== --- lang/php74/Makefile.ext +++ lang/php74/Makefile.ext @@ -4,8 +4,8 @@ USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -PHP_VER= 73 -IGNORE_WITH_PHP= 71 72 +PHP_VER= 74 +IGNORE_WITH_PHP= 71 72 73 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} @@ -36,6 +36,7 @@ LIB_DEPENDS+= libcurl.so:ftp/curl CONFIGURE_ARGS+=--with-curl=${LOCALBASE} +USES+= pkgconfig .endif .if ${PHP_MODNAME} == "dba" @@ -60,6 +61,7 @@ CONFIGURE_ARGS+=--enable-dom \ --with-libxml-dir=${LOCALBASE} +USES+= pkgconfig USE_GNOME= libxml2 .endif @@ -66,6 +68,7 @@ .if ${PHP_MODNAME} == "enchant" LIB_DEPENDS+= libenchant.so:textproc/enchant CONFIGURE_ARGS+=--with-enchant=${LOCALBASE} +USES+= pkgconfig .endif .if ${PHP_MODNAME} == "exif" @@ -72,6 +75,11 @@ CONFIGURE_ARGS+=--enable-exif .endif +.if ${PHP_MODNAME} == "ffi" +LIB_DEPENDS= libffi.so:devel/libffi +CONFIGURE_ARGS+=--enable-ffi +.endif + .if ${PHP_MODNAME} == "fileinfo" CONFIGURE_ARGS+=--enable-fileinfo \ --with-pcre-dir=${LOCALBASE} @@ -89,7 +97,7 @@ --with-openssl-dir=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl +USES+= ssl pkgconfig .endif .if ${PHP_MODNAME} == "gd" @@ -97,11 +105,8 @@ libpng.so:graphics/png USES+= jpeg -CONFIGURE_ARGS+=--with-gd=${LOCALBASE} \ - --with-freetype-dir=${LOCALBASE} \ - --with-jpeg-dir=${LOCALBASE} \ - --with-png-dir=${LOCALBASE} \ - --with-zlib-dir=/usr +CONFIGURE_ARGS+=--enable-gd \ + --with-external-gd EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude libgd \ php-${DISTVERSION}/ext/gd @@ -128,16 +133,6 @@ CONFIGURE_ARGS+=--with-gmp=${LOCALBASE} .endif -.if ${PHP_MODNAME} == "hash" -CONFIGURE_ARGS+=--enable-hash \ - --with-mhash -CFLAGS_mips64= -DHAVE_SLOW_HASH3 -CFLAGS_powerpc64= -DHAVE_SLOW_HASH3 -CFLAGS_powerpc= -DHAVE_SLOW_HASH3 -CFLAGS_powerpcspe= -DHAVE_SLOW_HASH3 -CFLAGS_sparc64= -DHAVE_SLOW_HASH3 -.endif - .if ${PHP_MODNAME} == "iconv" CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} @@ -153,19 +148,18 @@ --with-pcre-dir=${LOCALBASE} \ --with-imap-ssl=${OPENSSLBASE} +CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" \ + PHP_OPENSSL=yes + LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl +USES+= ssl .endif -.if ${PHP_MODNAME} == "interbase" -CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} - -USES+= firebird -.endif - .if ${PHP_MODNAME} == "intl" CONFIGURE_ARGS+=--with-intl=${LOCALBASE} LIB_DEPENDS= libicui18n.so:devel/icu +USES+= pkgconfig .endif .if ${PHP_MODNAME} == "json" @@ -210,10 +204,10 @@ .endif .if ${PHP_MODNAME} == "openssl" -CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USES+= ssl +USES+= ssl +CONFIGURE_ARGS+= --with-openssl +CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ + OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto" .endif .if ${PHP_MODNAME} == "opcache" @@ -273,7 +267,7 @@ .endif .if ${PHP_MODNAME} == "pdo_sqlite" -USES+= sqlite +USES+= localbase sqlite CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE} USE_PHP= pdo:build @@ -288,8 +282,6 @@ .if ${PHP_MODNAME} == "phar" CONFIGURE_ARGS+=--enable-phar \ --with-pcre-dir=${LOCALBASE} - -USE_PHP= hash:build .endif .if ${PHP_MODNAME} == "posix" @@ -307,12 +299,6 @@ USES+= readline .endif -.if ${PHP_MODNAME} == "recode" -LIB_DEPENDS+= librecode.so:converters/recode - -CONFIGURE_ARGS+=--with-recode=${LOCALBASE} -.endif - .if ${PHP_MODNAME} == "session" CONFIGURE_ARGS+=--enable-session PHP_MOD_PRIO= 18 @@ -346,6 +332,7 @@ CONFIGURE_ARGS+=--enable-soap \ --with-libxml-dir=${LOCALBASE} +USES+= pkgconfig USE_GNOME= libxml2 .endif @@ -359,7 +346,7 @@ .endif .if ${PHP_MODNAME} == "sqlite3" -USES+= sqlite +USES+= localbase pkgconfig sqlite CONFIGURE_ARGS+=--with-sqlite3=${LOCALBASE} .endif @@ -385,19 +372,11 @@ CONFIGURE_ARGS+=--enable-tokenizer .endif -.if ${PHP_MODNAME} == "wddx" -CONFIGURE_ARGS+=--enable-wddx \ - --with-libxml-dir=${LOCALBASE} - -USE_GNOME= libxml2 - -USE_PHP= xml:build session:build -.endif - .if ${PHP_MODNAME} == "xml" CONFIGURE_ARGS+=--enable-xml \ --with-libxml-dir=${LOCALBASE} +USES+= pkgconfig USE_GNOME= libxml2 .endif @@ -406,8 +385,6 @@ --with-libxml-dir=${LOCALBASE} USE_GNOME= libxml2 - -USE_PHP= dom:build .endif .if ${PHP_MODNAME} == "xmlrpc" @@ -427,6 +404,7 @@ CONFIGURE_ARGS+=--enable-xmlwriter \ --with-libxml-dir=${LOCALBASE} +USES+= pkgconfig USE_GNOME= libxml2 .endif @@ -444,10 +422,12 @@ --with-zlib-dir=/usr \ --with-pcre-dir=${LOCALBASE} \ --with-libzip=${LOCALBASE} +USES+= pkgconfig .endif .if ${PHP_MODNAME} == "zlib" CONFIGURE_ARGS+=--with-zlib=/usr +USES+= pkgconfig .endif .include @@ -512,9 +492,6 @@ .include .if ${PHP_MODNAME} == "gd" -. if ${PORT_OPTIONS:MTRUETYPE} -CONFIGURE_ARGS+=--enable-gd-native-ttf -. endif . if ${PORT_OPTIONS:MJIS} CONFIGURE_ARGS+=--enable-gd-jis-conv . endif @@ -521,12 +498,12 @@ . if ${PORT_OPTIONS:MWEBP} LIB_DEPENDS+= libwebp.so:graphics/webp -CONFIGURE_ARGS+=--with-webp-dir=${LOCALBASE} +CONFIGURE_ARGS+=--with-webp . endif . if ${PORT_OPTIONS:MX11} USE_XORG= xpm -CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} +CONFIGURE_ARGS+=--with-xpm . endif .endif Index: lang/php74/distinfo =================================================================== --- lang/php74/distinfo +++ lang/php74/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564742295 -SHA256 (php-7.3.8.tar.xz) = f6046b2ae625d8c04310bda0737ac660dc5563a8e04e8a46c1ee24ea414ad5a5 -SIZE (php-7.3.8.tar.xz) = 12064620 +TIMESTAMP = 1567762140 +SHA256 (php-7.4.0RC1.tar.xz) = 9e3d158ad070968ad9d9e796a7acf88c3cfe0e0382e991e6dee05a18049d4a62 +SIZE (php-7.4.0RC1.tar.xz) = 10212396 Index: lang/php74/files/patch-build_Makefile.global =================================================================== --- lang/php74/files/patch-build_Makefile.global +++ lang/php74/files/patch-build_Makefile.global @@ -1,5 +1,5 @@ ---- Makefile.global.orig 2016-08-17 19:50:48 UTC -+++ Makefile.global +--- build/Makefile.global.orig 2019-08-06 06:54:07 UTC ++++ build/Makefile.global @@ -89,14 +89,14 @@ test: all @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \ INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo php_ini_loaded_file();' 2> /dev/null`; \ Index: lang/php74/files/patch-configure.ac =================================================================== --- lang/php74/files/patch-configure.ac +++ lang/php74/files/patch-configure.ac @@ -1,47 +1,31 @@ ---- configure.ac.orig 2018-01-02 22:35:55 UTC +--- configure.ac.orig 2019-08-06 06:54:06 UTC +++ configure.ac -@@ -102,6 +102,7 @@ int zend_sprintf(char *buffer, const char *format, ... +@@ -105,6 +105,7 @@ extern "C++" { + #endif + #endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ - #undef PTHREADS - +#include #endif /* PHP_CONFIG_H */ ]) -@@ -339,7 +340,6 @@ sinclude(TSRM/tsrm.m4) - dnl . - dnl ------------------------------------------------------------------------- +@@ -313,7 +314,6 @@ sinclude(Zend/Zend.m4) + dnl ---------------------------------------------------------------------------- + -PTHREADS_CHECK PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -370,15 +370,9 @@ else - AC_MSG_RESULT([none]) - fi +@@ -654,7 +654,7 @@ memmem \ + AX_FUNC_WHICH_GETHOSTBYNAME_R --dnl Exit early --if test -z "$PHP_INSTALLED_SAPIS"; then -- AC_MSG_ERROR([Nothing to build.]) --fi -- - dnl force ZTS - if test "$enable_maintainer_zts" = "yes"; then - PTHREADS_ASSIGN_VARS -- PTHREADS_FLAGS - fi - - dnl Starting system checks. -@@ -682,7 +676,7 @@ nanosleep \ - ) - - dnl Some systems (like OpenSolaris) do not have nanosleep in libc + 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... - dnl Also check for working getaddrinfo -@@ -1235,7 +1229,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` + 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 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"` @@ -50,7 +34,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1434,7 +1428,7 @@ PHP_SUBST(all_targets) +@@ -1493,7 +1493,7 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) @@ -57,5 +41,5 @@ -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/]) +PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/]) - PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_ADD_SOURCES(TSRM, TSRM.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) Index: lang/php74/pkg-plist =================================================================== --- lang/php74/pkg-plist +++ lang/php74/pkg-plist @@ -10,11 +10,6 @@ %%FPM%%@sample etc/php-fpm.conf.default etc/php-fpm.conf %%FPM%%@sample etc/php-fpm.d/www.conf.default etc/php-fpm.d/www.conf include/php/TSRM/TSRM.h -include/php/TSRM/readdir.h -include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.w32.h -include/php/TSRM/tsrm_config_common.h -include/php/TSRM/tsrm_strtok_r.h include/php/TSRM/tsrm_win32.h include/php/Zend/zend.h include/php/Zend/zend_API.h @@ -28,7 +23,6 @@ include/php/Zend/zend_closures.h include/php/Zend/zend_compile.h include/php/Zend/zend_config.h -include/php/Zend/zend_config.nw.h include/php/Zend/zend_config.w32.h include/php/Zend/zend_constants.h include/php/Zend/zend_cpuinfo.h @@ -59,6 +53,7 @@ include/php/Zend/zend_list.h include/php/Zend/zend_llist.h include/php/Zend/zend_long.h +include/php/Zend/zend_map_ptr.h include/php/Zend/zend_modules.h include/php/Zend/zend_multibyte.h include/php/Zend/zend_multiply.h @@ -92,10 +87,25 @@ include/php/Zend/zend_vm_opcodes.h include/php/Zend/zend_vm_trace_handlers.h include/php/Zend/zend_vm_trace_map.h +include/php/Zend/zend_weakrefs.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 +include/php/ext/hash/php_hash_fnv.h +include/php/ext/hash/php_hash_gost.h +include/php/ext/hash/php_hash_haval.h +include/php/ext/hash/php_hash_joaat.h +include/php/ext/hash/php_hash_md.h +include/php/ext/hash/php_hash_ripemd.h +include/php/ext/hash/php_hash_sha.h +include/php/ext/hash/php_hash_sha3.h +include/php/ext/hash/php_hash_snefru.h +include/php/ext/hash/php_hash_tiger.h +include/php/ext/hash/php_hash_whirlpool.h %%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 @@ -123,6 +133,11 @@ %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_wireprotocol.h %%MYSQLND%%include/php/ext/mysqlnd/mysqlnd_vio.h %%MYSQLND%%include/php/ext/mysqlnd/php_mysqlnd.h +include/php/ext/pcre/pcre2lib/config.h +include/php/ext/pcre/pcre2lib/pcre2.h +include/php/ext/pcre/pcre2lib/pcre2_internal.h +include/php/ext/pcre/pcre2lib/pcre2_intmodedep.h +include/php/ext/pcre/pcre2lib/pcre2_ucp.h include/php/ext/pcre/php_pcre.h include/php/ext/spl/php_spl.h include/php/ext/spl/spl_array.h @@ -244,7 +259,6 @@ %%EMBED%%include/php/sapi/embed/php_embed.h %%EMBED%%lib/libphp7.so lib/php/build/Makefile.global -lib/php/build/acinclude.m4 lib/php/build/ax_check_compile_flag.m4 lib/php/build/ax_gcc_func_attribute.m4 lib/php/build/config.guess @@ -251,10 +265,11 @@ lib/php/build/config.sub lib/php/build/libtool.m4 lib/php/build/ltmain.sh -lib/php/build/mkdep.awk +lib/php/build/php.m4 +lib/php/build/php_cxx_compile_stdcxx.m4 lib/php/build/phpize.m4 +lib/php/build/pkg.m4 lib/php/build/run-tests.php -lib/php/build/scan_makefile_in.awk lib/php/build/shtool %%CGI%%man/man1/php-cgi.1.gz man/man1/php-config.1.gz Index: mail/Makefile =================================================================== --- mail/Makefile +++ mail/Makefile @@ -480,6 +480,7 @@ SUBDIR += php71-imap SUBDIR += php72-imap SUBDIR += php73-imap + SUBDIR += php74-imap SUBDIR += phplist SUBDIR += phpmailer SUBDIR += phpmailer6 Index: mail/php74-imap/Makefile =================================================================== --- mail/php74-imap/Makefile +++ mail/php74-imap/Makefile @@ -2,7 +2,7 @@ CATEGORIES= mail -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -imap Index: mail/php74-imap/files/patch-config.m4 =================================================================== --- mail/php74-imap/files/patch-config.m4 +++ mail/php74-imap/files/patch-config.m4 @@ -1,15 +1,20 @@ ---- config.m4.orig 2010-02-07 14:06:54.000000000 +0100 -+++ config.m4 2010-03-08 11:56:24.000000000 +0100 -@@ -103,6 +103,8 @@ - PHP_ARG_WITH(imap-ssl,for IMAP SSL support, - [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no) +--- config.m4.orig 2019-08-20 14:09:27 UTC ++++ config.m4 +@@ -105,6 +105,13 @@ PHP_ARG_WITH([imap-ssl], + [no], + [no]) -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir IMAP: pcre install prefix], no, no) - - if test "$PHP_IMAP" != "no"; then ++PHP_ARG_WITH([pcre-dir], ++ [pcre install prefix], ++ [AS_HELP_STRING([[--with-pcre-dir]], ++ [IMAP: pcre install prefix])], ++ [no], ++ [no]) ++ + if test "$PHP_IMAP" != "no"; then PHP_SUBST(IMAP_SHARED_LIBADD) -@@ -119,6 +121,30 @@ + PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) +@@ -120,6 +127,30 @@ if test "$PHP_IMAP" != "no"; then fi done Index: math/Makefile =================================================================== --- math/Makefile +++ math/Makefile @@ -648,6 +648,8 @@ SUBDIR += php72-gmp SUBDIR += php73-bcmath SUBDIR += php73-gmp + SUBDIR += php74-bcmath + SUBDIR += php74-gmp SUBDIR += physcalc SUBDIR += picosat SUBDIR += piranha Index: math/php74-bcmath/Makefile =================================================================== --- math/php74-bcmath/Makefile +++ math/php74-bcmath/Makefile @@ -2,7 +2,7 @@ CATEGORIES= math -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -bcmath Index: math/php74-gmp/Makefile =================================================================== --- math/php74-gmp/Makefile +++ math/php74-gmp/Makefile @@ -2,7 +2,7 @@ CATEGORIES= math -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -gmp Index: misc/Makefile =================================================================== --- misc/Makefile +++ misc/Makefile @@ -363,6 +363,7 @@ SUBDIR += php71-calendar SUBDIR += php72-calendar SUBDIR += php73-calendar + SUBDIR += php74-calendar SUBDIR += phraze SUBDIR += pinfo SUBDIR += pipe Index: misc/php74-calendar/Makefile =================================================================== --- misc/php74-calendar/Makefile +++ misc/php74-calendar/Makefile @@ -2,7 +2,7 @@ CATEGORIES= misc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -calendar Index: net-mgmt/Makefile =================================================================== --- net-mgmt/Makefile +++ net-mgmt/Makefile @@ -291,6 +291,7 @@ SUBDIR += php71-snmp SUBDIR += php72-snmp SUBDIR += php73-snmp + SUBDIR += php74-snmp SUBDIR += phpipam SUBDIR += phpweathermap SUBDIR += pixilate Index: net-mgmt/php74-snmp/Makefile =================================================================== --- net-mgmt/php74-snmp/Makefile +++ net-mgmt/php74-snmp/Makefile @@ -2,7 +2,7 @@ CATEGORIES= net-mgmt -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -snmp Index: net/Makefile =================================================================== --- net/Makefile +++ net/Makefile @@ -973,6 +973,10 @@ SUBDIR += php73-soap SUBDIR += php73-sockets SUBDIR += php73-xmlrpc + SUBDIR += php74-ldap + SUBDIR += php74-soap + SUBDIR += php74-sockets + SUBDIR += php74-xmlrpc SUBDIR += phpldapadmin SUBDIR += pim6-tools SUBDIR += pim6dd Index: net/php74-ldap/Makefile =================================================================== --- net/php74-ldap/Makefile +++ net/php74-ldap/Makefile @@ -2,7 +2,7 @@ CATEGORIES= net -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -ldap Index: net/php74-soap/Makefile =================================================================== --- net/php74-soap/Makefile +++ net/php74-soap/Makefile @@ -2,7 +2,7 @@ CATEGORIES= net -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -soap Index: net/php74-sockets/Makefile =================================================================== --- net/php74-sockets/Makefile +++ net/php74-sockets/Makefile @@ -2,7 +2,7 @@ CATEGORIES= net -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sockets Index: net/php74-xmlrpc/Makefile =================================================================== --- net/php74-xmlrpc/Makefile +++ net/php74-xmlrpc/Makefile @@ -2,7 +2,7 @@ CATEGORIES= net -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -xmlrpc Index: security/Makefile =================================================================== --- security/Makefile +++ security/Makefile @@ -805,6 +805,9 @@ SUBDIR += php73-hash SUBDIR += php73-openssl SUBDIR += php73-sodium + SUBDIR += php74-filter + SUBDIR += php74-openssl + SUBDIR += php74-sodium SUBDIR += phpsecinfo SUBDIR += picosha2 SUBDIR += pidentd Index: security/php74-filter/Makefile =================================================================== --- security/php74-filter/Makefile +++ security/php74-filter/Makefile @@ -2,7 +2,7 @@ CATEGORIES= security -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -filter Index: security/php74-openssl/Makefile =================================================================== --- security/php74-openssl/Makefile +++ security/php74-openssl/Makefile @@ -2,7 +2,7 @@ CATEGORIES= security -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -openssl Index: security/php74-sodium/Makefile =================================================================== --- security/php74-sodium/Makefile +++ security/php74-sodium/Makefile @@ -2,7 +2,7 @@ CATEGORIES= security -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sodium Index: sysutils/Makefile =================================================================== --- sysutils/Makefile +++ sysutils/Makefile @@ -893,6 +893,8 @@ SUBDIR += php72-posix SUBDIR += php73-fileinfo SUBDIR += php73-posix + SUBDIR += php74-fileinfo + SUBDIR += php74-posix SUBDIR += phpfpm_exporter SUBDIR += phybs SUBDIR += pick Index: sysutils/php74-fileinfo/Makefile =================================================================== --- sysutils/php74-fileinfo/Makefile +++ sysutils/php74-fileinfo/Makefile @@ -2,7 +2,7 @@ CATEGORIES= sysutils -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -fileinfo Index: sysutils/php74-posix/Makefile =================================================================== --- sysutils/php74-posix/Makefile +++ sysutils/php74-posix/Makefile @@ -2,7 +2,7 @@ CATEGORIES= sysutils -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -posix Index: textproc/Makefile =================================================================== --- textproc/Makefile +++ textproc/Makefile @@ -1206,6 +1206,15 @@ SUBDIR += php73-xmlreader SUBDIR += php73-xmlwriter SUBDIR += php73-xsl + SUBDIR += php74-ctype + SUBDIR += php74-dom + SUBDIR += php74-enchant + SUBDIR += php74-pspell + SUBDIR += php74-simplexml + SUBDIR += php74-xml + SUBDIR += php74-xmlreader + SUBDIR += php74-xmlwriter + SUBDIR += php74-xsl SUBDIR += pict SUBDIR += plover SUBDIR += po4a Index: textproc/php74-ctype/Makefile =================================================================== --- textproc/php74-ctype/Makefile +++ textproc/php74-ctype/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -ctype Index: textproc/php74-dom/Makefile =================================================================== --- textproc/php74-dom/Makefile +++ textproc/php74-dom/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -dom Index: textproc/php74-enchant/Makefile =================================================================== --- textproc/php74-enchant/Makefile +++ textproc/php74-enchant/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -enchant Index: textproc/php74-pspell/Makefile =================================================================== --- textproc/php74-pspell/Makefile +++ textproc/php74-pspell/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pspell Index: textproc/php74-simplexml/Makefile =================================================================== --- textproc/php74-simplexml/Makefile +++ textproc/php74-simplexml/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -simplexml Index: textproc/php74-simplexml/files/patch-config.m4 =================================================================== --- textproc/php74-simplexml/files/patch-config.m4 +++ textproc/php74-simplexml/files/patch-config.m4 @@ -1,17 +1,16 @@ ---- config.m4.orig 2018-09-25 09:08:02 UTC +--- config.m4.orig 2019-08-06 06:54:07 UTC +++ config.m4 -@@ -3,6 +3,9 @@ dnl config.m4 for extension simplexml - PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support, - [ --disable-simplexml Disable SimpleXML support], yes) +@@ -4,8 +4,39 @@ PHP_ARG_ENABLE([simplexml], + [Disable SimpleXML support])], + [yes]) -+PHP_ARG_WITH(pcre-dir, pcre install prefix, -+[ --with-pcre-dir SimpleXML: pcre install prefix], no, no) ++PHP_ARG_ENABLE([pcre-dir], ++ [pcre install prefix], ++ [AS_HELP_STRING([--with-pcre-dir], ++ [SimpleXML: pcre install dir])], ++ [no], ++ [no]) + - if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH(libxml-dir, libxml2 install dir, - [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) -@@ -10,6 +13,30 @@ fi - if test "$PHP_SIMPLEXML" != "no"; then + dnl This is PECL build, check if bundled PCRE library is used @@ -39,5 +38,5 @@ + ]) + if test "$PHP_LIBXML" = "no"; then - AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) + AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --with-libxml]) fi Index: textproc/php74-xml/Makefile =================================================================== --- textproc/php74-xml/Makefile +++ textproc/php74-xml/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -xml Index: textproc/php74-xmlreader/Makefile =================================================================== --- textproc/php74-xmlreader/Makefile +++ textproc/php74-xmlreader/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -xmlreader Index: textproc/php74-xmlwriter/Makefile =================================================================== --- textproc/php74-xmlwriter/Makefile +++ textproc/php74-xmlwriter/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -xmlwriter Index: textproc/php74-xsl/Makefile =================================================================== --- textproc/php74-xsl/Makefile +++ textproc/php74-xsl/Makefile @@ -2,7 +2,7 @@ CATEGORIES= textproc -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -xsl Index: www/Makefile =================================================================== --- www/Makefile +++ www/Makefile @@ -407,6 +407,7 @@ SUBDIR += mod_php71 SUBDIR += mod_php72 SUBDIR += mod_php73 + SUBDIR += mod_php74 SUBDIR += mod_proctitle SUBDIR += mod_proxy_xml SUBDIR += mod_python35 @@ -1400,6 +1401,9 @@ SUBDIR += php73-opcache SUBDIR += php73-session SUBDIR += php73-tidy + SUBDIR += php74-opcache + SUBDIR += php74-session + SUBDIR += php74-tidy SUBDIR += phpbb SUBDIR += phpbb3 SUBDIR += phpgroupware Index: www/mod_php74/Makefile =================================================================== --- www/mod_php74/Makefile +++ www/mod_php74/Makefile @@ -5,7 +5,7 @@ MAINTAINER= ports@FreeBSD.org -PHP_PORT= lang/php73 +PHP_PORT= lang/php74 MASTERDIR= ${.CURDIR}/../../${PHP_PORT} OPTIONS_DEFINE= AP2FILTER Index: www/php74-opcache/Makefile =================================================================== --- www/php74-opcache/Makefile +++ www/php74-opcache/Makefile @@ -2,7 +2,7 @@ CATEGORIES= www -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -opcache Index: www/php74-session/Makefile =================================================================== --- www/php74-session/Makefile +++ www/php74-session/Makefile @@ -2,7 +2,7 @@ CATEGORIES= www -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -session Index: www/php74-tidy/Makefile =================================================================== --- www/php74-tidy/Makefile +++ www/php74-tidy/Makefile @@ -2,7 +2,7 @@ CATEGORIES= www -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -tidy