# HG changeset patch
# User John Beck <John.Beck@Oracle.COM>
# Date 1465928536 25200
# Node ID f1a79541c99d376f9279397cea09e4770d4db8eb
# Parent  76759d0d513418e60a19ae138892d3c675cba627
23586894 Upgrade ImageMagick to 6.9.4-9
23586855 problem in UTILITY/IMAGEMAGICK

diff -r 76759d0d5134 -r f1a79541c99d components/imagemagick/Makefile
--- a/components/imagemagick/Makefile	Tue Jun 14 09:30:12 2016 -0700
+++ b/components/imagemagick/Makefile	Tue Jun 14 11:22:16 2016 -0700
@@ -29,12 +29,12 @@
 COMPONENT_NAME=			ImageMagick
 COMPONENT_VERSION=		6.9.4
 COMPONENT_MAJOR_VERSION=	$(shell echo $(COMPONENT_VERSION) | $(GSED) -e 's/\([0-9]\+\)\.[0-9]\+\.[0-9]\+/\1/')
-COMPONENT_SUBVERSION=		2
+COMPONENT_SUBVERSION=		9
 HUMAN_VERSION=			$(COMPONENT_VERSION)-$(COMPONENT_SUBVERSION)
 COMPONENT_PROJECT_URL=		http://www.imagemagick.org/
 COMPONENT_ARCHIVE=		$(COMPONENT_SRC)-$(COMPONENT_SUBVERSION).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:0974d97ceb45e32d25e98bc279690988fa5d5f5b9d50e5a6dc5e5b7eef892f50
+    sha256:328fba877c15dece7ced2e36662230944d0fd7c9990cd994ae848b43e9d51414
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/download/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/imagemagick
 
diff -r 76759d0d5134 -r f1a79541c99d components/imagemagick/patches/la.patch
--- a/components/imagemagick/patches/la.patch	Tue Jun 14 09:30:12 2016 -0700
+++ b/components/imagemagick/patches/la.patch	Tue Jun 14 11:22:16 2016 -0700
@@ -15,7 +15,7 @@
  #else
  #  if defined(_DEBUG)
  #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
-@@ -1480,7 +1480,7 @@
+@@ -1482,7 +1482,7 @@
    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
    assert(name != (char *) NULL);
  #if defined(MAGICKCORE_LTDL_DELEGATE)
@@ -24,7 +24,7 @@
    (void) LocaleLower(name);
  #else
  #if defined(MAGICKCORE_WINDOWS_SUPPORT)
-@@ -1531,7 +1531,7 @@
+@@ -1533,7 +1533,7 @@
  #if !defined(MAGICKCORE_LTDL_DELEGATE)
    (void) FormatLocaleString(name,MaxTextExtent,"%s.dll",tag);
  #else