10 files changed, 16 insertions, 16 deletions

diff --git a/multimedia/dvd-slideshow/Makefile b/multimedia/dvd-slideshow/Makefile
index 3d03257b878c..beb0506738bc 100644
--- a/multimedia/dvd-slideshow/Makefile
+++ b/multimedia/dvd-slideshow/Makefile
@@ -14,7 +14,6 @@ MAINTAINER=	oz@nixil.net
 COMMENT=	Script to create slideshow-style DVD with some simple menus
 
 RUN_DEPENDS=	bash:shells/bash \
-		identify:graphics/ImageMagick6 \
 		mpeg2enc:multimedia/mjpegtools \
 		ffmpeg:multimedia/ffmpeg \
 		sox:audio/sox \
@@ -24,6 +23,8 @@ RUN_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/share/fonts/urwfonts-ttf/README:x11-fonts/urwfonts-ttf \
 		cdrecord:sysutils/cdrtools
 
+USES=		magick:6,run
+
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/apps/${PORTNAME}
 
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index c3ef5cb72e2b..1ff51b2e761c 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -46,7 +46,7 @@ VIDEO-FORMAT_DESC=		Use default video format
 GRAPHICSMAGICK_CONFIGURE_WITH=	graphicsmagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 IMAGEMAGICK6_CONFIGURE_WITH=	imagemagick
-IMAGEMAGICK6_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick6
+IMAGEMAGICK6_USES=		magick:6
 MANPAGES_BUILD_DEPENDS=		docbook2man:textproc/docbook-utils \
 				docbook-sgml>0:textproc/docbook-sgml
 NTSC_CONFIGURE_ON=		--enable-default-video-format=NTSC
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index 8a841c9f2316..4f56023429e4 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -26,7 +26,6 @@ RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
 		p5-Event-RPC>=0:devel/p5-Event-RPC \
 		p5-Locale-libintl>=0:devel/p5-Locale-libintl \
 		cdrdao:sysutils/cdrdao \
-		convert:graphics/ImageMagick6 \
 		mplayer:multimedia/mplayer \
 		pstree:sysutils/pstree \
 		transcode:multimedia/transcode \
@@ -34,7 +33,7 @@ RUN_DEPENDS=	p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
 		${LOCALBASE}/sbin/fping:net/fping \
 		cdrecord:sysutils/cdrtools
 
-USES=		gettext perl5 shebangfix
+USES=		gettext magick:6,run perl5 shebangfix
 USE_PERL5=	configure patch
 
 SHEBANG_FILES=	bin/dvdrip*
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index f01bdaa2d0db..3aa99e91a5c1 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -106,9 +106,11 @@ OPTIONS_DEFAULT=	LAME X11
 LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=	libmp3lame
 
-X11_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
-X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:graphics/ImageMagick6-nox11
-X11_USES=		xorg
+SMB_USES=		samba:lib
+SMB_CONFIGURE_ENABLE=	libsmbclient
+
+X11_USES=		xorg magick:6
+X11_USES_OFF=		magick:6,nox11
 X11_USE=		xorg=x11
 
 FFVERSION=	2021_02_27
diff --git a/multimedia/libopenshot/Makefile b/multimedia/libopenshot/Makefile
index c76c6793575f..2d9846bd34d2 100644
--- a/multimedia/libopenshot/Makefile
+++ b/multimedia/libopenshot/Makefile
@@ -40,7 +40,7 @@ DOCS_CMAKE_BOOL=	ENABLE_DOCS
 DOCS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Doxygen
 DOCS_CMAKE_ON=	-DCMAKE_INSTALL_DOCDIR:PATH=${DOCSDIR_REL:Q}
 DOCS_PORTDOCS=	*
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_USES=	magick
 IMAGEMAGICK_CMAKE_BOOL=	ENABLE_MAGICK
 IMAGEMAGICK_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_ImageMagick
 OPENCV_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 8a9a1b87a64f..1e2e561232d3 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -100,7 +100,7 @@ DVB_BUILD_DEPENDS=		v4l_compat>=1.0.20100321:multimedia/v4l_compat
 DVB_CONFIGURE_ENABLE=		dvb
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=		--enable-tls
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_USES=		magick
 IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
 IMAGEMAGICK_IMPLIES=		DMX_IMAGE
 IPV6_CONFIGURE_ENABLE=		ipv6
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 430d07ed5adc..769d36ceb4b7 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -81,8 +81,7 @@ FREI0R_BUILD_DEPENDS=		frei0r>0:graphics/frei0r
 FREI0R_CONFIGURE_OFF=		--disable-frei0r
 FREI0R_RUN_DEPENDS=		frei0r>0:graphics/frei0r
 GHOSTSCRIPT_USES=		ghostscript:run
-IMAGEMAGICK_RUN_DEPENDS=	convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \
-				composite:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_USES=		magick:run
 JACK_CONFIGURE_OFF=		--disable-jack
 JACK_LIB_DEPENDS=		libjack.so:audio/jack \
 				libjackserver.so:audio/jack
diff --git a/multimedia/py-moviepy/Makefile b/multimedia/py-moviepy/Makefile
index 89719fa520d1..3b375090ca28 100644
--- a/multimedia/py-moviepy/Makefile
+++ b/multimedia/py-moviepy/Makefile
@@ -30,7 +30,7 @@ OPTIONS_SINGLE_IMAGEMAGICK=	IMAGEMAGICK6 IMAGEMAGICK7
 OPTIONS_DEFAULT=IMAGEMAGICK7
 IMAGEMAGICK6_DESC=	Use ImageMagick 6.x as backend
 IMAGEMAGICK7_DESC=	Use ImageMagick 7.x as backend
-IMAGEMAGICK6_RUN_DEPENDS=	convert:graphics/ImageMagick6
-IMAGEMAGICK7_RUN_DEPENDS=	convert:graphics/ImageMagick7
+IMAGEMAGICK6_USES=	magick:6,run
+IMAGEMAGICK7_USES=	magick:7,run
 
 .include <bsd.port.mk>
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 238befda0cf5..8aff1232bd93 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -96,7 +96,7 @@ SDL_USES=			sdl
 SDL_USE=			SDL=sdl
 SDL_CONFIGURE_ENABLE=		sdl
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
+IMAGEMAGICK_USES=		magick:6
 IMAGEMAGICK_CONFIGURE_ENABLE=	imagemagick
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick-prefix=${LOCALBASE}
 
diff --git a/multimedia/vapoursynth/Makefile b/multimedia/vapoursynth/Makefile
index 3fd170b53e90..73b4e0fd45a0 100644
--- a/multimedia/vapoursynth/Makefile
+++ b/multimedia/vapoursynth/Makefile
@@ -81,8 +81,7 @@ ASS_CONFIGURE_ENABLE=		subtext
 EEDI3_DESC=			Very slow edge directed interpolation
 EEDI3_CONFIGURE_ENABLE=		eedi3
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-7.so:graphics/ImageMagick7
-IMAGEMAGICK_USES=		compiler:c++11-lib
+IMAGEMAGICK_USES=		compiler:c++11-lib magick:7
 IMAGEMAGICK_CONFIGURE_ENABLE=	imwri
 
 TESSERACT_DESC=			Optical Character Recognition via Tesseract