[79113] trunk/dports

[ryandesign at macports.org]

Revision: 79113
          http://trac.macports.org/changeset/79113
Author:   ryandesign at macports.org
Date:     2011-06-02 04:26:32 -0700 (Thu, 02 Jun 2011)
Log Message:
-----------
qt3, qt3-mac, qt4-mac and qt4-mac-devel conflict with one another; see #13640

Modified Paths:
--------------
    trunk/dports/aqua/qt3-mac/Portfile
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/aqua/qt4-mac-devel/Portfile
    trunk/dports/x11/qt3/Portfile

Modified: trunk/dports/aqua/qt3-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt3-mac/Portfile	2011-06-02 11:22:16 UTC (rev 79112)
+++ trunk/dports/aqua/qt3-mac/Portfile	2011-06-02 11:26:32 UTC (rev 79113)
@@ -3,7 +3,7 @@
 PortSystem		1.0
 
 name			qt3-mac
-conflicts		qt4-mac qt4-mac-devel
+conflicts		qt3 qt4-mac qt4-mac-devel
 version			3.3.8b
 revision                2
 categories		aqua

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2011-06-02 11:22:16 UTC (rev 79112)
+++ trunk/dports/aqua/qt4-mac/Portfile	2011-06-02 11:26:32 UTC (rev 79113)
@@ -9,7 +9,7 @@
 PortGroup           qt4 1.0
 
 name                qt4-mac
-conflicts           qt3 qt4-mac-devel
+conflicts           qt3 qt3-mac qt4-mac-devel
 version             4.7.3
 categories          aqua
 platforms           macosx

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	2011-06-02 11:22:16 UTC (rev 79112)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2011-06-02 11:26:32 UTC (rev 79113)
@@ -10,7 +10,7 @@
 set select_name     ${select_group}-${select_branch}
 
 name                ${select_name}
-conflicts           qt3 qt4-mac
+conflicts           qt3 qt3-mac qt4-mac
 version             4.7.0-beta2
 revision            3
 categories          aqua

Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile	2011-06-02 11:22:16 UTC (rev 79112)
+++ trunk/dports/x11/qt3/Portfile	2011-06-02 11:26:32 UTC (rev 79113)
@@ -4,6 +4,7 @@
 
 PortSystem      1.0
 name            qt3
+conflicts       qt3-mac qt4-mac qt4-mac-devel
 version         3.3.8
 revision        10
 categories      x11
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110602/a5c16086/attachment.html>