summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2015-07-08 11:51:50 +0000
committerwiz <wiz>2015-07-08 11:51:50 +0000
commit680161df9fd7c3031813fca2a1e39f5397533ae0 (patch)
treebf3345be74f189dc33965edc3462ed501baef7c8
parentc3438654e0f2d02abb948f5705d6842789f57d29 (diff)
downloadpkgsrc-680161df9fd7c3031813fca2a1e39f5397533ae0.tar.gz
Update to 6.9.1-7:
2015-07-04 6.9.1-7 Cristy <quetzlzacatenango@image...> * New version 6.9.1-7, SVN revision 19121. 2015-06-27 6.9.1-7 Eric Dalquist * Fixed and escaped output of the json coder. (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&p=27894). 2015-06-25 6.9.1-7 Cristy <quetzlzacatenango@image...> * Support BPG image format (respects -quality option). * A bordered transparent image now remains transparent (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=5&t=27937). * The -update option behavior restored (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=27939).
-rw-r--r--graphics/ImageMagick/Makefile.common4
-rw-r--r--graphics/ImageMagick/distinfo9
-rw-r--r--graphics/ImageMagick/patches/patch-magick_profile.c18
3 files changed, 6 insertions, 25 deletions
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 68015a23a34..76f6b6bff2c 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.115 2015/07/01 12:41:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.116 2015/07/08 11:51:50 wiz Exp $
#
# used by graphics/p5-PerlMagick/Makefile
IM_MAJOR_VER= 6.9.1
-IM_MINOR_VER= 6
+IM_MINOR_VER= 7
IM_MAJOR_LIB_VER= 6
.if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index aefabf1c1a7..4d89436b566 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.133 2015/07/01 12:41:20 wiz Exp $
+$NetBSD: distinfo,v 1.134 2015/07/08 11:51:50 wiz Exp $
-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 (ImageMagick-6.9.1-7.tar.xz) = d58a448e6026cb2ecc2cc5804e35d6bc09924081
+RMD160 (ImageMagick-6.9.1-7.tar.xz) = 79d903b831d72dce50712dfc2632260b263a94b5
+Size (ImageMagick-6.9.1-7.tar.xz) = 8284892 bytes
SHA1 (patch-magick_property.c) = bffd5d465bb000d83de76ba81c3913e003b26299
diff --git a/graphics/ImageMagick/patches/patch-magick_profile.c b/graphics/ImageMagick/patches/patch-magick_profile.c
deleted file mode 100644
index ff0f66038aa..00000000000
--- a/graphics/ImageMagick/patches/patch-magick_profile.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$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"