<!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>[128130] trunk/dports/lang</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/128130">128130</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-11-13 21:02:56 -0800 (Thu, 13 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>php: bring php52 @5.2.17 into this port; resolves freetype-related build failure (#41864) and conflict with other php versions (#22668)</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="#trunkdportslangphpfilespatchphp52extgdconfigm4diff">trunk/dports/lang/php/files/patch-php52-ext-gd-config.m4.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52extgmpgmpcdiff">trunk/dports/lang/php/files/patch-php52-ext-gmp-gmp.c.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52extpdo_ociconfigm4diff">trunk/dports/lang/php/files/patch-php52-ext-pdo_oci-config.m4.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52iODBCdiff">trunk/dports/lang/php/files/patch-php52-iODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52libxml29diff">trunk/dports/lang/php/files/patch-php52-libxml-2.9.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52pcre830diff">trunk/dports/lang/php/files/patch-php52-pcre-8.30.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52scriptsphpconfigindiff">trunk/dports/lang/php/files/patch-php52-scripts-php-config.in.diff</a></li>
<li><a href="#trunkdportslangphpfilespatchphp52unixODBCdiff">trunk/dports/lang/php/files/patch-php52-unixODBC.diff</a></li>
<li><a href="#trunkdportslangphpfilesphp52">trunk/dports/lang/php/files/php52</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/lang/php52/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangphpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/Portfile (128129 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile 2014-11-14 03:06:26 UTC (rev 128129)
+++ trunk/dports/lang/php/Portfile 2014-11-14 05:02:56 UTC (rev 128130)
</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.3 5.4 5.5 5.6
</del><ins>+php.branches 5.2 5.3 5.4 5.5 5.6
</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">@@ -59,6 +59,20 @@
</span><span class="cx">
</span><span class="cx"> # Remember to increment revision of ${php}-eaccelerator when updating version of ${php}.
</span><span class="cx"> switch ${subport_branch} {
</span><ins>+ 5.2 {
+ version 5.2.17
+ use_bzip2 yes
+ set suhosin_available yes
+ set suhosin_patch_version 5.2.16-0.9.7
+ set suhosin_patch suhosin-patch-${suhosin_patch_version}.patch.gz
+ checksums ${distname}${extract.suffix} \
+ md5 b27947f3045220faf16e4d9158cbfe13 \
+ rmd160 567fa8d718b93fb83a89494c83a8bec224ac99e9 \
+ sha256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c \
+ ${suhosin_patch} \
+ rmd160 b28b70faf136b3e04c5b483da0f4c2279378f43a \
+ sha256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91
+ }
</ins><span class="cx"> 5.3 {
</span><span class="cx"> version 5.3.29
</span><span class="cx"> use_bzip2 yes
</span><span class="lines">@@ -106,8 +120,7 @@
</span><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><del>-# checksums ${distname}${extract.suffix} \
-# md5 0123456789 \
</del><ins>+# checksums md5 0123456789 \
</ins><span class="cx"> # rmd160 0123456789 \
</span><span class="cx"> # sha256 0123456789
</span><span class="cx"> # livecheck.url ${homepage}
</span><span class="lines">@@ -147,6 +160,12 @@
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-${php}-scripts-php-config.in.diff
</span><span class="cx">
</span><ins>+ if {[vercmp ${branch} 5.2] <= 0} {
+ patchfiles-append \
+ patch-${php}-libxml-2.9.diff \
+ patch-${php}-pcre-8.30.diff
+ }
+
</ins><span class="cx"> # https://trac.macports.org/ticket/31590
</span><span class="cx"> # Tested all subports (except oracle) and they built with clang-425. The reported failure was with Xcode 4.2.
</span><span class="cx"> # Xcode 4.3 may work, but leaving it blacklisted due to lack of testing
</span><span class="lines">@@ -166,13 +185,11 @@
</span><span class="cx"> --enable-bcmath \
</span><span class="cx"> --enable-ctype \
</span><span class="cx"> --enable-dom \
</span><del>- --enable-fileinfo \
</del><span class="cx"> --enable-filter \
</span><span class="cx"> --enable-hash \
</span><span class="cx"> --enable-json \
</span><span class="cx"> --enable-libxml \
</span><span class="cx"> --enable-pdo \
</span><del>- --enable-phar \
</del><span class="cx"> --enable-session \
</span><span class="cx"> --enable-simplexml \
</span><span class="cx"> --enable-tokenizer \
</span><span class="lines">@@ -186,17 +203,24 @@
</span><span class="cx"> --with-zlib=${prefix} \
</span><span class="cx"> --without-pear \
</span><span class="cx"> --disable-cgi \
</span><del>- --disable-cli \
</del><ins>+ --disable-cli
+
+ if {[vercmp ${branch} 5.3] >= 0} {
+ configure.args-append \
+ --enable-fileinfo \
+ --enable-phar \
</ins><span class="cx"> --disable-fpm
</span><del>-
</del><ins>+
+ # ${php}-mysql +mysqlnd needs mysqlnd support compiled into the SAPI
+ configure.env-append \
+ PHP_MYSQLND_ENABLED=yes
+ }
+
</ins><span class="cx"> if {[vercmp ${branch} 5.4] >= 0} {
</span><span class="cx"> # https://bugs.php.net/bug.php?id=68114
</span><span class="cx"> configure.args-append ac_cv_decimal_fp_supported=no
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # ${php}-mysql +mysqlnd needs mysqlnd support compiled into the SAPI
- configure.env PHP_MYSQLND_ENABLED=yes
-
</del><span class="cx"> configure.universal_args-delete --disable-dependency-tracking
</span><span class="cx">
</span><span class="cx"> test.run yes
</span><span class="lines">@@ -226,9 +250,13 @@
</span><span class="cx"> }
</span><span class="cx"> patch_sites-append http://download.suhosin.org/
</span><span class="cx"> if {${suhosin_available}} {
</span><del>- patchfiles-append patch-${php}-suhosin-before.diff
</del><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
+ patchfiles-append patch-${php}-suhosin-before.diff
+ }
</ins><span class="cx"> patchfiles-append ${suhosin_patch}
</span><del>- patchfiles-append patch-${php}-suhosin-after.diff
</del><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
+ patchfiles-append patch-${php}-suhosin-after.diff
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -246,6 +274,10 @@
</span><span class="cx"> subport ${php} {
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><ins>+ if {[vercmp ${branch} 5.2] == 0} {
+ revision 10
+ }
+
</ins><span class="cx"> depends_run port:php_select
</span><span class="cx">
</span><span class="cx"> select.group php
</span><span class="lines">@@ -260,14 +292,23 @@
</span><span class="cx"> post-destroot {
</span><span class="cx"> # Copy the default php.ini files.
</span><span class="cx"> xinstall -m 755 -d ${destroot}${phpinidir}
</span><del>- xinstall -m 644 -W ${worksrcpath} \
- php.ini-development \
- php.ini-production \
- ${destroot}${phpinidir}
</del><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
+ xinstall -m 644 -W ${worksrcpath} \
+ php.ini-development \
+ php.ini-production \
+ ${destroot}${phpinidir}
+ } else {
+ xinstall -m 644 -W ${worksrcpath} \
+ php.ini-dist \
+ php.ini-recommended \
+ ${destroot}${phpinidir}
+ }
</ins><span class="cx">
</span><del>- # Copy mysqlnd headers.
- xinstall -d ${destroot}${prefix}/include/${php}/php/ext/mysqlnd
- eval xinstall -m 644 [glob ${worksrcpath}/ext/mysqlnd/*.h] ${destroot}${prefix}/include/${php}/php/ext/mysqlnd
</del><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
+ # Copy mysqlnd headers.
+ xinstall -d ${destroot}${prefix}/include/${php}/php/ext/mysqlnd
+ eval xinstall -m 644 [glob ${worksrcpath}/ext/mysqlnd/*.h] ${destroot}${prefix}/include/${php}/php/ext/mysqlnd
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Include the readline extension http://www.php.net/readline directly in
</span><span class="lines">@@ -296,6 +337,7 @@
</span><span class="cx">
</span><span class="cx"> To learn how to update your code, please read the following guides:
</span><span class="cx">
</span><ins>+ http://php.net/manual/en/migration53.php
</ins><span class="cx"> http://php.net/manual/en/migration54.php
</span><span class="cx"> http://php.net/manual/en/migration55.php
</span><span class="cx"> http://php.net/manual/en/migration56.php
</span><span class="lines">@@ -309,19 +351,34 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![file exists ${phpinidir}/php.ini]} {
</span><del>- notes-append "
</del><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
+ notes-append "
</ins><span class="cx"> To customize ${php}, copy\
</span><span class="cx"> ${phpinidir}/php.ini-development (if this is a development server) or\
</span><span class="cx"> ${phpinidir}/php.ini-production (if this is a production server) to\
</span><span class="cx"> ${phpinidir}/php.ini and then make changes.
</span><span class="cx"> "
</span><ins>+ } else {
+ notes-append "
+To customize ${php}, copy ${phpinidir}/php.ini-recommended to\
+${phpinidir}/php.ini and then make changes.
+"
+ }
</ins><span class="cx"> } else {
</span><del>- notes-append "
</del><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
+ notes-append "
</ins><span class="cx"> You may need to update your php.ini for any changes that have been made\
</span><span class="cx"> in this version of ${php}. Compare ${phpinidir}/php.ini with\
</span><span class="cx"> ${phpinidir}/php.ini-development (if this is a development server) or\
</span><span class="cx"> ${phpinidir}/php.ini-production (if this is a production server).
</span><span class="cx"> "
</span><ins>+ } else {
+ notes-append "
+You may need to update your php.ini for any changes that have been made\
+in this version of ${php}. Compare ${phpinidir}/php.ini with\
+${phpinidir}/php.ini-recommended.
+"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Enable livecheck for the two most recent stable PHP branches and the development branch.
</span><span class="lines">@@ -381,7 +438,12 @@
</span><span class="cx">
</span><span class="cx"> homepage http://www.php.net/install.unix.commandline
</span><span class="cx">
</span><del>- configure.args-replace --disable-cgi --enable-cgi
</del><ins>+ configure.args-delete --disable-cgi
+ if {[vercmp ${branch} 5.3] >= 0} {
+ configure.args-append --enable-cgi
+ } else {
+ configure.args-append --enable-fastcgi --enable-force-cgi-redirect
+ }
</ins><span class="cx">
</span><span class="cx"> if {[vercmp ${branch} 5.4] >= 0} {
</span><span class="cx"> build.target cgi
</span><span class="lines">@@ -396,6 +458,7 @@
</span><span class="cx">
</span><span class="cx"> ### FPM SAPI ###
</span><span class="cx">
</span><ins>+if {[vercmp ${branch} 5.3] >= 0} {
</ins><span class="cx"> subport ${php}-fpm {
</span><span class="cx"> description ${php} FPM SAPI
</span><span class="cx">
</span><span class="lines">@@ -448,6 +511,7 @@
</span><span class="cx"> "
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> ### Bundled extensions ###
</span><span class="cx">
</span><span class="lines">@@ -490,6 +554,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if {[vercmp ${branch} 5.3] >= 0} {
</ins><span class="cx"> subport ${php}-enchant {
</span><span class="cx"> categories-append textproc devel
</span><span class="cx">
</span><span class="lines">@@ -512,6 +577,7 @@
</span><span class="cx"> ${destroot}${examplesdir}
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> subport ${php}-exif {
</span><span class="cx"> categories-append graphics
</span><span class="lines">@@ -584,6 +650,10 @@
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:gmp
</span><span class="cx">
</span><ins>+ if {[vercmp ${branch} 5.2] <= 0} {
+ patchfiles-append patch-${php}-ext-gmp-gmp.c.diff
+ }
+
</ins><span class="cx"> configure.args-append --with-gmp=${prefix}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -617,6 +687,7 @@
</span><span class="cx"> --with-kerberos=${prefix}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if {[vercmp ${branch} 5.3] >= 0} {
</ins><span class="cx"> subport ${php}-intl {
</span><span class="cx"> revision 1
</span><span class="cx">
</span><span class="lines">@@ -629,6 +700,7 @@
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:icu
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> subport ${php}-ipc {
</span><span class="cx"> php.extensions shmop sysvmsg sysvsem sysvshm
</span><span class="lines">@@ -711,6 +783,7 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append --with-zlib-dir=${prefix}
</span><span class="cx">
</span><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
</ins><span class="cx"> variant mysqlnd conflicts mysql4 mysql5 mysql51 mysql55 mysql56 mariadb percona description {Use MySQL Native Driver} {
</span><span class="cx"> configure.args-append --with-mysql=mysqlnd \
</span><span class="cx"> --with-mysqli=mysqlnd \
</span><span class="lines">@@ -732,6 +805,7 @@
</span><span class="cx"> For percona, use ${prefix}/var/run/percona/mysqld.sock
</span><span class="cx"> "
</span><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> variant mysql4 conflicts mysqlnd mysql5 mysql51 mysql55 mysql56 mariadb percona description {Use MySQL 4 libraries} {
</span><span class="cx"> depends_lib-append port:mysql4
</span><span class="lines">@@ -831,7 +905,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset mysql4] && ![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona]} {
</span><del>- default_variants +mysqlnd
</del><ins>+ if {[vercmp ${branch} 5.3] >= 0} {
+ default_variants +mysqlnd
+ } else {
+ default_variants +mariadb
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -921,6 +999,10 @@
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:oracle-instantclient
</span><span class="cx">
</span><ins>+ if {[vercmp ${branch} 5.2] <= 0} {
+ patchfiles-append patch-${php}-ext-pdo_oci-config.m4.diff
+ }
+
</ins><span class="cx"> set lib_dir ${prefix}/lib/oracle
</span><span class="cx"> pre-configure {
</span><span class="cx"> regexp {\.dylib\.(.+)$} [glob -directory ${lib_dir} libclntsh.dylib.*] -> library_version
</span><span class="lines">@@ -1069,6 +1151,7 @@
</span><span class="cx"> long_description ${description}
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if {[vercmp ${branch} 5.3] >= 0} {
</ins><span class="cx"> subport ${php}-sqlite {
</span><span class="cx"> php.extensions sqlite sqlite3 pdo_sqlite
</span><span class="cx">
</span><span class="lines">@@ -1094,6 +1177,7 @@
</span><span class="cx"> --with-pdo-sqlite=${prefix} \
</span><span class="cx"> --enable-sqlite-utf8
</span><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> subport ${php}-tidy {
</span><span class="cx"> categories-append www
</span></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52extgdconfigm4difffromrev115777trunkdportslangphpfilespatchphp53extgdconfigm4diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php52-ext-gd-config.m4.diff (from rev 115777, trunk/dports/lang/php/files/patch-php53-ext-gd-config.m4.diff) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-ext-gd-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-ext-gd-config.m4.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+--- ext/gd/config.m4.orig 2007-07-03 12:25:43.000000000 -0500
++++ ext/gd/config.m4 2014-01-10 20:14:34.000000000 -0600
+@@ -74,7 +74,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/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break
+ done
+
+@@ -99,7 +99,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/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
+ done
+
+@@ -134,7 +134,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
+
+@@ -203,30 +203,25 @@
+ 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
++ if test -f "$i/bin/freetype-config"; then
+ FREETYPE2_DIR=$i
+- FREETYPE2_INC_DIR=$i/include/freetype2
++ FREETYPE2_CONFIG="$i/bin/freetype-config"
+ break
+ fi
+ done
+
+ if test -z "$FREETYPE2_DIR"; then
+- AC_MSG_ERROR([freetype.h not found.])
++ AC_MSG_ERROR([freetype-config not found.])
+ fi
+
+- PHP_CHECK_LIBRARY(freetype, FT_New_Face,
+- [
+- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+- PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
+- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
+- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
+- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+- ],[
+- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
+- ],[
+- -L$FREETYPE2_DIR/$PHP_LIBDIR
+- ])
++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++
++ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
++ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
++ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
++ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+ else
+ AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
+ fi
+@@ -235,7 +230,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="trunkdportslangphpfilespatchphp52extgmpgmpcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/php/files/patch-php52-ext-gmp-gmp.c.diff (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-ext-gmp-gmp.c.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-ext-gmp-gmp.c.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Fix build with GMP 5+
+https://bugs.php.net/bug.php?id=50990
+https://github.com/php/php-src/commit/bd0a74c419f7c81c32ced26c8cd55b9c5cadcea4
+--- ext/gmp/gmp.c.orig
++++ ext/gmp/gmp.c
+@@ -1380,8 +1380,11 @@ ZEND_FUNCTION(gmp_random)
+
+ GMPG(rand_initialized) = 1;
+ }
++#ifdef GMP_LIMB_BITS
++ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS);
++#else
+ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB);
+-
++#endif
+ ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp);
+ }
+ /* }}} */
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52extpdo_ociconfigm4difffromrev126398trunkdportslangphp52filespatchextpdo_ociconfigm4diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php52-ext-pdo_oci-config.m4.diff (from rev 126398, trunk/dports/lang/php52/files/patch-ext-pdo_oci-config.m4.diff) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-ext-pdo_oci-config.m4.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-ext-pdo_oci-config.m4.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+Fix finding Oracle Instant Client library on OS X
+https://bugs.php.net/bug.php?id=39312
+https://github.com/php/php-src/commit/70075bc84c4c1f5700ee95415e07c1799e3c083c
+--- ext/pdo_oci/config.m4.orig
++++ ext/pdo_oci/config.m4
+@@ -79,6 +81,13 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
+ fi
+ PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
+ PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
++ if test -n "$PDO_OCI_IC_VERS"; then
++ PDO_OCI_IC_MAJ_VER="`echo $PDO_OCI_IC_VERS | cut -d. -f1`"
++ if test "$PDO_OCI_IC_MAJ_VER" -ge 11; then
++ # From 11.1.0.7 the RPM path only has an X.Y component
++ PDO_OCI_IC_VERS="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
++ fi
++ fi
+ AC_MSG_CHECKING([for oci.h])
+ if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then
+ PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR)
+@@ -97,11 +97,11 @@
+ else
+ AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
+ fi
+- if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
++ if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
+- elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
++ elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
+- elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
++ elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.$SHLIB_SUFFIX_NAME" ; then
+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
+ else
+ AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install])
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52iODBCdifffromrev126398trunkdportslangphpfilespatchphp53iODBCdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php52-iODBC.diff (from rev 126398, trunk/dports/lang/php/files/patch-php53-iODBC.diff) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-iODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-iODBC.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- 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
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -363,6 +364,7 @@
+ AC_MSG_RESULT([$ext_ouput])
+ fi
+ fi
++MACPORTS_DISABLED
+
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(iodbc,,
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52libxml29difffromrev126371trunkdportslangphp52filespatchlibxml29diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php52-libxml-2.9.diff (from rev 126371, trunk/dports/lang/php52/files/patch-libxml-2.9.diff) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-libxml-2.9.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-libxml-2.9.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+--- a/ext/dom/node.c.orig 2010-05-01 13:30:38.000000000 -0500
++++ b/ext/dom/node.c 2013-05-09 20:34:37.000000000 -0500
+@@ -1950,9 +1950,17 @@
+ RETVAL_FALSE;
+ } else {
+ if (mode == 0) {
++#ifdef LIBXML2_NEW_BUFFER
++ ret = xmlOutputBufferGetSize(buf);
++#else
+ ret = buf->buffer->use;
++#endif
+ if (ret > 0) {
++#ifdef LIBXML2_NEW_BUFFER
++ RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf), ret, 1);
++#else
+ RETVAL_STRINGL((char *) buf->buffer->content, ret, 1);
++#endif
+ } else {
+ RETVAL_EMPTY_STRING();
+ }
+--- a/ext/dom/documenttype.c.orig 2010-01-03 03:23:27.000000000 -0600
++++ b/ext/dom/documenttype.c 2013-05-09 20:34:37.000000000 -0500
+@@ -215,7 +215,13 @@
+ if (buff != NULL) {
+ xmlNodeDumpOutput (buff, NULL, (xmlNodePtr) intsubset, 0, 0, NULL);
+ xmlOutputBufferFlush(buff);
++
++#ifdef LIBXML2_NEW_BUFFER
++ ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff),
++ xmlOutputBufferGetSize(buff), 1);
++#else
+ ZVAL_STRINGL(*retval, buff->buffer->content, buff->buffer->use, 1);
++#endif
+ (void)xmlOutputBufferClose(buff);
+ return SUCCESS;
+ }
+--- a/ext/simplexml/simplexml.c.orig 2010-05-05 06:40:11.000000000 -0500
++++ b/ext/simplexml/simplexml.c 2013-05-09 20:34:37.000000000 -0500
+@@ -1343,7 +1343,12 @@
+
+ xmlNodeDumpOutput(outbuf, (xmlDocPtr) sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
+ xmlOutputBufferFlush(outbuf);
++#ifdef LIBXML2_NEW_BUFFER
++ RETVAL_STRINGL((char *)xmlOutputBufferGetContent(outbuf),
++ xmlOutputBufferGetSize(outbuf), 1);
++#else
+ RETVAL_STRINGL((char *)outbuf->buffer->content, outbuf->buffer->use, 1);
++#endif
+ xmlOutputBufferClose(outbuf);
+ }
+ } else {
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52pcre830difffromrev126371trunkdportslangphp52filespatchpcre830diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php52-pcre-8.30.diff (from rev 126371, trunk/dports/lang/php52/files/patch-pcre-8.30.diff) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-pcre-8.30.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-pcre-8.30.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+https://bugs.php.net/bug.php?id=60986
+https://github.com/php/php-src/commit/0f6e3408db4d8fd96e24459389b06dc7a6e40ee2
+https://github.com/php/php-src/commit/4ecfa5abf5d5cb47677565808bdd15dfb25e39b5
+--- a/ext/pcre/php_pcre.c.orig 2010-01-03 03:23:27.000000000 -0600
++++ b/ext/pcre/php_pcre.c 2012-05-12 12:28:32.000000000 -0500
+@@ -241,6 +241,7 @@
+ char *pattern;
+ int do_study = 0;
+ int poptions = 0;
++ int count = 0;
+ unsigned const char *tables = NULL;
+ #if HAVE_SETLOCALE
+ char *locale = setlocale(LC_CTYPE, NULL);
+@@ -253,10 +254,10 @@
+ regex_len = strlen(regex);
+ if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) {
+ /*
+- * We use a quick pcre_info() check to see whether cache is corrupted, and if it
++ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it
+ * is, we flush it and compile the pattern from scratch.
+ */
+- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) {
++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) {
+ zend_hash_clean(&PCRE_G(pcre_cache));
+ } else {
+ #if HAVE_SETLOCALE
+--- a/ext/pcre/php_pcre.def.orig 2007-02-26 06:38:34.000000000 -0600
++++ b/ext/pcre/php_pcre.def 2012-05-12 12:28:28.000000000 -0500
+@@ -4,7 +4,6 @@
+ php_pcre_exec
+ php_pcre_get_substring
+ php_pcre_get_substring_list
+-php_pcre_info
+ php_pcre_maketables
+ php_pcre_study
+ php_pcre_version
+--- a/main/php_compat.h.orig 2010-01-03 03:23:27.000000000 -0600
++++ b/main/php_compat.h 2012-05-12 12:28:28.000000000 -0500
+@@ -34,7 +34,6 @@
+ #define pcre_exec php_pcre_exec
+ #define pcre_get_substring php_pcre_get_substring
+ #define pcre_get_substring_list php_pcre_get_substring_list
+-#define pcre_info php_pcre_info
+ #define pcre_maketables php_pcre_maketables
+ #define pcre_study php_pcre_study
+ #define pcre_version php_pcre_version
</ins></span></pre></div>
<a id="trunkdportslangphpfilespatchphp52scriptsphpconfigindifffromrev126371trunkdportslangphp52filespatchscriptsphpconfigindiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php52-scripts-php-config.in.diff (from rev 126371, trunk/dports/lang/php52/files/patch-scripts-php-config.in.diff) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-scripts-php-config.in.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-scripts-php-config.in.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- a/scripts/php-config.in.orig 2007-08-24 06:44:10.000000000 -0500
++++ b/scripts/php-config.in 2009-08-10 16:33:49.000000000 -0500
+@@ -6,7 +6,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="trunkdportslangphpfilespatchphp52unixODBCdifffromrev126398trunkdportslangphpfilespatchphp53unixODBCdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/patch-php52-unixODBC.diff (from rev 126398, trunk/dports/lang/php/files/patch-php53-unixODBC.diff) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/patch-php52-unixODBC.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php52-unixODBC.diff 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+--- 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
++:<<'MACPORTS_DISABLED'
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(adabas,,
+ [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
+@@ -404,6 +405,7 @@
+ AC_MSG_RESULT([$ext_output])
+ fi
+ fi
++MACPORTS_DISABLED
+
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH(unixODBC,,
</ins></span></pre></div>
<a id="trunkdportslangphpfilesphp52fromrev126371trunkdportslangphpfilesphp53"></a>
<div class="copfile"><h4>Copied: trunk/dports/lang/php/files/php52 (from rev 126371, trunk/dports/lang/php/files/php53) (0 => 128130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/files/php52 (rev 0)
+++ trunk/dports/lang/php/files/php52 2014-11-14 05:02:56 UTC (rev 128130)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+bin/php52
+bin/php-config52
+bin/phpize52
+share/man/man1/php52.1.gz
+share/man/man1/php-config52.1.gz
+share/man/man1/phpize52.1.gz
</ins></span></pre>
</div>
</div>
</body>
</html>