[103820] trunk/dports/x11/qt3/Portfile

[ryandesign at macports.org]

Revision: 103820
          https://trac.macports.org/changeset/103820
Author:   ryandesign at macports.org
Date:     2013-03-07 22:18:50 -0800 (Thu, 07 Mar 2013)
Log Message:
-----------
qt3: use conflicts_build portgroup instead of doing it manually

Modified Paths:
--------------
    trunk/dports/x11/qt3/Portfile

Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile	2013-03-08 06:04:51 UTC (rev 103819)
+++ trunk/dports/x11/qt3/Portfile	2013-03-08 06:18:50 UTC (rev 103820)
@@ -3,6 +3,8 @@
 #Synced with Fink, revision 1.25
 
 PortSystem      1.0
+PortGroup       conflicts_build 1.0
+
 name            qt3
 conflicts       qt3-mac qt4-mac qt4-mac-devel
 version         3.3.8
@@ -119,6 +121,8 @@
     reinplace "s|\\.dylib$|.dylib ${configure.cc_archflags}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
 }
 
+conflicts_build qt3-mac
+
 configure.args  -buildkey qt3-jaguar \
                 -platform darwin-g++ -xplatform darwin-g++ \
                 -prefix '${prefix}/lib/qt3' -docdir '${prefix}/share/doc/qt3' \
@@ -136,13 +140,6 @@
     if {[file exists ${prefix}/lib/libqassistantclient.a]} {
         system "ranlib ${prefix}/lib/libqassistantclient.a"
     }
-    foreach {badport badfile} "qt3-mac ${prefix}/include/qt3/qt_mac.h" {
-        if {[file exists ${badfile}]} {
-            ui_error "${name} cannot be built while ${badport} is active."
-            ui_error "Please deactivate ${badport} and try again."
-            return -code error "${badport} is installed"
-        }
-    }
 }
 
 # The ranlib above requires the build phase to be run as root
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130307/78dfc182/attachment.html>