[124065] trunk/dports/aqua/qt5-mac/Portfile

[ryandesign at macports.org]

Revision: 124065
          https://trac.macports.org/changeset/124065
Author:   ryandesign at macports.org
Date:     2014-08-17 20:27:51 -0700 (Sun, 17 Aug 2014)
Log Message:
-----------
qt5-mac: use conflicts_build portgroup instead of reinventing the functionality (#44397; maintainer timeout)

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

Modified: trunk/dports/aqua/qt5-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt5-mac/Portfile	2014-08-18 02:51:44 UTC (rev 124064)
+++ trunk/dports/aqua/qt5-mac/Portfile	2014-08-18 03:27:51 UTC (rev 124065)
@@ -79,6 +79,7 @@
     # 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
 
@@ -86,14 +87,8 @@
 
     minimum_xcodeversions   {10 3.2}
 
-    pre-configure {
-        # See https://bugreports.qt-project.org/browse/QTBUG-34902
-        if {![catch {set installed [lindex [registry_active qt4-mac] 0]}]} {
-            ui_error "${name} fails if qt4-mac is active during configuration phase."
-            ui_error "Please deactivate qt4-mac to continue"
-            return -code error "conflicting port (qt4-mac)"
-        }
-    }
+    # See https://bugreports.qt-project.org/browse/QTBUG-34902
+    conflicts_build-append  qt4-mac
 
     # More testing is required to see if this is necessary.
     use_parallel_build no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140817/278ee733/attachment.html>