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

[ryandesign at macports.org]

Revision: 71331
          http://trac.macports.org/changeset/71331
Author:   ryandesign at macports.org
Date:     2010-09-09 02:45:11 -0700 (Thu, 09 Sep 2010)
Log Message:
-----------
ImageMagick: revert r70377; go back to using -delete and -append instead of -replace because -replace matches substrings; see #26421

Revision Links:
--------------
    http://trac.macports.org/changeset/70377

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

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2010-09-09 09:39:08 UTC (rev 71330)
+++ trunk/dports/graphics/ImageMagick/Portfile	2010-09-09 09:45:11 UTC (rev 71331)
@@ -128,38 +128,45 @@
 variant graphviz description {Support Graphviz} {
     depends_lib-append      path:bin/dot:graphviz
     archcheck.files-append  lib/libgvc.dylib
-    configure.args-replace  s|--without-gvc|--with-gvc|
+    configure.args-delete   --without-gvc
+    configure.args-append   --with-gvc
 }
 
 variant gs description {Include Ghostscript library support} {
     depends_lib-append      port:ghostscript
     archcheck.files-append  lib/libgs.dylib
-    configure.args-replace  s|--without-gslib|--with-gslib|
+    configure.args-delete   --without-gslib
+    configure.args-append   --with-gslib
 }
 
 variant hdri description {Support High Dynamic Range Imaging using OpenEXR} {
     depends_lib-append      port:openexr
     archcheck.files-append  lib/libIlmImf.dylib
-    configure.args-replace  s|--without-openexr|--with-openexr|
-    configure.args-replace  s|--disable-hdri|--enable-hdri|
+    configure.args-delete   --without-openexr \
+                            --disable-hdri
+    configure.args-append   --with-openexr \
+                            --enable-hdri
 }
 
 variant jbig description {Support JBIG} {
     depends_lib-append      port:jbigkit
     archcheck.files-append  lib/libjbig.dylib
-    configure.args-replace  s|--without-jbig|--with-jbig|
+    configure.args-delete   --without-jbig
+    configure.args-append   --with-jbig
 }
 
 variant jpeg2 description {Support JPEG-2000 using JasPer} {
     depends_lib-append      port:jasper
     archcheck.files-append  lib/libjasper.dylib
-    configure.args-replace  s|--without-jp2|--with-jp2|
+    configure.args-delete   --without-jp2
+    configure.args-append   --with-jp2
 }
 
 variant lqr description {Support Liquid Rescale (experimental)} {
     depends_lib-append      port:liblqr
     archcheck.files-append  lib/liblqr-1.dylib
-    configure.args-replace  s|--without-lqr|--with-lqr|
+    configure.args-delete   --without-lqr
+    configure.args-append   --with-lqr
 }
 
 variant mpeg description {Support MPEG-1 and MPEG-2 video} {
@@ -175,12 +182,14 @@
                             port:xorg-libXt
     archcheck.files-delete  lib/libXext.dylib \
                             lib/libXt.dylib \
-    configure.args-replace  s|--with-x|--without-x|
+    configure.args-delete   --with-x
+    configure.args-append   --without-x
 }
 
 variant perl description {Install PerlMagick} {
     depends_lib-append      path:bin/perl:perl5
-    configure.args-replace  s|--without-perl|--with-perl=${prefix}/bin/perl|
+    configure.args-delete   --without-perl
+    configure.args-append   --with-perl=${prefix}/bin/perl
     post-destroot {
         foreach packlist [exec find ${destroot} -name .packlist] {
             ui_info "Fixing packlist ${packlist}"
@@ -209,13 +218,15 @@
 variant rsvg description {Support SVG using librsvg} {
     depends_lib-append      port:librsvg
     archcheck.files-append  lib/librsvg-2.dylib
-    configure.args-replace  s|--without-rsvg|--with-rsvg|
+    configure.args-delete   --without-rsvg
+    configure.args-append   --with-rsvg
 }
 
 variant wmf description {Support the Windows Metafile Format} {
     depends_lib-append      port:libwmf
     archcheck.files-append  lib/libwmf.dylib
-    configure.args-replace  s|--without-wmf|--with-wmf|
+    configure.args-delete   --without-wmf
+    configure.args-append   --with-wmf
 }
 
 livecheck.version           ${reasonable_version}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100909/f486d26e/attachment.html>