Changes 6.2.7.1:

* Bug fixes and improvements (see ChangeLog for details)

4 files changed, 22 insertions, 21 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 052e988e8f2..ea941422947 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.52 2006/04/04 22:30:50 ghen Exp $
+# $NetBSD: Makefile.common,v 1.53 2006/04/30 17:55:12 adam Exp $
 
 ###########################################################################
-###########################################################################
 #
 # HEADS UP!  NOTE THE FOLLOWING WHEN UPDATING THIS PACKAGE:
 #
@@ -9,10 +8,9 @@
 # remove its PKGREVISION upon update of ImageMagick!
 #
 ###########################################################################
-###########################################################################
 
-IM_MAJOR_VER=		6.2.6
-IM_MINOR_VER=		8
+IM_MAJOR_VER=		6.2.7
+IM_MINOR_VER=		1
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
@@ -37,5 +35,8 @@ WRKSRC=		${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
 
 # For things for which we do not specify an explicit dependency above, disable
 # so that we don't cause implicit "hidden" dependencies.
-CONFIGURE_ARGS+=	--without-dps --without-fpx --without-hdf \
-			--without-jbig --without-threads
+CONFIGURE_ARGS+=	--without-dps
+CONFIGURE_ARGS+=	--without-fpx
+CONFIGURE_ARGS+=	--without-hdf
+CONFIGURE_ARGS+=	--without-jbig
+CONFIGURE_ARGS+=	--without-threads
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 4ac436f5381..8214d3b6e37 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.63 2006/04/04 22:30:50 ghen Exp $
+$NetBSD: distinfo,v 1.64 2006/04/30 17:55:12 adam Exp $
 
-SHA1 (ImageMagick-6.2.6-8.tar.bz2) = 2182329ce8404030380fd8282d7e739d64ce581e
-RMD160 (ImageMagick-6.2.6-8.tar.bz2) = e13c61dab736931f86e586be163041a7b4d8d01c
-Size (ImageMagick-6.2.6-8.tar.bz2) = 5163808 bytes
-SHA1 (patch-aa) = 59d1987bc26397f2c90ea36d19ab92a39c472aa4
-SHA1 (patch-ab) = 385f2ee6a47abf0c967623c6b4cae7cd3fc2667c
+SHA1 (ImageMagick-6.2.7-1.tar.bz2) = ad9885040191452dcf42456debc044d2af01caae
+RMD160 (ImageMagick-6.2.7-1.tar.bz2) = 337a2aa548f050624cb0626860b0d1ae26acf348
+Size (ImageMagick-6.2.7-1.tar.bz2) = 5167016 bytes
+SHA1 (patch-aa) = d2342d754195b66368f56a3f2c27ccf1d7fdc00b
+SHA1 (patch-ab) = cfa9680cf461dc350f16b7f0b631773625c655f8
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 16925c46170..c81f6111ab0 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.34 2006/03/05 21:25:49 adam Exp $
+$NetBSD: patch-aa,v 1.35 2006/04/30 17:55:12 adam Exp $
 
---- configure.orig	2006-01-30 02:55:33.000000000 +0100
+--- configure.orig	2006-04-24 03:19:39.000000000 +0200
 +++ configure
-@@ -25266,9 +25266,6 @@ fi
+@@ -25315,9 +25315,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 430338add97..088734e1026 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.17 2006/03/05 21:25:49 adam Exp $
+$NetBSD: patch-ab,v 1.18 2006/04/30 17:55:12 adam Exp $
 
---- Makefile.in.orig	2006-03-05 22:13:13.000000000 +0100
+--- Makefile.in.orig	2006-04-24 03:19:49.000000000 +0200
 +++ Makefile.in
-@@ -3247,8 +3247,6 @@ WAND_CLEANFILES = \
+@@ -3264,8 +3264,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.17 2006/03/05 21:25:49 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3298,7 +3296,6 @@ WAND_CLEANFILES = \
+@@ -3315,7 +3313,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.17 2006/03/05 21:25:49 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 \
-@@ -4566,7 +4563,6 @@ pkgconfig_DATA = \
+@@ -4583,7 +4580,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \