<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/872132ba542baf284366119d93682561d0527cee">https://github.com/macports/macports-ports/commit/872132ba542baf284366119d93682561d0527cee</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 872132b ImageMagick, p5-perlmagick: Update to 6.9.9-26
</span>872132b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 872132ba542baf284366119d93682561d0527cee
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 11 16:59:51 2017 -0600
<span style='display:block; white-space:pre;color:#404040;'> ImageMagick, p5-perlmagick: Update to 6.9.9-26
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55501
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Enable OpenCL on Lion and later; disable it on Snow Leopard and earlier.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/55167
</span>---
graphics/ImageMagick/Portfile | 26 +++++++++++++++-----------
perl/p5-perlmagick/Portfile | 8 ++++----
2 files changed, 19 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ImageMagick/Portfile b/graphics/ImageMagick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48483575..1be46a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ImageMagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ImageMagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup conflicts_build 1.0
</span> # PHP Warning: Version warning: Imagick was compiled against Image Magick version XXXX but version YYYY is loaded. Imagick will run but may behave surprisingly in Unknown on line 0
name ImageMagick
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.9.9-19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.9.9-26
</span> set reasonable_version [lindex [split ${version} -] 0]
homepage http://www.imagemagick.org/
categories graphics devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,9 +41,9 @@ master_sites http://www.imagemagick.org/download/ \
</span> ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick \
ftp://sunsite.icm.edu.pl/packages/ImageMagick
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ad2bc2b31e82afa543c1dfbb52700d809e25edc1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 330efe70c38d86b95337f67015c465c8d910d8e96632ee72e09017120546d1ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8789980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4058b96fb5e3bf030648d84a25b709b65f1cd578 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dcf23a7356a970e613a9fa2cfaa64c999ea8e278a45aec4905e54398d6c12c83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8799740
</span>
depends_lib port:bzip2 \
port:djvulibre \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,12 +72,6 @@ depends_lib-append port:pkgconfig
</span>
depends_run port:urw-fonts
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# On case-insensitive filesystems, ImageMagick finds cryptlib's libcl and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# tries to use it as if it were Apple's OpenCL, which fails; see #23354.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[file exists ${prefix}/lib/libCL.dylib]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts_build cryptlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.ccache no
use_autoreconf yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +79,6 @@ autoreconf.args -fvi
</span>
configure.args --enable-shared \
--enable-static \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-ltdl-install \
</span> --disable-silent-rules \
--with-frozenpaths \
--with-openexr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,6 +108,17 @@ configure.args --enable-shared \
</span> --without-x \
--with-gs-font-dir=${prefix}/share/fonts/urw-fonts
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-opencl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --enable-opencl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # On case-insensitive filesystems, ImageMagick finds cryptlib's libcl and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # tries to use it as if it were Apple's OpenCL, which fails; see #23354.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/lib/libCL.dylib]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts_build cryptlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> test.run yes
test.target check
test.env DYLD_LIBRARY_PATH=${worksrcpath}/magick/.libs
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-perlmagick/Portfile b/perl/p5-perlmagick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5effa19..14ccb60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-perlmagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-perlmagick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup perl5 1.0
</span>
epoch 1
perl5.branches 5.24 5.26
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.setup PerlMagick 6.9.9-19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.setup PerlMagick 6.9.9-26
</span> set reasonable_version \
[lindex [split ${version} -] 0]
set my_name ImageMagick
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,9 @@ master_sites http://www.imagemagick.org/download/ \
</span> dist_subdir ImageMagick
distname ${my_name}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ad2bc2b31e82afa543c1dfbb52700d809e25edc1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 330efe70c38d86b95337f67015c465c8d910d8e96632ee72e09017120546d1ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8789980
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4058b96fb5e3bf030648d84a25b709b65f1cd578 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dcf23a7356a970e613a9fa2cfaa64c999ea8e278a45aec4905e54398d6c12c83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8799740
</span>
if {${perl5.major} != ""} {
depends_lib-append port:ImageMagick
</pre><pre style='margin:0'>
</pre>