Pullup ticket 1951 - requested by salo

security update for ImageMagick

- pkgsrc/graphics/ImageMagick/Makefile		1.146,1.148
- pkgsrc/graphics/ImageMagick/Makefile.common	1.65-1.66
- pkgsrc/graphics/ImageMagick/PLIST		1.51-1.52
- pkgsrc/graphics/ImageMagick/distinfo		1.78-1.81
- pkgsrc/graphics/ImageMagick/patches/patch-aa	1.38-1.40
- pkgsrc/graphics/ImageMagick/patches/patch-ab	1.24-1.25

   Module Name:	pkgsrc
   Committed By:	rillig
   Date:		Tue Oct 10 19:43:32 UTC 2006

   Modified Files:
	pkgsrc/graphics/ImageMagick: distinfo
	pkgsrc/graphics/ImageMagick/patches: patch-aa

   Log Message:
   Fixed "test ==".
---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Sun Oct 22 21:03:15 UTC 2006

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

   Log Message:
   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.
---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Thu Nov 30 22:55:31 UTC 2006

   Modified Files:
	pkgsrc/graphics/ImageMagick: Makefile distinfo
   Added Files:
	pkgsrc/graphics/ImageMagick/patches: patch-ac

   Log Message:
   Remove comma at end of enum in magick/options.h, making it parseable by
   C++ compilers. Bump revision.
---
   Module Name:	pkgsrc
   Committed By:	adam
   Date:		Sat Dec  9 10:57:50 UTC 2006

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

   Log Message:
   Changes 6.3.1.0:
   * Bug fixes

5 files changed, 47 insertions, 18 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 1b68e84e128..e797c32bbfe 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.64.2.1 2006/12/11 11:49:04 ghen Exp $
 
 ###########################################################################
 #
@@ -9,8 +9,8 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.2.9
-IM_MINOR_VER=		3
+IM_MAJOR_VER=		6.3.1
+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..ca4092f8903 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.50.2.1 2006/12/11 11:49:04 ghen Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -158,6 +158,8 @@ 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/sRGB.icm
+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 339e9db45c9..278f640fd8c 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.77 2006/09/06 20:15:57 adam Exp $
+$NetBSD: distinfo,v 1.77.2.1 2006/12/11 11:49:04 ghen 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) = e5586b6520ebcc2745f4ab86bfe83dd6b649273f
-SHA1 (patch-ab) = 0a187f7d394583ed434298514aa6390f5ad83b12
+SHA1 (ImageMagick-6.3.1-0.tar.bz2) = d065ba25db632170450ace19d48bd1b49aa78fc2
+RMD160 (ImageMagick-6.3.1-0.tar.bz2) = 16059df07243caec8f82dc87f837edf2de01a2fa
+Size (ImageMagick-6.3.1-0.tar.bz2) = 5346376 bytes
+SHA1 (patch-aa) = f0f477d9831e317924b837715ad2467560286644
+SHA1 (patch-ab) = 23cd3215eec4de0b1447c09a1d431f3004054621
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 74099d70993..863e963e30d 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.37 2006/07/17 16:01:36 adam Exp $
+$NetBSD: patch-aa,v 1.37.2.1 2006/12/11 11:49:04 ghen Exp $
 
---- configure.orig	2006-07-13 04:29:32.000000000 +0200
+--- configure.orig	2006-11-27 02:54:52.000000000 +0100
 +++ configure
-@@ -25322,9 +25322,6 @@ fi
+@@ -18993,9 +18993,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'
@@ -10,5 +10,32 @@ $NetBSD: patch-aa,v 1.37 2006/07/17 16:01:36 adam Exp $
 -  with_ltdl='yes'
 -fi
  
+  if test "$with_ltdl" != 'no'; then
+   WITH_LTDL_TRUE=
+@@ -34391,7 +34388,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define HasFONTCONFIG 1
+ _ACEOF
  
+-  if test "$with_modules" == 'no' ; then
++  if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
+   fi
+ fi
+@@ -36509,7 +36506,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define HasGVC 1
+ _ACEOF
  
+-  if test "$with_modules" == 'no' ; then
++  if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
+   fi
+ fi
+@@ -37054,7 +37051,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define HasRSVG 1
+ _ACEOF
+ 
+-  if test "$with_modules" == 'no' ; then
++  if test "$with_modules" = 'no' ; then
+     CPPFLAGS="$RSVG_CFLAGS $CPPFLAGS"
+   fi
+ fi
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 3a26109a5dd..9921fc59b37 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.23.2.1 2006/12/11 11:49:04 ghen Exp $
 
---- Makefile.in.orig	2006-09-01 16:08:16.000000000 +0200
+--- Makefile.in.orig	2006-11-27 02:54:57.000000000 +0100
 +++ Makefile.in
-@@ -3285,8 +3285,6 @@ WAND_CLEANFILES = \
+@@ -3579,8 +3579,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 = \
+@@ -3630,7 +3628,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 = \
+@@ -4882,7 +4879,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \