Pullup ticket #3017 - requested by obache

GraphicsMagick: security update

Revisions pulled up:
- graphics/GraphicsMagick/Makefile		1.28-1.29-1.30
- graphics/GraphicsMagick/PLIST			1.14
- graphics/GraphicsMagick/distinfo		1.22-1.24
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Fri Feb  5 05:09:07 UTC 2010

Modified Files:
	pkgsrc/graphics/GraphicsMagick: Makefile PLIST distinfo

Log Message:
Update GraphicsMagick to 1.3.9.

1.3.9 (February 4, 2010)
========================

Security Fixes:

   * None

Bug fixes:

   * Fix "double free" error when using gm import -frame.

   * XPM does not support RGBA color syntax, so return RGB instead.

   * The display '-update' option was only working in conjunction with
     the '-delay' option with a delay setting of 2 or greater.

   * For formats which support multiple frames, output with +adjoing to
     filenames containing a scene specification (e.g. foo%02d.tiff) was
     resulting in wrong output file names.

   * -convolve was crashing rather than reporting an error.

   * Fixed crash if the number of OpenMP threads was reduced from the
     original value via '-limit threads' or omp_set_num_threads().

   * -blur was not blurring the opacity channel for solid-color images.

   * When installing HTML documentation, many files were included which
     are not part of the formatted documentation.

   * Several deleted global string constants are restored with
     deprecated status in order to assure that symbols are not removed
     from the ABI.

New Features:

   * None

Feature improvements:

   * None

Performance Improvements:

   * None

Behavior Changes:

   * There is no longer an implicit 'adjoin' if an output filename
     contains an apparent scene specification (e.g. foo%02d.tiff) and
     multiple files are not needed to save the image..  It is necessary
     to use +adjoin.  For example ``gm convert foo.pdf +adjoin
     %02d.tiff``.

   * -flatten now applies the image background color under the first
     image in the list if it is not already opaque.
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Thu Feb 11 06:43:55 UTC 2010

Modified Files:
	pkgsrc/graphics/GraphicsMagick: Makefile distinfo

Log Message:
Update GraphicsMagick to 1.3.10.

1.3.10 (February 10, 2010)
==========================

Security Fixes:

   * None

Bug fixes:

   * +adjoin was not working correctly for the case when only one image
     frame is present.  With +adjoin and writing one frame to
     "foo%d.jpg" it was outputting "foo%d.jpg" rather than "foo0.jpg".

   * When drawing paths, memory allocation for the points was much
     larger than it needed to be (patch by Vladimir Lukianov).

New Features:

   * None

Feature improvements:

   * None

Performance Improvements:

   * None

Behavior Changes:

   * To reiterate the change which first appeared in 1.3.9, there is no
     longer an implicit +adjoin if the output file name happens to
     contain a %d sequence, or there are multiple frames and the output
     file format only supports storing one frame.  Specify +adjoin if
     scene number substition is desired in the output file names.
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Mon Feb 22 06:10:32 UTC 2010

Modified Files:
	pkgsrc/graphics/GraphicsMagick: Makefile distinfo

Log Message:
Update GraphicsMagick to 1.3.11.

1.3.11 (February 21, 2010)
==========================

Security Fixes:

   * Fixed array underflow on systems using signed char which could
     result in a program crash due to extended characters in filenames
     or in certain file formats.

Bug fixes:

   * Fixed array underflow on systems using signed char which could
     result in a program crash due to extended characters in filenames
     or in certain file formats.

New Features:

   * Added a -thumbnail command to 'convert' and 'mogrify'.  This is a
     faster way to scale down the image when speed is a primary
     concern.

   * Added a -extent command to 'convert' and 'mogrify' which
     composites the image on top of a backing canvas image of solid
     color.

   * Added support for -compose to the 'convert' and 'mogrify', which
     were documented to support it (but did not).

Feature improvements:

   * None

Performance Improvements:

   * Requests for 'Over' and 'Atop' composition are converted to a
     request for the (faster) 'Copy' composition when both images are
     opaque.

Behavior Changes:

   * None

3 files changed, 11 insertions, 46 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 3343f3b8393..6454d55a101 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25.4.1 2010/01/24 11:16:19 tron Exp $
+# $NetBSD: Makefile,v 1.25.4.2 2010/02/22 13:21:41 tron Exp $
 #
 
-DISTNAME=	GraphicsMagick-1.3.8
+DISTNAME=	GraphicsMagick-1.3.11
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
diff --git a/graphics/GraphicsMagick/PLIST b/graphics/GraphicsMagick/PLIST
index 8db86d6773d..2e733f5bf1f 100644
--- a/graphics/GraphicsMagick/PLIST
+++ b/graphics/GraphicsMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12.4.1 2010/01/24 11:16:19 tron Exp $
+@comment $NetBSD: PLIST,v 1.12.4.2 2010/02/22 13:21:41 tron Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -117,7 +117,6 @@ share/doc/GraphicsMagick/ChangeLog.2009
 share/doc/GraphicsMagick/Copyright.txt
 share/doc/GraphicsMagick/NEWS.txt
 share/doc/GraphicsMagick/www/CVS.html
-share/doc/GraphicsMagick/www/CVS.rst
 share/doc/GraphicsMagick/www/ChangeLog-2001.html
 share/doc/GraphicsMagick/www/ChangeLog-2002.html
 share/doc/GraphicsMagick/www/ChangeLog-2003.html
@@ -130,21 +129,16 @@ share/doc/GraphicsMagick/www/ChangeLog-2009.html
 share/doc/GraphicsMagick/www/Changelog.html
 share/doc/GraphicsMagick/www/Copyright.html
 share/doc/GraphicsMagick/www/FAQ.html
-share/doc/GraphicsMagick/www/FAQ.rst
 share/doc/GraphicsMagick/www/GraphicsMagick.html
 share/doc/GraphicsMagick/www/INSTALL-unix.html
 share/doc/GraphicsMagick/www/INSTALL-windows.html
 share/doc/GraphicsMagick/www/ImageMagickObject.html
-share/doc/GraphicsMagick/www/ImageMagickObject.rst
 share/doc/GraphicsMagick/www/Magick++/Blob.html
-share/doc/GraphicsMagick/www/Magick++/Cache.fig
 share/doc/GraphicsMagick/www/Magick++/Cache.png
-share/doc/GraphicsMagick/www/Magick++/Cache.svg
 share/doc/GraphicsMagick/www/Magick++/ChangeLog.html
 share/doc/GraphicsMagick/www/Magick++/CoderInfo.html
 share/doc/GraphicsMagick/www/Magick++/Color.html
 share/doc/GraphicsMagick/www/Magick++/Documentation.html
-share/doc/GraphicsMagick/www/Magick++/Documentation.rst
 share/doc/GraphicsMagick/www/Magick++/Drawable.html
 share/doc/GraphicsMagick/www/Magick++/Drawable_example_1.png
 share/doc/GraphicsMagick/www/Magick++/Enumerations.html
@@ -152,44 +146,30 @@ share/doc/GraphicsMagick/www/Magick++/Exception.html
 share/doc/GraphicsMagick/www/Magick++/FormatCharacters.html
 share/doc/GraphicsMagick/www/Magick++/Future.html
 share/doc/GraphicsMagick/www/Magick++/Geometry.html
-share/doc/GraphicsMagick/www/Magick++/Image.fig
 share/doc/GraphicsMagick/www/Magick++/Image.html
 share/doc/GraphicsMagick/www/Magick++/Image.png
-share/doc/GraphicsMagick/www/Magick++/Image.rst
 share/doc/GraphicsMagick/www/Magick++/ImageDesign.html
-share/doc/GraphicsMagick/www/Magick++/ImageMagick.png
 share/doc/GraphicsMagick/www/Magick++/Install.html
-share/doc/GraphicsMagick/www/Magick++/Magick++.png
 share/doc/GraphicsMagick/www/Magick++/Montage.html
-share/doc/GraphicsMagick/www/Magick++/NEWS.html
 share/doc/GraphicsMagick/www/Magick++/PixelPacket.html
 share/doc/GraphicsMagick/www/Magick++/Pixels.html
-share/doc/GraphicsMagick/www/Magick++/README.txt
 share/doc/GraphicsMagick/www/Magick++/STL.html
 share/doc/GraphicsMagick/www/Magick++/TypeMetric.html
 share/doc/GraphicsMagick/www/Magick++/gm-188x120t.png
 share/doc/GraphicsMagick/www/Magick++/index.html
-share/doc/GraphicsMagick/www/Magick++/index.rst
 share/doc/GraphicsMagick/www/Magick++/montage-sample-framed.jpg
 share/doc/GraphicsMagick/www/Magick++/right_triangle.png
-share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-framed.fig
 share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-framed.jpg
-share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-plain.fig
 share/doc/GraphicsMagick/www/Magick++/thumbnail-anatomy-plain.jpg
 share/doc/GraphicsMagick/www/Magick++/thumbnail-sample-framed.jpg
 share/doc/GraphicsMagick/www/Magick++/thumbnail-sample-plain.jpg
-share/doc/GraphicsMagick/www/Makefile.am
 share/doc/GraphicsMagick/www/NEWS.html
 share/doc/GraphicsMagick/www/OpenMP.html
-share/doc/GraphicsMagick/www/OpenMP.rst
 share/doc/GraphicsMagick/www/README.html
 share/doc/GraphicsMagick/www/animate.html
-share/doc/GraphicsMagick/www/api/Makefile.am
 share/doc/GraphicsMagick/www/api/animate.html
 share/doc/GraphicsMagick/www/api/annotate.html
 share/doc/GraphicsMagick/www/api/api.html
-share/doc/GraphicsMagick/www/api/api.rst
-share/doc/GraphicsMagick/www/api/api_hyperlinks.rst
 share/doc/GraphicsMagick/www/api/attribute.html
 share/doc/GraphicsMagick/www/api/average.html
 share/doc/GraphicsMagick/www/api/blob.html
@@ -235,29 +215,22 @@ share/doc/GraphicsMagick/www/api/statistics.html
 share/doc/GraphicsMagick/www/api/texture.html
 share/doc/GraphicsMagick/www/api/transform.html
 share/doc/GraphicsMagick/www/api/types.html
-share/doc/GraphicsMagick/www/api/types.rst
 share/doc/GraphicsMagick/www/api/widget.html
 share/doc/GraphicsMagick/www/authors.html
-share/doc/GraphicsMagick/www/authors.rst
 share/doc/GraphicsMagick/www/benchmarks.html
-share/doc/GraphicsMagick/www/benchmarks.rst
 share/doc/GraphicsMagick/www/bugs.html
-share/doc/GraphicsMagick/www/bugs.rst
 share/doc/GraphicsMagick/www/color.html
 share/doc/GraphicsMagick/www/compare.html
 share/doc/GraphicsMagick/www/composite.html
 share/doc/GraphicsMagick/www/conjure.html
 share/doc/GraphicsMagick/www/contribute.html
-share/doc/GraphicsMagick/www/contribute.rst
 share/doc/GraphicsMagick/www/convert.html
 share/doc/GraphicsMagick/www/display.html
 share/doc/GraphicsMagick/www/docutils-api.css
 share/doc/GraphicsMagick/www/docutils-articles.css
 share/doc/GraphicsMagick/www/download.html
-share/doc/GraphicsMagick/www/download.rst
 share/doc/GraphicsMagick/www/favicon.ico
 share/doc/GraphicsMagick/www/formats.html
-share/doc/GraphicsMagick/www/formats.rst
 share/doc/GraphicsMagick/www/gm.html
 share/doc/GraphicsMagick/www/identify.html
 share/doc/GraphicsMagick/www/images/ball.png
@@ -269,32 +242,24 @@ share/doc/GraphicsMagick/www/images/right_triangle.png
 share/doc/GraphicsMagick/www/images/right_triangle_option.png
 share/doc/GraphicsMagick/www/import.html
 share/doc/GraphicsMagick/www/index.html
-share/doc/GraphicsMagick/www/index.rst
 share/doc/GraphicsMagick/www/links.html
-share/doc/GraphicsMagick/www/links.rst
 share/doc/GraphicsMagick/www/magick.css
 share/doc/GraphicsMagick/www/miff.html
-share/doc/GraphicsMagick/www/miff.rst
 share/doc/GraphicsMagick/www/mission.html
-share/doc/GraphicsMagick/www/mission.rst
 share/doc/GraphicsMagick/www/mogrify.html
 share/doc/GraphicsMagick/www/montage.html
 share/doc/GraphicsMagick/www/motion-picture.html
-share/doc/GraphicsMagick/www/motion-picture.rst
 share/doc/GraphicsMagick/www/perl.html
-share/doc/GraphicsMagick/www/perl.rst
 share/doc/GraphicsMagick/www/platforms.html
-share/doc/GraphicsMagick/www/platforms.rst
 share/doc/GraphicsMagick/www/process.html
-share/doc/GraphicsMagick/www/process.rst
 share/doc/GraphicsMagick/www/programming.html
-share/doc/GraphicsMagick/www/programming.rst
 share/doc/GraphicsMagick/www/quantize.html
-share/doc/GraphicsMagick/www/quantize.rst
 share/doc/GraphicsMagick/www/smile.c
 share/doc/GraphicsMagick/www/tools.html
-share/doc/GraphicsMagick/www/tools.rst
 share/doc/GraphicsMagick/www/utilities.html
-share/doc/GraphicsMagick/www/utilities.rst
+share/doc/GraphicsMagick/www/wand/drawing_wand.html
+share/doc/GraphicsMagick/www/wand/magick_wand.html
+share/doc/GraphicsMagick/www/wand/pixel_wand.html
+share/doc/GraphicsMagick/www/wand/wand.html
 @pkgdir lib/${PKGNAME}/modules-Q8/filters
 @pkgdir lib/${PKGNAME}/modules-Q8/coders
diff --git a/graphics/GraphicsMagick/distinfo b/graphics/GraphicsMagick/distinfo
index 29910f48d37..e8f852b60ad 100644
--- a/graphics/GraphicsMagick/distinfo
+++ b/graphics/GraphicsMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.20.4.1 2010/01/24 11:16:19 tron Exp $
+$NetBSD: distinfo,v 1.20.4.2 2010/02/22 13:21:41 tron Exp $
 
-SHA1 (GraphicsMagick-1.3.8.tar.gz) = d88c533002fbfeb5822d68eb3f14ee07c347a4ea
-RMD160 (GraphicsMagick-1.3.8.tar.gz) = 92f139dfc66f64c443b8ce005790083169636c5b
-Size (GraphicsMagick-1.3.8.tar.gz) = 7972244 bytes
+SHA1 (GraphicsMagick-1.3.11.tar.gz) = 83c6e0299a0e9c36f035a3245cda91575de327a5
+RMD160 (GraphicsMagick-1.3.11.tar.gz) = e030002c876c78fe0c2eb5784a92478f896e79c6
+Size (GraphicsMagick-1.3.11.tar.gz) = 7978002 bytes