Update to 5.5.1-6.

Changes:
  * Verify sanity of sysconf(_SC_PAGE_SIZE) and sysconf(_SC_PHYS_PAGES)
    before using their values.
  * Corrected bug in image geometry height calculation.
  * PingBlob() improperly set the length memory of BlobInfo to zero.
  * Fixed Ping() memory leak in PerlMagick.
  * Fixed -map problem in convert/mogrify utilities.
  * -border with a single value now produces correct results
    (e.g. -border 10).
  * Set locale type LC_NUMERIC to "C".
  * Bug fix for PS2 encoder.
  * Added PS-Adobe preamble to PS3 encoder.
  * Use ImageMagick release number to allow multiple ImageMagick releases
    to co-exist without interference on the same machine.
  * Decided that DrawGet functions should return by value.
  * Added detailed logging to BMP, PNG, and JPEG codecs, including JPEG
    quality estimate.
  * Added draw.h "DrawGet" equivalents to most of the "DrawSet" functions.
  * Added an array size argument to DrawSetDashPattern and got rid of
    the zero-termination garbage.
  o Remove 'Set' from the names of draw.h functions which update the
    current affine transformation array (e.g. DrawSetRotate becomes
    DrawRotate).
  * Under Windows, a DllMain function which automatically initializes
    ImageMagick (when ImageMagick is built using DLLs) may be added by
    defining ProvideDllMain in magick_config.h
  * Added resource consumption methods, see magick/resource.c.
  * Replaced underscores in commandline options with hyphens.  For backward
    compatibility, underscores will continue to be recognized.
  * Added -blue-primary, -green-primary, -red-primary, -white-point options.
  * Added BMP2 and BMP3 output formats.
  * Changed chromaticity primary.z from 1.0 to 1.0-(primary.x+primary.y)
    in the PNG and PCD codecs.
  * Added 'exception' parameter to the ImageMagick progress monitor API.
  * Added enumerated types for the dispose member of the Image structure.
  * Added -version option to commandline utilities.
  * The xcf decoder would sometimes create artifacts when reading RLE-encoded
    grayscale images, due to the green and blue samples not being defined.
  * Added logging capabilities to the CORE API.  This facility is useful
    for debugging.  Added "events" parameter to the -debug commandline option.
  * AcquireImagePixels() did not always return the same pixel values
    for virtual pixels when the cache was stored on disk (very rare).
  * new -virtual-pixel command line option.
  * new PerlMagick virtual-pixel image attribute.

9 files changed, 124 insertions, 44 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index ee70d018269..ba40525b0d8 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.86 2002/09/12 08:29:46 jlam Exp $
+# $NetBSD: Makefile,v 1.87 2002/11/13 13:44:42 wiz Exp $
 
-DISTNAME=		ImageMagick-5.4.8-2
-PKGNAME=		${DISTNAME:S/-2/.2/}
+DISTNAME=		ImageMagick-5.5.1-6
+PKGNAME=		${DISTNAME:S/-6/.6/}
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.nluug.nl/pub/ImageMagick/ \
 			ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/
+			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
+			http://imagemagick.sourceforge.net/http/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tron@netbsd.org
@@ -22,7 +23,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-2//}
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-6//}
 
 # c++ broken as of 'gcc version 2.95.3 20010315 (release) (NetBSD nb1)'
 NOT_FOR_PLATFORM=	NetBSD-*-sparc64
@@ -54,6 +55,7 @@ post-install:
 		${PREFIX}/share/ImageMagick
 
 .include "../../archivers/bzip2/buildlink2.mk"
+.include "../../graphics/jasper/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index bfc10883585..c9a85f645aa 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:22:44 jlam Exp $
+@comment $NetBSD: PLIST,v 1.6 2002/11/13 13:44:42 wiz Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/animate
@@ -15,15 +15,12 @@ include/Magick++/CoderInfo.h
 include/Magick++/Color.h
 include/Magick++/Drawable.h
 include/Magick++/Exception.h
-include/Magick++/Functions.h
 include/Magick++/Geometry.h
 include/Magick++/Image.h
 include/Magick++/Include.h
 include/Magick++/Montage.h
-include/Magick++/Options.h
 include/Magick++/Pixels.h
 include/Magick++/STL.h
-include/Magick++/Thread.h
 include/Magick++/TypeMetric.h
 include/magick/PreRvIcccm.h
 include/magick/api.h
@@ -31,15 +28,16 @@ include/magick/attribute.h
 include/magick/blob.h
 include/magick/cache.h
 include/magick/cache_view.h
-include/magick/classify.h
 include/magick/command.h
 include/magick/compress.h
 include/magick/delegate.h
+include/magick/deprecate.h
 include/magick/draw.h
 include/magick/error.h
 include/magick/gem.h
 include/magick/image.h
 include/magick/list.h
+include/magick/log.h
 include/magick/magic.h
 include/magick/magick.h
 include/magick/magick_config.h
@@ -48,28 +46,32 @@ include/magick/monitor.h
 include/magick/quantize.h
 include/magick/registry.h
 include/magick/render.h
+include/magick/resource.h
 include/magick/semaphore.h
 include/magick/timer.h
 include/magick/utility.h
 include/magick/version.h
 include/magick/widget.h
 include/magick/xwindow.h
-lib/ImageMagick/delegates.mgk
-lib/ImageMagick/type-ghostscript.mgk
-lib/ImageMagick/type-solaris.mgk
-lib/ImageMagick/type-windows.mgk
-lib/ImageMagick/type.mgk
-@exec ${MKDIR} %D/lib/ImageMagick/modules/coders
+lib/ImageMagick-5.5.1/colors.mgk
+lib/ImageMagick-5.5.1/delegates.mgk
+lib/ImageMagick-5.5.1/log.mgk
+lib/ImageMagick-5.5.1/magic.mgk
+lib/ImageMagick-5.5.1/type-ghostscript.mgk
+lib/ImageMagick-5.5.1/type-solaris.mgk
+lib/ImageMagick-5.5.1/type-windows.mgk
+lib/ImageMagick-5.5.1/type.mgk
+@exec ${MKDIR} %D/lib/ImageMagick-5.5.1/modules/coders
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
 lib/libMagick++.so.5
-lib/libMagick++.so.5.48
+lib/libMagick++.so.5.5
 lib/libMagick.a
 lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.5
-lib/libMagick.so.5.48
+lib/libMagick.so.5.5
 man/man1/ImageMagick.1
 man/man1/Magick++-config.1
 man/man1/Magick-config.1
@@ -87,8 +89,6 @@ man/man5/quantize.5
 share/ImageMagick/Copyright.txt
 share/ImageMagick/ImageMagick.html
 share/ImageMagick/QuickStart.txt
-share/ImageMagick/colors.mgk
-share/ImageMagick/images/appligent.jpg
 share/ImageMagick/images/authentica.jpg
 share/ImageMagick/images/ball.png
 share/ImageMagick/images/corbis.png
@@ -96,14 +96,21 @@ share/ImageMagick/images/examples.jpg
 share/ImageMagick/images/home.png
 share/ImageMagick/images/logo.png
 share/ImageMagick/images/magick.png
+share/ImageMagick/images/magick_button_120x60.png
+share/ImageMagick/images/magick_button_88x31.png
+share/ImageMagick/images/magick_icon_16x16.png
+share/ImageMagick/images/magick_icon_32x32.png
+share/ImageMagick/images/magick_icons.ico
 share/ImageMagick/images/magick_small.png
 share/ImageMagick/images/mail.png
+share/ImageMagick/images/pair.png
+share/ImageMagick/images/promote.png
 share/ImageMagick/images/right_triangle.png
 share/ImageMagick/images/right_triangle_option.png
 share/ImageMagick/images/screen.png
-share/ImageMagick/magic.mgk
 share/ImageMagick/www/Changelog.html
 share/ImageMagick/www/Copyright.html
+share/ImageMagick/www/FAQ.html
 share/ImageMagick/www/ImageMagick.html
 share/ImageMagick/www/Magick++/Blob.html
 share/ImageMagick/www/Magick++/Cache.fig
@@ -143,7 +150,7 @@ share/ImageMagick/www/Magick++/thumbnail-anatomy-plain.fig
 share/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg
 share/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg
 share/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg
-share/ImageMagick/www/Magick.html
+share/ImageMagick/www/QuickStart.html
 share/ImageMagick/www/animate.html
 share/ImageMagick/www/api.html
 share/ImageMagick/www/api/animate.html
@@ -172,6 +179,7 @@ share/ImageMagick/www/api/quantize.html
 share/ImageMagick/www/api/registry.html
 share/ImageMagick/www/api/render.html
 share/ImageMagick/www/api/resize.html
+share/ImageMagick/www/api/resource.html
 share/ImageMagick/www/api/segment.html
 share/ImageMagick/www/api/shear.html
 share/ImageMagick/www/api/signature.html
@@ -222,8 +230,8 @@ share/ImageMagick/www/windows.html
 @dirrm share/ImageMagick/www
 @dirrm share/ImageMagick/images
 @dirrm share/ImageMagick
-@dirrm lib/ImageMagick/modules/coders
-@dirrm lib/ImageMagick/modules
-@dirrm lib/ImageMagick
+@dirrm lib/ImageMagick-5.5.1/modules/coders
+@dirrm lib/ImageMagick-5.5.1/modules
+@dirrm lib/ImageMagick-5.5.1
 @dirrm include/magick
 @dirrm include/Magick++
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index aeac4d03018..53a1ddea97a 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.9 2002/08/25 19:22:44 jlam Exp $
+$NetBSD: distinfo,v 1.10 2002/11/13 13:44:43 wiz Exp $
 
-SHA1 (ImageMagick-5.4.8-2.tar.bz2) = 5f8149c6235ba74581c19871367c73bbb7a799b9
-Size (ImageMagick-5.4.8-2.tar.bz2) = 2979552 bytes
-SHA1 (patch-aa) = 47fb005781517d087f46745760f23ea88726e578
+SHA1 (ImageMagick-5.5.1-6.tar.bz2) = c5ddd8904332027e71264a3ea893720cbee06b4a
+Size (ImageMagick-5.5.1-6.tar.bz2) = 3328933 bytes
+SHA1 (patch-aa) = 953819eb591f7c30a121f14fccc57cecc070fedc
+SHA1 (patch-ab) = dd2844b849b72222f85ab903b4ba6a8171bbd4e2
+SHA1 (patch-ac) = fcc9b5518bf876a7937f3afb2d73f9a2a7948a74
+SHA1 (patch-ad) = 74f1acf61935cfaae3d2ea44a80f74598ed418b9
+SHA1 (patch-ae) = a6936bcbc0a377a498cd42e2d0c2e5e644fbdb29
+SHA1 (patch-af) = d77bd3331b5e2a7cb9d1437d2703781d4fe281a2
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 910b712a2e6..ae3f57f7482 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,17 +1,13 @@
-$NetBSD: patch-aa,v 1.19 2002/08/25 19:22:45 jlam Exp $
+$NetBSD: patch-aa,v 1.20 2002/11/13 13:44:43 wiz Exp $
 
---- coders/fits.c.orig	Sun Aug 18 03:20:46 2002
-+++ coders/fits.c	Tue Aug 20 08:35:05 2002
-@@ -180,9 +180,11 @@
-     k,
-     l,
-     packet_size,
--    quantum,
-     scene,
-     y;
-+
-+  int32_t
-+    quantum;
+--- Magick++/lib/Makefile.am.orig	Sat Oct 12 17:36:38 2002
++++ Magick++/lib/Makefile.am
+@@ -26,7 +26,7 @@ libMagick___la_SOURCES = \
+ 
+ # Add -no-undefined once Cygwin supports throwing C++ exceptions from DLLs.
+ libMagick___la_LDFLAGS = \
+-	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
++	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
+ 
+ libMagick___la_LIBADD = ../../magick/libMagick.la
  
-   register IndexPacket
-     *indexes;
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
new file mode 100644
index 00000000000..44a714e382c
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.14 2002/11/13 13:44:43 wiz Exp $
+
+--- Magick++/lib/Makefile.in.orig	Thu Oct 17 04:38:16 2002
++++ Magick++/lib/Makefile.in
+@@ -337,7 +337,7 @@ libMagick___la_SOURCES = \
+ 
+ # Add -no-undefined once Cygwin supports throwing C++ exceptions from DLLs.
+ libMagick___la_LDFLAGS = \
+-	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
++	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
+ 
+ 
+ libMagick___la_LIBADD = ../../magick/libMagick.la
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
new file mode 100644
index 00000000000..232941af200
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.10 2002/11/13 13:44:43 wiz Exp $
+
+--- coders/fits.c.orig	Sat Oct 12 18:41:32 2002
++++ coders/fits.c
+@@ -185,9 +185,11 @@ static Image *ReadFITSImage(const ImageI
+     k,
+     l,
+     packet_size,
+-    quantum,
+     scene,
+     y;
++
++  int32_t
++    quantum;
+ 
+   register IndexPacket
+     *indexes;
diff --git a/graphics/ImageMagick/patches/patch-ad b/graphics/ImageMagick/patches/patch-ad
new file mode 100644
index 00000000000..f6eb7ada68a
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7 2002/11/13 13:44:44 wiz Exp $
+
+--- coders/jp2.c.orig	Sun Nov 10 15:33:57 2002
++++ coders/jp2.c
+@@ -604,7 +604,7 @@ static unsigned int WriteJP2Image(const 
+     component_info[i].prec=(unsigned int) image->depth <= 8 ? 8 : 16;
+   }
+   jp2_image=jas_image_create((short) number_components,component_info,
+-    number_components == 1 ? JAS_IMAGE_CM_GRAY : JAS_IMAGE_CM_RGB);
++    number_components == 1 ? JAS_IMAGE_CS_GRAY : JAS_IMAGE_CS_RGB);
+   if (jp2_image == (jas_image_t *) NULL)
+     ThrowWriterException(FileOpenError,"Unable to create image",image);
+   /*
diff --git a/graphics/ImageMagick/patches/patch-ae b/graphics/ImageMagick/patches/patch-ae
new file mode 100644
index 00000000000..142c97b1e5a
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.4 2002/11/13 13:44:44 wiz Exp $
+
+--- magick/Makefile.am.orig	Sat Oct 12 22:56:34 2002
++++ magick/Makefile.am
+@@ -44,7 +44,7 @@ INCLUDES = -I$(top_srcdir) $(INCLTDL)
+ ALLMANPAGES = Magick-config.1
+ 
+ libMagick_la_LDFLAGS = -no-undefined \
+-	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
++	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
+ 
+ #AM_CFLAGS = @LIBRARY_EXTRA_CPPFLAGS@
+ AM_CPPFLAGS = @LIBRARY_EXTRA_CPPFLAGS@
diff --git a/graphics/ImageMagick/patches/patch-af b/graphics/ImageMagick/patches/patch-af
new file mode 100644
index 00000000000..5250655c313
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.4 2002/11/13 13:44:44 wiz Exp $
+
+--- magick/Makefile.in.orig	Thu Oct 17 04:37:54 2002
++++ magick/Makefile.in
+@@ -359,7 +359,7 @@ INCLUDES = -I$(top_srcdir) $(INCLTDL)
+ ALLMANPAGES = Magick-config.1
+ 
+ libMagick_la_LDFLAGS = -no-undefined \
+-	-release $(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION)
++	-version-info $(MAJOR_VERSION):$(MINOR_VERSION):$(MICRO_VERSION)
+ 
+ 
+ #AM_CFLAGS = @LIBRARY_EXTRA_CPPFLAGS@