Update to 6.8.9.8. patch-configure was integrated upstream.

Changes:
  * JPEG library version >= 80 is thread safe
  * Added support for some legacy dds formats

6 files changed, 10 insertions, 48 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index a4886986a13..42a8fa6d16a 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.213 2014/10/12 18:55:14 dholland Exp $
+# $NetBSD: Makefile,v 1.214 2014/10/13 09:08:31 wiz Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ImageMagick-${DISTVERSION}
-PKGREVISION=	4
 
 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 1641165276b..a95a265a8a4 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.108 2014/09/07 07:50:19 wiz Exp $
+# $NetBSD: Makefile.common,v 1.109 2014/10/13 09:08:31 wiz Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
 IM_MAJOR_VER=		6.8.9
-IM_MINOR_VER=		7
+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 98fc0908ef2..f416bdf8384 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.81 2014/08/21 21:41:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.82 2014/10/13 09:08:31 wiz Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -209,6 +209,7 @@ share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/gaussian-blur.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/granite.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/imade_art2.jpg
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/label.gif
+share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/litecoin.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/logo-sm-flop.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/logo-sm-fx.png
 share/doc/ImageMagick-${IM_MAJOR_LIB_VER}/images/logo-sm.png
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 2400de67572..a6a28bea5f9 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.127 2014/08/21 21:49:34 wiz Exp $
+$NetBSD: distinfo,v 1.128 2014/10/13 09:08:31 wiz Exp $
 
-SHA1 (ImageMagick-6.8.9-7.tar.xz) = 896a31574a06d2f2a9c1558fe05afe0c65012124
-RMD160 (ImageMagick-6.8.9-7.tar.xz) = 1e6253e3c928b66709d7627aeea469963b39e6ff
-Size (ImageMagick-6.8.9-7.tar.xz) = 7552828 bytes
-SHA1 (patch-configure) = 3d8e28106cae4d2cb9fcb02222027cd123286495
+SHA1 (ImageMagick-6.8.9-8.tar.xz) = 5304855f3504994ff8bbf380e9a89a9e1dfe8834
+RMD160 (ImageMagick-6.8.9-8.tar.xz) = 8047d045e5083c4dd26d7daaec733fdb42e58b8e
+Size (ImageMagick-6.8.9-8.tar.xz) = 7889188 bytes
diff --git a/graphics/ImageMagick/patches/patch-configure b/graphics/ImageMagick/patches/patch-configure
deleted file mode 100644
index 78d40e35b51..00000000000
--- a/graphics/ImageMagick/patches/patch-configure
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2014/08/21 21:49:34 wiz Exp $
-
-First chunk: ./configure: 28988: Syntax error: Bad substitution
-http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26143
-
-Others: test(1) portability fix.
-http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26142
-
---- configure.orig	2014-08-16 16:06:45.000000000 +0000
-+++ configure
-@@ -28985,7 +28985,6 @@ fi
- have_fpx='no'
- FPX_LIBS=''
- SAVED_LIBS=${LIBS}
--LIBS=${LIBS/-ldjvulibre/}
- if test "$with_fpx" != 'no'; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
- $as_echo "-------------------------------------------------------------" >&6; }
-@@ -33879,7 +33878,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--if test "$MPEGDecodeDelegate" == "$MPEGDecodeDelegateDefault" ; then
-+if test "$MPEGDecodeDelegate" = "$MPEGDecodeDelegateDefault" ; then
-   MPEGDecodeDelegateDefault='ffmpeg'
-   # Extract the first word of ""$MPEGDecodeDelegateDefault"", so it can be a program name with args.
- set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2
-@@ -33964,7 +33963,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--if test "$MPEGEncodeDelegate" == "$MPEGEncodeDelegateDefault" ; then
-+if test "$MPEGEncodeDelegate" = "$MPEGEncodeDelegateDefault" ; then
-   MPEGEncodeDelegateDefault='ffmpeg'
-   # Extract the first word of ""$MPEGEncodeDelegateDefault"", so it can be a program name with args.
- set dummy "$MPEGEncodeDelegateDefault"; ac_word=$2
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 5c10845ae35..49547db599a 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2014/10/09 14:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2014/10/13 09:08:31 wiz Exp $
 
 .include "../../graphics/ImageMagick/Makefile.common"
 
 PKGNAME=	p5-PerlMagick-${DISTVERSION}
-PKGREVISION=	3
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.simplesystems.org/ImageMagick/www/perl-magick.html