23 files changed, 43 insertions, 31 deletions

diff --git a/graphics/pecl-imagick/Makefile b/graphics/pecl-imagick/Makefile
index 71f2d71b2b8d..c80e57c30e9a 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imagick
 PORTVERSION=	2.1.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=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile
index 41696f41770f..a95cfcc257d2 100644
--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pfstools
 PORTVERSION=	1.6.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -119,7 +120,7 @@ PLIST_SUB+=	QT="@comment "
 
 .if defined(WITH_IM)
 CONFIGURE_ARGS+=--enable-imagemagick
-LIB_DEPENDS+=	Magick++.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick++.1:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IM=""
 .else
 CONFIGURE_ARGS+=--disable-imagemagick
diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile
index 36cc32fcc72c..4b5b54d17fdc 100644
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	magickwand
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
@@ -15,7 +16,7 @@ DISTNAME=	MagickWandForPHP-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PHP extension to manipulate images
 
-LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 49f5ace5f1ef..eac21e2d455f 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -39,7 +39,7 @@ LDFLAGS=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--without-magick
 PLIST_SUB+=	IMAGEMAGICK="@comment "
 .else
-LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick++.1:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IMAGEMAGICK=""
 .endif
 
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 6623d6b401ad..91444208be3f 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rss-glx
@@ -16,7 +16,7 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	dyeske@gmail.com
 COMMENT=	OpenGL screensaver collection
 
-LIB_DEPENDS=	Wand.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 
 USE_BZIP2=	yes
 USE_GL=		yes
diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index 1edf3c26cfa1..722ff0e196fe 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rmagick
 PORTVERSION=	1.15.10
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -43,7 +43,7 @@ DOCS=		ChangeLog README.html
 .if defined(WITH_GRAPHICSMAGICK)
 LIB_DEPENDS+=	GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
 .else
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 pre-configure:
diff --git a/lang/q/Makefile b/lang/q/Makefile
index c5af638ea287..b07a2e78fe52 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -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=	Magick.10:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm \
 		gii.1:${PORTSDIR}/devel/libgii \
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 98bbbc718a07..d4373b393c6e 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kino
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	pb@FreeBSD.org
 COMMENT=	A DV non-linear video editor
 
 LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv	\
-		Magick.10:${PORTSDIR}/graphics/ImageMagick	\
+		MagickWand.1:${PORTSDIR}/graphics/ImageMagick	\
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder	\
 		mplex:${PORTSDIR}/multimedia/mjpegtools
diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile
index 5d96a977fbbb..d45ca704349c 100644
--- a/multimedia/lives/Makefile
+++ b/multimedia/lives/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lives
 DISTVERSION=	0.9.8.10
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.xs4all.nl/%7Esalsaman/lives/current/ CENKES
 DISTNAME=	LiVES-${DISTVERSION}
@@ -14,7 +15,7 @@ DISTNAME=	LiVES-${DISTVERSION}
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Video editing system
 
-LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	MagickWand.1:${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 895cd880bcfe..c2baf2bac9a5 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://transcode.kabewm.com/ \
 		http://fromani.exit1.org/
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+=	--enable-theora=no
 .endif
 
 .if (defined(WITH_IMAGEMAGICK) || exists(${LOCALBASE}/lib/libMagick.so)) && !defined(WITHOUT_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${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 12eeed834c82..3f5f8d285252 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kismet
 PORTVERSION=	200710.r1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
 DISTNAME=	kismet-2007-10-R1
@@ -46,7 +47,7 @@ CONFIGURE_ARGS+=--disable-setuid
 PLIST_SUB+=	GPS=""
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		Magick++.10:${PORTSDIR}/graphics/ImageMagick
+		Magick++.1:${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 8ae0edea4d84..0162153d8ebd 100644
--- a/net-p2p/qbittorrent-22/Makefile
+++ b/net-p2p/qbittorrent-22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qbittorrent
 DISTVERSION=	1.0.0rc11
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
@@ -36,7 +37,7 @@ MANCOMPRESSED=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=--disable-libmagick
 .endif
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 8ae0edea4d84..0162153d8ebd 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qbittorrent
 DISTVERSION=	1.0.0rc11
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF
 
@@ -36,7 +37,7 @@ MANCOMPRESSED=	yes
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=--disable-libmagick
 .endif
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index df7af8c782f3..125d239892a9 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9pre6
-PORTREVISION=	2
+PORTREVISION=	3
 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+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=--with-Magick=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-Magick=no
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index b37d1d740acc..605bd9e81f58 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	textproc
 MASTER_SITES=	http://people.FreeBSD.org/~foxfair/distfiles/
 DISTNAME=	${PORTNAME}
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTML to LaTeX to PDF Converter
 
-LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 
 USE_BISON=	build
 USE_GMAKE=	yes
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 3159e9edace6..7f7d5bc8375f 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.5.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/ \
 		${MASTER_SITE_GNU}
@@ -54,7 +54,7 @@ check: build
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/wand/magick-wand.h)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if exists(${LOCALBASE}/include/vorbis/vorbisfile.h)
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 3bb9fb11986e..a818d8589719 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p3
-PORTREVISION=	27
+PORTREVISION=	28
 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=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/igal/Makefile b/www/igal/Makefile
index e8e1adcc4594..3caada4b7ff8 100644
--- a/www/igal/Makefile
+++ b/www/igal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	igal
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www graphics
 MASTER_SITES=	http://www.stanford.edu/~epop/igal/
 
diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index a3ff1a33e54f..b4c13fb7af8c 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo343/Makefile b/www/typo343/Makefile
index a3ff1a33e54f..b4c13fb7af8c 100644
--- a/www/typo343/Makefile
+++ b/www/typo343/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo344/Makefile b/www/typo344/Makefile
index a3ff1a33e54f..b4c13fb7af8c 100644
--- a/www/typo344/Makefile
+++ b/www/typo344/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo345/Makefile b/www/typo345/Makefile
index a3ff1a33e54f..b4c13fb7af8c 100644
--- a/www/typo345/Makefile
+++ b/www/typo345/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo346/Makefile b/www/typo346/Makefile
index a3ff1a33e54f..b4c13fb7af8c 100644
--- a/www/typo346/Makefile
+++ b/www/typo346/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	4.1.6
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -42,7 +43,7 @@ USE_PHP+=	zlib
 .endif
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	MagickWand.1:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install: