Update "ImageMagick" and "p5-PerlMagick" packages to version 5.3.9.

A complete list of changes is not available unfortunately. Recent
changes are:
- Text drawing now handles UTF8-encoding.
- Off-by-one GetImagePixels() fix in draw.c
- PingImage() now reports attributes for all images an image sequence.
- magick/image.h: Rename QuantumLeap define to QuantumDepth.
  QuantumDepth is set to the values 8 or 16, depend
  configuration option.
- Updated PerlMagick signatures to signature algorithm.
- ImageMagick defaults to 16-bit quantum. Set QuantumMagick for 8-bit.
- Changed image->blob from BlobInfo to BlobInfo- so the Image
  structure size is not dependent on the large-file defines.
- Added -background to convert prog
- DispatchImage() now properly handles grayscale images.

8 files changed, 89 insertions, 61 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index c194b2a44e6..b2f01d6444e 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.75 2001/08/29 22:41:14 jlam Exp $
+# $NetBSD: Makefile,v 1.76 2001/09/17 15:17:32 tron Exp $
 
-DISTNAME=		ImageMagick-5.2.8
+DISTNAME=		ImageMagick-5.3.9
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 7e280025260..a03dcecb514 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/07/02 16:48:31 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/09/17 15:17:32 tron Exp $
 
-SHA1 (ImageMagick-5.2.8.tar.bz2) = 8e173577afe0f0314087c7419397674fd52e0d95
-Size (ImageMagick-5.2.8.tar.bz2) = 2302009 bytes
-SHA1 (patch-aa) = 9c2deaa7323e13219a6b8e5b1dd22c211ba087b1
-SHA1 (patch-ab) = e87a955bb2e28da426e355f5aa6e5e0677cd6fc3
-SHA1 (patch-ac) = 47c01798066affb13707a61b92ca8b140a55cf5c
+SHA1 (ImageMagick-5.3.9.tar.bz2) = 554f0168cce4e7597366e70b835cf0b07435a4f9
+Size (ImageMagick-5.3.9.tar.bz2) = 2772757 bytes
+SHA1 (patch-aa) = 9023c09c60e58d7976cf56c08aeb202bedc341f3
+SHA1 (patch-ab) = 23197141943645250ed336040045cccd13d09b7e
+SHA1 (patch-ac) = d96ef6ca8dc12861bdb63cf5ab6e7b3358705fde
 SHA1 (patch-ad) = 83e78c89ff45d814c1b509dfc71e37a96aa5d6e7
 SHA1 (patch-ae) = 3b71f2ab7cb02aa547c6f50cbef775d06c011af2
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index b130afcf7b2..659698a1937 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.15 2000/08/10 08:59:04 tron Exp $
+$NetBSD: patch-aa,v 1.16 2001/09/17 15:17:32 tron Exp $
 
---- magick/magick.c.orig	Wed Aug  2 00:09:23 2000
-+++ magick/magick.c	Thu Aug 10 10:19:28 2000
-@@ -433,6 +433,7 @@
-       LiberateMemory((void **) &filename);
-     }
+--- magick/magick.c.orig	Mon Sep 17 01:36:12 2001
++++ magick/magick.c	Mon Sep 17 16:39:26 2001
+@@ -421,6 +421,7 @@
+ #endif
+   SetClientName(filename);
    (void) setlocale(LC_ALL,"");
 +  (void) setlocale(LC_CTYPE,"C");
    (void) setlocale(LC_NUMERIC,"C");
-   *magick='\0';
-   (void) SetImageMagic(magick,MaxTextExtent,magic);
+ }
+ 
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 57c2846c45a..12598943c44 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.10 2001/01/30 13:18:52 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2001/09/17 15:17:32 tron Exp $
 
---- magick/magick.h.orig	Wed Jan 24 16:12:55 2001
-+++ magick/magick.h	Tue Jan 30 13:53:37 2001
+--- magick/magick.h.orig	Wed Aug 15 04:20:26 2001
++++ magick/magick.h	Mon Sep 17 16:39:59 2001
 @@ -11,8 +11,6 @@
  /*
    System include declarations.
@@ -9,5 +9,5 @@ $NetBSD: patch-ab,v 1.10 2001/01/30 13:18:52 wiz Exp $
 -#define _XOPEN_SOURCE  500
 -#define _POSIX_C_SOURCE  199506L
  
- #include <stdio.h>
- #include <stdlib.h>
+ #define _MAGICK_CONFIG_H
+ #if !defined(vms) && !defined(macintosh)
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
index 108bcdbf64a..86606b126e5 100644
--- a/graphics/ImageMagick/patches/patch-ac
+++ b/graphics/ImageMagick/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2000/08/10 08:59:04 tron Exp $
+$NetBSD: patch-ac,v 1.7 2001/09/17 15:17:32 tron Exp $
 
---- magick/xwindows.c.orig	Wed Aug  2 00:09:23 2000
-+++ magick/xwindows.c	Thu Aug 10 10:19:48 2000
-@@ -2460,6 +2460,7 @@
+--- magick/xwindow.c.orig	Sun Sep  9 04:04:32 2001
++++ magick/xwindow.c	Mon Sep 17 16:40:54 2001
+@@ -2424,6 +2424,7 @@
    annotate_info->previous=(XAnnotateInfo *) NULL;
    annotate_info->next=(XAnnotateInfo *) NULL;
    (void) setlocale(LC_ALL,"");
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index ff115300699..770ff6ae492 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,14 +1,12 @@
-@comment $NetBSD: PLIST,v 1.27 2001/01/29 19:03:24 tron Exp $
+@comment $NetBSD: PLIST,v 1.28 2001/09/17 15:17:33 tron Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/animate
-bin/combine
+bin/composite
 bin/convert
-bin/cgimagick
 bin/display
 bin/identify
 bin/import
-bin/iptcutil
 bin/mogrify
 bin/montage
 include/Magick++.h
@@ -24,10 +22,10 @@ include/Magick++/Include.h
 include/Magick++/Montage.h
 include/Magick++/Options.h
 include/Magick++/Pixels.h
-include/Magick++/Thread.h
 include/Magick++/STL.h
+include/Magick++/Thread.h
+include/Magick++/TypeMetric.h
 include/magick/PreRvIcccm.h
-include/magick/attributes.h
 include/magick/draw.h
 include/magick/semaphore.h
 include/magick/widget.h
@@ -38,9 +36,7 @@ include/magick/blob.h
 include/magick/classify.h
 include/magick/compress.h
 include/magick/config.h
-include/magick/delegates.h
 include/magick/error.h
-include/magick/gems.h
 include/magick/image.h
 include/magick/magick.h
 include/magick/monitor.h
@@ -48,23 +44,30 @@ include/magick/quantize.h
 include/magick/timer.h
 include/magick/utility.h
 include/magick/version.h
-include/magick/xwindows.h
+include/magick/xwindow.h
+include/magick/attribute.h
+include/magick/delegate.h
+include/magick/gem.h
+include/magick/magic.h
+include/magick/module.h
+lib/ImageMagick/delegates.mgk
+lib/ImageMagick/type.mgk
 lib/libMagick.a
 lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.5
-lib/libMagick.so.5.28
+lib/libMagick.so.5.39
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
 lib/libMagick++.so.5
-lib/libMagick++.so.5.28
+lib/libMagick++.so.5.39
 @exec mkdir -p %D/lib/ImageMagick/modules/coders
 man/man1/ImageMagick.1
 man/man1/Magick-config.1
 man/man1/Magick++-config.1
 man/man1/animate.1
-man/man1/combine.1
+man/man1/composite.1
 man/man1/convert.1
 man/man1/display.1
 man/man1/identify.1
@@ -76,11 +79,11 @@ man/man5/quantize.5
 share/ImageMagick/Copyright.txt
 share/ImageMagick/ImageMagick.html
 share/ImageMagick/QuickStart.txt
-share/ImageMagick/delegates.mgk
+share/ImageMagick/colors.mgk
+share/ImageMagick/images/appligent.jpg
 share/ImageMagick/images/authentica.jpg
 share/ImageMagick/images/ball.png
 share/ImageMagick/images/corbis.png
-share/ImageMagick/images/digital-applications.png
 share/ImageMagick/images/examples.jpg
 share/ImageMagick/images/home.png
 share/ImageMagick/images/logo.png
@@ -92,26 +95,61 @@ share/ImageMagick/images/right_triangle_option.png
 share/ImageMagick/images/screen.png
 share/ImageMagick/magic.mgk
 share/ImageMagick/www/Changelog.html
+share/ImageMagick/www/Magick++/Blob.html
+share/ImageMagick/www/Magick++/Cache.fig
+share/ImageMagick/www/Magick++/Cache.png
+share/ImageMagick/www/Magick++/Cache.svg
+share/ImageMagick/www/Magick++/Color.html
+share/ImageMagick/www/Magick++/Documentation.html
+share/ImageMagick/www/Magick++/Drawable.html
+share/ImageMagick/www/Magick++/Drawable_example_1.png
+share/ImageMagick/www/Magick++/Enumerations.html
+share/ImageMagick/www/Magick++/Exception.html
+share/ImageMagick/www/Magick++/FormatCharacters.html
+share/ImageMagick/www/Magick++/Future.html
+share/ImageMagick/www/Magick++/Geometry.html
+share/ImageMagick/www/Magick++/Image.fig
+share/ImageMagick/www/Magick++/Image.html
+share/ImageMagick/www/Magick++/Image.png
+share/ImageMagick/www/Magick++/Image.svg
+share/ImageMagick/www/Magick++/ImageDesign.html
+share/ImageMagick/www/Magick++/ImageMagick.png
+share/ImageMagick/www/Magick++/Install.html
+share/ImageMagick/www/Magick++/Magick++.png
+share/ImageMagick/www/Magick++/Montage.html
+share/ImageMagick/www/Magick++/NEWS.html
+share/ImageMagick/www/Magick++/PixelPacket.html
+share/ImageMagick/www/Magick++/Pixels.html
+share/ImageMagick/www/Magick++/README.txt
+share/ImageMagick/www/Magick++/STL.html
+share/ImageMagick/www/Magick++/TypeMetric.html
+share/ImageMagick/www/Magick++/index.html
+share/ImageMagick/www/Magick++/montage-sample-framed.jpg
+share/ImageMagick/www/Magick++/right_triangle.png
+share/ImageMagick/www/Magick++/thumbnail-anatomy-framed.fig
+share/ImageMagick/www/Magick++/thumbnail-anatomy-framed.jpg
+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/animate.html
 share/ImageMagick/www/api.html
 share/ImageMagick/www/api/animate.html
 share/ImageMagick/www/api/annotate.html
-share/ImageMagick/www/api/attributes.html
+share/ImageMagick/www/api/attribute.html
 share/ImageMagick/www/api/blob.html
 share/ImageMagick/www/api/cache.html
 share/ImageMagick/www/api/cache_view.html
-share/ImageMagick/www/api/colors.html
+share/ImageMagick/www/api/color.html
 share/ImageMagick/www/api/compress.html
 share/ImageMagick/www/api/constitute.html
 share/ImageMagick/www/api/decorate.html
-share/ImageMagick/www/api/delegates.html
 share/ImageMagick/www/api/display.html
 share/ImageMagick/www/api/draw.html
-share/ImageMagick/www/api/effects.html
+share/ImageMagick/www/api/effect.html
 share/ImageMagick/www/api/enhance.html
 share/ImageMagick/www/api/error.html
-share/ImageMagick/www/api/gems.html
 share/ImageMagick/www/api/image.html
 share/ImageMagick/www/api/mac.html
 share/ImageMagick/www/api/magick.html
@@ -120,14 +158,12 @@ share/ImageMagick/www/api/monitor.html
 share/ImageMagick/www/api/montage.html
 share/ImageMagick/www/api/nt.html
 share/ImageMagick/www/api/pixel_cache.html
-share/ImageMagick/www/api/pixels.html
 share/ImageMagick/www/api/quantize.html
 share/ImageMagick/www/api/segment.html
 share/ImageMagick/www/api/shear.html
 share/ImageMagick/www/api/signature.html
 share/ImageMagick/www/api/stream.html
 share/ImageMagick/www/api/transform.html
-share/ImageMagick/www/api/types/AnnotateInfo.html
 share/ImageMagick/www/api/types/ChromaticityInfo.html
 share/ImageMagick/www/api/types/ColorPacket.html
 share/ImageMagick/www/api/types/DrawInfo.html
@@ -140,16 +176,16 @@ share/ImageMagick/www/api/types/MagickInfo.html
 share/ImageMagick/www/api/types/PixelPacket.html
 share/ImageMagick/www/api/types/PointInfo.html
 share/ImageMagick/www/api/types/ProfileInfo.html
+share/ImageMagick/www/api/types/QuantizeInfo.html
 share/ImageMagick/www/api/types/RectangleInfo.html
 share/ImageMagick/www/api/utility.html
 share/ImageMagick/www/api/vms.html
 share/ImageMagick/www/api/widget.html
-share/ImageMagick/www/api/xwindows.html
 share/ImageMagick/www/api/zoom.html
 share/ImageMagick/www/archives.html
 share/ImageMagick/www/cd.html
 share/ImageMagick/www/color.html
-share/ImageMagick/www/combine.html
+share/ImageMagick/www/composite.html
 share/ImageMagick/www/convert.html
 share/ImageMagick/www/cvs.html
 share/ImageMagick/www/display.html
@@ -168,9 +204,9 @@ share/ImageMagick/www/quantize.html
 share/ImageMagick/www/smile.c
 share/ImageMagick/www/sponsor.html
 share/ImageMagick/www/tools.html
-share/ImageMagick/www/xtp.html
 @dirrm share/ImageMagick/www/api/types
 @dirrm share/ImageMagick/www/api
+@dirrm share/ImageMagick/www/Magick++
 @dirrm share/ImageMagick/www
 @dirrm share/ImageMagick/images
 @dirrm share/ImageMagick
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index f0c0d82ae31..783ed1a242b 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 15:22:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/09/17 15:17:31 tron Exp $
 
-DISTNAME=		ImageMagick-5.2.8
-PKGNAME=		p5-PerlMagick-5.2.8
+DISTNAME=		ImageMagick-5.3.9
+PKGNAME=		p5-PerlMagick-5.3.9
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,6 +16,7 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
 MAGICK=			graphics/ImageMagick
 MAGICKDIR=		${PKGSRCDIR}/${MAGICK}
+DISTINFO_FILE=		${MAGICKDIR}/distinfo
 FILESDIR=		${MAGICKDIR}/files
 PATCHDIR=		${MAGICKDIR}/patches
 
@@ -23,8 +24,6 @@ PATCHDIR=		${MAGICKDIR}/patches
 WRKSRC=			${WRKDIR}/${DISTNAME}/PerlMagick
 .endif
 
-#EXTRACT_AFTER_ARGS+=	${WRKSRC}
-
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
diff --git a/graphics/p5-PerlMagick/distinfo b/graphics/p5-PerlMagick/distinfo
deleted file mode 100644
index 4f2b889e3ec..00000000000
--- a/graphics/p5-PerlMagick/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:22 wiz Exp $
-
-SHA1 (ImageMagick-5.2.8.tar.bz2) = 8e173577afe0f0314087c7419397674fd52e0d95
-Size (ImageMagick-5.2.8.tar.bz2) = 2302009 bytes
-SHA1 (patch-aa) = 9c2deaa7323e13219a6b8e5b1dd22c211ba087b1
-SHA1 (patch-ab) = e87a955bb2e28da426e355f5aa6e5e0677cd6fc3
-SHA1 (patch-ac) = 47c01798066affb13707a61b92ca8b140a55cf5c