Update GraphicsMagick to 1.1.10.

Significant changes associated with GraphicsMagick 1.1.10 (released September 19
, 2007)

  Bugs Fixed:

    o Image rotate by -90/270 degrees was producing wrong output.

Significant changes associated with GraphicsMagick 1.1.9 (released September 16, 2007)

  Bugs Fixed:

    o In mogrify command, don't remove file name based on random junk in
      memory.
    o Fixed memory leak when reading MPC files.
    o Fixed crash when writing MIFF format and depth is not expected 8/16/32/.
    o Find latest Ghostscript under Windows which identifies itself as
      "GPL Ghostscript".
    o In mogrify command, don't leak memory in the case where the image
      file contains multiple frames.
    o Fixed crash in PNG and JPEG coders when the image to be written is
      part of an image list.
    o PNG reader errors are now properly reported to the user.
    o TIFF output can now be written to a pipe or other non-seekable
      destination.
    o Support writing PDF with CCITT compression.

  Feature Improvements

    o Added a new 'benchmark' command which can be used to perform
      benchmarking on any other command.
    o Image rotate in clockwise (90 degrees) or counter-clockwise (270
      degrees) direction is now 2-9X faster than before.
    o The -version option now includes a list of supported features.
    o For Windows MinGW-based build, find Ghostscript fonts installed
      under C:/Program Files/.

Significant changes associated with GraphicsMagick 1.1.8 (released July 28, 2007)

  Security Fixes:

    o Shell command injection via delegates subsystem (CVE-2005-4601).
    o Insecure use of filenames as a "sprintf" specification (CVE-2006-0082).
    o EXIF IFD stack overflow vulnerability.
    o BMP  format: Verify seek before proceeding.
    o DCM  format: Buffer overflow prevention (CVE-2006-5456).
    o DCM  format: Integer overflow prevention (CVE-2007-1797).
    o PALM format: Heap overflow prevention (CVE-2006-5456).
    o SGI  format: Fixes for RLE decoding issue (CVE-2006-4144).
    o XCF  format: Buffer overflow prevention, infinite loop prevention.

  Bugs Fixed:

    o Typo when searching for HTMLDecodeDelegate.
    o Avoid crash if delegate program fails to return an image.
    o EXIF memory leak fixes.
    o Command parser memory leak fixes.
    o Deadlock fix for event log initialization.
    o Work with latest Ghostscript "GPL Ghostscript" under Windows.
    o 'gm import' now returns image of appropriate depth.
    o Fixed memory map resource managment.
    o Fixed includedir variable in pkg-config files.
    o Fixed validation of -affine argument.
    o Fixed bug where fseeko() and ftello() were not used when available.
    o Fixed issue when pread() and pwrite() prototypes are missing.
    o Fixed pixel cache issues when size_t is an unsigned type.
    o Fixed dcraw delegate options to work with modern dcraw.
    o Fixed -level argument parsing to allow embedded % characters.
    o Fix for segfault in InitializeMagick(NULL).
    o Fix for segfault in ModifyCache().
    o Fix for Wand MagickGetQuantumDepth() interface.
    o Fix for GrayscalePseudoClassImage() on 64-bit systems.
    o Fix for MagickReallocMemory memory leak under certain error conditions.
    o Validate BLOB access range.
    o ICON format: Segfault fix.
    o JPEG format: Fixed reading 12-bit grayscale JPEG.
    o MAT  format: Stability improvements.
    o MIFF format: Handle a compression value of 'None'.
    o PCX  format: Segfault fix.  Heap overflow fix.
    o PDF  format: Fixed writing with JPEG compression.
    o PICT format: Segfault fix.
    o PNG  format: Fixed compile problem with some libpng versions. Segfault fix.
    o PNM  format: Fixed scaling problem due to rounding error. Validate scaling.
    o PSD  format: Fixed memory leak with layerd PSD files.
    o SGI  format: Handle 16-bit SGI image files correctly.
    o SUN  format: Segfault fix.
    o TIFF format: Secure error reporting.  Finally support LZW under Windows.
    o WPG  format: Fixed crash with clip-art WPG files.
    o XWD  format: Fix for integer under/overflow.

  Feature Improvements

    o CIN format: Implementation is entirely replaced.
    o MAT format: Support Byte and Word formats, as well as big/little endian.
    o WPG format: Support for CTM translation.

  Updates:

    o JasPer is updated to version 1.900.1.
    o Jbigkit is updated to version 1.6
    o Lcms is updated to version 1.16
    o Libpng is updated to version 1.2.18
    o Libtiff is updated to version 3.8.2.

4 files changed, 167 insertions, 192 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 48ae58b02f3..e550580cba8 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2007/04/01 01:58:37 obache Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/14 12:25:15 obache Exp $
 #
 
-DISTNAME=	GraphicsMagick-1.1.7
-PKGREVISION=	1
+DISTNAME=	GraphicsMagick-1.1.10
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/
@@ -15,6 +14,7 @@ COMMENT=	X application for displaying and manipulating images
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 USE_TOOLS+=	gmake pkg-config gs
+USE_FEATURES+=	vsnprintf		# optional but recommended for security
 GNU_CONFIGURE=	yes
 
 PKGCONFIG_OVERRIDE+=	magick/GraphicsMagick.pc.in \
@@ -23,6 +23,8 @@ PKGCONFIG_OVERRIDE+=	magick/GraphicsMagick.pc.in \
 
 CONFIGURE_ARGS+=--without-perl
 
+TEST_TARGET=	check
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/GraphicsMagick/PLIST b/graphics/GraphicsMagick/PLIST
index 221cd014b75..441e5e01200 100644
--- a/graphics/GraphicsMagick/PLIST
+++ b/graphics/GraphicsMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/20 17:23:15 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/10/14 12:25:15 obache Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -67,12 +67,12 @@ include/GraphicsMagick/wand/drawing_wand.h
 include/GraphicsMagick/wand/magick_wand.h
 include/GraphicsMagick/wand/pixel_wand.h
 include/GraphicsMagick/wand/wand_api.h
-lib/GraphicsMagick-1.1.7/config/colors.mgk
-lib/GraphicsMagick-1.1.7/config/delegates.mgk
-lib/GraphicsMagick-1.1.7/config/type-ghostscript.mgk
-lib/GraphicsMagick-1.1.7/config/type-solaris.mgk
-lib/GraphicsMagick-1.1.7/config/type-windows.mgk
-lib/GraphicsMagick-1.1.7/config/type.mgk
+lib/${PKGNAME}/config/colors.mgk
+lib/${PKGNAME}/config/delegates.mgk
+lib/${PKGNAME}/config/type-ghostscript.mgk
+lib/${PKGNAME}/config/type-solaris.mgk
+lib/${PKGNAME}/config/type-windows.mgk
+lib/${PKGNAME}/config/type.mgk
 lib/libGraphicsMagick++.la
 lib/libGraphicsMagick.la
 lib/libGraphicsMagickWand.la
@@ -85,162 +85,160 @@ man/man1/GraphicsMagickWand-config.1
 man/man1/gm.1
 man/man4/miff.4
 man/man5/quantize.5
-share/GraphicsMagick-1.1.7/Copyright.txt
-share/GraphicsMagick-1.1.7/config/log.mgk
-share/GraphicsMagick-1.1.7/config/magic.mgk
-share/GraphicsMagick-1.1.7/config/modules.mgk
-share/GraphicsMagick-1.1.7/images/ball.png
-share/GraphicsMagick-1.1.7/images/corbis.png
-share/GraphicsMagick-1.1.7/images/examples.jpg
-share/GraphicsMagick-1.1.7/images/gm-125x80t.png
-share/GraphicsMagick-1.1.7/images/gm-188x120t.png
-share/GraphicsMagick-1.1.7/images/gm-282x180t.png
-share/GraphicsMagick-1.1.7/images/home.png
-share/GraphicsMagick-1.1.7/images/mail.png
-share/GraphicsMagick-1.1.7/images/pdfsages.png
-share/GraphicsMagick-1.1.7/images/pngnow.png
-share/GraphicsMagick-1.1.7/images/right_triangle.png
-share/GraphicsMagick-1.1.7/images/right_triangle_option.png
-share/GraphicsMagick-1.1.7/index.html
-share/GraphicsMagick-1.1.7/www/AUTHORS.html
-share/GraphicsMagick-1.1.7/www/Changelog.html
-share/GraphicsMagick-1.1.7/www/Copyright.html
-share/GraphicsMagick-1.1.7/www/FAQ.html
-share/GraphicsMagick-1.1.7/www/GraphicsMagick.html
-share/GraphicsMagick-1.1.7/www/INSTALL-mac.html
-share/GraphicsMagick-1.1.7/www/INSTALL-unix.html
-share/GraphicsMagick-1.1.7/www/INSTALL-vms.html
-share/GraphicsMagick-1.1.7/www/INSTALL-windows.html
-share/GraphicsMagick-1.1.7/www/ImageMagickObject.html
-share/GraphicsMagick-1.1.7/www/Magick++/Blob.html
-share/GraphicsMagick-1.1.7/www/Magick++/Cache.fig
-share/GraphicsMagick-1.1.7/www/Magick++/Cache.png
-share/GraphicsMagick-1.1.7/www/Magick++/Cache.svg
-share/GraphicsMagick-1.1.7/www/Magick++/ChangeLog.html
-share/GraphicsMagick-1.1.7/www/Magick++/CoderInfo.html
-share/GraphicsMagick-1.1.7/www/Magick++/Color.html
-share/GraphicsMagick-1.1.7/www/Magick++/Documentation.html
-share/GraphicsMagick-1.1.7/www/Magick++/Drawable.html
-share/GraphicsMagick-1.1.7/www/Magick++/Drawable_example_1.png
-share/GraphicsMagick-1.1.7/www/Magick++/Enumerations.html
-share/GraphicsMagick-1.1.7/www/Magick++/Exception.html
-share/GraphicsMagick-1.1.7/www/Magick++/FormatCharacters.html
-share/GraphicsMagick-1.1.7/www/Magick++/Future.html
-share/GraphicsMagick-1.1.7/www/Magick++/Geometry.html
-share/GraphicsMagick-1.1.7/www/Magick++/Image.fig
-share/GraphicsMagick-1.1.7/www/Magick++/Image.html
-share/GraphicsMagick-1.1.7/www/Magick++/Image.png
-share/GraphicsMagick-1.1.7/www/Magick++/ImageDesign.html
-share/GraphicsMagick-1.1.7/www/Magick++/ImageMagick.png
-share/GraphicsMagick-1.1.7/www/Magick++/Install.html
-share/GraphicsMagick-1.1.7/www/Magick++/Magick++.png
-share/GraphicsMagick-1.1.7/www/Magick++/Montage.html
-share/GraphicsMagick-1.1.7/www/Magick++/NEWS.html
-share/GraphicsMagick-1.1.7/www/Magick++/PixelPacket.html
-share/GraphicsMagick-1.1.7/www/Magick++/Pixels.html
-share/GraphicsMagick-1.1.7/www/Magick++/README.txt
-share/GraphicsMagick-1.1.7/www/Magick++/STL.html
-share/GraphicsMagick-1.1.7/www/Magick++/TypeMetric.html
-share/GraphicsMagick-1.1.7/www/Magick++/gm-188x120t.png
-share/GraphicsMagick-1.1.7/www/Magick++/index.html
-share/GraphicsMagick-1.1.7/www/Magick++/montage-sample-framed.jpg
-share/GraphicsMagick-1.1.7/www/Magick++/right_triangle.png
-share/GraphicsMagick-1.1.7/www/Magick++/thumbnail-anatomy-framed.fig
-share/GraphicsMagick-1.1.7/www/Magick++/thumbnail-anatomy-framed.jpg
-share/GraphicsMagick-1.1.7/www/Magick++/thumbnail-anatomy-plain.fig
-share/GraphicsMagick-1.1.7/www/Magick++/thumbnail-anatomy-plain.jpg
-share/GraphicsMagick-1.1.7/www/Magick++/thumbnail-sample-framed.jpg
-share/GraphicsMagick-1.1.7/www/Magick++/thumbnail-sample-plain.jpg
-share/GraphicsMagick-1.1.7/www/NEWS.html
-share/GraphicsMagick-1.1.7/www/README.html
-share/GraphicsMagick-1.1.7/www/animate.html
-share/GraphicsMagick-1.1.7/www/api.html
-share/GraphicsMagick-1.1.7/www/api/animate.html
-share/GraphicsMagick-1.1.7/www/api/annotate.html
-share/GraphicsMagick-1.1.7/www/api/attribute.html
-share/GraphicsMagick-1.1.7/www/api/blob.html
-share/GraphicsMagick-1.1.7/www/api/cache.html
-share/GraphicsMagick-1.1.7/www/api/cache_view.html
-share/GraphicsMagick-1.1.7/www/api/color.html
-share/GraphicsMagick-1.1.7/www/api/composite.html
-share/GraphicsMagick-1.1.7/www/api/constitute.html
-share/GraphicsMagick-1.1.7/www/api/decorate.html
-share/GraphicsMagick-1.1.7/www/api/deprecate.html
-share/GraphicsMagick-1.1.7/www/api/display.html
-share/GraphicsMagick-1.1.7/www/api/draw.html
-share/GraphicsMagick-1.1.7/www/api/effect.html
-share/GraphicsMagick-1.1.7/www/api/enhance.html
-share/GraphicsMagick-1.1.7/www/api/error.html
-share/GraphicsMagick-1.1.7/www/api/fx.html
-share/GraphicsMagick-1.1.7/www/api/image.html
-share/GraphicsMagick-1.1.7/www/api/list.html
-share/GraphicsMagick-1.1.7/www/api/magick.html
-share/GraphicsMagick-1.1.7/www/api/memory.html
-share/GraphicsMagick-1.1.7/www/api/monitor.html
-share/GraphicsMagick-1.1.7/www/api/montage.html
-share/GraphicsMagick-1.1.7/www/api/paint.html
-share/GraphicsMagick-1.1.7/www/api/profile.html
-share/GraphicsMagick-1.1.7/www/api/quantize.html
-share/GraphicsMagick-1.1.7/www/api/registry.html
-share/GraphicsMagick-1.1.7/www/api/render.html
-share/GraphicsMagick-1.1.7/www/api/resize.html
-share/GraphicsMagick-1.1.7/www/api/resource.html
-share/GraphicsMagick-1.1.7/www/api/segment.html
-share/GraphicsMagick-1.1.7/www/api/shear.html
-share/GraphicsMagick-1.1.7/www/api/signature.html
-share/GraphicsMagick-1.1.7/www/api/stream.html
-share/GraphicsMagick-1.1.7/www/api/transform.html
-share/GraphicsMagick-1.1.7/www/api/types.html
-share/GraphicsMagick-1.1.7/www/api/widget.html
-share/GraphicsMagick-1.1.7/www/body.html
-share/GraphicsMagick-1.1.7/www/body.html.rej
-share/GraphicsMagick-1.1.7/www/books.html
-share/GraphicsMagick-1.1.7/www/color.html
-share/GraphicsMagick-1.1.7/www/composite.html
-share/GraphicsMagick-1.1.7/www/conjure.html
-share/GraphicsMagick-1.1.7/www/contribute.html
-share/GraphicsMagick-1.1.7/www/convert.html
-share/GraphicsMagick-1.1.7/www/cvs.html
-share/GraphicsMagick-1.1.7/www/development.html
-share/GraphicsMagick-1.1.7/www/display.html
-share/GraphicsMagick-1.1.7/www/download.html
-share/GraphicsMagick-1.1.7/www/formats.html
-share/GraphicsMagick-1.1.7/www/gm.html
-share/GraphicsMagick-1.1.7/www/header.html
-share/GraphicsMagick-1.1.7/www/identify.html
-share/GraphicsMagick-1.1.7/www/import.html
-share/GraphicsMagick-1.1.7/www/index.html
-share/GraphicsMagick-1.1.7/www/install.html
-share/GraphicsMagick-1.1.7/www/links.html
-share/GraphicsMagick-1.1.7/www/magick.css
-share/GraphicsMagick-1.1.7/www/miff.html
-share/GraphicsMagick-1.1.7/www/mission.html
-share/GraphicsMagick-1.1.7/www/mogrify.html
-share/GraphicsMagick-1.1.7/www/montage.html
-share/GraphicsMagick-1.1.7/www/perl.html
-share/GraphicsMagick-1.1.7/www/programming.html
-share/GraphicsMagick-1.1.7/www/quantize.html
-share/GraphicsMagick-1.1.7/www/smile.c
-share/GraphicsMagick-1.1.7/www/tools.html
-share/GraphicsMagick-1.1.7/www/utilities.html
-share/GraphicsMagick-1.1.7/www/windows.html
+share/${PKGNAME}/Copyright.txt
+share/${PKGNAME}/config/log.mgk
+share/${PKGNAME}/config/magic.mgk
+share/${PKGNAME}/config/modules.mgk
+share/${PKGNAME}/images/ball.png
+share/${PKGNAME}/images/corbis.png
+share/${PKGNAME}/images/examples.jpg
+share/${PKGNAME}/images/gm-125x80t.png
+share/${PKGNAME}/images/gm-188x120t.png
+share/${PKGNAME}/images/gm-282x180t.png
+share/${PKGNAME}/images/home.png
+share/${PKGNAME}/images/mail.png
+share/${PKGNAME}/images/pdfsages.png
+share/${PKGNAME}/images/pngnow.png
+share/${PKGNAME}/images/right_triangle.png
+share/${PKGNAME}/images/right_triangle_option.png
+share/${PKGNAME}/index.html
+share/${PKGNAME}/www/AUTHORS.html
+share/${PKGNAME}/www/Changelog.html
+share/${PKGNAME}/www/Copyright.html
+share/${PKGNAME}/www/FAQ.html
+share/${PKGNAME}/www/GraphicsMagick.html
+share/${PKGNAME}/www/INSTALL-unix.html
+share/${PKGNAME}/www/INSTALL-windows.html
+share/${PKGNAME}/www/ImageMagickObject.html
+share/${PKGNAME}/www/Magick++/Blob.html
+share/${PKGNAME}/www/Magick++/Cache.fig
+share/${PKGNAME}/www/Magick++/Cache.png
+share/${PKGNAME}/www/Magick++/Cache.svg
+share/${PKGNAME}/www/Magick++/ChangeLog.html
+share/${PKGNAME}/www/Magick++/CoderInfo.html
+share/${PKGNAME}/www/Magick++/Color.html
+share/${PKGNAME}/www/Magick++/Documentation.html
+share/${PKGNAME}/www/Magick++/Drawable.html
+share/${PKGNAME}/www/Magick++/Drawable_example_1.png
+share/${PKGNAME}/www/Magick++/Enumerations.html
+share/${PKGNAME}/www/Magick++/Exception.html
+share/${PKGNAME}/www/Magick++/FormatCharacters.html
+share/${PKGNAME}/www/Magick++/Future.html
+share/${PKGNAME}/www/Magick++/Geometry.html
+share/${PKGNAME}/www/Magick++/Image.fig
+share/${PKGNAME}/www/Magick++/Image.html
+share/${PKGNAME}/www/Magick++/Image.png
+share/${PKGNAME}/www/Magick++/ImageDesign.html
+share/${PKGNAME}/www/Magick++/ImageMagick.png
+share/${PKGNAME}/www/Magick++/Install.html
+share/${PKGNAME}/www/Magick++/Magick++.png
+share/${PKGNAME}/www/Magick++/Montage.html
+share/${PKGNAME}/www/Magick++/NEWS.html
+share/${PKGNAME}/www/Magick++/PixelPacket.html
+share/${PKGNAME}/www/Magick++/Pixels.html
+share/${PKGNAME}/www/Magick++/README.txt
+share/${PKGNAME}/www/Magick++/STL.html
+share/${PKGNAME}/www/Magick++/TypeMetric.html
+share/${PKGNAME}/www/Magick++/gm-188x120t.png
+share/${PKGNAME}/www/Magick++/index.html
+share/${PKGNAME}/www/Magick++/montage-sample-framed.jpg
+share/${PKGNAME}/www/Magick++/right_triangle.png
+share/${PKGNAME}/www/Magick++/thumbnail-anatomy-framed.fig
+share/${PKGNAME}/www/Magick++/thumbnail-anatomy-framed.jpg
+share/${PKGNAME}/www/Magick++/thumbnail-anatomy-plain.fig
+share/${PKGNAME}/www/Magick++/thumbnail-anatomy-plain.jpg
+share/${PKGNAME}/www/Magick++/thumbnail-sample-framed.jpg
+share/${PKGNAME}/www/Magick++/thumbnail-sample-plain.jpg
+share/${PKGNAME}/www/NEWS.html
+share/${PKGNAME}/www/README.html
+share/${PKGNAME}/www/animate.html
+share/${PKGNAME}/www/api.html
+share/${PKGNAME}/www/api/animate.html
+share/${PKGNAME}/www/api/annotate.html
+share/${PKGNAME}/www/api/attribute.html
+share/${PKGNAME}/www/api/blob.html
+share/${PKGNAME}/www/api/cache.html
+share/${PKGNAME}/www/api/cache_view.html
+share/${PKGNAME}/www/api/color.html
+share/${PKGNAME}/www/api/composite.html
+share/${PKGNAME}/www/api/constitute.html
+share/${PKGNAME}/www/api/decorate.html
+share/${PKGNAME}/www/api/deprecate.html
+share/${PKGNAME}/www/api/display.html
+share/${PKGNAME}/www/api/draw.html
+share/${PKGNAME}/www/api/effect.html
+share/${PKGNAME}/www/api/enhance.html
+share/${PKGNAME}/www/api/error.html
+share/${PKGNAME}/www/api/fx.html
+share/${PKGNAME}/www/api/image.html
+share/${PKGNAME}/www/api/list.html
+share/${PKGNAME}/www/api/magick.html
+share/${PKGNAME}/www/api/memory.html
+share/${PKGNAME}/www/api/monitor.html
+share/${PKGNAME}/www/api/montage.html
+share/${PKGNAME}/www/api/paint.html
+share/${PKGNAME}/www/api/profile.html
+share/${PKGNAME}/www/api/quantize.html
+share/${PKGNAME}/www/api/registry.html
+share/${PKGNAME}/www/api/render.html
+share/${PKGNAME}/www/api/resize.html
+share/${PKGNAME}/www/api/resource.html
+share/${PKGNAME}/www/api/segment.html
+share/${PKGNAME}/www/api/shear.html
+share/${PKGNAME}/www/api/signature.html
+share/${PKGNAME}/www/api/stream.html
+share/${PKGNAME}/www/api/transform.html
+share/${PKGNAME}/www/api/types.html
+share/${PKGNAME}/www/api/widget.html
+share/${PKGNAME}/www/body.html
+share/${PKGNAME}/www/body.html.rej
+share/${PKGNAME}/www/books.html
+share/${PKGNAME}/www/color.html
+share/${PKGNAME}/www/composite.html
+share/${PKGNAME}/www/conjure.html
+share/${PKGNAME}/www/contribute.html
+share/${PKGNAME}/www/convert.html
+share/${PKGNAME}/www/cvs.html
+share/${PKGNAME}/www/development.html
+share/${PKGNAME}/www/display.html
+share/${PKGNAME}/www/download.html
+share/${PKGNAME}/www/formats.html
+share/${PKGNAME}/www/gm.html
+share/${PKGNAME}/www/header.html
+share/${PKGNAME}/www/identify.html
+share/${PKGNAME}/www/import.html
+share/${PKGNAME}/www/index.html
+share/${PKGNAME}/www/install.html
+share/${PKGNAME}/www/links.html
+share/${PKGNAME}/www/magick.css
+share/${PKGNAME}/www/miff.html
+share/${PKGNAME}/www/mission.html
+share/${PKGNAME}/www/mogrify.html
+share/${PKGNAME}/www/montage.html
+share/${PKGNAME}/www/perl.html
+share/${PKGNAME}/www/programming.html
+share/${PKGNAME}/www/quantize.html
+share/${PKGNAME}/www/smile.c
+share/${PKGNAME}/www/tools.html
+share/${PKGNAME}/www/utilities.html
+share/${PKGNAME}/www/windows.html
 @dirrm include/GraphicsMagick/Magick++
 @dirrm include/GraphicsMagick/magick
 @dirrm include/GraphicsMagick/wand
 @dirrm include/GraphicsMagick
-@dirrm lib/GraphicsMagick-1.1.7/config
-@exec ${MKDIR} %D/lib/GraphicsMagick-1.1.7/modules-Q8/filters
-@dirrm lib/GraphicsMagick-1.1.7/modules-Q8/filters
-@exec ${MKDIR} %D/lib/GraphicsMagick-1.1.7/modules-Q8/coders
-@dirrm lib/GraphicsMagick-1.1.7/modules-Q8/coders
-@exec ${MKDIR} %D/lib/GraphicsMagick-1.1.7/modules-Q8
-@dirrm lib/GraphicsMagick-1.1.7/modules-Q8
-@dirrm lib/GraphicsMagick-1.1.7
-@dirrm share/GraphicsMagick-1.1.7/www/Magick++
-@dirrm share/GraphicsMagick-1.1.7/www/api
-@dirrm share/GraphicsMagick-1.1.7/www
-@dirrm share/GraphicsMagick-1.1.7/images
-@dirrm share/GraphicsMagick-1.1.7/config
-@dirrm share/GraphicsMagick-1.1.7
+@dirrm lib/${PKGNAME}/config
+@exec ${MKDIR} %D/lib/${PKGNAME}/modules-Q8/filters
+@dirrm lib/${PKGNAME}/modules-Q8/filters
+@exec ${MKDIR} %D/lib/${PKGNAME}/modules-Q8/coders
+@dirrm lib/${PKGNAME}/modules-Q8/coders
+@exec ${MKDIR} %D/lib/${PKGNAME}/modules-Q8
+@dirrm lib/${PKGNAME}/modules-Q8
+@dirrm lib/${PKGNAME}
+@dirrm share/${PKGNAME}/www/Magick++
+@dirrm share/${PKGNAME}/www/api
+@dirrm share/${PKGNAME}/www
+@dirrm share/${PKGNAME}/images
+@dirrm share/${PKGNAME}/config
+@dirrm share/${PKGNAME}
 @exec ${MKDIR} %D/share/GraphicsMagick
 @dirrm share/GraphicsMagick
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 8341899dc74..85514fd3c54 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/10/17 09:26:24 markd Exp $
+$NetBSD: distinfo,v 1.3 2007/10/14 12:25:15 obache Exp $
 
-SHA1 (GraphicsMagick-1.1.7.tar.bz2) = b2d3878be34e6d0a8a19e991b7f99da30b02df7e
-RMD160 (GraphicsMagick-1.1.7.tar.bz2) = 9193ab3b109df6ce4b80cb2c1602c86ca36e3043
-Size (GraphicsMagick-1.1.7.tar.bz2) = 4957394 bytes
-SHA1 (patch-aa) = fb3f541ef1cbbe3e70283b83986cfd720eb41b5d
+SHA1 (GraphicsMagick-1.1.10.tar.bz2) = 52027fd146a648b0d80c11a444b6038a29269454
+RMD160 (GraphicsMagick-1.1.10.tar.bz2) = 98e339eb79a34ae07b1a86b30d7c9481d7f83935
+Size (GraphicsMagick-1.1.10.tar.bz2) = 4991117 bytes
diff --git a/graphics/GraphicsMagick/patches/patch-aa b/graphics/GraphicsMagick/patches/patch-aa
deleted file mode 100644
index c454b7a931b..00000000000
--- a/graphics/GraphicsMagick/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/10/17 09:26:24 markd Exp $
-
---- coders/png.c.orig	2006-10-15 15:09:43.000000000 +1300
-+++ coders/png.c
-@@ -1709,7 +1709,7 @@ static Image *ReadOnePNGImage(MngInfo *m
- #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
- && (PNG_LIBPNG_VER >= 10200)
-   /* Disable thread-unsafe features of pnggccrd */
--  if (png_access_version() >= 10200)
-+  if (png_access_version_number() >= 10200)
-   {
-     png_uint_32 mmx_disable_mask=0;
-     png_uint_32 asm_flags;
-@@ -1718,8 +1718,8 @@ static Image *ReadOnePNGImage(MngInfo *m
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
--    asm_flags=png_get_asm_flags(png_ptr);
--    png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
-+    asm_flags=png_get_asm_flags(ping);
-+    png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask);
-   }
- #endif
-