18 files changed, 43 insertions, 35 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 97fc1e0e2fb8..14c5ac369dd4 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.6.1-10
+DISTVERSION=	6.6.2-10
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://ftp.nluug.nl/pub/ImageMagick/ \
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 64ae214e45d8..8d3297b2d1a4 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.6.1-10.tar.xz) = d82e1331362f99790548e3e94777eb81
-SHA256 (ImageMagick-6.6.1-10.tar.xz) = 6d6dec27faca658d8f1c4bf16c480f9855772e91015bf31cd40a294d5ede3b86
-SIZE (ImageMagick-6.6.1-10.tar.xz) = 6255328
+MD5 (ImageMagick-6.6.2-10.tar.xz) = 5bb527f3f736d5a4a819d14b193ccb23
+SHA256 (ImageMagick-6.6.2-10.tar.xz) = 9f571251b1b79ba66db91925da7d25f98be0a2aadbdfb78849ce7d76d6af8b82
+SIZE (ImageMagick-6.6.2-10.tar.xz) = 6285360
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 07e5422b2c39..452787e70e1a 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -68,6 +68,7 @@ include/ImageMagick/magick/hashmap.h
 include/ImageMagick/magick/histogram.h
 include/ImageMagick/magick/identify.h
 include/ImageMagick/magick/image.h
+include/ImageMagick/magick/image-view.h
 include/ImageMagick/magick/layer.h
 include/ImageMagick/magick/list.h
 include/ImageMagick/magick/locale_.h
@@ -134,9 +135,9 @@ include/ImageMagick/wand/magick-wand.h
 include/ImageMagick/wand/mogrify.h
 include/ImageMagick/wand/montage.h
 include/ImageMagick/wand/pixel-iterator.h
-include/ImageMagick/wand/pixel-view.h
 include/ImageMagick/wand/pixel-wand.h
 include/ImageMagick/wand/stream.h
+include/ImageMagick/wand/wand-view.h
 lib/ImageMagick-%%PORTVERSION%%/config/configure.xml
 lib/ImageMagick-%%PORTVERSION%%/config/delegates.xml
 lib/ImageMagick-%%PORTVERSION%%/config/english.xml
@@ -174,6 +175,8 @@ lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dcm.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dds.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dds.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/debug.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/debug.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dib.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dib.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/dng.la
@@ -370,15 +373,15 @@ lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
-lib/libMagick++.so.3
+lib/libMagick++.so.4
 lib/libMagickCore.a
 lib/libMagickCore.la
 lib/libMagickCore.so
-lib/libMagickCore.so.3
+lib/libMagickCore.so.4
 lib/libMagickWand.a
 lib/libMagickWand.la
 lib/libMagickWand.so
-lib/libMagickWand.so.3
+lib/libMagickWand.so.4
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/Magick++.pc
 libdata/pkgconfig/ImageMagick.pc
@@ -1223,6 +1226,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/fx.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/histogram.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/image.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/image-view.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/layer.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/list.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/magick-deprecate.html
@@ -1252,6 +1256,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/stream.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/version.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/wand-view.html
 %%PORTDOCS%%%%DOCSDIR%%/www/architecture.html
 %%PORTDOCS%%%%DOCSDIR%%/www/binary-releases.html
 %%PORTDOCS%%%%DOCSDIR%%/www/changelog.html
diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile
index e2b4a972e04f..f34ab7105af3 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ale
 PORTVERSION=	0.8.11.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://auricle.dyndns.org/ALE/download/
 
@@ -52,7 +52,7 @@ LIB_DEPENDS+=	fftw3.5:${PORTSDIR}/math/fftw3
 .if defined(WITHOUT_IMAGEMAGICK)
 CONFIGURE_ARGS+=	--without-imagemagick
 .else
-LIB_DEPENDS+=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 208f750e6fa2..c0a7c7a5440f 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/AutoTrace/${PORTVERSION}
 
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert bitmap to vector graphics
 
 LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
-    		MagickWand.3:${PORTSDIR}/graphics/ImageMagick
+    		MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 
 USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
diff --git a/graphics/cuneiform/Makefile b/graphics/cuneiform/Makefile
index 32f045cc0ee2..4bfbcb8ebaaa 100644
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cuneiform
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/cuneiform-linux/${PORTVERSION:R}/${PORTVERSION:R}/+download/
 DISTNAME=	${PORTNAME}-linux-${PORTVERSION}
@@ -36,7 +37,7 @@ CMAKE_ARGS=	-DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib -ldlmalloc"
 .endif
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 post-extract:
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index af84906c805c..34dcb1611a23 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imgSeek
 PORTVERSION=	0.8.6
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -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.11:${PORTSDIR}/graphics/jpeg \
-		MagickWand.3:${PORTSDIR}/graphics/ImageMagick
+		MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 
 USE_PYDISTUTILS=yes
 USE_PYTHON=	yes
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 3677ecd5f6b7..626ea458818c 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.47
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 
@@ -22,7 +22,7 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		gtkspell.0:${PORTSDIR}/textproc/gtkspell \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		wpg-0.1.1:${PORTSDIR}/graphics/libwpg \
-		Magick++.3:${PORTSDIR}/graphics/ImageMagick
+		Magick++.4:${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 e7e6d79c7c4e..2ad254022aa9 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -9,7 +9,7 @@
 PORTNAME=	k3d
 PORTVERSION=	0.6.7.0
 DISTVERSIONSUFFIX=-src
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/K-3D%20Source/K-3D%20${PORTVERSION}
 
@@ -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.3:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	MagickWand.4:${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 a845d39e5ddb..bab260736265 100644
--- a/graphics/kallery/Makefile
+++ b/graphics/kallery/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	kallery
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 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.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickCore.4:${PORTSDIR}/graphics/ImageMagick
 
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
diff --git a/graphics/libdmtx/Makefile b/graphics/libdmtx/Makefile
index 6e62d4f3c1fa..e29ccb5e5821 100644
--- a/graphics/libdmtx/Makefile
+++ b/graphics/libdmtx/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	libdmtx
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Software for reading and writing Data Matrix barcodes
 
-LIB_DEPENDS=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 
 MAN1=		dmtxread.1 dmtxwrite.1 dmtxquery.1
 MAN3=		libdmtx.3
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 91ed90510cef..1b2ab138fb6b 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/
 DISTNAME=	dx-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME=	dx-${PORTVERSION}
 MAINTAINER=	stephen@missouri.edu
 COMMENT=	IBM's Open Visualization Data Explorer
 
-LIB_DEPENDS=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick	\
+LIB_DEPENDS=	MagickWand.4:${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 739fb351c2c1..a30ab8a26c17 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imagick
 DISTVERSION=	3.0.0RC1
+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.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 18c0889c8500..9de9abf89d43 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pfstools
 PORTVERSION=	1.6.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -120,7 +120,7 @@ PLIST_SUB+=	QT="@comment "
 
 .if defined(WITH_IM)
 CONFIGURE_ARGS+=--enable-imagemagick
-LIB_DEPENDS+=	Magick++.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick++.4:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IM=""
 .else
 CONFIGURE_ARGS+=--disable-imagemagick
diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile
index 0d4a18a91c50..7cf34561bfa4 100644
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	magickwand
 PORTVERSION=	1.0.8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
@@ -16,7 +16,7 @@ DISTNAME=	MagickWandForPHP-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A PHP extension to manipulate images
 
-LIB_DEPENDS=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 07b7380e56a7..b19fee549eca 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pstoedit
 PORTVERSION=	3.50
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics print
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
@@ -40,7 +40,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-magick
 PLIST_SUB+=	IMAGEMAGICK="@comment "
 .else
-LIB_DEPENDS+=	Magick++.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick++.4:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IMAGEMAGICK=""
 .endif
 
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 4205ec8ef814..4633484ad506 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.9.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/rss-glx/rss-glx/${PORTVERSION}
 DISTNAME=	rss-glx_${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL screensaver collection
 
-LIB_DEPENDS=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick \
 		GLC.0:${PORTSDIR}/graphics/quesoglc
 
 OPTIONS=	FREEALUT "Enable freealut support" off \
diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index 6f4485e5bfd0..e9225db69f89 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rmagick
 PORTVERSION=	2.13.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	RF
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A Ruby binding for ImageMagick
 
-LIB_DEPENDS=	MagickWand.3:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick
 
 USE_BZIP2=	yes
 USE_RUBY=	yes