3 files changed, 16 insertions, 18 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 696bc1113c7b..854c1b58d040 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.3.7
-PORTREVISION=	1
+PORTVERSION=	5.3.8.2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
@@ -43,6 +42,8 @@ LIB_DEPENDS=	fpx.1:${PORTSDIR}/graphics/libfpx \
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 USE_AUTOCONF=	yes
@@ -92,7 +93,7 @@ PLIST_SUB+=	MODULES='@comment '
 PKGNAMESUFFIX=	-nox11
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
 RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu-nox11
-CONFIGURE_ARGS+=	--without-x --without-wmf
+CONFIGURE_ARGS+=	--without-x
 PLIST_SUB+=	X11='@comment '
 .else
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript-gnu
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index e73160001c14..d4ddcab3e571 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.3.7.tar.gz) = 258258d62dc40dac6a2c175030ff1d0c
+MD5 (ImageMagick-5.3.8.2.tar.gz) = 9423b8c7d47073bba37be27b7246f4ec
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index cacd835e13d6..4277a20d4c2f 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -23,24 +23,24 @@ include/Magick++/Options.h
 include/Magick++/Pixels.h
 include/Magick++/STL.h
 include/Magick++/Thread.h
+include/Magick++/TypeMetric.h
 include/magick/PreRvIcccm.h
 include/magick/api.h
-include/magick/attributes.h
+include/magick/attribute.h
 include/magick/blob.h
 include/magick/cache.h
 include/magick/cache_view.h
 include/magick/classify.h
-include/magick/colors.h
 include/magick/compress.h
 include/magick/config.h
-include/magick/delegates.h
+include/magick/delegate.h
 include/magick/draw.h
 include/magick/error.h
-include/magick/gems.h
+include/magick/gem.h
 include/magick/image.h
 include/magick/magic.h
 include/magick/magick.h
-include/magick/modules.h
+include/magick/module.h
 include/magick/monitor.h
 include/magick/quantize.h
 include/magick/semaphore.h
@@ -48,9 +48,8 @@ include/magick/timer.h
 include/magick/utility.h
 include/magick/version.h
 include/magick/widget.h
-include/magick/xwindows.h
+include/magick/xwindow.h
 lib/ImageMagick/delegates.mgk
-lib/ImageMagick/fonts.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/8bim.la
 %%MODULES%%lib/ImageMagick/modules/coders/8bim.so
 %%MODULES%%lib/ImageMagick/modules/coders/art.la
@@ -216,6 +215,7 @@ lib/ImageMagick/fonts.mgk
 %%MODULES%%lib/ImageMagick/modules/coders/xwd.so
 %%MODULES%%lib/ImageMagick/modules/coders/yuv.la
 %%MODULES%%lib/ImageMagick/modules/coders/yuv.so
+lib/ImageMagick/type.mgk
 lib/libMagick++.a
 %%MODULES%%lib/libMagick++.la
 lib/libMagick++.so
@@ -275,6 +275,7 @@ share/ImageMagick/www/Magick++/PixelPacket.html
 share/ImageMagick/www/Magick++/Pixels.html
 share/ImageMagick/www/Magick++/README.txt
 share/ImageMagick/www/Magick++/STL.html
+share/ImageMagick/www/Magick++/TypeMetric.html
 share/ImageMagick/www/Magick++/index.html
 share/ImageMagick/www/Magick++/montage-sample-framed.jpg
 share/ImageMagick/www/Magick++/right_triangle.png
@@ -288,21 +289,19 @@ share/ImageMagick/www/Magick.html
 share/ImageMagick/www/animate.html
 share/ImageMagick/www/api/animate.html
 share/ImageMagick/www/api/annotate.html
-share/ImageMagick/www/api/attributes.html
+share/ImageMagick/www/api/attribute.html
 share/ImageMagick/www/api/blob.html
 share/ImageMagick/www/api/cache.html
 share/ImageMagick/www/api/cache_view.html
-share/ImageMagick/www/api/colors.html
+share/ImageMagick/www/api/color.html
 share/ImageMagick/www/api/compress.html
 share/ImageMagick/www/api/constitute.html
 share/ImageMagick/www/api/decorate.html
-share/ImageMagick/www/api/delegates.html
 share/ImageMagick/www/api/display.html
 share/ImageMagick/www/api/draw.html
-share/ImageMagick/www/api/effects.html
+share/ImageMagick/www/api/effect.html
 share/ImageMagick/www/api/enhance.html
 share/ImageMagick/www/api/error.html
-share/ImageMagick/www/api/gems.html
 share/ImageMagick/www/api/image.html
 share/ImageMagick/www/api/mac.html
 share/ImageMagick/www/api/magick.html
@@ -311,7 +310,6 @@ share/ImageMagick/www/api/monitor.html
 share/ImageMagick/www/api/montage.html
 share/ImageMagick/www/api/nt.html
 share/ImageMagick/www/api/pixel_cache.html
-share/ImageMagick/www/api/pixels.html
 share/ImageMagick/www/api/quantize.html
 share/ImageMagick/www/api/segment.html
 share/ImageMagick/www/api/shear.html
@@ -335,7 +333,6 @@ share/ImageMagick/www/api/types/RectangleInfo.html
 share/ImageMagick/www/api/utility.html
 share/ImageMagick/www/api/vms.html
 share/ImageMagick/www/api/widget.html
-share/ImageMagick/www/api/xwindows.html
 share/ImageMagick/www/api/zoom.html
 share/ImageMagick/www/api.html
 share/ImageMagick/www/archives.html