Changes 6.2.7.7:

  * Don't fault when processing bad TIFF profiles (4 characters or less).
  * Masks are now read properly for 16-bit DIB's.
  * The pixel cache file descriptor limit code failed because the pixel cache
    timestamp was not always being set properly.
  * Fixed a small memory leak in IsGrayImage().
  * Fixed Cineon writing bug for very long filenames in 6.2.7 (reference
    http://redux.imagemagick.org/discussion-server/viewtopic.php?t=6590)
  * Begin the long journey of enhancing the conjure utility to support
    all options that are supported by the convert utility and PerlMagick
    (e.g. border, guassian-blur, etc.).

5 files changed, 15 insertions, 17 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 337867c39f6..a961401dabd 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.142 2006/05/15 21:32:08 joerg Exp $
+# $NetBSD: Makefile,v 1.143 2006/05/22 11:30:19 adam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	1
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.simplesystems.org/ImageMagick/
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index c6f7c2aec70..fd29740db24 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2006/05/10 12:47:01 tonio Exp $
+# $NetBSD: Makefile.common,v 1.56 2006/05/22 11:30:19 adam Exp $
 
 ###########################################################################
 #
@@ -10,7 +10,7 @@
 ###########################################################################
 
 IM_MAJOR_VER=		6.2.7
-IM_MINOR_VER=		5
+IM_MINOR_VER=		7
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 1966e139816..6493057ca62 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.67 2006/05/10 12:47:01 tonio Exp $
+$NetBSD: distinfo,v 1.68 2006/05/22 11:30:19 adam Exp $
 
-SHA1 (ImageMagick-6.2.7-5.tar.bz2) = 8ea8d8e08a44f1f409b56bd551ce8426bb24c291
-RMD160 (ImageMagick-6.2.7-5.tar.bz2) = f8b155aa637a3f665ade6917387d1d6f06624094
-Size (ImageMagick-6.2.7-5.tar.bz2) = 5186814 bytes
+SHA1 (ImageMagick-6.2.7-7.tar.bz2) = dad946d9456fa5461be7110a196bd75fddc79afb
+RMD160 (ImageMagick-6.2.7-7.tar.bz2) = 0d66936c9620b61d5e53b4304cfb1173ccf50b70
+Size (ImageMagick-6.2.7-7.tar.bz2) = 5233739 bytes
 SHA1 (patch-aa) = 18c0d77512b0fc7247b2b0bb16d080f7c149bcf1
-SHA1 (patch-ab) = 4937b544f4c8f85974890cbc6a62fca689a2e630
+SHA1 (patch-ab) = fbafee0ad2a5a774d77b432960816248341d3b89
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index 5e7352f36c4..3b184bb585e 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2006/04/06 06:22:00 reed Exp $
+# $NetBSD: options.mk,v 1.7 2006/05/22 11:30:19 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ImageMagick
 PKG_SUPPORTED_OPTIONS=	x11
@@ -8,8 +8,7 @@ PKG_SUGGESTED_OPTIONS=	x11
 
 .if !empty(PKG_OPTIONS:Mx11)
 BUILDLINK_API_DEPENDS.jasper+=	jasper>=1.701.0
-DEPENDS+=		mpeg2codec>=1.2:../../graphics/mpeg2codec
-
+DEPENDS+=	mpeg2codec>=1.2:../../graphics/mpeg2codec
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index c45ba4af68a..76a02723989 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.19 2006/05/08 11:39:07 adam Exp $
+$NetBSD: patch-ab,v 1.20 2006/05/22 11:30:20 adam Exp $
 
---- Makefile.in.orig	2006-05-07 17:10:38.000000000 +0200
+--- Makefile.in.orig	2006-05-21 04:25:57.000000000 +0200
 +++ Makefile.in
-@@ -3263,8 +3263,6 @@ WAND_CLEANFILES = \
+@@ -3267,8 +3267,6 @@ WAND_CLEANFILES = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.19 2006/05/08 11:39:07 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3314,7 +3312,6 @@ WAND_CLEANFILES = \
+@@ -3318,7 +3316,6 @@ WAND_CLEANFILES = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/INSTALL \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/NEWS \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/README \
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.19 2006/05/08 11:39:07 adam Exp $
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config.in \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc.in \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/demo/model.miff \
-@@ -4582,7 +4579,6 @@ pkgconfig_DATA = \
+@@ -4586,7 +4583,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \