Pullup ticket 1791 - requested by salo

security update for ImageMagick

Revisions pulled up:
- pkgsrc/graphics/ImageMagick/Makefile.common		1.58-1.60, 1.62
- pkgsrc/graphics/ImageMagick/PLIST			1.49
- pkgsrc/graphics/ImageMagick/distinfo			1.70-1.72, 1.75
- pkgsrc/graphics/ImageMagick/patches/patch-aa		1.37
- pkgsrc/graphics/ImageMagick/patches/patch-ab		1.22

Module Name:	pkgsrc
Committed By:	adam
Date:		Mon Jul 17 16:01:36 UTC 2006

Modified Files:
	pkgsrc/graphics/ImageMagick: Makefile.common PLIST distinfo
	pkgsrc/graphics/ImageMagick/patches: patch-aa patch-ab

Log Message:
Changes  6.2.8-4:
  * Add IsImageSimiliar() method to MagickCore API.
  * Improve color reduction algorithm for images with transparency.

Changes 6.2.8-3:
  * The -page A4 option no longer returns a width/height of 0.
  * GetMagickModulePath() at line 803 in magick/module.c the variable 'home'
    is not freed before returning.
  * Magick::throwException should not call MagickLib::GetException().

Changes 6.2.8-2:
  * The DPX orientation header elements are 8 not 16.
  * Fix the ImageMagick web pages so they render properly.

Changes  6.2.8-1:
  * Fix off-by-one error in DrawAffineImage().
  * Set the offset to layer 2 of XCF images.
  * Set proper precendence so -fx 'p{u[1]*w,u[2]*h}' parses properly (bug

Module Name:	pkgsrc
Committed By:	adam
Date:		Mon Jul 31 14:55:36 UTC 2006

Modified Files:
	pkgsrc/graphics/ImageMagick: Makefile.common distinfo

Log Message:
Changes 6.2.8.7:
* Bug fixes

Module Name:	pkgsrc
Committed By:	perry
Date:		Mon Aug  7 01:08:05 UTC 2006

Modified Files:
	pkgsrc/graphics/ImageMagick: Makefile.common distinfo

Log Message:
Update to 6.2.8-8 -- -7 is no longer available on most ImageMagick
mirrors.

The ChangeLog between -7 and -8 says:

  * Add -unique-colors to discard all but one of any pixel color.
  * The montage program properly parses the -channel option.
  * Make -colors work consistently as an image operator.
  * Some DPX images do not contain a television header.
  * Restore ability to read 10-bit grayscale Cineon images.
  * Improve handling of corrupt GIF images.

Module Name:	pkgsrc
Committed By:	abs
Date:		Tue Aug 15 12:20:12 UTC 2006

Modified Files:
	pkgsrc/graphics/ImageMagick: Makefile Makefile.common distinfo

Log Message:
Update graphics/ImageMagick from 6.2.8.8 to 6.2.9.0
  * Add -adaptive-resize option.
  * Permit x100 as a geometry in Magick++.
  * Respect width/height for image MVG element.

5 files changed, 21 insertions, 17 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index e76de236ed8..61722a1a840 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2006/06/12 09:13:27 adam Exp $
+# $NetBSD: Makefile.common,v 1.57.2.1 2006/08/17 07:04:36 ghen Exp $
 
 ###########################################################################
 #
@@ -9,7 +9,7 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.2.8
+IM_MAJOR_VER=		6.2.9
 IM_MINOR_VER=		0
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 027f855cad7..96c1b215101 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2006/06/12 09:13:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.48.2.1 2006/08/17 07:04:36 ghen Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -12,6 +12,7 @@ bin/identify
 bin/import
 bin/mogrify
 bin/montage
+bin/stream
 include/Magick++.h
 include/Magick++/Blob.h
 include/Magick++/CoderInfo.h
@@ -117,6 +118,7 @@ include/wand/mogrify.h
 include/wand/montage.h
 include/wand/pixel-iterator.h
 include/wand/pixel-wand.h
+include/wand/stream.h
 include/wand/wand-config.h
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/colors.xml
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.xml
@@ -148,6 +150,7 @@ man/man1/identify.1
 man/man1/import.1
 man/man1/mogrify.1
 man/man1/montage.1
+man/man1/stream.1
 share/ImageMagick-${IM_MAJOR_VER}/ChangeLog
 share/ImageMagick-${IM_MAJOR_VER}/LICENSE
 share/ImageMagick-${IM_MAJOR_VER}/NEWS
@@ -309,6 +312,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/quantize.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/resources.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/search.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html
 @dirrm share/doc/ImageMagick-${IM_MAJOR_VER}/www/api
 @dirrm share/doc/ImageMagick-${IM_MAJOR_VER}/www/Magick++
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 01f67abbec1..cc174c72d3e 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.69 2006/06/12 09:13:27 adam Exp $
+$NetBSD: distinfo,v 1.69.2.1 2006/08/17 07:04:36 ghen Exp $
 
-SHA1 (ImageMagick-6.2.8-0.tar.bz2) = 637569bbcb331233c86258f6c681d5a7c849cba0
-RMD160 (ImageMagick-6.2.8-0.tar.bz2) = f5f9592c8f7c8bc67875ea984fed23650ab7224e
-Size (ImageMagick-6.2.8-0.tar.bz2) = 5282322 bytes
-SHA1 (patch-aa) = 18c0d77512b0fc7247b2b0bb16d080f7c149bcf1
-SHA1 (patch-ab) = 1b1148c9cd9be7b14063941531951c5cdb4d4caf
+SHA1 (ImageMagick-6.2.9-0.tar.bz2) = a9f19186e1d1ace0c98b613787dda5cb690b1332
+RMD160 (ImageMagick-6.2.9-0.tar.bz2) = 2e0982bd2172ff8f3c0ca13ef8d6796d3bab1128
+Size (ImageMagick-6.2.9-0.tar.bz2) = 5344651 bytes
+SHA1 (patch-aa) = e5586b6520ebcc2745f4ab86bfe83dd6b649273f
+SHA1 (patch-ab) = c3a3bf26b3a5edf22159e182e754a1c6dcdd121b
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 3c5d21f920a..53d48f18401 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.36 2006/05/08 11:39:07 adam Exp $
+$NetBSD: patch-aa,v 1.36.2.1 2006/08/17 07:04:36 ghen Exp $
 
---- configure.orig	2006-05-07 17:10:26.000000000 +0200
+--- configure.orig	2006-07-13 04:29:32.000000000 +0200
 +++ configure
-@@ -25305,9 +25305,6 @@ fi
+@@ -25322,9 +25322,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index a2fac40154a..1c15e2d18d4 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.21 2006/06/12 09:13:27 adam Exp $
+$NetBSD: patch-ab,v 1.21.2.1 2006/08/17 07:04:36 ghen Exp $
 
---- Makefile.in.orig	2006-06-05 04:08:39.000000000 +0200
+--- Makefile.in.orig	2006-07-13 04:29:46.000000000 +0200
 +++ Makefile.in
-@@ -3268,8 +3268,6 @@ WAND_CLEANFILES = \
+@@ -3281,8 +3281,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.21 2006/06/12 09:13:27 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3319,7 +3317,6 @@ WAND_CLEANFILES = \
+@@ -3332,7 +3330,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.21 2006/06/12 09:13:27 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 \
-@@ -4587,7 +4584,6 @@ pkgconfig_DATA = \
+@@ -4606,7 +4603,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \