<!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>[114097] trunk/dports</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/114097">114097</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2013-11-28 22:01:05 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>php-gd: fix build with freetype 2.5.1 (#41585); never look for dependencies in /usr or /usr/local or /usr/X11R6</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangphpPortfile">trunk/dports/lang/php/Portfile</a></li>
<li><a href="#trunkdportsphpphp5gdPortfile">trunk/dports/php/php5-gd/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangphpfilespatchphp53extgdconfigm4diff">trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff</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>
<li>trunk/dports/php/php5-gd/files/</li>
<li><a href="#trunkdportsphpphp5gdfilespatchextgdconfigm4diff">trunk/dports/php/php5-gd/files/patch-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 (114096 => 114097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile 2013-11-29 02:11:12 UTC (rev 114096)
+++ trunk/dports/lang/php/Portfile 2013-11-29 06:01:05 UTC (rev 114097)
</span><span class="lines">@@ -527,6 +527,8 @@
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+ patchfiles-append patch-${php}-ext-gd-config.m4.diff
+
</ins><span class="cx"> configure.args-append --with-freetype-dir=${prefix} \
</span><span class="cx"> --with-jpeg-dir=${prefix} \
</span><span class="cx"> --with-png-dir=${prefix} \
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp53extgdconfigm4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff (0 => 114097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+--- ext/gd/config.m4.orig 2013-07-10 12:43:08.000000000 -0500
++++ ext/gd/config.m4 2013-11-28 23:40:14.000000000 -0600
+@@ -71,7 +71,7 @@
+ AC_DEFUN([PHP_GD_JPEG],[
+ if test "$PHP_JPEG_DIR" != "no"; then
+
+- for i in $PHP_JPEG_DIR /usr/local /usr; do
++ for i in $PHP_JPEG_DIR; do
+ test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
+ done
+
+@@ -96,7 +96,7 @@
+ AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+- for i in $PHP_PNG_DIR /usr/local /usr; do
++ for i in $PHP_PNG_DIR; do
+ test -f $i/include/png.h && GD_PNG_DIR=$i && break
+ done
+
+@@ -127,7 +127,7 @@
+ AC_DEFUN([PHP_GD_XPM],[
+ if test "$PHP_XPM_DIR" != "no"; then
+
+- for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
++ for i in $PHP_XPM_DIR; do
+ test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+ done
+
+@@ -161,12 +161,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -194,7 +192,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp54extgdconfigm4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff (0 => 114097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+--- 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
+@@ -76,7 +76,7 @@
+ AC_DEFUN([PHP_GD_VPX],[
+ if test "$PHP_VPX_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
+ done
+
+@@ -102,7 +102,7 @@
+ AC_DEFUN([PHP_GD_JPEG],[
+ if test "$PHP_JPEG_DIR" != "no"; then
+
+- for i in $PHP_JPEG_DIR /usr/local /usr; do
++ for i in $PHP_JPEG_DIR; do
+ test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
+ done
+
+@@ -127,7 +127,7 @@
+ AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+- for i in $PHP_PNG_DIR /usr/local /usr; do
++ for i in $PHP_PNG_DIR; do
+ test -f $i/include/png.h && GD_PNG_DIR=$i && break
+ done
+
+@@ -158,7 +158,7 @@
+ AC_DEFUN([PHP_GD_XPM],[
+ if test "$PHP_XPM_DIR" != "no"; then
+
+- for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
++ for i in $PHP_XPM_DIR; do
+ test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+ done
+
+@@ -192,12 +192,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -225,7 +223,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp55extgdconfigm4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff (0 => 114097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+--- 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
+@@ -75,7 +75,7 @@
+ AC_DEFUN([PHP_GD_VPX],[
+ if test "$PHP_VPX_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
+ done
+
+@@ -101,7 +101,7 @@
+ AC_DEFUN([PHP_GD_JPEG],[
+ if test "$PHP_JPEG_DIR" != "no"; then
+
+- for i in $PHP_JPEG_DIR /usr/local /usr; do
++ for i in $PHP_JPEG_DIR; do
+ test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
+ done
+
+@@ -126,7 +126,7 @@
+ AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+- for i in $PHP_PNG_DIR /usr/local /usr; do
++ for i in $PHP_PNG_DIR; do
+ test -f $i/include/png.h && GD_PNG_DIR=$i && break
+ done
+
+@@ -157,7 +157,7 @@
+ AC_DEFUN([PHP_GD_XPM],[
+ if test "$PHP_XPM_DIR" != "no"; then
+
+- for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
++ for i in $PHP_XPM_DIR; do
+ 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
+@@ -184,12 +184,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -217,7 +215,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
</ins></span></pre></div>
<a id="trunkdportsphpphp5gdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/php/php5-gd/Portfile (114096 => 114097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/php/php5-gd/Portfile 2013-11-29 02:11:12 UTC (rev 114096)
+++ trunk/dports/php/php5-gd/Portfile 2013-11-29 06:01:05 UTC (rev 114097)
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+patchfiles patch-ext-gd-config.m4.diff
+
</ins><span class="cx"> configure.args-append --with-freetype-dir=${prefix} \
</span><span class="cx"> --with-jpeg-dir=${prefix} \
</span><span class="cx"> --with-png-dir=${prefix} \
</span></span></pre></div>
<a id="trunkdportsphpphp5gdfilespatchextgdconfigm4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/php/php5-gd/files/patch-ext-gd-config.m4.diff (0 => 114097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/php/php5-gd/files/patch-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/php/php5-gd/files/patch-ext-gd-config.m4.diff 2013-11-29 06:01:05 UTC (rev 114097)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+--- ext/gd/config.m4.orig 2013-07-10 12:43:08.000000000 -0500
++++ ext/gd/config.m4 2013-11-28 23:40:14.000000000 -0600
+@@ -71,7 +71,7 @@
+ AC_DEFUN([PHP_GD_JPEG],[
+ if test "$PHP_JPEG_DIR" != "no"; then
+
+- for i in $PHP_JPEG_DIR /usr/local /usr; do
++ for i in $PHP_JPEG_DIR; do
+ test -f $i/include/jpeglib.h && GD_JPEG_DIR=$i && break
+ done
+
+@@ -96,7 +96,7 @@
+ AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+- for i in $PHP_PNG_DIR /usr/local /usr; do
++ for i in $PHP_PNG_DIR; do
+ test -f $i/include/png.h && GD_PNG_DIR=$i && break
+ done
+
+@@ -127,7 +127,7 @@
+ AC_DEFUN([PHP_GD_XPM],[
+ if test "$PHP_XPM_DIR" != "no"; then
+
+- for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
++ for i in $PHP_XPM_DIR; do
+ test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
+ done
+
+@@ -161,12 +161,10 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+- if test -f "$i/include/freetype2/freetype/freetype.h"; then
++ for i in $PHP_FREETYPE_DIR; do
+ FREETYPE2_DIR=$i
+ FREETYPE2_INC_DIR=$i/include/freetype2
+ break
+- fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+@@ -194,7 +192,7 @@
+ AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+- for i in $PHP_T1LIB /usr/local /usr; do
++ for i in $PHP_T1LIB; do
+ test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break
+ done
+
</ins></span></pre>
</div>
</div>
</body>
</html>