[127655] trunk/dports/science

[larryv at macports.org]

Revision: 127655
          https://trac.macports.org/changeset/127655
Author:   larryv at macports.org
Date:     2014-10-31 10:06:47 -0700 (Fri, 31 Oct 2014)
Log Message:
-----------
root5, root6: Add variants for MySQL 5.6 (#45698)

Modified Paths:
--------------
    trunk/dports/science/root5/Portfile
    trunk/dports/science/root6/Portfile

Modified: trunk/dports/science/root5/Portfile
===================================================================
--- trunk/dports/science/root5/Portfile	2014-10-31 16:46:20 UTC (rev 127654)
+++ trunk/dports/science/root5/Portfile	2014-10-31 17:06:47 UTC (rev 127655)
@@ -378,7 +378,7 @@
     depends_lib-append      port:sqlite3
 }
 
-variant mysql conflicts mysql51 mysql55 mariadb percona description {Build with mysql5 support} {
+variant mysql conflicts mysql51 mysql55 mysql56 mariadb percona description {Build with mysql5 support} {
     configure.args-delete   --disable-mysql
     configure.args-append   --enable-mysql \
                             --with-mysql-incdir="${prefix}/include/mysql5/mysql" \
@@ -386,7 +386,7 @@
     depends_lib-append      port:mysql5
 }
 
-variant mysql51 conflicts mysql mysql55 mariadb percona description {Build with mysql51 support} {
+variant mysql51 conflicts mysql mysql55 mysql56 mariadb percona description {Build with mysql51 support} {
     configure.args-delete   --disable-mysql
     configure.args-append   --enable-mysql \
                             --with-mysql-incdir="${prefix}/include/mysql51/mysql" \
@@ -394,7 +394,7 @@
     depends_lib-append      port:mysql51
 }
 
-variant mysql55 conflicts mysql mysql51 mariadb percona description {Build with mysql55 support} {
+variant mysql55 conflicts mysql mysql51 mysql56 mariadb percona description {Build with mysql55 support} {
     configure.args-delete   --disable-mysql
     configure.args-append   --enable-mysql \
                             --with-mysql-incdir="${prefix}/include/mysql55/mysql" \
@@ -402,15 +402,23 @@
     depends_lib-append      port:mysql55
 }
 
-variant mariadb conflicts mysql mysql51 mysql55 percona description {Build with mariadb support} {
+variant mysql56 conflicts mysql mysql51 mysql55 mariadb percona description {Build with mysql56 support} {
     configure.args-delete   --disable-mysql
     configure.args-append   --enable-mysql \
+                            --with-mysql-incdir="${prefix}/include/mysql56/mysql" \
+                            --with-mysql-libdir="${prefix}/lib/mysql56/mysql"
+    depends_lib-append      port:mysql56
+}
+
+variant mariadb conflicts mysql mysql51 mysql55 mysql56 percona description {Build with mariadb support} {
+    configure.args-delete   --disable-mysql
+    configure.args-append   --enable-mysql \
                             --with-mysql-incdir="${prefix}/include/mariadb/mysql" \
                             --with-mysql-libdir="${prefix}/lib/mariadb/mysql"
     depends_lib-append      port:mariadb
 }
 
-variant percona conflicts mysql mysql51 mysql55 mariadb description {Build with percona support} {
+variant percona conflicts mysql mysql51 mysql55 mysql56 mariadb description {Build with percona support} {
     configure.args-delete   --disable-mysql
     configure.args-append   --enable-mysql \
                             --with-mysql-incdir="${prefix}/include/percona/mysql" \

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2014-10-31 16:46:20 UTC (rev 127654)
+++ trunk/dports/science/root6/Portfile	2014-10-31 17:06:47 UTC (rev 127655)
@@ -417,31 +417,37 @@
     depends_lib-append      port:sqlite3
 }
 
-variant mysql conflicts mysql51 mysql55 mariadb percona description {Build with mysql5 support} {
+variant mysql conflicts mysql51 mysql55 mysql56 mariadb percona description {Build with mysql5 support} {
     configure.args-replace  -Dmysql=OFF -Dmysql=ON
     configure.args-append   -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mysql5/bin/mysql_config"
     depends_lib-append      port:mysql5
 }
 
-variant mysql51 conflicts mysql mysql55 mariadb percona description {Build with mysql51 support} {
+variant mysql51 conflicts mysql mysql55 mysql56 mariadb percona description {Build with mysql51 support} {
     configure.args-replace  -Dmysql=OFF -Dmysql=ON
     configure.args-append   -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mysql51/bin/mysql_config"
     depends_lib-append      port:mysql51
 }
 
-variant mysql55 conflicts mysql mysql51 mariadb percona description {Build with mysql55 support} {
+variant mysql55 conflicts mysql mysql51 mysql56 mariadb percona description {Build with mysql55 support} {
     configure.args-replace  -Dmysql=OFF -Dmysql=ON
     configure.args-append   -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mysql55/bin/mysql_config"
     depends_lib-append      port:mysql55
 }
 
-variant mariadb conflicts mysql mysql51 mysql55 percona description {Build with mariadb support} {
+variant mysql56 conflicts mysql mysql51 mysql55 mariadb percona description {Build with mysql56 support} {
     configure.args-replace  -Dmysql=OFF -Dmysql=ON
+    configure.args-append   -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mysql56/bin/mysql_config"
+    depends_lib-append      port:mysql56
+}
+
+variant mariadb conflicts mysql mysql51 mysql55 mysql56 percona description {Build with mariadb support} {
+    configure.args-replace  -Dmysql=OFF -Dmysql=ON
     configure.args-append   -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/mariadb/bin/mysql_config"
     depends_lib-append      port:mariadb
 }
 
-variant percona conflicts mysql mysql51 mysql55 mariadb description {Build with percona support} {
+variant percona conflicts mysql mysql51 mysql55 mysql56 mariadb description {Build with percona support} {
     configure.args-replace  -Dmysql=OFF -Dmysql=ON
     configure.args-append   -DMYSQL_CONFIG_EXECUTABLE=${prefix}"/lib/percona/bin/mysql_config"
     depends_lib-append      port:percona
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141031/52ee8bf2/attachment-0001.html>