- Update ImageMagick to 6.4.9.2

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

17 files changed, 35 insertions, 29 deletions

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