Revision: 138994 https://trac.macports.org/changeset/138994 Author: ryandesign@macports.org Date: 2015-07-26 12:16:26 -0700 (Sun, 26 Jul 2015) Log Message: ----------- php: update php70 to 7.0.0beta2 Modified Paths: -------------- trunk/dports/lang/php/Portfile trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff Removed Paths: ------------- trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff Modified: trunk/dports/lang/php/Portfile =================================================================== --- trunk/dports/lang/php/Portfile 2015-07-26 18:20:48 UTC (rev 138993) +++ trunk/dports/lang/php/Portfile 2015-07-26 19:16:26 UTC (rev 138994) @@ -113,13 +113,13 @@ # When this becomes a stable version, remove the overrides for homepage, # master_sites and livecheck, and update php.latest_stable_branch in the # php-1.1 portgroup. - version 7.0.0beta1 + version 7.0.0beta2 homepage http://qa.php.net/ master_sites http://downloads.php.net/~ab/ use_xz yes - checksums md5 e18aaad357f7bb8e416c300d64625fb8 \ - rmd160 885a53949325b5af0508c5397995f599a4b491fa \ - sha256 1d4a768af5c11122fdc6d3417ef08a98302c3abb943ee704282ce1d92537195e + checksums md5 e1f311a953413508fd16651e32236fce \ + rmd160 0f99b5a951acaed6e9688a88a945e4493424f4eb \ + sha256 d17e0b9598592f90c717129cb5b4522223497f86b735bb0b00e53931e03b8ee9 livecheck.url ${homepage} livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar } @@ -168,11 +168,6 @@ patch-${php}-pcre-8.30.diff } - if {[vercmp ${branch} 7.0] == 0} { - patchfiles-append \ - patch-${php}-Zend-zend_operators.c.diff - } - # https://trac.macports.org/ticket/31590 # Tested all subports (except oracle) and they built with clang-425. The reported failure was with Xcode 4.2. # Xcode 4.3 may work, but leaving it blacklisted due to lack of testing @@ -627,6 +622,11 @@ --with-png-dir=${prefix} \ --with-zlib-dir=${prefix} \ --enable-gd-native-ttf + + if {[vercmp ${branch} 7.0] >= 0} { + depends_lib-append port:webp + configure.args-append --with-webp-dir=${prefix} + } if {[vercmp ${branch} 7] < 0} { variant t1lib description {Add PostScript Type 1 font support with t1lib} { Deleted: trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff =================================================================== --- trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff 2015-07-26 18:20:48 UTC (rev 138993) +++ trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff 2015-07-26 19:16:26 UTC (rev 138994) @@ -1,31 +0,0 @@ -Fix build on 32-bit systems -https://bugs.php.net/bug.php?id=70057 -http://git.php.net/?p=php-src.git;a=commit;h=e5a996f26855fe89459ae7dcc31034e... ---- a/Zend/zend_operators.c.orig -+++ b/Zend/zend_operators.c -@@ -1760,7 +1760,7 @@ static inline void zend_free_obj_get_result(zval *op) /* {{{ */ - } - /* }}} */ - --static zend_always_inline int i_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ -+ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ - { - int ret; - int converted = 0; -@@ -1942,15 +1942,9 @@ static zend_always_inline int i_compare_function(zval *result, zval *op1, zval * - } - /* }}} */ - --ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ --{ -- return i_compare_function(result, op1, op2); --} --/* }}} */ -- - ZEND_API int zval_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ - { -- return i_compare_function(result, op1, op2); -+ return compare_function(result, op1, op2); - } - /* }}} */ - Modified: trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff =================================================================== --- trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff 2015-07-26 18:20:48 UTC (rev 138993) +++ trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff 2015-07-26 19:16:26 UTC (rev 138994) @@ -1,15 +1,24 @@ ---- ext/gd/config.m4.orig 2015-06-10 03:49:51.000000000 -0500 -+++ ext/gd/config.m4 2015-06-13 22:14:06.000000000 -0500 +--- ext/gd/config.m4.orig 2015-07-21 14:00:36.000000000 -0500 ++++ ext/gd/config.m4 2015-07-26 13:56:55.000000000 -0500 @@ -72,7 +72,7 @@ - AC_DEFUN([PHP_GD_VPX],[ - if test "$PHP_VPX_DIR" != "no"; then + AC_DEFUN([PHP_GD_WEBP],[ + if test "$PHP_WEBP_DIR" != "no"; then -- for i in $PHP_VPX_DIR /usr/local /usr; do -+ for i in $PHP_VPX_DIR; do - test -f $i/include/vpx_codec.h || test -f $i/include/vpx/vpx_codec.h && GD_VPX_DIR=$i && break +- for i in $PHP_WEBP_DIR /usr/local /usr; do ++ for i in $PHP_WEBP_DIR; do + test -f $i/include/webp/decode.h && GD_WEBP_DIR=$i && break done -@@ -98,7 +98,7 @@ +@@ -80,7 +80,7 @@ + AC_MSG_ERROR([webp/decode.h not found.]) + fi + +- for i in $PHP_WEBP_DIR /usr/local /usr; do ++ for i in $PHP_WEBP_DIR; do + test -f $i/include/webp/encode.h && GD_WEBP_DIR=$i && break + done + +@@ -106,7 +106,7 @@ AC_DEFUN([PHP_GD_JPEG],[ if test "$PHP_JPEG_DIR" != "no"; then @@ -18,7 +27,7 @@ test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break done -@@ -123,7 +123,7 @@ +@@ -131,7 +131,7 @@ AC_DEFUN([PHP_GD_PNG],[ if test "$PHP_PNG_DIR" != "no"; then @@ -27,7 +36,7 @@ test -f $i/include/png.h && GD_PNG_DIR=$i && break done -@@ -154,7 +154,7 @@ +@@ -162,7 +162,7 @@ AC_DEFUN([PHP_GD_XPM],[ if test "$PHP_XPM_DIR" != "no"; then @@ -36,7 +45,7 @@ test -f $i/include/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break test -f $i/include/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 && break done -@@ -181,7 +181,7 @@ +@@ -189,7 +189,7 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ if test "$PHP_FREETYPE_DIR" != "no"; then