Update ImageMagick7 to 7.0.8.14 [1]

* Add option for ISO/IEC 23008-12:2017 HEIF suport [1]
* Add option for RAW support (from IM6).
* Convert a number of options to optionhelpers (sync from IM6).
* Add comment to the patch-config_policy.xml file why it still needed.

PR:		230788 (based on) [1]
Submitted by:	Sebastian Steinmetz <freebsd-2018@sebastiansteinmetz.ch>

4 files changed, 126 insertions, 217 deletions

diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 2bc3ae156947..6af4a7dd9763 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	7.0.7-16
-PORTREVISION=	2
+DISTVERSION=	7.0.8-14
+PORTREVISION=	0
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://www.imagemagick.org/download/legacy/ \
@@ -47,46 +47,133 @@ CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
-CONFIGURE_ARGS=	--without-dps
+CONFIGURE_ARGS=	--without-dps \
+		--without-flif \
+		--without-raqm \
+		--without-zstd
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
-SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
-		policy.xml quantization-table.xml thresholds.xml \
-		type-apple.xml type-dejavu.xml type-ghostscript.xml \
-		type-urw-base35.xml type-windows.xml type.xml 
+SAMPLE_FILES=	colors.xml delegates.xml log.xml mime.xml policy.xml \
+		quantization-table.xml thresholds.xml type-apple.xml \
+		type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \
+		type-windows.xml type.xml
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
+OPTIONS_SUB=	yes
 OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \
 		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \
 		OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \
-		THREADS X11 16BIT_PIXEL HDRI
+		THREADS X11 16BIT_PIXEL HDRI HEIF RAW
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \
 		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \
-		TIFF WEBP WMF THREADS X11 HDRI
+		TIFF WEBP WMF THREADS X11 HDRI RAW
 
-16BIT_PIXEL_DESC=	16bit pixel support
-JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
 DJVU_DESC=		DJVU format support (needs THREADS)
 GSLIB_DESC=		libgs (Postscript SHLIB) support
-HDRI_DESC=		High dynamic range images support
-MODULES_DESC=		Modules support
-SVG_DESC=		SVG vector image format support (via librsvg)
 TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch
 
-.include <bsd.port.options.mk>
+16BIT_PIXEL_DESC=	16bit pixel support
+16BIT_PIXEL_CONFIGURE_OFF=--with-quantum-depth=8
+16BIT_PIXEL_VARS=	_QBIT=Q16
+16BIT_PIXEL_VARS_OFF=	_QBIT=Q8
+PLIST_SUB+=		QBIT=${_QBIT}
 
-.if ${PORT_OPTIONS:MHDRI}
-CONFIGURE_ARGS+=	--enable-hdri
-_HDRI=HDRI
-.else
-CONFIGURE_ARGS+=	--disable-hdri
-_HDRI=""
-.endif
-PLIST_SUB+=	HDRI=${_HDRI}
+# Produce BZip compressed MIFF images
+BZIP2_DESC=		bzip2 compressed MIFF images
+BZIP2_CONFIGURE_WITH=	bzlib
+
+FFTW_CONFIGURE_WITH=	fftw
+FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3
+
+FONTCONFIG_CONFIGURE_WITH=	fontconfig
+FONTCONFIG_LIB_DEPENDS=		libfontconfig.so:x11-fonts/fontconfig
+
+FREETYPE_CONFIGURE_WITH=	freetype
+FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
+
+# FPX (FlashPIX) images
+FPX_CONFIGURE_WITH=	fpx
+FPX_LIB_DEPENDS=	libfpx.so:graphics/libfpx
+
+GRAPHVIZ_CONFIGURE_WITH=	gvc
+GRAPHVIZ_LIB_DEPENDS=	libgvc.so:graphics/graphviz
+GRAPHVIZ_CFLAGS=	-I${LOCALBASE}/include/graphviz
+GRAPHVIZ_LDFLAGS=	-L${LOCALBASE}/lib/graphviz
+
+HEIF_DESC=		ISO/IEC 23008-12:2017 HEIF file format support
+HEIF_CONFIGURE_WITH=	heic
+HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
+
+HDRI_DESC=		High dynamic range images support
+HDRI_CONFIGURE_ENABLE=	hdri
+HDRI_VARS=		_HDRI=HDRI
+HDRI_VARS_OFF=		_HDRI=""
+PLIST_SUB+=		HDRI=${_HDRI}
+
+# JBIG images (lossless compression for bi-level images)
+JBIG_CONFIGURE_WITH=	jbig
+JBIG_LIB_DEPENDS=	libjbig.so:graphics/jbigkit
+
+JPEG_CONFIGURE_WITH=	jpeg
+JPEG_USES=		jpeg
+
+# JPEG2000 images (wavelet-based lossy compression)
+JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
+JPEG2000_CONFIGURE_WITH=openjp2
+JPEG2000_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
+
+LCMS2_CONFIGURE_WITH=	lcms
+LCMS2_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
+
+LQR_CONFIGURE_WITH=	lqr
+LQR_LIB_DEPENDS=	liblqr-1.so:graphics/liblqr-1
+LQR_USE=		gnome=glib20
+
+LZMA_CONFIGURE_WITH=	lzma
+
+# Loadable coders, smaller executable, but PerlMagick not really works
+# ('make test' there works)
+MODULES_DESC=		Modules support
+MODULES_CONFIGURE_WITH=	modules
+
+PANGO_CONFIGURE_WITH=	pango
+PANGO_USE=		gnome=pango
+PANGO_IMPLIES=		X11
+
+PNG_CONFIGURE_WITH=	png
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+
+# libraw is by default liked to lcms2, whichs also ends up in IM regardless
+# of the IM LCMS option.
+RAW_DESC=		RAW format support (implies the lcms2 option)
+RAW_CONFIGURE_WITH=	raw
+RAW_LIB_DEPENDS=	libraw_r.so:graphics/libraw
+RAW_IMPLIES=		LCMS2
+
+SVG_DESC=		SVG vector image format support (via librsvg, implies the x11 option)
+SVG_CONFIGURE_WITH=	rsvg
+SVG_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
+SVG_USE=		gnome=cairo,gdkpixbuf2
+SVG_IMPLIES=		X11
+
+TIFF_CONFIGURE_WITH=	tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+
+WEBP_CONFIGURE_WITH=	webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+
+X11_CONFIGURE_WITH=	x
+X11_USE=		xorg=ice,sm,x11,xext,xt
+X11_VARS=		CONFLICTS_INSTALL+="ImageMagick7-nox11-* \
+			CONFLICTS+=display-[0-9]*
+X11_VARS_OFF=		CONFLICTS_INSTALL+="ImageMagick7-*" \
+			PKGNAMESUFFIX=7-nox11
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
 _IMAGEMAGICK_THREADS=yes
@@ -145,29 +232,10 @@ USES+=		compiler:openmp
 CONFIGURE_ARGS+=	--disable-openmp
 .endif
 
-.if ${PORT_OPTIONS:M16BIT_PIXEL}
-_QBIT=Q16
-.else
-# Faster, but poor quality
-CONFIGURE_ARGS+=	--with-quantum-depth=8
-_QBIT=Q8
-.endif
-PLIST_SUB+=		QBIT=${_QBIT}
-
 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
 .endif
 
-# Loadable coders, smaller executable, but PerlMagick not really works
-# ('make test' there works)
-.if ${PORT_OPTIONS:MMODULES}
-CONFIGURE_ARGS+=	--with-modules
-PLIST_SUB+=		MODULES=''
-.else
-CONFIGURE_ARGS+=	--without-modules
-PLIST_SUB+=		MODULES='@comment '
-.endif
-
 .if ${PORT_OPTIONS:MOPENEXR}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
@@ -192,30 +260,6 @@ CONFIGURE_ARGS+=	--without-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MJPEG}
-USES+=			jpeg
-PLIST_SUB+=		JPEG=""
-.else
-CONFIGURE_ARGS+=	--without-jpeg
-PLIST_SUB+=		JPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		libpng.so:graphics/png
-PLIST_SUB+=		PNG=""
-.else
-CONFIGURE_ARGS+=	--without-png
-PLIST_SUB+=		PNG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=		libtiff.so:graphics/tiff
-PLIST_SUB+=		TIFF=""
-.else
-CONFIGURE_ARGS+=	--without-tiff
-PLIST_SUB+=		TIFF="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MGSLIB}
 CONFIGURE_ARGS+=	--with-gslib
 . if ${PORT_OPTIONS:MX11}
@@ -227,102 +271,6 @@ USES+=		ghostscript
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
-.if ${PORT_OPTIONS:MLQR}
-CONFIGURE_ARGS+=	--with-lqr
-LIB_DEPENDS+=		liblqr-1.so:graphics/liblqr-1
-USE_GNOME+=		glib20
-.else
-CONFIGURE_ARGS+=	--without-lqr
-.endif
-
-.if ${PORT_OPTIONS:MFFTW}
-CONFIGURE_ARGS+=	--with-fftw
-LIB_DEPENDS+=		libfftw3.so:math/fftw3
-.else
-CONFIGURE_ARGS+=	--without-fftw
-.endif
-
-# Produce BZip compressed MIFF images
-.if empty(PORT_OPTIONS:MBZIP2)
-CONFIGURE_ARGS+=	--without-bzlib
-.endif
-
-# FPX (FlashPIX) images
-.if ${PORT_OPTIONS:MFPX}
-LIB_DEPENDS+=		libfpx.so:graphics/libfpx
-CONFIGURE_ARGS+=	--with-fpx
-PLIST_SUB+=		FPX=""
-.else
-CONFIGURE_ARGS+=	--without-fpx
-PLIST_SUB+=		FPX="@comment "
-.endif
-
-# JBIG images (lossless compression for bi-level images)
-.if ${PORT_OPTIONS:MJBIG}
-LIB_DEPENDS+=		libjbig.so:graphics/jbigkit
-PLIST_SUB+=		JBIG=""
-.else
-CONFIGURE_ARGS+=	--without-jbig
-PLIST_SUB+=		JBIG="@comment "
-.endif
-
-# JPEG2000 images (wavelet-based lossy compression)
-.if ${PORT_OPTIONS:MJPEG2000}
-LIB_DEPENDS+=		libopenjp2.so:graphics/openjpeg
-PLIST_SUB+=		JPEG2000=""
-.else
-CONFIGURE_ARGS+=	--without-openjp2
-PLIST_SUB+=		JPEG2000="@comment "
-.endif
-
-# GraphViz dot graphs
-.if ${PORT_OPTIONS:MGRAPHVIZ}
-LIB_DEPENDS+=		libgvc.so:graphics/graphviz
-CFLAGS+=		-I${LOCALBASE}/include/graphviz
-LDFLAGS+=		-L${LOCALBASE}/lib/graphviz
-.else
-CONFIGURE_ARGS+=	--without-gvc
-.endif
-
-# LZMA support
-# needs manula override for base system...
-.if ! ${PORT_OPTIONS:MLZMA}
-CONFIGURE_ARGS+=	--without-lzma
-.endif
-
-# LCMS (Little CMS) color management version 2 and 1 (mutually exclusive)
-.if ${PORT_OPTIONS:MLCMS2}
-LIB_DEPENDS+=		liblcms2.so:graphics/lcms2
-.else
-CONFIGURE_ARGS+=	--without-lcms
-.endif
-
-# Freetype (TrueType Font) support
-.if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=		libfreetype.so:print/freetype2
-CONFIGURE_ARGS+=	--with-freetype
-.else
-CONFIGURE_ARGS+=	--without-freetype
-.endif
-
-# Webp support
-.if ${PORT_OPTIONS:MWEBP}
-LIB_DEPENDS+=		libwebp.so:graphics/webp
-CONFIGURE_ARGS+=	--with-webp
-PLIST_SUB+=		WEBP=""
-.else
-CONFIGURE_ARGS+=	--without-webp
-PLIST_SUB+=		WEBP="@comment "
-.endif
-
-# Fontconfig support
-.if ${PORT_OPTIONS:MFONTCONFIG}
-LIB_DEPENDS+=		libfontconfig.so:x11-fonts/fontconfig
-CONFIGURE_ARGS+=	--with-fontconfig
-.else
-CONFIGURE_ARGS+=	--without-fontconfig
-.endif
-
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
@@ -337,24 +285,6 @@ CONFIGURE_ARGS+=	--without-wmf
 PLIST_SUB+=		WMF="@comment "
 .endif
 
-# SVG (Scalable Vector Graphics) requires both libxml2 and X11
-.if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=		librsvg-2.so:graphics/librsvg2
-USE_GNOME+=		cairo gdkpixbuf2
-CONFIGURE_ARGS+=	--with-rsvg
-.else
-CONFIGURE_ARGS+=	--without-rsvg
-.endif
-
-# Pango support
-.if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MX11}
-USE_GNOME+=		pango
-PLIST_SUB+=		PANGO=""
-.else
-CONFIGURE_ARGS+=	--without-pango
-PLIST_SUB+=		PANGO="@comment "
-.endif
-
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
 . if ${PORT_OPTIONS:MX11}
@@ -364,19 +294,6 @@ USES+=		ghostscript
 . endif
 .endif
 
-.if ! ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=	--without-x
-CONFLICTS+=		ImageMagick7-*
-PLIST_SUB+=		X11='@comment '
-PKGNAMESUFFIX=		7-nox11
-.else
-CONFLICTS+=		ImageMagick7-nox11-*
-CONFLICTS+=		display-[0-9]*
-CONFIGURE_ARGS+=	--with-x
-USE_XORG=		sm ice x11 xext xt
-PLIST_SUB+=		X11=''
-.endif
-
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install-strip install-docDATA install-data-html
 .else
diff --git a/graphics/ImageMagick7/distinfo b/graphics/ImageMagick7/distinfo
index 6d93a5fc83da..27c245b8cab3 100644
--- a/graphics/ImageMagick7/distinfo
+++ b/graphics/ImageMagick7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514225005
-SHA256 (ImageMagick-7.0.7-16.tar.xz) = 9b3ef8c8a8d2eafc0b72ea9f037720e5d50d5c072cc2847e7d97f65fd3af1f14
-SIZE (ImageMagick-7.0.7-16.tar.xz) = 8539884
+TIMESTAMP = 1541880044
+SHA256 (ImageMagick-7.0.8-14.tar.xz) = 70c3d8c800cfd0282c0e0d9930b83f472f9593a882adc77532aa82c0d7ca0bb1
+SIZE (ImageMagick-7.0.8-14.tar.xz) = 8634400
diff --git a/graphics/ImageMagick7/files/patch-config_policy.xml b/graphics/ImageMagick7/files/patch-config_policy.xml
index f2c914df229d..58f2c9f753e7 100644
--- a/graphics/ImageMagick7/files/patch-config_policy.xml
+++ b/graphics/ImageMagick7/files/patch-config_policy.xml
@@ -1,9 +1,12 @@
---- config/policy.xml.orig	2017-09-23 12:22:07 UTC
+Upstream doesn't disable these by default.
+
+--- config/policy.xml.orig	2018-08-17 19:14:07 UTC
 +++ config/policy.xml
-@@ -64,6 +64,11 @@
+@@ -65,6 +65,11 @@
    <!-- <policy domain="resource" name="map" value="4GiB"/> -->
    <!-- <policy domain="resource" name="width" value="10KP"/> -->
    <!-- <policy domain="resource" name="height" value="10KP"/> -->
+   <!-- <policy domain="resource" name="list-length" value="128"/> -->
 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
 +  <policy domain="coder" rights="none" pattern="URL" />
 +  <policy domain="coder" rights="none" pattern="HTTPS" />
diff --git a/graphics/ImageMagick7/pkg-plist b/graphics/ImageMagick7/pkg-plist
index 0f30f517ec28..9aa6ec4e2964 100644
--- a/graphics/ImageMagick7/pkg-plist
+++ b/graphics/ImageMagick7/pkg-plist
@@ -14,11 +14,9 @@ bin/magick-script
 bin/mogrify
 bin/montage
 bin/stream
-@sample etc/ImageMagick-7/coder.xml.sample
 @sample etc/ImageMagick-7/colors.xml.sample
 @sample etc/ImageMagick-7/delegates.xml.sample
 @sample etc/ImageMagick-7/log.xml.sample
-@sample etc/ImageMagick-7/magic.xml.sample
 @sample etc/ImageMagick-7/mime.xml.sample
 @sample etc/ImageMagick-7/policy.xml.sample
 @sample etc/ImageMagick-7/quantization-table.xml.sample
@@ -43,6 +41,7 @@ include/ImageMagick-7/Magick++/Montage.h
 include/ImageMagick-7/Magick++/Pixels.h
 include/ImageMagick-7/Magick++/ResourceLimits.h
 include/ImageMagick-7/Magick++/STL.h
+include/ImageMagick-7/Magick++/SecurityPolicy.h
 include/ImageMagick-7/Magick++/Statistic.h
 include/ImageMagick-7/Magick++/TypeMetric.h
 include/ImageMagick-7/MagickCore/MagickCore.h
@@ -125,6 +124,7 @@ include/ImageMagick-7/MagickCore/semaphore.h
 include/ImageMagick-7/MagickCore/shear.h
 include/ImageMagick-7/MagickCore/signature.h
 include/ImageMagick-7/MagickCore/splay-tree.h
+include/ImageMagick-7/MagickCore/static.h
 include/ImageMagick-7/MagickCore/statistic.h
 include/ImageMagick-7/MagickCore/stream.h
 include/ImageMagick-7/MagickCore/string_.h
@@ -208,8 +208,6 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 %%TIFF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ept.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fax.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fax.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fd.la
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fd.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fits.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fits.so
 %%FPX%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/fpx.la
@@ -224,6 +222,8 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hald.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hdr.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hdr.so
+%%HEIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/heic.la
+%%HEIF%%%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/heic.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/histogram.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/histogram.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/hrz.la
@@ -420,13 +420,13 @@ lib/libMagick++-7.so.4.0.0
 lib/libMagickCore-7.a
 lib/libMagickCore-7.la
 lib/libMagickCore-7.so
-lib/libMagickCore-7.so.5
-lib/libMagickCore-7.so.5.0.0
+lib/libMagickCore-7.so.6
+lib/libMagickCore-7.so.6.0.0
 lib/libMagickWand-7.a
 lib/libMagickWand-7.la
 lib/libMagickWand-7.so
-lib/libMagickWand-7.so.5
-lib/libMagickWand-7.so.5.0.0
+lib/libMagickWand-7.so.6
+lib/libMagickWand-7.so.6.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/%%QBIT%%%%HDRI%%/%%QBIT%%%%HDRI%%.so
@@ -1339,9 +1339,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/blob.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/blob.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/cache-view.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/cache-view.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/cache.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/cache.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/channel.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/channel.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/cipher.html
@@ -1355,7 +1353,6 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/compare.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/compare.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/composite.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/composite.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/constitute.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/constitute.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/decorate.html
@@ -1385,7 +1382,6 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/histogram.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/histogram.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/image-view.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/image-view.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/image.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/image.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/layer.html
@@ -1408,7 +1404,6 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/mime.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/mime.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/module.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/module.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/mogrify.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/mogrify.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/monitor.html
@@ -1424,9 +1419,7 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/pixel-wand.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/pixel-wand.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/profile.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/profile.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/property.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/property.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/quantize.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/quantize.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/registry.html
@@ -1434,7 +1427,6 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/resize.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/resize.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/resource.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/resource.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/segment.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/segment.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/shear.html
@@ -1444,13 +1436,11 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/statistic.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/statistic.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/stream.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/api/stream.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/transform.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/transform.php
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/version.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/api/version.php
 %%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/assets/magick.css
 %%PORTDOCS%%%%DOCSDIR%%-7/www/assets/magick.js
@@ -1539,7 +1529,6 @@ man/man1/stream.1.gz
 %%PORTDOCS%%%%DOCSDIR%%-7/www/source/type.xml
 %%PORTDOCS%%%%DOCSDIR%%-7/www/source/wand.c
 %%PORTDOCS%%%%DOCSDIR%%-7/www/stream.html
-%%PORTDOCS%%%%DOCSDIR%%-7/www/subversion.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/support.html
 %%PORTDOCS%%%%DOCSDIR%%-7/www/wand.png
 %%PORTDOCS%%%%DOCSDIR%%-7/www/webp.html