Changes 6.2.9-3:

* Add -clip-mask option to clip as defined by an image mask.

Changes 6.2.9-2:
* Add >>, <<, >=, and <= operators to -fx.

4 files changed, 18 insertions, 13 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 2c1ba28a8fa..1b68e84e128 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.63 2006/08/23 21:06:00 adam Exp $
+# $NetBSD: Makefile.common,v 1.64 2006/09/06 20:15:57 adam Exp $
 
 ###########################################################################
 #
@@ -10,7 +10,7 @@
 ###########################################################################
 
 IM_MAJOR_VER=		6.2.9
-IM_MINOR_VER=		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 7fa06f574f4..5abd786b251 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2006/07/17 16:01:36 adam Exp $
+@comment $NetBSD: PLIST,v 1.50 2006/09/06 20:15:57 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -91,6 +91,7 @@ include/magick/splay-tree.h
 include/magick/statistic.h
 include/magick/stream.h
 include/magick/string_.h
+include/magick/threshold.h
 include/magick/timer.h
 include/magick/token.h
 include/magick/transform.h
@@ -159,6 +160,7 @@ share/ImageMagick-${IM_MAJOR_VER}/config/log.xml
 share/ImageMagick-${IM_MAJOR_VER}/config/magic.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
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/button.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/configure.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/definitive-guide.png
@@ -173,12 +175,14 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/label.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.eps
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/logo.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/montage.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/navy.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/piechart.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/reconstruct.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/red-ball.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/red-circle.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/right.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose-over.png
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose-sigmoidal.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/rose.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/script.png
@@ -292,6 +296,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/display.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/download.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/examples.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/formats.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/fx.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/history.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/identify.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/import.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 43b044259bc..339e9db45c9 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.76 2006/08/23 21:06:00 adam Exp $
+$NetBSD: distinfo,v 1.77 2006/09/06 20:15:57 adam Exp $
 
-SHA1 (ImageMagick-6.2.9-1.tar.bz2) = 6101323a5bfbc1595ade36f66af3095a0de80352
-RMD160 (ImageMagick-6.2.9-1.tar.bz2) = 76f49aacf101e1d392f3a556cf9d1bf9a0c72d0f
-Size (ImageMagick-6.2.9-1.tar.bz2) = 5340771 bytes
+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) = e5586b6520ebcc2745f4ab86bfe83dd6b649273f
-SHA1 (patch-ab) = c3a3bf26b3a5edf22159e182e754a1c6dcdd121b
+SHA1 (patch-ab) = 0a187f7d394583ed434298514aa6390f5ad83b12
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 8d9fced37dc..3a26109a5dd 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.22 2006/07/17 16:01:36 adam Exp $
+$NetBSD: patch-ab,v 1.23 2006/09/06 20:15:57 adam Exp $
 
---- Makefile.in.orig	2006-07-13 04:29:46.000000000 +0200
+--- Makefile.in.orig	2006-09-01 16:08:16.000000000 +0200
 +++ Makefile.in
-@@ -3281,8 +3281,6 @@ WAND_CLEANFILES = \
+@@ -3285,8 +3285,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.22 2006/07/17 16:01:36 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3332,7 +3330,6 @@ WAND_CLEANFILES = \
+@@ -3336,7 +3334,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.22 2006/07/17 16:01:36 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 \
-@@ -4606,7 +4603,6 @@ pkgconfig_DATA = \
+@@ -4610,7 +4607,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \