Changes 6.2.8.0:

* Bug fixes and improvements

4 files changed, 18 insertions, 14 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index fd29740db24..e76de236ed8 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.56 2006/05/22 11:30:19 adam Exp $
+# $NetBSD: Makefile.common,v 1.57 2006/06/12 09:13:27 adam Exp $
 
 ###########################################################################
 #
@@ -9,8 +9,8 @@
 #
 ###########################################################################
 
-IM_MAJOR_VER=		6.2.7
-IM_MINOR_VER=		7
+IM_MAJOR_VER=		6.2.8
+IM_MINOR_VER=		0
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
@@ -39,4 +39,5 @@ CONFIGURE_ARGS+=	--without-dps
 CONFIGURE_ARGS+=	--without-fpx
 CONFIGURE_ARGS+=	--without-hdf
 CONFIGURE_ARGS+=	--without-jbig
+CONFIGURE_ARGS+=	--without-modules
 CONFIGURE_ARGS+=	--without-threads
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index ac20293b3d7..027f855cad7 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2006/05/10 12:47:01 tonio Exp $
+@comment $NetBSD: PLIST,v 1.48 2006/06/12 09:13:27 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -158,6 +158,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/arc.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/background.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/button.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/configure.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/definitive-guide.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/difference.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/dogwaffle.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/donate.png
@@ -182,6 +183,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/smile.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/sponsor.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/sprite.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/travelsur.gif
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/tricks.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/wand.ico
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/white-highlight.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/index.html
@@ -287,6 +289,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/display.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/download.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/examples.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/formats.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/history.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/identify.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/import.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/index.html
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 6493057ca62..01f67abbec1 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.68 2006/05/22 11:30:19 adam Exp $
+$NetBSD: distinfo,v 1.69 2006/06/12 09:13:27 adam Exp $
 
-SHA1 (ImageMagick-6.2.7-7.tar.bz2) = dad946d9456fa5461be7110a196bd75fddc79afb
-RMD160 (ImageMagick-6.2.7-7.tar.bz2) = 0d66936c9620b61d5e53b4304cfb1173ccf50b70
-Size (ImageMagick-6.2.7-7.tar.bz2) = 5233739 bytes
+SHA1 (ImageMagick-6.2.8-0.tar.bz2) = 637569bbcb331233c86258f6c681d5a7c849cba0
+RMD160 (ImageMagick-6.2.8-0.tar.bz2) = f5f9592c8f7c8bc67875ea984fed23650ab7224e
+Size (ImageMagick-6.2.8-0.tar.bz2) = 5282322 bytes
 SHA1 (patch-aa) = 18c0d77512b0fc7247b2b0bb16d080f7c149bcf1
-SHA1 (patch-ab) = fbafee0ad2a5a774d77b432960816248341d3b89
+SHA1 (patch-ab) = 1b1148c9cd9be7b14063941531951c5cdb4d4caf
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 76a02723989..a2fac40154a 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.20 2006/05/22 11:30:20 adam Exp $
+$NetBSD: patch-ab,v 1.21 2006/06/12 09:13:27 adam Exp $
 
---- Makefile.in.orig	2006-05-21 04:25:57.000000000 +0200
+--- Makefile.in.orig	2006-06-05 04:08:39.000000000 +0200
 +++ Makefile.in
-@@ -3267,8 +3267,6 @@ WAND_CLEANFILES = \
+@@ -3268,8 +3268,6 @@ WAND_CLEANFILES = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.20 2006/05/22 11:30:20 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3318,7 +3316,6 @@ WAND_CLEANFILES = \
+@@ -3319,7 +3317,6 @@ WAND_CLEANFILES = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/INSTALL \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/NEWS \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/README \
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.20 2006/05/22 11:30:20 adam Exp $
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config.in \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc.in \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/demo/model.miff \
-@@ -4586,7 +4583,6 @@ pkgconfig_DATA = \
+@@ -4587,7 +4584,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \