Update to 6.8.5.8.

2013-05-23  6.8.5-8 Glenn Randers-Pehrson <glennrp@image...>
  * Stopped a "-fsanitize-address" warning in the JNG coder.

2013-05-20  6.8.5-8 Cristy  <quetzlzacatenango@image...>
  * The -white-threshold option is symetrical with -black-threshold (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23441);
  * Fix multi-line PNM comments (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23442).
  * The -format option should not automatically append a newline since the
    user can specify a newline in the formatting expression.
  * The -level option is no longer returning a darkened image (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23479).

2013-05-20  6.8.5-7 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-7, SVN revision 12310.

2013-05-14  6.8.5-7 Glenn Randers-Pehrson <glennrp@image...>
  * Recognize PNG iCCP chunks that contain the sRGB profile and replace
    them with the PNG sRGB chunk.  Use "-define png:preserve-iCCP" to
    get the previous behavior, of simply copying the iCCP chunk.

2013-05-11  6.8.5-7 Cristy  <quetzlzacatenango@image...>
  * Sometimes an sRGB image is masquerading as grayscale (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23370).
  * Labels no longer overflow (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22964).
  * If more then one exception, return the highest security exception.
  * A grayscale image returns a color JPEG for -type TrueColor (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=23421).
  * Read PAM comment (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23442).

2013-05-10  6.8.5-6 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-6, SVN revision 12257.

2013-05-09  6.8.5-6 Cristy  <quetzlzacatenango@image...>
  * The stream utility no longer faults when exporting float pixels (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23394).

2013-05-08  6.8.5-5 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-5, SVN revision 12227.

2013-05-07  6.8.5-5 Nicolas Robidoux <nicolas.robidoux@gmail...>
  * Change the sample JPEG quantization table xml to something that works
    really well with 2x2 Chroma subsampling around quality 75.

2013-05-06  6.8.5-5 Glenn Randers-Pehrson <glennrp@image...>
  * Eliminate whitespace from image properties that hold PNG chunk data.

2013-05-05  6.8.5-5 Cristy  <quetzlzacatenango@image...>
  * The -poly option treats the opacity channel as alpha (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23346).
  * The -threshold 50% option returns a 50-50 black and white image (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23354).
  * Let user override the TIFF rows per strip  (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=23307).
  * Fix transient bug in the -separate option (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23335).

2013-05-01  6.8.5-4 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-4, SVN revision 12089.

2013-05-01  6.8.5-4 Cristy  <quetzlzacatenango@image...>
  * Add DeleteImageArtifact() for jpeg:extent artifact (thanks to
    Jimmy Xie @ Microsoft).
  * Track morphology changes per thread to avoid a critical section.

2013-04-28  6.8.5-3 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-3, SVN revision 12025.

2013-04-29  6.8.5-3 Cristy  <quetzlzacatenango@image...>
  * Add DeleteImageArtifact() for jpeg:extent artifact (thanks to
    Jimmy Xie @ Microsoft).
  * Add support for JXR / WDP image format.

2013-04-28  6.8.5-2 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-2, SVN revision 12013.

2013-04-28  6.8.5-2 Cristy  <quetzlzacatenango@image...>
  * Use GetImageOption() for webp options (e.g. webp:lossless).

2013-04-27  6.8.5-1 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-1, SVN revision 12000.

2013-04-26  6.8.5-1 Cristy  <quetzlzacatenango@image...>
  * Recognize xc:gray50 is non-linear.
  * Loop over read() until requested bytes are consumed (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?t=23268).
  * Don't use gamma lookup map when HDRI is enabled.

2013-04-24  6.8.5-0 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.5-0, SVN revision 11979.

2013-04-16  6.8.5-0 Glenn Randers-Pehrson <glennrp@image...>
  * Handle benign errors as warnings in the PNG coder.

2013-04-16  6.8.5-0 Cristy  <quetzlzacatenango@image...>
  * Don't modify channel values for -separate (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23193).
  * The -adaptive-sharpen option is now sharpening properly (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23211).
  * Sometimes an image says its grayscale when its not (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23217).
  * Use malloc() to allocate X image data (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23221).
  * If there are more components than quantization tables, the last table is
    replicated.
  * Removed the ICC profile from the logo: image definition in coders/magick.c;
    libpng16 detected that it was a broken sRGB profile.
  * Negatives raised to a non-integer power returns NaN's (reference
   http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23234).

2013-04-15  6.8.4-10 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-10, SVN revision 11851.

2013-04-11  6.8.4-10 Cristy  <quetzlzacatenango@image...>
  * Ensure -define jpeg:extent is resticted to at most 7 iterations (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23179).
  * Move X11 font support from annotate.c source module to xwindow.c.

2013-04-10  6.8.4-9 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-9, SVN revision 11818.

2013-04-10  6.8.4-9 Bastien Roucaries  <roucaries.basti...>
  * Respect --program-suffix configure script option (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23143).
  * Update to the newest AX_CHECK_PTHREAD macro from autoconf-archive.

2013-04-10  6.8.4-9 Anthony Thyssen <A.Thyssen@griffith...>
  * Save the calculated angle for "deskew" as the artifact "deskew:angle"

2013-04-08  6.8.4-9 Cristy  <quetzlzacatenango@image...>
  * Pass JP2 format type to decoder (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23038).
  * Previously tinting a grayscale image returned dark results.
  * The -page option only affects new images (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23172).
  * Revert 'Move binaries to lib subdirectory and link are created from binary
	  package' patch.  We're getting too many bug reports.

2013-04-07  6.8.4-8 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-8, SVN revision 11743.

2013-04-06  6.8.4-8 Cristy  <quetzlzacatenango@image...>
  * Include intensity type in the MIFF metadata.

2013-04-06  6.8.4-7 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-7, SVN revision 11720.

2013-04-05  6.8.4-7 Anthony Thyssen <A.Thyssen@griffith...>
  * Fix -sample sampling point to midpoints of sampling areas
  * add a "sample:offset=" define to allow users to adjust this
    sampling point position in terms of percentage (default = 50x50)

2013-04-02  6.8.4-7 Glenn Randers-Pehrson <glennrp@image...>
  * Don't write a PNG gAMA or cHRM chunk when writing the iCCP or sRGB chunk.

2013-04-02  6.8.4-7 Cristy  <quetzlzacatenango@image...>
  * Return MagickWand for the library name for Wand.pc.
  * The LCH colorspace makes the round-trip now.
  * Revert the default upsampling algortithm for JPEG (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23100).
  * Prevent fault when temporary directory is not-writable (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23117).

2013-04-01  6.8.4-7 Bastien Roucaries  <roucaries.basti...>
  * Prepare X11 support as a plugin.
  * Fix compilation under HPUX of perlmagick

2013-04-01  6.8.4-6 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-6, SVN revision 11640.

2013-04-01  6.8.4-6 Cristy  <quetzlzacatenango@image...>
  * The -clut option return a luma grayscale instead of the expected luminance.
  * Add moduledir variable to MagickCore.pc to support the MagickFilter and
    MagickCore kits.
  * Caption fits the sized area (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23085).

2013-03-31  6.8.4-5 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-5, SVN revision 11619.

2013-03-30  6.8.4-5 Cristy  <quetzlzacatenango@image...>
  * Fix transient bug when writing grayscale MIFF images.
  * Adding noise to a gray image returns a gray image as expected.
  * Image interlace no longer overwritten by proper cloning for GIF format.
  * Extract the clipping path from an image file with clip:myimage.

2013-03-29  6.8.4-4 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-4, SVN revision 11591.

2013-03-29  6.8.4-4 Cristy  <quetzlzacatenango@image...>
  * Update unit test signatures for Q8.
  * Resolve send() / recv() socket problems under MinGW.

2013-03-28  6.8.4-3 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-3, SVN revision 11581.

2013-03-28  6.8.4-3 Cristy  <quetzlzacatenango@image...>
  * Revert patch to ContrastStretchImage() to match results from 6.8.3-3.

2013-03-27  6.8.4-2 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-2, SVN revision 11558.

2013-03-27  6.8.4-2 Cristy  <quetzlzacatenango@image...>
  * Use MorphologyApply() rather than MorphologyImage() for -sharpen / -blur.

2013-03-27  6.8.4-1 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-1, SVN revision 11552.

2013-03-26  6.8.4-1 Cristy  <quetzlzacatenango@image...>
  * Sync 'intensity' option with current image.
  * Normalize sharpen kernel to match that of 6.8.3-3.

2013-03-26  6.8.4-0 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.4-0, SVN revision 11531.

2013-03-20  6.8.4-0 Cristy  <quetzlzacatenango@image...>
  * Do not write zero-length TIFF tags (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22957).
  * Math library should be private for *.pc.in configuration files (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=22986).
  * Do not split words for caption (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=17123).
  * Modify the configure script check for the webp delegate library (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=23025).
  * The -blur, -guassian-blur, and -sharpen are now convenience methods
    for -morphology convolve.
  * Fix infinite loop for 'display -window' (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23028).
  * Revert -auto-level patch to match the results of ImageMagick 6.8.3-4.
  * Revert g_type_init() patch in svg.c (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23035).

2013-03-18  6.8.3-10 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.3-10, SVN revision 11413.

2013-03-15  6.8.3-10 Glenn Randers-Pehrson <glennrp@image...>
  * Added IM, libpng, and zlib version info to debug output.

2013-03-10  6.8.3-10 Bastien Roucaries  <roucaries.basti...>
  * Move PerlMagick arch independant part to 'default' folder.
  * Move binaries to lib subdirectory and link are created from binary package.

2013-03-10  6.8.3-10 Cristy  <quetzlzacatenango@image...>
  * The TXT image format can now generate output compatible with the
    -sparse-color option (e.g. convert image.png sparse-color:image.txt).
  * Support -intensity option: method to generate an intensity value from a
    pixel.
  * Add -similarity-threshold option to the compare utility, the minimum
    distortion for a (sub)image match.
  * Avoid seq-fault in AcquireQuantumInfo() (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=22973).
  * Comment resource initializers in magick/resource.c.

4 files changed, 11 insertions, 11 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 7b9bffb0b3a..6d9990560c3 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.194 2013/05/09 07:39:09 adam Exp $
+# $NetBSD: Makefile,v 1.195 2013/05/30 13:40:37 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	3
 
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	Package for display and interactive manipulation of images
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 7dbc9144529..631e6b7d7b9 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.99 2013/03/17 15:06:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.100 2013/05/30 13:40:37 wiz Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
-IM_MAJOR_VER=		6.8.3
-IM_MINOR_VER=		9
+IM_MAJOR_VER=		6.8.5
+IM_MINOR_VER=		8
 IM_MAJOR_LIB_VER=	6
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index a6f0ddd8965..ef3057b02d5 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.76 2013/03/05 17:34:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.77 2013/05/30 13:40:37 wiz Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -113,6 +113,7 @@ include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/splay-tree.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/statistic.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/stream.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/string_.h
+include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/studio.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/threshold.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/timer.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/token.h
@@ -1182,7 +1183,7 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/type-ghostscript.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/type-windows.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/type.xml
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/source/wand.c
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/sponsors.html
+share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/support.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/stream.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/subversion.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/t-shirt.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 653ecba5640..e9529646708 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.117 2013/03/17 15:06:41 wiz Exp $
+$NetBSD: distinfo,v 1.118 2013/05/30 13:40:37 wiz Exp $
 
-SHA1 (ImageMagick-6.8.3-9.tar.xz) = 6410dff69abcfeb043b4bbd05626aee9b1925bfa
-RMD160 (ImageMagick-6.8.3-9.tar.xz) = 871432a063abf8bfa1689eedaa3dff18a0043322
-Size (ImageMagick-6.8.3-9.tar.xz) = 8362412 bytes
+SHA1 (ImageMagick-6.8.5-8.tar.xz) = 4d961c8cf86611eb88ba8be616229101ceb3e7ff
+RMD160 (ImageMagick-6.8.5-8.tar.xz) = 17828ace4c066ad2ef8b1dcfac93c85f10caec60
+Size (ImageMagick-6.8.5-8.tar.xz) = 8166540 bytes