3 files changed, 30 insertions, 18 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 98967127b311..79c91b574d4d 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	6.1.9.4
+PORTVERSION=	6.2.0.5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.nluug.nl/pub/ImageMagick/ \
+		http://people.fruitsalad.org/avleeuwen/distfiles/imagemagick/ \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
@@ -146,8 +147,17 @@ CONFIGURE_ARGS+=	--without-ttf
 .endif
 
 # WMF (Windows Meta File) images
-.if !defined(WITHOUT_IMAGEMAGICK_WMF)
+.if defined(WITH_IMAGEMAGICK_WMF)
+.if !defined(WITH_IMAGEMAGICK_MODULES)
+IGNORE=			WMF support requires WITH_IMAGEMAGICK_MODULES
+.else
+.if defined(WITHOUT_X11)
+IGNORE=			WMF support requires X11 libraries, please unset WITHOUT_X11
+.else
 LIB_DEPENDS+=		wmf.2:${PORTSDIR}/graphics/libwmf
+CONFIGURE_ARGS+=	--with-wmf=yes
+.endif
+.endif
 .else
 CONFIGURE_ARGS+=	--without-wmf
 .endif
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index c634ae4cc116..86dd90ad5d0f 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,2 +1,2 @@
-MD5 (ImageMagick-6.1.9-4.tar.bz2) = 9b2da5cfc898b6ab6015eaa96703b39c
-SIZE (ImageMagick-6.1.9-4.tar.bz2) = 4617422
+MD5 (ImageMagick-6.2.0-5.tar.bz2) = 3c6be31c122ead8c747d1eeb6f12b5f1
+SIZE (ImageMagick-6.2.0-5.tar.bz2) = 4642284
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 4c606cde13fa..53a688a9d533 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -32,7 +32,7 @@ include/magick/api.h
 include/magick/attribute.h
 include/magick/blob.h
 include/magick/cache.h
-include/magick/cache_view.h
+include/magick/cache-view.h
 include/magick/client.h
 include/magick/coder.h
 include/magick/color.h
@@ -64,7 +64,7 @@ include/magick/locale_.h
 include/magick/log.h
 include/magick/magic.h
 include/magick/magick.h
-include/magick/magick_config.h
+include/magick/magick-config.h
 include/magick/memory_.h
 include/magick/methods.h
 include/magick/module.h
@@ -76,7 +76,7 @@ include/magick/paint.h
 include/magick/pixel.h
 include/magick/profile.h
 include/magick/quantize.h
-include/magick/random.h
+include/magick/random_.h
 include/magick/registry.h
 include/magick/resize.h
 include/magick/resource_.h
@@ -84,6 +84,7 @@ include/magick/segment.h
 include/magick/semaphore.h
 include/magick/shear.h
 include/magick/signature.h
+include/magick/splay-tree.h
 include/magick/stream.h
 include/magick/string_.h
 include/magick/timer.h
@@ -94,10 +95,11 @@ include/magick/utility.h
 include/magick/version.h
 include/magick/widget.h
 include/magick/xwindow.h
-include/wand/drawing_wand.h
+include/wand/drawing-wand.h
 include/wand/magick_wand.h
-include/wand/pixel_iterator.h
-include/wand/pixel_wand.h
+include/wand/magick-wand.h
+include/wand/pixel-iterator.h
+include/wand/pixel-wand.h
 lib/ImageMagick/config/colors.xml
 lib/ImageMagick/config/configure.xml
 lib/ImageMagick/config/delegates.xml
@@ -305,13 +307,13 @@ lib/ImageMagick/modules-%%QBIT%%/filters/.keep
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/filters/analyze.so
 lib/libMagick++.a
 lib/libMagick++.so
-lib/libMagick++.so.7
+lib/libMagick++.so.8
 lib/libMagick.a
 lib/libMagick.so
-lib/libMagick.so.7
+lib/libMagick.so.8
 lib/libWand.a
 lib/libWand.so
-lib/libWand.so.7
+lib/libWand.so.8
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/ImageMagick.pc
 libdata/pkgconfig/Wand.pc
@@ -408,17 +410,17 @@ share/ImageMagick-%%PORTVERSION%%/NEWS
 %%PORTDOCS%%share/doc/ImageMagick/www/api/attribute.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/blob.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/cache.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/cache_view.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/cache-view.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/color.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/colorspace.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/compare.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/composite.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/constitute.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/draw.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/drawing-wand.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/decorate.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/deprecate.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/display.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/drawing_wand.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/effect.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/enhance.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/exception.html
@@ -426,13 +428,13 @@ share/ImageMagick-%%PORTVERSION%%/NEWS
 %%PORTDOCS%%share/doc/ImageMagick/www/api/image.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/list.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/magick.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/magick_wand.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/magick-wand.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/memory.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/monitor.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/montage.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/paint.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel_iterator.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel_wand.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel-iterator.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel-wand.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/profile.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/quantize.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html