Update to 6.8.9-3 [1][3].

Use USES=compiler:openmp for the OPENMP option[2] Ditch the use of perl for patching etc [4] and silence perl threaded check [6] -delay option spurious message should be fixed [5] JASPER option was replace by JPEG2000 for JP2k support. Put 16BIT_PIXEL and HDRI option separate option block. These options change the library name, so the user needs to take this into consideration. Use new LIB_DEPENDS syntax. Use @sample for config files. Sprinkle some USES=pkgconfig for some ports, since we don't pull it in anymore at run-time. PR: 185462 [1] PR: 187548 [2] PR: 182793 [3] PR: 181746 [4] PR: 176047 [5] PR: 190814 [6] Submitted by: c.petrik.sosa@gmail.com [1] Matthieu Volat <mazhe@alkumuna.eu> [2] free.bsd@webstyle.ch [3] andrnils@gmail.com [4] rfg@tristatelogic.com [5] Michelle Sullivan <michelle@sorbs.net> [6] Approved by: portmgr (blanket) (for NO_STAGED ports)
svn path=/head/; revision=358176
2024-11-24 00:45:52 +00:00 · 2014-06-17 20:05:30 +00:00 · 2014-06-17 20:05:30 +00:00 · cf906e5cf2 · 2021-03-31 03:12:20 +00:00
commit cf906e5cf2
parent fb4bc685a5
37 changed files with 1484 additions and 1618 deletions
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	virtuoso
 PORTVERSION=	6.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
@ -68,7 +68,7 @@ check:

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE}
-LIB_DEPENDS+=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 CONFIGURE_ARGS+=--disable-imagemagick
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@ -3,13 +3,14 @@

 PORTNAME=	calibre
 PORTVERSION=	1.35.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/

 MAINTAINER=	rnejdl@ringofsaturn.com
 COMMENT=	Ebook management application

-LIB_DEPENDS=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
 		libwmflite.so:${PORTSDIR}/graphics/libwmf \
@ -50,7 +51,7 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 USE_RC_SUBR=	calibre
 EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f

-USES=		desktop-file-utils shared-mime-info shebangfix tar:xz
+USES=		desktop-file-utils pkgconfig shared-mime-info shebangfix tar:xz
 SHEBANG_FILES=	src/calibre/ebooks/metadata/odt.py \
 		src/calibre/utils/*.py \
 		src/odf/*.py
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@ -10,19 +10,21 @@ MASTER_SITES=	SF
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	Vector based 2D animation package

-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl
-LIB_DEPENDS=	glibmm-2.4.1:${PORTSDIR}/devel/glibmm \
-		MagickWand:${PORTSDIR}/graphics/ImageMagick \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		mng:${PORTSDIR}/graphics/libmng \
-		png15:${PORTSDIR}/graphics/png \
-		tiff:${PORTSDIR}/graphics/tiff \
-		avcodec:${PORTSDIR}/multimedia/ffmpeg \
-		dv:${PORTSDIR}/multimedia/libdv \
-		IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26
+# update to 0.64.1 does pick up ImageMagick correctly but there are a 
+# multitude of c++ build failures which are beyond my skill to fix ..
+BROKEN=		Doesn't pickup ImageMagick anymore.

-USE_GNOME=	gnomehack glib20
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ETL.pc:${PORTSDIR}/devel/etl
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libmng.so:${PORTSDIR}/graphics/libmng \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+		libdv.so:${PORTSDIR}/multimedia/libdv \
+		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
+
+USE_GNOME=	gnomehack glib20 glibmm libxml++26
 USES=		gettext
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
@ -146,7 +146,7 @@ M17N_CONFIGURE_WITH=	m17n-flt
 OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
 OTF_CONFIGURE_WITH=	libotf

-MAGICK_LIB_DEPENDS=	libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick

 GSETTINGS_USE=			gnome=glib20
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION?=	4
+PORTREVISION?=	5
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
@ -144,7 +144,7 @@ M17N_CONFIGURE_WITH=	m17n-flt
 OTF_LIB_DEPENDS=	libotf.so:${PORTSDIR}/print/libotf
 OTF_CONFIGURE_WITH=	libotf

-MAGICK_LIB_DEPENDS=	libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick

 GSETTINGS_USE=			gnome=glib20
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@ -1,11 +1,11 @@
 # $FreeBSD$

 PORTNAME=	ImageMagick
-DISTVERSION=	6.8.0-7
-PORTREVISION=	9
+DISTVERSION=	6.8.9-3
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
+		http://www.imagemagick.org/download/legacy/ \
 		http://servingzone.com/mirrors/ImageMagick/ \
 		http://mirror.checkdomain.de/imagemagick/ \
 		http://image_magick.veidrodis.com/image_magick/ \
@ -31,49 +31,66 @@ MASTER_SITES=	http://www.imagemagick.org/download/ \
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Image processing tools

-LICENSE=	APACHE20
+#LICENSE=	APACHE20

-USES=		gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix
+USES=		gmake libtool pathfix perl5 pkgconfig shebangfix tar:xz
 SHEBANG_FILES=	www/source/examples.pl
-USE_XZ=		yes
-USE_PERL5=	run build patch
-WANT_GNOME=	yes
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-dps --without-lcms
+CONFIGURE_ENV=	MAKE=${MAKE_CMD}
+CONFIGURE_ARGS=	--without-dps \
+		--without-lcms
 USE_LDCONFIG=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

+SAMPLE_FILES=	coder.xml colors.xml delegates.xml log.xml magic.xml mime.xml \
+		policy.xml quantization-table.xml thresholds.xml type-dejavu.xml \
+		type-ghostscript.xml type-windows.xml type.xml
+
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}

-OPTIONS_DEFINE=	16BIT_PIXEL BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \
-		GRAPHVIZ GSLIB HDRI JASPER JBIG JPEG LCMS2 LZMA LQR MODULES \
+OPTIONS_DEFINE=	BZIP2 DOCS DJVU FFTW FONTCONFIG FPX FREETYPE \
+		GRAPHVIZ GSLIB JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \
 		OPENEXR OPENMP PANGO PDF PERL PNG SVG TESTS TIFF WEBP WMF \
 		THREADS
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \
-		JASPER JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \
-		TIFF WEBP WMF
+		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PNG SVG TIFF \
+		WEBP WMF THREADS
+OPTIONS_GROUP=	HALFSUPPORTED
+OPTIONS_GROUP_HALFSUPPORTED=	16BIT_PIXEL HDRI
+
+HALFSUPPORTED_DESC=	Half supported options (see help dialog)
 16BIT_PIXEL_DESC=	16bit pixel support
+JPEG2000_DESC=		OpenJPEG 2000 support via openjpeg
 DJVU_DESC=		DJVU format support (needs THREADS)
 GSLIB_DESC=		libgs (Postscript SHLIB) support
 HDRI_DESC=		High dynamic range images support
 MODULES_DESC=		Modules support
 TESTS_DESC=		Run bundled self-tests after build

-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MHDRI}
 CONFIGURE_ARGS+=	--enable-hdri
+_HDRI=HDRI
 .else
 CONFIGURE_ARGS+=	--disable-hdri
+_HDRI=""
 .endif
+PLIST_SUB+=	HDRI=${_HDRI}

 .if ${PORT_OPTIONS:MTHREADS}
 _IMAGEMAGICK_THREADS=yes
 _IMAGEMAGICK_THREADS_MSG=with threads
-PERL_THREADED!=	${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'
+. if exists(${PERL})
+PERL_THREADED!=	${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'; ${ECHO_CMD}
+. else
+# if ${PERL} doesn't exists, assume we dealing with threaded perl.
+PERL_THREADED=	yes
+. endif
 .else
 _IMAGEMAGICK_THREADS=no
 _IMAGEMAGICK_THREADS_MSG=without threads
@ -81,10 +98,9 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif

 .if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5}
+CONFIGURE_ARGS+=	--with-perl=${PERL5} \
+			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
-MAN3=			Image::Magick.3
-MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VER}
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
 . if defined(PERL_THREADED)
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded
@ -118,18 +134,20 @@ _IMAGEMAGICK_THREADS=no
 IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 CONFIGURE_ARGS+=	--enable-openmp
+USES+=		compiler:openmp
 . endif
 .else
 CONFIGURE_ARGS+=	--disable-openmp
 .endif

 .if ${PORT_OPTIONS:M16BIT_PIXEL}
-PLIST_SUB+=		QBIT='Q16'
+_QBIT=Q16
 .else
 # Faster, but poor quality
 CONFIGURE_ARGS+=	--with-quantum-depth=8
-PLIST_SUB+=		QBIT='Q8'
+_QBIT=Q8
 .endif
+PLIST_SUB+=		QBIT=${_QBIT}

 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
@ -149,7 +167,7 @@ PLIST_SUB+=		MODULES='@comment '
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
-LIB_DEPENDS+=		IlmImf:${PORTSDIR}/graphics/OpenEXR
+LIB_DEPENDS+=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
@ -161,7 +179,7 @@ PLIST_SUB+=		OPENEXR="@comment "
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
-LIB_DEPENDS+=		djvulibre:${PORTSDIR}/graphics/djvulibre
+LIB_DEPENDS+=		libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
@ -169,7 +187,7 @@ PLIST_SUB+=		DJVU="@comment "
 .endif

 .if ${PORT_OPTIONS:MJPEG}
-LIB_DEPENDS+=		jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS+=		libjpeg.so:${PORTSDIR}/graphics/jpeg
 PLIST_SUB+=		JPEG=""
 .else
 CONFIGURE_ARGS+=	--without-jpeg
@ -177,7 +195,7 @@ PLIST_SUB+=		JPEG="@comment "
 .endif

 .if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		libpng15.so:${PORTSDIR}/graphics/png
 PLIST_SUB+=		PNG=""
 .else
 CONFIGURE_ARGS+=	--without-png
@ -185,7 +203,7 @@ PLIST_SUB+=		PNG="@comment "
 .endif

 .if ${PORT_OPTIONS:MTIFF}
-LIB_DEPENDS+=		tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS+=		libtiff.so:${PORTSDIR}/graphics/tiff
 PLIST_SUB+=		TIFF=""
 .else
 CONFIGURE_ARGS+=	--without-tiff
@ -201,14 +219,14 @@ CONFIGURE_ARGS+=	--without-gslib

 .if ${PORT_OPTIONS:MLQR}
 CONFIGURE_ARGS+=	--with-lqr
-LIB_DEPENDS+=		lqr-1:${PORTSDIR}/graphics/liblqr-1
+LIB_DEPENDS+=		liblqr-1.so:${PORTSDIR}/graphics/liblqr-1
 .else
 CONFIGURE_ARGS+=	--without-lqr
 .endif

 .if ${PORT_OPTIONS:MFFTW}
 CONFIGURE_ARGS+=	--with-fftw
-LIB_DEPENDS+=		fftw3:${PORTSDIR}/math/fftw3
+LIB_DEPENDS+=		libfftw3.so:${PORTSDIR}/math/fftw3
 .else
 CONFIGURE_ARGS+=	--without-fftw
 .endif
@ -220,7 +238,7 @@ CONFIGURE_ARGS+=	--without-bzlib

 # FPX (FlashPIX) images
 .if ${PORT_OPTIONS:MFPX}
-LIB_DEPENDS+=		fpx.[2-9]:${PORTSDIR}/graphics/libfpx
+LIB_DEPENDS+=		libfpx.so:${PORTSDIR}/graphics/libfpx
 CONFIGURE_ARGS+=	--with-fpx
 PLIST_SUB+=		FPX=""
 .else
@ -230,7 +248,7 @@ PLIST_SUB+=		FPX="@comment "

 # JBIG images (lossless compression for bi-level images)
 .if ${PORT_OPTIONS:MJBIG}
-LIB_DEPENDS+=		jbig:${PORTSDIR}/graphics/jbigkit
+LIB_DEPENDS+=		libjbig.so:${PORTSDIR}/graphics/jbigkit
 PLIST_SUB+=		JBIG=""
 .else
 CONFIGURE_ARGS+=	--without-jbig
@ -238,17 +256,17 @@ PLIST_SUB+=		JBIG="@comment "
 .endif

 # JPEG2000 images (wavelet-based lossy compression)
-.if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=		jasper:${PORTSDIR}/graphics/jasper
+.if ${PORT_OPTIONS:MJPEG2000}
+LIB_DEPENDS+=		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
 PLIST_SUB+=		JPEG2000=""
 .else
-CONFIGURE_ARGS+=	--without-jp2
+CONFIGURE_ARGS+=	--without-openjp2
 PLIST_SUB+=		JPEG2000="@comment "
 .endif

 # GraphViz dot graphs
 .if ${PORT_OPTIONS:MGRAPHVIZ}
-LIB_DEPENDS+=		gvc:${PORTSDIR}/graphics/graphviz
+LIB_DEPENDS+=		libgvc.so:${PORTSDIR}/graphics/graphviz
 CFLAGS+=		-I${LOCALBASE}/include/graphviz
 LDFLAGS+=		-L${LOCALBASE}/lib/graphviz
 .else
@ -256,20 +274,21 @@ CONFIGURE_ARGS+=	--without-gvc
 .endif

 # LZMA support
+# needs manula override for base system...
 .if ! ${PORT_OPTIONS:MLZMA}
 CONFIGURE_ARGS+=	--without-lzma
 .endif

 # LCMS (Little CMS) color management version 2 and 1 (mutually exclusive)
 .if ${PORT_OPTIONS:MLCMS2}
-LIB_DEPENDS+=		lcms2:${PORTSDIR}/graphics/lcms2
+LIB_DEPENDS+=		liblcms2.so:${PORTSDIR}/graphics/lcms2
 .else
 CONFIGURE_ARGS+=	--without-lcms2
 .endif

 # Freetype (TrueType Font) support
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=		freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2
 USE_GHOSTSCRIPT=	yes
 CONFIGURE_ARGS+=	--with-freetype
 .else
@ -288,7 +307,7 @@ PLIST_SUB+=		WEBP="@comment "

 # Fontconfig support
 .if ${PORT_OPTIONS:MFONTCONFIG}
-LIB_DEPENDS+=		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS+=		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 CONFIGURE_ARGS+=	--with-fontconfig
 CONFIGURE_ENV+=		FONTCONFIG_CFLAGS="-I${LOCALBASE}/include" \
 			FONTCONFIG_LIBS="-L${LOCALBASE}/lib"
@ -300,9 +319,9 @@ CONFIGURE_ARGS+=	--without-fontconfig
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if !defined(WITHOUT_X11)
-LIB_DEPENDS+=		wmf:${PORTSDIR}/graphics/libwmf
+LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf
 . else
-LIB_DEPENDS+=		wmf:${PORTSDIR}/graphics/libwmf-nox11
+LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 CFLAGS+=		-I${LOCALBASE}/include/freetype2
@ -315,7 +334,7 @@ PLIST_SUB+=		WMF="@comment "
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && !defined(WITHOUT_X11)
 USE_GNOME+=		libxml2
-LIB_DEPENDS+=		rsvg-2:${PORTSDIR}/graphics/librsvg2
+LIB_DEPENDS+=		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
 CONFIGURE_ARGS+=	--with-rsvg --with-xml
 CONFIGURE_ENV+=		RSVG_CFLAGS="-I${LOCALBASE}/include/librsvg-2.0" \
 			RSVG_LIBS="-L${LOCALBASE}/lib"
@ -325,7 +344,7 @@ CONFIGURE_ARGS+=	--without-rsvg --without-xml

 # Pango support
 .if ${PORT_OPTIONS:MPANGO} && !defined(WITHOUT_X11)
-LIB_DEPENDS+=		pangocairo-1\.0:${PORTSDIR}/x11-toolkits/pango
+USE_GNOME+=		pango
 PLIST_SUB+=		PANGO=""
 .else
 CONFIGURE_ARGS+=	--without-pango
@ -351,9 +370,9 @@ PLIST_SUB+=		X11=''
 .endif

 .if ${PORT_OPTIONS:MDOCS}
-INSTALL_TARGET=	install install-docDATA install-data-html
+INSTALL_TARGET=	install-strip install-docDATA install-data-html
 .else
-INSTALL_TARGET=	install
+INSTALL_TARGET=	install-strip
 .endif

 # Test suite, requires installed ghostscript to pass
@ -362,46 +381,6 @@ INSTALL_TARGET=	install
 USE_GHOSTSCRIPT_BUILD=yes
 .endif

-post-patch:
-# prevent perllocal.pod from being written
-	@${REINPLACE_CMD} -e '/PERL/s|install && \\$$|pure_install \&\& \\|' \
-		-e 's/install-docDATA install-filters/install-filters/' \
-		${WRKSRC}/Makefile.in
-# remove the autogenerated Magick.c so it will be regenerated from
-# Magick.xs on _this_ system:
-	@${RM} -f ${WRKSRC}/PerlMagick/Magick.c
-	@${PERL} -pi -e 's|^tagnames=|#tagnames=|g ; \
-		 s|lcms/lcms.h|lcms.h|g ; \
-		 s|lcms_lcms_h|lcms_h|g' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# version neither libraries nor directories
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|pkgdocdir =.*$$|pkgdocdir = ${DOCSDIR}/|g ; \
-		 s|-\$$\(VERSION\)||; \
-		 s| install-data-html||g'
-# do not version lib directories
-	@${PERL} -pi -e 's|^(MagickLibSubdir).*$$|\1="ImageMagick"|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e 's|lcms/lcms.h|lcms.h|g' ${WRKSRC}/magick/transform.c
-#	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/ltdl/ltdl.c
-	@${PERL} -pi -e 's|timestamp: %ld|timestamp: %d|g' \
-		${WRKSRC}/magick/xwindow.c
-.if ${_IMAGEMAGICK_THREADS} == "yes"
-. for i in Magick++/lib/ImageMagick++.pc.in wand/Wand.pc.in magick/ImageMagick.pc.in
-	@${PERL} -pi -e 's|^(Libs.+)$$|\1 ${PTHREAD_LIBS}|; \
-		s|^(Cflags.+)$$|\1 ${PTHREAD_CFLAGS}|' \
-		${WRKSRC}/${i}
-. endfor
-.endif
-# deprecated gvCleanup
-	@${REINPLACE_CMD} -e "s|gvCleanup|gvFreeContext|g" \
-		${WRKSRC}/coders/dot.c
-# freetype headers are in freetype2/ nowadays
-	@${REINPLACE_CMD} -e "s|freetype/|freetype2/|g" \
-		${WRKSRC}/configure \
-		${WRKSRC}/coders/ttf.c \
-		${WRKSRC}/magick/annotate.c \
-		${WRKSRC}/www/api/MagickCore/annotate_8c.html
-
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
@ -415,22 +394,21 @@ pre-configure:

 post-install: test
 .if ${PORT_OPTIONS:MPERL}
-	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
-	${REINPLACE_CMD} -i '' -e 's}^${STAGEDIR}}}' ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Image/Magick/.packlist
+	@${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH}/perllocal.pod*
+	@${RM} -f ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto/Image/Magick/.packlist
 .endif
 .if ${PORT_OPTIONS:MMODULES}
-. if ${PORT_OPTIONS:M16BIT_PIXEL}
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/coders/.keep
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q16/filters/.keep
-. else
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/coders/.keep
-	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-Q8/filters/.keep
-. endif
+	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/coders/.keep
+	@${TOUCH} ${STAGEDIR}${PREFIX}/lib/ImageMagick-${PORTVERSION:R}/modules-${_QBIT}${_HDRI}/filters/.keep
 .endif
+.for i in ${SAMPLE_FILES}
+	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i} \
+		${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i}.sample
+.endfor

 test check:
-.if (${PORT_OPTIONS:MTESTS} || defined(PACKAGE_BUILDING))
+.if ${PORT_OPTIONS:MTESTS}
 	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} check
 .endif

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.8.0-7.tar.xz) = e15672c8c11148bcfcd95885e1cd7a5575d4a6984bdf0a3a1c718a2a6ad37435
-SIZE (ImageMagick-6.8.0-7.tar.xz) = 8245624
+SHA256 (ImageMagick-6.8.9-3.tar.xz) = aca0c1af5b2db84a39dcb7ac109be542965af61ebab967c84d26541f475ba9d1
+SIZE (ImageMagick-6.8.9-3.tar.xz) = 7555684
--- a/graphics/ImageMagick/files/patch-coders::jp2.c
+++ b/graphics/ImageMagick/files/patch-coders::jp2.c
@ -1,17 +0,0 @@
--- coders/jp2.c.orig	Sat Oct 12 23:41:32 2002
-+++ coders/jp2.c	Wed Jan 22 21:11:31 2003
-@@ -639,5 +639,14 @@
- 
- #if defined(HasJP2)
-+
-+#ifndef JAS_IMAGE_CM_GRAY
-+#define JAS_IMAGE_CM_GRAY JAS_IMAGE_CS_GRAY
-+#endif
-+
-+#ifndef JAS_IMAGE_CM_RGB
-+#define JAS_IMAGE_CM_RGB JAS_IMAGE_CS_RGB
-+#endif
-+
- /*
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %                                                                             %
--- a/graphics/ImageMagick/files/patch-configure
+++ b/graphics/ImageMagick/files/patch-configure
@ -1,11 +0,0 @@
--- configure.orig	2012-05-16 09:58:45.571776589 +0200
-+++ configure	2012-05-16 09:58:54.042776583 +0200
-@@ -32626,7 +32626,7 @@
- 
- #
- # Path to ImageMagick documentation files
-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-+DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"
- DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
- DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
- case "${build_os}" in
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	autotrace
 PORTVERSION=	0.31.1
-PORTREVISION=	24
+PORTREVISION=	25
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/AutoTrace/${PORTVERSION}

@ -30,7 +30,7 @@ PSTOEDIT_DESC=	Convert postscript to other formats
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=	--without-magick
 .endif
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@ -3,13 +3,14 @@

 PORTNAME=	converseen
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/Converseen/Converseen%200.7/

 MAINTAINER=	fernando.apesteguia@gmail.com
 COMMENT=	Easy to use graphics conversion utility

-LIB_DEPENDS=	libMagick++.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

 USES=		cmake gettext iconv tar:bzip2
 USE_QT4=	corelib gui linguist_build moc_build qmake_build \
--- a/graphics/cuneiform/Makefile
+++ b/graphics/cuneiform/Makefile
@ -28,7 +28,7 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 .endif

 post-patch:
--- a/graphics/dcraw-m/Makefile
+++ b/graphics/dcraw-m/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	dcraw-m
 PORTVERSION=	9.17
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://dx.burplex.com/dcraw-m/ \
 		http://www.waitman.net/dcraw-m/
@ -15,7 +16,7 @@ BROKEN=		Unfetchable
 LIB_DEPENDS=	libjasper.so:${PORTSDIR}/graphics/jasper \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		liblcms.so:${PORTSDIR}/graphics/lcms \
-		libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+		libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

 PLIST_FILES=	bin/dcraw-m

@ -33,8 +34,8 @@ CFLAGS+=	-O4
 .endif
 .endif

-CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick
-LDFLAGS+=	-L${LOCALBASE}/lib -lm -ljasper -ljpeg -llcms -lMagickWand
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick-6
+LDFLAGS+=	-L${LOCALBASE}/lib -lm -ljasper -ljpeg -llcms -lMagickWand-6.Q16

 do-build:
 	cd ${WRKSRC}/ && ${CC} -o ${PORTNAME} ${CFLAGS} ${PORTNAME}.c ${LDFLAGS}
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@ -1,7 +1,7 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$

-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imagemagick

@ -18,6 +18,6 @@ OPTIONS_DEFINE=	IMAGEMAGICK
 IMAGEMAGICK_DESC=	Install ImageMagick image proccesing tool
 OPTIONS_DEFAULT=	IMAGEMAGICK

-IMAGEMAGICK_LIB_DEPENDS=	libMagick++.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

 .include "${MASTERDIR}/Makefile"
--- a/graphics/gimp-gmic-plugin/Makefile
+++ b/graphics/gimp-gmic-plugin/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	gmic
 PORTVERSION=	1.5.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/older_versions/ \
 		SF/${PORTNAME}/
@ -15,7 +15,7 @@ COMMENT=	GREYC's Magic Image Converter

 LIB_DEPENDS=	libGraphicsMagick++.so:${PORTSDIR}/graphics/GraphicsMagick \
 		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
-		libMagick++.so:${PORTSDIR}/graphics/ImageMagick \
+		libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	inkscape
 PORTVERSION=	0.48.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics gnome
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
@ -19,12 +19,13 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt \
 		liblcms.so:${PORTSDIR}/graphics/lcms \
 		libwpg-0.2.so:${PORTSDIR}/graphics/libwpg \
 		libpng15.so:${PORTSDIR}/graphics/png \
-		libMagick++.so:${PORTSDIR}/graphics/ImageMagick
+		libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	p5-XML-XQL>=0:${PORTSDIR}/textproc/p5-XML-XQL

 USE_BZIP2=	yes
 USE_GNOME=	gtkmm24 intlhack libxslt
-USES=		desktop-file-utils gettext gmake pathfix perl5 shebangfix
+USES=		desktop-file-utils gettext gmake pathfix pkgconfigperl5 \
+		shebangfix
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@ -100,7 +100,7 @@ PLIST_SUB+=	GTS="@comment "
 .endif

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IMAGEMAGICK=""
 .else
 CMAKE_ARGS+=	-DK3D_BUILD_IMAGEMAGICK_IO_MODULE:BOOL=OFF
--- a/graphics/kipi-plugin-videoslideshow/Makefile
+++ b/graphics/kipi-plugin-videoslideshow/Makefile
@ -2,13 +2,13 @@

 PORTNAME=	kipi-plugin-${KIPI_PLUGIN}
 PORTVERSION=	${DIGIKAM_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${KIPI_PLUGIN}_DESC}

-LIB_DEPENDS=	libMagickCore.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \
 		libQtGStreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer-qt4

 KIPI_PLUGIN=	videoslideshow
--- a/graphics/libdmtx/Makefile
+++ b/graphics/libdmtx/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	libdmtx
 PORTVERSION=	0.7.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF

 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Library for reading and writing Data Matrix barcodes

-LIB_DEPENDS=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
--- a/graphics/npretty/Makefile
+++ b/graphics/npretty/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	npretty
 PORTVERSION=	0.9.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.pulia.nu/code/projects/npretty/ \
 		${MASTER_SITE_LOCAL:S@%SUBDIR%@gabor@}
@ -15,7 +15,7 @@ RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		convert:${PORTSDIR}/graphics/ImageMagick \
 		p5-forks>=0:${PORTSDIR}/devel/p5-forks

-LIB_DEPENDS+=	Magick.*:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

 NO_BUILD=	yes
 USES=		perl5
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opendx
 PORTVERSION=	4.4.4
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	graphics math java
 MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/
 DISTNAME=	dx-${PORTVERSION}
@ -11,7 +11,7 @@ DISTNAME=	dx-${PORTVERSION}
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer

-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick	\
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick	\
 		tiff:${PORTSDIR}/graphics/tiff		\
 		cdf:${PORTSDIR}/science/cdf

--- a/graphics/pecl-imagick/Makefile
+++ b/graphics/pecl-imagick/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	imagick
 DISTVERSION=	3.1.2
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@ -15,11 +16,12 @@ COMMENT=	Provides a wrapper to the ImageMagick/GraphicsMagick library
 LICENSE=	PHP301

 .if !defined(WITHOUT_X11)
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 .else
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick-nox11
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick-nox11
 .endif

+USES=		pkgconfig
 USE_PHP=	yes
 USE_PHPEXT=	yes

--- a/graphics/pfstools/Makefile
+++ b/graphics/pfstools/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pfstools
 PORTVERSION=	1.6.4
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics
 MASTER_SITES=	SF

@ -71,7 +71,7 @@ PLIST_SUB+=	QT="@comment "

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
 CONFIGURE_ARGS+=--enable-imagemagick
-LIB_DEPENDS+=	libMagick++.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	IM=""
 .else
 CONFIGURE_ARGS+=--disable-imagemagick
--- a/graphics/php-magickwand/Makefile
+++ b/graphics/php-magickwand/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	magickwand
 PORTVERSION=	1.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.magickwand.org/download/php/
 PKGNAMEPREFIX=	php-
@ -12,11 +12,17 @@ DISTNAME=	MagickWandForPHP-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PHP extension to manipulate images

-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

+USES=		pkgconfig
 USE_PHP=	yes
 USE_PHPEXT=	yes

 CONFIGURE_ARGS=	--with-magickwand=${LOCALBASE}

+pre-configure:
+	@${REINPLACE_CMD} -e 's|-lMagickWand|-lMagickWand-6.Q16|g' \
+		-e 's|-lMagickCore|-lMagickCore-6.Q16|g' \
+		${WRKSRC}/configure
+
 .include <bsd.port.mk>
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@ -39,7 +39,7 @@ EMF_LIB_DEPENDS=	libEMF.so:${PORTSDIR}/graphics/libemf
 EMF_CONFIGURE_ON=	--with-libemf-include=${LOCALBASE}/include/libEMF
 EMF__CONFIGURE_OFF=	--without-emf

-MAGICK_LIB_DEPENDS=	libMagick++.so:${PORTSDIR}/graphics/ImageMagick
+MAGICK_LIB_DEPENDS=	libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 MAGICK_CONFIGURE_ON=	--with-magick
 MAGICK_CONFIGURE_OFF=	--without-magick

--- a/graphics/py-wand/Makefile
+++ b/graphics/py-wand/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	Wand
 PORTVERSION=	0.3.7
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -11,7 +12,7 @@ COMMENT=	MagickWand Python binding

 LICENSE=	MIT

-LIB_DEPENDS=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
--- a/graphics/reallyslick/Makefile
+++ b/graphics/reallyslick/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	reallyslick
 PORTVERSION=	0.9.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF/rss-glx/rss-glx/${PORTVERSION}
 DISTNAME=	rss-glx_${PORTVERSION}
@ -11,11 +11,11 @@ DISTNAME=	rss-glx_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL screensaver collection

-LIB_DEPENDS=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \
 		libGLC.so:${PORTSDIR}/graphics/quesoglc

 USE_GL=		glut
-USES=		gmake pathfix tar:bzip2 libtool
+USES=		gmake pathfix pkgconfig tar:bzip2 libtool
 GNU_CONFIGURE=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/graphics/ruby-rmagick/Makefile
+++ b/graphics/ruby-rmagick/Makefile
@ -12,6 +12,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for ImageMagick

+USES=		pkgconfig
 BROKEN=		not staged

 OPTIONS_DEFINE=		X11
@ -23,9 +24,9 @@ NO_STAGE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 .else
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick-nox11
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick-nox11
 .endif

 USE_BZIP2=	yes
--- a/graphics/rubygem-rmagick/Makefile
+++ b/graphics/rubygem-rmagick/Makefile
@ -2,6 +2,7 @@

 PORTNAME=		rmagick
 PORTVERSION=		2.13.2
+PORTREVISION=		1
 CATEGORIES=		graphics rubygems
 MASTER_SITES=		RG

@ -17,10 +18,11 @@ OPTIONS_DEFAULT=	X11

 .include <bsd.port.options.mk>

+USES=		pkgconfig
 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 .else
-LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick-nox11
+LIB_DEPENDS=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick-nox11
 .endif

 .include <bsd.port.mk>
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF

@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--with-x=no --without-xshm --without-xv
 .endif

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	Magick++:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=	--with-imagemagick=yes
 PLIST_SUB+=	IMAGEMAGICK=""
 MAN1=	zbarimg.1
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dvdauthor
 PORTVERSION=	0.7.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	SF

@ -45,7 +45,7 @@ PAL_DESC=	Default video format PAL

 SUB_FILES=	README.FreeBSD

-IMAGEMAGICK_LIB_DEPENDS=	libMagick++.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagick++-6.Q*.so:${PORTSDIR}/graphics/ImageMagick

 .include <bsd.port.options.mk>

--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	xine
 PORTVERSION=	1.2.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
@ -156,7 +156,7 @@ CONFIGURE_ARGS+=	--disable-aalib --disable-aalibtest
 .endif

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 PLIST_SUB+=	WITH_IMAGEMAGICK=""
 .else
 PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	transcode
 PORTVERSION=	1.1.7
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	http://cdn.bitbucket.org/france/transcode-tcforge/downloads/

@ -179,7 +179,7 @@ CONFIGURE_ARGS+=	--disable-sdl
 .endif

 .if ${PORT_OPTIONS:MIMAGEMAGICK}
-LIB_DEPENDS+=	libMagickWand.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickWand-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 CONFIGURE_ARGS+=	--with-imagemagick-prefix=${LOCALBASE} --enable-imagemagick
 .else
 CONFIGURE_ARGS+=	--disable-imagemagick
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	libfprint
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
 MASTER_SITES=	http://people.freedesktop.org/~hadess/

 MAINTAINER=	lichray@gmail.com
 COMMENT=	Library for fingerprint reader devices

-LIB_DEPENDS+=	Magick:${PORTSDIR}/graphics/ImageMagick \
+LIB_DEPENDS+=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick \
 		nss3:${PORTSDIR}/security/nss

 GNU_CONFIGURE=	yes
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	WebMagick
 PORTVERSION=	2.03p24
 DISTVERSION=	2.03pre24
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www graphics
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}-beta/${DISTVERSION}
@ -14,7 +14,7 @@ COMMENT=	Image Web Generator - recursively build HTMLs, imagemaps, thumbnails

 LICENSE=	GPLv2

-LIB_DEPENDS=    libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 RUN_DEPENDS=	p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally

 USES=		shebangfix perl5
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	xlockmore
 PORTVERSION=	5.43
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \
 		ftp://ibiblio.org/pub/Linux/X11/screensavers/ \
@ -124,7 +124,7 @@ CONFIGURE_ARGS+=	--enable-customization
 .endif

 .if ${PORT_OPTIONS:MMAGICK}
-LIB_DEPENDS+=	libMagickCore.so:${PORTSDIR}/graphics/ImageMagick
+LIB_DEPENDS+=	libMagickCore-6.Q*.so:${PORTSDIR}/graphics/ImageMagick
 .else
 CONFIGURE_ARGS+=	--without-magick
 .endif