Update ImageMagick to 6.9.0.4.

- Normalize the ImageMagick library name so it stays the same regardless of
  what the 16-bit and HDRI option are set to [1]. Teach cmake to look for
  the new name. Bump ports that link to the libraries due to this.
- As a result do away with the "HALFSUPPORTED" option block, and list
  16-bit and HDRI with the other options.
- ImageMagick ships a basic SVG plugin when not using librsvg2 for SVG
  support. This basic SVG plugin needs libxml2 to work [2]. Make libxml2
  a mandatory dependency (instead of only when the SVG option was selected).
- Don't touch .keep files in the modules directory, there files there so
  it useless.

PR:		194949 [1]
PR:		195227 [2]
Requested by:	many [1]
Submitted by:	software-freebsd@interfasys.ch [2]

45 files changed, 155 insertions, 156 deletions

diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile
index 0fc774178d0f..6eed42fe3b6e 100644
--- a/audio/mp3plot/Makefile
+++ b/audio/mp3plot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mp3plot
 DISTVERSION=	0.6.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	audio
 MASTER_SITES=	http://p.outlyer.net/mp3plot/files/
 
@@ -28,7 +28,7 @@ PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 GD_CONFIGURE_ENABLE=	gd
 GD_LIB_DEPENDS=		libgd.so:${PORTSDIR}/graphics/gd
 IMAGEMAGICK_CONFIGURE_ENABLE=	magick
-IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 
 post-patch:
 	@${REINPLACE_CMD} -e '/bldtype_/s|-O2||g; s|^extra_LD.*||g' ${WRKSRC}/configure
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index f36ab40ed62c..010353e9bcd1 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtuoso
 PORTVERSION=	6.1.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
@@ -69,7 +69,7 @@ check:
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE}
-LIB_DEPENDS+=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 CONFIGURE_ARGS+=--disable-imagemagick
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index e2f248ff2c14..c8a9c9dfa6fd 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	calibre
 PORTVERSION=	1.48.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
 		libwmflite.so:${PORTSDIR}/graphics/libwmf \
diff --git a/devel/cmake-modules/Makefile b/devel/cmake-modules/Makefile
index b2aa3d22abc8..6de999df9520 100644
--- a/devel/cmake-modules/Makefile
+++ b/devel/cmake-modules/Makefile
@@ -1,7 +1,7 @@
 # Created by: gahr
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-modules
 
 COMMENT=	Modules and Templates for CMake
diff --git a/devel/cmake/files/patch-Modules_FindImageMagick.cmake b/devel/cmake/files/patch-Modules_FindImageMagick.cmake
new file mode 100644
index 000000000000..13554a1e9aff
--- /dev/null
+++ b/devel/cmake/files/patch-Modules_FindImageMagick.cmake
@@ -0,0 +1,23 @@
+--- Modules/FindImageMagick.cmake.orig	2015-01-18 20:59:07.643587544 +0100
++++ Modules/FindImageMagick.cmake	2015-01-18 21:00:52.175617819 +0100
+@@ -207,17 +207,17 @@
+     )
+   if(component STREQUAL "Magick++")
+     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
+-      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
++      Magick++ CORE_RL_Magick++_ Magick++-6 Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
+   elseif(component STREQUAL "MagickWand")
+     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
+-      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
++      Wand MagickWand CORE_RL_wand_ MagickWand-6 MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
+   elseif(component STREQUAL "MagickCore")
+     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
+-      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
++      Magick MagickCore CORE_RL_magick_ MagickCore-6 MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
+       )
+     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
+   else()
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index 0e5148dcbefd..6cb49f183eaf 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	synfig
 PORTVERSION=	0.64.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel graphics multimedia
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/source
 
@@ -15,7 +15,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	etl>=0.04.17:${PORTSDIR}/devel/etl
 LIB_DEPENDS=	libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
 		libltdl.so:${PORTSDIR}/devel/libltdl \
-		libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libmng.so:${PORTSDIR}/graphics/libmng \
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 63339dc4caf1..d9331534e887 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@@ -145,7 +145,7 @@ M17N_CONFIGURE_WITH=	m17n-flt
 OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
 OTF_CONFIGURE_WITH=	libotf
 
-MAGICK_LIB_DEPENDS=	libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
 
 GSETTINGS_USE=			gnome=glib20
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index eabc798940f8..733b09521345 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -153,7 +153,7 @@ M17N_CONFIGURE_WITH=	m17n-flt
 OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
 OTF_CONFIGURE_WITH=	libotf
 
-MAGICK_LIB_DEPENDS=	libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
 
 GSETTINGS_USE=		gnome=glib20
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 6d80b8190416..72f51737a5c1 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.0-2
+DISTVERSION=	6.9.0-4
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -44,6 +44,7 @@ CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps \
 		--without-lcms
 USE_LDCONFIG=	yes
+USE_GNOME=	libxml2
 
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-Wl,-Y${LOCALBASE}/lib
@@ -52,26 +53,23 @@ SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
 		policy.xml quantization-table.xml thresholds.xml type-dejavu.xml \
 		type-ghostscript.xml type-windows.xml type.xml
 
-
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
 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
+		THREADS X11 16BIT_PIXEL HDRI
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \
 		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \
 		TIFF WEBP WMF THREADS X11
-OPTIONS_GROUP=	HALFSUPPORTED
-OPTIONS_GROUP_HALFSUPPORTED=	16BIT_PIXEL HDRI
 
-HALFSUPPORTED_DESC=	Half supported options (see help dialog)
 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
@@ -338,13 +336,10 @@ PLIST_SUB+=		WMF="@comment "
 
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
-USE_GNOME+=		libxml2
 LIB_DEPENDS+=		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
-CONFIGURE_ARGS+=	--with-rsvg --with-xml
-CONFIGURE_ENV+=		RSVG_CFLAGS="-I${LOCALBASE}/include/librsvg-2.0" \
-			RSVG_LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-rsvg
 .else
-CONFIGURE_ARGS+=	--without-rsvg --without-xml
+CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
 # Pango support
@@ -384,6 +379,22 @@ INSTALL_TARGET=	install-strip
 USE_GHOSTSCRIPT_BUILD=yes
 .endif
 
+post-patch:
+# strip library name of variable parts that can change due to
+# the HDRI and Q16 option
+	@${REINPLACE_CMD}  -e 's|_@MAGICK_ABI_SUFFIX@||g; \
+		s|\.@MAGICK_ABI_SUFFIX@||g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \
+		${WRKSRC}/PerlMagick/Makefile.PL.in \
+		${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \
+		${WRKSRC}/Magick++/lib/Magick++.pc.in \
+		${WRKSRC}/Magick++/lib/ImageMagick++.pc.in \
+		${WRKSRC}/magick/ImageMagick.pc.in \
+		${WRKSRC}/magick/MagickCore.pc.in \
+		${WRKSRC}/wand/Wand.pc.in \
+		${WRKSRC}/wand/MagickWand.pc.in
+
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
@@ -396,10 +407,6 @@ pre-configure:
 .endif
 
 post-install: test
-.if ${PORT_OPTIONS:MMODULES}
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/coders/.keep
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/filters/.keep
-.endif
 .for i in ${SAMPLE_FILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i} \
 		${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i}.sample
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index b07de72e6db0..b53151bf081d 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.0-2.tar.xz) = ce7ced11cc1019cd37518ebc4ea03ffaff8e6891aaf41a05615689dafe854ff6
-SIZE (ImageMagick-6.9.0-2.tar.xz) = 7896448
+SHA256 (ImageMagick-6.9.0-4.tar.xz) = 996aa8081dced3f3bbf23d90fca861b30332f734329f89367c6fc35173a74957
+SIZE (ImageMagick-6.9.0-4.tar.xz) = 7901680
diff --git a/graphics/ImageMagick/files/patch-coders_palm.c b/graphics/ImageMagick/files/patch-coders_palm.c
deleted file mode 100644
index a5cd0c32f710..000000000000
--- a/graphics/ImageMagick/files/patch-coders_palm.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- coders/palm.c	2014-12-25 19:05:34.000000000 +0100
-+++ coders/palm.c	2014-12-31 09:38:35.499493971 +0100
-@@ -510,7 +510,7 @@
-       {
-         IndexPacket index=ConstrainColormapIndex(image,(mask-transparentIndex));
-         if (bits_per_pixel != 16)
--          SetMagickPixelPacket(image,image->colormap+index,
-+          SetMagickPixelPacket(image,image->colormap+(ssize_t) index,
-             (const IndexPacket *) NULL,&transpix);
-         (void) TransparentPaintImage(image,&transpix,(Quantum)
-           TransparentOpacity,MagickFalse);
diff --git a/graphics/ImageMagick/files/patch-coders_rle.c b/graphics/ImageMagick/files/patch-coders_rle.c
deleted file mode 100644
index 184ddb77c96f..000000000000
--- a/graphics/ImageMagick/files/patch-coders_rle.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- coders/rle.c.orig	2015-01-01 22:58:53.775440763 +0100
-+++ coders/rle.c	2015-01-01 23:00:50.825507571 +0100
-@@ -456,7 +456,7 @@
-             if (IsValidColormapIndex(image,*p & mask,&index,exception) ==
-                 MagickFalse)
-               break;
--            *p=colormap[index];
-+            *p=colormap[(ssize_t)index];
-             p++;
-           }
-         else
-@@ -467,7 +467,7 @@
-                 if (IsValidColormapIndex(image,(size_t) (x*map_length+
-                     (*p & mask)),&index,exception) == MagickFalse)
-                   break;
--                *p=colormap[index];
-+                *p=colormap[(ssize_t)index];
-                 p++;
-               }
-         if ((i < (ssize_t) number_pixels) || (x < (ssize_t) number_planes))
diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
new file mode 100644
index 000000000000..cbd21aa8d1bd
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2015-01-16 22:45:09.000000000 +0100
++++ configure	2015-01-17 22:55:31.590059586 +0100
+@@ -33096,7 +33096,7 @@
+ 
+ 
+ if test "x$SHAREARCH_DIRNAME" = "x"; then
+-  SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
++  SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
diff --git a/graphics/ImageMagick/files/patch-magick_distribute-cache.c b/graphics/ImageMagick/files/patch-magick_distribute-cache.c
deleted file mode 100644
index 6a83cbd576fa..000000000000
--- a/graphics/ImageMagick/files/patch-magick_distribute-cache.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: magick/distribute-cache.c
-===================================================================
---- magick/distribute-cache.c	(revision 17523)
-+++ magick/distribute-cache.c	(working copy)
-@@ -92,6 +92,10 @@
- #define SOCKET_TYPE SOCKET
- #define MAGICKCORE_HAVE_DISTRIBUTE_CACHE
- #else
-+#define CLOSE_SOCKET(socket) 
-+#define HANDLER_RETURN_TYPE  void *
-+#define HANDLER_RETURN_VALUE  (void *) NULL
-+#define SOCKET_TYPE  int
- #undef send
- #undef recv
- #define send(file,buffer,length,flags)  0
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 348e4875e27e..ab0be32c4651 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -163,8 +163,7 @@ include/ImageMagick-6/wand/pixel-iterator.h
 include/ImageMagick-6/wand/pixel-wand.h
 include/ImageMagick-6/wand/stream.h
 include/ImageMagick-6/wand/wand-view.h
-lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/.keep
+lib/ImageMagick-%%PORTVERSION%%/config/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/aai.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/aai.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/art.la
@@ -409,36 +408,35 @@ lib/ImageMagick-%%PORTVERSION%%/config-%%QBIT%%%%HDRI%%/configure.xml
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/ycbcr.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/yuv.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/coders/yuv.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/filters/.keep
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/filters/analyze.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%%%HDRI%%/filters/analyze.so
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.a
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.la
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.so
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.so.5
-lib/libMagick++-6.%%QBIT%%%%HDRI%%.so.5.0.0
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.a
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.la
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.so
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.so.2
-lib/libMagickCore-6.%%QBIT%%%%HDRI%%.so.2.0.0
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.a
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.la
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.so
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.so.2
-lib/libMagickWand-6.%%QBIT%%%%HDRI%%.so.2.0.0
+lib/libMagick++-6.a
+lib/libMagick++-6.la
+lib/libMagick++-6.so
+lib/libMagick++-6.so.5
+lib/libMagick++-6.so.5.0.0
+lib/libMagickCore-6.a
+lib/libMagickCore-6.la
+lib/libMagickCore-6.so
+lib/libMagickCore-6.so.2
+lib/libMagickCore-6.so.2.0.0
+lib/libMagickWand-6.a
+lib/libMagickWand-6.la
+lib/libMagickWand-6.so
+lib/libMagickWand-6.so.2
+lib/libMagickWand-6.so.2.0.0
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/Magick++.pc
 libdata/pkgconfig/ImageMagick.pc
 libdata/pkgconfig/MagickCore.pc
 libdata/pkgconfig/MagickWand.pc
 libdata/pkgconfig/Wand.pc
-libdata/pkgconfig/ImageMagick++-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/ImageMagick-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/Magick++-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/MagickCore-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/MagickWand-6.%%QBIT%%%%HDRI%%.pc
-libdata/pkgconfig/Wand-6.%%QBIT%%%%HDRI%%.pc
+libdata/pkgconfig/ImageMagick++-6.pc
+libdata/pkgconfig/ImageMagick-6.pc
+libdata/pkgconfig/Magick++-6.pc
+libdata/pkgconfig/MagickCore-6.pc
+libdata/pkgconfig/MagickWand-6.pc
+libdata/pkgconfig/Wand-6.pc
 %%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
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index a8e6a642e416..cb199168c98b 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	27
+PORTREVISION=	28
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/AutoTrace/${PORTVERSION}
 
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=IMAGEMAGICK PSTOEDIT
 MING_DESC=	Enable swf interface
 PSTOEDIT_DESC=	Convert postscript to other formats
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 IMAGEMAGICK_CONFIGURE_OFF=	--without-magick
 
 MING_LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
index f1c50cef71c4..850dbd105845 100644
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	converseen
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Converseen/Converseen%200.8/
 
@@ -11,7 +12,7 @@ COMMENT=	Easy to use graphics conversion utility
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 
 USES=		cmake gettext iconv tar:bzip2
 USE_QT4=	corelib gui linguist_build moc_build qmake_build \
diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile
index 03429385ff01..4842b8f80e29 100644
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cuneiform
 PORTVERSION=	1.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://launchpadlibrarian.net/69906918/
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
@@ -27,7 +27,7 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 post-patch:
diff --git a/graphics/dcraw-m/Makefile b/graphics/dcraw-m/Makefile
index 78770fd21db4..793a89022991 100644
--- a/graphics/dcraw-m/Makefile
+++ b/graphics/dcraw-m/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dcraw-m
 PORTVERSION=	9.22
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GH
 
@@ -14,7 +15,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		liblcms2.so:${PORTSDIR}/graphics/lcms2 \
-		libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	waitman
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index 9bb81a3cadbc..e300b93fa3a9 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imagemagick
 
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 IMAGEMAGICK_DESC=	Install ImageMagick image proccesing tool
 OPTIONS_DEFAULT=	IMAGEMAGICK
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 
 .include "${MASTERDIR}/Makefile"
diff --git a/graphics/gimp-gmic-plugin/Makefile b/graphics/gimp-gmic-plugin/Makefile
index 1e6092f20419..843b9c22166d 100644
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gmic
 PORTVERSION=	1.6.0.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/older_versions/ \
 		SF/${PORTNAME}/
@@ -14,7 +15,7 @@ COMMENT=	GREYC's Magic Image Converter
 
 LIB_DEPENDS=	libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick \
 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+		libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index 0afecb128657..1fd2860fe29a 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gscan2pdf
 PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index dc136c722a13..77a906ddee8a 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.48.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		liblcms.so:${PORTSDIR}/graphics/lcms \
 		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+		libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	p5-XML-XQL>=0:${PORTSDIR}/textproc/p5-XML-XQL
 
 USE_GNOME=	gtkmm24 intlhack libxslt
diff --git a/graphics/kipi-plugin-videoslideshow/Makefile b/graphics/kipi-plugin-videoslideshow/Makefile
index 553fbc830dc5..98ccd67913d9 100644
--- a/graphics/kipi-plugin-videoslideshow/Makefile
+++ b/graphics/kipi-plugin-videoslideshow/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	kipi-plugin-${KIPI_PLUGIN}
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics kde
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}
 
-LIB_DEPENDS=	libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libQtGStreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer-qt4
 
 KIPI_PLUGIN=	videoslideshow
diff --git a/graphics/libdmtx/Makefile b/graphics/libdmtx/Makefile
index 0abac9b1e8a0..80a00db8b8f2 100644
--- a/graphics/libdmtx/Makefile
+++ b/graphics/libdmtx/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	libdmtx
 PORTVERSION=	0.7.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Library for reading and writing Data Matrix barcodes
 
-LIB_DEPENDS=	libMagickWand-*.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 
 USES=		tar:bzip2 libtool
 GNU_CONFIGURE=	yes
diff --git a/graphics/npretty/Makefile b/graphics/npretty/Makefile
index 111fa25125b2..4313f2101520 100644
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	npretty
 PORTVERSION=	0.9.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pulia.nu/code/projects/npretty/ \
 		${MASTER_SITE_LOCAL:S@%SUBDIR%@gabor@}
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		p5-forks>=0:${PORTSDIR}/devel/p5-forks
-LIB_DEPENDS=	libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
 
 NO_BUILD=	yes
 USES=		perl5 shebangfix
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 940730c94554..6620a8eee73d 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.4
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	graphics math java
 MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/
 DISTNAME=	dx-${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME=	dx-${PORTVERSION}
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick	\
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick	\
 		libtiff.so:${PORTSDIR}/graphics/tiff		\
 		libcdf.so:${PORTSDIR}/science/cdf
 
diff --git a/graphics/p5-Image-Magick-Iterator/Makefile b/graphics/p5-Image-Magick-Iterator/Makefile
index 41fc8cf58662..0a6922074252 100644
--- a/graphics/p5-Image-Magick-Iterator/Makefile
+++ b/graphics/p5-Image-Magick-Iterator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Magick-Iterator
 PORTVERSION=	0.01
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index bfa220b40f75..24db2c731929 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	imagick
 DISTVERSION=	3.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -16,8 +16,8 @@ LICENSE=	PHP301
 
 OPTIONS_DEFINE=	X11
 
-X11_LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
-X11_LIB_DEPENDS_OFF=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick-nox11
+X11_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
 
 USES=		pkgconfig tar:tgz
 USE_PHP=	yes
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 0504b4ff19c1..deb332ac3bb1 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pfstools
 PORTVERSION=	1.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -51,7 +51,7 @@ QT_USE=			QT4=moc_build,corelib,gui
 QT_CONFIGURE_ENABLE=	qt
 
 IMAGEMAGICK_CONFIGURE_ENABLE=	imagemagick
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 
 GDAL_CONFIGURE_ENABLE=	gdal
 GDAL_LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal
diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile
index 4f08ebfbdba7..c40517bb4743 100644
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	magickwand
 PORTVERSION=	1.0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
@@ -12,7 +12,7 @@ DISTNAME=	MagickWandForPHP-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP extension to manipulate images
 
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 
 USES=		pkgconfig
 USE_PHP=	yes
@@ -21,8 +21,8 @@ USE_PHPEXT=	yes
 CONFIGURE_ARGS=	--with-magickwand=${LOCALBASE}
 
 pre-configure:
-	@${REINPLACE_CMD} -e 's|-lMagickWand|-lMagickWand-6.Q16|g' \
-		-e 's|-lMagickCore|-lMagickCore-6.Q16|g' \
+	@${REINPLACE_CMD} -e 's|-lMagickWand|-lMagickWand-6|g' \
+		-e 's|-lMagickCore|-lMagickCore-6|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index c7449cb741e0..2f2a403b307f 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pstoedit
 PORTVERSION=	3.62
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics print
 MASTER_SITES=	SF
 
@@ -39,7 +39,7 @@ EMF_LIB_DEPENDS=	libEMF.so:${PORTSDIR}/graphics/libemf
 EMF_CONFIGURE_ON=	--with-libemf-include=${LOCALBASE}/include/libEMF
 EMF__CONFIGURE_OFF=	--without-emf
 
-MAGICK_LIB_DEPENDS=	libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_ON=	--with-magick
 MAGICK_CONFIGURE_OFF=	--without-magick
 
diff --git a/graphics/py-wand/Makefile b/graphics/py-wand/Makefile
index c7838417ca7c..5c749c3d5357 100644
--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Wand
 PORTVERSION=	0.3.8
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	MagickWand Python binding
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 
 USES=	python
 USE_PYTHON=	distutils autoplist
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 8cb4f01db146..46c631ff3477 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.9.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	SF/rss-glx/rss-glx/${PORTVERSION}
 DISTNAME=	rss-glx_${PORTVERSION}
@@ -11,7 +11,7 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL screensaver collection
 
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libGLC.so:${PORTSDIR}/graphics/quesoglc
 
 USE_GL=		glut
diff --git a/graphics/rubygem-rmagick/Makefile b/graphics/rubygem-rmagick/Makefile
index 48d8cae8a9ce..145b282585e1 100644
--- a/graphics/rubygem-rmagick/Makefile
+++ b/graphics/rubygem-rmagick/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=		rmagick
 PORTVERSION=		2.13.3
+PORTREVISION=		1
 CATEGORIES=		graphics rubygems
 MASTER_SITES=		RG
 
@@ -19,9 +20,9 @@ OPTIONS_DEFAULT=	X11
 
 USES=		pkgconfig
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 .else
-LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick-nox11
+LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick-nox11
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 1d428dc43ad4..f8659ee8393f 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -29,7 +29,7 @@ X11_USE=	XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
 X11_CONFIGURE_ON=	--with-x=yes
 X11_CONFIGURE_OFF=	--with-x=no --without-xshm --without-xv
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick=yes
 IMAGEMAGICK_CONFIGURE_OFF=	--with-imagemagick=no
 
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 7fcc73f09f55..c9c3e30e08a9 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dvdauthor
 PORTVERSION=	0.7.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -45,7 +45,7 @@ PAL_DESC=	Default video format PAL
 
 SUB_FILES=	README.FreeBSD
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.so:${PORTSDIR}/graphics/ImageMagick
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 24a84d1ea835..4c8b15c4d27c 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
@@ -157,7 +157,7 @@ CONFIGURE_ARGS+=	--disable-aalib --disable-aalibtest
 .endif
 
 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 316d32f077ab..b07c072806a5 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cdn.bitbucket.org/france/transcode-tcforge/downloads/
 
@@ -100,7 +100,7 @@ SDL_USE=			SDL=sdl
 SDL_CONFIGURE_ENABLE=		sdl
 SDL_CONFIGURE_ENV_ON=		SDL_CONFIG="${SDL_CONFIG}"
 
-IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 IMAGEMAGICK_CONFIGURE_ENABLE=	imagemagick
 IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick-prefix=${LOCALBASE}
 
diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index d70d4e878712..4a6105f5d4e0 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	libfprint
 PORTVERSION=	0.5.1
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
 MAINTAINER=	lichray@gmail.com
 COMMENT=	Library for fingerprint reader devices
 
-LIB_DEPENDS=	libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libnss3.so:${PORTSDIR}/security/nss
 
 GNU_CONFIGURE=	yes
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 018ef6475a68..d11002976744 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p25
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSION=	2.03pre25
 PORTREVISION=	1
 PORTEPOCH=	1
@@ -15,7 +15,7 @@ COMMENT=	Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally
 
 USES=		shebangfix perl5
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index d0cf8b3d1374..e22a23e2c113 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tengine
 PORTVERSION=	2.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 MASTER_SITES=	GH
 
@@ -461,7 +461,7 @@ LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 			libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 			libavutil.so:${PORTSDIR}/multimedia/ffmpeg \
 			libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
-			libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+			libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 NGINX_VIDEO_THUMBEXTRACTOR_VERSION=	0.2.0
 GIT_VIDEO_THUMBEXTRACTOR_VERSION=	0-g9406457
 MASTER_SITES+=	https://github.com/wandenberg/nginx-video-thumbextractor-module/tarball/${NGINX_VIDEO_THUMBEXTRACTOR_VERSION}/:videothumbextractor
diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index 75664812312a..d02e1e73e914 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libwraster
 PORTVERSION=	0.95.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/release
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libwebp.so:${PORTSDIR}/graphics/webp \
-		libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
 
 USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index cff67f85f03d..6d757a0a4429 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	windowmaker
 PORTVERSION=	0.95.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/release
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libwebp.so:${PORTSDIR}/graphics/webp \
-		libMagickWand-6.Q16.so:${PORTSDIR}/graphics/ImageMagick \
+		libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick \
 		libwraster.so.5:${PORTSDIR}/x11-wm/libwraster
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index feef0dfa7bf3..35a4d7bc23aa 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xlockmore
 PORTVERSION=	5.43
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
@@ -124,7 +124,7 @@ CONFIGURE_ARGS+=	--enable-customization
 .endif
 
 .if ${PORT_OPTIONS:MMAGICK}
-LIB_DEPENDS+=	libMagickCore-6.Q16.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=	--without-magick
 .endif