update to 6.7.9.10

changes: many fixes and improvements
pkgsrc change: switch to lcms2

7 files changed, 32 insertions, 63 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index d2d00b203ca..c5d1e8ae055 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.186 2012/10/06 14:10:39 asau Exp $
+# $NetBSD: Makefile,v 1.187 2012/10/10 11:48:39 drochner Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	5
 
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	Package for display and interactive manipulation of images
@@ -55,7 +54,6 @@ CONF_FILES+=	${EGDIR}/log.xml ${PKG_SYSCONFDIR}/log.xml
 CONF_FILES+=	${EGDIR}/magic.xml ${PKG_SYSCONFDIR}/magic.xml
 CONF_FILES+=	${EGDIR}/mime.xml ${PKG_SYSCONFDIR}/mime.xml
 CONF_FILES+=	${EGDIR}/policy.xml ${PKG_SYSCONFDIR}/policy.xml
-CONF_FILES+=	${EGDIR}/sRGB.icc ${PKG_SYSCONFDIR}/sRGB.icc
 CONF_FILES+=	${EGDIR}/thresholds.xml ${PKG_SYSCONFDIR}/thresholds.xml
 CONF_FILES+=	${EGDIR}/type-dejavu.xml ${PKG_SYSCONFDIR}/type-dejavu.xml
 CONF_FILES+=	${EGDIR}/type-ghostscript.xml ${PKG_SYSCONFDIR}/type-ghostscript.xml
@@ -79,7 +77,7 @@ SUBST_SED.fix-etc=	-e 's,^configlibdir =.*,configlibdir = $$(DATA_DIR)/examples/
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 7520c2fb176..c433aeb3c55 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.96 2012/07/30 09:21:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.97 2012/10/10 11:48:39 drochner Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
-IM_MAJOR_VER=		6.7.6
-IM_MINOR_VER=		6
+IM_MAJOR_VER=		6.7.9
+IM_MINOR_VER=		10
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 986b777a401..5916a650fa6 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.73 2012/04/20 15:22:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.74 2012/10/10 11:48:39 drochner Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -40,6 +40,7 @@ include/ImageMagick/magick/attribute.h
 include/ImageMagick/magick/blob.h
 include/ImageMagick/magick/cache-view.h
 include/ImageMagick/magick/cache.h
+include/ImageMagick/magick/channel.h
 include/ImageMagick/magick/cipher.h
 include/ImageMagick/magick/client.h
 include/ImageMagick/magick/coder.h
@@ -89,6 +90,7 @@ include/ImageMagick/magick/montage.h
 include/ImageMagick/magick/morphology.h
 include/ImageMagick/magick/option.h
 include/ImageMagick/magick/paint.h
+include/ImageMagick/magick/pixel-accessor.h
 include/ImageMagick/magick/pixel.h
 include/ImageMagick/magick/policy.h
 include/ImageMagick/magick/prepress.h
@@ -1040,6 +1042,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/attribute.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache-view.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/channel.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/cipher.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/color.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/colormap.html
@@ -1064,6 +1067,7 @@ 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
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick++-classes.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-deprecate.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-image.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.html
@@ -1096,6 +1100,7 @@ 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
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/channel.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/cipher.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/color.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/command-line-options.html
@@ -1179,11 +1184,8 @@ share/examples/ImageMagick/magic.xml
 share/examples/ImageMagick/mime.xml
 share/examples/ImageMagick/policy.xml
 share/examples/ImageMagick/quantization-table.xml
-share/examples/ImageMagick/sRGB.icc
 share/examples/ImageMagick/thresholds.xml
 share/examples/ImageMagick/type-dejavu.xml
 share/examples/ImageMagick/type-ghostscript.xml
 share/examples/ImageMagick/type-windows.xml
 share/examples/ImageMagick/type.xml
-@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/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index f71ab972668..fd371690da2 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.42 2012/08/18 08:49:43 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.43 2012/10/10 11:48:39 drochner Exp $
 
 BUILDLINK_TREE+=	ImageMagick
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ImageMagick
 IMAGEMAGICK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ImageMagick+=	ImageMagick>=5.5.7.11nb1
-BUILDLINK_ABI_DEPENDS.ImageMagick+=	ImageMagick>=6.7.6.6nb3
+BUILDLINK_ABI_DEPENDS.ImageMagick+=	ImageMagick>=6.7.9.4
 BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 
 pkgbase := ImageMagick
@@ -35,7 +35,7 @@ pkgbase := ImageMagick
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 0ba125780cc..107d3f09b05 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.114 2012/07/30 09:20:08 wiz Exp $
+$NetBSD: distinfo,v 1.115 2012/10/10 11:48:39 drochner Exp $
 
-SHA1 (ImageMagick-6.7.6-6.tar.bz2) = 7456efb55d2eb37fe7c5a8c131d0247041ce0100
-RMD160 (ImageMagick-6.7.6-6.tar.bz2) = 714fa4a68049df810581fe5e8d791812c6a4b255
-Size (ImageMagick-6.7.6-6.tar.bz2) = 10484245 bytes
-SHA1 (patch-coders_png.c) = 07a1f14fb112d9f0b5b555446f2771c15589e55c
+SHA1 (ImageMagick-6.7.9-10.tar.bz2) = fbde4f8925c57c9ca7c817bdf3e664082ac11e61
+RMD160 (ImageMagick-6.7.9-10.tar.bz2) = afcd65e919826acbfa40ffc3f0af7b35cdc41318
+Size (ImageMagick-6.7.9-10.tar.bz2) = 11140675 bytes
+SHA1 (patch-aa) = 3ab35feaf0ced569a73267643a372235fb8082c4
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
new file mode 100644
index 00000000000..cd24b6ec097
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.48 2012/10/10 11:48:39 drochner Exp $
+
+--- tests/validate-colorspace.tap.orig	2012-08-22 17:08:31.000000000 +0000
++++ tests/validate-colorspace.tap
+@@ -17,7 +17,7 @@
+ . ${srcdir}/tests/common.shi
+ 
+ depth=`eval ${CONVERT} xc:none -format '%[fx:QuantumRange]' info:-`
+-if [ "X$depth" == "X255" ]; then
++if [ "X$depth" = "X255" ]; then
+   echo "1..1"
+   echo "ok"
+   exit 0
diff --git a/graphics/ImageMagick/patches/patch-coders_png.c b/graphics/ImageMagick/patches/patch-coders_png.c
deleted file mode 100644
index 96c6ab4d28d..00000000000
--- a/graphics/ImageMagick/patches/patch-coders_png.c
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-coders_png.c,v 1.1 2012/07/30 09:20:08 wiz Exp $
-
-Tom Lane (tgl@redhat.com) found an issue in ImageMagick. Basically
-CVE-2011-3026 deals with libpng memory allocation, limitations have been
-added so that a bad PNG can't cause the system to allocate a lot of
-memory causing a denial of service. However on further investigation of
-ImageMagick Tom Lane found that PNG malloc function (Magick_png_malloc)
-in turn calls AcquireMagickMemory with an improper size argument:
-
-#ifdef PNG_USER_MEM_SUPPORTED
-static png_voidp Magick_png_malloc(png_structp png_ptr,png_uint_32 size)
-{
-  (void) png_ptr;
-  return((png_voidp) AcquireMagickMemory((size_t) size));
-}
-
-This is incorrect, the size argument should be declared
-png_alloc_size_t according to 1.5, or png_size_t according to 1.2.
-
-"As this function stands, it invisibly does the wrong thing for any
-request over 4GB.  On big-endian architectures it very possibly will
-do the wrong thing even for requests less than that. So the reason why
-the hard-wired 4GB limit prevents a core dump is that it masks the ABI
-mismatch here."
-
-So basically we have memory allocations problems that can probably
-lead to a denial of service.
-
-For more information please see:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=844101
-https://bugzilla.redhat.com/show_bug.cgi?id=844105
-
---- coders/png.c.orig	2012-04-12 01:52:11.000000000 +0000
-+++ coders/png.c
-@@ -1756,7 +1756,7 @@ static void MagickPNGWarningHandler(png_
- }
- 
- #ifdef PNG_USER_MEM_SUPPORTED
--static png_voidp Magick_png_malloc(png_structp png_ptr,png_uint_32 size)
-+static png_voidp Magick_png_malloc(png_structp png_ptr,png_alloc_size_t size)
- {
-   (void) png_ptr;
-   return((png_voidp) AcquireMagickMemory((size_t) size));