Modified: branches/pixilla-mysqls-55/dports/mail/dovecot2/Portfile (100168 => 100169)

--- branches/pixilla-mysqls-55/dports/mail/dovecot2/Portfile	2012-12-01 14:22:50 UTC (rev 100168)
+++ branches/pixilla-mysqls-55/dports/mail/dovecot2/Portfile	2012-12-01 16:20:30 UTC (rev 100169)
@@ -61,6 +61,14 @@
 }
 configure.cppflags  -I${prefix}/include/openssl
 
+if {[variant_isset mariadb]} {
+    default_variants +mariadb55
+}
+
+if {[variant_isset percona]} {
+    default_variants +percona55
+}
+
 variant postgresql82  \
     conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 \
     description "Enable PostgreSQL 8.2 support" {
@@ -116,7 +124,7 @@
 }
 
 variant mysql5 \
-    conflicts mysql51 mysql55 mariadb percona \
+    conflicts mysql51 mysql55 mariadb55 percona55 \
     description "Enable MySQL 5.1 support" {
 
     depends_lib-append          port:mysql5
@@ -125,7 +133,7 @@
 }
 
 variant mysql51 \
-    conflicts mysql5 mysql55 mariadb percona \
+    conflicts mysql5 mysql55 mariadb55 percona55 \
     description "Enable MySQL 5.1 support" {
 
     depends_lib-append          port:mysql51
@@ -134,7 +142,7 @@
 }
 
 variant mysql55 \
-    conflicts mysql5 mysql51 mariadb percona \
+    conflicts mysql5 mysql51 mariadb55 percona55 \
     description "Enable MySQL 5.5 support" {
 
     depends_lib-append          port:mysql55
@@ -142,20 +150,20 @@
     configure.args-append       --with-mysql
 }
 
-variant mariadb \
-    conflicts mysql5 mysql51 mysql55 percona \
-    description "Enable MariaDB (MySQL) support" {
+variant mariadb55 \
+    conflicts mysql5 mysql51 mysql55 percona55 \
+    description "Enable MariaDB 5.5 (MySQL) support" {
 
-    depends_lib-append          port:mariadb
-    configure.env-append        MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
+    depends_lib-append          port:mariadb55
+    configure.env-append        MYSQL_CONFIG=${prefix}/lib/mariadb55/bin/mysql_config
     configure.args-append       --with-mysql
 }
 
-variant percona \
-    conflicts mysql5 mysql51 mysql55 mariadb \
-    description "Enable Percona (MySQL) support" {
-        depends_lib-append          port:percona
-        configure.env-append        MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
+variant percona55 \
+    conflicts mysql5 mysql51 mysql55 mariadb55 \
+    description "Enable Percona 5.5 (MySQL) support" {
+        depends_lib-append          port:percona55
+        configure.env-append        MYSQL_CONFIG=${prefix}/lib/percona55/bin/mysql_config
         configure.args-append       --with-mysql
 }