[94479] trunk/dports/python/py-mysql/Portfile

[blair at macports.org]

Revision: 94479
          https://trac.macports.org/changeset/94479
Author:   blair at macports.org
Date:     2012-06-20 07:15:58 -0700 (Wed, 20 Jun 2012)
Log Message:
-----------
py-mysqldb: restore the mysql5 variant.

Modified Paths:
--------------
    trunk/dports/python/py-mysql/Portfile

Modified: trunk/dports/python/py-mysql/Portfile
===================================================================
--- trunk/dports/python/py-mysql/Portfile	2012-06-20 06:52:11 UTC (rev 94478)
+++ trunk/dports/python/py-mysql/Portfile	2012-06-20 14:15:58 UTC (rev 94479)
@@ -39,9 +39,10 @@
 
     pre-configure {
         if {![variant_isset mysql4] &&
+            ![variant_isset mysql5] &&
             ![variant_isset mysql51] &&
             ![variant_isset mysql55]} {
-            return -code error "you must select either mysql4, mysql51 or mysql55"
+            return -code error "you must select either mysql4, mysql5, mysql51 or mysql55"
         }
     }
 
@@ -54,17 +55,22 @@
 
     set mysql_config {}
 
-    variant mysql4 conflicts mysql51 mysql55 description {Build with MySQL 4} {
+    variant mysql4 conflicts mysql5 mysql51 mysql55 description {Build with MySQL 4} {
         depends_lib-append  port:mysql4
         set mysql_config bin/mysql_config
     }
 
-    variant mysql51 conflicts mysql4 mysql55 description {Build with MySQL 5.1} {
+    variant mysql5 conflicts mysql4 mysql51 mysql55 description {Build with MySQL 5.1} {
+        depends_lib-append  port:mysql5
+        set mysql_config lib/mysql51/bin/mysql_config
+    }
+
+    variant mysql51 conflicts mysql4 mysql5 mysql55 description {Build with MySQL 5.1} {
         depends_lib-append  port:mysql51
         set mysql_config lib/mysql51/bin/mysql_config
     }
 
-    variant mysql55 conflicts mysql4 mysql51 description {Build with MySQL 5.5} {
+    variant mysql55 conflicts mysql4 mysql5 mysql51 description {Build with MySQL 5.5} {
         depends_lib-append  port:mysql55
         set mysql_config lib/mysql55/bin/mysql_config
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120620/84427634/attachment.html>