<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f9c671038a57fc80b6ebcc83f4ff90f30a558292">https://github.com/macports/macports-ports/commit/f9c671038a57fc80b6ebcc83f4ff90f30a558292</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f9c671038a57fc80b6ebcc83f4ff90f30a558292
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Jan 17 16:59:43 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> php: Remove variants from php52-odbc
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In PHP 5.2, the odbc extension didn't support using libiodbc, so don't
</span><span style='display:block; white-space:pre;color:#404040;'> offer the user a choice to use that; just always use unixODBC.
</span>---
lang/php/Portfile | 14 +++++++++-----
lang/php/files/patch-php52-iODBC.diff | 18 ------------------
2 files changed, 9 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/Portfile b/lang/php/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 065391a..c5972dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/php/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1386,6 +1386,7 @@ subport ${php}-odbc {
</span>
long_description ${description}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${branch} 5.3] >= 0} {
</span> variant iodbc conflicts unixodbc description {Use iODBC} {
depends_lib-append port:libiodbc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1401,7 +1402,14 @@ subport ${php}-odbc {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant unixodbc conflicts iodbc description {Use unixODBC} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant unixodbc conflicts iodbc description {Use unixODBC} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset iodbc] && ![variant_isset unixodbc]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +unixodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset unixodbc] || [vercmp ${branch} 5.3] < 0} {
</span> depends_lib-append port:unixODBC
patchfiles-append patch-${php}-unixODBC.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1415,10 +1423,6 @@ subport ${php}-odbc {
</span> configure.args-append --with-unixODBC
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset iodbc] && ![variant_isset unixodbc]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +unixodbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {[vercmp ${branch} 5.5] >= 0} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/php/files/patch-php52-iODBC.diff b/lang/php/files/patch-php52-iODBC.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92ff1b4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/php/files/patch-php52-iODBC.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ext/odbc/config.m4.orig 2007-07-31 08:02:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ext/odbc/config.m4 2015-04-17 20:30:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,6 +99,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl configure options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+:<<'MACPORTS_DISABLED'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH(adabas,,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-adabas[=DIR] Include Adabas D support [/usr/local]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,6 +365,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MACPORTS_DISABLED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$ODBC_TYPE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PHP_ARG_WITH(iodbc,,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ --with-iodbc[=DIR] Include iODBC support [/usr/local]])
</span></pre><pre style='margin:0'>
</pre>