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

Many bugs were fixed since the release of version 5.3.9 and lots of new
features like 32-Bit QuantumDepth support added.

12 files changed, 90 insertions, 199 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 7a495fc5eba..f603f1d7f88 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.82 2002/03/13 17:37:02 fredb Exp $
+# $NetBSD: Makefile,v 1.83 2002/08/22 08:06:11 tron Exp $
 
-DISTNAME=		ImageMagick-5.3.9
-PKGREVISION=		1
+DISTNAME=		ImageMagick-5.4.8-2
+PKGNAME=		${DISTNAME:S/-2/.2/}
 CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_LOCAL}
+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/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tron@netbsd.org
@@ -14,18 +16,24 @@ CONFLICTS=		geomview-[0-9]*    # both have a program named 'animate'
 
 DEPENDS+=		mpeg2codec-1.2:../../graphics/mpeg2codec
 
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
-
 USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-2//}
 
 # c++ broken as of 'gcc version 2.95.3 20010315 (release) (NetBSD nb1)'
 NOT_FOR_PLATFORM=	NetBSD-*-sparc64
 
 .include "../../mk/bsd.prefs.mk"
 
+.if (${OPSYS} == NetBSD)
+BUILD_DEPENDS+=		bash>=2.0:../../shells/bash2
+
+CONFIGURE_SCRIPT=	${LOCALBASE}/bin/bash ./configure
+.endif
+
 # Avoid compiler bug on "arm32"
 .if (${MACHINE_ARCH} == arm32)
 CFLAGS=			-O
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 417573f0b71..3ca2bd7ae1d 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/06/26 10:29:44 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/22 08:06:11 tron Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/animate
@@ -11,7 +11,7 @@ bin/mogrify
 bin/montage
 include/Magick++.h
 include/Magick++/Blob.h
-include/Magick++/Coder.h
+include/Magick++/CoderInfo.h
 include/Magick++/Color.h
 include/Magick++/Drawable.h
 include/Magick++/Exception.h
@@ -26,48 +26,56 @@ include/Magick++/STL.h
 include/Magick++/Thread.h
 include/Magick++/TypeMetric.h
 include/magick/PreRvIcccm.h
-include/magick/draw.h
-include/magick/semaphore.h
-include/magick/widget.h
-include/magick/cache.h
-include/magick/cache_view.h
 include/magick/api.h
+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/config.h
+include/magick/delegate.h
+include/magick/draw.h
 include/magick/error.h
+include/magick/gem.h
 include/magick/image.h
+include/magick/list.h
+include/magick/magic.h
 include/magick/magick.h
+include/magick/magick_config.h
+include/magick/module.h
 include/magick/monitor.h
 include/magick/quantize.h
+include/magick/registry.h
+include/magick/render.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
-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-ghostscript.mgk
+lib/ImageMagick/type-solaris.mgk
+lib/ImageMagick/type-windows.mgk
 lib/ImageMagick/type.mgk
-lib/libMagick.a
-lib/libMagick.la
-lib/libMagick.so
-lib/libMagick.so.5
-lib/libMagick.so.5.39
+@exec ${MKDIR} %D/lib/ImageMagick/modules/coders
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
 lib/libMagick++.so.5
-lib/libMagick++.so.5.39
-@exec ${MKDIR} %D/lib/ImageMagick/modules/coders
+lib/libMagick++.so.5.48
+lib/libMagick.a
+lib/libMagick.la
+lib/libMagick.so
+lib/libMagick.so.5
+lib/libMagick.so.5.48
 man/man1/ImageMagick.1
-man/man1/Magick-config.1
 man/man1/Magick++-config.1
+man/man1/Magick-config.1
 man/man1/animate.1
 man/man1/composite.1
+man/man1/conjure.1
 man/man1/convert.1
 man/man1/display.1
 man/man1/identify.1
@@ -95,10 +103,14 @@ 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/ImageMagick.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++/ChangeLog.html
+share/ImageMagick/www/Magick++/CoderInfo.html
 share/ImageMagick/www/Magick++/Color.html
 share/ImageMagick/www/Magick++/Documentation.html
 share/ImageMagick/www/Magick++/Drawable.html
@@ -111,7 +123,6 @@ 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
@@ -142,7 +153,7 @@ share/ImageMagick/www/api/blob.html
 share/ImageMagick/www/api/cache.html
 share/ImageMagick/www/api/cache_view.html
 share/ImageMagick/www/api/color.html
-share/ImageMagick/www/api/compress.html
+share/ImageMagick/www/api/composite.html
 share/ImageMagick/www/api/constitute.html
 share/ImageMagick/www/api/decorate.html
 share/ImageMagick/www/api/display.html
@@ -150,22 +161,23 @@ share/ImageMagick/www/api/draw.html
 share/ImageMagick/www/api/effect.html
 share/ImageMagick/www/api/enhance.html
 share/ImageMagick/www/api/error.html
+share/ImageMagick/www/api/fx.html
 share/ImageMagick/www/api/image.html
-share/ImageMagick/www/api/mac.html
+share/ImageMagick/www/api/list.html
 share/ImageMagick/www/api/magick.html
 share/ImageMagick/www/api/memory.html
 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/quantize.html
+share/ImageMagick/www/api/registry.html
+share/ImageMagick/www/api/render.html
+share/ImageMagick/www/api/resize.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/ChromaticityInfo.html
-share/ImageMagick/www/api/types/ColorPacket.html
 share/ImageMagick/www/api/types/DrawInfo.html
 share/ImageMagick/www/api/types/Enumerations.html
 share/ImageMagick/www/api/types/ExceptionInfo.html
@@ -178,14 +190,12 @@ 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/zoom.html
 share/ImageMagick/www/archives.html
 share/ImageMagick/www/cd.html
 share/ImageMagick/www/color.html
 share/ImageMagick/www/composite.html
+share/ImageMagick/www/conjure.html
 share/ImageMagick/www/convert.html
 share/ImageMagick/www/cvs.html
 share/ImageMagick/www/display.html
@@ -195,6 +205,7 @@ share/ImageMagick/www/identify.html
 share/ImageMagick/www/import.html
 share/ImageMagick/www/install.html
 share/ImageMagick/www/magick-list.html
+share/ImageMagick/www/magick.css
 share/ImageMagick/www/miff.html
 share/ImageMagick/www/mogrify.html
 share/ImageMagick/www/montage.html
@@ -204,6 +215,7 @@ share/ImageMagick/www/quantize.html
 share/ImageMagick/www/smile.c
 share/ImageMagick/www/sponsor.html
 share/ImageMagick/www/tools.html
+share/ImageMagick/www/windows.html
 @dirrm share/ImageMagick/www/api/types
 @dirrm share/ImageMagick/www/api
 @dirrm share/ImageMagick/www/Magick++
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index cbb1036486a..4b9a5df6b14 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.7 2002/02/10 12:50:59 abs Exp $
+$NetBSD: distinfo,v 1.8 2002/08/22 08:06:11 tron Exp $
 
-SHA1 (ImageMagick-5.3.9.tar.bz2) = 554f0168cce4e7597366e70b835cf0b07435a4f9
-Size (ImageMagick-5.3.9.tar.bz2) = 2772757 bytes
-SHA1 (patch-aa) = 45bbecaeb54524a0e5996a4e84f38935a88a57d8
-SHA1 (patch-ab) = 49c9354cf0e351cb3f20bf69a76263e6c97e8227
-SHA1 (patch-ac) = 415172bacc3266473d4f16699f7f4e366fd83acd
-SHA1 (patch-ad) = d9716acb824b6692f3dd25e06d3a71a37547dfb8
-SHA1 (patch-ae) = 52f87aafbc587312db604b2df9b931146e632aa7
-SHA1 (patch-af) = d0ca4f9afcaa5361a5b727199def122a5718a932
-SHA1 (patch-ag) = 78537a5e2a79233e9c971ffec6d85dbe667b2203
-SHA1 (patch-ah) = 26f8068a0c34b09e5c9966c0905bc14492da6868
+SHA1 (ImageMagick-5.4.8-2.tar.bz2) = 5f8149c6235ba74581c19871367c73bbb7a799b9
+Size (ImageMagick-5.4.8-2.tar.bz2) = 2979552 bytes
+SHA1 (patch-aa) = 47fb005781517d087f46745760f23ea88726e578
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 42e185e5137..dca68308b74 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.17 2002/02/10 12:51:00 abs Exp $
+$NetBSD: patch-aa,v 1.18 2002/08/22 08:06:12 tron Exp $
 
---- coders/fits.c.orig	Sun Feb 10 10:31:38 2002
-+++ coders/fits.c
-@@ -183,7 +183,9 @@
+--- 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;
- 
-   long
--    count,
-+    count;
 +
 +  int32_t
-     quantum;
++    quantum;
  
    register IndexPacket
+     *indexes;
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
deleted file mode 100644
index bcd7474fb08..00000000000
--- a/graphics/ImageMagick/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2002/02/10 12:51:00 abs Exp $
-
---- configure.in.orig	Wed Sep 12 17:39:19 2001
-+++ configure.in
-@@ -423,9 +423,6 @@
- eval "eval MAN_DIR=$mandir"
- 
- 
--LDFLAGS="$LDFLAGS -L$LIB_DIR"
--CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
--
- # Extend includedir to include magick subdirectory offset
- includedir="$includedir/magick"
- 
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
deleted file mode 100644
index 51071d1c2a3..00000000000
--- a/graphics/ImageMagick/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2002/02/10 12:51:00 abs Exp $
-
---- configure.orig	Wed Sep 12 17:39:17 2001
-+++ configure
-@@ -4128,9 +4128,6 @@
- eval "eval INFO_DIR=$infodir"
- eval "eval MAN_DIR=$mandir"
- 
--LDFLAGS="$LDFLAGS -L$LIB_DIR"
--CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
--
- # Extend includedir to include magick subdirectory offset
- includedir="$includedir/magick"
- 
diff --git a/graphics/ImageMagick/patches/patch-ad b/graphics/ImageMagick/patches/patch-ad
deleted file mode 100644
index 15b79f31b6e..00000000000
--- a/graphics/ImageMagick/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2002/02/10 12:51:00 abs Exp $
-
---- magick/delegate.c.orig	Fri Aug 24 21:26:43 2001
-+++ magick/delegate.c
-@@ -267,7 +267,6 @@
-   assert(image_info->signature == MagickSignature);
-   assert(image != (Image *) NULL);
-   assert(image->signature == MagickSignature);
--  assert(decode!= (char *) NULL);
-   delegate_info=GetDelegateInfo(decode,encode,&image->exception);
-   if (delegate_info == (DelegateInfo *) NULL)
-     {
diff --git a/graphics/ImageMagick/patches/patch-ae b/graphics/ImageMagick/patches/patch-ae
deleted file mode 100644
index ecbaafc95a7..00000000000
--- a/graphics/ImageMagick/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2002/02/10 12:51:00 abs Exp $
-
---- magick/magick.c.orig	Sun Sep 16 23:36:12 2001
-+++ magick/magick.c
-@@ -421,6 +421,7 @@
- #endif
-   SetClientName(filename);
-   (void) setlocale(LC_ALL,"");
-+  (void) setlocale(LC_CTYPE,"C");
-   (void) setlocale(LC_NUMERIC,"C");
- }
- 
diff --git a/graphics/ImageMagick/patches/patch-af b/graphics/ImageMagick/patches/patch-af
deleted file mode 100644
index 0f058ff7297..00000000000
--- a/graphics/ImageMagick/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2002/02/10 12:51:00 abs Exp $
-
---- magick/magick.h.orig	Wed Aug 15 02:20:26 2001
-+++ magick/magick.h
-@@ -11,8 +11,6 @@
- /*
-   System include declarations.
- */
--#define _XOPEN_SOURCE  500
--#define _POSIX_C_SOURCE  199506L
- 
- #define _MAGICK_CONFIG_H
- #if !defined(vms) && !defined(macintosh)
diff --git a/graphics/ImageMagick/patches/patch-ag b/graphics/ImageMagick/patches/patch-ag
deleted file mode 100644
index 47b75656c62..00000000000
--- a/graphics/ImageMagick/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2002/02/10 12:51:00 abs Exp $
-
---- magick/xwindow.c.orig	Sun Sep  9 02:04:32 2001
-+++ magick/xwindow.c
-@@ -2424,6 +2424,7 @@
-   annotate_info->previous=(XAnnotateInfo *) NULL;
-   annotate_info->next=(XAnnotateInfo *) NULL;
-   (void) setlocale(LC_ALL,"");
-+  (void) setlocale(LC_CTYPE,"C");
-   (void) setlocale(LC_NUMERIC,"C");
-   XSupportsLocale();
-   XSetLocaleModifiers("");
diff --git a/graphics/ImageMagick/patches/patch-ah b/graphics/ImageMagick/patches/patch-ah
deleted file mode 100644
index f6ed65e7347..00000000000
--- a/graphics/ImageMagick/patches/patch-ah
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/02/10 12:51:00 abs Exp $
-
---- utilities/mogrify.c.orig	Fri Sep  7 16:03:51 2001
-+++ utilities/mogrify.c
-@@ -1651,11 +1651,12 @@
-               (void) strcpy(p,format);
-             else
-               {
--                FormatString(image_info->filename,"%.1024s:%.1024s",format,
--                  image->filename);
--                (void) strcpy(image->filename,image_info->filename);
-+                FormatString(filename, "%.1024s:%.1024s",format,
-+                  image_info->filename);
-+                (void) strcpy(image->filename,filename);
-               }
--          }
-+          } else 
-+            (void) strcpy(image->filename,image_info->filename);
-         /*
-           Transmogrify image as defined by the image processing options.
-         */
-@@ -1669,19 +1670,6 @@
-         */
-         if (format != (char *) NULL)
-           AppendImageFormat(format,image->filename);
--        else
--          if (LocaleCompare(image_info->filename,"-") != 0)
--            {
--              (void) strcpy(filename,image->filename);
--              AppendImageFormat("mgk",image->filename);
--              if (IsAccessible(image->filename))
--                {
--                  (void) strcat(image->filename,"~");
--                  if (IsAccessible(image->filename))
--                    MagickError(FileOpenError,"Unable to create temporary file",
--                      filename);
--                }
--            }
-         for (p=image; p != (Image *) NULL; p=p->next)
-         {
-           (void) strcpy(p->filename,image->filename);
-@@ -1700,12 +1688,6 @@
-           scene--;
-         if (image_info->verbose)
-           DescribeImage(image,stderr,False);
--        if ((format == (char *) NULL) && (status != False))
--          if (LocaleCompare(image_info->filename,"-") != 0)
--            {
--              (void) remove(filename);
--              (void) rename(image->filename,filename);
--            }
-         DestroyImage(image);
-       }
-   }
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index d24386fef77..769c122fb43 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,29 +1,26 @@
-# $NetBSD: Makefile,v 1.17 2002/07/07 06:23:49 simonb Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/22 08:06:15 tron Exp $
 
-DISTNAME=		ImageMagick-5.3.9
-PKGNAME=		p5-PerlMagick-5.3.9
-PKGREVISION=		1
+DISTNAME=		ImageMagick-5.4.8-2
+PKGNAME=		p5-PerlMagick-5.4.8.2
 SVR4_PKGNAME=		p5pma
 CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_LOCAL}
+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/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.simplesystems.org/ImageMagick/
 COMMENT=		Object-oriented Perl interface to ImageMagick
 
-# restore following line on next update
-#DEPENDS+=		${DISTNAME}:../../graphics/ImageMagick
-DEPENDS+=		ImageMagick-5.3.9nb1:../../graphics/ImageMagick
-
-NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
+DEPENDS+=		${DISTNAME:S/-2/.2/}:../../graphics/ImageMagick
 
 DISTINFO_FILE=		${.CURDIR}/../../graphics/ImageMagick/distinfo
 FILESDIR=		${.CURDIR}/../../graphics/ImageMagick/files
 PATCHDIR=		${.CURDIR}/../../graphics/ImageMagick/patches
 
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 USE_PERL5=		YES
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Image/Magick/.packlist
@@ -31,6 +28,8 @@ PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Image/Magick/.packlist
 GNU_CONFIGURE=		YES
 USE_X11=		YES
 
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-2//}
+
 # These need to coordinate with the ImageMagick package.
 # Just leave out "--without-perl".
 
@@ -39,6 +38,14 @@ CONFIGURE_ARGS+=	--with-perl=${PERL5} \
 			--without-hdf --without-jbig --without-threads \
 			--without-ttf --without-xml
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == NetBSD)
+BUILD_DEPENDS+=		bash>=2.0:../../shells/bash2
+
+CONFIGURE_SCRIPT=	${LOCALBASE}/bin/bash ./configure
+.endif
+
 post-configure:
 	cd ${WRKSRC}/PerlMagick && ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL