[142742] trunk/dports/aqua/qt5/Portfile

[mcalhoun at macports.org]

Revision: 142742
          https://trac.macports.org/changeset/142742
Author:   mcalhoun at macports.org
Date:     2015-11-21 08:36:16 -0800 (Sat, 21 Nov 2015)
Log Message:
-----------
qt5: with r140960, qt4-mac no longer seems to conflict with qt5 (see #44193)

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

Modified Paths:
--------------
    trunk/dports/aqua/qt5/Portfile

Modified: trunk/dports/aqua/qt5/Portfile
===================================================================
--- trunk/dports/aqua/qt5/Portfile	2015-11-21 16:28:54 UTC (rev 142741)
+++ trunk/dports/aqua/qt5/Portfile	2015-11-21 16:36:16 UTC (rev 142742)
@@ -788,18 +788,14 @@
     # use the qt5 group; set 'building_qt5' so that the portgroup
     # does not include certain parts
     set building_qt5    1
-    PortGroup           conflicts_build 1.0
     PortGroup           qt5 1.0
     PortGroup           xcodeversion 1.0
     PortGroup           cxx11 1.0
 
-    conflicts           qt3 qt3-mac qt4-mac
+    conflicts           qt3 qt3-mac
 
     minimum_xcodeversions   {11 4.3}
 
-    # see https://bugreports.qt.io/browse/QTBUG-34902
-    conflicts_build-append  qt4-mac
-
     # special case
     if { ${subport} ne "${name}-docs" } {
         # qmake automatically makes certain commands (QMAKE_CC, etc.) absolute paths
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/7228d494/attachment.html>