Update ImageMagick to 6.9.8.6.

PR:		219497
Security:	50776801-4183-11e7-b291-b499baebfeaf

4 files changed, 14 insertions, 17 deletions

diff --git a/graphics/ImageMagick-nox11/Makefile b/graphics/ImageMagick-nox11/Makefile
index d5e43c88813e..62e3b72c0444 100644
--- a/graphics/ImageMagick-nox11/Makefile
+++ b/graphics/ImageMagick-nox11/Makefile
@@ -1,8 +1,6 @@
 # Created by: mm@FreeBSD.org
 # $FreeBSD$
 
-PORTREVISION=	1
-
 # the SVG and PANGO plugins need X11
 OPTIONS_EXCLUDE=	X11 SVG PANGO
 PORTSCOUT=	ignore:1
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index bc596a329a56..af5db43e1e0b 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.6-4
-PORTREVISION=	2
+DISTVERSION=	6.9.8-6
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index dac6c9ba47dc..b983980b565c 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479160028
-SHA256 (ImageMagick-6.9.6-4.tar.xz) = d523c2c45dc2ff55f1bc27aa0cfa6e00e6f80dc182e8d6c27fcac99461c462d7
-SIZE (ImageMagick-6.9.6-4.tar.xz) = 8767920
+TIMESTAMP = 1495624294
+SHA256 (ImageMagick-6.9.8-6.tar.xz) = dc587a30457d1b42fa980fe7d94bfad906407ad811335e60f5eb673b3a17afeb
+SIZE (ImageMagick-6.9.8-6.tar.xz) = 8772452
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 0b4db93e8697..4cfe5496f964 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -46,7 +46,6 @@ include/ImageMagick-6/Magick++/STL.h
 include/ImageMagick-6/Magick++/TypeMetric.h
 include/ImageMagick-6/magick/ImageMagick.h
 include/ImageMagick-6/magick/MagickCore.h
-include/ImageMagick-6/magick/accelerate.h
 include/ImageMagick-6/magick/animate.h
 include/ImageMagick-6/magick/annotate.h
 include/ImageMagick-6/magick/api.h
@@ -300,6 +299,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pdf.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pes.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pes.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pgx.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pgx.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pict.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pict.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/pix.la
@@ -415,24 +416,22 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 lib/libMagick++-6.a
 lib/libMagick++-6.la
 lib/libMagick++-6.so
-lib/libMagick++-6.so.6
-lib/libMagick++-6.so.6.0.0
+lib/libMagick++-6.so.7
+lib/libMagick++-6.so.7.0.0
 lib/libMagickCore-6.a
 lib/libMagickCore-6.la
 lib/libMagickCore-6.so
-lib/libMagickCore-6.so.2
-lib/libMagickCore-6.so.2.0.0
+lib/libMagickCore-6.so.4
+lib/libMagickCore-6.so.4.0.0
 lib/libMagickWand-6.a
 lib/libMagickWand-6.la
 lib/libMagickWand-6.so
-lib/libMagickWand-6.so.2
-lib/libMagickWand-6.so.2.0.0
+lib/libMagickWand-6.so.4
+lib/libMagickWand-6.so.4.0.0
 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick.pm
 %%WITH_PERL%%%%SITE_ARCH%%/Image/Magick/%%QBIT%%%%HDRI%%.pm
-%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/Magick.so
 %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
 %%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/%%QBIT%%%%HDRI%%/autosplit.ix
-%%WITH_PERL%%%%SITE_ARCH%%/auto/Image/Magick/autosplit.ix
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick.3.gz
 %%WITH_PERL%%%%PERL5_MAN3%%/Image::Magick::%%QBIT%%%%HDRI%%.3.gz
 libdata/pkgconfig/ImageMagick++-6.pc
@@ -1417,6 +1416,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/convert.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/css/README.txt
 %%PORTDOCS%%%%DOCSDIR%%-6/www/css/magick.css
+%%PORTDOCS%%%%DOCSDIR%%-6/www/develop.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/display.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/distribute-pixel-cache.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/download.html
@@ -1446,6 +1446,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/magick-vector-graphics.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/magick-wand.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/miff.html
+%%PORTDOCS%%%%DOCSDIR%%-6/www/mirror.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/mogrify.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/montage.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/motion-picture.html
@@ -1481,7 +1482,6 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-6/www/source/type-windows.xml
 %%PORTDOCS%%%%DOCSDIR%%-6/www/source/type.xml
 %%PORTDOCS%%%%DOCSDIR%%-6/www/source/wand.c
-%%PORTDOCS%%%%DOCSDIR%%-6/www/sponsors.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/stream.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/support.html
 %%PORTDOCS%%%%DOCSDIR%%-6/www/wand.png