<!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>[149431] 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/149431">149431</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2016-06-19 16:10:51 -0700 (Sun, 19 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>php: add php71 version 7.1.0alpha1</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangphpPortfile">trunk/dports/lang/php/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangphpfilespatchphp71extgdconfigm4diff">trunk/dports/lang/php/files/patch-php71-ext-gd-config.m4.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp71exttidytidycdiff">trunk/dports/lang/php/files/patch-php71-ext-tidy-tidy.c.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp71iODBCdiff">trunk/dports/lang/php/files/patch-php71-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp71sapifpmphpfpmconfindiff">trunk/dports/lang/php/files/patch-php71-sapi-fpm-php-fpm.conf.in.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp71scriptsphpconfigindiff">trunk/dports/lang/php/files/patch-php71-scripts-php-config.in.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp71unixODBCdiff">trunk/dports/lang/php/files/patch-php71-unixODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilesphp71">trunk/dports/lang/php/files/php71</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangphpfilespatchphp70extgdconfigm4diff">trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp70exttidytidycdiff">trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp70iODBCdiff">trunk/dports/lang/php/files/patch-php70-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp70sapifpmphpfpmconfindiff">trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp70scriptsphpconfigindiff">trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp70unixODBCdiff">trunk/dports/lang/php/files/patch-php70-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 (149430 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile        2016-06-19 19:44:15 UTC (rev 149430)
+++ trunk/dports/lang/php/Portfile        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">                         scripting.
</span><span class="cx"> 
</span><span class="cx"> # The list of PHP branches this port provides.
</span><del>-php.branches            5.2 5.3 5.4 5.5 5.6 7.0
</del><ins>+php.branches            5.2 5.3 5.4 5.5 5.6 7.0 7.1
</ins><span class="cx"> 
</span><span class="cx"> # Fix for users specifying the subport name with the wrong case.
</span><span class="cx"> set subport             [string tolower ${subport}]
</span><span class="lines">@@ -121,12 +121,12 @@
</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><span class="cx">         version         7.1.0alpha1
</span><del>-        homepage        http://qa.php.net/
-        master_sites    http://downloads.php.net/~ab/
</del><ins>+        homepage        https://qa.php.net/
+        master_sites    https://downloads.php.net/~krakjoe/
</ins><span class="cx">         use_xz          yes
</span><del>-        checksums       md5     0123456789abcdef0123456789abcdef \
-                        rmd160  0123456789abcdef0123456789abcdef01234567 \
-                        sha256  0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
</del><ins>+        checksums       md5     bba5158cf155a63bc6a1daf51b7b34a7 \
+                        rmd160  0a6bc7ddaff6002b3b2b7498b75cfc5903c4f429 \
+                        sha256  e58c1e945200e2b03626a9429dd6f0079af390aa1009b5bf88e6e3105e8c34dd
</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">@@ -1234,7 +1234,7 @@
</span><span class="cx">     
</span><span class="cx">     depends_lib-append      port:tidy
</span><span class="cx">     
</span><del>-    if {[vercmp ${branch} 7.0] &lt;= 0} {
</del><ins>+    if {[vercmp ${branch} 7.1] &lt;= 0} {
</ins><span class="cx">         patchfiles-append   patch-${php}-ext-tidy-tidy.c.diff
</span><span class="cx">     }
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70extgdconfigm4diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff (149430 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff        2016-06-19 19:44:15 UTC (rev 149430)
+++ trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>---- 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
-@@ -72,7 +72,7 @@
- AC_DEFUN([PHP_GD_WEBP],[
-   if test &quot;$PHP_WEBP_DIR&quot; != &quot;no&quot;; then

--    for i in $PHP_WEBP_DIR /usr/local /usr; do
-+    for i in $PHP_WEBP_DIR; do
-       test -f $i/include/webp/decode.h &amp;&amp; GD_WEBP_DIR=$i &amp;&amp; break
-     done

-@@ -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 &amp;&amp; GD_WEBP_DIR=$i &amp;&amp; break
-     done

-@@ -106,7 +106,7 @@
- AC_DEFUN([PHP_GD_JPEG],[
-   if test &quot;$PHP_JPEG_DIR&quot; != &quot;no&quot;; then

--    for i in $PHP_JPEG_DIR /usr/local /usr; do
-+    for i in $PHP_JPEG_DIR; do
-       test -f $i/include/jpeglib.h &amp;&amp; GD_JPEG_DIR=$i &amp;&amp; break
-     done

-@@ -131,7 +131,7 @@
- AC_DEFUN([PHP_GD_PNG],[
-   if test &quot;$PHP_PNG_DIR&quot; != &quot;no&quot;; then

--    for i in $PHP_PNG_DIR /usr/local /usr; do
-+    for i in $PHP_PNG_DIR; do
-       test -f $i/include/png.h &amp;&amp; GD_PNG_DIR=$i &amp;&amp; break
-     done

-@@ -162,7 +162,7 @@
- AC_DEFUN([PHP_GD_XPM],[
-   if test &quot;$PHP_XPM_DIR&quot; != &quot;no&quot;; 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 &amp;&amp; GD_XPM_DIR=$i &amp;&amp; GD_XPM_INC=$i &amp;&amp; break
-       test -f $i/include/X11/xpm.h &amp;&amp; GD_XPM_DIR=$i &amp;&amp; GD_XPM_INC=$i/X11 &amp;&amp; break
-     done
-@@ -189,7 +189,7 @@
- AC_DEFUN([PHP_GD_FREETYPE2],[
-   if test &quot;$PHP_FREETYPE_DIR&quot; != &quot;no&quot;; then

--    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-+    for i in $PHP_FREETYPE_DIR; do
-       if test -f &quot;$i/bin/freetype-config&quot;; then
-         FREETYPE2_DIR=$i
-         FREETYPE2_CONFIG=&quot;$i/bin/freetype-config&quot;
</del></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70exttidytidycdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff (149430 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff        2016-06-19 19:44:15 UTC (rev 149430)
+++ trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- ext/tidy/tidy.c.orig        2015-09-16 07:49:50.000000000 -0500
-+++ ext/tidy/tidy.c        2015-09-19 14:18:11.000000000 -0500
-@@ -31,7 +31,7 @@
- #include &quot;ext/standard/info.h&quot;

- #include &quot;tidy.h&quot;
--#include &quot;buffio.h&quot;
-+#include &quot;tidybuffio.h&quot;

- /* compatibility with older versions of libtidy */
- #ifndef TIDY_CALL
</del></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70iODBCdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/patch-php70-iODBC.diff (149430 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-iODBC.diff        2016-06-19 19:44:15 UTC (rev 149430)
+++ trunk/dports/lang/php/files/patch-php70-iODBC.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>---- 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
-@@ -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)

-+:&lt;&lt;'MACPORTS_DISABLED'
- if test -z &quot;$ODBC_TYPE&quot;; then
- PHP_ARG_WITH(adabas,,
- [  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
-@@ -386,6 +387,7 @@
-   fi
- fi

-+MACPORTS_DISABLED
- if test -z &quot;$ODBC_TYPE&quot;; then
- PHP_ARG_WITH(iodbc,,
- [  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
</del></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70sapifpmphpfpmconfindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff (149430 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff        2016-06-19 19:44:15 UTC (rev 149430)
+++ trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -1,41 +0,0 @@
</span><del>---- a/sapi/fpm/php-fpm.conf.in.orig        2015-06-10 03:49:51.000000000 -0500
-+++ b/sapi/fpm/php-fpm.conf.in        2015-06-13 22:03:00.000000000 -0500
-@@ -14,14 +14,14 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+;pid = run/@PHP@/php-fpm.pid

- ; Error log file
- ; If it's set to &quot;syslog&quot;, log is sent to syslogd instead of being written
- ; in a local file.
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: log/php-fpm.log
--;error_log = log/php-fpm.log
-+error_log = log/@PHP@/php-fpm.log

- ; syslog_facility is used to specify what type of program is logging the
- ; message. This lets syslogd specify that messages from different facilities
-@@ -34,7 +34,7 @@
- ; instances running on the same server, you can change the default value
- ; which must suit common needs.
- ; Default Value: php-fpm
--;syslog.ident = php-fpm
-+syslog.ident = @PHP@-fpm

- ; Log level
- ; Possible Values: alert, error, warning, notice, debug
-@@ -76,9 +76,10 @@
- ; Default Value: no set
- ; process.priority = -19

--; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
-+; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging
-+; or for use with launchd.
- ; Default Value: yes
--;daemonize = yes
-+daemonize = no

- ; Set open file descriptor rlimit for the master process.
- ; Default Value: system defined value
</del></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70scriptsphpconfigindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff (149430 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff        2016-06-19 19:44:15 UTC (rev 149430)
+++ trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- a/scripts/php-config.in.orig        2011-05-15 01:09:21.000000000 -0500
-+++ b/scripts/php-config.in        2011-10-04 05:45:52.000000000 -0500
-@@ -7,7 +7,7 @@
- version=&quot;@PHP_VERSION@&quot;
- vernum=&quot;@PHP_VERSION_ID@&quot;
- include_dir=&quot;@includedir@/php&quot;
--includes=&quot;-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib&quot;
-+includes=&quot;-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I@prefix@/include&quot;
- ldflags=&quot;@PHP_LDFLAGS@&quot;
- libs=&quot;@EXTRA_LIBS@&quot;
- extension_dir='@EXTENSION_DIR@'
</del></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70unixODBCdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/patch-php70-unixODBC.diff (149430 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-unixODBC.diff        2016-06-19 19:44:15 UTC (rev 149430)
+++ trunk/dports/lang/php/files/patch-php70-unixODBC.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>---- 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
-@@ -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)

-+:&lt;&lt;'MACPORTS_DISABLED'
- if test -z &quot;$ODBC_TYPE&quot;; then
- PHP_ARG_WITH(adabas,,
- [  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
-@@ -446,6 +447,7 @@
-   fi
- fi

-+MACPORTS_DISABLED
- if test -z &quot;$ODBC_TYPE&quot;; then
- PHP_ARG_WITH(unixODBC,,
- [  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
</del></span></pre></div>
<a id="trunkdportslangphpfilespatchphp71extgdconfigm4difffromrev149430trunkdportslangphpfilespatchphp70extgdconfigm4diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php71-ext-gd-config.m4.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff) (0 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php71-ext-gd-config.m4.diff                                (rev 0)
+++ trunk/dports/lang/php/files/patch-php71-ext-gd-config.m4.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><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
+@@ -72,7 +72,7 @@
+ AC_DEFUN([PHP_GD_WEBP],[
+   if test &quot;$PHP_WEBP_DIR&quot; != &quot;no&quot;; then

+-    for i in $PHP_WEBP_DIR /usr/local /usr; do
++    for i in $PHP_WEBP_DIR; do
+       test -f $i/include/webp/decode.h &amp;&amp; GD_WEBP_DIR=$i &amp;&amp; break
+     done

+@@ -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 &amp;&amp; GD_WEBP_DIR=$i &amp;&amp; break
+     done

+@@ -106,7 +106,7 @@
+ AC_DEFUN([PHP_GD_JPEG],[
+   if test &quot;$PHP_JPEG_DIR&quot; != &quot;no&quot;; then

+-    for i in $PHP_JPEG_DIR /usr/local /usr; do
++    for i in $PHP_JPEG_DIR; do
+       test -f $i/include/jpeglib.h &amp;&amp; GD_JPEG_DIR=$i &amp;&amp; break
+     done

+@@ -131,7 +131,7 @@
+ AC_DEFUN([PHP_GD_PNG],[
+   if test &quot;$PHP_PNG_DIR&quot; != &quot;no&quot;; then

+-    for i in $PHP_PNG_DIR /usr/local /usr; do
++    for i in $PHP_PNG_DIR; do
+       test -f $i/include/png.h &amp;&amp; GD_PNG_DIR=$i &amp;&amp; break
+     done

+@@ -162,7 +162,7 @@
+ AC_DEFUN([PHP_GD_XPM],[
+   if test &quot;$PHP_XPM_DIR&quot; != &quot;no&quot;; 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 &amp;&amp; GD_XPM_DIR=$i &amp;&amp; GD_XPM_INC=$i &amp;&amp; break
+       test -f $i/include/X11/xpm.h &amp;&amp; GD_XPM_DIR=$i &amp;&amp; GD_XPM_INC=$i/X11 &amp;&amp; break
+     done
+@@ -189,7 +189,7 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+   if test &quot;$PHP_FREETYPE_DIR&quot; != &quot;no&quot;; then

+-    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++    for i in $PHP_FREETYPE_DIR; do
+       if test -f &quot;$i/bin/freetype-config&quot;; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_CONFIG=&quot;$i/bin/freetype-config&quot;
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp71exttidytidycdifffromrev149430trunkdportslangphpfilespatchphp70exttidytidycdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php71-ext-tidy-tidy.c.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-ext-tidy-tidy.c.diff) (0 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php71-ext-tidy-tidy.c.diff                                (rev 0)
+++ trunk/dports/lang/php/files/patch-php71-ext-tidy-tidy.c.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- ext/tidy/tidy.c.orig        2015-09-16 07:49:50.000000000 -0500
++++ ext/tidy/tidy.c        2015-09-19 14:18:11.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include &quot;ext/standard/info.h&quot;

+ #include &quot;tidy.h&quot;
+-#include &quot;buffio.h&quot;
++#include &quot;tidybuffio.h&quot;

+ /* compatibility with older versions of libtidy */
+ #ifndef TIDY_CALL
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp71iODBCdifffromrev149430trunkdportslangphpfilespatchphp70iODBCdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php71-iODBC.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-iODBC.diff) (0 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php71-iODBC.diff                                (rev 0)
+++ trunk/dports/lang/php/files/patch-php71-iODBC.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><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
+@@ -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)

++:&lt;&lt;'MACPORTS_DISABLED'
+ if test -z &quot;$ODBC_TYPE&quot;; then
+ PHP_ARG_WITH(adabas,,
+ [  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
+@@ -386,6 +387,7 @@
+   fi
+ fi

++MACPORTS_DISABLED
+ if test -z &quot;$ODBC_TYPE&quot;; then
+ PHP_ARG_WITH(iodbc,,
+ [  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp71sapifpmphpfpmconfindifffromrev149430trunkdportslangphpfilespatchphp70sapifpmphpfpmconfindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php71-sapi-fpm-php-fpm.conf.in.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff) (0 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php71-sapi-fpm-php-fpm.conf.in.diff                                (rev 0)
+++ trunk/dports/lang/php/files/patch-php71-sapi-fpm-php-fpm.conf.in.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+--- a/sapi/fpm/php-fpm.conf.in.orig        2015-06-10 03:49:51.000000000 -0500
++++ b/sapi/fpm/php-fpm.conf.in        2015-06-13 22:03:00.000000000 -0500
+@@ -14,14 +14,14 @@
+ ; Pid file
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: none
+-;pid = run/php-fpm.pid
++;pid = run/@PHP@/php-fpm.pid

+ ; Error log file
+ ; If it's set to &quot;syslog&quot;, log is sent to syslogd instead of being written
+ ; in a local file.
+ ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
+ ; Default Value: log/php-fpm.log
+-;error_log = log/php-fpm.log
++error_log = log/@PHP@/php-fpm.log

+ ; syslog_facility is used to specify what type of program is logging the
+ ; message. This lets syslogd specify that messages from different facilities
+@@ -34,7 +34,7 @@
+ ; instances running on the same server, you can change the default value
+ ; which must suit common needs.
+ ; Default Value: php-fpm
+-;syslog.ident = php-fpm
++syslog.ident = @PHP@-fpm

+ ; Log level
+ ; Possible Values: alert, error, warning, notice, debug
+@@ -76,9 +76,10 @@
+ ; Default Value: no set
+ ; process.priority = -19

+-; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
++; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging
++; or for use with launchd.
+ ; Default Value: yes
+-;daemonize = yes
++daemonize = no

+ ; Set open file descriptor rlimit for the master process.
+ ; Default Value: system defined value
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp71scriptsphpconfigindifffromrev149430trunkdportslangphpfilespatchphp70scriptsphpconfigindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php71-scripts-php-config.in.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff) (0 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php71-scripts-php-config.in.diff                                (rev 0)
+++ trunk/dports/lang/php/files/patch-php71-scripts-php-config.in.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- a/scripts/php-config.in.orig        2011-05-15 01:09:21.000000000 -0500
++++ b/scripts/php-config.in        2011-10-04 05:45:52.000000000 -0500
+@@ -7,7 +7,7 @@
+ version=&quot;@PHP_VERSION@&quot;
+ vernum=&quot;@PHP_VERSION_ID@&quot;
+ include_dir=&quot;@includedir@/php&quot;
+-includes=&quot;-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib&quot;
++includes=&quot;-I$include_dir -I$include_dir/main -I$include_dir/TSRM -I$include_dir/Zend -I$include_dir/ext -I$include_dir/ext/date/lib -I@prefix@/include&quot;
+ ldflags=&quot;@PHP_LDFLAGS@&quot;
+ libs=&quot;@EXTRA_LIBS@&quot;
+ extension_dir='@EXTENSION_DIR@'
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp71unixODBCdifffromrev149430trunkdportslangphpfilespatchphp70unixODBCdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php71-unixODBC.diff (from rev 149430, trunk/dports/lang/php/files/patch-php70-unixODBC.diff) (0 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php71-unixODBC.diff                                (rev 0)
+++ trunk/dports/lang/php/files/patch-php71-unixODBC.diff        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><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
+@@ -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)

++:&lt;&lt;'MACPORTS_DISABLED'
+ if test -z &quot;$ODBC_TYPE&quot;; then
+ PHP_ARG_WITH(adabas,,
+ [  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
+@@ -446,6 +447,7 @@
+   fi
+ fi

++MACPORTS_DISABLED
+ if test -z &quot;$ODBC_TYPE&quot;; then
+ PHP_ARG_WITH(unixODBC,,
+ [  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilesphp71fromrev149430trunkdportslangphpfilesphp70"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/php71 (from rev 149430, trunk/dports/lang/php/files/php70) (0 => 149431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/php71                                (rev 0)
+++ trunk/dports/lang/php/files/php71        2016-06-19 23:10:51 UTC (rev 149431)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+bin/php71
+bin/php-config71
+bin/phpize71
+share/man/man1/php71.1.gz
+share/man/man1/php-config71.1.gz
+share/man/man1/phpize71.1.gz
</ins></span></pre>
</div>
</div>

</body>
</html>