Changes 6.0.1-3:

* DrawSetStrokeDashArray() now respects the number_elements argument
* Since the WMF coder has Wand dependancies we only enable this coder when
  both WMF is available and module support enabled
* Some XCF tiles were not being read properly
* Fixed memory leak in EPT coder
* Fixed memory leak in DestroyImage()
* Close Windows registry when no longer needed
* RelinquishUniqueFileResource() was not freeing file resource properly
* Free the ImageInfo structure allocated by CloneImageInfo() in the
  WriteImages() method
* EPT images cannot support blobs
* Fixed temporary file resource limit leak in RelinquishUniqueFileResource()
* ConvolveImageChannel() incorrectly initialized non-selected channels to 0
* Added Cisco IP phone image format (write only)

5 files changed, 11 insertions, 38 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index c962b0522f8..b6ebfab1f8c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.117 2004/04/25 05:15:27 minskim Exp $
+# $NetBSD: Makefile,v 1.118 2004/05/19 14:11:28 adam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.simplesystems.org/ImageMagick/
 COMMENT=	Package for display and interactive manipulation of images
 
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 9d9d01f0f14..7238a94fe61 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.9 2004/04/21 13:49:09 adam Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/05/19 14:11:28 adam Exp $
 
-IM_MAJOR_VER=		6.0.0
-IM_MINOR_VER=		2
+IM_MAJOR_VER=		6.0.1
+IM_MINOR_VER=		3
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index b50cd2956d6..ed4ad46c093 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/04/21 13:49:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2004/05/19 14:11:28 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -77,7 +77,7 @@ include/magick/quantize.h
 include/magick/random.h
 include/magick/registry.h
 include/magick/resize.h
-include/magick/resource.h
+include/magick/resource_.h
 include/magick/segment.h
 include/magick/shear.h
 include/magick/signature.h
@@ -161,6 +161,7 @@ share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/colorspace.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/draw.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/pixel_iterator.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/profile.html
+share/ImageMagick-${IM_MAJOR_LIB_VER}/www/archives.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/compare.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/download.html
 share/ImageMagick-${IM_MAJOR_LIB_VER}/www/index.html
diff --git a/graphics/ImageMagick/buildlink2.mk b/graphics/ImageMagick/buildlink2.mk
deleted file mode 100644
index 02beb2f700d..00000000000
--- a/graphics/ImageMagick/buildlink2.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/02 10:31:48 adam Exp $
-
-.if !defined(IMAGEMAGICK_BUILDLINK2_MK)
-IMAGEMAGICK_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			ImageMagick
-BUILDLINK_DEPENDS.ImageMagick?=		ImageMagick>=5.5.7.11nb1
-BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.ImageMagick=ImageMagick
-BUILDLINK_PREFIX.ImageMagick_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ImageMagick=	include/Magick++.h
-BUILDLINK_FILES.ImageMagick+=	include/Magick++/*
-BUILDLINK_FILES.ImageMagick+=	include/magick/*
-BUILDLINK_FILES.ImageMagick+=	lib/libMagick.*
-BUILDLINK_FILES.ImageMagick+=	lib/libMagick++.*
-
-.include "../../archivers/bzip2/buildlink2.mk"
-.include "../../graphics/jasper/buildlink2.mk"
-.include "../../graphics/libexif/buildlink2.mk"
-.include "../../graphics/libwmf/buildlink2.mk"
-.include "../../graphics/tiff/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	ImageMagick-buildlink
-
-ImageMagick-buildlink: _BUILDLINK_USE
-
-.endif	# IMAGEMAGICK_BUILDLINK2_MK
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 8f73bb3d9a1..050f5da8a81 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2004/04/21 13:49:09 adam Exp $
+$NetBSD: distinfo,v 1.20 2004/05/19 14:11:28 adam Exp $
 
-SHA1 (ImageMagick-6.0.0-2.tar.bz2) = 45674bf9dedc09a784314ae6459af272ff53d8f0
-Size (ImageMagick-6.0.0-2.tar.bz2) = 5590894 bytes
+SHA1 (ImageMagick-6.0.1-3.tar.bz2) = 28229404f7a2afcadb46997b7b4d7f1073f7c9d4
+Size (ImageMagick-6.0.1-3.tar.bz2) = 5606799 bytes