Update "ImageMagick" package to version 5.1.1. Changes since version 4.2.9:

- ImageMagick has a new logo (contributed by Ofer Tenenbaum).
- Requests for all or part of a pixel row, or multiple complete pixel
  rows, are mapped directly to the underlying image in memory, or memory
  mapped from a disk file, avoiding performance-robbing pixel copying.
  Requested rectangular regions which are narrower than the image width
  must still be copied to a scratch space.
- Support for WBMP, Wireless Bitmap (level 0) images (contributed by
  Milan Votava)
- Image sizes are limited by physical memory plus available disk space on
  the machine, or the file addressing limits of the operating system,
  whichever comes first. This means that if you can figure out how to
  build a big enough machine (and have plenty of time) terabyte images
  can be processed.
- An image cache subsystem and API are provided to map portions (as small
  as one pixel or as large as the entire image) of images into memory and
  to save any updates.
- Memory mapping is used to access files. This is the most efficient
  access mechanism available.
- DirectColor pixels are now stored in an efficient 32-bit structure (or
  64-bit when QuantumLeap is enabled).
- PseudoColor indices are now stored separately from the DirectColor
  pixels (PseudoColor and DirectColor representations are still available
  simultaneously).
- In-memory run-length encoding is eliminated.
- Compressed images are decompressed and compressed incrementally in
  order to limit memory consumption.
- Lots of minor C API fixes and improvements.
- Cache threshold setting for setting the boundary between use of RAM or
  RAM + disk when processing an image:
  - Use the --enable-cache option (e.g. --enable-cache=160) to set the
    compiled-in default when running the configure script.
  - Use -cache for ImageMagick utilities
  - Set the cache_threshold attribute in PerlMagick
  - Set the cacheThreshold attribute in Magick++
- The identify utility now displays precise read-time values.
- The Win32 build environment (now called "VisualMagick") is completely
  re-done and supports building both multi-thread DLL as well as static
  libraries.

6 files changed, 59 insertions, 44 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index f877f77a148..80639873d0c 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.55 2000/02/09 20:20:53 tron Exp $
+# $NetBSD: Makefile,v 1.56 2000/03/21 22:18:24 tron Exp $
 
-DISTNAME=	ImageMagick-4.2.9
+DISTNAME=	ImageMagick-5.1.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.wizards.dupont.com/cristy/ImageMagick.html
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	mpeg2codec-1.2:../../graphics/mpeg2codec
-DEPENDS+=	png>=1.0.3:../../graphics/png
+DEPENDS+=	png>=1.0.6:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 MIRROR_DISTFILE= no
diff --git a/graphics/ImageMagick/files/md5 b/graphics/ImageMagick/files/md5
index d3a05dc8f01..f779adaff0b 100644
--- a/graphics/ImageMagick/files/md5
+++ b/graphics/ImageMagick/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.24 1999/09/11 00:52:33 tron Exp $
+$NetBSD: md5,v 1.25 2000/03/21 22:18:24 tron Exp $
 
-MD5 (ImageMagick-4.2.9.tar.bz2) = 4bea05b1dadab050ef5190583e08a705
+MD5 (ImageMagick-5.1.1.tar.bz2) = 46c72b6f38c134d9877a2f2bb1915c41
diff --git a/graphics/ImageMagick/files/patch-sum b/graphics/ImageMagick/files/patch-sum
index 06d9ec0c6f6..19161da9590 100644
--- a/graphics/ImageMagick/files/patch-sum
+++ b/graphics/ImageMagick/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/11/19 11:53:01 agc Exp $
+$NetBSD: patch-sum,v 1.3 2000/03/21 22:18:24 tron Exp $
 
-MD5 (patch-aa) = 986b81b5b304380b027eb03963fc24c6
+MD5 (patch-aa) = ad8a064f1e13a16800e93d98b39659f8
+MD5 (patch-ab) = 53267446ee149dc4e2291fad62464f0a
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 2036da41347..d56261df80e 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,39 +1,36 @@
-$NetBSD: patch-aa,v 1.11 1999/11/19 11:53:01 agc Exp $
+$NetBSD: patch-aa,v 1.12 2000/03/21 22:18:24 tron Exp $
 
---- configure.orig	Thu Sep  9 01:10:48 1999
-+++ configure	Fri Nov 19 11:26:56 1999
-@@ -2238,7 +2238,7 @@
- fi
- rm -f confcache
+--- configure.orig	Fri Feb  4 23:41:28 2000
++++ configure	Tue Mar 21 22:21:52 2000
+@@ -1673,6 +1673,7 @@
+ # Must also pass -no-undefined to libtool in Makefile
+ # AC_LIBTOOL_WIN32_DLL
  
--
 +if false; then
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
-@@ -2247,6 +2247,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-+fi
+ # Configure libtool
+ # Check whether --enable-shared or --disable-shared was given.
+ if test "${enable_shared+set}" = set; then
+@@ -2057,6 +2058,7 @@
  
- # Reload cache, that may have been modified by ltconfig
- if test -r "$cache_file"; then
-@@ -2257,7 +2258,7 @@
-   > $cache_file
- fi
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++fi
  
--
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -4303,6 +4305,7 @@
+ # Find Posix threads library
+ #
+ LIB_THREAD=''
 +if false; then
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
- 
-@@ -2282,7 +2283,7 @@
- then
-   libtool_build_static_libs='yes'
- fi
--
+ echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6
+ echo "configure:4308: checking for pthread_attr_init in -lpthread" >&5
+ ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'`
+@@ -4346,6 +4349,7 @@
+    DEF_THREAD="-D_REENTRANT"
+ else
+   echo "$ac_t""no" 1>&6
 +fi
+ fi
  
- # Add configure option --enable-maintainer-mode which enables dependency
- # checking and generation useful to package maintainers.  This is made an
+ LIBS="$LIB_THREAD $LIBS"
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
new file mode 100644
index 00000000000..d1ba8f81501
--- /dev/null
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -0,0 +1,16 @@
+$NetBSD: patch-ab,v 1.7 2000/03/21 22:19:44 tron Exp $
+
+--- magick/magick.h.orig	Fri Feb  4 18:14:06 2000
++++ magick/magick.h	Tue Mar 21 22:38:42 2000
+@@ -5,9 +5,11 @@
+ #define _MAGICK_H
+ 
+ #define __EXTENSIONS__  1
++#ifndef __NetBSD__
+ #define _POSIX_C_SOURCE  199506L
+ #define _XOPEN_SOURCE  500
+ #define _XOPEN_SOURCE_EXTENDED  1
++#endif
+ 
+ /*
+   System include declarations.
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index c09b39d2051..0116a597b9f 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 1999/09/11 00:52:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.23 2000/03/21 22:18:24 tron Exp $
 bin/Magick-config
 bin/animate
 bin/combine
@@ -8,13 +8,13 @@ bin/identify
 bin/import
 bin/mogrify
 bin/montage
-bin/xtp
+include/magick/cache.h
+include/magick/cache_io.h
 include/magick/api.h
 include/magick/blob.h
 include/magick/classify.h
 include/magick/compress.h
 include/magick/config.h
-include/magick/defines.h
 include/magick/delegates.h
 include/magick/error.h
 include/magick/gems.h
@@ -23,10 +23,12 @@ include/magick/magick.h
 include/magick/memory.h
 include/magick/monitor.h
 include/magick/quantize.h
+include/magick/timer.h
 include/magick/utility.h
 include/magick/version.h
+include/magick/xwindows.h
 lib/libMagick.a
-lib/libMagick.so.4.29
+lib/libMagick.so.5.11
 man/man1/ImageMagick.1
 man/man1/animate.1
 man/man1/combine.1
@@ -36,7 +38,6 @@ man/man1/identify.1
 man/man1/import.1
 man/man1/mogrify.1
 man/man1/montage.1
-man/man1/xtp.1
 man/man4/miff.4
 man/man5/quantize.5
 share/ImageMagick/Copyright.txt