Changes 6.8.8.5:

* Fix case where an image moment might have a mass of 0 or a Hu moment might
  be 0.
* Enhance the TXT coder to read RGB percent values (e.g. 10.008%).
* Fixed new "-define png:swap-bytes" option (reference
  http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=24818).

5 files changed, 11 insertions, 16 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 3b2959fdab5..ca015c9e216 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.201 2014/02/12 23:17:58 tron Exp $
+# $NetBSD: Makefile,v 1.202 2014/02/13 19:53:43 adam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	1
 
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	Package for display and interactive manipulation of images
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 2077d7d4076..4424fb91e34 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.104 2014/01/06 19:48:15 wiz Exp $
+# $NetBSD: Makefile.common,v 1.105 2014/02/13 19:53:43 adam Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
 IM_MAJOR_VER=		6.8.8
-IM_MINOR_VER=		1
+IM_MINOR_VER=		5
 IM_MAJOR_LIB_VER=	6
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 5f20521bb6d..7a58b2f15b0 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.79 2014/01/06 19:48:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.80 2014/02/13 19:53:43 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -21,11 +21,13 @@ include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/CoderInfo.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Color.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Drawable.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Exception.h
+include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Functions.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Geometry.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Image.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Include.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Montage.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/Pixels.h
+include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/ResourceLimits.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/STL.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/Magick++/TypeMetric.h
 include/ImageMagick-${IM_MAJOR_LIB_VER}/magick/ImageMagick.h
@@ -198,9 +200,7 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/bluebells_log.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/button.gif
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/configure.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/cylinder_shaded.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/definitive-guide.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/difference.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/donate.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/examples.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/frame.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/fuzzy-magick.png
@@ -215,7 +215,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/logo.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/logo.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/montage.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/navy.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/networkredux.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/bricks.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/checkerboard.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/circles.png
@@ -271,7 +270,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/verticalleftshingle.pn
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/verticalrightshingle.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/patterns/verticalsaw.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/piechart.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/project-support.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/radial-gradient.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/reconstruct.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/red-ball.png
@@ -287,7 +285,6 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/smile.gif
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/sponsor.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/sprite.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/t-shirt.png
-share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/tricks.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/wand.ico
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/wand.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/white-highlight.png
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 69b0f2a5e79..7bf1641ca3a 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.123 2014/01/06 19:48:15 wiz Exp $
+$NetBSD: distinfo,v 1.124 2014/02/13 19:53:43 adam Exp $
 
-SHA1 (ImageMagick-6.8.8-1.tar.xz) = 1a2c0c83b38cc39170825bc247f41c0bb7a92792
-RMD160 (ImageMagick-6.8.8-1.tar.xz) = d5eee6158f4e1add5eb9940d12ebd62f84fd0bdc
-Size (ImageMagick-6.8.8-1.tar.xz) = 7527812 bytes
+SHA1 (ImageMagick-6.8.8-5.tar.xz) = 5cb75caf426acf3eacaf882dbbb24f462016d828
+RMD160 (ImageMagick-6.8.8-5.tar.xz) = 86f35a57845f9bbe7355ebcab513aa42a7b43fb2
+Size (ImageMagick-6.8.8-5.tar.xz) = 7446036 bytes
 SHA1 (patch-configure) = 87ae69ea06d9ed392627ec2067192e1a292106c4
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 03ece91254b..f53f68689fa 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.98 2014/02/12 23:18:03 tron Exp $
+# $NetBSD: Makefile,v 1.99 2014/02/13 19:53:43 adam Exp $
 
 .include "../../graphics/ImageMagick/Makefile.common"
 
 PKGNAME=	p5-PerlMagick-${DISTVERSION}
-PKGREVISION=	1
 SVR4_PKGNAME=	p5pma
 
 MAINTAINER=	pkgsrc-users@NetBSD.org