Ignore:
Timestamp:
Jun 21, 2016, 3:09:26 PM (2 years ago)
Author:
raimue@…
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/qore-mysql-module/Portfile

    r149320 r149454  
    2020                    rmd160 c3459e518186bfc4176cbb8b06adf5d68bcd4943
    2121
    22 variant mariadb conflicts mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb} {}
    23 variant mariadb-10.0 conflicts mariadb mariadb-10.1 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.0} {}
    24 variant mariadb-10.1 conflicts mariadb mariadb-10.0 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.1} {}
    25 variant mysql51 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql55 mysql56 mysql57 percona description {use mysql 5.1} {}
    26 variant mysql55 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql56 mysql57 percona description {use mysql 5.5} {}
    27 variant mysql56 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql57 percona description {use mysql 5.6} {}
    28 variant mysql57 conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql56 percona description {use mysql 5.7} {}
    29 variant percona conflicts mariadb mariadb-10.0 mariadb-10.1 mysql51 mysql55 mysql56 mysql57 description {use percona} {}
     22variant mariadb conflicts mariadb100 mariadb101 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb} {}
     23variant mariadb100 conflicts mariadb mariadb101 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.0} {}
     24variant mariadb101 conflicts mariadb mariadb100 mysql51 mysql55 mysql56 mysql57 percona description {use mariadb-10.1} {}
     25variant mysql51 conflicts mariadb mariadb100 mariadb101 mysql55 mysql56 mysql57 percona description {use mysql 5.1} {}
     26variant mysql55 conflicts mariadb mariadb100 mariadb101 mysql51 mysql56 mysql57 percona description {use mysql 5.5} {}
     27variant mysql56 conflicts mariadb mariadb100 mariadb101 mysql51 mysql55 mysql57 percona description {use mysql 5.6} {}
     28variant mysql57 conflicts mariadb mariadb100 mariadb101 mysql51 mysql55 mysql56 percona description {use mysql 5.7} {}
     29variant percona conflicts mariadb mariadb100 mariadb101 mysql51 mysql55 mysql56 mysql57 description {use percona} {}
    3030
    31 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]} {
     31if {![variant_isset mariadb] && ![variant_isset mariadb100] && ![variant_isset mariadb101] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mysql57] && ![variant_isset percona]} {
    3232    default_variants +mariadb
    3333}
     
    3535if {[variant_isset mariadb]} {
    3636    set mysql_port "mariadb"
    37 } elseif {[variant_isset mariadb-10.0]} {
     37} elseif {[variant_isset mariadb100]} {
    3838    set mysql_port "mariadb-10.0"
    39 } elseif {[variant_isset mariadb-10.1]} {
     39} elseif {[variant_isset mariadb101]} {
    4040    set mysql_port "mariadb-10.1"
    4141} elseif {[variant_isset mysql51]} {
Note: See TracChangeset for help on using the changeset viewer.