Update to 6.9.1.6:

2015-06-13  6.9.1-6 Cristy  <quetzlzacatenango@image...>
  * New version 6.9.1-6, SVN revision 18945.

2015-06-14  6.9.1-6 Cristy  <quetzlzacatenango@image...>
  * Cache cloning on disk optimized with sendfile() (if available).
  * Add an additional check for end-of-file for the RLE coder (reference
    http://www.imagemagick.org/discourse-server/viewforum.php?f=3).
  * Respect resource limits in AVS coder.

2015-06-13  6.9.1-6 Glenn Randers-Pehrson <glennrp@image...>
  * Reverted change to 6.9.1-3 that skipped palette-building.

2015-06-13  6.9.1-5 Cristy  <quetzlzacatenango@image...>
  * New version 6.9.1-5, SVN revision 18882.

2015-06-03  6.9.1-5 Cristy  <quetzlzacatenango@image...>
  * Use correct scale when interpretting alpha (e.g. rgba(0,0,0,1)).
  * DrawGetVectorGraphics() now returns proper XML (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=27751).
  * Support writing EXR files with different color types (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=27759).
  * Prefer PKG_CHECK_MODULES() when searching for delegate libraries.
  * Throw exception if frame option bevel exceeds to the image width / height.
  * Resolve undefined behaviors (reference
    http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=27811).

5 files changed, 44 insertions, 8 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 9720dce5d4b..e2bd21b815b 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.218 2015/06/12 10:50:08 wiz Exp $
+# $NetBSD: Makefile,v 1.219 2015/07/01 12:41:20 wiz Exp $
 
-PKGREVISION= 1
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 8bfc3ebafe9..68015a23a34 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.114 2015/06/07 09:13:11 wiz Exp $
+# $NetBSD: Makefile.common,v 1.115 2015/07/01 12:41:20 wiz Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
 IM_MAJOR_VER=		6.9.1
-IM_MINOR_VER=		4
+IM_MINOR_VER=		6
 IM_MAJOR_LIB_VER=	6
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 097d6c745d7..aefabf1c1a7 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.132 2015/06/07 09:13:11 wiz Exp $
+$NetBSD: distinfo,v 1.133 2015/07/01 12:41:20 wiz Exp $
 
-SHA1 (ImageMagick-6.9.1-4.tar.xz) = ed0743e1a999461433a45a10f8afe6bf2c62a884
-RMD160 (ImageMagick-6.9.1-4.tar.xz) = 506b22aa5ab9e453a7894a24a2abb0e6406ec7ef
-Size (ImageMagick-6.9.1-4.tar.xz) = 7978216 bytes
+SHA1 (ImageMagick-6.9.1-6.tar.xz) = 42f4e39c16632bb9ae79f60962b3b647f90260bc
+RMD160 (ImageMagick-6.9.1-6.tar.xz) = 0752f283164c72bbf0ba01f3ed2ebb3f90426a95
+Size (ImageMagick-6.9.1-6.tar.xz) = 8276660 bytes
+SHA1 (patch-magick_profile.c) = eb9f6abe136e1dd342f75f1e3ffcdc6e2ba64dba
+SHA1 (patch-magick_property.c) = bffd5d465bb000d83de76ba81c3913e003b26299
diff --git a/graphics/ImageMagick/patches/patch-magick_profile.c b/graphics/ImageMagick/patches/patch-magick_profile.c
new file mode 100644
index 00000000000..ff0f66038aa
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-magick_profile.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-magick_profile.c,v 1.3 2015/07/01 12:41:20 wiz Exp $
+
+Adapt for pkgsrc path of lcms2.
+
+--- magick/profile.c.orig	2015-06-06 13:46:25.000000000 +0000
++++ magick/profile.c
+@@ -65,9 +65,9 @@
+ #include "magick/token.h"
+ #include "magick/utility.h"
+ #if defined(MAGICKCORE_LCMS_DELEGATE)
+-#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
++#if defined(MAGICKCORE_HAVE_LCMS2_LCMS2_H)
+ #include <wchar.h>
+-#include <lcms/lcms2.h>
++#include <lcms2/lcms2.h>
+ #elif defined(MAGICKCORE_HAVE_LCMS2_H)
+ #include <wchar.h>
+ #include "lcms2.h"
diff --git a/graphics/ImageMagick/patches/patch-magick_property.c b/graphics/ImageMagick/patches/patch-magick_property.c
new file mode 100644
index 00000000000..c218a5f825d
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-magick_property.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-magick_property.c,v 1.4 2015/07/01 12:41:20 wiz Exp $
+
+Adapt for pkgsrc path of lcms2.
+
+--- magick/property.c.orig	2015-06-06 13:46:25.000000000 +0000
++++ magick/property.c
+@@ -81,8 +81,8 @@
+ #include "magick/version.h"
+ #include "magick/xml-tree.h"
+ #if defined(MAGICKCORE_LCMS_DELEGATE)
+-#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
+-#include <lcms/lcms2.h>
++#if defined(MAGICKCORE_HAVE_LCMS2_LCMS2_H)
++#include <lcms2/lcms2.h>
+ #elif defined(MAGICKCORE_HAVE_LCMS2_H)
+ #include "lcms2.h"
+ #elif defined(MAGICKCORE_HAVE_LCMS_LCMS_H)