<!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>[137582] 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/137582">137582</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-06-14 22:31:02 -0700 (Sun, 14 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>php: add php70 version 7.0.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="#trunkdportslangphpfilesmod_phpconfin">trunk/dports/lang/php/files/mod_php.conf.in</a></li>
<li><a href="#trunkdportslangphpfilespatchphp70extgdconfigm4diff">trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.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>
<li><a href="#trunkdportslangphpfilesphp70">trunk/dports/lang/php/files/php70</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportslangphpfilesmod_phpconf">trunk/dports/lang/php/files/mod_php.conf</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangphpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/Portfile (137581 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile 2015-06-15 03:24:40 UTC (rev 137581)
+++ trunk/dports/lang/php/Portfile 2015-06-15 05:31:02 UTC (rev 137582)
</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
</del><ins>+php.branches 5.2 5.3 5.4 5.5 5.6 7.0
</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">@@ -109,21 +109,20 @@
</span><span class="cx"> checksums rmd160 f5dbf5fd8ed76b20429187cdde1558be63009f3a \
</span><span class="cx"> sha256 1af720c955b0a57aa47606e928616e84c78868aff2a5f269c70601a77d6da8c1
</span><span class="cx"> }
</span><ins>+ 7.0 {
+ # When this becomes a stable version, remove the overrides for homepage,
+ # master_sites and livecheck, and update php.latest_stable_branch in the
+ # php-1.1 portgroup.
+ version 7.0.0alpha1
+ homepage http://qa.php.net/
+ master_sites http://downloads.php.net/~ab/
+ use_xz yes
+ checksums rmd160 e664b23c34a98bc1607dc9d1ad024e6cbaa77730 \
+ sha256 241245f438531bca27c2be527b90918b2b007349e20334b47652a294085a9b7d
+ livecheck.url ${homepage}
+ livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
+ }
</ins><span class="cx"> }
</span><del>-# 7.0 {
-# # When this becomes a stable version, remove the overrides for homepage,
-# # master_sites and livecheck, and update php.latest_stable_branch in the
-# # php-1.1 portgroup.
-# version 7.0
-# homepage http://qa.php.net/
-# master_sites http://downloads.php.net/tyrael/
-# use_xz yes
-# checksums md5 0123456789 \
-# rmd160 0123456789 \
-# sha256 0123456789
-# livecheck.url ${homepage}
-# livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
-# }
</del><span class="cx">
</span><span class="cx"> # Iterate through branches in reverse order, so that the list of subports in
</span><span class="cx"> # "port info" will show newer versions before older versions.
</span><span class="lines">@@ -136,7 +135,11 @@
</span><span class="cx">
</span><span class="cx"> if {[regexp "^${php}" ${subport}]} {
</span><span class="cx">
</span><del>-dist_subdir php${major}
</del><ins>+if {[vercmp ${major} 5] > 0} {
+ dist_subdir ${php}
+} else {
+ dist_subdir php${major}
+}
</ins><span class="cx">
</span><span class="cx"> if {[is_sapi_subport]} {
</span><span class="cx">
</span><span class="lines">@@ -408,14 +411,15 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append --with-apxs2=${apxs}
</span><span class="cx">
</span><del>- build.target libs/libphp5.bundle
</del><ins>+ build.target libs/libphp${major}.bundle
</ins><span class="cx">
</span><span class="cx"> destroot.violate_mtree yes
</span><span class="cx">
</span><span class="cx"> destroot {
</span><span class="cx"> xinstall -m 755 -d ${destroot}${moduledir} ${destroot}${confdir}/extra
</span><del>- xinstall -m 644 ${worksrcpath}/libs/libphp5.so ${destroot}${moduledir}/mod_${php}.so
- xinstall -m 644 ${filespath}/mod_php.conf ${destroot}${confdir}/extra/mod_${php}.conf
</del><ins>+ xinstall -m 644 ${worksrcpath}/libs/libphp${major}.so ${destroot}${moduledir}/mod_${php}.so
+ xinstall -m 644 ${filespath}/mod_php.conf.in ${destroot}${confdir}/extra/mod_${php}.conf
+ reinplace s/@MAJOR@/${major}/g ${destroot}${confdir}/extra/mod_${php}.conf
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> notes-append "
</span><span class="lines">@@ -618,10 +622,12 @@
</span><span class="cx"> --with-zlib-dir=${prefix} \
</span><span class="cx"> --enable-gd-native-ttf
</span><span class="cx">
</span><ins>+ if {[vercmp ${branch} 7] < 0} {
</ins><span class="cx"> variant t1lib description {Add PostScript Type 1 font support with t1lib} {
</span><span class="cx"> depends_lib-append port:t1lib
</span><span class="cx"> configure.args-append --with-t1lib=${prefix}
</span><span class="cx"> }
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${php}-gettext {
</span><span class="lines">@@ -753,6 +759,7 @@
</span><span class="cx"> configure.args-append --with-mcrypt=${prefix}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if {[vercmp ${branch} 7] < 0} {
</ins><span class="cx"> subport ${php}-mssql {
</span><span class="cx"> php.extensions mssql pdo_dblib
</span><span class="cx">
</span><span class="lines">@@ -768,14 +775,21 @@
</span><span class="cx"> configure.args-append --with-mssql=${prefix} \
</span><span class="cx"> --with-pdo-dblib=${prefix}
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> subport ${php}-mysql {
</span><del>- php.extensions mysql mysqli pdo_mysql
</del><ins>+ php.extensions mysqli pdo_mysql
+ if {[vercmp ${branch} 7] < 0} {
+ php.extensions-prepend mysql
+ }
</ins><span class="cx">
</span><span class="cx"> categories-append databases
</span><span class="cx">
</span><del>- description a PHP interface to MySQL databases, including the \
- mysql, mysqli and pdo_mysql extensions
</del><ins>+ description a PHP interface to MySQL databases, including the
+ if {[vercmp ${branch} 7] < 0} {
+ description-append mysql,
+ }
+ description-append mysqli and pdo_mysql extensions
</ins><span class="cx">
</span><span class="cx"> long_description ${description}
</span><span class="cx">
</span><span class="lines">@@ -946,6 +960,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# php70-opcache @7.0.0alpha1 fails:
+# too few arguments provided to function-like macro invocation
+# use of undeclared identifier 'accel_xlat_get'
+# too many arguments to function call, expected 4, have 5
+if {[vercmp ${branch} 7] < 0} {
</ins><span class="cx"> if {[vercmp ${branch} 5.5] >= 0} {
</span><span class="cx"> subport ${php}-opcache {
</span><span class="cx"> php.extensions.zend opcache
</span><span class="lines">@@ -965,6 +984,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> subport ${php}-openssl {
</span><span class="cx"> categories-append devel security
</span><span class="lines">@@ -987,6 +1007,9 @@
</span><span class="cx"> --with-openssl=${prefix}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# php70-oracle @7.0.0alpha1 fails:
+# too many arguments to function call, expected 2, have 3
+if {[vercmp ${branch} 7] < 0} {
</ins><span class="cx"> subport ${php}-oracle {
</span><span class="cx"> php.extensions oci8 pdo_oci
</span><span class="cx">
</span><span class="lines">@@ -1011,6 +1034,7 @@
</span><span class="cx"> --with-pdo-oci=instantclient,${lib_dir},${library_version}
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> subport ${php}-pcntl {
</span><span class="cx"> categories-append sysutils
</span><span class="lines">@@ -1270,6 +1294,7 @@
</span><span class="cx"> # These variables are not only required by the subsequent code but also by
</span><span class="cx"> # preceding code in phase blocks.
</span><span class="cx"> set branch ${subport_branch}
</span><ins>+set major [lindex [split ${branch} .] 0]
</ins><span class="cx"> set php php[php.suffix_from_branch ${branch}]
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span></span></pre></div>
<a id="trunkdportslangphpfilesmod_phpconf"></a>
<div class="delfile"><h4>Deleted: trunk/dports/lang/php/files/mod_php.conf (137581 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/mod_php.conf 2015-06-15 03:24:40 UTC (rev 137581)
+++ trunk/dports/lang/php/files/mod_php.conf 2015-06-15 05:31:02 UTC (rev 137582)
</span><span class="lines">@@ -1,6 +0,0 @@
</span><del>-<IfModule mod_php5.c>
-
-AddType application/x-httpd-php .php
-AddType application/x-httpd-php-source .phps
-
-</IfModule>
</del></span></pre></div>
<a id="trunkdportslangphpfilesmod_phpconfinfromrev137579trunkdportslangphpfilesmod_phpconf"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/mod_php.conf.in (from rev 137579, trunk/dports/lang/php/files/mod_php.conf) (0 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/mod_php.conf.in (rev 0)
+++ trunk/dports/lang/php/files/mod_php.conf.in 2015-06-15 05:31:02 UTC (rev 137582)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+<IfModule mod_php@MAJOR@.c>
+
+AddType application/x-httpd-php .php
+AddType application/x-httpd-php-source .phps
+
+</IfModule>
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70extgdconfigm4difffromrev137543trunkdportslangphpfilespatchphp56extgdconfigm4diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-ext-gd-config.m4.diff) (0 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-ext-gd-config.m4.diff 2015-06-15 05:31:02 UTC (rev 137582)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+--- ext/gd/config.m4.orig 2015-06-10 03:49:51.000000000 -0500
++++ ext/gd/config.m4 2015-06-13 22:14:06.000000000 -0500
+@@ -72,7 +72,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
+
+@@ -98,7 +98,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
+
+@@ -123,7 +123,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
+
+@@ -154,7 +154,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
+@@ -181,7 +181,7 @@
+ AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+- for i in $PHP_FREETYPE_DIR /usr/local /usr; do
++ for i in $PHP_FREETYPE_DIR; do
+ if test -f "$i/bin/freetype-config"; then
+ FREETYPE2_DIR=$i
+ FREETYPE2_CONFIG="$i/bin/freetype-config"
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70iODBCdifffromrev137543trunkdportslangphpfilespatchphp56iODBCdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php70-iODBC.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-iODBC.diff) (0 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-iODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-iODBC.diff 2015-06-15 05:31:02 UTC (rev 137582)
</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)
+
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; 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 "$ODBC_TYPE"; then
+ PHP_ARG_WITH(iodbc,,
+ [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70sapifpmphpfpmconfindifffromrev137543trunkdportslangphpfilespatchphp56sapifpmphpfpmconfindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-sapi-fpm-php-fpm.conf.in.diff) (0 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-sapi-fpm-php-fpm.conf.in.diff 2015-06-15 05:31:02 UTC (rev 137582)
</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 "syslog", 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="trunkdportslangphpfilespatchphp70scriptsphpconfigindifffromrev137543trunkdportslangphpfilespatchphp56scriptsphpconfigindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-scripts-php-config.in.diff) (0 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-scripts-php-config.in.diff 2015-06-15 05:31:02 UTC (rev 137582)
</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="@PHP_VERSION@"
+ vernum="@PHP_VERSION_ID@"
+ include_dir="@includedir@/php"
+-includes="-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"
++includes="-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"
+ ldflags="@PHP_LDFLAGS@"
+ libs="@EXTRA_LIBS@"
+ extension_dir='@EXTENSION_DIR@'
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp70unixODBCdifffromrev137543trunkdportslangphpfilespatchphp56unixODBCdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php70-unixODBC.diff (from rev 137543, trunk/dports/lang/php/files/patch-php56-unixODBC.diff) (0 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php70-unixODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php70-unixODBC.diff 2015-06-15 05:31:02 UTC (rev 137582)
</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)
+
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; 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 "$ODBC_TYPE"; then
+ PHP_ARG_WITH(unixODBC,,
+ [ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]])
</ins></span></pre></div>
<a id="trunkdportslangphpfilesphp70fromrev137543trunkdportslangphpfilesphp56"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/php70 (from rev 137543, trunk/dports/lang/php/files/php56) (0 => 137582)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/php70 (rev 0)
+++ trunk/dports/lang/php/files/php70 2015-06-15 05:31:02 UTC (rev 137582)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+bin/php70
+bin/php-config70
+bin/phpize70
+share/man/man1/php70.1.gz
+share/man/man1/php-config70.1.gz
+share/man/man1/phpize70.1.gz
</ins></span></pre>
</div>
</div>
</body>
</html>