Update to 6.8.9-7:

2014-08-16  6.8.9-7 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.9-7, SVN revision 16330.

2014-08-14  6.8.9-7 Cristy  <quetzlzacatenango@image...>
  * Fix off by one buglet when extracting profiles 8BIM (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26095).

2014-07-31  6.8.9-7 Dirk Lemstra <dirk@snakeware...>
  * Fixed bug when reading 1 bit PSD. (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26015).

2014-07-25  6.8.9-7 Glenn Randers-Pehrson <glennrp@image...>
  * Relocate initialization of "image_colors" in the PNG encoder, to avoid
    a possible use of uninitialized variable.

2014-07-25  6.8.9-6 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.9-6, SVN revision 16211.

2014-07-24  6.8.9-6 Glenn Randers-Pehrson <glennrp@image...>
  * Use IsOptionMember() instead of LocaleNCompare() in coders/png.c to
    parse the list of excluded and included PNG chunks.

2014-07-19  6.8.9-6 Dirk Lemstra <dirk@snakeware...>
  * Fixed fill-rule in SVG clip path (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25882).

2014-07-14  6.8.9-6 Glenn Randers-Pehrson <glennrp@image...>
  * Removed some dead code (testing image->matte) in PNG64 encoder.

2014-07-07  6.8.9-6 Dirk Lemstra <dirk@snakeware...>
  * Added support for R5G6B5, RGB5A1 and RGBA4 dds files.

2014-07-01  6.8.9-6 Cristy  <quetzlzacatenango@image...>
  * Write LAB pixels as percentages in the TXT image format (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25830).
  * Throw exception when image morphology differs when comparing (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25927).
  * Remove mogrify backup file (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25683).
  * Read WEBP images from STDIN (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25886).

2014-07-01  6.8.9-5 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.9-5, SVN revision 16123.

2014-06-28  6.8.9-5 Glenn Randers-Pehrson <glennrp@image...>
  * Do not let libpng16 check ICC/sRGB profiles in non-debug runs; we do
    it ourselves anyway.  Avoids emitting "known incorrect profile" warnings.
    For strict profile checking and warning, use "-debug coder".

2014-06-27  6.8.9-5 Dirk Lemstra <dirk@snakeware...>
  * Disabled OpenCL acceleration when image has a 'mask' or 'clip-mask'.

2014-06-25  6.8.9-5 Cristy  <quetzlzacatenango@image...>
  * Use -define profile:skip=icc, for example,  to skip color profiles on read.

2014-06-23  6.8.9-4 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.9-4, SVN revision 16057.

2014-06-15  6.8.9-4 Cristy  <quetzlzacatenango@image...>
  * Support RMS argument for -evaluate-sequence and -statistic options.
  * Fix lseek define for a successful compile under 64-bit MinGW.
  * Pipe image to display program no longer reports an exception (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23532).
  * Check that profile is non-NULL in coders/tiff.c (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25770).

2014-06-08  6.8.9-3 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.9-3, SVN revision 15975.

2014-06-07  6.8.9-3 Glenn Randers-Pehrson <glennrp@image...>
  * Quiet warning about unused variable "skip_to_iend" in coders/png.c.

2014-06-07  6.8.9-3 Dirk Lemstra <dirk@snakeware...>
  * Fixed creation of SVG from 8bim clip path. (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=25594).

2014-06-02  6.8.9-3 Cristy  <quetzlzacatenango@image...>
  * The -version option returns 0 status (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25667).
  * The inline coder can now read from standard input (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25641).
  * Add '=' character to the sanitize whitelist.

2014-05-30  6.8.9-2 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.9-2, SVN revision 15932.

2014-05-18  6.8.9-2 Glenn Randers-Pehrson <glennrp@image...>
  * Fixed some bugs in the PNG codec discovered by coverity analysis.

2014-05-14  6.8.9-2 Cristy  <quetzlzacatenango@image...>
  * The -fx equality operator returns a proper boolean result now (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25580).
  * Permit spaces in the gradient color specification (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25614).
  * Fix IdentifyImage() crash when image->magick member is null (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25615).
  * The -format M and Y channels are no longer reversed (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25633).
  * Remove Makefile race condition where two targets attempt to install
    magick-baseconfig.h (reference
    http://git.buildroot.net/buildroot/commit/?id=7395ee9d3b88e45798143e05a28d6d4b51409130)
  * Fix memory leak in BlobToStringInfo() (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25639).
  * In certain cases, -adaptive-sharpen failed to sharpen (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=23211

2014-05-12  6.8.9-2 Dirk Lemstra <dirk@snakeware...>
  * Bump major Magick++ library version.
  * Added support for writing RLE compressed TGA files (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=12335).
  * Improved performance of parsing the xmp profile (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25612).
  * Fixed detecting transparency in PSD files (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25634).

2014-05-09  6.8.9-1 Cristy  <quetzlzacatenango@image...>
  * New version 6.8.9-1, SVN revision 15697.

2014-04-22  6.8.9-1 Glenn Randers-Pehrson <glennrp@image...>
  * Fixed bug with the PNG00 subformat when the original format was PNG32.
  * The "-strip" option now only removes profiles and comments from PNG
    output.  Previously the background, density, and other metadata were
    also discarded.

2014-04-22  6.8.9-1 Cristy  <quetzlzacatenango@image...>
  * Support new -hough-lines option.
  * Support new -mean-shift option.
  * identify -units without argument no longer faults (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25542).
  * Require OpenJP2 version 2.1.0 (opj_stream_set_user_data() method signature
    change between 2.0.0 and 2.1.0).

2014-04-20  6.8.9-1 Dirk Lemstra <dirk@snakeware...>
  * Added image moments, canny edge and hough line to Magick++.
  * The 8bim profile will be updated when the icc/iptc/xmp profile is changed.
  * Fix for stack overflow in DestroyXMLTree in Windows (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=25457).
  * Added new coder for VIPS image format (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25445).
  * Moved detection of type to a separate method in Magick++. The type() method
    no longer modifies the type of the image. Use determineType() instead.
  * Improved error messages when a coder uses Ghostscript.

6 files changed, 26 insertions, 18 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 6271a079d2f..a4d120fd3aa 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.206 2014/06/17 11:02:42 wiz Exp $
+# $NetBSD: Makefile,v 1.207 2014/08/21 21:41:52 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	2
 
 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 3b527ad095a..1fb885404aa 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.106 2014/04/12 08:56:39 adam Exp $
+# $NetBSD: Makefile.common,v 1.107 2014/08/21 21:41:52 wiz Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
 IM_MAJOR_VER=		6.8.9
-IM_MINOR_VER=		0
+IM_MINOR_VER=		7
 IM_MAJOR_LIB_VER=	6
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 7a58b2f15b0..98fc0908ef2 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.80 2014/02/13 19:53:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.81 2014/08/21 21:41:52 wiz Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -17,6 +17,7 @@ bin/montage
 bin/stream
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Blob.h
+include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/ChannelMoments.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/CoderInfo.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Color.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Drawable.h
@@ -1179,9 +1180,9 @@ 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/support.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/t-shirt.html
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/wand.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/www/webp.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 192248de1d5..0f5a4f2ccd7 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.125 2014/04/12 08:56:39 adam Exp $
+$NetBSD: distinfo,v 1.126 2014/08/21 21:41:52 wiz Exp $
 
-SHA1 (ImageMagick-6.8.9-0.tar.xz) = 098a98ba2b5c988084da3d103c6ce8fff962bbf8
-RMD160 (ImageMagick-6.8.9-0.tar.xz) = 25579943c88d6b427c89979342b210fcf001ee10
-Size (ImageMagick-6.8.9-0.tar.xz) = 7545228 bytes
-SHA1 (patch-configure) = 87ae69ea06d9ed392627ec2067192e1a292106c4
+SHA1 (ImageMagick-6.8.9-7.tar.xz) = 896a31574a06d2f2a9c1558fe05afe0c65012124
+RMD160 (ImageMagick-6.8.9-7.tar.xz) = 1e6253e3c928b66709d7627aeea469963b39e6ff
+Size (ImageMagick-6.8.9-7.tar.xz) = 7552828 bytes
+SHA1 (patch-configure) = 3e0f1cce437d3b1b62b37b06e4cf20c498541505
diff --git a/graphics/ImageMagick/patches/patch-configure b/graphics/ImageMagick/patches/patch-configure
index 93fea78cd70..2b3a08c7778 100644
--- a/graphics/ImageMagick/patches/patch-configure
+++ b/graphics/ImageMagick/patches/patch-configure
@@ -1,10 +1,19 @@
-$NetBSD: patch-configure,v 1.1 2013/11/05 17:27:10 adam Exp $
+$NetBSD: patch-configure,v 1.2 2014/08/21 21:41:52 wiz Exp $
 
-Portability fix.
+First chunk: ./configure: 28988: Syntax error: Bad substitution
+Others: test(1) portability fix.
 
---- configure.orig	2013-11-05 17:24:55.000000000 +0000
+--- configure.orig	2014-08-16 16:06:45.000000000 +0000
 +++ configure
-@@ -34656,7 +34656,7 @@ $as_echo "no" >&6; }
+@@ -28985,7 +28985,6 @@ fi
+ have_fpx='no'
+ FPX_LIBS=''
+ SAVED_LIBS=${LIBS}
+-LIBS=${LIBS/-ldjvulibre/}
+ if test "$with_fpx" != 'no'; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+ $as_echo "-------------------------------------------------------------" >&6; }
+@@ -33879,7 +33878,7 @@ $as_echo "no" >&6; }
  fi
  
  
@@ -13,7 +22,7 @@ Portability fix.
    MPEGDecodeDelegateDefault='ffmpeg'
    # Extract the first word of ""$MPEGDecodeDelegateDefault"", so it can be a program name with args.
  set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
-@@ -34741,7 +34741,7 @@ $as_echo "no" >&6; }
+@@ -33964,7 +33963,7 @@ $as_echo "no" >&6; }
  fi
  
  
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 3fe08a3465f..dd1b710ab9c 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.102 2014/05/29 23:36:40 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2014/08/21 21:41:52 wiz Exp $
 
 .include "../../graphics/ImageMagick/Makefile.common"
 
 PKGNAME=	p5-PerlMagick-${DISTVERSION}
-PKGREVISION=	1
 SVR4_PKGNAME=	p5pma
 
 MAINTAINER=	pkgsrc-users@NetBSD.org