<!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>[135171] 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/135171">135171</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-04-17 19:36:37 -0700 (Fri, 17 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>php: update php56 to 5.6.8; update php55 to 5.5.24; update php54 to 5.4.40 (#47488)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangphpPortfile">trunk/dports/lang/php/Portfile</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52iODBCdiff">trunk/dports/lang/php/files/patch-php52-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52unixODBCdiff">trunk/dports/lang/php/files/patch-php52-unixODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp53iODBCdiff">trunk/dports/lang/php/files/patch-php53-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp53unixODBCdiff">trunk/dports/lang/php/files/patch-php53-unixODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp54iODBCdiff">trunk/dports/lang/php/files/patch-php54-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp54unixODBCdiff">trunk/dports/lang/php/files/patch-php54-unixODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp55iODBCdiff">trunk/dports/lang/php/files/patch-php55-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp55unixODBCdiff">trunk/dports/lang/php/files/patch-php55-unixODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp56iODBCdiff">trunk/dports/lang/php/files/patch-php56-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp56unixODBCdiff">trunk/dports/lang/php/files/patch-php56-unixODBC.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 (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/Portfile 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -90,27 +90,27 @@
</span><span class="cx"> }
</span><span class="cx"> 5.4 {
</span><span class="cx"> epoch 1
</span><del>- version 5.4.39
</del><ins>+ version 5.4.40
</ins><span class="cx"> use_bzip2 yes
</span><del>- checksums md5 017f7ba7484e738c88bf19eec4369d78 \
- rmd160 4f0f33b18dc59851ebe48050f8d1759578718504 \
- sha256 7ceb76538e709c74533210ae41148d5c01c330ac8a73220954bbc4fcae69d77e
</del><ins>+ checksums md5 19dafb2b9fc31517cf5c3309fb8a9923 \
+ rmd160 2848d814e1038e88156a8d58ad661ed9d42cbbdc \
+ sha256 4898ffe8ac3ccb2d8cc94f7d76a9ea0414d954f5d4479895ddfccdc2e158a51a
</ins><span class="cx"> }
</span><span class="cx"> 5.5 {
</span><span class="cx"> epoch 2
</span><del>- version 5.5.23
</del><ins>+ version 5.5.24
</ins><span class="cx"> use_xz yes
</span><del>- checksums md5 692f9bc5649806f2053eee1e7323b7ea \
- rmd160 e35c3ffae7db2b30805645563d81d9858fc5f2e6 \
- sha256 2fc8315606cd6a51dae2e1fe9ac7a9bead76dace3eaf888ba372506695403af4
</del><ins>+ checksums md5 32e5ab1d77186142474cb65c685659bd \
+ rmd160 be66352ade99975df4e349d006d4dcdf296c5d86 \
+ sha256 ffb6235a25043cab71e6445cfc9e8bf16ae80a2835f0373cdd948fcc31eafe57
</ins><span class="cx"> }
</span><span class="cx"> 5.6 {
</span><span class="cx"> epoch 2
</span><del>- version 5.6.7
</del><ins>+ version 5.6.8
</ins><span class="cx"> use_xz yes
</span><del>- checksums md5 4e04eb021de009981ed963f993a171c1 \
- rmd160 952208e9a321e8b27862b1d6d5f2ff10e5c78b4f \
- sha256 a85522dd2e6f80ee5637e537447ee54896c77a8fabe49d2310830d0e20952787
</del><ins>+ checksums md5 526a5a7f593de632cd9e8546335de8b7 \
+ rmd160 94bf75220431f2909ccf9c7020df4f6fc0ade47d \
+ sha256 4c417387b88e100ca306adeda8051eb9fad93dae8da983f962dabf91a14b2b7b
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> # 7.0 {
</span><span class="lines">@@ -1190,7 +1190,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${php}-tidy {
</span><del>- revision 1
</del><ins>+ if {[vercmp ${branch} 5.3] <= 0} {
+ revision 1
+ }
</ins><span class="cx">
</span><span class="cx"> categories-append www
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52iODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php52-iODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-iODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php52-iODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> --- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500
</span><del>-+++ ext/odbc/config.m4 2010-08-05 21:21:54.000000000 -0500
</del><ins>++++ ext/odbc/config.m4 2015-04-17 20:30:44.000000000 -0500
</ins><span class="cx"> @@ -99,6 +99,7 @@
</span><span class="cx"> dnl
</span><span class="cx"> dnl configure options
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -363,6 +364,7 @@
- AC_MSG_RESULT([$ext_ouput])
</del><ins>+@@ -364,6 +365,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(iodbc,,
</span><ins>+ [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52unixODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php52-unixODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-unixODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php52-unixODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> --- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500
</span><del>-+++ ext/odbc/config.m4 2009-12-12 20:32:00.000000000 -0600
</del><ins>++++ ext/odbc/config.m4 2015-04-17 20:29:54.000000000 -0500
</ins><span class="cx"> @@ -99,6 +99,7 @@
</span><span class="cx"> dnl
</span><span class="cx"> dnl configure options
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -404,6 +405,7 @@
- AC_MSG_RESULT([$ext_output])
</del><ins>+@@ -405,6 +406,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(unixODBC,,
</span><ins>+ [ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp53iODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php53-iODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php53-iODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php53-iODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500
-+++ ext/odbc/config.m4 2010-08-05 21:21:54.000000000 -0500
</del><ins>+--- ext/odbc/config.m4.orig 2014-08-13 14:22:50.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:28:22.000000000 -0500
</ins><span class="cx"> @@ -99,6 +99,7 @@
</span><span class="cx"> dnl
</span><span class="cx"> dnl configure options
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -363,6 +364,7 @@
- AC_MSG_RESULT([$ext_ouput])
</del><ins>+@@ -364,6 +365,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(iodbc,,
</span><ins>+ [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp53unixODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php53-unixODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php53-unixODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php53-unixODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500
-+++ ext/odbc/config.m4 2009-12-12 20:32:00.000000000 -0600
</del><ins>+--- ext/odbc/config.m4.orig 2014-08-13 14:22:50.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:26:14.000000000 -0500
</ins><span class="cx"> @@ -99,6 +99,7 @@
</span><span class="cx"> dnl
</span><span class="cx"> dnl configure options
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -404,6 +405,7 @@
- AC_MSG_RESULT([$ext_output])
</del><ins>+@@ -405,6 +406,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(unixODBC,,
</span><ins>+ [ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp54iODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php54-iODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php54-iODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php54-iODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500
-+++ ext/odbc/config.m4 2010-08-05 21:21:54.000000000 -0500
</del><ins>+--- ext/odbc/config.m4.orig 2015-04-14 23:16:17.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:22:31.000000000 -0500
</ins><span class="cx"> @@ -99,6 +99,7 @@
</span><span class="cx"> dnl
</span><span class="cx"> dnl configure options
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -363,6 +364,7 @@
- AC_MSG_RESULT([$ext_ouput])
</del><ins>+@@ -364,6 +365,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(iodbc,,
</span><ins>+ [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp54unixODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php54-unixODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php54-unixODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php54-unixODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500
-+++ ext/odbc/config.m4 2009-12-12 20:32:00.000000000 -0600
</del><ins>+--- ext/odbc/config.m4.orig 2015-04-14 23:16:17.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:21:25.000000000 -0500
</ins><span class="cx"> @@ -99,6 +99,7 @@
</span><span class="cx"> dnl
</span><span class="cx"> dnl configure options
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -404,6 +405,7 @@
- AC_MSG_RESULT([$ext_output])
</del><ins>+@@ -420,6 +421,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(unixODBC,,
</span><ins>+ [ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp55iODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php55-iODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php55-iODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php55-iODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2015-03-18 04:45:50.000000000 -0500
-+++ ext/odbc/config.m4 2015-03-21 16:03:59.000000000 -0500
</del><ins>+--- ext/odbc/config.m4.orig 2015-04-15 05:43:00.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:20:29.000000000 -0500
</ins><span class="cx"> @@ -104,6 +104,7 @@
</span><span class="cx"> [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span class="cx"> Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -367,6 +368,7 @@
- AC_MSG_RESULT([$ext_output])
</del><ins>+@@ -386,6 +387,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(iodbc,,
</span><ins>+ [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp55unixODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php55-unixODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php55-unixODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php55-unixODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2015-03-18 04:45:50.000000000 -0500
-+++ ext/odbc/config.m4 2015-03-21 16:03:02.000000000 -0500
</del><ins>+--- ext/odbc/config.m4.orig 2015-04-15 05:43:00.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:19:37.000000000 -0500
</ins><span class="cx"> @@ -104,6 +104,7 @@
</span><span class="cx"> [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span class="cx"> Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -423,6 +424,7 @@
- AC_MSG_RESULT([$ext_output])
</del><ins>+@@ -446,6 +447,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(unixODBC,,
</span><ins>+ [ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp56iODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php56-iODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php56-iODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php56-iODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2015-03-18 19:19:30.000000000 -0500
-+++ ext/odbc/config.m4 2015-03-21 16:00:05.000000000 -0500
</del><ins>+--- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:15:12.000000000 -0500
</ins><span class="cx"> @@ -104,6 +104,7 @@
</span><span class="cx"> [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span class="cx"> Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -367,6 +368,7 @@
- AC_MSG_RESULT([$ext_output])
</del><ins>+@@ -386,6 +387,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(iodbc,,
</span><ins>+ [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp56unixODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php56-unixODBC.diff (135170 => 135171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php56-unixODBC.diff 2015-04-18 01:55:38 UTC (rev 135170)
+++ trunk/dports/lang/php/files/patch-php56-unixODBC.diff 2015-04-18 02:36:37 UTC (rev 135171)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- ext/odbc/config.m4.orig 2015-03-18 19:19:30.000000000 -0500
-+++ ext/odbc/config.m4 2015-03-21 16:01:48.000000000 -0500
</del><ins>+--- ext/odbc/config.m4.orig 2015-04-15 13:05:57.000000000 -0500
++++ ext/odbc/config.m4 2015-04-17 20:13:57.000000000 -0500
</ins><span class="cx"> @@ -104,6 +104,7 @@
</span><span class="cx"> [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
</span><span class="cx"> Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><span class="cx"> [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><del>-@@ -423,6 +424,7 @@
- AC_MSG_RESULT([$ext_output])
</del><ins>+@@ -446,6 +447,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><ins>+
</ins><span class="cx"> +MACPORTS_DISABLED
</span><del>-
</del><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(unixODBC,,
</span><ins>+ [ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
</ins></span></pre>
</div>
</div>
</body>
</html>