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

[pixilla at macports.org]

Revision: 120024
          https://trac.macports.org/changeset/120024
Author:   pixilla at macports.org
Date:     2014-05-13 18:13:29 -0700 (Tue, 13 May 2014)
Log Message:
-----------
python/py-mysql:
- If legacy +mysql5 variant change to replacement +mysql51 variant. See #43431

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

Modified: trunk/dports/python/py-mysql/Portfile
===================================================================
--- trunk/dports/python/py-mysql/Portfile	2014-05-14 00:58:13 UTC (rev 120023)
+++ trunk/dports/python/py-mysql/Portfile	2014-05-14 01:13:29 UTC (rev 120024)
@@ -40,13 +40,12 @@
 
     pre-configure {
         if {![variant_isset mysql4] &&
-            ![variant_isset mysql5] &&
             ![variant_isset mysql51] &&
             ![variant_isset mysql55] &&
             ![variant_isset mysql56] &&
             ![variant_isset mariadb55] &&
             ![variant_isset percona55]} {
-            return -code error "you must select either mysql4, mysql5, mysql51, mysql55, mysql55, mysql56, mariadb55 or percona55"
+            return -code error "you must select either mysql4, mysql51, mysql55, mysql55, mysql56, mariadb55 or percona55"
         }
     }
 
@@ -59,44 +58,44 @@
 
     set mysql_config {}
 
-    variant mysql4 conflicts mysql5 mysql51 mysql55 mysql56 mariadb55 percona55 description {Build with mysql4} {
+    variant mysql4 conflicts mysql51 mysql55 mysql56 mariadb55 percona55 description {Build with mysql4} {
         depends_lib-append  port:mysql4
         set mysql_config bin/mysql_config
     }
 
-    variant mysql5 conflicts mysql4 mysql51 mysql55 mysql56 mariadb55 percona55 description {Build with mysql5} {
-        depends_lib-append  port:mysql5
-        set mysql_config lib/mysql5/bin/mysql_config
-    }
-
-    variant mysql51 conflicts mysql4 mysql5 mysql55 mysql56 mariadb55 percona55 description {Build with mysql51} {
+    variant mysql51 conflicts mysql4 mysql55 mysql56 mariadb55 percona55 description {Build with mysql51} {
         depends_lib-append  port:mysql51
         set mysql_config lib/mysql51/bin/mysql_config
     }
 
-    variant mysql55 conflicts mysql4 mysql5 mysql51 mysql56 mariadb55 percona55 description {Build with mysql55} {
+    variant mysql55 conflicts mysql4 mysql51 mysql56 mariadb55 percona55 description {Build with mysql55} {
         depends_lib-append  port:mysql55
         set mysql_config lib/mysql55/bin/mysql_config
     }
 
-    variant mysql56 conflicts mysql4 mysql5 mysql51 mysql55 mariadb55 percona55 description {Build with mysql56} {
+    variant mysql56 conflicts mysql4 mysql51 mysql55 mariadb55 percona55 description {Build with mysql56} {
         depends_lib-append  port:mysql56
         set mysql_config lib/mysql56/bin/mysql_config
     }
 
-    variant mariadb55 conflicts mysql4 mysql5 mysql51 mysql55 mysql56 percona55 description {Build with mariadb55} {
+    variant mariadb55 conflicts mysql4 mysql51 mysql55 mysql56 percona55 description {Build with mariadb55} {
         depends_lib-append  port:mariadb
         set mysql_config lib/mariadb/bin/mysql_config
     }
 
-    variant percona55 conflicts mysql4 mysql5 mysql51 mysql55 mysql56 mariadb55 description {Build with percona55} {
+    variant percona55 conflicts mysql4 mysql51 mysql55 mysql56 mariadb55 description {Build with percona55} {
         depends_lib-append  port:percona
         set mysql_config lib/percona/bin/mysql_config
     }
 
-    if {![variant_isset mysql4] && ![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb55] && ![variant_isset percona55]} {
-        default_variants +mariadb55
+    # If legacy +mysql5 variant change to replacement +mysql51 variant.
+    if {[variant_isset mysql5]} {
+        default_variants-append +mysql51
     }
 
+    if {![variant_isset mysql4] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb55] && ![variant_isset percona55]} {
+        default_variants-append +mariadb55
+    }
+
     livecheck.type      none
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140513/e55f1ec4/attachment-0001.html>