update to 6.6.4.1

many improvements and fixes - see the changelog

6 files changed, 15 insertions, 58 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index bbc51f4f249..40e420889c4 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.165 2010/06/13 22:44:26 wiz Exp $
+# $NetBSD: Makefile,v 1.166 2010/09/16 21:03:48 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 5f1dd23a937..9d310461ab2 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.87 2010/05/04 11:14:23 drochner Exp $
+# $NetBSD: Makefile.common,v 1.88 2010/09/16 21:03:48 drochner Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
-IM_MAJOR_VER=		6.6.1
-IM_MINOR_VER=		5
+IM_MAJOR_VER=		6.6.4
+IM_MINOR_VER=		1
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 20872fafdda..7a7c606a208 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.66 2010/05/04 11:14:23 drochner Exp $
+@comment $NetBSD: PLIST,v 1.67 2010/09/16 21:03:49 drochner Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -68,6 +68,7 @@ include/ImageMagick/magick/geometry.h
 include/ImageMagick/magick/hashmap.h
 include/ImageMagick/magick/histogram.h
 include/ImageMagick/magick/identify.h
+include/ImageMagick/magick/image-view.h
 include/ImageMagick/magick/image.h
 include/ImageMagick/magick/layer.h
 include/ImageMagick/magick/list.h
@@ -135,9 +136,9 @@ include/ImageMagick/wand/magick_wand.h
 include/ImageMagick/wand/mogrify.h
 include/ImageMagick/wand/montage.h
 include/ImageMagick/wand/pixel-iterator.h
-include/ImageMagick/wand/pixel-view.h
 include/ImageMagick/wand/pixel-wand.h
 include/ImageMagick/wand/stream.h
+include/ImageMagick/wand/wand-view.h
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/english.xml
@@ -1006,6 +1007,7 @@ 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/histogram.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image-view.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
@@ -1036,6 +1038,7 @@ 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
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/wand-view.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/architecture.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/binary-releases.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/changelog.html
@@ -1045,6 +1048,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-options.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-processing.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-tools.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/compare.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/compose.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/composite.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/conjure.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/contact.html
@@ -1085,5 +1089,6 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/wand.png
 @pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters
 @pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 5f642881166..5eb49a343a1 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.103 2010/08/08 21:07:23 wiz Exp $
+$NetBSD: distinfo,v 1.104 2010/09/16 21:03:49 drochner Exp $
 
-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
-SHA1 (patch-ab) = 6c6cb3c2e91141cbe0cbabdcda86d56d5f80f0ae
+SHA1 (ImageMagick-6.6.4-1.tar.bz2) = 8337317b1fd941bfd8bc1d7b4c0534951e445d8e
+RMD160 (ImageMagick-6.6.4-1.tar.bz2) = cbb7549328057cd0349487e84267ac9758d98c4f
+Size (ImageMagick-6.6.4-1.tar.bz2) = 8669192 bytes
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
deleted file mode 100644
index d35c2e4524c..00000000000
--- a/graphics/ImageMagick/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
deleted file mode 100644
index 1ee23a73b2e..00000000000
--- a/graphics/ImageMagick/patches/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ab,v 1.29 2010/08/08 21:07:24 wiz Exp $
-
-Fix whitespace issues -- gmake-3.82 expects tabs.
-
---- Makefile.in.orig	2010-04-23 18:29:22.000000000 +0000
-+++ Makefile.in
-@@ -11119,21 +11119,21 @@ check-local: $(PERLMAGICK_CHECK_LOCAL_TA
- 
- # drd: valgrind's newer thread error detector
- drd:
--  $(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
-+	$(MAKE) MEMCHECK='valgrind --tool=drd --check-stack-var=yes --var-info=yes \
-     --quiet $(VALGRIND_EXTRA_OPTS)' check
- 
- # helgrind: valgrind's older thread error detector
- helgrind:
--  $(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check
-+	$(MAKE) MEMCHECK='valgrind --tool=helgrind --quiet $(VALGRIND_EXTRA_OPTS)' check
- 
- # memcheck: valgrind's memory access checker
- memcheck:
--  $(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \
-+	$(MAKE) MEMCHECK='valgrind --tool=memcheck --leak-check=full --read-var-info=yes \
-     --track-origins=yes --num-callers=12 --quiet $(VALGRIND_EXTRA_OPTS)' check
- 
- # ptrcheck: valgrind's experimental pointer checking tool.
- ptrcheck:
--  $(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
-+	$(MAKE) MEMCHECK='valgrind --tool=exp-ptrcheck --quiet $(VALGRIND_EXTRA_OPTS)' check
- dist-hook:
- 	( \
- 	  builddir=`pwd` ; \