Ticket #36836: akonadi-mysql56.diff

File akonadi-mysql56.diff, 2.6 KB (added by ryandesign (Ryan Carsten Schmidt), 11 years ago)

proposed patch

  • Portfile

     
    103103}
    104104
    105105variant mysql5 \
    106    conflicts sqlite mysql51 mysql55 mariadb percona \
     106   conflicts sqlite mysql51 mysql55 mysql56 mariadb percona \
    107107   description {build with mysql5 port} {
    108108
    109109   depends_lib-append      port:qt4-mac-mysql5-plugin
     
    113113}
    114114
    115115variant mysql51 \
    116    conflicts sqlite mysql5 mysql55 mariadb percona \
     116   conflicts sqlite mysql5 mysql55 mysql56 mariadb percona \
    117117   description {build with mysql51 port} {
    118118
    119119   depends_lib-append      port:qt4-mac-mysql51-plugin
     
    123123}
    124124
    125125variant mysql55 \
    126    conflicts sqlite mysql5 mysql51 mariadb percona \
     126   conflicts sqlite mysql5 mysql51 mysql56 mariadb percona \
    127127   description {build with mysql55 port} {
    128128
    129129   depends_lib-append      port:qt4-mac-mysql55-plugin
     
    132132                           -DMYSQLD_EXECUTABLE=${prefix}/lib/mysql55/bin/mysqld
    133133}
    134134
     135variant mysql56 \
     136   conflicts sqlite mysql5 mysql51 mysql55 mariadb percona \
     137   description {build with mysql56 port} {
     138
     139   depends_lib-append      port:qt4-mac-mysql56-plugin
     140   depends_run-append      port:mysql56-server
     141   configure.args-append   -DDATABASE_BACKEND=MYSQL \
     142                           -DMYSQLD_EXECUTABLE=${prefix}/lib/mysql56/bin/mysqld
     143}
     144
    135145variant mariadb \
    136    conflicts sqlite mysql5 mysql51 mysql55 percona \
     146   conflicts sqlite mysql5 mysql51 mysql55 mysql56 percona \
    137147   description {build with mariadb port} {
    138148
    139149   depends_lib-append      port:qt4-mac-mariadb-plugin
     
    143153}
    144154
    145155variant percona \
    146    conflicts sqlite mysql5 mysql51 mysql55 mariadb \
     156   conflicts sqlite mysql5 mysql51 mysql55 mysql56 mariadb \
    147157   description {build with percona port} {
    148158
    149159   depends_lib-append      port:qt4-mac-percona-plugin
     
    153163}
    154164
    155165variant sqlite \
    156    conflicts mysql5 mysql51 mysql55 mariadb percona \
     166   conflicts mysql5 mysql51 mysql55 mysql56 mariadb percona \
    157167   description {Use sqlite backend instead of MySQL} {
    158168
    159169   depends_lib-append      port:qt4-mac-sqlite3-plugin         
     
    161171                           -DMYSQLD_EXECUTABLE=Off
    162172}
    163173
    164 if {![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mariadb] && ![variant_isset percona] && ![variant_isset sqlite]} {
     174if {![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona] && ![variant_isset sqlite]} {
    165175    default_variants +mysql5
    166176}
    167177