[149454] trunk/dports/lang/qore-mysql-module/Portfile

[raimue at macports.org]

Revision: 149454
          https://trac.macports.org/changeset/149454
Author:   raimue at macports.org
Date:     2016-06-21 08:09:26 -0700 (Tue, 21 Jun 2016)
Log Message:
-----------
lang/qore-mysql-modules:
Fix error in variant naming, "Variant name mariadb-10.0 contains invalid characters".
Maintainer override as port was broken.

https://lists.macosforge.org/pipermail/macports-dev/2016-June/033120.html

Modified Paths:
--------------
    trunk/dports/lang/qore-mysql-module/Portfile

Modified: trunk/dports/lang/qore-mysql-module/Portfile
===================================================================
--- trunk/dports/lang/qore-mysql-module/Portfile	2016-06-21 13:25:53 UTC (rev 149453)
+++ trunk/dports/lang/qore-mysql-module/Portfile	2016-06-21 15:09:26 UTC (rev 149454)
@@ -19,24 +19,24 @@
                     sha1 5abf5c0ddea7719bee45dae0cbea76d8afe13dbe \
                     rmd160 c3459e518186bfc4176cbb8b06adf5d68bcd4943
 
-variant mariadb conflicts mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb} {}
-variant mariadb-10.0 conflicts mariadb mariadb-10.1 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.0} {}
-variant mariadb-10.1 conflicts mariadb mariadb-10.0 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.1} {}
-variant mysql51 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql55 mysql56 mysql57 percona description {use mysql 5.1} {}
-variant mysql55 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql56 mysql57 percona description {use mysql 5.5} {}
-variant mysql56 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql57 percona description {use mysql 5.6} {}
-variant mysql57 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql56 percona description {use mysql 5.7} {}
-variant percona conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql56 mysql57 description {use percona} {}
+variant mariadb conflicts mariadb100 mariadb101 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb} {}
+variant mariadb100 conflicts mariadb mariadb101 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.0} {}
+variant mariadb101 conflicts mariadb mariadb100 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.1} {}
+variant mysql51 conflicts mariadb mariadb100 mariadb101 mysql55 mysql56 mysql57 percona description {use mysql 5.1} {}
+variant mysql55 conflicts mariadb mariadb100 mariadb101 mysql51 mysql56 mysql57 percona description {use mysql 5.5} {}
+variant mysql56 conflicts mariadb mariadb100 mariadb101 mysql51 mysql55 mysql57 percona description {use mysql 5.6} {}
+variant mysql57 conflicts mariadb mariadb100 mariadb101 mysql51 mysql55 mysql56 percona description {use mysql 5.7} {}
+variant percona conflicts mariadb mariadb100 mariadb101 mysql51 mysql55 mysql56 mysql57 description {use percona} {}
 
-if {![variant_isset mariadb] && ![variant_isset mariadb-10.0] && ![variant_isset mariadb-10.1] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset percona]} {
+if {![variant_isset mariadb] && ![variant_isset mariadb100] && ![variant_isset mariadb101] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset percona]} {
     default_variants +mariadb
 }
 
 if {[variant_isset mariadb]} {
     set mysql_port "mariadb"
-} elseif {[variant_isset mariadb-10.0]} {
+} elseif {[variant_isset mariadb100]} {
     set mysql_port "mariadb-10.0"
-} elseif {[variant_isset mariadb-10.1]} {
+} elseif {[variant_isset mariadb101]} {
     set mysql_port "mariadb-10.1"
 } elseif {[variant_isset mysql51]} {
     set mysql_port "mysql51"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160621/62023502/attachment.html>