38 files changed, 71 insertions, 59 deletions

diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 44347197e088..a04f6895fac0 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xastir
@@ -69,7 +70,7 @@ LIB_DEPENDS+=	shp.1:${PORTSDIR}/devel/shapelib
 .if defined(WITHOUT_MAGICK)
 CONFIGURE_ARGS+=	--without-imagemagick
 .else
-LIB_DEPENDS+=	Magick:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if defined(WITHOUT_DBFAWK)
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index cd94fd7d14a1..b0f976e307b5 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.5.0
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION:S/a//}/src
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index cd94fd7d14a1..b0f976e307b5 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.5.0
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION:S/a//}/src
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index cd94fd7d14a1..b0f976e307b5 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	koffice
 PORTVERSION=	1.5.0
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION:S/a//}/src
diff --git a/graphics/ale/Makefile b/graphics/ale/Makefile
index e18094ac2dd7..3d9a7f02fa45 100644
--- a/graphics/ale/Makefile
+++ b/graphics/ale/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	ale
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://auricle.dyndns.org/ALE/download/
 
@@ -44,7 +45,7 @@ MAKE_ARGS+=	FFTW=1
 .endif
 
 .if !defined(WITHOUT_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 MAKE_ARGS+=	IMAGEMAGICK=1
 .endif
 
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 43a937616381..18772b7b6a98 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT=	Convert bitmap to vector graphics
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		ming.4:${PORTSDIR}/graphics/ming \
-		Magick.9:${PORTSDIR}/graphics/ImageMagick \
+		Magick.10:${PORTSDIR}/graphics/ImageMagick \
 		pstoedit.0:${PORTSDIR}/graphics/pstoedit
 
 INSTALLS_SHLIB=	yes
diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile
index b9a11b9786a4..e2e78c7718aa 100644
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cimg
 DISTVERSION=	1-14
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,7 +35,7 @@ NOBUILD=	yes
 .endif
 
 .if !defined(WITHOUT_IM)
-RUN_DEPENDS+=	${LOCALBASE}/lib/libMagick.so.9:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS+=	${LOCALBASE}/lib/libMagick.so.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 .if !defined(WITHOUT_LAPACK)
 LIB_DEPENDS+=	atlas:${PORTSDIR}/math/atlas
diff --git a/graphics/imageindex/Makefile b/graphics/imageindex/Makefile
index 9daf7bd74509..a0f8ffb9fbf5 100644
--- a/graphics/imageindex/Makefile
+++ b/graphics/imageindex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imageindex
 PORTVERSION=	1.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.edwinh.org/imageindex/release/ \
 		http://www.reynoldsnet.org/imageindex/release/
diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile
index a5686e9718b9..459c817b6835 100644
--- a/graphics/imgseek/Makefile
+++ b/graphics/imgseek/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imgSeek
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	imgseek
diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile
index 2160a0a3f631..1e857915b71b 100644
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	k3d
 PORTVERSION=	0.4.4.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${X11BASE}/lib/libplibul.a:${PORTSDIR}/x11-toolkits/plib
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++ \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		Magick++.9:${PORTSDIR}/graphics/ImageMagick \
+		Magick++.10:${PORTSDIR}/graphics/ImageMagick \
 		netpbm.1:${PORTSDIR}/graphics/netpbm \
 		Half.2:${PORTSDIR}/graphics/OpenEXR \
 		gts.5:${PORTSDIR}/graphics/gts
diff --git a/graphics/kallery/Makefile b/graphics/kallery/Makefile
index febe0f46d178..6fef321ad597 100644
--- a/graphics/kallery/Makefile
+++ b/graphics/kallery/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	kallery
 PORTVERSION=	1.0.7a
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics www kde
 MASTER_SITES=	http://kallery.kdewebdev.org/releases/
 
-MAINTAINER=		metrol@metrol.net
+MAINTAINER=	metrol@metrol.net
 COMMENT=	An image gallery generator for KDE
 
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 
 USE_KDELIBS_VER=3
 USE_BZIP2=	yes
diff --git a/graphics/lphoto/Makefile b/graphics/lphoto/Makefile
index 375889a4583d..424913ed7602 100644
--- a/graphics/lphoto/Makefile
+++ b/graphics/lphoto/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A complete desktop solution for digital photo management
 
 BUILD_DEPENDS=	kdepyuic:${PORTSDIR}/x11-toolkits/py-kde
 # libs for burning cd/vcd in lphoto, does not work in freebsd.
-#LIB_DEPENDS=	Magick.8:${PORTSDIR}/graphics/ImageMagick \
+#LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick \
 #		vcdinfo.0:${PORTSDIR}/multimedia/vcdimager \
 #		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	gphoto2:${PORTSDIR}/graphics/gphoto2 \
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 018806bdd24c..6cd10dd7ec9d 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics math
 MASTER_SITES=	http://opendx.npaci.edu/source/
 DISTNAME=	dx-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME=	dx-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick	\
+LIB_DEPENDS=	Magick.10:${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 df9f9cb9060c..5503a73d782e 100644
--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	imagick
 PORTVERSION=	0.9.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics pear
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -27,7 +27,7 @@ OPTIONS=	GM "Use GraphicsMagick backend" on
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_GM)
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .else
 LIB_DEPENDS=	GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
 CONFIGURE_ARGS+=--with-imagick-gm
diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile
index 656b53ddee77..6bc701ae3c29 100644
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	magickwand
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
@@ -14,7 +15,7 @@ PKGNAMEPREFIX=	php-
 MAINTAINER=	mark@goodstorm.com
 COMMENT=	A PHP extension to manipulate images
 
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 7873e172db0e..9275f53c20f0 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	pixieplus
 PORTVERSION=	0.5.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics kde
 MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/${PORTNAME}/
 
 MAINTAINER=	avleeuwen@piwebs.com
 COMMENT=	A free, fast, and feature packed image browser and viewer for KDE
 
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick \
 		ungif.5:${PORTSDIR}/graphics/libungif
 
 USE_AUTOTOOLS=	libtool:15
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 59a985f069f6..91dd91bfdca1 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pstoedit
 PORTVERSION=	3.44
+PORTREVISION=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -48,7 +49,7 @@ LDFLAGS+=	-lstlport_gcc ${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--without-magick
 PLIST_SUB+=	IMAGEMAGICK="@comment "
 .else
-LIB_DEPENDS+=	Magick++.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick++.10:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IMAGEMAGICK=""
 .endif
 
diff --git a/graphics/reallyslick/Makefile b/graphics/reallyslick/Makefile
index 5f7840fb2084..b9f7b3be62bf 100644
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	reallyslick
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rss-glx
@@ -15,7 +16,7 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	OpenGL screensaver collection
 
-LIB_DEPENDS=	Wand.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	Wand.10:${PORTSDIR}/graphics/ImageMagick
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
diff --git a/graphics/ruby-rmagick/Makefile b/graphics/ruby-rmagick/Makefile
index 70ac585c8709..bd4f80dd7853 100644
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rmagick
 PORTVERSION=	1.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://rubyforge.lauschmusik.de/rmagick/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -44,7 +44,7 @@ DOCS=		ChangeLog README.html
 .if defined(WITH_GRAPHICSMAGICK)
 LIB_DEPENDS=GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
 .else
-LIB_DEPENDS=Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if ${OSVERSION} < 500000
diff --git a/lang/q/Makefile b/lang/q/Makefile
index 1008df090268..9b8d16f5b2a9 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	q
 PORTVERSION=	6.2
-PORTREVISION=	4
+PORTREVISION=	5
 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=	Magick.9:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	Magick.10:${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 176ce6c9eb17..3086cfe2797b 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	LabPlot
 PORTVERSION=	1.5.0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=labplot
@@ -16,7 +16,7 @@ MAINTAINER=	kay_lehmann@web.de
 COMMENT=	LabPlot : Data analysis and visualisation
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		Magick.9:${PORTSDIR}/graphics/ImageMagick \
+		Magick.10:${PORTSDIR}/graphics/ImageMagick \
 		audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		gsl.9:${PORTSDIR}/math/gsl \
 		jasper.4:${PORTSDIR}/graphics/jasper \
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 8382471db256..581193785c04 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dvdauthor
 PORTVERSION=	0.6.11
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,7 +36,7 @@ WITH_FRIBIDI=		yes
 .if exists(${LOCALBASE}/lib/libiconv.so)
 WITH_ICONV=		yes
 .endif
-.if exists(${LOCALBASE}/lib/libMagick.so.9)
+.if exists(${LOCALBASE}/lib/libMagick.so.10)
 WITH_IMAGEMAGICK=	yes
 .endif
 
@@ -50,7 +51,7 @@ USE_ICONV=	yes
 CONFIGURE_ENV+=	CFLAGS="-DICONV_CONV=yes"
 .endif
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .else
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 .endif
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 1dd7d859ab82..16e077c2c923 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kino
 PORTVERSION=	0.8.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.9:${PORTSDIR}/graphics/ImageMagick	\
+		Magick.10:${PORTSDIR}/graphics/ImageMagick	\
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
 
 OPTIONS=	QUICKTIME "With Quicktime support" off
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 39990a761c03..ca9081f8ddd2 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS=	FLAC.7:${PORTSDIR}/audio/flac \
 		cdio.7:${PORTSDIR}/sysutils/libcdio \
 		modplug.0:${PORTSDIR}/audio/libmodplug \
 		vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
-		Wand.9:${PORTSDIR}/graphics/ImageMagick
+		Wand.10:${PORTSDIR}/graphics/ImageMagick
 
 USE_GETTEXT=	yes
 USE_ICONV=	yes
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index f12cf4816d21..49a41c344fac 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.fkb.wormulon.net/transcode/ \
 		http://dl.kel.wormulon.net/transcode/ \
@@ -165,7 +165,7 @@ CONFIGURE_ARGS+=	--enable-theora=no
 .endif
 
 .if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 CONFIGURE_ARGS+=	--enable-imagemagick --with-imagemagick-prefix=${LOCALBASE}
 .else
diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index ff7d6cc5d865..653eb67e3b8d 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kismet
 PORTVERSION=	200508.r1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
 DISTNAME=	kismet-2005-08-R1
@@ -48,7 +48,7 @@ PLIST_SUB+=	GPS="@comment "
 PLIST_SUB+=	GPS=""
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		expat.6:${PORTSDIR}/textproc/expat2 \
-		Magick++.9:${PORTSDIR}/graphics/ImageMagick
+		Magick++.10:${PORTSDIR}/graphics/ImageMagick
 BUILD_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
 RUN_DEPENDS+=	wget:${PORTSDIR}/ftp/wget
 .endif
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 36ad6bdd477a..61eb65079c45 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnudatalanguage
 PORTVERSION=	0.8.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -55,7 +55,7 @@ PLIST_SUB+=	MASTER=""
 .endif
 
 .if !defined(WITHOUT_IMAGEMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${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 754c8ca576c3..0804227737d1 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	htmltolatex
 PORTVERSION=	1
-PORTREVISION=	5
+PORTREVISION=	6
 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.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 
 USE_BISON=	yes
 USE_GMAKE=	yes
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 7709bda5f9b2..1e7b61ca9ee9 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libextractor
 PORTVERSION=	0.5.14
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/ \
 		${MASTER_SITE_GNU}
@@ -34,7 +35,8 @@ MAN3=		libextractor.3
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|
$$||g'
+		's|
+$$||g'
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
@@ -53,7 +55,7 @@ check: build
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/wand/magick-wand.h)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 .if exists(${LOCALBASE}/include/vorbis/vorbisfile.h)
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index 4bf9ccc1940e..3913d8815f7e 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p3
-PORTREVISION=	22
+PORTREVISION=	23
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}-2.03pre3
 MAINTAINER=	ache@freebsd.org
 COMMENT=	Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
 
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/campsite/Makefile b/www/campsite/Makefile
index 98148b3b4dbe..8c0b9eed7a73 100644
--- a/www/campsite/Makefile
+++ b/www/campsite/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	campsite
 PORTVERSION=	2.5.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	koutek@o-k.cz
 COMMENT=	The free and open multilingual web publishing tool for news sites
 
-LIB_DEPENDS=	Magick.9:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	Magick.10:${PORTSDIR}/graphics/ImageMagick \
 		idn.16:${PORTSDIR}/dns/libidn
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		gm4:${PORTSDIR}/devel/m4 \
diff --git a/www/igal/Makefile b/www/igal/Makefile
index 55e553985e27..8354c0e6032a 100644
--- a/www/igal/Makefile
+++ b/www/igal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	igal
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www graphics
 MASTER_SITES=	http://www.stanford.edu/~epop/igal/
 
diff --git a/www/typo3/Makefile b/www/typo3/Makefile
index 74ef015c85d4..5c243912545c 100644
--- a/www/typo3/Makefile
+++ b/www/typo3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	3.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -57,7 +57,7 @@ USE_PHP+=	zlib
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo343/Makefile b/www/typo343/Makefile
index 74ef015c85d4..5c243912545c 100644
--- a/www/typo343/Makefile
+++ b/www/typo343/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	3.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -57,7 +57,7 @@ USE_PHP+=	zlib
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo344/Makefile b/www/typo344/Makefile
index 74ef015c85d4..5c243912545c 100644
--- a/www/typo344/Makefile
+++ b/www/typo344/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	3.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -57,7 +57,7 @@ USE_PHP+=	zlib
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo345/Makefile b/www/typo345/Makefile
index 74ef015c85d4..5c243912545c 100644
--- a/www/typo345/Makefile
+++ b/www/typo345/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	3.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -57,7 +57,7 @@ USE_PHP+=	zlib
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/www/typo346/Makefile b/www/typo346/Makefile
index 74ef015c85d4..5c243912545c 100644
--- a/www/typo346/Makefile
+++ b/www/typo346/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	typo3
 PORTVERSION=	3.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -57,7 +57,7 @@ USE_PHP+=	zlib
 .include "${PORTSDIR}/Mk/bsd.php.mk"
 
 .if defined(WITH_IMAGICK)
-LIB_DEPENDS+=	Magick.9:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	Magick.10:${PORTSDIR}/graphics/ImageMagick
 .endif
 
 do-install:
diff --git a/x11-themes/icons-tango/Makefile b/x11-themes/icons-tango/Makefile
index ca7c6b5cd836..c4279abd407a 100644
--- a/x11-themes/icons-tango/Makefile
+++ b/x11-themes/icons-tango/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icons-tango
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://tango-project.org/releases/ \
 		${MASTER_SITE_GENTOO}