[110778] trunk/dports/mail/postfix/Portfile

[pixilla at macports.org]

Revision: 110778
          https://trac.macports.org/changeset/110778
Author:   pixilla at macports.org
Date:     2013-09-05 12:48:07 -0700 (Thu, 05 Sep 2013)
Log Message:
-----------
mail/postfix:
- Remove unintended variant changes in r110777.

Revision Links:
--------------
    https://trac.macports.org/changeset/110777

Modified Paths:
--------------
    trunk/dports/mail/postfix/Portfile

Modified: trunk/dports/mail/postfix/Portfile
===================================================================
--- trunk/dports/mail/postfix/Portfile	2013-09-05 19:42:00 UTC (rev 110777)
+++ trunk/dports/mail/postfix/Portfile	2013-09-05 19:48:07 UTC (rev 110778)
@@ -1,4 +1,3 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
 PortSystem  1.0
@@ -16,8 +15,8 @@
             Postfix act as delivery daemon for ezmlm-idx.
 homepage        http://www.postfix.org/
 platforms       darwin
-checksums       rmd160  c5c7ecdc1a4e27b8eba2125e22f39860488db0e0 \
-                sha256  f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4
+checksums       rmd160 c5c7ecdc1a4e27b8eba2125e22f39860488db0e0 \
+                sha256 f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4
 
 master_sites    http://archive.mgm51.com/mirrors/postfix-source/official/ \
                 http://de.postfix.org/ftpmirror/official/ \
@@ -150,14 +149,6 @@
 sudo launchctl unload -w /System/Library/LaunchDaemons/org.postfix.master.plist
 "
 
-if {[variant_isset mariadb]} {
-    default_variants +mariadb55
-}
-
-if {[variant_isset percona]} {
-    default_variants +percona55
-}
-
 variant pcre description "add pcre support" {
     set CCARGS      [ldelete ${CCARGS} -DNO_PCRE]
     lappend CCARGS  -DHAS_PCRE "-I${prefix}/include"
@@ -184,34 +175,34 @@
 }
 
 # Keep the mysql5 variant until the mysql5 port is replaced_by mysql51 port.
-variant mysql5  conflicts mysql51 mysql55 mariadb55 percona55 description "add MySQL support via mysql5" {
+variant mysql5  conflicts mysql51 mysql55 mariadb percona description "add MySQL support via mysql5" {
     depends_lib-append path:bin/mysql_config5:mysql5
     lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mysql5/mysql"
     lappend AUXLIBS "-L${prefix}/lib/mysql5/mysql" -lmysqlclient -lz -lm
 }
 
-variant mysql51 conflicts mysql5 mysql55 mariadb55 percona55 description "add MySQL support via mysql51" {
+variant mysql51 conflicts mysql5 mysql55 mariadb percona description "add MySQL support via mysql51" {
     depends_lib-append port:mysql51
     lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mysql51/mysql"
     lappend AUXLIBS "-L${prefix}/lib/mysql51/mysql" -lmysqlclient -lz -lm
 }
 
-variant mysql55 conflicts mysql5 mysql51 mariadb55 percona55 description "add MySQL support via mysql55" {
+variant mysql55 conflicts mysql5 mysql51 mariadb percona description "add MySQL support via mysql55" {
     depends_lib-append port:mysql55
     lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mysql55/mysql"
     lappend AUXLIBS "-L${prefix}/lib/mysql55/mysql" -lmysqlclient -lz -lm
 }
 
-variant mariadb55 conflicts mysql5 mysql51 mysql55 percona55 description "add MySQL support via mariadb55" {
-    depends_lib-append port:mariadb55
-    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mariadb55/mysql"
-    lappend AUXLIBS "-L${prefix}/lib/mariadb55/mysql" -lmysqlclient -lz -lm
+variant mariadb conflicts mysql5 mysql51 mysql55 percona description "add MySQL support via mariadb" {
+    depends_lib-append port:mariadb
+    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/mariadb/mysql"
+    lappend AUXLIBS "-L${prefix}/lib/mariadb/mysql" -lmysqlclient -lz -lm
 }
 
-variant percona55 conflicts mysql5 mysql51 mysql55 mariadb55 description "add MySQL support via percona55" {
-    depends_lib-append port:percona55
-    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/percona55/mysql"
-    lappend AUXLIBS "-L${prefix}/lib/percona55/mysql" -lmysqlclient -lz -lm
+variant percona conflicts mysql5 mysql51 mysql55 mariadb description "add MySQL support via percona" {
+    depends_lib-append port:percona
+    lappend CCARGS  -DHAS_MYSQL "-I${prefix}/include/percona/mysql"
+    lappend AUXLIBS "-L${prefix}/lib/percona/mysql" -lmysqlclient -lz -lm
 }
 
 variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 description "add postgresql support via postgresql83" {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130905/76098735/attachment.html>