Changes 6.3.0-0:

  * Destroy MagickCore API environment when END{} is called in PerlMagick
  * Support -fx conditionals (e.g. x ? y : z), assignment (e.g. zz=3.1), and
    statement separators (e.g. zz=2.1; zz).
  * Add new pixel: attribute (e.g. -format '%[pixel:s]').
  * Add support for Supplementary Plane Unicode characters

Changes 6.2.9-8:
  * The plasma: coder is once again opaque.
  * Bogus relinquish in rare circustances produced incorrect resource
    utilization statistics.

Changes 6.2.9-7:
  * Add CMYK support to the PAM image format.
  * Do not write PDF soft mask if image is PaletteMatteType.
  * Patches from Sven Koehler to improve PerlMagick's build script.

Changes 6.2.9-7:
  * Add additional ordered-dithering options.

Changes 6.2.9-6:
  * Ensure cache_resources in magick/cache.c is a valid splay-tree before we
    add/remove nodes to/from it.
  * Automatically threshold the alpha channel at 50% when color reducing an
    image.
  * Make ParseMagickOptions() more robust to handle ordered dither options.

5 files changed, 23 insertions, 22 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 1b68e84e128..8c81bf2de17 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.64 2006/09/06 20:15:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.65 2006/10/22 21:03:15 adam Exp $
 
 ###########################################################################
 #
@@ -9,8 +9,8 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.2.9
-IM_MINOR_VER=		3
+IM_MAJOR_VER=		6.3.0
+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 5abd786b251..b641b72d3fb 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2006/09/06 20:15:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.51 2006/10/22 21:03:15 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -158,6 +158,7 @@ share/ImageMagick-${IM_MAJOR_VER}/NEWS
 share/ImageMagick-${IM_MAJOR_VER}/config/coder.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/log.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/magic.xml
+share/ImageMagick-${IM_MAJOR_VER}/config/thresholds.xml
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/arc.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/background.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/black.png
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index bbd1f9b1f95..ee3b5f61838 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.78 2006/10/10 19:43:32 rillig Exp $
+$NetBSD: distinfo,v 1.79 2006/10/22 21:03:15 adam Exp $
 
-SHA1 (ImageMagick-6.2.9-3.tar.bz2) = 2f0f00fff0b0c3691b37ba9d38f17979a8328295
-RMD160 (ImageMagick-6.2.9-3.tar.bz2) = 52a4756c41fcfe970af242263df856f0a9ddb5a6
-Size (ImageMagick-6.2.9-3.tar.bz2) = 5365841 bytes
-SHA1 (patch-aa) = 432f3195cc5babdce2f9c7119daab7844c0d9619
-SHA1 (patch-ab) = 0a187f7d394583ed434298514aa6390f5ad83b12
+SHA1 (ImageMagick-6.3.0-0.tar.bz2) = 0b4a9f69a189540cc3a3fad0f858bf918f9a3229
+RMD160 (ImageMagick-6.3.0-0.tar.bz2) = e3a75c993db42d2908cff9e77e47562dbf1507e3
+Size (ImageMagick-6.3.0-0.tar.bz2) = 5348178 bytes
+SHA1 (patch-aa) = e651b564d210c091c68fc72e8d82e79aa3603069
+SHA1 (patch-ab) = f42c6b249b6051e40e56676608a925900228ec95
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 6ce40c16e67..4d73003b9ac 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.38 2006/10/10 19:43:32 rillig Exp $
+$NetBSD: patch-aa,v 1.39 2006/10/22 21:03:15 adam Exp $
 
---- configure.orig	2006-09-01 16:08:04.000000000 +0200
-+++ configure	2006-10-10 21:41:52.000000000 +0200
-@@ -25322,9 +25322,6 @@ fi
+--- configure.orig	2006-10-14 21:20:53.000000000 +0200
++++ configure
+@@ -18364,9 +18364,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.38 2006/10/10 19:43:32 rillig Exp $
  
  
  
-@@ -42274,7 +42271,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -34830,7 +34827,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasFONTCONFIG 1
  _ACEOF
  
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.38 2006/10/10 19:43:32 rillig Exp $
      CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
    fi
  fi
-@@ -44531,7 +44528,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -37089,7 +37086,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasGVC 1
  _ACEOF
  
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.38 2006/10/10 19:43:32 rillig Exp $
      CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
    fi
  fi
-@@ -45105,7 +45102,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -37665,7 +37662,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasRSVG 1
  _ACEOF
  
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 3a26109a5dd..ae959def515 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.23 2006/09/06 20:15:57 adam Exp $
+$NetBSD: patch-ab,v 1.24 2006/10/22 21:03:15 adam Exp $
 
---- Makefile.in.orig	2006-09-01 16:08:16.000000000 +0200
+--- Makefile.in.orig	2006-10-14 21:21:05.000000000 +0200
 +++ Makefile.in
-@@ -3285,8 +3285,6 @@ WAND_CLEANFILES = \
+@@ -3291,8 +3291,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.23 2006/09/06 20:15:57 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3336,7 +3334,6 @@ WAND_CLEANFILES = \
+@@ -3342,7 +3340,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.23 2006/09/06 20:15:57 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 \
-@@ -4610,7 +4607,6 @@ pkgconfig_DATA = \
+@@ -4603,7 +4600,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \