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

Changes since version 5.5.6:
- File descriptor leak prevented temporary disk pixel cache from being
  removed under Windows.
- Color profile patches provided by (dge at softec.st).
- West/East geometry was computed with image width rather than height.
- The MNG encoder failed to set the JNG bit in the simplicity profile.
- The MNG encoder failed to write FRAM chunks when all images were JNG.
- The JNG encoder wrote the wrong alpha_sample_depth for opaque images.
- Fixed JPEG EXIF problem.
- Added -thumbnail as an option to the utilities.
- No TIFF preview was written on EPT write (patch provided by
  Lars Ruben Skyum).
- NegateImage() now negates the K channel of a CMYK image (patch provided
  by Lars Ruben Skyum).
- Parameter 'elevation' misspeclled for PerlMagick Shape() method.
- A number of minor leak/unitialzed memory problems fixed.
- Allocate free nodes from the heap in QuantizeImage().
- Magick-config --version returned gibberish.
- Adopted Bob Friesenhahn's patterns-- use as filename pattern:checkboard,
  pattern:bricks, etc.
- We cannot reliably auto rotate PDF files so this feature was removed.
- The conjure program did not correctly handle the gravity attribute.
- The persistent cache reference count was not properly incremented.
- Added $image->Describe() method to PerlMagick to interface to the
  DescribeImage() C API method.
- Added support for the EXIF Tag Parsing Library.  Currently we simply
  display the tags when calling DescribeImage().  In the near future
  there will be support for modifying or adding tags.
- Added Bob Friesenhahn's updated Windows installation instructions.
- Interfaced the drawing routines with the new MagickWand API.
  MagickWand will be the primary public C interface to ImageMagick in
  the near future.
- magick/effect.c: RandomChannelThresholdImage was not handling
  PseudoColor, non-gray images correctly.
- png.c would not compile with libpng versions older than libpng-0.95,
  due to bugs introduced in ImageMagick version 5.5.2.
- Implemented -random-threshold and -ordered-dither options.
- The locale messaging system now uses a hash for fast lookup.
- Updated libtool to the new released version, 1.5.
- Fixed bug with decoding grayscale PNG images and JNG alpha channel
  at Q:32.
- Now recognize 32-bit hex color specifications, patches provided by
  Bob Friesenhahn.
- Started API wrappers based on Bob Friesenhahn's method suggestions.
- Text annotations that started with '\n' were not rendered correctly.
- Removed artifacts from images rotated with a small number of degrees.
- Minor bug fix in the ParseGeometry() method.
- Modified the non-public inline AlphaComposite() to use a PixelPacket
  pointer; previously it returned a PixelPacket structure.
- You can now specify an image geometry as an image file (e.g. -geometry
  image.jpg).
- Use new temporary file manager for JNG components.
- Added support for 12-bit TIFF images.
- Added improved locale message subsystem (contributed by Kyle Shorter).
- Removed a bias from SampleImage() and DrawAffineImage() (bug report
  by Glenn Randers-Pehrson).
- PerlMagick now recognizes percent values for fuzz or opacity.
- Not enough memory allocated for reading PCX (bug report by Trevor
  Willis).
- There were artifacts when using the Bessel function for resizing
  (bug report by Bob Friesenhahn).
- Added -resample to convert to change the resolution of an image.
- Added a temporary file manager that prevents race conditions and
  removes any remaining files on exit.
- Prepped ImageMagick to work with Visual C++ 7.0 under Windows.
  The Windows configure patches came from William Radcliffe.
- The refresh of the display image window no longer lags when the
  magnify window overlay it.
- Numerous code clean-up and minor speed ups based on problem areas
  identified in the Graphics-Magick ChangeLog.

5 files changed, 227 insertions, 172 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 8cf57aeb5f6..4bc87d8d2ab 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.97 2003/06/02 14:05:04 abs Exp $
+# $NetBSD: Makefile,v 1.98 2003/06/30 06:45:01 tron Exp $
 
-.include "./Makefile.common"
+.include "Makefile.common"
 
-PKGNAME=		ImageMagick-${DISTSUFFIX}
+PKGNAME=		ImageMagick-${DISTVERSION}
 
 CATEGORIES=		graphics
 
@@ -40,10 +40,6 @@ CFLAGS=			-O
 # Some configure_args come from Makefile.common
 CONFIGURE_ARGS+=	--without-perl
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \
-		${PREFIX}/share/ImageMagick
-
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../graphics/jasper/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 5402f2185f9..535198ce498 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2003/04/16 13:27:21 mjl Exp $
+# $NetBSD: Makefile.common,v 1.2 2003/06/30 06:45:02 tron Exp $
 
-IM_MAJOR_VER=		5.5.6
-IM_MINOR_VER=		NONE
-IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}-Q16
+IM_MAJOR_VER=		5.5.7
+IM_MINOR_VER=		9
+IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
 DISTSUFFIX=		${IM_MAJOR_VER}-${IM_MINOR_VER}
@@ -11,6 +11,7 @@ DISTSUFFIX=		${IM_MAJOR_VER}
 .endif
 
 DISTNAME=		ImageMagick-${DISTSUFFIX}
+DISTVERSION=		${DISTSUFFIX:S/-/./}
 
 WRKSRC=			${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
 
@@ -27,6 +28,6 @@ EXTRACT_SUFX=		.tar.bz2
 # any of these manually as desired (PerlMagick should probably be a separate
 # pkg, however).
 CONFIGURE_ARGS+=	--without-dps --without-fpx \
-			--without-hdf --without-jbig --without-threads \
-			--without-ttf --without-wmf --without-xml \
-			--without-lcms
+			--without-hdf --without-jbig --without-jp2 \
+			--without-threads --without-ttf --without-wmf \
+			--without-xml --without-lcms
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 4359bdcd8ea..659ff9ad70b 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/04/15 11:11:50 mjl Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/06/30 06:45:02 tron Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/animate
@@ -30,20 +30,24 @@ include/magick/cache.h
 include/magick/cache_view.h
 include/magick/command.h
 include/magick/compress.h
+include/magick/drawing_wand.h
 include/magick/delegate.h
 include/magick/deprecate.h
-include/magick/draw.h
 include/magick/error.h
 include/magick/gem.h
+include/magick/hashmap.h
 include/magick/image.h
+include/magick/info.h
 include/magick/list.h
 include/magick/log.h
 include/magick/magic.h
 include/magick/magick.h
 include/magick/magick_config.h
+include/magick/magick_wand.h
 include/magick/module.h
 include/magick/monitor.h
 include/magick/paint.h
+include/magick/pixel_wand.h
 include/magick/quantize.h
 include/magick/registry.h
 include/magick/render.h
@@ -57,25 +61,28 @@ include/magick/widget.h
 include/magick/xwindow.h
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/colors.mgk
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/delegates.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/english.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/locale.mgk
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/log.mgk
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/magic.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders/modules.mgk
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/type-ghostscript.mgk
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/type-solaris.mgk
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/type-windows.mgk
 lib/ImageMagick-${IM_MAJOR_LIB_VER}/type.mgk
-@exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_VER}/modules/coders
+@exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_VER}/modules/filters
 lib/libMagick++.a
 lib/libMagick++.la
-lib/libMagick++-${IM_MAJOR_LIB_VER}.so
-lib/libMagick++-${IM_MAJOR_LIB_VER}.so.0
-lib/libMagick++-${IM_MAJOR_LIB_VER}.so.0.0
 lib/libMagick++.so
+lib/libMagick++.so.0
+lib/libMagick++.so.0.0
 lib/libMagick.a
 lib/libMagick.la
-lib/libMagick-${IM_MAJOR_LIB_VER}.so
-lib/libMagick-${IM_MAJOR_LIB_VER}.so.0
-lib/libMagick-${IM_MAJOR_LIB_VER}.so.0.0
 lib/libMagick.so
+lib/libMagick.so.0
+lib/libMagick.so.0.0
+lib/pkgconfig/ImageMagick.pc
+lib/pkgconfig/ImageMagick++.pc
 man/man1/ImageMagick.1
 man/man1/Magick++-config.1
 man/man1/Magick-config.1
@@ -90,150 +97,201 @@ man/man1/mogrify.1
 man/man1/montage.1
 man/man4/miff.4
 man/man5/quantize.5
-share/ImageMagick/Copyright.txt
-share/ImageMagick/ImageMagick.html
-share/ImageMagick/QuickStart.txt
-share/ImageMagick/images/background.gif
-share/ImageMagick/images/examples.jpg
-share/ImageMagick/images/logo.png
-share/ImageMagick/images/magick.png
-share/ImageMagick/images/networkeleven.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/images/script.gif
-share/ImageMagick/images/sprite.png
-share/ImageMagick/images/star.png
-share/ImageMagick/images/top.jpg
-share/ImageMagick/images/twi.png
-share/ImageMagick/www/Changelog.html
-share/ImageMagick/www/Copyright.html
-share/ImageMagick/www/FAQ.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
-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++/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/QuickStart.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/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/color.html
-share/ImageMagick/www/api/composite.html
-share/ImageMagick/www/api/constitute.html
-share/ImageMagick/www/api/decorate.html
-share/ImageMagick/www/api/deprecate.html
-share/ImageMagick/www/api/display.html
-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/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/paint.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/resource.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/DrawInfo.html
-share/ImageMagick/www/api/types/Enumerations.html
-share/ImageMagick/www/api/types/ExceptionInfo.html
-share/ImageMagick/www/api/types/Image.html
-share/ImageMagick/www/api/types/ImageAttribute.html
-share/ImageMagick/www/api/types/ImageInfo.html
-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/widget.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
-share/ImageMagick/www/formats.html
-share/ImageMagick/www/help.html
-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
-share/ImageMagick/www/new.html
-share/ImageMagick/www/perl.html
-share/ImageMagick/www/quantize.html
-share/ImageMagick/www/smile.c
-share/ImageMagick/www/sponsor.html
-share/ImageMagick/www/tools.html
-share/ImageMagick/www/utilities.html
-share/ImageMagick/www/windows.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
-@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules/coders
-@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules
+share/ImageMagick-${IM_MAJOR_VER}/Copyright.txt
+share/ImageMagick-${IM_MAJOR_VER}/QuickStart.txt
+share/ImageMagick-${IM_MAJOR_VER}/images/background.gif
+share/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg
+share/ImageMagick-${IM_MAJOR_VER}/images/logo.png
+share/ImageMagick-${IM_MAJOR_VER}/images/granite.png
+share/ImageMagick-${IM_MAJOR_VER}/images/magick.png
+share/ImageMagick-${IM_MAJOR_VER}/images/networkeleven.png
+share/ImageMagick-${IM_MAJOR_VER}/images/pair.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/bricks.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/checkerboard.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/circles.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch30.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/crosshatch45.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/fishscales.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray0.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray10.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray100.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray15.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray20.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray25.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray30.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray35.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray40.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray45.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray5.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray50.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray55.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray60.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray65.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray70.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray75.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray80.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray85.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray90.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/gray95.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hexagons.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontal.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/horizontalsaw.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_bdiagonal.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_cross.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_diagcross.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_fdiagonal.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_horizontal.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/hs_vertical.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/left30.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/left45.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/leftshingle.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/octagons.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/right30.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/right45.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/rightshingle.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/smallfishscales.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/vertical.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalbricks.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalleftshingle.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalrightshingle.png
+share/ImageMagick-${IM_MAJOR_VER}/images/patterns/verticalsaw.png
+share/ImageMagick-${IM_MAJOR_VER}/images/promote.png
+share/ImageMagick-${IM_MAJOR_VER}/images/rose.png
+share/ImageMagick-${IM_MAJOR_VER}/images/right_triangle.png
+share/ImageMagick-${IM_MAJOR_VER}/images/right_triangle_option.png
+share/ImageMagick-${IM_MAJOR_VER}/images/screen.png
+share/ImageMagick-${IM_MAJOR_VER}/images/script.gif
+share/ImageMagick-${IM_MAJOR_VER}/images/sprite.png
+share/ImageMagick-${IM_MAJOR_VER}/images/star.png
+share/ImageMagick-${IM_MAJOR_VER}/images/top.jpg
+share/ImageMagick-${IM_MAJOR_VER}/images/twi.png
+share/ImageMagick-${IM_MAJOR_VER}/index.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Changelog.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Copyright.html
+share/ImageMagick-${IM_MAJOR_VER}/www/FAQ.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Blob.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.fig
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.png
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Cache.svg
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/ChangeLog.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/CoderInfo.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Color.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Documentation.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Drawable.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Drawable_example_1.png
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Enumerations.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Exception.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/FormatCharacters.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Future.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Geometry.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Image.fig
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Image.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Image.png
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/ImageDesign.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/ImageMagick.png
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Install.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Magick++.png
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Montage.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/NEWS.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/PixelPacket.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/Pixels.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/README.txt
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/STL.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/TypeMetric.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/index.html
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/montage-sample-framed.jpg
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/right_triangle.png
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-framed.fig
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-framed.jpg
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-plain.fig
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-anatomy-plain.jpg
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-sample-framed.jpg
+share/ImageMagick-${IM_MAJOR_VER}/www/Magick++/thumbnail-sample-plain.jpg
+share/ImageMagick-${IM_MAJOR_VER}/www/QuickStart.html
+share/ImageMagick-${IM_MAJOR_VER}/www/animate.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api.html
+share/ImageMagick-${IM_MAJOR_VER}/www/INSTALL-mac.html
+share/ImageMagick-${IM_MAJOR_VER}/www/INSTALL-unix.html
+share/ImageMagick-${IM_MAJOR_VER}/www/INSTALL-vms.html
+share/ImageMagick-${IM_MAJOR_VER}/www/INSTALL-windows.html
+share/ImageMagick-${IM_MAJOR_VER}/www/ImageMagickObject.html
+share/ImageMagick-${IM_MAJOR_VER}/www/apis.html
+share/ImageMagick-${IM_MAJOR_VER}/www/objectives.html
+share/ImageMagick-${IM_MAJOR_VER}/www/topics.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/drawing_wand.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/magick_wand.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/pixel_wand.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/types.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/animate.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/annotate.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/attribute.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/blob.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/cache.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/cache_view.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/color.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/composite.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/constitute.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/decorate.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/deprecate.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/display.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/effect.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/enhance.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/error.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/fx.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/image.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/list.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/magick.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/paint.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/quantize.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/registry.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/render.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/resize.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/resource.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/segment.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/shear.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/signature.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/stream.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/transform.html
+share/ImageMagick-${IM_MAJOR_VER}/www/api/widget.html
+share/ImageMagick-${IM_MAJOR_VER}/www/archives.html
+share/ImageMagick-${IM_MAJOR_VER}/www/cd.html
+share/ImageMagick-${IM_MAJOR_VER}/www/color.html
+share/ImageMagick-${IM_MAJOR_VER}/www/composite.html
+share/ImageMagick-${IM_MAJOR_VER}/www/conjure.html
+share/ImageMagick-${IM_MAJOR_VER}/www/convert.html
+share/ImageMagick-${IM_MAJOR_VER}/www/cvs.html
+share/ImageMagick-${IM_MAJOR_VER}/www/display.html
+share/ImageMagick-${IM_MAJOR_VER}/www/formats.html
+share/ImageMagick-${IM_MAJOR_VER}/www/help.html
+share/ImageMagick-${IM_MAJOR_VER}/www/identify.html
+share/ImageMagick-${IM_MAJOR_VER}/www/import.html
+share/ImageMagick-${IM_MAJOR_VER}/www/install.html
+share/ImageMagick-${IM_MAJOR_VER}/www/magick-list.html
+share/ImageMagick-${IM_MAJOR_VER}/www/magick.css
+share/ImageMagick-${IM_MAJOR_VER}/www/miff.html
+share/ImageMagick-${IM_MAJOR_VER}/www/mogrify.html
+share/ImageMagick-${IM_MAJOR_VER}/www/montage.html
+share/ImageMagick-${IM_MAJOR_VER}/www/new.html
+share/ImageMagick-${IM_MAJOR_VER}/www/perl.html
+share/ImageMagick-${IM_MAJOR_VER}/www/quantize.html
+share/ImageMagick-${IM_MAJOR_VER}/www/smile.c
+share/ImageMagick-${IM_MAJOR_VER}/www/sponsor.html
+share/ImageMagick-${IM_MAJOR_VER}/www/tools.html
+share/ImageMagick-${IM_MAJOR_VER}/www/utilities.html
+share/ImageMagick-${IM_MAJOR_VER}/www/windows.html
+@dirrm share/ImageMagick-${IM_MAJOR_VER}/www/api
+@dirrm share/ImageMagick-${IM_MAJOR_VER}/www/Magick++
+@dirrm share/ImageMagick-${IM_MAJOR_VER}/www
+@dirrm share/ImageMagick-${IM_MAJOR_VER}/images/patterns
+@dirrm share/ImageMagick-${IM_MAJOR_VER}/images
+@dirrm share/ImageMagick-${IM_MAJOR_VER}
+@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters
+@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders
+@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16
 @dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}
 @dirrm include/magick
 @dirrm include/Magick++
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index e30d87a879c..c12014e7b2c 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2003/04/15 11:11:50 mjl Exp $
+$NetBSD: distinfo,v 1.14 2003/06/30 06:45:02 tron Exp $
 
-SHA1 (ImageMagick-5.5.6.tar.bz2) = 952695b25f53a11c1cf576f790a1d06299a750fb
-Size (ImageMagick-5.5.6.tar.bz2) = 3526303 bytes
+SHA1 (ImageMagick-5.5.7-9.tar.bz2) = d1d5aee70a92adda82e18fcac717c1b753769c65
+Size (ImageMagick-5.5.7-9.tar.bz2) = 4212993 bytes
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 275696ec0fc..8b5f036fd28 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2003/04/16 13:27:22 mjl Exp $
+# $NetBSD: Makefile,v 1.28 2003/06/30 06:45:04 tron Exp $
 
 .include "../ImageMagick/Makefile.common"
 
-PKGNAME=		p5-PerlMagick-${DISTSUFFIX}
+PKGNAME=		p5-PerlMagick-${DISTVERSION}
 
 SVR4_PKGNAME=		p5pma