[142934] trunk/dports/aqua/qt4-mac/Portfile

[mcalhoun at macports.org]

Revision: 142934
          https://trac.macports.org/changeset/142934
Author:   mcalhoun at macports.org
Date:     2015-11-28 10:06:52 -0800 (Sat, 28 Nov 2015)
Log Message:
-----------
qt4-mac: qt4-mac and qt5 now seem to coexist harmoniously (#44193)

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2015-11-28 18:02:38 UTC (rev 142933)
+++ trunk/dports/aqua/qt4-mac/Portfile	2015-11-28 18:06:52 UTC (rev 142934)
@@ -14,7 +14,7 @@
 # qt4-mac-devel is "replaced_by" this port,
 # so this port cannot conflict with it.
 #conflicts           qt3 qt3-mac qt4-mac-devel
-conflicts           qt3 qt3-mac qt5-mac
+conflicts           qt3 qt3-mac
 version             4.8.7
 revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/a69ed3d3/attachment.html>