Changes 6.2.3.3:

* Bug fixes

5 files changed, 18 insertions, 14 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index bb3232dc30d..7c15f9e7ae8 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.127 2005/05/22 20:08:04 jlam Exp $
+# $NetBSD: Makefile,v 1.128 2005/07/14 08:58:46 adam Exp $
 
 .include "Makefile.common"
 
@@ -12,10 +12,10 @@ CONFLICTS=	geomview<1.8.1nb2  # used to have a program named 'animate'
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
 USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
+GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	Magick++/lib/ImageMagick++.pc.in
 PKGCONFIG_OVERRIDE+=	magick/ImageMagick.pc.in
 
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 029aa0acfa9..98e72a71d5a 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.40 2005/05/25 10:32:33 adam Exp $
+# $NetBSD: Makefile.common,v 1.41 2005/07/14 08:58:46 adam Exp $
 
 IM_MAJOR_VER=		6.2.3
-IM_MINOR_VER=		0
+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 8d83bb38ae7..8aee0642696 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2005/05/25 10:32:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.38 2005/07/14 08:58:46 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -65,6 +65,7 @@ include/magick/locale_.h
 include/magick/log.h
 include/magick/magic.h
 include/magick/magick-config.h
+include/magick/magick-type.h
 include/magick/magick.h
 include/magick/memory_.h
 include/magick/methods.h
@@ -75,6 +76,7 @@ include/magick/montage.h
 include/magick/option.h
 include/magick/paint.h
 include/magick/pixel.h
+include/magick/prepress.h
 include/magick/profile.h
 include/magick/quantize.h
 include/magick/random_.h
@@ -98,6 +100,8 @@ include/magick/version.h
 include/magick/widget.h
 include/magick/xwindow.h
 include/wand/drawing-wand.h
+include/wand/magick-attribute.h
+include/wand/magick-image.h
 include/wand/magick-wand.h
 include/wand/magick_wand.h
 include/wand/pixel-iterator.h
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 727118743d6..663a82cc40d 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.49 2005/05/25 10:32:33 adam Exp $
+$NetBSD: distinfo,v 1.50 2005/07/14 08:58:46 adam Exp $
 
-SHA1 (ImageMagick-6.2.3-0.tar.bz2) = 8601a4bd3a486270d4d26832a14813ce75a129be
-RMD160 (ImageMagick-6.2.3-0.tar.bz2) = 9b017329079f7578fec4cf7e7077f8e8f460cbf1
-Size (ImageMagick-6.2.3-0.tar.bz2) = 4758543 bytes
-SHA1 (patch-aa) = 3015c125e54de75826a17f6de8cb68fa87a3c316
+SHA1 (ImageMagick-6.2.3-3.tar.bz2) = 8f6a2d54030dd3e50a273f4a829e63a4133391ac
+RMD160 (ImageMagick-6.2.3-3.tar.bz2) = 1e86cb0ae1ffbb2fb538e76b142146f63d9690d9
+Size (ImageMagick-6.2.3-3.tar.bz2) = 4741892 bytes
+SHA1 (patch-aa) = d750bc2cfd05200f38495f27b7ce9a84a0b0c8d9
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 5834c7a8132..4d5b6cc7cfb 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.30 2005/05/25 10:32:33 adam Exp $
+$NetBSD: patch-aa,v 1.31 2005/07/14 08:58:46 adam Exp $
 
---- configure.orig	2005-05-23 22:33:09.000000000 +0000
+--- configure.orig	2005-06-24 04:07:35.000000000 +0000
 +++ configure
-@@ -26084,9 +26084,6 @@ fi
+@@ -26121,9 +26121,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'