Date: Fri, 20 Sep 2019 12:21:12 +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: r512406 - in head: Mk Mk/Uses archivers archivers/php74-bz2 archivers/php74-phar archivers/php74-zip archivers/php74-zlib converters converters/php74-iconv converters/php74-mbstring con... Message-ID: <201909201221.x8KCLCkn085449@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Fri Sep 20 12:21:11 2019 New Revision: 512406 URL: https://svnweb.freebsd.org/changeset/ports/512406 Log: Welcome PHP 7.4 RC 1 in the ports-tree. There are many greater changes including: - New module ffi - Remove interbase module - Remove recode module - Remove wddx module - Many modules changes the build switches - Many modules changes the config format, so patches needed to be recreated Special thanks to tobik and ale for their support. Reviewed by: tobik, ale, joneum Sponsored by: PHP Update Service Differential Revision: https://reviews.freebsd.org/D21349 Added: head/archivers/php74-bz2/ - copied from r512395, head/archivers/php73-bz2/ head/archivers/php74-phar/ - copied from r512395, head/archivers/php73-phar/ head/archivers/php74-zip/ - copied from r512395, head/archivers/php73-zip/ head/archivers/php74-zlib/ - copied from r512395, head/archivers/php73-zlib/ head/converters/php74-iconv/ - copied from r512395, head/converters/php73-iconv/ head/converters/php74-mbstring/ - copied from r512395, head/converters/php73-mbstring/ head/databases/php74-dba/ - copied from r512395, head/databases/php73-dba/ head/databases/php74-mysqli/ - copied from r512395, head/databases/php73-mysqli/ head/databases/php74-odbc/ - copied from r512395, head/databases/php73-odbc/ head/databases/php74-pdo/ - copied from r512395, head/databases/php73-pdo/ head/databases/php74-pdo_dblib/ - copied from r512395, head/databases/php73-pdo_dblib/ head/databases/php74-pdo_firebird/ - copied from r512395, head/databases/php73-pdo_firebird/ head/databases/php74-pdo_mysql/ - copied from r512395, head/databases/php73-pdo_mysql/ head/databases/php74-pdo_odbc/ - copied from r512395, head/databases/php73-pdo_odbc/ head/databases/php74-pdo_pgsql/ - copied from r512395, head/databases/php73-pdo_pgsql/ head/databases/php74-pdo_sqlite/ - copied from r512395, head/databases/php73-pdo_sqlite/ head/databases/php74-pgsql/ - copied from r512395, head/databases/php73-pgsql/ head/databases/php74-sqlite3/ - copied from r512395, head/databases/php73-sqlite3/ head/devel/php74-gettext/ - copied from r512395, head/devel/php73-gettext/ head/devel/php74-intl/ - copied from r512395, head/devel/php73-intl/ head/devel/php74-json/ - copied from r512395, head/devel/php73-json/ head/devel/php74-pcntl/ - copied from r512395, head/devel/php73-pcntl/ head/devel/php74-readline/ - copied from r512395, head/devel/php73-readline/ head/devel/php74-shmop/ - copied from r512395, head/devel/php73-shmop/ head/devel/php74-sysvmsg/ - copied from r512395, head/devel/php73-sysvmsg/ head/devel/php74-sysvsem/ - copied from r512395, head/devel/php73-sysvsem/ head/devel/php74-sysvshm/ - copied from r512395, head/devel/php73-sysvshm/ head/devel/php74-tokenizer/ - copied from r512395, head/devel/php73-tokenizer/ head/ftp/php74-curl/ - copied from r512395, head/ftp/php73-curl/ head/ftp/php74-ftp/ - copied from r512395, head/ftp/php73-ftp/ head/graphics/php74-exif/ - copied from r512395, head/graphics/php73-exif/ head/graphics/php74-gd/ - copied from r512395, head/graphics/php73-gd/ head/lang/php74/ - copied from r512395, head/lang/php73/ head/lang/php74-extensions/ - copied from r512395, head/lang/php73-extensions/ head/mail/php74-imap/ - copied from r512395, head/mail/php73-imap/ head/math/php74-bcmath/ - copied from r512395, head/math/php73-bcmath/ head/math/php74-gmp/ - copied from r512395, head/math/php73-gmp/ head/misc/php74-calendar/ - copied from r512395, head/misc/php73-calendar/ head/net-mgmt/php74-snmp/ - copied from r512395, head/net-mgmt/php73-snmp/ head/net/php74-ldap/ - copied from r512395, head/net/php73-ldap/ head/net/php74-soap/ - copied from r512395, head/net/php73-soap/ head/net/php74-sockets/ - copied from r512395, head/net/php73-sockets/ head/net/php74-xmlrpc/ - copied from r512395, head/net/php73-xmlrpc/ head/security/php74-filter/ - copied from r512395, head/security/php73-filter/ head/security/php74-hash/ - copied from r512395, head/security/php73-hash/ head/security/php74-openssl/ - copied from r512395, head/security/php73-openssl/ head/security/php74-sodium/ - copied from r512395, head/security/php73-sodium/ head/sysutils/php74-fileinfo/ - copied from r512395, head/sysutils/php73-fileinfo/ head/sysutils/php74-posix/ - copied from r512395, head/sysutils/php73-posix/ head/textproc/php74-ctype/ - copied from r512395, head/textproc/php73-ctype/ head/textproc/php74-dom/ - copied from r512395, head/textproc/php73-dom/ head/textproc/php74-enchant/ - copied from r512395, head/textproc/php73-enchant/ head/textproc/php74-pspell/ - copied from r512395, head/textproc/php73-pspell/ head/textproc/php74-simplexml/ - copied from r512395, head/textproc/php73-simplexml/ head/textproc/php74-xml/ - copied from r512395, head/textproc/php73-xml/ head/textproc/php74-xmlreader/ - copied from r512395, head/textproc/php73-xmlreader/ head/textproc/php74-xmlwriter/ - copied from r512395, head/textproc/php73-xmlwriter/ head/textproc/php74-xsl/ - copied from r512395, head/textproc/php73-xsl/ head/www/mod_php74/ - copied from r512395, head/www/mod_php73/ head/www/php74-opcache/ - copied from r512395, head/www/php73-opcache/ head/www/php74-session/ - copied from r512395, head/www/php73-session/ head/www/php74-tidy/ - copied from r512395, head/www/php73-tidy/ Modified: head/Mk/Uses/php.mk head/Mk/bsd.default-versions.mk head/archivers/Makefile head/archivers/php74-bz2/Makefile head/archivers/php74-phar/Makefile head/archivers/php74-zip/Makefile head/archivers/php74-zlib/Makefile head/converters/Makefile head/converters/php74-iconv/Makefile head/converters/php74-mbstring/Makefile head/converters/php74-mbstring/files/patch-config.m4 head/databases/Makefile head/databases/php74-dba/Makefile head/databases/php74-mysqli/Makefile head/databases/php74-odbc/Makefile head/databases/php74-odbc/files/patch-config.m4 head/databases/php74-pdo/Makefile head/databases/php74-pdo_dblib/Makefile head/databases/php74-pdo_firebird/Makefile head/databases/php74-pdo_mysql/Makefile head/databases/php74-pdo_odbc/Makefile head/databases/php74-pdo_pgsql/Makefile head/databases/php74-pdo_sqlite/Makefile head/databases/php74-pgsql/Makefile head/databases/php74-sqlite3/Makefile head/devel/Makefile head/devel/php74-gettext/Makefile head/devel/php74-intl/Makefile head/devel/php74-json/Makefile head/devel/php74-pcntl/Makefile head/devel/php74-readline/Makefile head/devel/php74-readline/files/patch-config.m4 head/devel/php74-shmop/Makefile head/devel/php74-sysvmsg/Makefile head/devel/php74-sysvsem/Makefile head/devel/php74-sysvshm/Makefile head/devel/php74-tokenizer/Makefile head/ftp/Makefile head/ftp/php74-curl/Makefile head/ftp/php74-ftp/Makefile head/graphics/Makefile head/graphics/php74-exif/Makefile head/graphics/php74-gd/Makefile head/graphics/php74-gd/files/patch-gd.c head/lang/Makefile head/lang/php74-extensions/Makefile head/lang/php74-extensions/pkg-descr head/lang/php74/Makefile head/lang/php74/Makefile.ext head/lang/php74/distinfo head/lang/php74/pkg-message.mod head/lang/php74/pkg-plist head/mail/Makefile head/mail/php74-imap/Makefile head/mail/php74-imap/files/patch-config.m4 head/math/Makefile head/math/php74-bcmath/Makefile head/math/php74-gmp/Makefile head/misc/Makefile head/misc/php74-calendar/Makefile head/net-mgmt/Makefile head/net-mgmt/php74-snmp/Makefile head/net/Makefile head/net/php74-ldap/Makefile head/net/php74-soap/Makefile head/net/php74-sockets/Makefile head/net/php74-xmlrpc/Makefile head/security/Makefile head/security/php74-filter/Makefile head/security/php74-hash/Makefile head/security/php74-openssl/Makefile head/security/php74-sodium/Makefile head/sysutils/Makefile head/sysutils/php74-fileinfo/Makefile head/sysutils/php74-posix/Makefile head/textproc/Makefile head/textproc/php74-ctype/Makefile head/textproc/php74-dom/Makefile head/textproc/php74-enchant/Makefile head/textproc/php74-pspell/Makefile head/textproc/php74-simplexml/Makefile head/textproc/php74-simplexml/files/patch-config.m4 head/textproc/php74-xml/Makefile head/textproc/php74-xmlreader/Makefile head/textproc/php74-xmlwriter/Makefile head/textproc/php74-xsl/Makefile head/www/Makefile head/www/mod_php74/Makefile head/www/php74-opcache/Makefile head/www/php74-session/Makefile head/www/php74-tidy/Makefile Modified: head/Mk/Uses/php.mk ============================================================================== --- head/Mk/Uses/php.mk Fri Sep 20 11:36:30 2019 (r512405) +++ head/Mk/Uses/php.mk Fri Sep 20 12:21:11 2019 (r512406) @@ -110,7 +110,7 @@ DIST_SUBDIR= PECL 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 @@ 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} == 73 +. if ${PHP_VER} == 74 +PHP_EXT_DIR= 20190902 +PHP_EXT_INC= hash pcre spl +. elif ${PHP_VER} == 73 PHP_EXT_DIR= 20180731 PHP_EXT_INC= pcre spl . elif ${PHP_VER} == 72 @@ -367,17 +370,18 @@ add-plist-phpext: # 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 \ + hash 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} interbase recode wddx +_USE_PHP_VER72= ${_USE_PHP_ALL} interbase recode sodium wddx +_USE_PHP_VER73= ${_USE_PHP_ALL} interbase recode sodium wddx +_USE_PHP_VER74= ${_USE_PHP_ALL} ffi sodium bcmath_DEPENDS= math/php${PHP_VER}-bcmath bitset_DEPENDS= math/pecl-bitset@${PHP_FLAVOR} @@ -390,6 +394,7 @@ dbase_DEPENDS= databases/php${PHP_VER}-dbase dom_DEPENDS= textproc/php${PHP_VER}-dom enchant_DEPENDS= textproc/php${PHP_VER}-enchant exif_DEPENDS= graphics/php${PHP_VER}-exif +ffi_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 Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Fri Sep 20 11:36:30 2019 (r512405) +++ head/Mk/bsd.default-versions.mk Fri Sep 20 12:21:11 2019 (r512406) @@ -82,7 +82,7 @@ PERL5_DEFAULT:= ${_PERL5_FROM_BIN:R} .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 Modified: head/archivers/Makefile ============================================================================== --- head/archivers/Makefile Fri Sep 20 11:36:30 2019 (r512405) +++ head/archivers/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -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 Modified: head/archivers/php74-bz2/Makefile ============================================================================== --- head/archivers/php73-bz2/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/archivers/php74-bz2/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -bz2 Modified: head/archivers/php74-phar/Makefile ============================================================================== --- head/archivers/php73-phar/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/archivers/php74-phar/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -phar Modified: head/archivers/php74-zip/Makefile ============================================================================== --- head/archivers/php73-zip/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/archivers/php74-zip/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -zip Modified: head/archivers/php74-zlib/Makefile ============================================================================== --- head/archivers/php73-zlib/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/archivers/php74-zlib/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -zlib Modified: head/converters/Makefile ============================================================================== --- head/converters/Makefile Fri Sep 20 11:36:30 2019 (r512405) +++ head/converters/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -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 Modified: head/converters/php74-iconv/Makefile ============================================================================== --- head/converters/php73-iconv/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/converters/php74-iconv/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -iconv Modified: head/converters/php74-mbstring/Makefile ============================================================================== --- head/converters/php73-mbstring/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/converters/php74-mbstring/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -mbstring Modified: head/converters/php74-mbstring/files/patch-config.m4 ============================================================================== --- head/converters/php73-mbstring/files/patch-config.m4 Fri Sep 20 09:17:19 2019 (r512395) +++ head/converters/php74-mbstring/files/patch-config.m4 Fri Sep 20 12:21:11 2019 (r512406) @@ -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) Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Fri Sep 20 11:36:30 2019 (r512405) +++ head/databases/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -657,6 +657,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 Modified: head/databases/php74-dba/Makefile ============================================================================== --- head/databases/php73-dba/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-dba/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -dba Modified: head/databases/php74-mysqli/Makefile ============================================================================== --- head/databases/php73-mysqli/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-mysqli/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -mysqli Modified: head/databases/php74-odbc/Makefile ============================================================================== --- head/databases/php73-odbc/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-odbc/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -odbc Modified: head/databases/php74-odbc/files/patch-config.m4 ============================================================================== --- head/databases/php73-odbc/files/patch-config.m4 Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-odbc/files/patch-config.m4 Fri Sep 20 12:21:11 2019 (r512406) @@ -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 Modified: head/databases/php74-pdo/Makefile ============================================================================== --- head/databases/php73-pdo/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pdo/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo Modified: head/databases/php74-pdo_dblib/Makefile ============================================================================== --- head/databases/php73-pdo_dblib/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pdo_dblib/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_dblib Modified: head/databases/php74-pdo_firebird/Makefile ============================================================================== --- head/databases/php73-pdo_firebird/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pdo_firebird/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_firebird Modified: head/databases/php74-pdo_mysql/Makefile ============================================================================== --- head/databases/php73-pdo_mysql/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pdo_mysql/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_mysql Modified: head/databases/php74-pdo_odbc/Makefile ============================================================================== --- head/databases/php73-pdo_odbc/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pdo_odbc/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_odbc Modified: head/databases/php74-pdo_pgsql/Makefile ============================================================================== --- head/databases/php73-pdo_pgsql/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pdo_pgsql/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_pgsql Modified: head/databases/php74-pdo_sqlite/Makefile ============================================================================== --- head/databases/php73-pdo_sqlite/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pdo_sqlite/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pdo_sqlite Modified: head/databases/php74-pgsql/Makefile ============================================================================== --- head/databases/php73-pgsql/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-pgsql/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pgsql Modified: head/databases/php74-sqlite3/Makefile ============================================================================== --- head/databases/php73-sqlite3/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/databases/php74-sqlite3/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sqlite3 Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Fri Sep 20 11:36:30 2019 (r512405) +++ head/devel/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -3935,6 +3935,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 Modified: head/devel/php74-gettext/Makefile ============================================================================== --- head/devel/php73-gettext/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-gettext/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -gettext Modified: head/devel/php74-intl/Makefile ============================================================================== --- head/devel/php73-intl/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-intl/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -intl Modified: head/devel/php74-json/Makefile ============================================================================== --- head/devel/php73-json/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-json/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -json Modified: head/devel/php74-pcntl/Makefile ============================================================================== --- head/devel/php73-pcntl/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-pcntl/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -pcntl Modified: head/devel/php74-readline/Makefile ============================================================================== --- head/devel/php73-readline/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-readline/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -readline Modified: head/devel/php74-readline/files/patch-config.m4 ============================================================================== --- head/devel/php73-readline/files/patch-config.m4 Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-readline/files/patch-config.m4 Fri Sep 20 12:21:11 2019 (r512406) @@ -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]) Modified: head/devel/php74-shmop/Makefile ============================================================================== --- head/devel/php73-shmop/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-shmop/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -shmop Modified: head/devel/php74-sysvmsg/Makefile ============================================================================== --- head/devel/php73-sysvmsg/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-sysvmsg/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sysvmsg Modified: head/devel/php74-sysvsem/Makefile ============================================================================== --- head/devel/php73-sysvsem/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-sysvsem/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sysvsem Modified: head/devel/php74-sysvshm/Makefile ============================================================================== --- head/devel/php73-sysvshm/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-sysvshm/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -sysvshm Modified: head/devel/php74-tokenizer/Makefile ============================================================================== --- head/devel/php73-tokenizer/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/devel/php74-tokenizer/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -tokenizer Modified: head/ftp/Makefile ============================================================================== --- head/ftp/Makefile Fri Sep 20 11:36:30 2019 (r512405) +++ head/ftp/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -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 Modified: head/ftp/php74-curl/Makefile ============================================================================== --- head/ftp/php73-curl/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/ftp/php74-curl/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -curl Modified: head/ftp/php74-ftp/Makefile ============================================================================== --- head/ftp/php73-ftp/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/ftp/php74-ftp/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -ftp Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Fri Sep 20 11:36:30 2019 (r512405) +++ head/graphics/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -763,6 +763,8 @@ SUBDIR += php72-gd SUBDIR += php73-exif SUBDIR += php73-gd + SUBDIR += php74-exif + SUBDIR += php74-gd SUBDIR += phplot SUBDIR += picpuz SUBDIR += piddle Modified: head/graphics/php74-exif/Makefile ============================================================================== --- head/graphics/php73-exif/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/graphics/php74-exif/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -exif Modified: head/graphics/php74-gd/Makefile ============================================================================== --- head/graphics/php73-gd/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/graphics/php74-gd/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -2,7 +2,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php73 +MASTERDIR= ${.CURDIR}/../../lang/php74 PKGNAMESUFFIX= -gd Modified: head/graphics/php74-gd/files/patch-gd.c ============================================================================== --- head/graphics/php73-gd/files/patch-gd.c Fri Sep 20 09:17:19 2019 (r512395) +++ head/graphics/php74-gd/files/patch-gd.c Fri Sep 20 12:21:11 2019 (r512406) @@ -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 <Wingdi.h> +@@ -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 <X11/xpm.h> - #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) } /* }}} */ Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Fri Sep 20 11:36:30 2019 (r512405) +++ head/lang/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -285,6 +285,8 @@ SUBDIR += php72-extensions SUBDIR += php73 SUBDIR += php73-extensions + SUBDIR += php74 + SUBDIR += php74-extensions SUBDIR += picoc SUBDIR += plexil SUBDIR += pocl Modified: head/lang/php74-extensions/Makefile ============================================================================== --- head/lang/php73-extensions/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/lang/php74-extensions/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTNAME= php73 +PORTNAME= php74 PORTVERSION= 1.0 CATEGORIES= lang PKGNAMESUFFIX= -extensions @@ -9,18 +9,18 @@ MAINTAINER= tz@FreeBSD.org 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 @@ FTP_DESC= FTP support 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 @@ PHAR_DESC= phar support 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 @@ SYSVSEM_DESC= System V semaphore support 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 @@ ZLIB_DESC= ZLIB support OPTIONS_DEFAULT= CTYPE \ DOM \ FILTER \ - HASH \ ICONV \ JSON \ OPCACHE \ Modified: head/lang/php74-extensions/pkg-descr ============================================================================== --- head/lang/php73-extensions/pkg-descr Fri Sep 20 09:17:19 2019 (r512395) +++ head/lang/php74-extensions/pkg-descr Fri Sep 20 12:21:11 2019 (r512406) @@ -1,7 +1,7 @@ -This is a "meta-port" to install the extensions for PHP 7.3. +This is a "meta-port" to install the extensions for PHP 7.4. Defaults to: -ctype, dom, filter, hash, iconv, json, pdo, pdo_sqlite, phar, posix, +ctype, dom, filter, iconv, json, opcache, pdo, pdo_sqlite, phar, posix, session, simplexml, sqlite3, tokenizer, xml, xmlreader and xmlwriter. WWW: http://www.php.net/ Modified: head/lang/php74/Makefile ============================================================================== --- head/lang/php73/Makefile Fri Sep 20 09:17:19 2019 (r512395) +++ head/lang/php74/Makefile Fri Sep 20 12:21:11 2019 (r512406) @@ -1,10 +1,10 @@ # $FreeBSD$ -PORTNAME= php73 -DISTVERSION= 7.3.9 +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 @@ COMMENT= PHP Scripting Language LICENSE= PHP301 -USES+= tar:xz cpe gnome +USES+= tar:xz cpe gnome pkgconfig CPE_PRODUCT= php NO_OPTIONS_SORT=yes @@ -24,9 +24,7 @@ GNU_CONFIGURE= yes 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 @@ MYSQLND_DESC= Build with MySQL Native Driver 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 @@ pre-configure: .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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909201221.x8KCLCkn085449>