[59235] trunk/dports/aqua

[ryandesign at macports.org]

Revision: 59235
          http://trac.macports.org/changeset/59235
Author:   ryandesign at macports.org
Date:     2009-10-12 06:44:14 -0700 (Mon, 12 Oct 2009)
Log Message:
-----------
qt4-mac and qt4-mac-devel conflict on ${applications_dir}/Qt/Assistant.app

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2009-10-12 13:39:24 UTC (rev 59234)
+++ trunk/dports/aqua/qt4-mac/Portfile	2009-10-12 13:44:14 UTC (rev 59235)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 
 name                qt4-mac
+conflicts           qt4-mac-devel
 version             4.5.2
 revision            2
 categories          aqua

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	2009-10-12 13:39:24 UTC (rev 59234)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2009-10-12 13:44:14 UTC (rev 59235)
@@ -4,6 +4,7 @@
 PortSystem          1.0
 
 name                qt4-mac-devel
+conflicts           qt4-mac
 version             4.5.0
 revision            1
 categories          aqua
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091012/d3b9ebda/attachment.html>