<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138994] trunk/dports/lang/php</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138994">138994</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-07-26 12:16:26 -0700 (Sun, 26 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>php: update php70 to 7.0.0beta2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangphpPortfile">trunk/dports/lang/php/Portfile</a></li>
<li><a href="#trunkdportslangphpfilespatchphp70extgdconfigm4diff">trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangphpfilespatchphp70Zendzend_operatorscdiff">trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangphpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/Portfile (138993 => 138994)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -113,13 +113,13 @@
</span><span class="cx"> # When this becomes a stable version, remove the overrides for homepage,
</span><span class="cx"> # master_sites and livecheck, and update php.latest_stable_branch in the
</span><span class="cx"> # php-1.1 portgroup.
</span><del>- version 7.0.0beta1
</del><ins>+ version 7.0.0beta2
</ins><span class="cx"> homepage http://qa.php.net/
</span><span class="cx"> master_sites http://downloads.php.net/~ab/
</span><span class="cx"> use_xz yes
</span><del>- checksums md5 e18aaad357f7bb8e416c300d64625fb8 \
- rmd160 885a53949325b5af0508c5397995f599a4b491fa \
- sha256 1d4a768af5c11122fdc6d3417ef08a98302c3abb943ee704282ce1d92537195e
</del><ins>+ checksums md5 e1f311a953413508fd16651e32236fce \
+ rmd160 0f99b5a951acaed6e9688a88a945e4493424f4eb \
+ sha256 d17e0b9598592f90c717129cb5b4522223497f86b735bb0b00e53931e03b8ee9
</ins><span class="cx"> livecheck.url ${homepage}
</span><span class="cx"> livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
</span><span class="cx"> }
</span><span class="lines">@@ -168,11 +168,6 @@
</span><span class="cx"> patch-${php}-pcre-8.30.diff
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {[vercmp ${branch} 7.0] == 0} {
- patchfiles-append \
- patch-${php}-Zend-zend_operators.c.diff
- }
-
</del><span class="cx"> # https://trac.macports.org/ticket/31590
</span><span class="cx"> # Tested all subports (except oracle) and they built with clang-425. The reported failure was with Xcode 4.2.
</span><span class="cx"> # Xcode 4.3 may work, but leaving it blacklisted due to lack of testing
</span><span class="lines">@@ -627,6 +622,11 @@
</span><span class="cx"> --with-png-dir=${prefix} \
</span><span class="cx"> --with-zlib-dir=${prefix} \
</span><span class="cx"> --enable-gd-native-ttf
</span><ins>+
+ if {[vercmp ${branch} 7.0] >= 0} {
+ depends_lib-append port:webp
+ configure.args-append --with-webp-dir=${prefix}
+ }
</ins><span class="cx">
</span><span class="cx"> if {[vercmp ${branch} 7] < 0} {
</span><span class="cx"> variant t1lib description {Add PostScript Type 1 font support with t1lib} {
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70Zendzend_operatorscdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/patch-php70-Zend-zend_operators.c.diff (138993 => 138994)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-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=e5a996f26855fe89459ae7dcc31034e44e70b91d
---- 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);
- }
- /* }}} */
-
</del></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70extgdconfigm4diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff (138993 => 138994)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,15 +1,24 @@
</span><del>---- 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
</del><ins>+--- 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
</ins><span class="cx"> @@ -72,7 +72,7 @@
</span><del>- AC_DEFUN([PHP_GD_VPX],[
- if test "$PHP_VPX_DIR" != "no"; then
</del><ins>+ AC_DEFUN([PHP_GD_WEBP],[
+ if test "$PHP_WEBP_DIR" != "no"; then
</ins><span class="cx">
</span><del>-- 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
</del><ins>+- 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
</ins><span class="cx"> done
</span><span class="cx">
</span><del>-@@ -98,7 +98,7 @@
</del><ins>+@@ -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 @@
</ins><span class="cx"> AC_DEFUN([PHP_GD_JPEG],[
</span><span class="cx"> if test "$PHP_JPEG_DIR" != "no"; then
</span><span class="cx">
</span><span class="lines">@@ -18,7 +27,7 @@
</span><span class="cx"> test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
</span><span class="cx"> done
</span><span class="cx">
</span><del>-@@ -123,7 +123,7 @@
</del><ins>+@@ -131,7 +131,7 @@
</ins><span class="cx"> AC_DEFUN([PHP_GD_PNG],[
</span><span class="cx"> if test "$PHP_PNG_DIR" != "no"; then
</span><span class="cx">
</span><span class="lines">@@ -27,7 +36,7 @@
</span><span class="cx"> test -f $i/include/png.h && GD_PNG_DIR=$i && break
</span><span class="cx"> done
</span><span class="cx">
</span><del>-@@ -154,7 +154,7 @@
</del><ins>+@@ -162,7 +162,7 @@
</ins><span class="cx"> AC_DEFUN([PHP_GD_XPM],[
</span><span class="cx"> if test "$PHP_XPM_DIR" != "no"; then
</span><span class="cx">
</span><span class="lines">@@ -36,7 +45,7 @@
</span><span class="cx"> test -f $i/include/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break
</span><span class="cx"> test -f $i/include/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 && break
</span><span class="cx"> done
</span><del>-@@ -181,7 +181,7 @@
</del><ins>+@@ -189,7 +189,7 @@
</ins><span class="cx"> AC_DEFUN([PHP_GD_FREETYPE2],[
</span><span class="cx"> if test "$PHP_FREETYPE_DIR" != "no"; then
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>