Update "ImageMagick" package to version 5.2.2. Changes in version 5.2.2:

- Support added for the Word Perfect Graphics (WPG) file format
  (contributed by Jaroslav Fojtik).
- The pixel 'matte' field is changed to indicate the degree of pixel
  transparency rather than the degree of opacity. This makes the pixels
  compatable with most popular video cards, and many in-memory image
  formats.
  When the pixel quantum size is eight bits, the colormap is restricted
  to 256 colors, but supports up to 65535 colors when the quantum size is
  sixteen bits (when QuantumLeap is defined at compilation time).
- ImageMagick is more memory efficient (by 18%) when the quantum size is
  eight bits, and the image is colormapped.
- ImageMagick is (finally) believed to be thread safe under Windows,
  since it uses the Windows synchronization APIs to lock shared data.
- Under Unix and Windows, dynamically-loaded format coder modules are
  supported. There are currently 72 loadable modules. Support for
  loadable modules allows the user to add or remove formats from
  ImageMagick by simply adding or removing a file. New modules are
  automatically detected so users may add their own modules. This support
  is proven to work for Sun Solaris, Linux, and SGI IRIX. Please let us
  know about other operating systems they work on. Building a modular
  ImageMagick is enabled by specifing the configure options
  --enable-shared --with-modules.
- ImageMagick now has a set of modules for streaming. Here pixels are
  passed to the application as they are available and deleted after use
  ensuring a small memory footprint. This is useful for multi-media
  applications such as MPEG.
- Image format identification (based on the file header) is now
  configured via an external text file. This allows the user to add
  automatic file identification for new formats added via a coder module,
  or via a delegate (external program).
- XML files conforming to the W3C SVG DTD are now rendered directly by
  ImageMagick. The support is incomplete but still useful.
- The Pilot Image Format (PDB) is now supported.
- The drawing primitives have been extended to support drawing bezier
  curves, rounded rectangles, and arcs. There is now support for drawing
  compound objects (a sequence of objects) using drawing paths. The
  concept of a drawing pen has been split into stroke (for the outline)
  and fill (for the objects internal color). If fill is not defined, then
  only the object outline is drawn. This substantial change results in
  the existing drawing commands for filled objects (fillEllipse,
  fillRectangle, fillCircle, and fillPolygon) being deprecated.
- A cache file format is now supported which is a snapshot of an image's
  pixel cache as it appears on disk. Images stored in this format (large)
  may be loaded instantly by ImageMagick since decoding is not required.
  In order to write this format , the argument -cache 0 must be supplied
  (e.g. convert -cache 0 file.jpg file.cache).
- The build environment for Windows NT is entirely re-done. There is now
  a configure program which generates a set of Visual C++ project files
  which satisfy a set of reqirements (e.g. DLL, multi-thread, X11). These
  project files are then used to build ImageMagick.
- The C API is significantly modified in order to provide thread-safe
  operation via function re-entrancy. ImageMagick is believed to be
  thread-safe when used with POSIX threads. It is not yet completely
  thread safe under Windows or the Mac. Errors (of type ExceptionInfo)
  are now reported by a function argument, or via a member of the current
  image.
- The GaussianBlurImage() function (contributed by runger@cs.mcgill.ca)
  supports Gaussian bluring an image.
- Functions (OpenCacheView(), CloseCacheView(), GetCacheView(),
  SetCacheView(), and SyncCacheView()) are provided in order to support
  manipulating multiple pixel views.

6 files changed, 36 insertions, 45 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 8b30c79e50b..5cd5e7530eb 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2000/06/21 02:45:15 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2000/08/10 08:57:23 tron Exp $
 
-DISTNAME=		ImageMagick-5.1.1
+DISTNAME=		ImageMagick-5.2.2
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=		.tar.bz2
@@ -15,9 +15,9 @@ DEPENDS+=		tiff-*:../../graphics/tiff
 
 MIRROR_DISTFILE=	no
 
-GNU_CONFIGURE=		# defined
-USE_X11=		# defined
-USE_LIBTOOL=		# defined
+GNU_CONFIGURE=		YES
+USE_X11=		YES
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 # Avoid compiler bug on "arm32"
@@ -30,7 +30,8 @@ CFLAGS=			-O
 # any of these manually as desired (PerlMagick should probably be a separate
 # pkg, however).
 CONFIGURE_ARGS+=	--without-perl --without-dps --without-fpx \
-			--without-hdf --without-jbig --without-ttf
+			--without-hdf --without-jbig --without-threads \
+			--without-ttf --without-xml
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \
diff --git a/graphics/ImageMagick/files/md5 b/graphics/ImageMagick/files/md5
index f779adaff0b..655a27c5d09 100644
--- a/graphics/ImageMagick/files/md5
+++ b/graphics/ImageMagick/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.25 2000/03/21 22:18:24 tron Exp $
+$NetBSD: md5,v 1.26 2000/08/10 08:57:23 tron Exp $
 
-MD5 (ImageMagick-5.1.1.tar.bz2) = 46c72b6f38c134d9877a2f2bb1915c41
+MD5 (ImageMagick-5.2.2.tar.bz2) = 75f847fce36b32ba4b41b654e508388c
diff --git a/graphics/ImageMagick/files/patch-sum b/graphics/ImageMagick/files/patch-sum
index d2a39219d55..895eb158b3c 100644
--- a/graphics/ImageMagick/files/patch-sum
+++ b/graphics/ImageMagick/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/06/21 02:45:17 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/10 08:57:23 tron Exp $
 
-MD5 (patch-aa) = 3eb6f5bb131b2150cf371a9195fb20b4
-MD5 (patch-ab) = 53267446ee149dc4e2291fad62464f0a
+MD5 (patch-aa) = e762a9b4538fe1e2382ab668ebd866c8
+MD5 (patch-ab) = 84374af1376ffb3abef510d31b40e83e
+MD5 (patch-ac) = 4ab9f29433f4a2b4d711d107f72ba5d2
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
deleted file mode 100644
index 69d0f0e7c8f..00000000000
--- a/graphics/ImageMagick/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2000/06/21 02:45:17 jlam Exp $
-
---- configure.orig	Fri Feb  4 17:41:28 2000
-+++ configure	Tue Jun 20 22:29:55 2000
-@@ -4303,6 +4303,7 @@
- # Find Posix threads library
- #
- LIB_THREAD=''
-+if false; then
- 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 +4347,7 @@
-    DEF_THREAD="-D_REENTRANT"
- else
-   echo "$ac_t""no" 1>&6
-+fi
- fi
- 
- LIBS="$LIB_THREAD $LIBS"
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index d1ba8f81501..05a2b4ff9ff 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,16 +1,17 @@
-$NetBSD: patch-ab,v 1.7 2000/03/21 22:19:44 tron Exp $
+$NetBSD: patch-ab,v 1.8 2000/08/10 08:57:23 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
+--- magick/magick.h.orig	Tue Aug  1 01:32:36 2000
++++ magick/magick.h	Mon Aug  7 16:48:20 2000
+@@ -7,10 +7,12 @@
+ /*
+   System include declarations.
+ */
 +#ifndef __NetBSD__
+ #define __EXTENSIONS__  1
  #define _POSIX_C_SOURCE  199506L
  #define _XOPEN_SOURCE  500
  #define _XOPEN_SOURCE_EXTENDED  1
 +#endif
  
- /*
-   System include declarations.
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index 4611af67c39..2099c42cd20 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2000/06/21 02:45:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.25 2000/08/10 08:57:23 tron Exp $
 bin/Magick-config
 bin/animate
 bin/combine
@@ -8,8 +8,12 @@ bin/identify
 bin/import
 bin/mogrify
 bin/montage
+include/magick/PreRvIcccm.h
+include/magick/attributes.h
+include/magick/semaphore.h
+include/magick/widget.h
 include/magick/cache.h
-include/magick/cache_io.h
+include/magick/cache_view.h
 include/magick/api.h
 include/magick/blob.h
 include/magick/classify.h
@@ -20,7 +24,6 @@ include/magick/error.h
 include/magick/gems.h
 include/magick/image.h
 include/magick/magick.h
-include/magick/memory.h
 include/magick/monitor.h
 include/magick/quantize.h
 include/magick/timer.h
@@ -29,7 +32,8 @@ include/magick/version.h
 include/magick/xwindows.h
 lib/libMagick.a
 lib/libMagick.la
-lib/libMagick.so.5.11
+lib/libMagick.so.5.22
+@exec mkdir -p %D/lib/ImageMagick/modules/coders
 man/man1/ImageMagick.1
 man/man1/animate.1
 man/man1/combine.1
@@ -44,5 +48,9 @@ man/man5/quantize.5
 share/ImageMagick/Copyright.txt
 share/ImageMagick/QuickStart.txt
 share/ImageMagick/delegates.mgk
-@dirrm include/magick
+share/ImageMagick/magic.mgk
 @dirrm share/ImageMagick
+@dirrm lib/ImageMagick/modules/coders
+@dirrm lib/ImageMagick/modules
+@dirrm lib/ImageMagick
+@dirrm include/magick