update to 6.6.1.5

many new features and fixes - too much to list here

5 files changed, 33 insertions, 11 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 80c748349c8..ec619f7ba98 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.163 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.164 2010/05/04 11:14:23 drochner Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=		1
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.imagemagick.org/
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 0d72e6635b5..5f1dd23a937 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.86 2010/04/17 17:09:01 zafer Exp $
+# $NetBSD: Makefile.common,v 1.87 2010/05/04 11:14:23 drochner Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
-IM_MAJOR_VER=		6.5.7
-IM_MINOR_VER=		9
+IM_MAJOR_VER=		6.6.1
+IM_MINOR_VER=		5
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index ac9ae53c548..20872fafdda 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.65 2009/10/28 11:07:59 adam Exp $
+@comment $NetBSD: PLIST,v 1.66 2010/05/04 11:14:23 drochner Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -31,6 +31,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
@@ -59,6 +60,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
@@ -82,6 +84,7 @@ include/ImageMagick/magick/mime.h
 include/ImageMagick/magick/module.h
 include/ImageMagick/magick/monitor.h
 include/ImageMagick/magick/montage.h
+include/ImageMagick/magick/morphology.h
 include/ImageMagick/magick/option.h
 include/ImageMagick/magick/paint.h
 include/ImageMagick/magick/pixel.h
@@ -141,6 +144,7 @@ lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/english.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/francais.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/locale.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/policy.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-dejavu.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-ghostscript.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-windows.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type.xml
@@ -215,6 +219,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose-over.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose-sigmoidal.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose.pnm
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/script.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/smile.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/sponsor.jpg
@@ -998,9 +1003,10 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/drawing-wand.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/exception.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/feature.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html
-share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/histogram.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/layer.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/list.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-deprecate.html
@@ -1012,6 +1018,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/module.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/morphology.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-iterator.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/pixel-view.html
@@ -1025,6 +1032,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/resource.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/segment.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/shear.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/signature.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/statistic.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/stream.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/transform.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/version.html
@@ -1046,6 +1054,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/download.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/escape.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/examples.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/exception.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/favicon.ico
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/formats.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/fx.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/high-dynamic-range.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 4526e3d5e42..a9ebdee8cbf 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.101 2010/01/15 19:28:41 drochner Exp $
+$NetBSD: distinfo,v 1.102 2010/05/04 11:14:23 drochner Exp $
 
-SHA1 (ImageMagick-6.5.7-9.tar.bz2) = 061eeb17a55150b324ae88706dcc06aa7d51a0ee
-RMD160 (ImageMagick-6.5.7-9.tar.bz2) = 295467edeab5ccdcfed304e4cacc2d924921d385
-Size (ImageMagick-6.5.7-9.tar.bz2) = 8716394 bytes
+SHA1 (ImageMagick-6.6.1-5.tar.bz2) = cd12d1a62efef9cce94b4df332d8e3d8cc40d5d7
+RMD160 (ImageMagick-6.6.1-5.tar.bz2) = 1a01a060a56dc490305ac6c72b8146616d0625ca
+Size (ImageMagick-6.6.1-5.tar.bz2) = 8771244 bytes
+SHA1 (patch-aa) = 49e5b85118460d684fcae48adc7a8118a16b30bb
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
new file mode 100644
index 00000000000..d35c2e4524c
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.46 2010/05/04 11:14:23 drochner Exp $
+
+--- configure.orig	2010-04-13 19:20:13.000000000 +0000
++++ configure
+@@ -27537,7 +27537,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+ if test "$with_lcms" != 'no'; then
+-if test "$have_lcms" == 'no'; then
++if test "$have_lcms" = 'no'; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+ $as_echo "-------------------------------------------------------------" >&6; }
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5