- Update ImageMagick to 6.4.9.2

- Libraries Magick++, MagickCore and MagickWand bumped to 2
- Update all ports using libraries above

37 files changed, 76 insertions, 64 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index a59dd46afed5..2fb44ff77d40 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	1.9.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xastir
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+=	--without-shapelib
 .if defined(WITHOUT_MAGICK)
 CONFIGURE_ARGS+=	--without-imagemagick --without-graphicsmagick
 .else
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=	--without-graphicsmagick
 .endif
 
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index b664732887a3..b9579fefe160 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	virtuoso
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -60,7 +60,7 @@ post-install:
 
 .if defined(WITH_IMAGEMAGICK)
 CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE}
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 598b6eadcb0e..bd56a6afa2dd 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.4.8-3
+DISTVERSION=	6.4.9-2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index bcc883ef29ee..01ae87524e01 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.4.8-3.tar.bz2) = c5a323a26b30351311b0314108b509b7
-SHA256 (ImageMagick-6.4.8-3.tar.bz2) = b1dcebd1a3e98095dd49f887b23fd1990ca6bb456d2776080fb045aef8893e54
-SIZE (ImageMagick-6.4.8-3.tar.bz2) = 8880004
+MD5 (ImageMagick-6.4.9-2.tar.bz2) = 06a878564dfd2f88f21f82ae58744342
+SHA256 (ImageMagick-6.4.9-2.tar.bz2) = 5c9bec39f1f690e59669f575decba31d65cf234dc3f04ce9eda99020648fe293
+SIZE (ImageMagick-6.4.9-2.tar.bz2) = 8894243
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 2e2c270246f2..8815b1f4bd14 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -464,15 +464,15 @@ lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
-lib/libMagick++.so.1
+lib/libMagick++.so.2
 lib/libMagickCore.a
 lib/libMagickCore.la
 lib/libMagickCore.so
-lib/libMagickCore.so.1
+lib/libMagickCore.so.2
 lib/libMagickWand.a
 lib/libMagickWand.la
 lib/libMagickWand.so
-lib/libMagickWand.so.1
+lib/libMagickWand.so.2
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/Magick++.pc
 libdata/pkgconfig/ImageMagick.pc
diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile
index 11870390e7c8..e05f79b58b3f 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ale
 PORTVERSION=	0.8.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://auricle.dyndns.org/ALE/download/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -41,7 +41,7 @@ MAKE_ARGS+=	FFTW=1
 .endif
 
 .if !defined(WITHOUT_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 MAKE_ARGS+=	IMAGEMAGICK=1
 .endif
 
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index a239f474c9f2..165a1f827a4d 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert bitmap to vector graphics
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-    		MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+    		MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile
index d314d2d75d15..ac4ca8842418 100644
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cuneiform
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/cuneiform-linux/${PORTVERSION:R}/${PORTVERSION:R}/+download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
@@ -34,7 +35,7 @@ OPTIONS=	IMAGEMAGICK "Enable support of different graphic formats" off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 post-extract:
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index fa01f398ff46..548a7a8a762f 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imgSeek
 PORTVERSION=	0.8.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SFE
 
@@ -17,7 +17,7 @@ COMMENT=	A photo manager and viewer with content-based search
 BUILD_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
 RUN_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+		MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_PYDISTUTILS=yes
 USE_PYTHON=	yes
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index a82dc333b631..b6cabb82671e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.46
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		gc.1:${PORTSDIR}/devel/boehm-gc \
 		gtkspell.0:${PORTSDIR}/textproc/gtkspell \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		Magick++.1:${PORTSDIR}/graphics/ImageMagick
+		Magick++.2:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	${SITE_PERL}/XML/XQL.pm:${PORTSDIR}/textproc/p5-XML-XQL
 
 USE_BZIP2=	yes
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index c9d0c6085b13..001d6b128669 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	k3d
 PORTVERSION=	0.6.7.0
 DISTVERSIONSUFFIX=-src
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D modeling, animation, and rendering system
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibul.a:${PORTSDIR}/x11-toolkits/plib
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick \
 		IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
 		gts.5:${PORTSDIR}/graphics/gts \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
diff --git a/graphics/kallery/Makefile b/graphics/kallery/Makefile
index b1ad09b3a963..a24ae1a84676 100644
--- a/graphics/kallery/Makefile
+++ b/graphics/kallery/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	kallery
 PORTVERSION=	1.2.0
+PORTREVISION=	1
 CATEGORIES=	graphics www kde
 MASTER_SITES=	http://kallery.kdewebdev.org/releases/
 
 MAINTAINER=	metrol@metrol.net
 COMMENT=	An image gallery generator for KDE
 
-LIB_DEPENDS=	MagickCore.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickCore.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 78ca973a632d..42cfabb99a21 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.4
+PORTREVISION=	1
 CATEGORIES=	graphics math
 MASTER_SITES=	http://opendx.npaci.edu/source/
 DISTNAME=	dx-${PORTVERSION}
@@ -15,7 +16,7 @@ DISTNAME=	dx-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick	\
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick	\
 		tiff.4:${PORTSDIR}/graphics/tiff		\
 		cdf.0:${PORTSDIR}/science/cdf
 
diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index 3c891b857eca..0e2ff4a56d88 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imagick
 PORTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -16,7 +17,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	anray@FreeBSD.org
 COMMENT=	Provides a wrapper to the ImageMagick/GraphicsMagick library
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 2e84bd04d850..31855feab125 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pfstools
 PORTVERSION=	1.6.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -120,7 +120,7 @@ PLIST_SUB+=	QT="@comment "
 
 .if defined(WITH_IM)
 CONFIGURE_ARGS+=--enable-imagemagick
-LIB_DEPENDS+=	Magick++.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick++.2:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IM=""
 .else
 CONFIGURE_ARGS+=--disable-imagemagick
diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile
index c6adee91ed72..9defd3837a2f 100644
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	magickwand
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
@@ -15,7 +16,7 @@ DISTNAME=	MagickWandForPHP-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A PHP extension to manipulate images
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index eac21e2d455f..9b2064040820 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pstoedit
 PORTVERSION=	3.45
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics print
 MASTER_SITES=	SF
 
@@ -39,7 +39,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-magick
 PLIST_SUB+=	IMAGEMAGICK="@comment "
 .else
-LIB_DEPENDS+=	Magick++.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick++.2:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IMAGEMAGICK=""
 .endif
 
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 1784012ee49a..46541ba52691 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.8.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rss-glx
@@ -16,7 +16,7 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL screensaver collection
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_BZIP2=	yes
 USE_GL=		yes
diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index c1dc56d363d2..5c3ccdd02d88 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rmagick
 PORTVERSION=	2.9.1
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A Ruby binding for ImageMagick
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_BZIP2=	yes
 USE_RUBY=	yes
diff --git a/lang/q/Makefile b/lang/q/Makefile
index d0313a6c82af..90d4147f0c1b 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	q
 PORTVERSION=	6.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	q-lang
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Q -- equational programming language
 
 BUILD_DEPENDS=	${LOCALBASE}/dx/lib_freebsd/libDXL.a:${PORTSDIR}/graphics/opendx
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm \
 		gii.1:${PORTSDIR}/devel/libgii \
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 13eb805e9b6a..698f2db920b0 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	LabPlot
 PORTVERSION=	1.6.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=labplot
@@ -17,7 +17,7 @@ COMMENT=	LabPlot : Data analysis and visualisation
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jasper.4:${PORTSDIR}/graphics/jasper \
-		MagickWand.1:${PORTSDIR}/graphics/ImageMagick \
+		MagickWand.2:${PORTSDIR}/graphics/ImageMagick \
 		gsl.13:${PORTSDIR}/math/gsl \
 		fftw3.4:${PORTSDIR}/math/fftw3 \
 		qwtplot3d.0:${PORTSDIR}/math/qwtplot3d \
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index fdfbaecf7627..81b86617dfa5 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvdauthor
 PORTVERSION=	0.6.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,7 +35,7 @@ WITH_FRIBIDI=		yes
 .if exists(${LOCALBASE}/lib/libiconv.so)
 WITH_ICONV=		yes
 .endif
-.if exists(${LOCALBASE}/lib/libMagickWand.so.1)
+.if exists(${LOCALBASE}/lib/libMagickWand.so.2)
 WITH_IMAGEMAGICK=	yes
 .endif
 
@@ -50,7 +50,7 @@ USE_ICONV=	yes
 CONFIGURE_ENV+=	CFLAGS="-DICONV_CONV=yes"
 .endif
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .else
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 .endif
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 7ac9a8e77a47..313136862b68 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kino
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ MAINTAINER=	pb@FreeBSD.org
 COMMENT=	A DV non-linear video editor
 
 LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv	\
-		MagickWand.1:${PORTSDIR}/graphics/ImageMagick	\
+		MagickWand.2:${PORTSDIR}/graphics/ImageMagick	\
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder	\
 		mplex:${PORTSDIR}/multimedia/mjpegtools
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 8be9d48edd8b..6b8f3d884f9a 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	lib
@@ -153,7 +153,7 @@ CONFIGURE_ARGS+=	--disable-aalib --disable-aalibtest
 .endif
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index c41547309f0f..690ab601f0aa 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lives
 DISTVERSION=	0.9.8.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xs4all.nl/%7Esalsaman/lives/current/ CENKES
 DISTNAME=	LiVES-${DISTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	LiVES-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video editing system
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		jack.0:${PORTSDIR}/audio/jack \
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 7520bf6dd3fe..49bab3f956ee 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://transcode.kabewm.com/ \
 		http://fromani.exit1.org/
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=	--enable-theora=no
 .endif
 
 .if (defined(WITH_IMAGEMAGICK) || exists(${LOCALBASE}/lib/libMagickWand.so)) && !defined(WITHOUT_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=	--enable-imagemagick --with-imagemagick-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--enable-imagemagick=no
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index 042a6257d8ae..6896a95ee196 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kismet
 PORTVERSION=	200805.r1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
 DISTNAME=	kismet-2008-05-R1
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--disable-setuid
 PLIST_SUB+=	GPS=""
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		Magick++.1:${PORTSDIR}/graphics/ImageMagick
+		Magick++.2:${PORTSDIR}/graphics/ImageMagick
 BUILD_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
 MAN1=		gpsmap.1
 .else
diff --git a/net-p2p/qbittorrent-22/Makefile b/net-p2p/qbittorrent-22/Makefile
index f3e0f0ec3d9c..1af38207fd5a 100644
--- a/net-p2p/qbittorrent-22/Makefile
+++ b/net-p2p/qbittorrent-22/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qbittorrent
 DISTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
@@ -37,7 +37,7 @@ MANCOMPRESSED=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=--with-libmagick-inc=${LOCALBASE}/include/ImageMagick
 .else
 CONFIGURE_ARGS+=--disable-libmagick
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index f3e0f0ec3d9c..1af38207fd5a 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qbittorrent
 DISTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
@@ -37,7 +37,7 @@ MANCOMPRESSED=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=--with-libmagick-inc=${LOCALBASE}/include/ImageMagick
 .else
 CONFIGURE_ARGS+=--disable-libmagick
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 9a73ad57a58d..e80134710bf8 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9pre6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -54,7 +54,7 @@ PLIST_SUB+=	MASTER=""
 .endif
 
 .if !defined(WITHOUT_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=--with-Magick=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-Magick=no
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 1a013e7f856a..fd5c03661496 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.5.20b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/
 
@@ -51,7 +51,7 @@ check: build
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/wand/magick-wand.h)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if exists(${LOCALBASE}/include/vorbis/vorbisfile.h)
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index a818d8589719..beb1b1271367 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p3
-PORTREVISION=	28
+PORTREVISION=	29
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/webmagick
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-2.03pre3
 MAINTAINER=	ache@freebsd.org
 COMMENT=	Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
 
-LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index 82426517dd54..4693cecdbf18 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.2.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src-${PORTVERSION}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo343/Makefile b/www/typo343/Makefile
index 82426517dd54..4693cecdbf18 100644
--- a/www/typo343/Makefile
+++ b/www/typo343/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.2.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src-${PORTVERSION}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo344/Makefile b/www/typo344/Makefile
index 82426517dd54..4693cecdbf18 100644
--- a/www/typo344/Makefile
+++ b/www/typo344/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.2.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src-${PORTVERSION}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo345/Makefile b/www/typo345/Makefile
index 82426517dd54..4693cecdbf18 100644
--- a/www/typo345/Makefile
+++ b/www/typo345/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.2.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src-${PORTVERSION}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo346/Makefile b/www/typo346/Makefile
index 82426517dd54..4693cecdbf18 100644
--- a/www/typo346/Makefile
+++ b/www/typo346/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.2.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src-${PORTVERSION}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.2:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install: