Changes 6.1.7:

* ReadPALMImage() now produces a proper RGB image
* Added the -shadow option to simulate an image shadow
* Fix file leak in ImageToBlob() method

5 files changed, 14 insertions, 14 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 2099e21d714..291e3e017f6 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2004/12/28 23:18:20 reed Exp $
+# $NetBSD: Makefile,v 1.125 2005/01/05 09:25:18 adam Exp $
 
 .include "Makefile.common"
 
@@ -6,7 +6,6 @@ PKGNAME=	ImageMagick-${DISTVERSION}
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.simplesystems.org/ImageMagick/
-PKGREVISION=	1
 COMMENT=	Package for display and interactive manipulation of images
 
 CONFLICTS=	geomview<1.8.1nb2  # used to have a program named 'animate'
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 1576b4b70fc..6a6dc2ca5ce 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.24 2004/12/05 09:42:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/01/05 09:25:18 adam Exp $
 
-IM_MAJOR_VER=		6.1.6
-IM_MINOR_VER=		0
+IM_MAJOR_VER=		6.1.7
+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 8ec811b8112..00b78cc6c7b 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2004/11/29 09:05:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2005/01/05 09:25:18 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -27,6 +27,7 @@ include/Magick++/STL.h
 include/Magick++/TypeMetric.h
 include/magick/ImageMagick.h
 include/magick/PreRvIcccm.h
+include/magick/animate.h
 include/magick/annotate.h
 include/magick/api.h
 include/magick/attribute.h
@@ -47,6 +48,7 @@ include/magick/convert.h
 include/magick/decorate.h
 include/magick/delegate.h
 include/magick/deprecate.h
+include/magick/display.h
 include/magick/draw.h
 include/magick/effect.h
 include/magick/enhance.h
@@ -91,7 +93,6 @@ include/magick/type.h
 include/magick/utility.h
 include/magick/version.h
 include/magick/widget.h
-include/magick/xwindow.h
 include/wand/drawing_wand.h
 include/wand/magick_wand.h
 include/wand/pixel_iterator.h
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 57171005460..3298372dfd5 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.34 2004/12/05 09:42:11 adam Exp $
+$NetBSD: distinfo,v 1.35 2005/01/05 09:25:18 adam Exp $
 
-SHA1 (ImageMagick-6.1.6-0.tar.bz2) = 14b19fd3c752699a205997c647395c7c6bfe43b3
-Size (ImageMagick-6.1.6-0.tar.bz2) = 4558525 bytes
-SHA1 (patch-aa) = 207bea9bece866ea773ebaddc7cd35d3c857b59f
+SHA1 (ImageMagick-6.1.7-5.tar.bz2) = d7545655b9a78ae4a4780f106990cc6c892d2cf4
+Size (ImageMagick-6.1.7-5.tar.bz2) = 4562769 bytes
+SHA1 (patch-aa) = 8fc26a7c88c58c5324d9935b768b53932fa4c9f0
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 28ac69917fa..5c1714ddc92 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.26 2004/12/05 09:42:11 adam Exp $
+$NetBSD: patch-aa,v 1.27 2005/01/05 09:25:18 adam Exp $
 
---- configure.orig	2004-12-03 23:31:05.000000000 +0000
+--- configure.orig	2004-12-27 21:45:13.000000000 +0000
 +++ configure
-@@ -25576,9 +25576,6 @@ fi
+@@ -25563,9 +25563,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'