3 files changed, 16 insertions, 11 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index bb4d1d7b6f50..e0a7ddf5203e 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.4.7.4
-PORTREVISION=	2
+PORTVERSION=	5.4.8.3
 CATEGORIES=	graphics perl5
-MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://imagemagick.sourceforge.net/http/ \
 		ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/multimedia/graphics/%SUBDIR%/ \
@@ -26,21 +26,21 @@ MASTER_SITES=	http://imagemagick.sourceforge.net/http/ \
 		ftp://giswitch.sggw.waw.pl/pub/graphics/%SUBDIR%/ \
 		ftp://ftp.fifi.org/pub/%SUBDIR%/ \
 		ftp://ftp.simplesystems.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITE_SUBDIR=	${PORTNAME:L} ${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
-LIB_DEPENDS=	fpx.1:${PORTSDIR}/graphics/libfpx \
-		jasper.4:${PORTSDIR}/graphics/jasper \
+LIB_DEPENDS=	jasper.4:${PORTSDIR}/graphics/jasper \
 		jbig.1:${PORTSDIR}/graphics/jbigkit \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
+		fpx.1:${PORTSDIR}/graphics/libfpx \
+		wmf.2:${PORTSDIR}/graphics/libwmf \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.9:${PORTSDIR}/print/freetype2 \
-		wmf.2:${PORTSDIR}/graphics/libwmf \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
@@ -49,9 +49,9 @@ LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_REINPLACE=	yes
 LIBTOOLFLAGS=	# none
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+=	--without-threads
 
 # Faster, but poor quality
 .if defined(WITHOUT_IMAGEMAGICK_16BIT_PIXEL)
-CONFIGURE_ARGS+=	--disable-16bit-pixel
+CONFIGURE_ARGS+=	--with-quantum-depth=8
 .endif
 
 # Produce standard (small) GIFs
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index a6242459a6a3..a910ded597d5 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1 +1 @@
-MD5 (ImageMagick-5.4.7-4.tar.gz) = 7440256c33fca7f095da90d4e14b15f7
+MD5 (ImageMagick-5.4.8-3.tar.gz) = fc2770393d04b65504d8b9b1b8637007
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 4aaed7c2ee16..fe514f8f8f36 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -32,6 +32,7 @@ include/magick/blob.h
 include/magick/cache.h
 include/magick/cache_view.h
 include/magick/classify.h
+include/magick/command.h
 include/magick/compress.h
 include/magick/delegate.h
 include/magick/draw.h
@@ -269,6 +270,7 @@ share/ImageMagick/magic.mgk
 %%PORTDOCS%%share/doc/ImageMagick/images/right_triangle_option.png
 %%PORTDOCS%%share/doc/ImageMagick/images/screen.png
 %%PORTDOCS%%share/doc/ImageMagick/www/Changelog.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Copyright.html
 %%PORTDOCS%%share/doc/ImageMagick/www/ImageMagick.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Blob.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Cache.fig
@@ -317,6 +319,7 @@ share/ImageMagick/magic.mgk
 %%PORTDOCS%%share/doc/ImageMagick/www/api/cache.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/cache_view.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/color.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/composite.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/constitute.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/decorate.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/display.html
@@ -324,6 +327,7 @@ share/ImageMagick/magic.mgk
 %%PORTDOCS%%share/doc/ImageMagick/www/api/effect.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/enhance.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/error.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/fx.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/image.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/list.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/magick.html
@@ -333,6 +337,7 @@ share/ImageMagick/magic.mgk
 %%PORTDOCS%%share/doc/ImageMagick/www/api/quantize.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/render.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/resize.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/segment.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/shear.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/signature.html
@@ -352,7 +357,6 @@ share/ImageMagick/magic.mgk
 %%PORTDOCS%%share/doc/ImageMagick/www/api/types/QuantizeInfo.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/types/RectangleInfo.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/widget.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/zoom.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api.html
 %%PORTDOCS%%share/doc/ImageMagick/www/archives.html
 %%PORTDOCS%%share/doc/ImageMagick/www/cd.html
@@ -378,6 +382,7 @@ share/ImageMagick/magic.mgk
 %%PORTDOCS%%share/doc/ImageMagick/www/smile.c
 %%PORTDOCS%%share/doc/ImageMagick/www/sponsor.html
 %%PORTDOCS%%share/doc/ImageMagick/www/tools.html
+%%PORTDOCS%%share/doc/ImageMagick/www/windows.html
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/www/api/types
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/www/api
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/www/Magick++