[97532] trunk/dports/graphics/ImageMagick/Portfile

[ryandesign at macports.org]

Revision: 97532
          https://trac.macports.org/changeset/97532
Author:   ryandesign at macports.org
Date:     2012-09-07 22:51:48 -0700 (Fri, 07 Sep 2012)
Log Message:
-----------
ImageMagick: use conflicts_build

Modified Paths:
--------------
    trunk/dports/graphics/ImageMagick/Portfile

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2012-09-08 05:36:58 UTC (rev 97531)
+++ trunk/dports/graphics/ImageMagick/Portfile	2012-09-08 05:51:48 UTC (rev 97532)
@@ -3,11 +3,11 @@
 
 PortSystem                  1.0
 PortGroup                   archcheck 1.0
+PortGroup                   conflicts_build 1.0
 
 # Keep relevant lines in sync between ImageMagick and p5-perlmagick.
 
 name                        ImageMagick
-conflicts                   cryptlib
 version                     6.7.9-0
 revision                    2
 set reasonable_version      [lindex [split ${version} -] 0]
@@ -83,15 +83,10 @@
                             lib/libexpat.dylib \
                             lib/libxml2.dylib
 
-pre-configure {
-    foreach {badport badfile} "cryptlib ${prefix}/lib/libcl.dylib" {
-        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"
-        }
-    }
+# On case-insensitive filesystems, ImageMagick finds cryptlib's libcl and
+# tries to use it as if it were Apple's OpenCL, which fails; see #23354.
+if {[file exists ${prefix}/lib/libCL.dylib]} {
+    conflicts_build         cryptlib
 }
 
 configure.ccache            no
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120907/811425ee/attachment.html>