<!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>[134308] 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/134308">134308</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-03-21 16:19:19 -0700 (Sat, 21 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>php: update patches for php55-odbc and php56-odbc</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangphpPortfile">trunk/dports/lang/php/Portfile</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 (134307 => 134308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile 2015-03-21 23:08:26 UTC (rev 134307)
+++ trunk/dports/lang/php/Portfile 2015-03-21 23:19:19 UTC (rev 134308)
</span><span class="lines">@@ -113,11 +113,11 @@
</span><span class="cx"> sha256 a85522dd2e6f80ee5637e537447ee54896c77a8fabe49d2310830d0e20952787
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-# 5.7 {
</del><ins>+# 7.0 {
</ins><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 5.7
</del><ins>+# version 7.0
</ins><span class="cx"> # homepage http://qa.php.net/
</span><span class="cx"> # master_sites http://downloads.php.net/tyrael/
</span><span class="cx"> # use_xz yes
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp55iODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php55-iODBC.diff (134307 => 134308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php55-iODBC.diff 2015-03-21 23:08:26 UTC (rev 134307)
+++ trunk/dports/lang/php/files/patch-php55-iODBC.diff 2015-03-21 23:19:19 UTC (rev 134308)
</span><span class="lines">@@ -1,15 +1,15 @@
</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
-@@ -99,6 +99,7 @@
- dnl
- dnl configure options
- dnl
</del><ins>+--- 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
+@@ -104,6 +104,7 @@
+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+
</ins><span class="cx"> +:<<'MACPORTS_DISABLED'
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><del>- [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
-@@ -363,6 +364,7 @@
- AC_MSG_RESULT([$ext_ouput])
</del><ins>+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -367,6 +368,7 @@
+ AC_MSG_RESULT([$ext_output])
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><span class="cx"> +MACPORTS_DISABLED
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp55unixODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php55-unixODBC.diff (134307 => 134308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php55-unixODBC.diff 2015-03-21 23:08:26 UTC (rev 134307)
+++ trunk/dports/lang/php/files/patch-php55-unixODBC.diff 2015-03-21 23:19:19 UTC (rev 134308)
</span><span class="lines">@@ -1,14 +1,14 @@
</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
-@@ -99,6 +99,7 @@
- dnl
- dnl configure options
- dnl
</del><ins>+--- 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
+@@ -104,6 +104,7 @@
+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+
</ins><span class="cx"> +:<<'MACPORTS_DISABLED'
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><del>- [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
-@@ -404,6 +405,7 @@
</del><ins>+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -423,6 +424,7 @@
</ins><span class="cx"> AC_MSG_RESULT([$ext_output])
</span><span class="cx"> fi
</span><span class="cx"> fi
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp56iODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php56-iODBC.diff (134307 => 134308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php56-iODBC.diff 2015-03-21 23:08:26 UTC (rev 134307)
+++ trunk/dports/lang/php/files/patch-php56-iODBC.diff 2015-03-21 23:19:19 UTC (rev 134308)
</span><span class="lines">@@ -1,15 +1,15 @@
</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
-@@ -99,6 +99,7 @@
- dnl
- dnl configure options
- dnl
</del><ins>+--- 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
+@@ -104,6 +104,7 @@
+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+
</ins><span class="cx"> +:<<'MACPORTS_DISABLED'
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><del>- [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
-@@ -363,6 +364,7 @@
- AC_MSG_RESULT([$ext_ouput])
</del><ins>+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -367,6 +368,7 @@
+ AC_MSG_RESULT([$ext_output])
</ins><span class="cx"> fi
</span><span class="cx"> fi
</span><span class="cx"> +MACPORTS_DISABLED
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp56unixODBCdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/files/patch-php56-unixODBC.diff (134307 => 134308)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php56-unixODBC.diff 2015-03-21 23:08:26 UTC (rev 134307)
+++ trunk/dports/lang/php/files/patch-php56-unixODBC.diff 2015-03-21 23:19:19 UTC (rev 134308)
</span><span class="lines">@@ -1,14 +1,14 @@
</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
-@@ -99,6 +99,7 @@
- dnl
- dnl configure options
- dnl
</del><ins>+--- 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
+@@ -104,6 +104,7 @@
+ [ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300.
+ Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300)
+
</ins><span class="cx"> +:<<'MACPORTS_DISABLED'
</span><span class="cx"> if test -z "$ODBC_TYPE"; then
</span><span class="cx"> PHP_ARG_WITH(adabas,,
</span><del>- [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
-@@ -404,6 +405,7 @@
</del><ins>+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -423,6 +424,7 @@
</ins><span class="cx"> AC_MSG_RESULT([$ext_output])
</span><span class="cx"> fi
</span><span class="cx"> fi
</span></span></pre>
</div>
</div>
</body>
</html>