Changes 6.2.6.0:

* Bug fixes

7 files changed, 31 insertions, 22 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index da93877f17f..e4c2053120c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.135 2006/01/24 07:32:10 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2006/01/26 20:38:18 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 4f01c5d2361..e575633baae 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.45 2005/11/29 08:51:17 adam Exp $
+# $NetBSD: Makefile.common,v 1.46 2006/01/26 20:38:18 adam Exp $
 
-IM_MAJOR_VER=		6.2.5
-IM_MINOR_VER=		5
+IM_MAJOR_VER=		6.2.6
+IM_MINOR_VER=		0
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index c73196393a1..69aad63382b 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2005/11/29 08:51:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.44 2006/01/26 20:38:18 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -26,6 +26,7 @@ include/Magick++/Pixels.h
 include/Magick++/STL.h
 include/Magick++/TypeMetric.h
 include/magick/ImageMagick.h
+include/magick/MagickCore.h
 include/magick/PreRvIcccm.h
 include/magick/animate.h
 include/magick/annotate.h
@@ -42,9 +43,7 @@ include/magick/compare.h
 include/magick/composite.h
 include/magick/compress.h
 include/magick/configure.h
-include/magick/conjure.h
 include/magick/constitute.h
-include/magick/convert.h
 include/magick/decorate.h
 include/magick/delegate.h
 include/magick/deprecate.h
@@ -59,7 +58,6 @@ include/magick/geometry.h
 include/magick/hashmap.h
 include/magick/identify.h
 include/magick/image.h
-include/magick/import.h
 include/magick/list.h
 include/magick/locale_.h
 include/magick/log.h
@@ -70,7 +68,6 @@ include/magick/magick.h
 include/magick/memory_.h
 include/magick/methods.h
 include/magick/module.h
-include/magick/mogrify.h
 include/magick/monitor.h
 include/magick/montage.h
 include/magick/option.h
@@ -99,14 +96,27 @@ include/magick/type.h
 include/magick/utility.h
 include/magick/version.h
 include/magick/widget.h
+include/magick/xml-tree.h
 include/magick/xwindow.h
+include/wand/MagickWand.h
+include/wand/animate.h
+include/wand/compare.h
+include/wand/composite.h
+include/wand/conjure.h
+include/wand/convert.h
+include/wand/display.h
 include/wand/drawing-wand.h
+include/wand/identify.h
+include/wand/import.h
 include/wand/magick-attribute.h
 include/wand/magick-image.h
 include/wand/magick-wand.h
 include/wand/magick_wand.h
+include/wand/mogrify.h
+include/wand/montage.h
 include/wand/pixel-iterator.h
 include/wand/pixel-wand.h
+include/wand/wand-config.h
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/colors.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.xml
diff --git a/graphics/ImageMagick/buildlink3.mk b/graphics/ImageMagick/buildlink3.mk
index 16ff12c72ea..bd368e1f9b1 100644
--- a/graphics/ImageMagick/buildlink3.mk
+++ b/graphics/ImageMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/01/24 07:32:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/01/26 20:38:18 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 IMAGEMAGICK_BUILDLINK3_MK:=	${IMAGEMAGICK_BUILDLINK3_MK}+
@@ -23,4 +23,4 @@ BUILDLINK_PKGSRCDIR.ImageMagick?=	../../graphics/ImageMagick
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 1d22d3d3f1c..73c09f9b95a 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.56 2005/11/29 08:51:17 adam Exp $
+$NetBSD: distinfo,v 1.57 2006/01/26 20:38:18 adam Exp $
 
-SHA1 (ImageMagick-6.2.5-5.tar.bz2) = ce1289edb35a7d2999bdfc1654b18251939832d5
-RMD160 (ImageMagick-6.2.5-5.tar.bz2) = b2882a7cef6ce98ea797ca99cec62a39b026f252
-Size (ImageMagick-6.2.5-5.tar.bz2) = 5044679 bytes
-SHA1 (patch-aa) = 0b79328af247471986b8c9a55b688bd4bf45f88e
+SHA1 (ImageMagick-6.2.6-0.tar.bz2) = 0cf67149e806053a63fdaec70de913a9fd72aaf9
+RMD160 (ImageMagick-6.2.6-0.tar.bz2) = 34d8ea5408439c536ac2c791c7ad2fafa1424671
+Size (ImageMagick-6.2.6-0.tar.bz2) = 5139235 bytes
+SHA1 (patch-aa) = b5002ca0bd553c27a23f3ea9835e5b6c738f4f8d
diff --git a/graphics/ImageMagick/options.mk b/graphics/ImageMagick/options.mk
index 3cb56dce257..3a62c76dbc7 100644
--- a/graphics/ImageMagick/options.mk
+++ b/graphics/ImageMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2005/06/01 18:02:53 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2006/01/26 20:38:18 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ImageMagick
 PKG_SUPPORTED_OPTIONS=	x11
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS=	x11
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mx11)
-BUILDLINK_DEPENDS.jasper+= jasper>=1.701.0
+BUILDLINK_DEPENDS.jasper+=	jasper>=1.701.0
 DEPENDS+=		mpeg2codec-1.2:../../graphics/mpeg2codec
 
 .include "../../graphics/jasper/buildlink3.mk"
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index acbdfdca7dd..7b7eb26abcd 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.32 2005/10/03 13:57:40 adam Exp $
+$NetBSD: patch-aa,v 1.33 2006/01/26 20:38:18 adam Exp $
 
---- configure.orig	2005-10-02 03:27:16.000000000 +0000
+--- configure.orig	2006-01-19 04:20:30.000000000 +0100
 +++ configure
-@@ -26215,9 +26215,6 @@ fi
+@@ -25186,9 +25186,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'