6 files changed, 9 insertions, 43 deletions

diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 1bab565fb7be..1415e0f0c9e6 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	7.0.8-14
-PORTREVISION=	2
+DISTVERSION=	7.0.8-16
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://www.imagemagick.org/download/legacy/ \
diff --git a/graphics/ImageMagick7/distinfo b/graphics/ImageMagick7/distinfo
index 27c245b8cab3..f0ee6596531b 100644
--- a/graphics/ImageMagick7/distinfo
+++ b/graphics/ImageMagick7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1541880044
-SHA256 (ImageMagick-7.0.8-14.tar.xz) = 70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1
-SIZE (ImageMagick-7.0.8-14.tar.xz) = 8634400
+TIMESTAMP = 1544635868
+SHA256 (ImageMagick-7.0.8-16.tar.xz) = 2d4713956fb11d500681da5b32a3243d5d5823551dfdfeb62ba8e5959244e951
+SIZE (ImageMagick-7.0.8-16.tar.xz) = 8646148
diff --git a/graphics/ImageMagick7/files/patch-coders_icon.c b/graphics/ImageMagick7/files/patch-coders_icon.c
deleted file mode 100644
index 320444f6112b..000000000000
--- a/graphics/ImageMagick7/files/patch-coders_icon.c
+++ /dev/null
@@ -1,24 +0,0 @@
-From 08761138f4b3ee4d174ee4297983839c55382349 Mon Sep 17 00:00:00 2001
-From: Cristy <urban-warrior@imagemagick.org>
-Date: Sun, 18 Nov 2018 17:39:53 -0500
-Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1386
-
----
- coders/icon.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/coders/icon.c b/coders/icon.c
-index fa35021cd5..e32c7392f8 100644
---- coders/icon.c
-+++ coders/icon.c
-@@ -367,8 +367,8 @@ static Image *ReadICONImage(const ImageInfo *image_info,
-         png[13]=(unsigned char) (icon_info.planes >> 8);
-         png[14]=(unsigned char) icon_info.bits_per_pixel;
-         png[15]=(unsigned char) (icon_info.bits_per_pixel >> 8);
--        count=ReadBlob(image,length,png+16);
--        if (count != (ssize_t) length)
-+        count=ReadBlob(image,length-16,png+16);
-+        if (count != (ssize_t) (length-16))
-           {
-             png=(unsigned char *) RelinquishMagickMemory(png);
-             ThrowReaderException(CorruptImageError,
diff --git a/graphics/ImageMagick7/files/patch-config_policy.xml b/graphics/ImageMagick7/files/patch-config_policy.xml
index 58f2c9f753e7..e51c4551d2cd 100644
--- a/graphics/ImageMagick7/files/patch-config_policy.xml
+++ b/graphics/ImageMagick7/files/patch-config_policy.xml
@@ -12,6 +12,6 @@ Upstream doesn't disable these by default.
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
 +  <policy domain="coder" rights="none" pattern="MVG" />
 +  <policy domain="coder" rights="none" pattern="MSL" />
-   <!-- <policy domain="resource" name="area" value="100MP"/> -->
-   <!-- <policy domain="resource" name="disk" value="16EiB"/> -->
-   <!-- <policy domain="resource" name="file" value="768"/> -->
+   <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
+   <!-- <policy domain="path" rights="none" pattern="@*" /> -->
+   <!-- <policy domain="cache" name="memory-map" value="anonymous"/> -->
diff --git a/graphics/ImageMagick7/files/patch-configure b/graphics/ImageMagick7/files/patch-configure
deleted file mode 100644
index d9e75f1e149b..000000000000
--- a/graphics/ImageMagick7/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2018-11-20 17:30:38.038076000 +0100
-+++ configure	2018-11-20 17:30:45.393294000 +0100
-@@ -36948,7 +36948,7 @@
- MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/  */ /g'`
- MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/  */ /g'`
- MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS"
--MAGICK_LIBS="$MAGICK_DEP_LIBS MAGICK_EXTRA_DEP_LIBS"
-+MAGICK_LIBS="$MAGICK_DEP_LIBS $MAGICK_EXTRA_DEP_LIBS"
- 
- 
- 
diff --git a/graphics/ImageMagick7/pkg-plist b/graphics/ImageMagick7/pkg-plist
index 9aa6ec4e2964..cb8ad5b4bdfb 100644
--- a/graphics/ImageMagick7/pkg-plist
+++ b/graphics/ImageMagick7/pkg-plist
@@ -188,6 +188,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/clip.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cmyk.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cmyk.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cube.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cube.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cut.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/cut.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/dcm.la