[58290] trunk/dports/www/redland/Portfile

[ryandesign at macports.org]

Revision: 58290
          http://trac.macports.org/changeset/58290
Author:   ryandesign at macports.org
Date:     2009-09-24 21:43:22 -0700 (Thu, 24 Sep 2009)
Log Message:
-----------
redland: fix conflict markers on remaining mysql variants

Modified Paths:
--------------
    trunk/dports/www/redland/Portfile

Modified: trunk/dports/www/redland/Portfile
===================================================================
--- trunk/dports/www/redland/Portfile	2009-09-25 04:42:19 UTC (rev 58289)
+++ trunk/dports/www/redland/Portfile	2009-09-25 04:43:22 UTC (rev 58290)
@@ -51,12 +51,12 @@
     depends_lib-append port:db46
 }
  
-variant mysql4 conflicts mysql3 mysql5 {
+variant mysql4 conflicts mysql5 {
     configure.args-delete --with-mysql=no
     depends_lib-append port:mysql4
 }
 
-variant mysql5 conflicts mysql3 mysql4 {
+variant mysql5 conflicts mysql4 {
     configure.args-delete --with-mysql=no
     depends_lib-append path:bin/mysql_config5:mysql5
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090924/6f2e0cc4/attachment.html>