Revision
92479
Author
pixilla@macports.org
Date
2012-04-29 16:36:07 -0700 (Sun, 29 Apr 2012)

Log Message

mail/dovecot2:
- Fix variant conflicts. Closes #34259

Modified Paths

Diff

Modified: trunk/dports/mail/dovecot2/Portfile (92478 => 92479)


--- trunk/dports/mail/dovecot2/Portfile	2012-04-29 23:29:03 UTC (rev 92478)
+++ trunk/dports/mail/dovecot2/Portfile	2012-04-29 23:36:07 UTC (rev 92479)
@@ -62,76 +62,76 @@
 }
 configure.cppflags  -I${prefix}/include/openssl
 
-variant postgresql82 description {Enable PostgreSQL 8.2 support} { \
-    conflicts postgresql83 postgresql84 postgresql90 postgresql91
-
-    depends_lib-append          port:postgresql82
-    configure.env-append        PG_CONFIG=${prefix}/lib/postgresql82/bin/pg_config
-    configure.args-append       --with-pgsql
+variant postgresql82  \
+    conflicts postgresql83 postgresql84 postgresql90 postgresql91 \
+    description "Enable PostgreSQL 8.2 support" {
+        depends_lib-append          port:postgresql82
+        configure.env-append        PG_CONFIG=${prefix}/lib/postgresql82/bin/pg_config
+        configure.args-append       --with-pgsql
 }
 
-variant postgresql83 description {Enable PostgreSQL 8.3 support} { \
-    conflicts postgresql82 postgresql84 postgresql90 postgresql91
-
-    depends_lib-append          port:postgresql83
-    configure.env-append        PG_CONFIG=${prefix}/lib/postgresql83/bin/pg_config
-    configure.args-append       --with-pgsql
+variant postgresql83 \
+    conflicts postgresql82 postgresql84 postgresql90 postgresql91 \
+    description "Enable PostgreSQL 8.3 support" { 
+        depends_lib-append          port:postgresql83
+        configure.env-append        PG_CONFIG=${prefix}/lib/postgresql83/bin/pg_config
+        configure.args-append       --with-pgsql
 }
 
-variant postgresql84 description {Enable PostgreSQL 8.4 support} { \
-    conflicts postgresql82 postgresql83 postgresql90 postgresql91
-
-    depends_lib-append          port:postgresql84
-    configure.env-append        PG_CONFIG=${prefix}/lib/postgresql84/bin/pg_config
-    configure.args-append       --with-pgsql
+variant postgresql84 \
+    conflicts postgresql82 postgresql83 postgresql90 postgresql91 \
+    description "Enable PostgreSQL 8.4 support" { 
+        depends_lib-append          port:postgresql84
+        configure.env-append        PG_CONFIG=${prefix}/lib/postgresql84/bin/pg_config
+        configure.args-append       --with-pgsql
 }
 
-variant postgresql90 description {Enable PostgreSQL 9.0 support} { \
-    conflicts postgresql82 postgresql83 postgresql84 postgresql91
-
-    depends_lib-append          port:postgresql90
-    configure.env-append        PG_CONFIG=${prefix}/lib/postgresql90/bin/pg_config
-    configure.args-append       --with-pgsql
+variant postgresql90 \
+    conflicts postgresql82 postgresql83 postgresql84 postgresql91 \
+    description "Enable PostgreSQL 9.0 support" { 
+        depends_lib-append          port:postgresql90
+        configure.env-append        PG_CONFIG=${prefix}/lib/postgresql90/bin/pg_config
+        configure.args-append       --with-pgsql
 }
 
-variant postgresql91 description {Enable PostgreSQL 9.1 support} { \
-    conflicts postgresql82 postgresql83 postgresql84 postgresql90
-
-    depends_lib-append          port:postgresql91
-    configure.env-append        PG_CONFIG=${prefix}/lib/postgresql91/bin/pg_config
-    configure.args-append       --with-pgsql
+variant postgresql91 \
+    conflicts postgresql82 postgresql83 postgresql84 postgresql90 \
+    description "Enable PostgreSQL 9.1 support" { 
+        depends_lib-append          port:postgresql91
+        configure.env-append        PG_CONFIG=${prefix}/lib/postgresql91/bin/pg_config
+        configure.args-append       --with-pgsql
 }
 
-variant mysql5 description {Enable MySQL 5.1 support} {
-    conflicts mysql55 mariadb percona
-
-    depends_lib-append          port:mysql5
-    configure.env-append        MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
-    configure.args-append       --with-mysql
+variant mysql5 \
+    conflicts mysql55 mariadb percona \
+    description "Enable MySQL 5.1 support" {
+        depends_lib-append          port:mysql5
+        configure.env-append        MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
+        configure.args-append       --with-mysql
 }
 
-variant mysql55 description {Enable MySQL 5.5 support} {
-    conflicts mysql5 mariadb percona
-
-    depends_lib-append          port:mysql55
-    configure.env-append        MYSQL_CONFIG=${prefix}/lib/mysql55/bin/mysql_config
-    configure.args-append       --with-mysql
+variant mysql55 \
+    conflicts mysql5 mariadb percona \
+    description "Enable MySQL 5.5 support" {
+        depends_lib-append          port:mysql55
+        configure.env-append        MYSQL_CONFIG=${prefix}/lib/mysql55/bin/mysql_config
+        configure.args-append       --with-mysql
 }
 
-variant mariadb description {Enable MariaDB (MySQL) support} {
-    conflicts mysql5 mysql55 percona
-
-    depends_lib-append          port:mariadb
-    configure.env-append        MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
-    configure.args-append       --with-mysql
+variant mariadb \
+    conflicts mysql5 mysql55 percona \
+    description "Enable MariaDB (MySQL) support" {
+        depends_lib-append          port:mariadb
+        configure.env-append        MYSQL_CONFIG=${prefix}/lib/mariadb/bin/mysql_config
+        configure.args-append       --with-mysql
 }
 
-variant percona description {Enable Percona (MySQL) support} {
-    conflicts mysql5 mysql55 mariadb
-
-    depends_lib-append          port:percona
-    configure.env-append        MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
-    configure.args-append       --with-mysql
+variant percona \
+    conflicts mysql5 mysql55 mariadb \
+    description "Enable Percona (MySQL) support" {
+        depends_lib-append          port:percona
+        configure.env-append        MYSQL_CONFIG=${prefix}/lib/percona/bin/mysql_config
+        configure.args-append       --with-mysql
 }
 
 variant ldap description {Enable LDAP support} {