summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/ImageMagick/Makefile10
-rw-r--r--graphics/ImageMagick/Makefile.common4
-rw-r--r--graphics/ImageMagick/PLIST4
-rw-r--r--graphics/ImageMagick/distinfo10
4 files changed, 13 insertions, 15 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 490a61b758e..aceb12ce45f 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.224 2016/05/10 16:40:45 adam Exp $
+# $NetBSD: Makefile,v 1.225 2016/06/06 12:24:27 wiz Exp $
.include "Makefile.common"
@@ -22,12 +22,10 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
# This one used to be optional, but it depends on ghostscript even if it's
# disabled so having a way to disable it seems pointless.
CONFIGURE_ARGS+= --with-gslib
-PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in
+PKGCONFIG_OVERRIDE+= MagickWand/MagickWand.pc.in
+PKGCONFIG_OVERRIDE+= MagickCore/MagickCore.pc.in
+PKGCONFIG_OVERRIDE+= MagickCore/ImageMagick.pc.in
PKGCONFIG_OVERRIDE+= Magick++/lib/Magick++.pc.in
-PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
-PKGCONFIG_OVERRIDE+= magick/MagickCore.pc.in
-PKGCONFIG_OVERRIDE+= wand/MagickWand.pc.in
-PKGCONFIG_OVERRIDE+= wand/Wand.pc.in
GCC_REQD+= 2.95.3
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index dd09a576991..91a08cf57a3 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.119 2016/05/22 17:15:44 wiz Exp $
+# $NetBSD: Makefile.common,v 1.120 2016/06/06 12:24:27 wiz Exp $
#
# used by graphics/p5-PerlMagick/Makefile
IM_MAJOR_VER= 7.0.1
-IM_MINOR_VER= 6
+IM_MINOR_VER= 9
IM_MAJOR_LIB_VER= 7
.if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 471d817245f..43eb7d8b6f0 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.86 2016/05/10 16:40:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.87 2016/06/06 12:24:27 wiz Exp $
bin/Magick++-config
bin/MagickCore-config
bin/MagickWand-config
@@ -32,7 +32,6 @@ include/ImageMagick-7/Magick++/STL.h
include/ImageMagick-7/Magick++/Statistic.h
include/ImageMagick-7/Magick++/TypeMetric.h
include/ImageMagick-7/MagickCore/MagickCore.h
-include/ImageMagick-7/MagickCore/accelerate.h
include/ImageMagick-7/MagickCore/animate.h
include/ImageMagick-7/MagickCore/annotate.h
include/ImageMagick-7/MagickCore/artifact.h
@@ -1255,6 +1254,7 @@ share/doc/ImageMagick-7/www/source/type.xml
share/doc/ImageMagick-7/www/source/wand.c
share/doc/ImageMagick-7/www/sponsors.html
share/doc/ImageMagick-7/www/stream.html
+share/doc/ImageMagick-7/www/subversion.html
share/doc/ImageMagick-7/www/support.html
share/doc/ImageMagick-7/www/wand.png
share/doc/ImageMagick-7/www/webp.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index ca6bf41c1f0..f9621570067 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.138 2016/05/22 17:15:44 wiz Exp $
+$NetBSD: distinfo,v 1.139 2016/06/06 12:24:27 wiz Exp $
-SHA1 (ImageMagick-7.0.1-6.tar.xz) = 7777e6949b3b085470cf04edf63fde8b4d992f25
-RMD160 (ImageMagick-7.0.1-6.tar.xz) = 82ee94b1a035fe3fedc27fbd3e34b6e8eae2e331
-SHA512 (ImageMagick-7.0.1-6.tar.xz) = c04791bae434d751c2ecb192f7dea37e22b5a9ab4cba3b85ad4d024219f608d6d221a7b76f7d4e4fe792c3c2113578852aea6bb9a06f91dd444e8df8751be750
-Size (ImageMagick-7.0.1-6.tar.xz) = 8289416 bytes
+SHA1 (ImageMagick-7.0.1-9.tar.xz) = 9fe7371189e89b0b1cbb6251716fc73108a24318
+RMD160 (ImageMagick-7.0.1-9.tar.xz) = 7f3732b4d0af8099ff37dd36a4a6ff6beeac2fe9
+SHA512 (ImageMagick-7.0.1-9.tar.xz) = 1be64919f5ac2bfbfbdc97c91301339f1d66fb13c08a62ac6a362a6243d8d1ecfbc4353ec430b5accbeca3f4defb5b9e51c1a4fbfb6764e5ab2b9c1bf7dc21ae
+Size (ImageMagick-7.0.1-9.tar.xz) = 8288780 bytes