Changes 6.3.1.0:

* Bug fixes

7 files changed, 24 insertions, 38 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index e68dfae06e1..2d4e4df9c08 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.147 2006/12/02 22:32:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.148 2006/12/09 10:57:49 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 8c81bf2de17..2fd37e4bc4a 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2006/10/22 21:03:15 adam Exp $
+# $NetBSD: Makefile.common,v 1.66 2006/12/09 10:57:49 adam Exp $
 
 ###########################################################################
 #
@@ -9,7 +9,7 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.3.0
+IM_MAJOR_VER=		6.3.1
 IM_MINOR_VER=		0
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index b641b72d3fb..e9e3037682d 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2006/10/22 21:03:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.52 2006/12/09 10:57:49 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/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
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 3e13d21c32d..ddd4938eb4d 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.80 2006/11/30 22:55:31 joerg Exp $
+$NetBSD: distinfo,v 1.81 2006/12/09 10:57:49 adam Exp $
 
-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
-SHA1 (patch-ac) = 211c7251a9ed442ec33237a9443ca12abf91c175
+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 4d73003b9ac..75460994a92 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.39 2006/10/22 21:03:15 adam Exp $
+$NetBSD: patch-aa,v 1.40 2006/12/09 10:57:49 adam Exp $
 
---- configure.orig	2006-10-14 21:20:53.000000000 +0200
+--- configure.orig	2006-11-27 02:54:52.000000000 +0100
 +++ configure
-@@ -18364,9 +18364,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,9 +10,9 @@ $NetBSD: patch-aa,v 1.39 2006/10/22 21:03:15 adam Exp $
 -  with_ltdl='yes'
 -fi
  
- 
- 
-@@ -34830,7 +34827,7 @@ cat >>confdefs.h <<\_ACEOF
+  if test "$with_ltdl" != 'no'; then
+   WITH_LTDL_TRUE=
+@@ -34391,7 +34388,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasFONTCONFIG 1
  _ACEOF
  
@@ -21,7 +21,7 @@ $NetBSD: patch-aa,v 1.39 2006/10/22 21:03:15 adam Exp $
      CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
    fi
  fi
-@@ -37089,7 +37086,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -36509,7 +36506,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasGVC 1
  _ACEOF
  
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.39 2006/10/22 21:03:15 adam Exp $
      CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
    fi
  fi
-@@ -37665,7 +37662,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -37054,7 +37051,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasRSVG 1
  _ACEOF
  
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index ae959def515..a4ceabbd644 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.24 2006/10/22 21:03:15 adam Exp $
+$NetBSD: patch-ab,v 1.25 2006/12/09 10:57:49 adam Exp $
 
---- Makefile.in.orig	2006-10-14 21:21:05.000000000 +0200
+--- Makefile.in.orig	2006-11-27 02:54:57.000000000 +0100
 +++ Makefile.in
-@@ -3291,8 +3291,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.24 2006/10/22 21:03:15 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3342,7 +3340,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.24 2006/10/22 21:03:15 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 \
-@@ -4603,7 +4600,6 @@ pkgconfig_DATA = \
+@@ -4882,7 +4879,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
deleted file mode 100644
index 7fcbaa3e9dc..00000000000
--- a/graphics/ImageMagick/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.16 2006/11/30 22:55:31 joerg Exp $
-
---- magick/option.h.orig	2006-11-30 22:13:12.000000000 +0000
-+++ magick/option.h
-@@ -78,7 +78,7 @@ typedef enum
-   MagickModuleOptions,
-   /* MagickResourceOptions, -- duplicate Function context dependant */
-   MagickThresholdOptions,
--  MagickTypeOptions,
-+  MagickTypeOptions
- } MagickOption;
- 
- typedef struct _OptionInfo