framework: Add new USES 'magick' for graphics/ImageMagick*

A new USES has been added to depend on ImageMagick.

	USES=magick

adds a LIB_DEPENDS on graphics/ImageMagick${IMAGEMAGICK_DEFAULT}.

If a specific version is required, use for example

	USES=magick:6        resp.     USES=magick:7

If only a build, run or test is required, use for example

	USES=magick:build    resp.     USES=magick:6,build,test

If a dependency on the nox11 flavor is required, use for example

	USES=magick:nox11    resp.     USES=magick:7,nox11,run,test

See magick.mk for more details on the available flags.

The tree has been completely converted to make use of this.

Approved by:	bapt
Differential Revision: https://reviews.freebsd.org/D32754

51 files changed, 73 insertions, 116 deletions

diff --git a/graphics/acidwarp-sdl/Makefile b/graphics/acidwarp-sdl/Makefile
index 73c4714de01a..6dd4c39a6e21 100644
--- a/graphics/acidwarp-sdl/Makefile
+++ b/graphics/acidwarp-sdl/Makefile
@@ -5,9 +5,7 @@ CATEGORIES=	graphics
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Eye candy program which displays various patterns
 
-BUILD_DEPENDS=	convert:graphics/ImageMagick7
-
-USES=		cmake sdl
+USES=		cmake magick:7,build sdl
 USE_SDL=	sdl2
 
 USE_GITHUB=	yes
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index b2d03ed1272f..aa3332d431d0 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=IMAGEMAGICK
 MING_DESC=	Enable swf interface
 PSTOEDIT_DESC=	Convert postscript to other formats
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
+IMAGEMAGICK_USES=		magick:6
 IMAGEMAGICK_CONFIGURE_OFF=	--without-magick
 
 MING_LIB_DEPENDS=	libming.so:graphics/ming
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 822c3d21e79f..33d110dce2ef 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -9,10 +9,11 @@ MASTER_SITES=	SF/aa-project/${PORTNAME}/${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphics viewer for viewing netpbm format on console or X using aalib
 
-RUN_DEPENDS=	anytopnm:graphics/netpbm \
-		convert:graphics/ImageMagick6
+RUN_DEPENDS=	anytopnm:graphics/netpbm
 LIB_DEPENDS=	libaa.so:graphics/aalib
 
+USES=		magick:6,run
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 GNU_CONFIGURE=	yes
diff --git a/graphics/chafa/Makefile b/graphics/chafa/Makefile
index 85dbfd62db71..e05b9a676a62 100644
--- a/graphics/chafa/Makefile
+++ b/graphics/chafa/Makefile
@@ -14,11 +14,9 @@ LICENSE_COMB=	multi
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3+ =	${WRKSRC}/COPYING.LESSER
 
-BUILD_DEPENDS=	convert:graphics/ImageMagick7
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libMagickCore-7.so:graphics/ImageMagick7
 
-USES=		gettext-runtime gnome libtool tar:xz
+USES=		gettext-runtime gnome libtool magick:7 tar:xz
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
index 3dc1ee0c5c46..3c7d56702b34 100644
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -9,9 +9,7 @@ COMMENT=	Easy to use graphics conversion utility
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
-
-USES=		cmake compiler:c++11-lang qt:5 tar:bzip2
+USES=		cmake compiler:c++11-lang magick:6 qt:5 tar:bzip2
 USE_QT=		core gui network widgets \
 		buildtools_build linguisttools_build qmake_build
 
diff --git a/graphics/curator/Makefile b/graphics/curator/Makefile
index 316511ad1756..ac453de88717 100644
--- a/graphics/curator/Makefile
+++ b/graphics/curator/Makefile
@@ -9,13 +9,11 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Static Image Gallery Generator for web or CD-ROM galleries
 
-USES=		python:3.6+
+USES=		magick:6,run python:3.6+
 USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 PLIST_FILES=	man/man1/curator.1.gz
 
-RUN_DEPENDS=	convert:graphics/ImageMagick6
-
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/curator.1 ${STAGEDIR}${PREFIX}/man/man1/curator.1
 
diff --git a/graphics/cuttlefish/Makefile b/graphics/cuttlefish/Makefile
index e6416d392f5e..975b711ba90b 100644
--- a/graphics/cuttlefish/Makefile
+++ b/graphics/cuttlefish/Makefile
@@ -10,10 +10,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plots diurnal and geographical patterns of supplied data
 
 RUN_DEPENDS+=	p5-GD>=0:graphics/p5-GD \
-		convert:graphics/ImageMagick6 \
 		gifsicle:graphics/gifsicle
 
-USES=		perl5 shebangfix
+USES=		magick:6,run perl5 shebangfix
 USE_PERL5=	run
 NO_BUILD=	yes
 SHEBANG_FILES=	bin/cuttlefish.pl
diff --git a/graphics/dcraw-m/Makefile b/graphics/dcraw-m/Makefile
index 9eb5ed09fe44..216d9da706fe 100644
--- a/graphics/dcraw-m/Makefile
+++ b/graphics/dcraw-m/Makefile
@@ -11,14 +11,13 @@ COMMENT=	Modified Decoder for RAW files from digital cameras
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libjasper.so:graphics/jasper \
-		liblcms2.so:graphics/lcms2 \
-		libMagickWand-6.so:graphics/ImageMagick6
+		liblcms2.so:graphics/lcms2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	waitman
 GH_TAGNAME=	1392579
 
-USES=		jpeg pkgconfig
+USES=		jpeg magick:6 pkgconfig
 
 CFLAGS+=	-Wall -I${LOCALBASE}/include \
 		`MagickWand-config --cflags --cppflags` \
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 26f63a21d1b9..ecc365909cf4 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libKF5Sane.so:graphics/libksane \
 		libboost_graph.so:devel/boost-libs \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
-		libMagickCore-6.so:graphics/ImageMagick6 \
 		libgphoto2.so:graphics/libgphoto2 \
 		libicalss.so:devel/libical \
 		libjasper.so:graphics/jasper \
@@ -31,7 +30,7 @@ LIB_DEPENDS=	libKF5Sane.so:graphics/libksane \
 		libx265.so:multimedia/x265
 
 USES=		bison cmake compiler:c++11-lib desktop-file-utils eigen:3 gl \
-		gnome jpeg kde:5 pkgconfig qt:5 shebangfix tar:xz xorg
+		gnome jpeg kde:5 magick:6 pkgconfig qt:5 shebangfix tar:xz xorg
 USE_GL=		gl glu
 USE_GNOME=	glib20 libxml2 libxslt
 USE_KDE=	archive auth bookmarks calendarcore codecs completion config \
diff --git a/graphics/dmtx-utils/Makefile b/graphics/dmtx-utils/Makefile
index e5d410d0e4d0..e112c1cc602e 100644
--- a/graphics/dmtx-utils/Makefile
+++ b/graphics/dmtx-utils/Makefile
@@ -11,10 +11,9 @@ COMMENT=	Software for reading and writing Data Matrix barcodes
 
 LICENSE=	LGPL21+
 
-LIB_DEPENDS=	libdmtx.so:graphics/libdmtx \
-		libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+LIB_DEPENDS=	libdmtx.so:graphics/libdmtx
 
-USES=		autoreconf libtool localbase tar:bzip2 pkgconfig
+USES=		autoreconf libtool localbase magick tar:bzip2 pkgconfig
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dmtx
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index 2e0ea1b537b1..cbb9349ca7bc 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -13,6 +13,6 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 IMAGEMAGICK_DESC=	Install ImageMagick image proccesing tool
 OPTIONS_DEFAULT=	IMAGEMAGICK
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
+IMAGEMAGICK_USES=	magick:6
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/freetype-gl/Makefile b/graphics/freetype-gl/Makefile
index edee62f51539..26c711dd059e 100644
--- a/graphics/freetype-gl/Makefile
+++ b/graphics/freetype-gl/Makefile
@@ -14,9 +14,8 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
-TEST_DEPENDS=	ImageMagick${IMAGEMAGICK_DEFAULT}-nox11>0:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}-nox11
 
-USES=		cmake:noninja gl
+USES=		cmake:noninja gl magick:test,nox11
 USE_GL=		glew
 USE_LDCONFIG=	yes
 
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index fdc85bb1dbfc..1bcfc3d48eda 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -15,7 +15,6 @@ BROKEN=		OpenCV4 no longer ships OpencCV-1.0 headers
 LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick \
 		libOpenEXR.so:graphics/openexr \
 		libopencv_video.so:graphics/opencv \
-		libMagick++-6.so:graphics/ImageMagick6 \
 		libavcodec.so:multimedia/ffmpeg \
 		libfftw3.so:math/fftw3 \
 		libgimp-2.0.so:graphics/gimp-app \
@@ -27,7 +26,7 @@ BASH_RUN_DEPENDS=	bash:shells/bash
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
-USES=		dos2unix gmake gnome localbase pkgconfig xorg
+USES=		dos2unix gmake gnome localbase magick:6 pkgconfig xorg
 USE_GCC=	yes
 USE_GNOME=	gtk20
 USE_XORG=	x11 xext xrandr
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index b8988f7cbc64..4cb686ca6c48 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -15,7 +15,6 @@ BUILD_DEPENDS=	p5-Config-General>=2.40:devel/p5-Config-General \
 		p5-Locale-gettext>=1.05:devel/p5-Locale-gettext \
 		p5-Log-Log4perl>0:devel/p5-Log-Log4perl \
 		p5-Readonly>0:devel/p5-Readonly \
-		ImageMagick6>0:graphics/ImageMagick6 \
 		p5-Image-Sane>=0.14:graphics/p5-Image-Sane \
 		p5-Set-IntSpan>=1.10:math/p5-Set-IntSpan \
 		p5-List-MoreUtils>0:lang/p5-List-MoreUtils \
@@ -31,7 +30,6 @@ RUN_DEPENDS:=	p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable \
 		cjb2:graphics/djvulibre \
 		scanimage:graphics/sane-backends \
 		unpaper:graphics/unpaper \
-		ImageMagick6>0:graphics/ImageMagick6 \
 		p5-HTML-Parser>0:www/p5-HTML-Parser \
 		p5-Filesys-Df>0.92:sysutils/p5-Filesys-Df \
 		p5-Data-UUID>=1.220:devel/p5-Data-UUID \
@@ -57,7 +55,7 @@ RUN_DEPENDS:=	p5-Proc-ProcessTable>0:devel/p5-Proc-ProcessTable \
 
 NO_ARCH=	yes
 
-USES=		desktop-file-utils gettext gmake gnome perl5 tar:xz
+USES=		desktop-file-utils gettext gmake gnome magick:6,build,run perl5 tar:xz
 USE_GNOME=	gtk30 librsvg2
 USE_PERL5=	configure
 
diff --git a/graphics/hdr_tools/Makefile b/graphics/hdr_tools/Makefile
index 9c184e681ee2..3696c59d9b11 100644
--- a/graphics/hdr_tools/Makefile
+++ b/graphics/hdr_tools/Makefile
@@ -16,9 +16,8 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libpopt.so:devel/popt \
 		libtiff.so:graphics/tiff \
 		libOpenEXR.so:graphics/openexr \
-		libMagick++-6.so:graphics/ImageMagick6
 
-USES=		compiler:c++11-lang gmake pkgconfig tar:tgz
+USES=		compiler:c++11-lang gmake magick:6 pkgconfig tar:tgz
 NO_WRKSUBDIR=	yes
 
 PROGRAMS=	hdr_adjust hdr_convert hdr_create hdr_denoise hdr_fix_ca \
diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile
index 9eaaa8ffc532..195fb53c5f6f 100644
--- a/graphics/imageindex/Makefile
+++ b/graphics/imageindex/Makefile
@@ -10,11 +10,10 @@ MASTER_SITES=	http://www.edwinh.org/imageindex/release/ \
 MAINTAINER=	johnjen@reynoldsnet.org
 COMMENT=	Digital photo gallery tool
 
-RUN_DEPENDS=	convert:graphics/ImageMagick6 \
-		mplayer:multimedia/mplayer \
+RUN_DEPENDS=	mplayer:multimedia/mplayer \
 		p5-Image-Info>=0:graphics/p5-Image-Info
 
-USES=		jpeg perl5
+USES=		jpeg magick:6,run perl5
 USE_PERL5=	run
 MAKE_ARGS+=	PERLPATH=${PERL} PREFIX=${STAGEDIR}${PREFIX}
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index ceecb66ab1cc..9451ba0284ce 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -96,7 +96,7 @@ WPG_LIB_DEPENDS=	libwpg-0.3.so:graphics/libwpg03
 
 IMAGICK_DESC=		Raster image format library
 IMAGICK6_DESC=		Use ImageMagick6
-IMAGICK6_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
+IMAGICK6_USES=		magick:6
 IMAGICK6_CMAKE_BOOL=	WITH_IMAGE_MAGICK
 GM_DESC=		Use GraphicsMagick
 GM_LIB_DEPENDS=		libGraphicsMagick.so:graphics/GraphicsMagick
diff --git a/graphics/instant-meshes/Makefile b/graphics/instant-meshes/Makefile
index ff2df235f08e..570b6818a674 100644
--- a/graphics/instant-meshes/Makefile
+++ b/graphics/instant-meshes/Makefile
@@ -10,12 +10,11 @@ COMMENT=	Interactive field-aligned mesh generator
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	convert:graphics/ImageMagick6
 LIB_DEPENDS=	libglfw.so:graphics/glfw
 RUN_DEPENDS=	zenity:x11/zenity
 
 USES=		cmake compiler:c++14-lang eigen:3 gl localbase:ldflags \
-		pkgconfig xorg
+		magick:6,build pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	wjakob
 GH_TUPLE=	wjakob:nanogui:2a61f03:nanogui/ext/nanogui \
diff --git a/graphics/kxstitch/Makefile b/graphics/kxstitch/Makefile
index 9e06fd4ecf13..16d317c3bdda 100644
--- a/graphics/kxstitch/Makefile
+++ b/graphics/kxstitch/Makefile
@@ -7,10 +7,7 @@ CATEGORIES=	graphics kde
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Cross stitch pattern editor
 
-LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6 \
-		libMagickCore-6.so:graphics/ImageMagick6
-
-USES=		cmake compiler:c++11-lang desktop-file-utils kde:5 qt:5 tar:xz \
+USES=		cmake compiler:c++11-lang desktop-file-utils magick:6 kde:5 qt:5 tar:xz \
 		xorg
 USE_KDE=	auth bookmarks codecs completion config configwidgets coreaddons \
 		i18n itemviews jobwidgets kio service solid sonnet textwidgets \
diff --git a/graphics/l2p/Makefile b/graphics/l2p/Makefile
index 309d30a97f90..b4ee3df5ac59 100644
--- a/graphics/l2p/Makefile
+++ b/graphics/l2p/Makefile
@@ -8,8 +8,6 @@ MASTER_SITES=	http://static.redsymbol.net/software/l2p/dist/ \
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Create PNG images from LaTeX math expressions
 
-RUN_DEPENDS=	convert:graphics/ImageMagick6
-
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
@@ -21,7 +19,7 @@ SHEBANG_FILES=	${WRKSRC}/${PORTNAME}
 
 USE_PERL5=	run
 USE_TEX=	latex dvipsk
-USES=		perl5 shebangfix zip
+USES=		magick:6,run perl5 shebangfix zip
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile
index b78b549a125b..3caf850d5873 100644
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -10,9 +10,7 @@ COMMENT=	Vector graphics C++ library
 
 LICENSE=	LGPL3
 
-LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
-
-USES=		cmake compiler:c++11-lang localbase
+USES=		cmake compiler:c++11-lang localbase magick
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	c-koi
diff --git a/graphics/meh/Makefile b/graphics/meh/Makefile
index 7057c086a61b..96572333721c 100644
--- a/graphics/meh/Makefile
+++ b/graphics/meh/Makefile
@@ -14,9 +14,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png
-RUN_DEPENDS=	convert:graphics/ImageMagick7
 
-USES=		gmake jpeg localbase xorg
+USES=		gmake jpeg localbase magick:7,run xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	jhawthorn
 USE_XORG=	x11 xext
diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile
index 12cde71be02c..ea1407141dfe 100644
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@@ -13,13 +13,12 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool \
 		p5-forks>=0:devel/p5-forks
-LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick6
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gammy
 
 NO_BUILD=	yes
-USES=		perl5 shebangfix
+USES=		magick:6 perl5 shebangfix
 USE_PERL5=	run
 SHEBANG_FILES=	npretty.pl
 
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index be09eb304439..db04c9ddcbf9 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -15,12 +15,11 @@ LICENSE_NAME=	IBM PUBLIC LICENSE - Open Visualization Data Explorer VERSION 1.0
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6	\
-		libtiff.so:graphics/tiff		\
+LIB_DEPENDS=	libtiff.so:graphics/tiff		\
 		libcdf.so:science/cdf
 
 MAKE_JOBS_UNSAFE=	yes
-USES=		bison compiler:c++17-lang gl gmake libtool motif xorg
+USES=		bison compiler:c++17-lang gl gmake libtool magick:6 motif xorg
 USE_XORG=	x11 xt xinerama xext xpm xmu sm ice
 USE_GL=		gl glu
 GNU_CONFIGURE=	yes
diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile
index e5418f8d59db..3d1f023e93af 100644
--- a/graphics/openfx-arena/Makefile
+++ b/graphics/openfx-arena/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 		librevenge-0.0.so:textproc/librevenge \
 		libpoppler-glib.so:graphics/poppler-glib \
 		liblcms2.so:graphics/lcms2 \
-		libMagick++-6.so:graphics/ImageMagick6 \
 		libzip.so:archivers/libzip \
 		libexpat.so:textproc/expat2 \
 		libfreetype.so:print/freetype2 \
@@ -33,7 +32,7 @@ LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 		libltdl.so:devel/libltdl \
 		libpoppler.so:graphics/poppler
 
-USES=		gl gmake gnome iconv xorg
+USES=		gl gmake gnome iconv magick:6 xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	NatronGitHub
 GH_TUPLE=	NatronGitHub:openfx-supportext:e600cae:openfx_supportext/SupportExt \
diff --git a/graphics/optar/Makefile b/graphics/optar/Makefile
index 9f05bde159b1..2e47e3b7b978 100644
--- a/graphics/optar/Makefile
+++ b/graphics/optar/Makefile
@@ -15,11 +15,10 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png
-RUN_DEPENDS=	convert:graphics/ImageMagick6
 
 WRKSRC=		${WRKDIR}/optar_dist
 
-USES=		gmake tar:tgz
+USES=		gmake magick:6,run tar:tgz
 
 PLIST_FILES=	bin/optar bin/unoptar bin/pgm2ps
 
diff --git a/graphics/p5-CAD-Drawing/Makefile b/graphics/p5-CAD-Drawing/Makefile
index 25e0684aa6d2..1d0389dade6d 100644
--- a/graphics/p5-CAD-Drawing/Makefile
+++ b/graphics/p5-CAD-Drawing/Makefile
@@ -18,10 +18,9 @@ RUN_DEPENDS=	p5-CAD-Calc>=0:math/p5-CAD-Calc \
 		p5-Math-Geometry-Planar>=0:math/p5-Math-Geometry-Planar \
 		p5-Math-MatrixReal>=0:math/p5-Math-MatrixReal \
 		p5-Math-Vec>=0:math/p5-Math-Vec \
-		p5-Stream>=0:devel/p5-Stream \
-		convert:graphics/ImageMagick6
+		p5-Stream>=0:devel/p5-Stream
 
-USES=		perl5
+USES=		magick:6,run perl5
 USE_PERL5=	modbuild
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Image-Heatmap/Makefile b/graphics/p5-Image-Heatmap/Makefile
index 65d515ece604..aeb95bda30fa 100644
--- a/graphics/p5-Image-Heatmap/Makefile
+++ b/graphics/p5-Image-Heatmap/Makefile
@@ -13,10 +13,8 @@ COMMENT=	Convert geographic coordinates into a graphical heatmap
 LICENSE=	ART20 GPLv1
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	convert:graphics/ImageMagick6
-
 WRKSRC=	${WRKDIR}/${PORTNAME}
-USES=		perl5
+USES=		magick:6,run perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index 4d181d79871a..5242e953e043 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -11,10 +11,9 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Sequentially read Image::Magick object from a filehandle
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	ImageMagick6>=0:graphics/ImageMagick6 \
-		p5-Image-PBMlib>=1.05:graphics/p5-Image-PBMlib
+RUN_DEPENDS=	p5-Image-PBMlib>=1.05:graphics/p5-Image-PBMlib
 
-USES=		perl5
+USES=		magick:6,build,run perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
diff --git a/graphics/p5-Image-OCR-Tesseract/Makefile b/graphics/p5-Image-OCR-Tesseract/Makefile
index df2f7fe82066..60e594cb3fe8 100644
--- a/graphics/p5-Image-OCR-Tesseract/Makefile
+++ b/graphics/p5-Image-OCR-Tesseract/Makefile
@@ -10,12 +10,11 @@ COMMENT=	Read an image with Resseract OCR and get output
 
 LICENSE=	GPLv3
 
-MY_DEPENDS=	tesseract>0:graphics/tesseract \
-		ImageMagick6-nox11>0:graphics/ImageMagick6-nox11
+MY_DEPENDS=	tesseract>0:graphics/tesseract
 BUILD_DEPENDS=	${MY_DEPENDS}
 RUN_DEPENDS=	${MY_DEPENDS}
 
-USES=		perl5
+USES=		magick:6,build,run,nox11 perl5
 USE_PERL5=	configure
 
 NO_ARCH=	yes
diff --git a/graphics/pecl-imagick-im7/Makefile b/graphics/pecl-imagick-im7/Makefile
index 9074c1e8a397..749ee78fde62 100644
--- a/graphics/pecl-imagick-im7/Makefile
+++ b/graphics/pecl-imagick-im7/Makefile
@@ -12,7 +12,7 @@ MASTERDIR=	${.CURDIR}/../pecl-imagick
 
 CONFLICTS_INSTALL=	${PKGNAMEPREFIX}${PORTNAME}
 
-X11_LIB_DEPENDS?=	libMagickWand-7.so:graphics/ImageMagick7
-X11_LIB_DEPENDS_OFF?=	libMagickWand-7.so:graphics/ImageMagick7-nox11
+X11_USES?=		magick:7
+X11_USES_OFF?=		magick:7,nox11
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index 6a5ec4e4783a..681483fbfee7 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -17,8 +17,8 @@ CONFLICTS_INSTALL?=	${PKGNAMEPREFIX}${PORTNAME}-im7
 
 OPTIONS_DEFINE=	X11
 
-X11_LIB_DEPENDS?=	libMagickWand-6.so:graphics/ImageMagick6
-X11_LIB_DEPENDS_OFF?=	libMagickWand-6.so:graphics/ImageMagick6-nox11
+X11_USES?=		magick:6
+X11_USES_OFF?=		magick:6,nox11
 
 CONFIGURE_ARGS=	--with-imagick=${LOCALBASE}
 
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index b3b29a9530ed..eaa83e4debf1 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -55,7 +55,7 @@ OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr \
 			libImath.so:math/Imath
 
 IMAGEMAGICK_CMAKE_BOOL=	WITH_ImageMagick
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:graphics/ImageMagick6
+IMAGEMAGICK_USES=	magick:6
 
 NETPBM_CMAKE_BOOL=	WITH_NetPBM
 NETPBM_LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile
index 77f9aa76978d..bbfb754e3df7 100644
--- a/graphics/pqiv/Makefile
+++ b/graphics/pqiv/Makefile
@@ -51,7 +51,7 @@ SPECTRE_CONFIGURE_WITH=	spectre
 SPECTRE_LIB_DEPENDS=	libspectre.so:print/libspectre
 
 WAND_CONFIGURE_WITH=	wand
-WAND_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
+WAND_USES=		magick:6
 
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 188a3f6049d9..1dfaa1dc90a8 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -32,7 +32,7 @@ EMF_DESC=		WMF/EMF support via libEMF
 EMF_LIB_DEPENDS=	libEMF.so:graphics/libemf
 EMF_CONFIGURE_ON=	--with-libemf-include=${LOCALBASE}/include/libEMF
 EMF_CONFIGURE_OFF=	--without-emf
-MAGICK_LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+MAGICK_USES=		magick
 MAGICK_CONFIGURE_ON=	--with-magick
 MAGICK_CONFIGURE_OFF=	--without-magick
 MING_DESC=		Flash support via Ming
diff --git a/graphics/py-sorl-thumbnail/Makefile b/graphics/py-sorl-thumbnail/Makefile
index 8dd61f6edfd2..3de3a44654de 100644
--- a/graphics/py-sorl-thumbnail/Makefile
+++ b/graphics/py-sorl-thumbnail/Makefile
@@ -33,7 +33,7 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_F
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
 
 GRAPHICSMAGICK_RUN_DEPENDS=	${LOCALBASE}/bin/gm:graphics/GraphicsMagick
-IMAGEMAGICK_RUN_DEPENDS=	${LOCALBASE}/bin/convert:graphics/ImageMagick6
+IMAGEMAGICK_USES=		magick:6,run
 PILLOW_RUN_DEPENDS=		${PY_PILLOW}
 REDIS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${PY_FLAVOR}
 WAND_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}Wand>0:graphics/py-wand@${PY_FLAVOR}
diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
index 47aabe40bf95..84ae2963cfa4 100644
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -27,15 +27,15 @@ IMAGEMAGICK7_DESC=	Use ImageMagick 7.x (graphics/ImageMagick7*)
 
 .if ${PORT_OPTIONS:MX11}
 .if ${PORT_OPTIONS:MIMAGEMAGICK7}
-LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7
+USES=		magick:7
 .else
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
+USES=		magick:6
 .endif
 .else
 .if ${PORT_OPTIONS:MIMAGEMAGICK7}
-LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7-nox11
+USES=		magick:7,nox11
 .else
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6-nox11
+USES=		magick:6,nox11
 .endif
 .endif
 
diff --git a/graphics/raster3d/Makefile b/graphics/raster3d/Makefile
index 769b85733dcc..7ec93c25dcf8 100644
--- a/graphics/raster3d/Makefile
+++ b/graphics/raster3d/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	IMAGEMAGICK DOCS EXAMPLES
 OPTIONS_DEFAULT=IMAGEMAGICK
 OPTIONS_SUB=		yes
 
-IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick6
+IMAGEMAGICK_USES=	magick:6,run
 
 .include <bsd.port.options.mk>
 
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 875b484b8715..f99bb5d44407 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -10,10 +10,9 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL screensaver collection
 
-LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6 \
-		libGLC.so:graphics/quesoglc
+LIB_DEPENDS=	libGLC.so:graphics/quesoglc
 
-USES=		compiler:c++11-lang gl gmake pathfix pkgconfig tar:bzip2 libtool
+USES=		compiler:c++11-lang gl gmake magick:6 pathfix pkgconfig tar:bzip2 libtool
 USE_GL=		glut
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/recoverjpeg/Makefile b/graphics/recoverjpeg/Makefile
index e8c09d240250..f349f156dedb 100644
--- a/graphics/recoverjpeg/Makefile
+++ b/graphics/recoverjpeg/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Recoverjpeg tries to recover JFIF (JPEG) pictures from a peripheral
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	exif:graphics/exif \
-		identify:graphics/ImageMagick6
+RUN_DEPENDS=	exif:graphics/exif
 
-USES=		python shebangfix
+USES=		magick:6,run python shebangfix
 GNU_CONFIGURE=	yes
 
 SHEBANG_FILES=	scripts/remove-duplicates
diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile
index ab78167412ea..761c1a5fbdec 100644
--- a/graphics/renrot/Makefile
+++ b/graphics/renrot/Makefile
@@ -22,7 +22,7 @@ PORTDOCS=	AUTHORS README README.russian ChangeLog NEWS TODO
 OPTIONS_DEFINE=	IMAGEMAGICK DOCS
 IMAGEMAGICK_DESC=	Image::Magick Perl module support
 
-IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick6
+IMAGEMAGICK_USES=	magick:6,run
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile
index 375e4d7cbefe..e1ebe0aea091 100644
--- a/graphics/rubygem-mini_magick/Makefile
+++ b/graphics/rubygem-mini_magick/Makefile
@@ -27,15 +27,15 @@ NO_ARCH=	yes
 
 .if ${PORT_OPTIONS:MX11}
 .if ${PORT_OPTIONS:MIMAGEMAGICK7}
-RUN_DEPENDS+=	convert:graphics/ImageMagick7
+USES+=		magick:7
 .else
-RUN_DEPENDS+=	convert:graphics/ImageMagick6
+USES+=		magick:6
 .endif
 .else
 .if ${PORT_OPTIONS:MIMAGEMAGICK7}
-RUN_DEPENDS+=	convert:graphics/ImageMagick7-nox11
+USES+=		magick:7,nox11
 .else
-RUN_DEPENDS+=	convert:graphics/ImageMagick6-nox11
+USES+=		magick:6,nox11
 .endif
 .endif
 
diff --git a/graphics/rubygem-rmagick/Makefile b/graphics/rubygem-rmagick/Makefile
index cd8391fc61fd..924a7c125c43 100644
--- a/graphics/rubygem-rmagick/Makefile
+++ b/graphics/rubygem-rmagick/Makefile
@@ -16,7 +16,7 @@ USE_RUBY=	yes
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
-X11_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
-X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:graphics/ImageMagick6-nox11
+X11_USES=		magick:6
+X11_USES_OFF=		magick:6,nox11
 
 .include <bsd.port.mk>
diff --git a/graphics/s2tc/Makefile b/graphics/s2tc/Makefile
index e8e4bc9e5264..3d3f58b9b06f 100644
--- a/graphics/s2tc/Makefile
+++ b/graphics/s2tc/Makefile
@@ -12,11 +12,10 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	libglvnd>=0:graphics/libglvnd
-TEST_DEPENDS=	convert:graphics/ImageMagick6 \
-		nvcompress:graphics/nvidia-texture-tools \
+TEST_DEPENDS=	nvcompress:graphics/nvidia-texture-tools \
 		wget:ftp/wget
 
-USES=		autoreconf libtool pathfix
+USES=		autoreconf libtool magick:6,test pathfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
diff --git a/graphics/synfig/Makefile b/graphics/synfig/Makefile
index 7c6f144ca011..98938a69cbcf 100644
--- a/graphics/synfig/Makefile
+++ b/graphics/synfig/Makefile
@@ -15,7 +15,6 @@ BUILD_DEPENDS=	etl>=1.2.2:devel/etl \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libOpenEXR.so:graphics/openexr \
-		libMagickWand-6.so:graphics/ImageMagick6 \
 		libavcodec.so:multimedia/ffmpeg \
 		libboost_program_options.so:devel/boost-libs \
 		libdv.so:multimedia/libdv \
@@ -30,7 +29,7 @@ LIB_DEPENDS=	libImath.so:math/Imath \
 PORTSCOUT=	limitw:1,even
 
 USES=		autoreconf compiler:c++11-lang gmake gnome iconv jpeg \
-		libtool localbase mlt:6 pathfix pkgconfig
+		libtool localbase magick:6 mlt:6 pathfix pkgconfig
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 USE_GNOME=	cairo glibmm intltool libxml++26 pango
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 8759f78f8d9d..6164356c54c0 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -15,7 +15,6 @@ BUILD_DEPENDS=	etl>=1.2.2:devel/etl \
 		gsed:textproc/gsed
 LIB_DEPENDS=	libImath.so:math/Imath \
 		libOpenEXR.so:graphics/openexr \
-		libMagick++-6.so:graphics/ImageMagick6 \
 		libfftw3.so:math/fftw3 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
@@ -25,7 +24,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils
 PORTSCOUT=	limitw:1,even
 
 USES=		autoreconf compiler:c++11-lang desktop-file-utils \
-		gmake gnome libtool localbase mlt:6 pathfix pkgconfig \
+		gmake gnome libtool localbase magick:6 mlt:6 pathfix pkgconfig \
 		shared-mime-info
 USE_GITHUB=	yes
 GH_ACCOUNT=	synfig
diff --git a/graphics/ttygif/Makefile b/graphics/ttygif/Makefile
index 2d125fc70826..edd48b28181e 100644
--- a/graphics/ttygif/Makefile
+++ b/graphics/ttygif/Makefile
@@ -9,12 +9,10 @@ COMMENT=	Converts a ttyrec file into animated gif
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	convert:graphics/ImageMagick6
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	icholy
 
-USES=		gmake
+USES=		gmake magick:6,run
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index 949fd144b4ac..97425ec3bc84 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -25,10 +25,9 @@ RUN_DEPENDS=	${PY_PILLOW} \
 		bash>=4.3.33:shells/bash \
 		ca_root_nss>=3.17.4:security/ca_root_nss \
 		coreutils>=8.23:sysutils/coreutils \
-		ImageMagick6>=6.9.0.4,1:graphics/ImageMagick6 \
 		yelp>=3.14.1:x11/yelp
 
-USES=		desktop-file-utils gettext-tools gnome python:3.5+ shebangfix
+USES=		desktop-file-utils gettext-tools gnome magick:6,run python:3.5+ shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	varietywalls
diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index 9baf0b3a7971..628508884fde 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -91,9 +91,9 @@ X11_CONFIGURE_WITH=	x
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS+=	libMagickCore-7.so:graphics/ImageMagick7
+USES+=		magick:7
 .else
-LIB_DEPENDS+=	libMagickCore-7.so:graphics/ImageMagick7-nox11
+USES+=		magick:7,nox11
 .endif
 .endif
 
diff --git a/graphics/xd3d/Makefile b/graphics/xd3d/Makefile
index 091a8e52ed41..502486ae01f6 100644
--- a/graphics/xd3d/Makefile
+++ b/graphics/xd3d/Makefile
@@ -28,7 +28,7 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .if !defined(WITHOUT_IMAGEMAGICK)
-RUN_DEPENDS+=	convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+USES+=		magick:run
 .endif
 .if !defined(WITHOUT_GIFSICLE)
 RUN_DEPENDS+=	gifsicle:graphics/gifsicle
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 92d497a828b9..26d402f7ea6b 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -59,7 +59,7 @@ GTK_NONE_CONFIGURE_ON=		--with-gtk=no
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CONFIGURE_WITH=	graphicsmagick
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_USES=		magick
 IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
 
 JPEG_USES=			jpeg