Changes 6.4.8-3:

* Reverse argument and option in Throw*InvalidArgumentException()
  macro for proper exception message.
* Recognize negative geometries for -shear and -annotate (.e.g. 45x-30).
* Fix Y shear angle for -shear option.

Changes 6.4.8-2:
* Use GetImageArtifact() to retrieve -attentuate option value for +noise.
* Support reading FITS test files.
* Replace input.ttf with the public domain Tuffy.ttf font.
* MagickNewImage() no longer faults when parameters are incorrect (reference
* Allocate strings returned by XGetResourceInstance().
* The -append gravity is relative to the container.

Changes 6.4.8-1:
* Reference cache rather than acquiring when cloning an image.

Changes 6.4.8-0:
* Cross-compilation failure using MinGW on Linux for ImageMagick trunk
* Add -interword-spacing option to convert.
* Initialize the black channel when testing the CMY colorspace.
* remove calls to exit() in MagickWand.
* Validate -affine arguments.
* Accept -attentuate as an option for convert.
* Properly create RGBA image if colormapped image has transparency.
* Support X11 geometry like this: +-4+-4;  wierd but X11 supports it.

5 files changed, 52 insertions, 23 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index e6d93b96499..f2abfe50b5f 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2008/10/28 10:42:02 adam Exp $
+# $NetBSD: Makefile,v 1.154 2009/01/07 08:58:07 adam Exp $
 
 .include "Makefile.common"
 
@@ -40,16 +40,16 @@ CFLAGS+=		-O
 
 # Some configure_args come from Makefile.common
 CONFIGURE_ARGS+=	--without-perl
-
-# WMF linkage is currently broke, since libMagick would need symbols from libWand
-CONFIGURE_ARGS+=	--without-wmf
 CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 2aaa6a98787..238edab66bf 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.79 2008/11/21 17:13:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.80 2009/01/07 08:58:07 adam Exp $
 
 ###########################################################################
 #
@@ -9,8 +9,8 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.4.6
-IM_MINOR_VER=		0
+IM_MAJOR_VER=		6.4.8
+IM_MINOR_VER=		3
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
@@ -31,13 +31,14 @@ MASTER_SITES=	ftp://ftp.imagemagick.net/pub/ImageMagick/ \
 		http://www.imagemagick.net/download/
 EXTRACT_SUFX=	.tar.bz2
 
-WRKSRC=		${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
+WRKSRC=		${WRKDIR}/ImageMagick-${DISTSUFFIX}
 
 # For things for which we do not specify an explicit dependency above, disable
 # so that we don't cause implicit "hidden" dependencies.
 CONFIGURE_ARGS+=	--without-dps
 CONFIGURE_ARGS+=	--without-fpx
+CONFIGURE_ARGS+=	--without-gvc
 CONFIGURE_ARGS+=	--without-hdf
 CONFIGURE_ARGS+=	--without-jbig
+CONFIGURE_ARGS+=	--without-lqr
 CONFIGURE_ARGS+=	--without-modules
-CONFIGURE_ARGS+=	--without-threads
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index ef188a15678..153b9534a3c 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2008/10/28 10:42:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.60 2009/01/07 08:58:07 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -168,13 +168,14 @@ man/man1/stream.1
 share/ImageMagick-${IM_MAJOR_VER}/ChangeLog
 share/ImageMagick-${IM_MAJOR_VER}/LICENSE
 share/ImageMagick-${IM_MAJOR_VER}/NEWS.txt
-share/ImageMagick-${IM_MAJOR_VER}/config/colors.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/coder.xml
+share/ImageMagick-${IM_MAJOR_VER}/config/colors.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/log.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/magic.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/mime.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/sRGB.icm
 share/ImageMagick-${IM_MAJOR_VER}/config/thresholds.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/affine.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/arc.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/background.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/black.png
@@ -1079,9 +1080,9 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html
 @dirrm share/doc/ImageMagick-${IM_MAJOR_VER}
 @dirrm share/ImageMagick-${IM_MAJOR_VER}/config
 @dirrm share/ImageMagick-${IM_MAJOR_VER}
-@exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_VER}/modules-Q16/filters
+@exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters
 @dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters
-@exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_VER}/modules-Q16/coders
+@exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders
 @dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders
 @dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16
 @dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/config
@@ -1089,3 +1090,4 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html
 @dirrm include/ImageMagick/wand
 @dirrm include/ImageMagick/magick
 @dirrm include/ImageMagick/Magick++
+@dirrm include/ImageMagick
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 3df47938c50..93f85f234bc 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.94 2008/11/21 17:13:43 adam Exp $
+$NetBSD: distinfo,v 1.95 2009/01/07 08:58:07 adam Exp $
 
-SHA1 (ImageMagick-6.4.6-0.tar.bz2) = 954a441c5f5d23b9e2cb92906087a85a0bbb6e59
-RMD160 (ImageMagick-6.4.6-0.tar.bz2) = af3f2ebba041798099fd221995c42f3174862904
-Size (ImageMagick-6.4.6-0.tar.bz2) = 8900267 bytes
+SHA1 (ImageMagick-6.4.8-3.tar.bz2) = f0ed8778e928e2d039a9e7817268a930dc803761
+RMD160 (ImageMagick-6.4.8-3.tar.bz2) = 2ac2842b4b66e70eedaba392f5d43977338792ed
+Size (ImageMagick-6.4.8-3.tar.bz2) = 8880004 bytes
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index b6b4470845b..71260ae1ad4 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,17 +1,43 @@
-# $NetBSD: options.mk,v 1.8 2007/01/10 10:00:47 abs Exp $
+# $NetBSD: options.mk,v 1.9 2009/01/07 08:58:07 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ImageMagick
-PKG_SUPPORTED_OPTIONS=	x11
-PKG_SUGGESTED_OPTIONS=	x11
+PKG_SUPPORTED_OPTIONS=	x11 jasper djvu ghostscript wmf
+PKG_SUGGESTED_OPTIONS=	x11 jasper
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mx11)
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-x
+.endif
+
+.if !empty(PKG_OPTIONS:Mjasper)
 BUILDLINK_API_DEPENDS.jasper+=	jasper>=1.701.0
-DEPENDS+=	mpeg2codec>=1.2:../../graphics/mpeg2codec
 .include "../../graphics/jasper/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-jp2
+.else
+CONFIGURE_ARGS+=	--without-jp2
+.endif
+
+.if !empty(PKG_OPTIONS:Mdjvu)
+.include "../../graphics/djvulibre-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-djvu
+.else
+CONFIGURE_ARGS+=	--without-djvu
+.endif
+
+.if !empty(PKG_OPTIONS:Mghostscript)
+.include "../../print/ghostscript/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gslib
+.else
+CONFIGURE_ARGS+=	--without-gslib
+.endif
+
+.if !empty(PKG_OPTIONS:Mwmf)
 .include "../../graphics/libwmf/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-wmf
 .else
-CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=	--without-wmf
 .endif