diff -udprN /usr/ports/graphics/ImageMagick7/Makefile ./Makefile
--- /usr/ports/graphics/ImageMagick7/Makefile 2016-12-04 23:59:10.000000000 +0000
+++ ./Makefile 2017-02-09 08:45:51.655122000 +0000
@@ -1,7 +1,7 @@
# $FreeBSD: head/graphics/ImageMagick7/Makefile 427819 2016-12-04 23:59:10Z feld $
PORTNAME= ImageMagick
-DISTVERSION= 7.0.3-7
+DISTVERSION= 7.0.4-7
CATEGORIES= graphics perl5
MASTER_SITES= http://www.imagemagick.org/download/ \
http://www.imagemagick.org/download/legacy/ \
@@ -39,8 +39,8 @@ LIB_DEPENDS= libltdl.so:devel/libltdl
CONFLICTS_INSTALL= execline-[0-9]* # bin/import
# This port uses .la files, keep libtool:keepla! (magick/module.c)
-USES= cpe gettext-runtime gmake gnome libtool:keepla \
- localbase pathfix perl5 pkgconfig:both shebangfix tar:xz
+USES= 7z cpe gettext-runtime gmake gnome libtool:keepla \
+ localbase pathfix perl5 pkgconfig:both shebangfix
CPE_PRODUCT= imagemagick
CPE_VENDOR= imagemagick
SHEBANG_FILES= www/source/examples.pl
@@ -369,7 +369,7 @@ CONFLICTS+= ImageMagick7-*
PLIST_SUB+= X11='@comment '
PKGNAMESUFFIX= 7-nox11
.else
-CONFLICTS+= ImageMagick7-nox11-*
+CONFLICTS+= ImageMagick7-nox11-[0-9]*
CONFLICTS+= display-[0-9]*
CONFIGURE_ARGS+= --with-x
USE_XORG= sm ice x11 xext xt
diff -udprN /usr/ports/graphics/ImageMagick7/distinfo ./distinfo
--- /usr/ports/graphics/ImageMagick7/distinfo 2016-12-04 23:59:10.000000000 +0000
+++ ./distinfo 2017-02-08 06:55:14.183784000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479675593
-SHA256 (ImageMagick-7.0.3-7.tar.xz) = 140b99f33a3326aed92132a7cd054ee962a6e2562064c68495640411aa4571d7
-SIZE (ImageMagick-7.0.3-7.tar.xz) = 8290176
+TIMESTAMP = 1486536914
+SHA256 (ImageMagick-7.0.4-7.7z) = 1ab5bd3976d25d4d46e3fc9f9ab288679044932c80332b94324f37cba01e05c1
+SIZE (ImageMagick-7.0.4-7.7z) = 8294295
diff -udprN /usr/ports/graphics/ImageMagick7/files/patch-config_policy.xml ./files/patch-config_policy.xml
--- /usr/ports/graphics/ImageMagick7/files/patch-config_policy.xml 2016-05-13 12:57:03.000000000 +0000
+++ ./files/patch-config_policy.xml 2017-02-09 07:59:52.001818000 +0000
@@ -1,12 +1,13 @@
---- config/policy.xml.orig 2016-05-09 19:28:58.000000000 +0200
-+++ config/policy.xml 2016-05-10 17:44:26.720503000 +0200
-@@ -64,4 +64,9 @@
-
+--- config/policy.xml.orig 2017-02-04 14:40:54 UTC
++++ config/policy.xml
+@@ -64,5 +64,10 @@
+
+
-
+
+
+
+
+
+
diff -udprN /usr/ports/graphics/ImageMagick7/pkg-plist ./pkg-plist
--- /usr/ports/graphics/ImageMagick7/pkg-plist 2016-08-11 10:32:56.000000000 +0000
+++ ./pkg-plist 2017-02-09 08:46:06.652539000 +0000
@@ -412,13 +412,13 @@ lib/ImageMagick-%%PORTVERSION%%/config-%
lib/libMagick++-7.a
lib/libMagick++-7.la
lib/libMagick++-7.so
-lib/libMagick++-7.so.0
-lib/libMagick++-7.so.0.0.0
+lib/libMagick++-7.so.1
+lib/libMagick++-7.so.1.0.0
lib/libMagickCore-7.a
lib/libMagickCore-7.la
lib/libMagickCore-7.so
-lib/libMagickCore-7.so.0
-lib/libMagickCore-7.so.0.0.0
+lib/libMagickCore-7.so.2
+lib/libMagickCore-7.so.2.0.0
lib/libMagickWand-7.a
lib/libMagickWand-7.la
lib/libMagickWand-7.so
@@ -426,10 +426,8 @@ lib/libMagickWand-7.so.0
lib/libMagickWand-7.so.0.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-7.pc
@@ -617,7 +615,6 @@ man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/advanced-unix-installation.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/advanced-windows-installation.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/animate.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/Image++.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/MagickCore/ImageMagick_8h-source.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/MagickCore/ImageMagick_8h.html
@@ -1450,7 +1447,6 @@ man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/wand-view.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/api/wand-view.php
%%PORTDOCS%%%%DOCSDIR%%-7/www/architecture.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/binary-releases.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/changelog.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/cipher.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/color-management.html
@@ -1467,6 +1463,7 @@ man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/convert.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/css/README.txt
%%PORTDOCS%%%%DOCSDIR%%-7/www/css/magick.css
+%%PORTDOCS%%%%DOCSDIR%%-7/www/develop.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/display.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/distribute-pixel-cache.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/download.html
@@ -1496,6 +1493,7 @@ man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/magick-wand.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/magick.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/miff.html
+%%PORTDOCS%%%%DOCSDIR%%-7/www/mirror.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/mogrify.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/montage.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/motion-picture.html
@@ -1532,7 +1530,6 @@ man/man1/stream.1.gz
%%PORTDOCS%%%%DOCSDIR%%-7/www/source/type-windows.xml
%%PORTDOCS%%%%DOCSDIR%%-7/www/source/type.xml
%%PORTDOCS%%%%DOCSDIR%%-7/www/source/wand.c
-%%PORTDOCS%%%%DOCSDIR%%-7/www/sponsors.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/stream.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/subversion.html
%%PORTDOCS%%%%DOCSDIR%%-7/www/support.html