Changes 6.1.2: bug fixes and improvements

4 files changed, 48 insertions, 47 deletions

diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 8640e29fded..f103ae97246 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.18 2004/10/05 12:07:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.19 2004/10/28 14:34:17 adam Exp $
 
-IM_MAJOR_VER=		6.1.0
-IM_MINOR_VER=		2
+IM_MAJOR_VER=		6.1.2
+IM_MINOR_VER=		3
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index baec5771af6..56a16b7c28a 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/10/05 12:07:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2004/10/28 14:34:17 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/Wand-config
@@ -50,7 +50,7 @@ include/magick/deprecate.h
 include/magick/draw.h
 include/magick/effect.h
 include/magick/enhance.h
-include/magick/error.h
+include/magick/exception.h
 include/magick/fx.h
 include/magick/gem.h
 include/magick/geometry.h
@@ -79,6 +79,7 @@ include/magick/registry.h
 include/magick/resize.h
 include/magick/resource_.h
 include/magick/segment.h
+include/magick/semaphore.h
 include/magick/shear.h
 include/magick/signature.h
 include/magick/stream.h
@@ -95,15 +96,15 @@ include/wand/drawing_wand.h
 include/wand/magick_wand.h
 include/wand/pixel_iterator.h
 include/wand/pixel_wand.h
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/colors.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/english.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/locale.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-ghostscript.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-solaris.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-windows.mgk
-lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/colors.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/configure.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/delegates.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/english.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/locale.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-ghostscript.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-solaris.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type-windows.xml
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/config/type.xml
 @exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_VER}/modules-Q16/coders
 @exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_VER}/modules-Q16/filters
 lib/libMagick++.la
@@ -128,38 +129,21 @@ man/man1/mogrify.1
 man/man1/montage.1
 man/man4/miff.4
 man/man5/quantize.5
-share/ImageMagick-${IM_MAJOR_LIB_VER}/ChangeLog
-share/ImageMagick-${IM_MAJOR_LIB_VER}/LICENSE
-share/ImageMagick-${IM_MAJOR_LIB_VER}/NEWS
-share/ImageMagick-${IM_MAJOR_LIB_VER}/config/coder.mgk
-share/ImageMagick-${IM_MAJOR_LIB_VER}/config/log.mgk
-share/ImageMagick-${IM_MAJOR_LIB_VER}/config/magic.mgk
-share/ImageMagick-${IM_MAJOR_LIB_VER}/images/dogwaffle.png
-share/ImageMagick-${IM_MAJOR_LIB_VER}/images/magick-icon.png
-share/ImageMagick-${IM_MAJOR_LIB_VER}/images/star.gif
-share/ImageMagick-${IM_MAJOR_LIB_VER}/images/top.gif
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/Authors.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/ImageMagick.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/Install-mac.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/Install-unix.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/Install-vms.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/Install-windows.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/News.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/README.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/colorspace.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/draw.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/pixel_iterator.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/api/profile.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/compare.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/download.html
-share/ImageMagick-${IM_MAJOR_LIB_VER}/www/index.html
+share/ImageMagick-${IM_MAJOR_VER}/ChangeLog
+share/ImageMagick-${IM_MAJOR_VER}/LICENSE
+share/ImageMagick-${IM_MAJOR_VER}/NEWS
+share/ImageMagick-${IM_MAJOR_VER}/config/coder.xml
+share/ImageMagick-${IM_MAJOR_VER}/config/log.xml
+share/ImageMagick-${IM_MAJOR_VER}/config/magic.xml
 share/ImageMagick-${IM_MAJOR_VER}/images/ImageMagick.jpg
 share/ImageMagick-${IM_MAJOR_VER}/images/background.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/devlib.gif
+share/ImageMagick-${IM_MAJOR_VER}/images/dogwaffle.png
 share/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg
 share/ImageMagick-${IM_MAJOR_VER}/images/granite.png
 share/ImageMagick-${IM_MAJOR_VER}/images/logo.png
 share/ImageMagick-${IM_MAJOR_VER}/images/magick.png
+share/ImageMagick-${IM_MAJOR_VER}/images/magick-icon.png
 share/ImageMagick-${IM_MAJOR_VER}/images/networkeleven.png
 share/ImageMagick-${IM_MAJOR_VER}/images/pair.png
 share/ImageMagick-${IM_MAJOR_VER}/images/promote.png
@@ -169,13 +153,21 @@ share/ImageMagick-${IM_MAJOR_VER}/images/rose.png
 share/ImageMagick-${IM_MAJOR_VER}/images/screen.png
 share/ImageMagick-${IM_MAJOR_VER}/images/script.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/sprite.png
+share/ImageMagick-${IM_MAJOR_VER}/images/star.gif
+share/ImageMagick-${IM_MAJOR_VER}/images/top.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/travelsur.gif
 share/ImageMagick-${IM_MAJOR_VER}/images/twi.png
 share/ImageMagick-${IM_MAJOR_VER}/index.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Authors.html
 share/ImageMagick-${IM_MAJOR_VER}/www/Changelog.html
 share/ImageMagick-${IM_MAJOR_VER}/www/Copyright.html
 share/ImageMagick-${IM_MAJOR_VER}/www/FAQ.html
+share/ImageMagick-${IM_MAJOR_VER}/www/ImageMagick.html
 share/ImageMagick-${IM_MAJOR_VER}/www/ImageMagickObject.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Install-mac.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Install-unix.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Install-vms.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Install-windows.html
 share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Blob.html
 share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.fig
 share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.png
@@ -214,7 +206,9 @@ share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-plain.fig
 share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-plain.jpg
 share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-sample-framed.jpg
 share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-sample-plain.jpg
+share/ImageMagick-${IM_MAJOR_VER}/www/News.html
 share/ImageMagick-${IM_MAJOR_VER}/www/QuickStart.html
+share/ImageMagick-${IM_MAJOR_VER}/www/README.html
 share/ImageMagick-${IM_MAJOR_VER}/www/animate.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html
@@ -224,16 +218,18 @@ share/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/cache_view.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/color.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/colorspace.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/compare.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/composite.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/constitute.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/decorate.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/deprecate.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/display.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/draw.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/drawing_wand.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html
-share/ImageMagick-${IM_MAJOR_VER}/www/api/error.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/exception.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/image.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/list.html
@@ -243,8 +239,10 @@ share/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/pixel_iterator.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/pixel_wand.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/quantize.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/profile.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/registry.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/resize.html
 share/ImageMagick-${IM_MAJOR_VER}/www/api/resource.html
@@ -259,15 +257,18 @@ share/ImageMagick-${IM_MAJOR_VER}/www/api/widget.html
 share/ImageMagick-${IM_MAJOR_VER}/www/apis.html
 share/ImageMagick-${IM_MAJOR_VER}/www/cd.html
 share/ImageMagick-${IM_MAJOR_VER}/www/color.html
+share/ImageMagick-${IM_MAJOR_VER}/www/compare.html
 share/ImageMagick-${IM_MAJOR_VER}/www/composite.html
 share/ImageMagick-${IM_MAJOR_VER}/www/conjure.html
 share/ImageMagick-${IM_MAJOR_VER}/www/convert.html
 share/ImageMagick-${IM_MAJOR_VER}/www/cvs.html
 share/ImageMagick-${IM_MAJOR_VER}/www/display.html
+share/ImageMagick-${IM_MAJOR_VER}/www/download.html
 share/ImageMagick-${IM_MAJOR_VER}/www/formats.html
 share/ImageMagick-${IM_MAJOR_VER}/www/help.html
 share/ImageMagick-${IM_MAJOR_VER}/www/identify.html
 share/ImageMagick-${IM_MAJOR_VER}/www/import.html
+share/ImageMagick-${IM_MAJOR_VER}/www/index.html
 share/ImageMagick-${IM_MAJOR_VER}/www/install.html
 share/ImageMagick-${IM_MAJOR_VER}/www/magick-list.html
 share/ImageMagick-${IM_MAJOR_VER}/www/magick.css
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 462ddff05fe..9229af16982 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.28 2004/10/05 22:12:00 reed Exp $
+$NetBSD: distinfo,v 1.29 2004/10/28 14:34:17 adam Exp $
 
-SHA1 (ImageMagick-6.1.0-2.tar.bz2) = 3b7abbebda66f33c843b16a7f461824f2f19011b
-Size (ImageMagick-6.1.0-2.tar.bz2) = 4561035 bytes
-SHA1 (patch-aa) = 021ecd662255af646faae45610739a09ad233d4b
+SHA1 (ImageMagick-6.1.2-3.tar.bz2) = 443ba9490e5cf3bbca8339c03fb29ca753d688c3
+Size (ImageMagick-6.1.2-3.tar.bz2) = 4565604 bytes
+SHA1 (patch-aa) = 2efa08754b41d65dc85d7061666e3f326a2193e1
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index b1b16848f4b..a78c9087ad6 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2004/10/05 22:12:00 reed Exp $
+$NetBSD: patch-aa,v 1.24 2004/10/28 14:34:17 adam Exp $
 
---- configure.orig	2004-10-04 19:42:50.000000000 -0700
+--- configure.orig	2004-10-28 03:42:36.000000000 +0000
 +++ configure
-@@ -26396,9 +26396,6 @@ fi
+@@ -26412,9 +26412,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'