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

[ryandesign at macports.org]

Revision: 63755
          http://trac.macports.org/changeset/63755
Author:   ryandesign at macports.org
Date:     2010-02-13 21:25:11 -0800 (Sat, 13 Feb 2010)
Log Message:
-----------
ImageMagick:

 * update to 6.5.9-3
 * remove lcms variant; now always turn on Little Color Management System support (requested by nox)
 * simplify how -arch flags are removed from *-config scripts and do so always, not just when building universal

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

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2010-02-14 05:23:36 UTC (rev 63754)
+++ trunk/dports/graphics/ImageMagick/Portfile	2010-02-14 05:25:11 UTC (rev 63755)
@@ -4,7 +4,7 @@
 
 name                    ImageMagick
 conflicts               cryptlib
-version                 6.5.9-0
+version                 6.5.9-3
 set reasonable_version  [lindex [split ${version} -] 0]
 homepage                http://www.imagemagick.org/
 categories              graphics devel
@@ -39,15 +39,16 @@
 #    ftp://ftp.nluug.nl/pub/${name}/ \
 
 checksums \
-    md5     857a335b651bfc3bed20366f73f16686 \
-    sha1    a4b9ab777f2ee525f2a746a379868bac93219851 \
-    rmd160  48e6632fd223de56c5b94ef37be456da594324f1
+    md5     f9d95795d8f7296578f9e72b966e3381 \
+    sha1    ec22d2c01b453115bee8d4172264cec058d4e941 \
+    rmd160  4214111cdb6291f2a6e6b5481c08a9a09e02e4d9
 
 depends_lib \
     port:xorg-libXext \
     port:xorg-libXt \
     port:bzip2 \
     port:jpeg \
+    port:lcms \
     port:libpng \
     port:tiff \
     port:zlib \
@@ -79,6 +80,7 @@
     --with-bzlib \
     --with-fontconfig \
     --with-jpeg \
+    --with-lcms \
     --with-png \
     --with-tiff \
     --with-zlib \
@@ -90,35 +92,24 @@
     --without-gslib \
     --without-jbig \
     --without-jp2 \
-    --without-lcms \
     --without-wmf \
     --without-gvc \
     --without-rsvg \
     --without-lqr
 
+post-configure {
+    reinplace -E {s|-arch [^ ]+||g} \
+        ${worksrcpath}/magick/Magick-config \
+        ${worksrcpath}/magick/MagickCore-config \
+        ${worksrcpath}/Magick++/bin/Magick++-config \
+        ${worksrcpath}/wand/MagickWand-config \
+        ${worksrcpath}/wand/Wand-config
+}
+
 test.run                yes
 test.target             check
 test.env                DYLD_LIBRARY_PATH=${worksrcpath}/magick/.libs
 
-post-destroot {
-    if {[variant_isset universal]} {
-        if {${configure.universal_cppflags} != ""} {
-            reinplace "s|${configure.universal_cppflags}||" \
-                ${destroot}${prefix}/bin/Magick++-config \
-                ${destroot}${prefix}/bin/Magick-config \
-                ${destroot}${prefix}/bin/MagickCore-config \
-                ${destroot}${prefix}/bin/MagickWand-config \
-                ${destroot}${prefix}/bin/Wand-config
-        }
-        reinplace "s|${configure.universal_ldflags}||" \
-            ${destroot}${prefix}/bin/Magick++-config \
-            ${destroot}${prefix}/bin/Magick-config \
-            ${destroot}${prefix}/bin/MagickCore-config \
-            ${destroot}${prefix}/bin/MagickWand-config \
-            ${destroot}${prefix}/bin/Wand-config
-   }
-}
-
 variant rsvg description {Support SVG using librsvg} {
     depends_lib-append \
         port:librsvg
@@ -156,15 +147,6 @@
         --with-gslib
 }
 
-variant lcms description {Support the Little Color Management System} {
-    depends_lib-append \
-        port:lcms
-    configure.args-delete \
-        --without-lcms
-    configure.args-append \
-        --with-lcms
-}
-
 variant lqr description {Support Liquid Rescale (experimental)} {
     depends_lib-append \
         port:liblqr
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100213/af62ed7e/attachment.html>