summaryrefslogtreecommitdiff
path: root/graphics/ImageMagick
diff options
context:
space:
mode:
authorwiz <wiz>2016-04-29 12:16:46 +0000
committerwiz <wiz>2016-04-29 12:16:46 +0000
commitaf96ea7c8f443fbb26c52987c9cd321346c2712a (patch)
tree2fd9dce06cf6fdd15c7915939dd2d0c2906623e4 /graphics/ImageMagick
parent2919c5c59016fadf8dab6469cbbcfd16e461f1f2 (diff)
downloadpkgsrc-af96ea7c8f443fbb26c52987c9cd321346c2712a.tar.gz
Update ImageMagick and p5-PerlMagick to 6.9.3.8.
2016-03-22 6.9.3-8 Cristy <quetzlzacatenango@image...> * Respect gravity when rendering text (e.g. convert -gravity center my.txt) * Return empty string for %d property and no directory (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29365) * Return filename for the %i property (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=29364). * Fixed lost pixels in frequency space (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29374). 2016-03-06 6.9.3-7 Cristy <quetzlzacatenango@image...> * New version 6.9.3-7, GIT revision 10628:810a9fe:20160306 2016-03-05 6.9.3-7 Dirk Lemstra <dirk@lem.....org> * -size can now be used the specify the maximum width/height for the following vector formats: * SVG (when librsvg and cairo are being used). * EMF (did not work on Windows). 2016-02-29 6.9.3-7 Cristy <quetzlzacatenango@image...> * Fixed text alignment issue for label: / coder: (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29223). 2016-02-27 6.9.3-6 Cristy <quetzlzacatenango@image...> * New version 6.9.3-6, GIT revision 10597:83584a1:20160228. 2016-02-25 6.9.3-6 Cristy <quetzlzacatenango@image...> * Ensure TXT: image format survives round-trip (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29206). 2016-02-21 6.9.2-6 Dirk Lemstra <dirk@lem.....org> * Added wavelet denoise. 2016-02-20 6.9.3-5 Cristy <quetzlzacatenango@image...> * New version 6.9.3-5, GIT revision 10572:cb24a69:20160219. 2016-02-16 6.9.3-5 Cristy <quetzlzacatenango@image...> * Too many bytes when writing raw image formats (reference https://github.com/ImageMagick/ImageMagick/issues/132). 2016-02-12 6.9.3-4 Cristy <quetzlzacatenango@image...> * New version 6.9.3-4, GIT revision 10560:09f5f5d:20160212. 2016-02-12 6.9.3-4 Dirk Lemstra <dirk@lem.....org> * Fixed memory leak when reading an SVG without width/height (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=27&p=130197). 2016-02-09 6.9.3-4 Cristy <quetzlzacatenango@image...> * Fix compiler error for complext text layout. 2016-02-05 6.9.3-3 Cristy <quetzlzacatenango@image...> * New version 6.9.3-3, GIT revision 10540:6b4c918:20160206. 2016-02-04 6.9.3-3 Cristy <quetzlzacatenango@image...> * Numerous bugs fixed from fuzzed images (reference https://github.com/ImageMagick/ImageMagick/issues/123). * The -bias option is no longer a noop (reference https://github.com/ImageMagick/ImageMagick/issues/125). 2016-01-25 6.9.3-3 Dirk Lemstra <dirk@lem.....org> * Read XCF layer name (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&p=129638). 2016-01-23 6.9.3-2 Cristy <quetzlzacatenango@image...> * New version 6.9.3-2, GIT revision 10496:315028c:20160122. 2016-01-17 6.9.3-2 Cristy <quetzlzacatenango@image...> * Don't reuse lock after free (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29031). 2016-01-21 6.9.3-2 Dirk Lemstra <dirk@lem.....org> * Fixed writing DocClass in CALS coder (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&p=129478). 2016-01-17 6.9.3-1 Cristy <quetzlzacatenango@image...> * New version 6.9.3-1, GIT revision 10488:e4f046e:20160116. 2016-01-06 6.9.3-1 Cristy <quetzlzacatenango@image...> * Pair AcquireMagickResource with calls to RelinquishMagickResource when resource limits are hit (reference https://github.com/ImageMagick/ImageMagick/pull/75). * Return non-zero for the -format %b option (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28969). 2016-01-01 6.9.3-0 Cristy <quetzlzacatenango@image...> * New version 6.9.3-0, GIT revision 10445:620328b:20160101. 2015-12-31 6.9.3-0 Cristy <quetzlzacatenango@image...> * Don't break on euro-style numbers (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28910). 2015-12-22 6.9.3-0 Glenn Randers-Pehrson <glennrp@image...> * 16-bit pnm images have a max value of 65535. 2015-12-18 6.9.2-10 Cristy <quetzlzacatenango@image...> * New version 6.9.2-10, GIT revision 10415:e31c09d:20151219. 2015-12-19 6.9.2-10 Cristy <quetzlzacatenango@image...> * Fixed compile error when POSIX threads are not defined. http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28791). 2015-12-18 6.9.2-9 Cristy <quetzlzacatenango@image...> * New version 6.9.2-9, GIT revision 10402:0027295:20151219 2015-12-05 6.9.2-9 Dirk Lemstra <dirk@lem.....org> * Fixed memory leak when reading incorrect PSD files (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28791). 2015-12-05 6.9.2-9 Cristy <quetzlzacatenango@image...> * Enhance PDF to properly handle unicode titles (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28786). * Fix memory leak in icon coder (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=6&t=28848). 2015-12-05 6.9.2-8 Cristy <quetzlzacatenango@image...> * New version 6.9.2-8, GIT revision 10374:ac7d144:20151205. 2015-12-04 6.9.2-8 Cristy <quetzlzacatenango@image...> * Gray artifacts in large gif when using -layers optimize (reference https://github.com/ImageMagick/ImageMagick/issues/57). 2015-11-26 6.9.2-7 Cristy <quetzlzacatenango@image...> * New version 6.9.2-7, GIT revision 10370:eeb7d4e:20151126. 2015-11-24 6.9.2-7 Dirk Lemstra <dirk@lem.....org> * The DICOM reader now handles the rescale intercept and slope. * Added 'bmp3:alpha' option for including the alpha channel when writing an image in the BMP3 format. (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28733). * Only one thread permitted when delegating to the Ghostscript library under Windows. 2015-11-14 6.9.2-6 Cristy <quetzlzacatenango@image...> * New version 6.9.2-6, GIT revision 10341:f408196:20151113. 2015-11-08 6.9.2-6 Cristy <quetzlzacatenango@image...> * PixelColor off by one on i386 (reference https://github.com/ImageMagick/ImageMagick/issues/54). * Eliminate stack overflow (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28658). 2015-11-03 6.9.2-6 Dirk Lemstra <dirk@lem.....org> * Added local contrast enhancement. * Fixed bug in SetPixelCacheExtent that made images all black (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28514). * Added support for reading DICOM images with implicit vr little-endian transfer syntax. 2015-11-02 6.9.2-6 Samuel Thibault <samuel.thibault@...org> * Added 6dot variant for unicode and iso braille formats (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&p=127111). 2015-10-31 6.9.2-5 Cristy <quetzlzacatenango@image...> * New version 6.9.2-5, GIT revision 10316:86a76b6:20151031. 2015-10-15 6.9.2-5 Dirk Lemstra <dirk@lem.....org> * Fixed alpha blending issue with semi-transparent pixels in the merged image of PSD files. This can be disabled by setting the option 'psd:alpha-unblend' to 'off' (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28169). * Fixed issue in jpeg:extent that prevented it from working (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&p=126638). * Fixed memory leak when reading Photoshop layers in a TIFF file. 2015-10-12 6.9.2-5 Cristy <quetzlzacatenango@image...> * Support gradient:bounding-box, gradient:vector, gradient:center, and gradient:radius to shape the gradient rendering. * Recognize label:@- as stdin (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28501). * Make commas optional for coordinates (e.g. 0,0 256,256). 2015-10-10 6.9.2-4 Cristy <quetzlzacatenango@image...> * New version 6.9.2-4, GIT revision 10273:e00cf21:20151010 2015-10-08 6.9.2-4 Dirk Lemstra <dirk@lem.....org> * Fixed accessing subimage in a TIFF photoshop layer (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28469). * Fixed out of bounds error in -splice (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28466). 2015-09-25 6.9.2-4 Eric McConville <emcconville@emccon...> * Created Manhattan Interpolate method for -sparse-color (reference https://github.com/ImageMagick/ImageMagick/pull/36). 2015-09-22 6.9.2-4 Cristy <quetzlzacatenango@image...> * Prevent null pointer access (reference https://github.com/ImageMagick/ImageMagick/pull/34). * Specify histogram code image format implictedly (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28412). * Don't round up for JPEG image resolution (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28422). * Read the whole image @ image.jp2[0] or an individual tile @ image.jp2[1], image.jp2[2]. * The -caption option no longer fails for filenames with @ prefix (reference https://github.com/ImageMagick/ImageMagick/issues/43). * Honor $XDG_CONFIG_HOME and $XDG_CACHE_HOME (reference https://github.com/ImageMagick/ImageMagick/issues/44). 2015-09-19 6.9.2-3 Cristy <quetzlzacatenango@image...> * New version 6.9.2-3, GIT revision 10235:c40ee57:20150919 2015-09-17 6.9.2-2 Dirk Lemstra <dirk@lem.....org> * Added extra checks to avoid out of bounds error when parsing the 8bim profile (reference https://github.com/ImageMagick/ImageMagick/issues/31). * Fixed size of memory allocation in RLE coder to avoid segfault (reference https://github.com/ImageMagick/ImageMagick/issues/32). 2015-09-16 6.9.2-2 Cristy <quetzlzacatenango@image...> * Add Bootstrap MIT license to ImageMagick web CSS and JS. * Use modern idiom for autoconf Fix a forgotten dir when regenerating html doc (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28363). * The -colorspace gray option no long leaves a ghostly shadow (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28350). 2015-09-14 6.9.2-1 Cristy <quetzlzacatenango@image...> * New version 6.9.2-1, GIT revision 10201:5879612:20150913. 2015-09-13 6.9.2-1 Dirk Lemstra <dirk@lem.....org> * Preserving image origin in TGA files (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28310). 2015-08-15 6.9.2-1 Cristy <quetzlzacatenango@image...> * Support color compliance for TXT format (e.g. -define txt:compliance=css) (bug report from Anthony). * The first argument of a hsl() color is integer, not percentage (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=26072). * Limit -fx recursive to avoid stack overflow (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28200). * Support inline images with data URLS. * Report progress less often (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28299). * Don't set image colorspace to gray for -alpha copy option. * Fixed a possible memory leak associated with the -sampling-factor option. * GetImageType() no longer has side-effects to match behavior of IMv7. 2015-08-15 6.9.2-0 Cristy <quetzlzacatenango@image...> * New version 6.9.2-0, GIT revision 10143:3534f6d:20150815. 2015-08-10 6.9.2-0 Cristy <quetzlzacatenango@image...> * Swap pixels for -spread command-line option (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28043). * fx logical operations short circuit (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28179). * Type cast intensity variable (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28182). * Fix ModulusAdd & ModulusSubstract for HDRI compositing (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28186). 2015-07-25 6.9.2-0 Dirk Lemstra <dirk@lem.....org> * Added "-set colorspace:auto-grayscale false" that will prevent automatic conversion to grayscale inside coders that support grayscale. * Fixed -list weight and the options for -weight. * Added fontFamily, fontStyle, fontWeight and textUnderColor to the Image class of Magick++. * Fixed reading Photoshop layers of LSB TIFF files (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=28045). * Fixed memory leak in font cache under Windows (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=6&t=28191). 2015-07-25 6.9.1-10 Cristy <quetzlzacatenango@image...> * New version 6.9.1-10, SVN revision 19269. 2015-07-20 6.9.1-10 Glenn Randers-Pehrson <glennrp@image...> * coders/magick.c: added "-define h:format=FMT" and "-define magick:format=FMT" options. FMT can be any output format supported by ImageMagick except "H" or "MAGICK". If this define is omitted, the encoder uses GIF by default for pseudoclass images and PNM for directclass images, as previously. Made "MAGICK" (read-write) and "H" (write-only) visible in the format list. 2015-07-18 6.9.1-10 Dirk lemstra <dirk@lem.....org> * Removed incorrect EOF check in the DDS reader (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28065). 2015-07-18 6.9.1-10 Cristy <quetzlzacatenango@image...> * Fixed undefined behaviors (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28067). * Return exception message for unknown image properties. * Color shift removed when reading transparent gray images (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28081) 2015-07-18 6.9.1-9 Cristy <quetzlzacatenango@image...> * New version 6.9.1-9, SVN revision 19200. 2015-07-12 6.9.1-9 Dirk Lemstra <dirk@lem.....org> * Fixed issue with radial gradient in MVG (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=27995). 2015-07-11 6.9.1-8 Cristy <quetzlzacatenango@image...> * New version 6.9.1-8, SVN revision 19167. 2015-06-25 6.9.1-8 Cristy <quetzlzacatenango@image...> * Correct install location of the Magick++ headers (reference https://github.com/ImageMagick/ImageMagick/pull/17/commits). * Different gif cropping behavior between versions (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28013). * Cannot read properly simple psd file (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=28002).
Diffstat (limited to 'graphics/ImageMagick')
-rw-r--r--graphics/ImageMagick/Makefile3
-rw-r--r--graphics/ImageMagick/Makefile.common6
-rw-r--r--graphics/ImageMagick/PLIST26
-rw-r--r--graphics/ImageMagick/distinfo11
-rw-r--r--graphics/ImageMagick/patches/patch-magick_property.c17
5 files changed, 27 insertions, 36 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 5e3b072c902..bf8c8d60f33 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.222 2016/04/08 13:13:02 wiz Exp $
+# $NetBSD: Makefile,v 1.223 2016/04/29 12:16:46 wiz Exp $
-PKGREVISION= 3
.include "Makefile.common"
PKGNAME= ImageMagick-${DISTVERSION}
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 76f6b6bff2c..c59d9c6a262 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.116 2015/07/08 11:51:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.117 2016/04/29 12:16:46 wiz Exp $
#
# used by graphics/p5-PerlMagick/Makefile
-IM_MAJOR_VER= 6.9.1
-IM_MINOR_VER= 7
+IM_MAJOR_VER= 6.9.3
+IM_MINOR_VER= 8
IM_MAJOR_LIB_VER= 6
.if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index a11f54e8589..6015f5ce8cc 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.84 2015/06/07 09:13:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.85 2016/04/29 12:16:46 wiz Exp $
bin/Magick++-config
bin/Magick-config
bin/MagickCore-config
@@ -33,7 +33,6 @@ include/ImageMagick-6/Magick++/STL.h
include/ImageMagick-6/Magick++/TypeMetric.h
include/ImageMagick-6/magick/ImageMagick.h
include/ImageMagick-6/magick/MagickCore.h
-include/ImageMagick-6/magick/PreRvIcccm.h
include/ImageMagick-6/magick/accelerate.h
include/ImageMagick-6/magick/animate.h
include/ImageMagick-6/magick/annotate.h
@@ -151,7 +150,7 @@ include/ImageMagick-6/wand/pixel-iterator.h
include/ImageMagick-6/wand/pixel-wand.h
include/ImageMagick-6/wand/stream.h
include/ImageMagick-6/wand/wand-view.h
-lib/ImageMagick-6.9.1/config-Q16/configure.xml
+lib/ImageMagick-6.9.3/config-Q16/configure.xml
lib/libMagick++-6.Q16.la
lib/libMagickCore-6.Q16.la
lib/libMagickWand-6.Q16.la
@@ -192,7 +191,9 @@ share/doc/ImageMagick-6/LICENSE
share/doc/ImageMagick-6/NEWS.txt
share/doc/ImageMagick-6/images/ImageMagick.ico
share/doc/ImageMagick-6/images/affine.png
+share/doc/ImageMagick-6/images/annotate.png
share/doc/ImageMagick-6/images/arc.png
+share/doc/ImageMagick-6/images/atop.gif
share/doc/ImageMagick-6/images/background.jpg
share/doc/ImageMagick-6/images/black.png
share/doc/ImageMagick-6/images/bluebells_clipped.jpg
@@ -203,6 +204,7 @@ share/doc/ImageMagick-6/images/button.gif
share/doc/ImageMagick-6/images/configure.jpg
share/doc/ImageMagick-6/images/cylinder_shaded.png
share/doc/ImageMagick-6/images/difference.png
+share/doc/ImageMagick-6/images/donate.png
share/doc/ImageMagick-6/images/examples.jpg
share/doc/ImageMagick-6/images/frame.jpg
share/doc/ImageMagick-6/images/fuzzy-magick.png
@@ -218,9 +220,11 @@ share/doc/ImageMagick-6/images/logo.jpg
share/doc/ImageMagick-6/images/logo.png
share/doc/ImageMagick-6/images/montage.jpg
share/doc/ImageMagick-6/images/navy.png
+share/doc/ImageMagick-6/images/networkredux.png
share/doc/ImageMagick-6/images/objects.gif
share/doc/ImageMagick-6/images/objects.jpg
share/doc/ImageMagick-6/images/objects.png
+share/doc/ImageMagick-6/images/over.gif
share/doc/ImageMagick-6/images/patterns/bricks.png
share/doc/ImageMagick-6/images/patterns/checkerboard.png
share/doc/ImageMagick-6/images/patterns/circles.png
@@ -291,6 +295,7 @@ share/doc/ImageMagick-6/images/smile.gif
share/doc/ImageMagick-6/images/sponsor.jpg
share/doc/ImageMagick-6/images/sprite.jpg
share/doc/ImageMagick-6/images/t-shirt.png
+share/doc/ImageMagick-6/images/transloadit.png
share/doc/ImageMagick-6/images/wand.ico
share/doc/ImageMagick-6/images/wand.png
share/doc/ImageMagick-6/images/white-highlight.png
@@ -313,6 +318,7 @@ share/doc/ImageMagick-6/www/Magick++/Exception.html
share/doc/ImageMagick-6/www/Magick++/FormatCharacters.html
share/doc/ImageMagick-6/www/Magick++/Future.html
share/doc/ImageMagick-6/www/Magick++/Geometry.html
+share/doc/ImageMagick-6/www/Magick++/Image++.html
share/doc/ImageMagick-6/www/Magick++/Image.fig
share/doc/ImageMagick-6/www/Magick++/Image.html
share/doc/ImageMagick-6/www/Magick++/Image.png
@@ -341,6 +347,7 @@ share/doc/ImageMagick-6/www/advanced-unix-installation.html
share/doc/ImageMagick-6/www/advanced-windows-installation.html
share/doc/ImageMagick-6/www/animate.html
share/doc/ImageMagick-6/www/api.html
+share/doc/ImageMagick-6/www/api/Image++.html
share/doc/ImageMagick-6/www/api/MagickCore/ImageMagick_8h-source.html
share/doc/ImageMagick-6/www/api/MagickCore/ImageMagick_8h.html
share/doc/ImageMagick-6/www/api/MagickCore/MagickCore_8h-source.html
@@ -1081,6 +1088,7 @@ share/doc/ImageMagick-6/www/api/image-view.html
share/doc/ImageMagick-6/www/api/image.html
share/doc/ImageMagick-6/www/api/layer.html
share/doc/ImageMagick-6/www/api/list.html
+share/doc/ImageMagick-6/www/api/magick++-classes.html
share/doc/ImageMagick-6/www/api/magick-deprecate.html
share/doc/ImageMagick-6/www/api/magick-image.html
share/doc/ImageMagick-6/www/api/magick-property.html
@@ -1126,7 +1134,7 @@ share/doc/ImageMagick-6/www/conjure.html
share/doc/ImageMagick-6/www/connected-components.html
share/doc/ImageMagick-6/www/contact.html
share/doc/ImageMagick-6/www/convert.html
-share/doc/ImageMagick-6/www/css/bootstrap.min.css
+share/doc/ImageMagick-6/www/css/README.txt
share/doc/ImageMagick-6/www/css/magick.css
share/doc/ImageMagick-6/www/display.html
share/doc/ImageMagick-6/www/distribute-pixel-cache.html
@@ -1138,6 +1146,7 @@ share/doc/ImageMagick-6/www/export.html
share/doc/ImageMagick-6/www/favicon.ico
share/doc/ImageMagick-6/www/formats.html
share/doc/ImageMagick-6/www/fx.html
+share/doc/ImageMagick-6/www/gradient.html
share/doc/ImageMagick-6/www/high-dynamic-range.html
share/doc/ImageMagick-6/www/history.html
share/doc/ImageMagick-6/www/identify.html
@@ -1145,18 +1154,19 @@ share/doc/ImageMagick-6/www/import.html
share/doc/ImageMagick-6/www/index.html
share/doc/ImageMagick-6/www/install-source.html
share/doc/ImageMagick-6/www/jp2.html
-share/doc/ImageMagick-6/www/js/bootstrap.min.js
+share/doc/ImageMagick-6/www/js/README.txt
+share/doc/ImageMagick-6/www/js/magick.js
share/doc/ImageMagick-6/www/license.html
share/doc/ImageMagick-6/www/links.html
share/doc/ImageMagick-6/www/magick++.html
share/doc/ImageMagick-6/www/magick-core.html
share/doc/ImageMagick-6/www/magick-vector-graphics.html
share/doc/ImageMagick-6/www/magick-wand.html
-share/doc/ImageMagick-6/www/magick.css
share/doc/ImageMagick-6/www/miff.html
share/doc/ImageMagick-6/www/mogrify.html
share/doc/ImageMagick-6/www/montage.html
share/doc/ImageMagick-6/www/motion-picture.html
+share/doc/ImageMagick-6/www/opencl.html
share/doc/ImageMagick-6/www/openmp.html
share/doc/ImageMagick-6/www/perl-magick.html
share/doc/ImageMagick-6/www/porting.html
@@ -1187,10 +1197,9 @@ share/doc/ImageMagick-6/www/source/type-ghostscript.xml
share/doc/ImageMagick-6/www/source/type-windows.xml
share/doc/ImageMagick-6/www/source/type.xml
share/doc/ImageMagick-6/www/source/wand.c
+share/doc/ImageMagick-6/www/sponsors.html
share/doc/ImageMagick-6/www/stream.html
-share/doc/ImageMagick-6/www/subversion.html
share/doc/ImageMagick-6/www/support.html
-share/doc/ImageMagick-6/www/t-shirt.html
share/doc/ImageMagick-6/www/wand.png
share/doc/ImageMagick-6/www/webp.html
share/examples/ImageMagick/coder.xml
@@ -1202,6 +1211,7 @@ share/examples/ImageMagick/mime.xml
share/examples/ImageMagick/policy.xml
share/examples/ImageMagick/quantization-table.xml
share/examples/ImageMagick/thresholds.xml
+share/examples/ImageMagick/type-apple.xml
share/examples/ImageMagick/type-dejavu.xml
share/examples/ImageMagick/type-ghostscript.xml
share/examples/ImageMagick/type-windows.xml
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index eecd5984bb8..6627b06da7d 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.135 2015/11/03 21:33:51 agc Exp $
+$NetBSD: distinfo,v 1.136 2016/04/29 12:16:46 wiz Exp $
-SHA1 (ImageMagick-6.9.1-7.tar.xz) = d58a448e6026cb2ecc2cc5804e35d6bc09924081
-RMD160 (ImageMagick-6.9.1-7.tar.xz) = 79d903b831d72dce50712dfc2632260b263a94b5
-SHA512 (ImageMagick-6.9.1-7.tar.xz) = 6eeef09b0e0297347e95c25c94305439e32e3e95a6f1c2e476a84911e8ca036c52634693a63cd28832c5dd0df14ca0c3ff41bad577f07bfe86c4085576350434
-Size (ImageMagick-6.9.1-7.tar.xz) = 8284892 bytes
-SHA1 (patch-magick_property.c) = bffd5d465bb000d83de76ba81c3913e003b26299
+SHA1 (ImageMagick-6.9.3-8.tar.xz) = ab3a16e1ac223153a76c98d20ed6dda98116d91a
+RMD160 (ImageMagick-6.9.3-8.tar.xz) = 53400d4babcd866de934ba31c0de6a20d1c45148
+SHA512 (ImageMagick-6.9.3-8.tar.xz) = 3517cc1282619aa97c1afea8e584920954720925b176802964933dbf25ba13e340b41c2b64090ce72c9651162e763cd1e0c5c8bbd4abd2193cc7e6a9644a8b80
+Size (ImageMagick-6.9.3-8.tar.xz) = 8775168 bytes
diff --git a/graphics/ImageMagick/patches/patch-magick_property.c b/graphics/ImageMagick/patches/patch-magick_property.c
deleted file mode 100644
index c218a5f825d..00000000000
--- a/graphics/ImageMagick/patches/patch-magick_property.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$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)