[97531] trunk/dports/devel

[ryandesign at macports.org]

Revision: 97531
          https://trac.macports.org/changeset/97531
Author:   ryandesign at macports.org
Date:     2012-09-07 22:36:58 -0700 (Fri, 07 Sep 2012)
Log Message:
-----------
glib2, glib2-devel: use conflicts_build

Modified Paths:
--------------
    trunk/dports/devel/glib2/Portfile
    trunk/dports/devel/glib2-devel/Portfile

Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile	2012-09-08 05:23:38 UTC (rev 97530)
+++ trunk/dports/devel/glib2/Portfile	2012-09-08 05:36:58 UTC (rev 97531)
@@ -3,6 +3,7 @@
 
 PortSystem                  1.0
 PortGroup                   archcheck 1.0
+PortGroup                   conflicts_build 1.0
 
 name                        glib2
 conflicts                   glib2-devel
@@ -51,10 +52,11 @@
                             lib/libz.dylib \
                             lib/libffi.dylib
 
+# configure checks for libelf, and if found, the build fails; see #33948.
+conflicts_build             libelf
+
 # TODO: compiling with clang produces a glib that breaks other ports; see #32202, #32204, #32233.
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
+compiler.blacklist          clang
 
 # -lresolv is needed at least on Tiger PPC.
 configure.ldflags-append    -lresolv \
@@ -75,15 +77,6 @@
     set libffi_version      [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
     configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
                             LIBFFI_LIBS="-L${prefix}/lib -lffi"
-    
-    foreach {badport badfile} "libelf ${prefix}/lib/libelf.a" {
-        if {[file exists ${badfile}]} {
-            ui_error "${name} cannot be built while ${badport} is active."
-            ui_error "Please deactivate ${badport} and try again."
-            ui_error "You can reactivate ${badport} again later."
-            return -code error "${badport} is installed"
-        }
-    }
 }
 
 post-patch {

Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile	2012-09-08 05:23:38 UTC (rev 97530)
+++ trunk/dports/devel/glib2-devel/Portfile	2012-09-08 05:36:58 UTC (rev 97531)
@@ -3,6 +3,7 @@
 
 PortSystem                  1.0
 PortGroup                   archcheck 1.0
+PortGroup                   conflicts_build 1.0
 
 name                        glib2-devel
 conflicts                   glib2
@@ -51,10 +52,12 @@
                             lib/libz.dylib \
                             lib/libffi.dylib
 
+
+# configure checks for libelf, and if found, the build fails; see #33948.
+conflicts_build             libelf
+
 # TODO: compiling with clang produces a glib that breaks other ports; see #32202, #32204, #32233.
-if {${configure.compiler} == "clang"} {
-    configure.compiler llvm-gcc-4.2
-}
+compiler.blacklist          clang
 
 # -lresolv is needed at least on Tiger PPC.
 configure.ldflags-append    -lresolv \
@@ -75,15 +78,6 @@
     set libffi_version      [exec sed -n {s/Version: //p} ${prefix}/lib/pkgconfig/libffi.pc]
     configure.env-append    LIBFFI_CFLAGS="-I${prefix}/lib/libffi-${libffi_version}/include" \
                             LIBFFI_LIBS="-L${prefix}/lib -lffi"
-    
-    foreach {badport badfile} "libelf ${prefix}/lib/libelf.a" {
-        if {[file exists ${badfile}]} {
-            ui_error "${name} cannot be built while ${badport} is active."
-            ui_error "Please deactivate ${badport} and try again."
-            ui_error "You can reactivate ${badport} again later."
-            return -code error "${badport} is installed"
-        }
-    }
 }
 
 post-patch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120907/290a0035/attachment-0001.html>