<!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>[115772] 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/115772">115772</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-01-10 14:53:20 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>php54: update to 5.4.24
php55: update to 5.5.8</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangphpPortfile">trunk/dports/lang/php/Portfile</a></li>
<li><a href="#trunkdportslangphpfilespatchphp54extgdconfigm4diff">trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp55extgdconfigm4diff">trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.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 (115771 => 115772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile 2014-01-10 22:50:51 UTC (rev 115771)
+++ trunk/dports/lang/php/Portfile 2014-01-10 22:53:20 UTC (rev 115772)
</span><span class="lines">@@ -75,23 +75,23 @@
</span><span class="cx"> }
</span><span class="cx"> 5.4 {
</span><span class="cx"> epoch 1
</span><del>- version 5.4.23
</del><ins>+ version 5.4.24
</ins><span class="cx"> use_bzip2 yes
</span><span class="cx"> set suhosin_available no
</span><span class="cx"> checksums ${distname}${extract.suffix} \
</span><del>- md5 023857598b92ea5c78137543817f4bc5 \
- rmd160 3a5e3b7a6013f5a284c80d41a95989ba2a78b6d4 \
- sha256 ae7c070fa9b9e16413ef944d910b68f3ba79192eca4010b0af132b8631bd91cc
</del><ins>+ md5 acef880cc808b85e216897ee88187ee1 \
+ rmd160 8248a1314986b071de990f725fc802729ca97e3c \
+ sha256 97fe70eddaf5b93969714a551870fe03f6b0a387f85b83a6d63a40a76199a327
</ins><span class="cx"> }
</span><span class="cx"> 5.5 {
</span><span class="cx"> epoch 2
</span><del>- version 5.5.7
- use_xz yes
</del><ins>+ version 5.5.8
+ use_bzip2 yes
</ins><span class="cx"> set suhosin_available no
</span><span class="cx"> checksums ${distname}${extract.suffix} \
</span><del>- md5 0c02437f661105221e99a301a5275a41 \
- rmd160 02394608b517056b2e1c1bf3474a139a80b3f4dd \
- sha256 b7bae5d878b8fc3f4b481eb8f2179b5e71d30dfb3bc3640a5068c1b46633f08c
</del><ins>+ md5 42fe814a3cbbf34b21a2c39f66ee0001 \
+ rmd160 7779602dfa1683a7938ed41d1713916bcb7ce296 \
+ sha256 6d5f45659d13383fc8429f185cc9da0b30c7bb72dcae9baf568f0511eb7f8b68
</ins><span class="cx"> }
</span><span class="cx"> 5.6 {
</span><span class="cx"> # When this becomes a stable version, remove the overrides for homepage,
</span><span class="lines">@@ -516,7 +516,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${php}-gd {
</span><del>- revision 1
</del><ins>+ if {[vercmp ${php.branch} 5.4] < 0} {
+ revision 1
+ }
</ins><span class="cx">
</span><span class="cx"> categories-append graphics
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp54extgdconfigm4diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff (115771 => 115772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff 2014-01-10 22:50:51 UTC (rev 115771)
+++ trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff 2014-01-10 22:53:20 UTC (rev 115772)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/gd/config.m4.orig 2013-11-13 00:46:59.000000000 -0600
-+++ ext/gd/config.m4 2013-11-28 23:55:35.000000000 -0600
</del><ins>+--- ext/gd/config.m4.orig 2014-01-07 20:57:08.000000000 -0600
++++ ext/gd/config.m4 2014-01-10 15:46:18.000000000 -0600
</ins><span class="cx"> @@ -76,7 +76,7 @@
</span><span class="cx"> AC_DEFUN([PHP_GD_VPX],[
</span><span class="cx"> if test "$PHP_VPX_DIR" != "no"; then
</span><span class="lines">@@ -36,21 +36,16 @@
</span><span class="cx"> test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
</span><span class="cx"> done
</span><span class="cx">
</span><del>-@@ -192,12 +192,10 @@
</del><ins>+@@ -192,7 +192,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 class="cx"> - for i in $PHP_FREETYPE_DIR /usr/local /usr; do
</span><del>-- if test -f "$i/include/freetype2/freetype/freetype.h"; then
</del><span class="cx"> + for i in $PHP_FREETYPE_DIR; do
</span><ins>+ if test -f "$i/bin/freetype-config"; then
</ins><span class="cx"> FREETYPE2_DIR=$i
</span><del>- FREETYPE2_INC_DIR=$i/include/freetype2
- break
-- fi
- done
-
- if test -z "$FREETYPE2_DIR"; then
-@@ -225,7 +223,7 @@
</del><ins>+ FREETYPE2_CONFIG="$i/bin/freetype-config"
+@@ -220,7 +220,7 @@
</ins><span class="cx"> AC_DEFUN([PHP_GD_T1LIB],[
</span><span class="cx"> if test "$PHP_T1LIB" != "no"; then
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp55extgdconfigm4diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff (115771 => 115772)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff 2014-01-10 22:50:51 UTC (rev 115771)
+++ trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff 2014-01-10 22:53:20 UTC (rev 115772)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/gd/config.m4.orig 2013-11-12 08:17:27.000000000 -0600
-+++ ext/gd/config.m4 2013-11-28 23:53:42.000000000 -0600
</del><ins>+--- ext/gd/config.m4.orig 2014-01-08 04:15:20.000000000 -0600
++++ ext/gd/config.m4 2014-01-10 15:48:08.000000000 -0600
</ins><span class="cx"> @@ -75,7 +75,7 @@
</span><span class="cx"> AC_DEFUN([PHP_GD_VPX],[
</span><span class="cx"> if test "$PHP_VPX_DIR" != "no"; then
</span><span class="lines">@@ -36,21 +36,16 @@
</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>-@@ -184,12 +184,10 @@
</del><ins>+@@ -184,7 +184,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 class="cx"> - for i in $PHP_FREETYPE_DIR /usr/local /usr; do
</span><del>-- if test -f "$i/include/freetype2/freetype/freetype.h"; then
</del><span class="cx"> + for i in $PHP_FREETYPE_DIR; do
</span><ins>+ if test -f "$i/bin/freetype-config"; then
</ins><span class="cx"> FREETYPE2_DIR=$i
</span><del>- FREETYPE2_INC_DIR=$i/include/freetype2
- break
-- fi
- done
-
- if test -z "$FREETYPE2_DIR"; then
-@@ -217,7 +215,7 @@
</del><ins>+ FREETYPE2_CONFIG="$i/bin/freetype-config"
+@@ -212,7 +212,7 @@
</ins><span class="cx"> AC_DEFUN([PHP_GD_T1LIB],[
</span><span class="cx"> if test "$PHP_T1LIB" != "no"; then
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>