Revision: 70329 http://trac.macports.org/changeset/70329 Author: ryandesign@macports.org Date: 2010-08-05 23:33:50 -0700 (Thu, 05 Aug 2010) Log Message: ----------- php5-odbc: give the choice between using unixodbc and iodbc; see #25967 Modified Paths: -------------- trunk/dports/php/php5-odbc/Portfile Added Paths: ----------- trunk/dports/php/php5-odbc/files/patch-iODBC.diff Modified: trunk/dports/php/php5-odbc/Portfile =================================================================== --- trunk/dports/php/php5-odbc/Portfile 2010-08-06 03:51:23 UTC (rev 70328) +++ trunk/dports/php/php5-odbc/Portfile 2010-08-06 06:33:50 UTC (rev 70329) @@ -17,11 +17,22 @@ sha1 79ea4ee3da3a7542d1e348ac963a5b38bcbb4b6b \ rmd160 60a8aac0d51511ecaf8dcad9d31bdf072c0c99cf -depends_lib-append port:unixODBC +use_parallel_build yes -patchfiles-append patch-unixODBC.diff +variant iodbc conflicts unixodbc description {Use unixODBC} { + depends_lib-append port:libiodbc + patchfiles-append patch-iODBC.diff + configure.args-append --with-iODBC=${prefix} \ + --with-pdo-odbc=iODBC,${prefix} +} -configure.args-append --with-unixODBC=${prefix} \ +variant unixodbc conflicts iodbc description {Use iODBC} { + depends_lib-append port:unixODBC + patchfiles-append patch-unixODBC.diff + configure.args-append --with-unixODBC=${prefix} \ --with-pdo-odbc=unixODBC,${prefix} +} -use_parallel_build yes +if {![variant_isset iodbc]} { + default_variants +unixodbc +} Added: trunk/dports/php/php5-odbc/files/patch-iODBC.diff =================================================================== --- trunk/dports/php/php5-odbc/files/patch-iODBC.diff (rev 0) +++ trunk/dports/php/php5-odbc/files/patch-iODBC.diff 2010-08-06 06:33:50 UTC (rev 70329) @@ -0,0 +1,18 @@ +--- 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,,