[111664] trunk/dports

[ryandesign at macports.org]

Revision: 111664
          https://trac.macports.org/changeset/111664
Author:   ryandesign at macports.org
Date:     2013-09-27 22:44:34 -0700 (Fri, 27 Sep 2013)
Log Message:
-----------
ImageMagick, p5-perlmagick: update to 6.8.7-0; update master_sites; add djvulibre and xorg-libX11 dependencies (#40596)

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

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2013-09-28 05:17:43 UTC (rev 111663)
+++ trunk/dports/graphics/ImageMagick/Portfile	2013-09-28 05:44:34 UTC (rev 111664)
@@ -7,9 +7,8 @@
 # Keep relevant lines in sync between ImageMagick and p5-perlmagick.
 
 name                        ImageMagick
-version                     6.8.6-6
+version                     6.8.7-0
 set reasonable_version      [lindex [split ${version} -] 0]
-revision                    1
 homepage                    http://www.imagemagick.org/
 categories                  graphics devel
 maintainers                 ryandesign
@@ -34,14 +33,17 @@
                             supported, including GIF, JPEG, JPEG 2000, PNG, PDF, \
                             PhotoCD and TIFF.
 
-master_sites                http://image_magick.veidrodis.com/image_magick/ \
+master_sites                http://www.imagemagick.org/download/ \
+                            http://mirror.checkdomain.de/imagemagick/ \
+                            ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
                             ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick \
                             ftp://sunsite.icm.edu.pl/packages/ImageMagick
 
-checksums                   rmd160  aef9bb4482c918cae8364c9240bb9342f781c2a7 \
-                            sha256  c826e88a7880016af07f6edb44d5bc2a57caf184242c4c3c087a94849294c701
+checksums                   rmd160  90032fae2b82155e80daed94f6556fc7de566845 \
+                            sha256  2b9c4097c727a25ffe1523d8158feea2d50517061e047f1ccbd8a11d531e132e
 
 depends_lib                 port:bzip2 \
+                            port:djvulibre \
                             port:xz \
                             port:jpeg \
                             port:lcms2 \
@@ -83,6 +85,7 @@
                             --disable-hdri \
                             --with-dps \
                             --with-bzlib \
+                            --with-djvu \
                             --with-fontconfig \
                             --with-gslib \
                             --with-jpeg \
@@ -162,7 +165,8 @@
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 
 variant x11 conflicts no_x11 {
-    depends_lib-append      port:xorg-libXext \
+    depends_lib-append      port:xorg-libX11 \
+                            port:xorg-libXext \
                             port:xorg-libXt
     configure.args-append   --with-x
     configure.args-delete   --without-x

Modified: trunk/dports/perl/p5-perlmagick/Portfile
===================================================================
--- trunk/dports/perl/p5-perlmagick/Portfile	2013-09-28 05:17:43 UTC (rev 111663)
+++ trunk/dports/perl/p5-perlmagick/Portfile	2013-09-28 05:44:34 UTC (rev 111664)
@@ -8,7 +8,7 @@
 
 epoch                       1
 perl5.branches              5.8 5.10 5.12 5.14 5.16
-perl5.setup                 PerlMagick 6.8.6-6
+perl5.setup                 PerlMagick 6.8.7-0
 set reasonable_version      [lindex [split ${version} -] 0]
 set my_name                 ImageMagick
 maintainers                 futurelab.ch:astricker ryandesign
@@ -21,15 +21,17 @@
 # we use the ImageMagick distribution version of PerlMagick to
 # ensure it will always match ImageMagick version installed
 
-master_sites                http://image_magick.veidrodis.com/image_magick/ \
+master_sites                http://www.imagemagick.org/download/ \
+                            http://mirror.checkdomain.de/imagemagick/ \
+                            ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
                             ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick \
                             ftp://sunsite.icm.edu.pl/packages/ImageMagick
 
 dist_subdir                 ImageMagick
 distname                    ${my_name}-${version}
 
-checksums                   rmd160  aef9bb4482c918cae8364c9240bb9342f781c2a7 \
-                            sha256  c826e88a7880016af07f6edb44d5bc2a57caf184242c4c3c087a94849294c701
+checksums                   rmd160  90032fae2b82155e80daed94f6556fc7de566845 \
+                            sha256  2b9c4097c727a25ffe1523d8158feea2d50517061e047f1ccbd8a11d531e132e
 
 if {${perl5.major} != ""} {
 depends_lib-append          port:ImageMagick
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130927/85092a79/attachment-0001.html>