Index: head/graphics/ImageMagick/Makefile
===================================================================
--- head/graphics/ImageMagick/Makefile	(revision 405758)
+++ head/graphics/ImageMagick/Makefile	(revision 405759)
@@ -1,431 +1,431 @@
 # $FreeBSD$
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.9.2-10
+DISTVERSION=	6.9.3-0
 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/ \
 		http://imagemagick.spd.co.il/ \
 		http://www.champground.com/imagemagick/ \
 		http://ftp.surfnet.nl/pub/ImageMagick/ \
 		http://mirror.searchdaimon.com/ImageMagick/ \
 		http://mirror.is.co.za/pub/imagemagick/ \
 		http://imagemagick.mirrorcatalogs.com/ \
 		ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://mirror.aarnet.edu.au/pub/imagemagick/ \
 		ftp://mirror.checkdomain.de/imagemagick/ \
 		ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \
 		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \
 		ftp://ftp.nluug.nl/pub/ImageMagick/ \
 		ftp://mirror.searchdaimon.com/ImageMagick/ \
 		ftp://sunsite.icm.edu.pl/packages/ImageMagick/ \
 		ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ \
 		ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
 		ftp://ftp.is.co.za/pub/imagemagick/ \
 		ftp://ftp.fifi.org/pub/ImageMagick/
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Image processing tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
 
 CONFLICTS_INSTALL=	execline-[0-9]* # bin/import
 
 # This port uses .la files, keep libtool:keepla! (magick/module.c)
 USES=		cpe gmake libtool:keepla pathfix perl5 pkgconfig:both shebangfix tar:xz
 CPE_PRODUCT=	imagemagick
 CPE_VENDOR=	imagemagick
 SHEBANG_FILES=	www/source/examples.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKE=${MAKE_CMD}
 CONFIGURE_ARGS=	--without-dps
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 
 # make sure LOCALBASE is placed at the end of the compiler lookup so the configure
 # script can find openjpeg2 headers before the openjpeg15 headers
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-Wl,-Y${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=	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 X11 16BIT_PIXEL HDRI
 OPTIONS_DEFAULT=	16BIT_PIXEL BZIP2 FFTW FONTCONFIG FPX FREETYPE \
 		JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG SVG \
 		TIFF WEBP WMF THREADS X11
 
 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
 SVG_DESC=		SVG vector image format support (via librsvg)
 TESTS_DESC=		Run bundled self-tests after build
 #SIMD_CONFIGURE_WITH=	gcc-arch
 CONFIGURE_ARGS+=	--without-gcc-arch
 
 .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
 . 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
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # 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
 _IMAGEMAGICK_THREADS=yes
 . else
 _IMAGEMAGICK_THREADS_PERL_MSG=Perl is non-threaded
 _IMAGEMAGICK_THREADS_IGNORE_MSG=. ${_IMAGEMAGICK_THREADS_PERL_MSG}. Reinstall Perl with threads or undefine WITH_IMAGEMAGICK_PERL
 .  if ${_IMAGEMAGICK_THREADS} == "yes"
 IGNORE=${_IMAGEMAGICK_THREADS_IGNORE_MSG} or undefine WITH_THREADS
 .  endif
 _IMAGEMAGICK_THREADS=no
 . endif
 .else
 CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=		WITH_PERL='@comment '
 .endif
 
 .if ${_IMAGEMAGICK_THREADS} == "yes"
 CONFIGURE_ARGS+=	--with-threads
 CONFIGURE_ENV+=		PTHREAD_LIBS="-lpthread"
 LDFLAGS+=		-lpthread
 .else
 CONFIGURE_ARGS+=	--without-threads
 _IMAGEMAGICK_THREADS=no
 .endif
 
 # OpenMP
 .if ${PORT_OPTIONS:MOPENMP}
 . if ${_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}
 _QBIT=Q16
 .else
 # Faster, but poor quality
 CONFIGURE_ARGS+=	--with-quantum-depth=8
 _QBIT=Q8
 .endif
 PLIST_SUB+=		QBIT=${_QBIT}
 
 .if defined(WITH_WINDOWS_FONT_DIR)
 CONFIGURE_ARGS+=	--with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
 .endif
 
 # Loadable coders, smaller executable, but PerlMagick not really works
 # ('make test' there works)
 .if ${PORT_OPTIONS:MMODULES}
 CONFIGURE_ARGS+=	--with-modules
 PLIST_SUB+=		MODULES=''
 .else
 CONFIGURE_ARGS+=	--without-modules
 PLIST_SUB+=		MODULES='@comment '
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . else
 LIB_DEPENDS+=		libIlmImf.so:${PORTSDIR}/graphics/OpenEXR
 PLIST_SUB+=		OPENEXR=""
 . endif
 .else
 CONFIGURE_ARGS+=	--without-openexr
 PLIST_SUB+=		OPENEXR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDJVU}
 . if ${_IMAGEMAGICK_THREADS} == "no"
 IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
 . endif
 LIB_DEPENDS+=		libdjvulibre.so:${PORTSDIR}/graphics/djvulibre
 PLIST_SUB+=		DJVU=""
 .else
 CONFIGURE_ARGS+=	--without-djvu
 PLIST_SUB+=		DJVU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
 USES+=			jpeg
 PLIST_SUB+=		JPEG=""
 .else
 CONFIGURE_ARGS+=	--without-jpeg
 PLIST_SUB+=		JPEG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPNG}
 LIB_DEPENDS+=		libpng.so:${PORTSDIR}/graphics/png
 PLIST_SUB+=		PNG=""
 .else
 CONFIGURE_ARGS+=	--without-png
 PLIST_SUB+=		PNG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
 LIB_DEPENDS+=		libtiff.so:${PORTSDIR}/graphics/tiff
 PLIST_SUB+=		TIFF=""
 .else
 CONFIGURE_ARGS+=	--without-tiff
 PLIST_SUB+=		TIFF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGSLIB}
 CONFIGURE_ARGS+=	--with-gslib
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11
 . else
 USES+=		ghostscript
 . endif
 .else
 CONFIGURE_ARGS+=	--without-gslib
 .endif
 
 .if ${PORT_OPTIONS:MLQR}
 CONFIGURE_ARGS+=	--with-lqr
 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+=		libfftw3.so:${PORTSDIR}/math/fftw3
 .else
 CONFIGURE_ARGS+=	--without-fftw
 .endif
 
 # Produce BZip compressed MIFF images
 .if empty(PORT_OPTIONS:MBZIP2)
 CONFIGURE_ARGS+=	--without-bzlib
 .endif
 
 # FPX (FlashPIX) images
 .if ${PORT_OPTIONS:MFPX}
 LIB_DEPENDS+=		libfpx.so:${PORTSDIR}/graphics/libfpx
 CONFIGURE_ARGS+=	--with-fpx
 PLIST_SUB+=		FPX=""
 .else
 CONFIGURE_ARGS+=	--without-fpx
 PLIST_SUB+=		FPX="@comment "
 .endif
 
 # JBIG images (lossless compression for bi-level images)
 .if ${PORT_OPTIONS:MJBIG}
 LIB_DEPENDS+=		libjbig.so:${PORTSDIR}/graphics/jbigkit
 PLIST_SUB+=		JBIG=""
 .else
 CONFIGURE_ARGS+=	--without-jbig
 PLIST_SUB+=		JBIG="@comment "
 .endif
 
 # JPEG2000 images (wavelet-based lossy compression)
 .if ${PORT_OPTIONS:MJPEG2000}
 LIB_DEPENDS+=		libopenjp2.so:${PORTSDIR}/graphics/openjpeg
 PLIST_SUB+=		JPEG2000=""
 .else
 CONFIGURE_ARGS+=	--without-openjp2
 PLIST_SUB+=		JPEG2000="@comment "
 .endif
 
 # GraphViz dot graphs
 .if ${PORT_OPTIONS:MGRAPHVIZ}
 LIB_DEPENDS+=		libgvc.so:${PORTSDIR}/graphics/graphviz
 CFLAGS+=		-I${LOCALBASE}/include/graphviz
 LDFLAGS+=		-L${LOCALBASE}/lib/graphviz
 .else
 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+=		liblcms2.so:${PORTSDIR}/graphics/lcms2
 .else
 CONFIGURE_ARGS+=	--without-lcms
 .endif
 
 # Freetype (TrueType Font) support
 .if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=		libfreetype.so:${PORTSDIR}/print/freetype2
 CONFIGURE_ARGS+=	--with-freetype
 .else
 CONFIGURE_ARGS+=	--without-freetype
 .endif
 
 # Webp support
 .if ${PORT_OPTIONS:MWEBP}
 LIB_DEPENDS+=		libwebp.so:${PORTSDIR}/graphics/webp
 CONFIGURE_ARGS+=	--with-webp
 PLIST_SUB+=		WEBP=""
 .else
 CONFIGURE_ARGS+=	--without-webp
 PLIST_SUB+=		WEBP="@comment "
 .endif
 
 # Fontconfig support
 .if ${PORT_OPTIONS:MFONTCONFIG}
 LIB_DEPENDS+=		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 CONFIGURE_ARGS+=	--with-fontconfig
 .else
 CONFIGURE_ARGS+=	--without-fontconfig
 .endif
 
 # WMF (Windows Meta File) images
 .if ${PORT_OPTIONS:MWMF}
 . if ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf
 . else
 LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf-nox11
 . endif
 CONFIGURE_ARGS+=	--with-wmf=yes
 PLIST_SUB+=		WMF=""
 .else
 CONFIGURE_ARGS+=	--without-wmf
 PLIST_SUB+=		WMF="@comment "
 .endif
 
 # SVG (Scalable Vector Graphics) requires both libxml2 and X11
 .if ${PORT_OPTIONS:MSVG} && ${PORT_OPTIONS:MX11}
 LIB_DEPENDS+=		librsvg-2.so:${PORTSDIR}/graphics/librsvg2
 CONFIGURE_ARGS+=	--with-rsvg
 .else
 CONFIGURE_ARGS+=	--without-rsvg
 .endif
 
 # Pango support
 .if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MX11}
 USE_GNOME+=		pango
 PLIST_SUB+=		PANGO=""
 .else
 CONFIGURE_ARGS+=	--without-pango
 PLIST_SUB+=		PANGO="@comment "
 .endif
 
 # PDF (Adobe Portable Document Format) support
 .if ${PORT_OPTIONS:MPDF}
 . if ${PORT_OPTIONS:MX11}
 USES+=			ghostscript:x11
 . else
 USES+=			ghostscript
 . endif
 .endif
 
 .if ! ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--without-x
 CONFLICTS+=		ImageMagick-6*
 PLIST_SUB+=		X11='@comment '
 PKGNAMESUFFIX=		-nox11
 .else
 CONFLICTS+=		ImageMagick-nox11-6*
 CONFLICTS+=		display-[0-9]*
 CONFIGURE_ARGS+=	--with-x
 USE_XORG=		xext xt
 PLIST_SUB+=		X11=''
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 INSTALL_TARGET=	install-strip install-docDATA install-data-html
 .else
 INSTALL_TARGET=	install-strip
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
 . if ${PORT_OPTIONS:MX11}
 USES+=		ghostscript:x11,build
 . else
 USES+=		ghostscript:build
 . endif
 .endif
 
 post-patch:
 # strip library name of variable parts that can change due to
 # the HDRI and Q16 option
 	@${REINPLACE_CMD}  -e 's|_@MAGICK_ABI_SUFFIX@||g; \
 		s|\.@MAGICK_ABI_SUFFIX@||g' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \
 		${WRKSRC}/PerlMagick/Makefile.PL.in \
 		${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \
 		${WRKSRC}/Magick++/lib/Magick++.pc.in \
 		${WRKSRC}/Magick++/lib/ImageMagick++.pc.in \
 		${WRKSRC}/magick/ImageMagick.pc.in \
 		${WRKSRC}/magick/MagickCore.pc.in \
 		${WRKSRC}/wand/Wand.pc.in \
 		${WRKSRC}/wand/MagickWand.pc.in
 
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)
 	@${ECHO_CMD} '###################################################################'
 	@${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}.
 	@${ECHO_CMD} '###################################################################'
 .endif
 
 .if ${PORT_OPTIONS:MSVG} && ! ${PORT_OPTIONS:MX11}
 	@${ECHO_CMD} NOTICE: SVG format support disabled, requires X11
 .endif
 
 post-install:
 .for i in ${SAMPLE_FILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i} \
 		${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i}.sample
 .endfor
 
 post-install-TESTS-on: test
 
 do-test:
 	-cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check
 
 .include <bsd.port.mk>
Index: head/graphics/ImageMagick/distinfo
===================================================================
--- head/graphics/ImageMagick/distinfo	(revision 405758)
+++ head/graphics/ImageMagick/distinfo	(revision 405759)
@@ -1,2 +1,2 @@
-SHA256 (ImageMagick-6.9.2-10.tar.xz) = da2f6fba43d69f20ddb11783f13f77782b0b57783dde9cda39c9e5e733c2013c
-SIZE (ImageMagick-6.9.2-10.tar.xz) = 8755528
+SHA256 (ImageMagick-6.9.3-0.tar.xz) = 2ba0656eb03d72d8a44e741ead524e8c34097418c0bb5487a5c4f4fe5eca9656
+SIZE (ImageMagick-6.9.3-0.tar.xz) = 8767896