From owner-svn-ports-all@freebsd.org Mon Feb 15 14:34:34 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D8C4AA83A9; Mon, 15 Feb 2016 14:34:34 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDE821B3D; Mon, 15 Feb 2016 14:34:33 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1FEYW1S001794; Mon, 15 Feb 2016 14:34:32 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1FEYRj3001733; Mon, 15 Feb 2016 14:34:27 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201602151434.u1FEYRj3001733@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Mon, 15 Feb 2016 14:34:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408932 - in head: Mk archivers archivers/php70-bz2 archivers/php70-phar archivers/php70-phar/files archivers/php70-zip archivers/php70-zlib converters converters/php70-iconv converters... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Feb 2016 14:34:34 -0000 Author: miwi Date: Mon Feb 15 14:34:26 2016 New Revision: 408932 URL: https://svnweb.freebsd.org/changeset/ports/408932 Log: Welcome php 7.0.3 Changelog: http://php.net/ChangeLog-7.php#7.0.0 http://php.net/ChangeLog-7.php#7.0.1 http://php.net/ChangeLog-7.php#7.0.2 http://php.net/ChangeLog-7.php#7.0.3 I'd like to thanks: Kurt Jaeger Matthias Breddin Rainer Duffner Victor van Vlaardingen Torsten Zuehlsdorff Franco Fichtner and all helpers and testers from ports@. Added: head/archivers/php70-bz2/ - copied from r408923, head/archivers/php56-bz2/ head/archivers/php70-phar/ - copied from r408923, head/archivers/php56-phar/ head/archivers/php70-zip/ - copied from r408923, head/archivers/php56-zip/ head/archivers/php70-zlib/ - copied from r408923, head/archivers/php56-zlib/ head/converters/php70-iconv/ - copied from r408923, head/converters/php56-iconv/ head/converters/php70-mbstring/ - copied from r408923, head/converters/php56-mbstring/ head/converters/php70-recode/ - copied from r408923, head/converters/php56-recode/ head/databases/php70-dba/ - copied from r408923, head/databases/php56-dba/ head/databases/php70-interbase/ - copied from r408923, head/databases/php56-interbase/ head/databases/php70-mysqli/ - copied from r408923, head/databases/php56-mysqli/ head/databases/php70-odbc/ - copied from r408923, head/databases/php56-odbc/ head/databases/php70-pdo/ - copied from r408923, head/databases/php56-pdo/ head/databases/php70-pdo_dblib/ - copied from r408923, head/databases/php56-pdo_dblib/ head/databases/php70-pdo_firebird/ - copied from r408923, head/databases/php56-pdo_firebird/ head/databases/php70-pdo_mysql/ - copied from r408923, head/databases/php56-pdo_mysql/ head/databases/php70-pdo_odbc/ - copied from r408923, head/databases/php56-pdo_odbc/ head/databases/php70-pdo_pgsql/ - copied from r408923, head/databases/php56-pdo_pgsql/ head/databases/php70-pdo_sqlite/ - copied from r408923, head/databases/php56-pdo_sqlite/ head/databases/php70-pgsql/ - copied from r408923, head/databases/php56-pgsql/ head/databases/php70-sqlite3/ - copied from r408923, head/databases/php56-sqlite3/ head/devel/php70-gettext/ - copied from r408923, head/devel/php56-gettext/ head/devel/php70-intl/ head/devel/php70-intl/Makefile (contents, props changed) head/devel/php70-json/ - copied from r408923, head/devel/php56-json/ head/devel/php70-pcntl/ - copied from r408923, head/devel/php56-pcntl/ head/devel/php70-readline/ - copied from r408923, head/devel/php56-readline/ head/devel/php70-shmop/ - copied from r408923, head/devel/php56-shmop/ head/devel/php70-sysvmsg/ - copied from r408923, head/devel/php56-sysvmsg/ head/devel/php70-sysvsem/ - copied from r408923, head/devel/php56-sysvsem/ head/devel/php70-sysvshm/ - copied from r408923, head/devel/php56-sysvshm/ head/devel/php70-tokenizer/ - copied from r408923, head/devel/php56-tokenizer/ head/ftp/php70-curl/ - copied from r408923, head/ftp/php56-curl/ head/ftp/php70-ftp/ - copied from r408923, head/ftp/php56-ftp/ head/graphics/php70-exif/ - copied from r408923, head/graphics/php56-exif/ head/graphics/php70-gd/ - copied from r408923, head/graphics/php56-gd/ head/lang/php70/ - copied from r408923, head/lang/php56/ head/lang/php70-extensions/ - copied from r408923, head/lang/php56-extensions/ head/mail/php70-imap/ - copied from r408923, head/mail/php56-imap/ head/math/php70-bcmath/ - copied from r408923, head/math/php56-bcmath/ head/math/php70-gmp/ - copied from r408923, head/math/php56-gmp/ head/misc/php70-calendar/ - copied from r408923, head/misc/php56-calendar/ head/net-mgmt/php70-snmp/ - copied from r408923, head/net-mgmt/php56-snmp/ head/net/php70-ldap/ - copied from r408923, head/net/php56-ldap/ head/net/php70-soap/ - copied from r408923, head/net/php56-soap/ head/net/php70-sockets/ - copied from r408923, head/net/php56-sockets/ head/net/php70-xmlrpc/ - copied from r408923, head/net/php56-xmlrpc/ head/security/php70-filter/ - copied from r408923, head/security/php56-filter/ head/security/php70-hash/ - copied from r408923, head/security/php56-hash/ head/security/php70-mcrypt/ - copied from r408923, head/security/php56-mcrypt/ head/security/php70-openssl/ - copied from r408923, head/security/php56-openssl/ head/sysutils/php70-fileinfo/ - copied from r408923, head/sysutils/php56-fileinfo/ head/sysutils/php70-posix/ - copied from r408923, head/sysutils/php56-posix/ head/textproc/php70-ctype/ - copied from r408923, head/textproc/php56-ctype/ head/textproc/php70-dom/ - copied from r408923, head/textproc/php56-dom/ head/textproc/php70-pspell/ - copied from r408923, head/textproc/php56-pspell/ head/textproc/php70-simplexml/ - copied from r408923, head/textproc/php56-simplexml/ head/textproc/php70-wddx/ - copied from r408923, head/textproc/php56-wddx/ head/textproc/php70-xml/ - copied from r408923, head/textproc/php56-xml/ head/textproc/php70-xmlreader/ - copied from r408923, head/textproc/php56-xmlreader/ head/textproc/php70-xmlwriter/ - copied from r408923, head/textproc/php56-xmlwriter/ head/textproc/php70-xsl/ - copied from r408923, head/textproc/php56-xsl/ head/www/mod_php70/ - copied from r408923, head/www/mod_php56/ head/www/php70-opcache/ - copied from r408923, head/www/php56-opcache/ head/www/php70-session/ - copied from r408923, head/www/php56-session/ head/www/php70-tidy/ - copied from r408923, head/www/php56-tidy/ Deleted: head/databases/php70-pgsql/files/ head/graphics/php70-gd/files/ head/lang/php70/files/patch-TSRM_threads.m4 head/lang/php70/files/patch-Zend__zend.h head/lang/php70/files/patch-Zend_zend_list.c head/lang/php70/files/patch-Zend_zend_list.h head/lang/php70/files/patch-acinclude.m4 head/lang/php70/files/patch-ext_standard_image.c head/lang/php70/files/patch-ext_zlib_config0.m4 head/lang/php70/files/patch-sapi_apache2filter_config.m4 head/net/php70-soap/files/ Modified: head/Mk/bsd.php.mk head/archivers/Makefile head/archivers/php70-bz2/Makefile head/archivers/php70-phar/files/patch-config.m4 head/archivers/php70-phar/files/patch-phar.c head/archivers/php70-zip/Makefile head/converters/Makefile head/converters/php70-iconv/Makefile head/converters/php70-mbstring/Makefile head/converters/php70-recode/Makefile head/databases/Makefile head/databases/php70-dba/Makefile head/databases/php70-interbase/Makefile head/databases/php70-mysqli/Makefile head/databases/php70-odbc/Makefile head/databases/php70-pdo/Makefile head/databases/php70-pdo_dblib/Makefile head/databases/php70-pdo_firebird/Makefile head/databases/php70-pdo_mysql/Makefile head/databases/php70-pdo_odbc/Makefile head/databases/php70-pdo_pgsql/Makefile head/databases/php70-pdo_sqlite/Makefile head/databases/php70-pgsql/Makefile head/databases/php70-sqlite3/Makefile head/devel/Makefile head/devel/php70-gettext/Makefile head/devel/php70-json/Makefile head/devel/php70-pcntl/Makefile head/devel/php70-readline/Makefile head/devel/php70-shmop/Makefile head/devel/php70-sysvmsg/Makefile head/devel/php70-sysvsem/Makefile head/devel/php70-sysvshm/Makefile head/devel/php70-tokenizer/Makefile head/ftp/Makefile head/ftp/php70-curl/Makefile head/ftp/php70-ftp/Makefile head/graphics/Makefile head/graphics/php70-exif/Makefile head/graphics/php70-gd/Makefile head/lang/Makefile head/lang/php55-extensions/Makefile head/lang/php55/Makefile head/lang/php55/Makefile.ext head/lang/php56-extensions/Makefile head/lang/php56/Makefile head/lang/php56/Makefile.ext head/lang/php70-extensions/Makefile head/lang/php70/Makefile head/lang/php70/Makefile.ext head/lang/php70/distinfo head/lang/php70/files/patch-main__php_config.h.in head/lang/php70/files/patch-sapi_apache2handler_config.m4 head/lang/php70/files/patch-sapi_fpm_config.m4 head/lang/php70/pkg-plist head/mail/Makefile head/mail/php70-imap/Makefile head/math/Makefile head/math/php70-bcmath/Makefile head/math/php70-gmp/Makefile head/misc/Makefile head/misc/php70-calendar/Makefile head/net-mgmt/Makefile head/net/Makefile head/net/php70-ldap/Makefile head/net/php70-soap/Makefile head/net/php70-sockets/Makefile head/net/php70-xmlrpc/Makefile head/security/Makefile head/security/php70-filter/Makefile head/security/php70-hash/Makefile head/security/php70-mcrypt/Makefile head/security/php70-openssl/Makefile head/sysutils/Makefile head/sysutils/php70-fileinfo/Makefile head/sysutils/php70-posix/Makefile head/textproc/Makefile head/textproc/php70-ctype/Makefile head/textproc/php70-dom/Makefile head/textproc/php70-pspell/Makefile head/textproc/php70-simplexml/Makefile head/textproc/php70-wddx/Makefile head/textproc/php70-xml/Makefile head/textproc/php70-xmlreader/Makefile head/textproc/php70-xmlwriter/Makefile head/textproc/php70-xsl/Makefile head/www/Makefile head/www/mod_php70/Makefile head/www/php70-opcache/Makefile head/www/php70-session/Makefile head/www/php70-tidy/Makefile Modified: head/Mk/bsd.php.mk ============================================================================== --- head/Mk/bsd.php.mk Mon Feb 15 14:31:01 2016 (r408931) +++ head/Mk/bsd.php.mk Mon Feb 15 14:34:26 2016 (r408932) @@ -56,7 +56,10 @@ PHP_EXT_DIR!= ${PHPBASE}/bin/php-config DEFAULT_PHP_VER?= ${PHP_DEFAULT:S/.//} PHP_VER?= ${DEFAULT_PHP_VER} -.if ${PHP_VER} == 56 +.if ${PHP_VER} == 70 +PHP_EXT_DIR= 20151012 +PHP_EXT_INC= pcre spl +.elif ${PHP_VER} == 56 PHP_EXT_DIR= 20131226 PHP_EXT_INC= pcre spl .elif ${PHP_VER} == 55 @@ -252,6 +255,7 @@ _USE_PHP_ALL= apc bcmath bitset bz2 cale # version specific components _USE_PHP_VER55= ${_USE_PHP_ALL} phar sqlite3 _USE_PHP_VER56= ${_USE_PHP_ALL} phar sqlite3 +_USE_PHP_VER70= ${_USE_PHP_ALL} phar sqlite3 apc_DEPENDS= www/pecl-APC bcmath_DEPENDS= math/php${PHP_VER}-bcmath @@ -275,7 +279,11 @@ iconv_DEPENDS= converters/php${PHP_VER}- igbinary_DEPENDS= converters/pecl-igbinary imap_DEPENDS= mail/php${PHP_VER}-imap interbase_DEPENDS= databases/php${PHP_VER}-interbase +.if ${PHP_VER} == 70 +intl_DEPENDS= devel/php${PHP_VER}-intl +.else intl_DEPENDS= devel/pecl-intl +.endif json_DEPENDS= devel/php${PHP_VER}-json ldap_DEPENDS= net/php${PHP_VER}-ldap mbstring_DEPENDS= converters/php${PHP_VER}-mbstring @@ -288,12 +296,9 @@ mysqli_DEPENDS= databases/php${PHP_VER}- ncurses_DEPENDS=devel/php${PHP_VER}-ncurses odbc_DEPENDS= databases/php${PHP_VER}-odbc oci8_DEPENDS= databases/php${PHP_VER}-oci8 -.if ${PHP_VER} == 55 || ${PHP_VER} == 56 opcache_DEPENDS= www/php${PHP_VER}-opcache -.endif openssl_DEPENDS=security/php${PHP_VER}-openssl pcntl_DEPENDS= devel/php${PHP_VER}-pcntl -pcre_DEPENDS= devel/php${PHP_VER}-pcre pdf_DEPENDS= print/pecl-pdflib pdo_DEPENDS= databases/php${PHP_VER}-pdo pdo_dblib_DEPENDS= databases/php${PHP_VER}-pdo_dblib Modified: head/archivers/Makefile ============================================================================== --- head/archivers/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/archivers/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -150,6 +150,10 @@ SUBDIR += php56-phar SUBDIR += php56-zip SUBDIR += php56-zlib + SUBDIR += php70-bz2 + SUBDIR += php70-phar + SUBDIR += php70-zip + SUBDIR += php70-zlib SUBDIR += pigz SUBDIR += pixz SUBDIR += plzip Modified: head/archivers/php70-bz2/Makefile ============================================================================== --- head/archivers/php56-bz2/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/archivers/php70-bz2/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -bz2 Modified: head/archivers/php70-phar/files/patch-config.m4 ============================================================================== --- head/archivers/php56-phar/files/patch-config.m4 Mon Feb 15 11:31:53 2016 (r408923) +++ head/archivers/php70-phar/files/patch-config.m4 Mon Feb 15 14:34:26 2016 (r408932) @@ -1,5 +1,5 @@ ---- config.m4.orig 2011-11-25 15:31:20.000000000 +0100 -+++ config.m4 2011-11-25 15:47:45.000000000 +0100 +--- config.m4.orig 2015-12-10 14:23:55.176546745 +0300 ++++ config.m4 2015-12-10 14:29:14.284524651 +0300 @@ -4,8 +4,38 @@ PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) @@ -34,7 +34,7 @@ + ]) + ]) + - PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) + PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_HASH=yes AC_MSG_CHECKING([for phar openssl support]) if test "$PHP_HASH_SHARED" != "yes"; then Modified: head/archivers/php70-phar/files/patch-phar.c ============================================================================== --- head/archivers/php56-phar/files/patch-phar.c Mon Feb 15 11:31:53 2016 (r408923) +++ head/archivers/php70-phar/files/patch-phar.c Mon Feb 15 14:34:26 2016 (r408932) @@ -1,6 +1,6 @@ ---- phar.c.orig 2011-11-25 15:38:44.000000000 +0100 -+++ phar.c 2011-11-25 15:39:01.000000000 +0100 -@@ -3716,7 +3716,7 @@ +--- phar.c.orig 2015-12-10 14:18:59.933565343 +0300 ++++ phar.c 2015-12-10 14:19:28.787563292 +0300 +@@ -3578,7 +3578,7 @@ ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") Modified: head/archivers/php70-zip/Makefile ============================================================================== --- head/archivers/php56-zip/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/archivers/php70-zip/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= archivers -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -zip Modified: head/converters/Makefile ============================================================================== --- head/converters/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/converters/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -140,6 +140,9 @@ SUBDIR += php56-iconv SUBDIR += php56-mbstring SUBDIR += php56-recode + SUBDIR += php70-iconv + SUBDIR += php70-mbstring + SUBDIR += php70-recode SUBDIR += psiconv SUBDIR += py-bencode SUBDIR += py-bsdconv Modified: head/converters/php70-iconv/Makefile ============================================================================== --- head/converters/php56-iconv/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/converters/php70-iconv/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -iconv Modified: head/converters/php70-mbstring/Makefile ============================================================================== --- head/converters/php56-mbstring/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/converters/php70-mbstring/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -1,10 +1,9 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -mbstring Modified: head/converters/php70-recode/Makefile ============================================================================== --- head/converters/php56-recode/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/converters/php70-recode/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= converters -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -recode Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/databases/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -615,6 +615,19 @@ SUBDIR += php56-redis SUBDIR += php56-sqlite3 SUBDIR += php56-sybase_ct + SUBDIR += php70-dba + SUBDIR += php70-interbase + SUBDIR += php70-mysqli + SUBDIR += php70-odbc + SUBDIR += php70-pdo + SUBDIR += php70-pdo_dblib + SUBDIR += php70-pdo_firebird + SUBDIR += php70-pdo_mysql + SUBDIR += php70-pdo_odbc + SUBDIR += php70-pdo_pgsql + SUBDIR += php70-pdo_sqlite + SUBDIR += php70-pgsql + SUBDIR += php70-sqlite3 SUBDIR += phpminiadmin SUBDIR += phpmyadmin SUBDIR += phppgadmin Modified: head/databases/php70-dba/Makefile ============================================================================== --- head/databases/php56-dba/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-dba/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -dba Modified: head/databases/php70-interbase/Makefile ============================================================================== --- head/databases/php56-interbase/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-interbase/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -interbase Modified: head/databases/php70-mysqli/Makefile ============================================================================== --- head/databases/php56-mysqli/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-mysqli/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -mysqli Modified: head/databases/php70-odbc/Makefile ============================================================================== --- head/databases/php56-odbc/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-odbc/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -odbc Modified: head/databases/php70-pdo/Makefile ============================================================================== --- head/databases/php56-pdo/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pdo/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pdo Modified: head/databases/php70-pdo_dblib/Makefile ============================================================================== --- head/databases/php56-pdo_dblib/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pdo_dblib/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pdo_dblib Modified: head/databases/php70-pdo_firebird/Makefile ============================================================================== --- head/databases/php56-pdo_firebird/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pdo_firebird/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pdo_firebird Modified: head/databases/php70-pdo_mysql/Makefile ============================================================================== --- head/databases/php56-pdo_mysql/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pdo_mysql/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pdo_mysql Modified: head/databases/php70-pdo_odbc/Makefile ============================================================================== --- head/databases/php56-pdo_odbc/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pdo_odbc/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pdo_odbc Modified: head/databases/php70-pdo_pgsql/Makefile ============================================================================== --- head/databases/php56-pdo_pgsql/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pdo_pgsql/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pdo_pgsql Modified: head/databases/php70-pdo_sqlite/Makefile ============================================================================== --- head/databases/php56-pdo_sqlite/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pdo_sqlite/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pdo_sqlite Modified: head/databases/php70-pgsql/Makefile ============================================================================== --- head/databases/php56-pgsql/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-pgsql/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pgsql Modified: head/databases/php70-sqlite3/Makefile ============================================================================== --- head/databases/php56-sqlite3/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/databases/php70-sqlite3/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= databases -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -sqlite3 Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/devel/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3767,6 +3767,16 @@ SUBDIR += php56-sysvsem SUBDIR += php56-sysvshm SUBDIR += php56-tokenizer + SUBDIR += php70-gettext + SUBDIR += php70-intl + SUBDIR += php70-json + SUBDIR += php70-pcntl + SUBDIR += php70-readline + SUBDIR += php70-shmop + SUBDIR += php70-sysvmsg + SUBDIR += php70-sysvsem + SUBDIR += php70-sysvshm + SUBDIR += php70-tokenizer SUBDIR += phpbt SUBDIR += phpsh SUBDIR += phpunit Modified: head/devel/php70-gettext/Makefile ============================================================================== --- head/devel/php56-gettext/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-gettext/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -gettext Added: head/devel/php70-intl/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/php70-intl/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -0,0 +1,10 @@ +# Created by: Alex Dupre +# $FreeBSD$ + +CATEGORIES= devel + +MASTERDIR= ${.CURDIR}/../../lang/php70 + +PKGNAMESUFFIX= -intl + +.include "${MASTERDIR}/Makefile" Modified: head/devel/php70-json/Makefile ============================================================================== --- head/devel/php56-json/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-json/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -json Modified: head/devel/php70-pcntl/Makefile ============================================================================== --- head/devel/php56-pcntl/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-pcntl/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -pcntl Modified: head/devel/php70-readline/Makefile ============================================================================== --- head/devel/php56-readline/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-readline/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -readline Modified: head/devel/php70-shmop/Makefile ============================================================================== --- head/devel/php56-shmop/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-shmop/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -shmop Modified: head/devel/php70-sysvmsg/Makefile ============================================================================== --- head/devel/php56-sysvmsg/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-sysvmsg/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -sysvmsg Modified: head/devel/php70-sysvsem/Makefile ============================================================================== --- head/devel/php56-sysvsem/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-sysvsem/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -sysvsem Modified: head/devel/php70-sysvshm/Makefile ============================================================================== --- head/devel/php56-sysvshm/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-sysvshm/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -sysvshm Modified: head/devel/php70-tokenizer/Makefile ============================================================================== --- head/devel/php56-tokenizer/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/devel/php70-tokenizer/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= devel -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -tokenizer Modified: head/ftp/Makefile ============================================================================== --- head/ftp/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/ftp/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -67,6 +67,8 @@ SUBDIR += php55-ftp SUBDIR += php56-curl SUBDIR += php56-ftp + SUBDIR += php70-curl + SUBDIR += php70-ftp SUBDIR += phpwebftp SUBDIR += plasma-applet-ftpmonitor SUBDIR += proftpd Modified: head/ftp/php70-curl/Makefile ============================================================================== --- head/ftp/php56-curl/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/ftp/php70-curl/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -curl Modified: head/ftp/php70-ftp/Makefile ============================================================================== --- head/ftp/php56-ftp/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/ftp/php70-ftp/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= ftp -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -ftp Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/graphics/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -770,6 +770,8 @@ SUBDIR += php55-gd SUBDIR += php56-exif SUBDIR += php56-gd + SUBDIR += php70-exif + SUBDIR += php70-gd SUBDIR += phplot SUBDIR += picpuz SUBDIR += piddle Modified: head/graphics/php70-exif/Makefile ============================================================================== --- head/graphics/php56-exif/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/graphics/php70-exif/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -exif Modified: head/graphics/php70-gd/Makefile ============================================================================== --- head/graphics/php56-gd/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/graphics/php70-gd/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -3,7 +3,7 @@ CATEGORIES= graphics -MASTERDIR= ${.CURDIR}/../../lang/php56 +MASTERDIR= ${.CURDIR}/../../lang/php70 PKGNAMESUFFIX= -gd Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/lang/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -249,6 +249,8 @@ SUBDIR += php55-extensions SUBDIR += php56 SUBDIR += php56-extensions + SUBDIR += php70 + SUBDIR += php70-extensions SUBDIR += php_doc SUBDIR += picoc SUBDIR += pike78 Modified: head/lang/php55-extensions/Makefile ============================================================================== --- head/lang/php55-extensions/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/lang/php55-extensions/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -14,7 +14,7 @@ COMMENT= "meta-port" to install PHP exte USE_PHP= yes PHP_DEFAULT= 5.5 -IGNORE_WITH_PHP=53 54 5 +IGNORE_WITH_PHP=56 70 USE_PHP_BUILD= yes NO_BUILD= yes Modified: head/lang/php55/Makefile ============================================================================== --- head/lang/php55/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/lang/php55/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -52,7 +52,7 @@ MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php53-5* php54-5* php56-5* php5-5* +CONFLICTS= php56-5* php70-* DESTDIRNAME= INSTALL_ROOT Modified: head/lang/php55/Makefile.ext ============================================================================== --- head/lang/php55/Makefile.ext Mon Feb 15 14:31:01 2016 (r408931) +++ head/lang/php55/Makefile.ext Mon Feb 15 14:34:26 2016 (r408932) @@ -4,7 +4,7 @@ USE_PHP= yes USE_PHPEXT= yes PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_DEFAULT= 5.5 -IGNORE_WITH_PHP=52 53 54 5 +IGNORE_WITH_PHP= 56 70 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} Modified: head/lang/php56-extensions/Makefile ============================================================================== --- head/lang/php56-extensions/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/lang/php56-extensions/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -14,7 +14,7 @@ COMMENT= "meta-port" to install PHP exte USE_PHP= yes PHP_DEFAULT= 5.6 -IGNORE_WITH_PHP=53 54 55 5 +IGNORE_WITH_PHP= 55 70 USE_PHP_BUILD= yes NO_BUILD= yes Modified: head/lang/php56/Makefile ============================================================================== --- head/lang/php56/Makefile Mon Feb 15 14:31:01 2016 (r408931) +++ head/lang/php56/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -52,7 +52,7 @@ MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php53-5* php54-5* php55-5* php5-5* +CONFLICTS= php55-5* php70-* DESTDIRNAME= INSTALL_ROOT Modified: head/lang/php56/Makefile.ext ============================================================================== --- head/lang/php56/Makefile.ext Mon Feb 15 14:31:01 2016 (r408931) +++ head/lang/php56/Makefile.ext Mon Feb 15 14:34:26 2016 (r408932) @@ -4,7 +4,7 @@ USE_PHP= yes USE_PHPEXT= yes PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_DEFAULT= 5.6 -IGNORE_WITH_PHP=52 53 54 55 5 +IGNORE_WITH_PHP= 55 70 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} Modified: head/lang/php70-extensions/Makefile ============================================================================== --- head/lang/php56-extensions/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70-extensions/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -1,29 +1,24 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTNAME= php56 +PORTNAME= php70 PORTVERSION= 1.0 CATEGORIES= lang -MASTER_SITES= # none PKGNAMESUFFIX= -extensions -DISTFILES= # none -EXTRACT_ONLY= # none -MAINTAINER= ale@FreeBSD.org +MAINTAINER= miwi@FreeBSD.org COMMENT= "meta-port" to install PHP extensions +USES= metaport USE_PHP= yes -PHP_DEFAULT= 5.6 -IGNORE_WITH_PHP=53 54 55 5 +PHP_DEFAULT= 7.0 +IGNORE_WITH_PHP= 55 56 USE_PHP_BUILD= yes -NO_BUILD= yes -NO_MTREE= yes - OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM EXIF FILEINFO FILTER FTP GD GETTEXT \ - GMP HASH ICONV IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \ - MSSQL MYSQL MYSQLI \ + GMP HASH ICONV INTL IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \ + 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 \ @@ -48,13 +43,12 @@ 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 MCRYPT_DESC= Encryption support -MSSQL_DESC= MS-SQL database support -MYSQL_DESC= MySQL database support MYSQLI_DESC= MySQLi database support ODBC_DESC= ODBC support OPCACHE_DESC= OPcache support @@ -96,6 +90,8 @@ XSL_DESC= XSL support (Implies DOM) ZIP_DESC= ZIP support ZLIB_DESC= ZLIB support +.include + OPTIONS_DEFAULT= CTYPE \ DOM \ FILTER \ @@ -115,15 +111,10 @@ OPTIONS_DEFAULT= CTYPE \ XMLREADER \ XMLWRITER -.include - .for opt in ${OPTIONS_DEFINE} . if ${PORT_OPTIONS:M${opt}} USE_PHP+= ${opt:tl} . endif .endfor -do-install: build - @${DO_NADA} - .include Modified: head/lang/php70/Makefile ============================================================================== --- head/lang/php56/Makefile Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70/Makefile Mon Feb 15 14:34:26 2016 (r408932) @@ -1,14 +1,14 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTNAME= php56 -PORTVERSION= 5.6.18 +PORTNAME= php70 +PORTVERSION= 7.0.3 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions DISTNAME= php-${PORTVERSION} -MAINTAINER= ale@FreeBSD.org +MAINTAINER= miwi@FreeBSD.org COMMENT= PHP Scripting Language LICENSE= PHP301 @@ -18,6 +18,9 @@ CPE_PRODUCT= php NO_OPTIONS_SORT=yes .if !defined(PKGNAMESUFFIX) USE_AUTOTOOLS= autoconf +#NOTE: libtools ends with Version mismatch error +#USES+= autoreconf gmake +#GNU_CONFIGURE= yes LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre @@ -29,12 +32,11 @@ CONFIGURE_ARGS+=--with-layout=GNU \ --enable-mysqlnd \ --with-libxml-dir=${LOCALBASE} \ --with-pcre-regex=${LOCALBASE} \ - --with-zlib-dir=/usr \ --program-prefix="" USE_GNOME= libxml2 -OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 MAILHEAD LINKTHR ZTS +OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS OPTIONS_DEFAULT=CLI CGI FPM IPV6 LINKTHR # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM @@ -46,13 +48,13 @@ CGI_DESC= Build CGI version FPM_DESC= Build FPM version EMBED_DESC= Build embedded library DEBUG_DESC= Enable debug +PHPDBG_DESC= Interactive PHP debugger DTRACE_DESC= Enable DTrace support IPV6_DESC= Enable ipv6 support -MAILHEAD_DESC= Enable mail header patch LINKTHR_DESC= Link thread lib (for threaded extensions) ZTS_DESC= Force Zend Thread Safety (ZTS) build -CONFLICTS= php53-5* php54-5* php55-5* php5-5* +CONFLICTS= php55-5* php56-* DESTDIRNAME= INSTALL_ROOT @@ -62,11 +64,6 @@ PATCH_DIST_STRIP= -p1 PATCH_SITES+= LOCAL/ale -.if ${PORT_OPTIONS:MMAILHEAD} -PATCHFILES+= php-5.5.x-mail-header.patch:mail -PATCH_SITES+= http://choon.net/opensource/php/:mail -.endif - .if ${PORT_OPTIONS:MCLI} PHP_SAPI+= cli .else @@ -89,8 +86,8 @@ CONFIGURE_ARGS+=--enable-fpm \ .if defined(PKGNAMEPREFIX) USE_PHP= yes -PHP_DEFAULT= 5.6 -IGNORE_WITH_PHP=53 54 5 +PHP_DEFAULT= 7.0 +IGNORE_WITH_PHP= 55 56 USE_APACHE= 22+ .include "${PORTSDIR}/Mk/bsd.apache.mk" .if ${PORT_OPTIONS:MAP2FILTER} @@ -100,8 +97,8 @@ CONFIGURE_ARGS+=--with-apxs2=${APXS} .endif PLIST= ${PKGDIR}/pkg-plist.mod PKGMESSAGE= ${PKGDIR}/pkg-message.mod -MODULENAME= libphp5 -SHORTMODNAME= php5 +MODULENAME= libphp7 +SHORTMODNAME= php7 WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!" .endif @@ -138,10 +135,7 @@ CONFIGURE_ARGS+=--with-zend-vm=SWITCH CONFIGURE_ARGS+=--with-zend-vm=GOTO .endif -CONFIGURE_ENV+= ac_cv_pthreads_lib="" \ - ac_cv_pthreads_cflags="" \ - ac_cv_decimal_fp_supported="no" \ - pthreads_working="yes" \ +CONFIGURE_ENV+= ac_cv_decimal_fp_supported="no" \ lt_cv_path_SED="sed" .if ${PORT_OPTIONS:MLINKTHR} @@ -154,6 +148,7 @@ CONFIGURE_ARGS+=--enable-debug .if ${PORT_OPTIONS:MZTS} CONFIGURE_ARGS+=--enable-maintainer-zts +USES= localhost .endif .if ${PORT_OPTIONS:MDTRACE} @@ -175,16 +170,16 @@ post-patch: ${WRKSRC}/sapi/fpm/php-fpm.conf.in .endif -# Work around issues with newer (>=2.64) autoconf pre-configure: @${REINPLACE_CMD} -E 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \ ${WRKSRC}/configure.in `${FIND} ${WRKSRC} -name '*.m4'` @${RM} ${WRKSRC}/configure @${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4 + .if !defined(PKGNAMEPREFIX) post-build: - @${ECHO_CMD} "PHP_VER=56" > ${WRKDIR}/php.conf + @${ECHO_CMD} "PHP_VER=70" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_EXT_INC=pcre spl" >> ${WRKDIR}/php.conf Modified: head/lang/php70/Makefile.ext ============================================================================== --- head/lang/php56/Makefile.ext Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70/Makefile.ext Mon Feb 15 14:34:26 2016 (r408932) @@ -3,8 +3,8 @@ COMMENT= The ${PHP_MODNAME} shared exten USE_PHP= yes USE_PHPEXT= yes PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} -PHP_DEFAULT= 5.6 -IGNORE_WITH_PHP=52 53 54 55 5 +PHP_DEFAULT= 7.0 +IGNORE_WITH_PHP= 55 56 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} @@ -146,7 +146,12 @@ USE_OPENSSL= yes .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} -USES+= firebird +USES+= firebird +.endif + +.if ${PHP_MODNAME} == "intl" +CONFIGURE_ARGS+=--with-intl=${LOCALBASE} +LIB_DEPENDS= libicui18n.so:${PORTSDIR}/devel/icu .endif .if ${PHP_MODNAME} == "json" @@ -183,19 +188,6 @@ LIB_DEPENDS+= libltdl.so:${PORTSDIR}/dev CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} .endif -.if ${PHP_MODNAME} == "mssql" -LIB_DEPENDS+= libsybdb.so:${PORTSDIR}/databases/freetds - -CONFIGURE_ARGS+=--with-mssql=${LOCALBASE} -.endif - -.if ${PHP_MODNAME} == "mysql" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT=MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver -.endif - .if ${PHP_MODNAME} == "mysqli" OPTIONS_DEFINE= MYSQLND OPTIONS_DEFAULT=MYSQLND @@ -219,6 +211,7 @@ USE_OPENSSL= yes .if ${PHP_MODNAME} == "opcache" CONFIGURE_ARGS+=--enable-opcache +USES+= localbase .endif .if ${PHP_MODNAME} == "pcntl" @@ -243,20 +236,20 @@ MSSQL_DESC= Enable Microsoft SQL Server .if ${PHP_MODNAME} == "pdo_firebird" CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE} +USES+= firebird USE_PHP= pdo USE_PHP_BUILD= yes -USES+= firebird .endif .if ${PHP_MODNAME} == "pdo_mysql" -OPTIONS_DEFINE= MYSQLND -OPTIONS_DEFAULT=MYSQLND - -MYSQLND_DESC= Use MySQL Native Driver - -USE_PHP= pdo +CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd +USE_PHP=pdo USE_PHP_BUILD= yes +.else +CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE} \ + --with-zlib-dir=/usr +USE_MYSQL= yes .endif .if ${PHP_MODNAME} == "pdo_odbc" @@ -543,17 +536,6 @@ CONFIGURE_ARGS+=--disable-mbregex . endif .endif -.if ${PHP_MODNAME} == "mysql" -. if ${PORT_OPTIONS:MMYSQLND} -CONFIGURE_ARGS+=--with-mysql=mysqlnd -. else -CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} \ - --with-zlib-dir=/usr - -USE_MYSQL= yes -. endif -.endif - .if ${PHP_MODNAME} == "mysqli" . if ${PORT_OPTIONS:MMYSQLND} CONFIGURE_ARGS+=--with-mysqli=mysqlnd Modified: head/lang/php70/distinfo ============================================================================== --- head/lang/php56/distinfo Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70/distinfo Mon Feb 15 14:34:26 2016 (r408932) @@ -1,4 +1,2 @@ -SHA256 (php-5.6.18.tar.bz2) = c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed -SIZE (php-5.6.18.tar.bz2) = 14094993 -SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 -SIZE (php-5.5.x-mail-header.patch) = 3379 +SHA256 (php-7.0.3.tar.bz2) = 826823d754f09c779222a99becf9c53a4dc719dba2d777aca7807c6ca68e6fc6 +SIZE (php-7.0.3.tar.bz2) = 14011153 Modified: head/lang/php70/files/patch-main__php_config.h.in ============================================================================== --- head/lang/php56/files/patch-main__php_config.h.in Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70/files/patch-main__php_config.h.in Mon Feb 15 14:34:26 2016 (r408932) @@ -1,6 +1,6 @@ ---- main/php_config.h.in.orig 2013-12-10 23:50:50.000000000 +0000 -+++ main/php_config.h.in 2013-12-13 21:50:25.396258363 +0000 -@@ -2342,6 +2342,9 @@ +--- main/php_config.h.in.orig 2015-12-01 16:36:43.000000000 +0300 ++++ main/php_config.h.in 2015-12-09 21:45:32.033676604 +0300 +@@ -2405,6 +2405,9 @@ /* Define if processor uses big-endian word */ #undef WORDS_BIGENDIAN Modified: head/lang/php70/files/patch-sapi_apache2handler_config.m4 ============================================================================== --- head/lang/php56/files/patch-sapi_apache2handler_config.m4 Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70/files/patch-sapi_apache2handler_config.m4 Mon Feb 15 14:34:26 2016 (r408932) @@ -8,4 +8,4 @@ + if true; then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -i -n php5" + -i -n php7" Modified: head/lang/php70/files/patch-sapi_fpm_config.m4 ============================================================================== --- head/lang/php56/files/patch-sapi_fpm_config.m4 Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70/files/patch-sapi_fpm_config.m4 Mon Feb 15 14:34:26 2016 (r408932) @@ -1,6 +1,6 @@ ---- sapi/fpm/config.m4.orig 2013-12-10 23:31:06.000000000 +0000 -+++ sapi/fpm/config.m4 2013-12-13 21:50:25.662258580 +0000 -@@ -317,7 +317,7 @@ AC_DEFUN([AC_FPM_LQ], +--- sapi/fpm/config.m4.orig 2015-12-01 16:36:27.000000000 +0300 ++++ sapi/fpm/config.m4 2015-12-09 21:34:18.665722795 +0300 +@@ -317,14 +317,14 @@ AC_MSG_CHECKING([for TCP_INFO]) @@ -9,12 +9,11 @@ have_lq=tcp_info AC_MSG_RESULT([yes]) ], [ -@@ -338,7 +338,7 @@ AC_DEFUN([AC_FPM_LQ], - AC_MSG_RESULT([no]) - ]) + AC_MSG_RESULT([no]) + ]) -- if test "$have_lq" = "tcp_info"; then -+ if test "$have_lq" = "so_listenq"; then - AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?]) - fi +- if test "$have_lq" = "tcp_info"; then ++ if test "$have_lq" = "so_listenq"; then + AC_DEFINE([HAVE_LQ_TCP_INFO], 1, [do we have TCP_INFO?]) fi + Modified: head/lang/php70/pkg-plist ============================================================================== --- head/lang/php56/pkg-plist Mon Feb 15 11:31:53 2016 (r408923) +++ head/lang/php70/pkg-plist Mon Feb 15 14:34:26 2016 (r408932) @@ -10,6 +10,9 @@ etc/php.ini-production %%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi %%FPM%%etc/php-fpm.conf.default %%FPM%%@exec cp -n %D/%F %B/php-fpm.conf +%%FPM%%@unexec if cmp -s %D/etc/php-fpm.d/www.conf %D/etc/php-fpm.d/www.conf.default; then rm -f %D/etc/php-fpm.d/www.conf; fi +%%FPM%%etc/php-fpm.d/www.conf.default +%%FPM%%@exec cp -n %D/%F %B/www.conf include/php/TSRM/TSRM.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h @@ -21,7 +24,10 @@ include/php/TSRM/tsrm_win32.h include/php/Zend/zend.h include/php/Zend/zend_API.h include/php/Zend/zend_alloc.h +include/php/Zend/zend_alloc_sizes.h +include/php/Zend/zend_arena.h include/php/Zend/zend_ast.h +include/php/Zend/zend_bitset.h include/php/Zend/zend_build.h include/php/Zend/zend_builtin_functions.h include/php/Zend/zend_closures.h @@ -32,7 +38,6 @@ include/php/Zend/zend_config.w32.h include/php/Zend/zend_constants.h include/php/Zend/zend_dtrace.h %%DTRACE%%include/php/Zend/zend_dtrace_gen.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***