[70654] trunk/dports/php/php5-mysql/Portfile

[ryandesign at macports.org]

Revision: 70654
          http://trac.macports.org/changeset/70654
Author:   ryandesign at macports.org
Date:     2010-08-16 06:06:34 -0700 (Mon, 16 Aug 2010)
Log Message:
-----------
php5-mysql: reinstate mysqlnd variant which now works again as of php5 @5.3.3_1; see #25789

Modified Paths:
--------------
    trunk/dports/php/php5-mysql/Portfile

Modified: trunk/dports/php/php5-mysql/Portfile
===================================================================
--- trunk/dports/php/php5-mysql/Portfile	2010-08-16 12:58:18 UTC (rev 70653)
+++ trunk/dports/php/php5-mysql/Portfile	2010-08-16 13:06:34 UTC (rev 70654)
@@ -26,8 +26,6 @@
 
 use_parallel_build              yes
 
-# mysqlnd is broken as of php 5.3.3; see http://bugs.php.net/bug.php?id=52417
-if {0} {
 variant mysqlnd conflicts mysql4 mysql5 description {Use MySQL Native Driver} {
     configure.args-append       --with-mysql=mysqlnd \
                                 --with-mysqli=mysqlnd \
@@ -42,16 +40,15 @@
         }
     }
 }
-}
 
-variant mysql4 conflicts mysql5 description {Use MySQL 4 libraries} {
+variant mysql4 conflicts mysql5 mysqlnd description {Use MySQL 4 libraries} {
     depends_lib-append          port:mysql4
     archcheck.files-append      lib/mysql/libmysqlclient.dylib
     configure.args-append       --with-mysql=${prefix} \
                                 --with-pdo-mysql=${prefix}
 }
 
-variant mysql5 conflicts mysql4 description {Use MySQL 5 libraries} {
+variant mysql5 conflicts mysql4 mysqlnd description {Use MySQL 5 libraries} {
     depends_lib-append          path:bin/mysql_config5:mysql5
     archcheck.files-append      lib/mysql5/mysql/libmysqlclient.dylib
     configure.args-append       --with-mysql=${workpath}/mysql5 \
@@ -66,5 +63,5 @@
 }
 
 if {![variant_isset mysql4] && ![variant_isset mysql5]} {
-    default_variants +mysql5
+    default_variants +mysqlnd
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100816/6e7b001c/attachment.html>