[99852] branches/pixilla-mysqls-55/dports/databases/dbslayer/Portfile

[pixilla at macports.org]

Revision: 99852
          https://trac.macports.org/changeset/99852
Author:   pixilla at macports.org
Date:     2012-11-19 04:25:08 -0800 (Mon, 19 Nov 2012)
Log Message:
-----------
databases/dbslayer:
- Use new mysql ports.

Modified Paths:
--------------
    branches/pixilla-mysqls-55/dports/databases/dbslayer/Portfile

Modified: branches/pixilla-mysqls-55/dports/databases/dbslayer/Portfile
===================================================================
--- branches/pixilla-mysqls-55/dports/databases/dbslayer/Portfile	2012-11-19 10:21:11 UTC (rev 99851)
+++ branches/pixilla-mysqls-55/dports/databases/dbslayer/Portfile	2012-11-19 12:25:08 UTC (rev 99852)
@@ -5,6 +5,7 @@
 
 name                dbslayer
 version             beta-12
+revision            1
 categories          databases lang www
 maintainers         pixilla openmaintainer
 platforms           darwin
@@ -49,16 +50,8 @@
             ${destroot}${prefix}/share/${name}
 }
 
-variant mysql5 \
-    conflicts mysql51 mysql55 mariadb percona \
-    description {build with mysql5 port} {
-
-    depends_lib-append      port:mysql5
-    configure.args-append   --with-mysql-config=${prefix}/lib/mysql5/bin/mysql_config
-}
-
 variant mysql51 \
-    conflicts mysql5 mysql55 mariadb percona \
+    conflicts mysql5 mysql55 mariadb55 percona55 \
     description {build with mysql51 port} {
 
     depends_lib-append      port:mysql51
@@ -66,50 +59,60 @@
 }
 
 variant mysql55 \
-    conflicts mysql5 mysql51 mariadb percona \
+    conflicts mysql5 mysql51 mariadb55 percona55 \
     description {build with mysql55 port} {
 
     depends_lib-append      port:mysql55
     configure.args-append   --with-mysql-config=${prefix}/lib/mysql55/bin/mysql_config
 }
 
-variant mariadb \
-    conflicts mysql5 mysql51 mysql55 percona \
-    description {build with mariadb port} {
+variant mariadb55 \
+    conflicts mysql5 mysql51 mysql55 percona55 \
+    description {build with mariadb55 port} {
 
-    depends_lib-append      port:mariadb
-    configure.args-append   --with-mysql-config=${prefix}/lib/mariadb/bin/mysql_config
+    depends_lib-append      port:mariadb55
+    configure.args-append   --with-mysql-config=${prefix}/lib/mariadb55/bin/mysql_config
 }
 
-variant percona \
-    conflicts mysql5 mysql51 mysql55 mariadb \
-    description {build with percona port} {
+variant percona55 \
+    conflicts mysql5 mysql51 mysql55 mariadb55 \
+    description {build with percona55 port} {
 
-    depends_lib-append      port:percona
-    configure.args-append   --with-mysql-config=${prefix}/lib/percona/bin/mysql_config
+    depends_lib-append      port:percona55
+    configure.args-append   --with-mysql-config=${prefix}/lib/percona55/bin/mysql_config
 }
 
-if {
+if {[variant_isset mariadb]} {
 
-    ![variant_isset mysql5]
-    && ![variant_isset mysql51]
+    default_variants +mariadb55
+}
+
+if {[variant_isset percona]} {
+
+    default_variants +percona55
+}
+
+if {[variant_isset mysql5]} {
+
+    default_variants +mysql55
+}
+
+if {![variant_isset mysql51]
     && ![variant_isset mysql55]
-    && ![variant_isset mariadb]
-    && ![variant_isset percona]
-} {
-    default_variants    +mysql5
+    && ![variant_isset mariadb55]
+    && ![variant_isset percona55]
+    } {
+
+    default_variants    +mysql55
 }
 pre-fetch {
-    if {
-
-        ![variant_isset mysql5]
-        && ![variant_isset mysql51]
+    if {![variant_isset mysql51]
         && ![variant_isset mysql55]
-        && ![variant_isset mariadb]
-        && ![variant_isset percona]
+        && ![variant_isset mariadb55]
+        && ![variant_isset percona55]
     } {
 
-        return -code error "${name} requires one of these variants: +mysql5, +mysql51, +mysql55, +mariadb or +percona"
+        return -code error "${name} requires one of these variants: +mysql5, +mysql51, +mysql55, +mariadb55 or +percona55"
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121119/b180410a/attachment.html>