[123732] trunk/dports

[ryandesign at macports.org]

Revision: 123732
          https://trac.macports.org/changeset/123732
Author:   ryandesign at macports.org
Date:     2014-08-13 13:08:09 -0700 (Wed, 13 Aug 2014)
Log Message:
-----------
ImageMagick, p5-perlmagick: update to 6.8.9-6
ImageMagick: add openexr support (#44621); remove jbig and jpeg2 variants and enable that functionality always; remove legacy perl variant

Modified Paths:
--------------
    trunk/dports/graphics/ImageMagick/Portfile
    trunk/dports/perl/p5-perlmagick/Portfile

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2014-08-13 19:46:12 UTC (rev 123731)
+++ trunk/dports/graphics/ImageMagick/Portfile	2014-08-13 20:08:09 UTC (rev 123732)
@@ -7,7 +7,7 @@
 # Keep relevant lines in sync between ImageMagick and p5-perlmagick.
 
 name                        ImageMagick
-version                     6.8.9-1
+version                     6.8.9-6
 set reasonable_version      [lindex [split ${version} -] 0]
 homepage                    http://www.imagemagick.org/
 categories                  graphics devel
@@ -39,12 +39,13 @@
                             ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick \
                             ftp://sunsite.icm.edu.pl/packages/ImageMagick
 
-checksums                   rmd160  b41841c74f7bec53eafdc81542f87679ed170149 \
-                            sha256  88e9f72cff22b91738494abe8b87f53c5b0c6932c4b08f944bf79846f035e642
+checksums                   rmd160  718aecd8c606d03e755b4b6e6c3683bba08f4f31 \
+                            sha256  238f8b0f6188ead6b541f88bd8324cc049788662ccd9396ee61caac99d970605
 
 depends_lib                 port:bzip2 \
                             port:djvulibre \
                             port:xz \
+                            port:jbigkit \
                             port:jpeg \
                             port:lcms2 \
                             port:libpng \
@@ -57,6 +58,8 @@
                             port:ghostscript \
                             port:libiconv \
                             port:libtool \
+                            port:openjpeg \
+                            port:openexr \
                             port:expat \
                             port:libxml2
 
@@ -81,15 +84,17 @@
                             --disable-ltdl-install \
                             --disable-silent-rules \
                             --with-frozenpaths \
-                            --without-openexr \
+                            --with-openexr \
                             --disable-hdri \
                             --with-dps \
                             --with-bzlib \
                             --with-djvu \
                             --with-fontconfig \
                             --with-gslib \
+                            --with-jbig \
                             --with-jpeg \
                             --with-lcms \
+                            --with-openjp2 \
                             --with-png \
                             --with-tiff \
                             --with-webp \
@@ -98,8 +103,6 @@
                             --with-xml \
                             --without-perl \
                             --without-fpx \
-                            --without-jbig \
-                            --without-openjp2 \
                             --without-wmf \
                             --without-gvc \
                             --without-rsvg \
@@ -120,16 +123,6 @@
     configure.args-replace  --without-gvc --with-gvc
 }
 
-variant jbig description {Support JBIG} {
-    depends_lib-append      port:jbigkit
-    configure.args-replace  --without-jbig --with-jbig
-}
-
-variant jpeg2 description {Support JPEG-2000 using OpenJPEG} {
-    depends_lib-append      port:openjpeg
-    configure.args-replace  --without-openjp2 --with-openjp2
-}
-
 variant lqr description {Support Liquid Rescale (experimental)} {
     depends_lib-append      port:liblqr
     configure.args-replace  --without-lqr --with-lqr
@@ -140,13 +133,6 @@
     configure.args-replace  --without-pango --with-pango
 }
 
-# Legacy perl variant to be removed after May 2014.
-variant perl description {Obsolete variant} {
-    pre-configure {
-        return -code error "The +perl variant is no longer used\; use the separate p5-perlmagick port instead."
-    }
-}
-
 variant rsvg description {Support SVG using librsvg} {
     depends_lib-append      port:librsvg
     configure.args-replace  --without-rsvg --with-rsvg

Modified: trunk/dports/perl/p5-perlmagick/Portfile
===================================================================
--- trunk/dports/perl/p5-perlmagick/Portfile	2014-08-13 19:46:12 UTC (rev 123731)
+++ trunk/dports/perl/p5-perlmagick/Portfile	2014-08-13 20:08:09 UTC (rev 123732)
@@ -8,8 +8,7 @@
 
 epoch               1
 perl5.branches      5.8 5.10 5.12 5.14 5.16 5.18 5.20
-perl5.setup         PerlMagick 6.8.9-1
-revision            1
+perl5.setup         PerlMagick 6.8.9-6
 set reasonable_version \
                     [lindex [split ${version} -] 0]
 set my_name         ImageMagick
@@ -32,8 +31,8 @@
 dist_subdir         ImageMagick
 distname            ${my_name}-${version}
 
-checksums           rmd160  b41841c74f7bec53eafdc81542f87679ed170149 \
-                    sha256  88e9f72cff22b91738494abe8b87f53c5b0c6932c4b08f944bf79846f035e642
+checksums           rmd160  718aecd8c606d03e755b4b6e6c3683bba08f4f31 \
+                    sha256  238f8b0f6188ead6b541f88bd8324cc049788662ccd9396ee61caac99d970605
 
 if {${perl5.major} != ""} {
 depends_lib-append  port:ImageMagick
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140813/679f6e8d/attachment.html>