4 files changed, 23 insertions, 27 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 4920d6e2eec5..d9ca812cc72e 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.5.8-10
-PORTREVISION=	2
+DISTVERSION=	6.6.0-10
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://ftp.nluug.nl/pub/ImageMagick/ \
@@ -50,7 +49,6 @@ OPTIONS=	X11				"X11 support" on \
 		IMAGEMAGICK_16BIT_PIXEL		"16bit pixel support" on \
 		IMAGEMAGICK_DJVU	"DJVU format support (needs threads)" off \
 		IMAGEMAGICK_LCMS		"LCMS support" on \
-		IMAGEMAGICK_HDRI		"High Dynamic Range Images (HDRI)" off \
 		IMAGEMAGICK_TTF			"Freetype support" on \
 		IMAGEMAGICK_FONTCONFIG		"Fontconfig support" on \
 		IMAGEMAGICK_JPEG		"JPG format support" on \
@@ -73,12 +71,12 @@ OPTIONS=	X11				"X11 support" on \
 IGNORE=		support for the PDF format requires ghostscript 8 and higher
 .endif
 
-.if defined(WITH_IMAGEMAGICK_HDRI)
-BROKEN=			hdri support broken, disable in options
-CONFIGURE_ARGS+=	--enable-hdri
-.else
+#.if defined(WITH_IMAGEMAGICK_HDRI)
+#BROKEN=			hdri support broken, disable in options
+#CONFIGURE_ARGS+=	--enable-hdri
+#.else
 CONFIGURE_ARGS+=	--disable-hdri
-.endif
+#.endif
 
 .if defined(WITH_IMAGEMAGICK_OPENMP)
 CONFIGURE_ARGS+=	--enable-openmp
@@ -322,7 +320,7 @@ WITHOUT_IMAGEMAGICK_TESTS=yes
 
 post-patch:
 # prevent perllocal.pod from being written
-	@${REINPLACE_CMD} -e '/PERL/s|install && \\$$|pure_install \&\& \\|' ${WRKSRC}/Makefile.in	
+	@${REINPLACE_CMD} -e '/PERL/s|install && \\$$|pure_install \&\& \\|' ${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
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 156d88a9fc42..716e4bb260f8 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.5.8-10.tar.bz2) = fc04d56c32bb2eebba7885d0db042f9a
-SHA256 (ImageMagick-6.5.8-10.tar.bz2) = ad47980454adbc41d3b3dcc1c968e90f08c08a86b5006da8b0a357248f3ed74c
-SIZE (ImageMagick-6.5.8-10.tar.bz2) = 8713910
+MD5 (ImageMagick-6.6.0-10.tar.bz2) = d47c72d5ddbf930f1559ae115b398b19
+SHA256 (ImageMagick-6.6.0-10.tar.bz2) = 91be351d7d6ad1c05afa831d2e00f5a49a487538b09ebf1382472ef4323ecf9f
+SIZE (ImageMagick-6.6.0-10.tar.bz2) = 8779837
diff --git a/graphics/ImageMagick/files/patch-tests-validate.h b/graphics/ImageMagick/files/patch-tests-validate.h
deleted file mode 100644
index 4000131cd73c..000000000000
--- a/graphics/ImageMagick/files/patch-tests-validate.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- tests/validate.h.orig	2009-10-09 19:57:50.000000000 +0200
-+++ tests/validate.h	2009-12-02 17:35:09.784675288 +0100
-@@ -282,7 +282,6 @@
-     { "MIFF", UndefinedCompression, 0.0 },
-     { "MNG", UndefinedCompression, 0.0 },
-     { "MONO", UndefinedCompression, 0.0 },
--    { "MOV", UndefinedCompression, 0.0 },
-     { "MRW", UndefinedCompression, 0.0 },
-     { "MTV", UndefinedCompression, 0.0 },
-     { "NEF", UndefinedCompression, 0.0 },
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 65a4f73a29fe..07e5422b2c39 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -30,6 +30,7 @@ include/ImageMagick/Magick++/TypeMetric.h
 include/ImageMagick/magick/ImageMagick.h
 include/ImageMagick/magick/MagickCore.h
 include/ImageMagick/magick/PreRvIcccm.h
+include/ImageMagick/magick/accelerate.h
 include/ImageMagick/magick/animate.h
 include/ImageMagick/magick/annotate.h
 include/ImageMagick/magick/api.h
@@ -58,6 +59,7 @@ include/ImageMagick/magick/draw.h
 include/ImageMagick/magick/effect.h
 include/ImageMagick/magick/enhance.h
 include/ImageMagick/magick/exception.h
+include/ImageMagick/magick/feature.h
 include/ImageMagick/magick/fourier.h
 include/ImageMagick/magick/fx.h
 include/ImageMagick/magick/gem.h
@@ -142,6 +144,7 @@ lib/ImageMagick-%%PORTVERSION%%/config/francais.xml
 lib/ImageMagick-%%PORTVERSION%%/config/locale.xml
 lib/ImageMagick-%%PORTVERSION%%/config/policy.xml
 lib/ImageMagick-%%PORTVERSION%%/config/type.xml
+lib/ImageMagick-%%PORTVERSION%%/config/type-dejavu.xml
 lib/ImageMagick-%%PORTVERSION%%/config/type-ghostscript.xml
 lib/ImageMagick-%%PORTVERSION%%/config/type-windows.xml
 lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep
@@ -261,6 +264,8 @@ lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pdb.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pdf.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pdf.so
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pes.la
+%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pes.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pict.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pict.so
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/pix.la
@@ -362,20 +367,18 @@ lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/coders/.keep
 lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/.keep
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.la
 %%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/analyze.so
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/convolve.la
-%%MODULES%%lib/ImageMagick-%%PORTVERSION%%/modules-%%QBIT%%/filters/convolve.so
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
-lib/libMagick++.so.2
+lib/libMagick++.so.3
 lib/libMagickCore.a
 lib/libMagickCore.la
 lib/libMagickCore.so
-lib/libMagickCore.so.2
+lib/libMagickCore.so.3
 lib/libMagickWand.a
 lib/libMagickWand.la
 lib/libMagickWand.so
-lib/libMagickWand.so.2
+lib/libMagickWand.so.3
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/Magick++.pc
 libdata/pkgconfig/ImageMagick.pc
@@ -432,6 +435,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/images/rose-sigmoidal.png
 %%PORTDOCS%%%%DOCSDIR%%/images/rose.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/rose.png
+%%PORTDOCS%%%%DOCSDIR%%/images/rose.pnm
 %%PORTDOCS%%%%DOCSDIR%%/images/script.png
 %%PORTDOCS%%%%DOCSDIR%%/images/smile.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/sponsor.jpg
@@ -1215,6 +1219,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/effect.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/enhance.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/exception.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/feature.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/fx.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/histogram.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/image.html
@@ -1229,6 +1234,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/module.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/monitor.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/montage.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/morphology.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/paint.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/pixel-iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/pixel-view.html
@@ -1242,6 +1248,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/segment.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/shear.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/signature.html
+%%PORTDOCS%%%%DOCSDIR%%/www/api/statistic.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/stream.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/version.html
@@ -1263,6 +1270,7 @@ libdata/pkgconfig/Wand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/escape.html
 %%PORTDOCS%%%%DOCSDIR%%/www/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/www/exception.html
+%%PORTDOCS%%%%DOCSDIR%%/www/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/www/formats.html
 %%PORTDOCS%%%%DOCSDIR%%/www/fx.html
 %%PORTDOCS%%%%DOCSDIR%%/www/high-dynamic-range.html