Updated to version 6.3.4.9 (approved by adam@).

Pkgsrc changes:
  - http://www.imagemagick.org/ is the HOMEPAGE now.
  - The package supports installation to DESTDIR.
  - Removed patch-ab because it was unclear why we would not want to have
    Magick++-config.1.

Changes since version 6.3.3.6:
==============================
2007-06-11  6.3.4-9 Cristy  <quetzlzacatenango@image...>
  * Converting a jpg to pdf is creating an empty pdf object (reference
          http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8954).
  * Respect the '-set type:hinting off option' (bug report from Richard
    Jones).
  * WritePSDImage vulnerable to exploitable heap corruption (reference
          http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8967).

2007-06-09  6.3.4-8 Cristy  <quetzlzacatenango@image...>
  * SetMagickRegistry() post-increment the value 'id' (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8944).

2007-06-02  6.3.4-6 Cristy  <quetzlzacatenango@image...>
  * Read/write 10 & 12-bit packed DPX images.
  * Reduce stack requirements for messaging system.
  * Small memory leak for raw profiles in the PNG coder.

2007-06-01  6.3.4-5 Glenn <glennrp@image...>
  * Added GIF, JPEG, and PNG interlace types.  For backward compatibility,
    you can continue to use "-interlace Plane" to request these.

2007-04-30  6.3.4-0 Anthony  <anthony@griffith...>
  * Fixed minor bug in the 'curl' for Polaroid of very non-square images.

2007-06-01  6.3.4-5 Cristy  <quetzlzacatenango@image...>
  * Set min-is-white for Group4-compressed PDF.
  * Add PaintFloodfillImage() method.

2007-05-30  6.3.4-4 Cristy  <quetzlzacatenango@image...>
  * Add MEPP metric to compare program.  Returns the mean error per pixel
    along with the normalize mean and maximum error.
  * Attach an XMP profile to an image (e.g.
    convert input.tif -profile xmp:metadata.xmp output.tif).

2007-05-22  6.3.4-3 Cristy  <quetzlzacatenango@image...>
  * Fixed mogrify conversions with -format and -path (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=9127).

2007-05-15  6.3.4-2 Cristy  <quetzlzacatenango@image...>
  * SVG style element was not always parsed properly.
  * Do not dither when the number of unique colors is already less than the
    maximum.
  * Return normalized PAE metric (compare utility).

2007-05-03  6.3.4-1 Cristy  <quetzlzacatenango@image...>
  * Add support for PFM images.
  * Check for corrupt EXIF image profiles.
  * Writing JPEG YCbCr TIFF images no longer faults (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=8896).

2007-04-30  6.3.4-0 Anthony  <anthony@griffith...>
  * Fixed minor bug for crop missed images and 'background' GIF disposal.

2007-04-28  6.3.4-0 Glenn  <glennrp@image...>
  * Added profile support to the GIF decoder/encoder.  They are stored
    as GIF Application Extensions.  Known extensions include existing ICCRGB1
    (for ICC profiles) and new MGKIPTC0 and MGK8BIM0 (for IPTC and 8BIM
    profiles).  Unknown extensions found in GIF files are read as gifappNNN.

2007-04-28  6.3.4-0 Anthony  <anthony@griffith...>
  * Invert Opacity change for user defined ordered dither threshold maps,
    so that 'off' map is transparent, and 'on' is opaque.

2007-04-24  6.3.4-0 Anthony  <anthony@griffith...>
  * Added an initial Coalesce Images, and a final +map local colortable
    optimization to the -layers Optimize method, for a simple to use
    GIF optimization operation.  (more work to come)

2007-04-22  6.3.4-0 Cristy  <quetzlzacatenango@image...>
  * Properly set the virtual canvas of a multi-frame GIF image sequence.
  * Add AcquireOneVirtualPixel() method.
  * Set Log colorspace properly when writing DPX images.
  * Add -tile-offset option.
  * Add support for the EXR image format.
  * Improve support for DPX images.
  * Add --enable-hdri option to the configure script.
  * Add support for high dynamic-range images (HDRI).

2007-04-20  6.3.3-9 Peter Hull  <peterhull90@gmail...>
  * Improve support for writing multiple image icons.

2007-04-18  6.3.3-9 Anthony  <anthony@griffith...>
  * Separated -layers Optimize from -layers OptimizeFrame to allow
    the former expansion into a general (multiple method) optimizer
    of GIF animations
  * merged -layers OptimizeTransparency into -layers Optimize method

2007-04-12  6.3.3-8 Chris Madison  <madisonblu@hotma...>
  * Fix fault whem comparing a colormapped image with a non-colormapped one.
  * Fix race condition when spawning delegate programs.
  * TIFF JPEG now respects the -quality comptression setting.
  * The -fx option now properly groks the logical and operator.
  * DPX tilestamp property should be timestamp.

2007-04-13  6.3.3-7 Anthony  <anthony@griffith...>
  * Added GravityAdjustGeometry() to "geometry.c" to adjust geometry settings
    according to given gravity and canvas area it applies to. This is for
    code simplification thoughout MagickCore.

6 files changed, 46 insertions, 47 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 0041d81cb1b..d37eaccd715 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.150 2007/02/06 14:52:46 adam Exp $
+# $NetBSD: Makefile,v 1.151 2007/06/16 21:58:08 heinz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
 
 MAINTAINER=	adam@NetBSD.org
-HOMEPAGE=	http://www.simplesystems.org/ImageMagick/
+HOMEPAGE=	http://www.imagemagick.org/
 COMMENT=	Package for display and interactive manipulation of images
 
 CONFLICTS=	geomview<1.8.1nb2  # used to have a program named 'animate'
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		c c++ c99
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index ca929862304..c637e47bd53 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.74 2007/04/18 22:44:22 drochner Exp $
+# $NetBSD: Makefile.common,v 1.75 2007/06/16 21:58:09 heinz Exp $
 
 ###########################################################################
 #
@@ -9,8 +9,8 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.3.3
-IM_MINOR_VER=		6
+IM_MAJOR_VER=		6.3.4
+IM_MINOR_VER=		9
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index c55e668138f..08f325b0b78 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.55 2007/04/18 22:44:22 drochner Exp $
+@comment $NetBSD: PLIST,v 1.56 2007/06/16 21:58:09 heinz Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -108,6 +108,7 @@ include/wand/compare.h
 include/wand/composite.h
 include/wand/conjure.h
 include/wand/convert.h
+include/wand/deprecate.h
 include/wand/display.h
 include/wand/drawing-wand.h
 include/wand/identify.h
@@ -140,6 +141,7 @@ lib/pkgconfig/ImageMagick++.pc
 lib/pkgconfig/ImageMagick.pc
 lib/pkgconfig/Wand.pc
 man/man1/ImageMagick.1
+man/man1/Magick++-config.1
 man/man1/Magick-config.1
 man/man1/Wand-config.1
 man/man1/animate.1
@@ -165,6 +167,10 @@ 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
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/bluebells_clipped.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/bluebells_darker.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/bluebells_lin.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/bluebells_log.jpg
 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
@@ -252,6 +258,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/compare.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/composite.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/constitute.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/decorate.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/deprecate.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/display.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/draw.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/drawing-wand.html
@@ -262,6 +269,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/image.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/layer.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/list.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-deprecate.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-image.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-property.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-wand.html
@@ -302,6 +310,7 @@ 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/high-dynamic-range.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
@@ -317,6 +326,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/mailing-list.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/miff.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/mogrify.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/montage.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/motion-picture.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/perl-magick.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/quantize.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/resources.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 27ab079e0ba..acc26ff3ea6 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.89 2007/04/18 22:44:22 drochner Exp $
+$NetBSD: distinfo,v 1.90 2007/06/16 21:58:10 heinz Exp $
 
-SHA1 (ImageMagick-6.3.3-6.tar.bz2) = 61aed9286d22d79bda75b65428791455cc191369
-RMD160 (ImageMagick-6.3.3-6.tar.bz2) = 0b8cadc428ac3aff36d8e356943310d7e643888f
-Size (ImageMagick-6.3.3-6.tar.bz2) = 5625824 bytes
-SHA1 (patch-aa) = 63ea984409733fd6e35b0a305b96760b3aae36e7
-SHA1 (patch-ab) = 87cbd40e9ae64bbe160e1dbebd0ec50e7e62b311
+SHA1 (ImageMagick-6.3.4-9.tar.bz2) = 5869d2ee1d63b849b899637c7a39320d96022ab4
+RMD160 (ImageMagick-6.3.4-9.tar.bz2) = cab331e23c1a49ac9db403d823fa807efbf69a40
+Size (ImageMagick-6.3.4-9.tar.bz2) = 5813934 bytes
+SHA1 (patch-aa) = e58cbaed0673513d9fed764081c1b3a73d5cc8ba
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 8a49283b806..959ec440661 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.43 2007/04/18 22:44:22 drochner Exp $
+$NetBSD: patch-aa,v 1.44 2007/06/16 21:58:10 heinz Exp $
 
---- configure.orig	2007-03-31 22:30:48.000000000 +0200
+--- configure.orig	2007-06-09 19:41:57.000000000 +0200
 +++ configure
-@@ -18984,9 +18984,6 @@ fi
+@@ -19095,9 +19095,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,16 @@ $NetBSD: patch-aa,v 1.43 2007/04/18 22:44:22 drochner Exp $
  
   if test "$with_ltdl" != 'no'; then
    WITH_LTDL_TRUE=
-@@ -34622,7 +34619,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -19603,7 +19600,7 @@ if test "x$with_windows_font_dir" = "xno
+     with_windows_font_dir=
+ fi
+ if test "$with_windows_font_dir" != '' ; then
+-    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-windows-font-dir==$with_windows_font_dir "
++    DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-windows-font-dir=$with_windows_font_dir "
+ fi
+ 
+ 
+@@ -34749,7 +34746,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasFONTCONFIG 1
  _ACEOF
  
@@ -21,7 +30,7 @@ $NetBSD: patch-aa,v 1.43 2007/04/18 22:44:22 drochner Exp $
      CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
      fi
  fi
-@@ -36794,7 +36791,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -36921,7 +36918,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasGVC 1
  _ACEOF
  
@@ -30,7 +39,16 @@ $NetBSD: patch-aa,v 1.43 2007/04/18 22:44:22 drochner Exp $
          CPPFLAGS="$GVC_CFLAGS $CPPFLAGS"
      fi
  fi
-@@ -37337,7 +37334,7 @@ cat >>confdefs.h <<\_ACEOF
+@@ -37464,7 +37461,7 @@ cat >>confdefs.h <<\_ACEOF
+ #define HasOPENEXR 1
+ _ACEOF
+ 
+-    if test "$with_modules" == 'no' ; then
++    if test "$with_modules" = 'no' ; then
+         CPPFLAGS="$OPENEXR_CFLAGS $CPPFLAGS"
+     fi
+ fi
+@@ -37576,7 +37573,7 @@ cat >>confdefs.h <<\_ACEOF
  #define HasRSVG 1
  _ACEOF
  
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
deleted file mode 100644
index bbb2abeedc7..00000000000
--- a/graphics/ImageMagick/patches/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ab,v 1.27 2007/02/15 08:05:52 adam Exp $
-
---- Makefile.in.orig	2007-02-10 21:49:52.000000000 +0100
-+++ Makefile.in
-@@ -3629,8 +3629,6 @@ WAND_CLEANFILES = \
- @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = \
- @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config
- 
--@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_MANS = \
--@WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config.1
- 
- @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
- @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3680,7 +3678,6 @@ WAND_CLEANFILES = \
- @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/INSTALL \
- @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/NEWS \
- @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/README \
--@WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config.1 \
- @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 \
-@@ -4932,7 +4929,6 @@ pkgconfig_DATA = \
- # Manual pages to install
- man_MANS = \
- 	$(MAGICK_MANS) \
--	$(MAGICKPP_MANS) \
- 	$(UTILITIES_MANS) \
- 	$(WAND_MANS)
-