3 files changed, 26 insertions, 50 deletions

diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 01c10e8e40f1..ff8c38d5f851 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	GraphicsMagick
-PORTVERSION=	1.3.7
-PORTREVISION=	2
+PORTVERSION=	1.3.10
 CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
diff --git a/graphics/GraphicsMagick13/distinfo b/graphics/GraphicsMagick13/distinfo
index 7e24ef44a6ab..f60cdace7641 100644
--- a/graphics/GraphicsMagick13/distinfo
+++ b/graphics/GraphicsMagick13/distinfo
@@ -1,3 +1,3 @@
-MD5 (GraphicsMagick-1.3.7.tar.bz2) = 42bfd382ddcda399880721170bcbf61b
-SHA256 (GraphicsMagick-1.3.7.tar.bz2) = 0d2e8f81574efc7e16c05b72fc9a62a2ba333d6fa196bdb72f8fda8ce7a585fc
-SIZE (GraphicsMagick-1.3.7.tar.bz2) = 6581207
+MD5 (GraphicsMagick-1.3.10.tar.bz2) = 09137f1180edc6d99834e8a7b1e620e3
+SHA256 (GraphicsMagick-1.3.10.tar.bz2) = 89b0195e6c0634fd10c7a0a5799baca1e34351fed0dec9c021b6eb46f7b41ae2
+SIZE (GraphicsMagick-1.3.10.tar.bz2) = 6754130
diff --git a/graphics/GraphicsMagick13/pkg-plist b/graphics/GraphicsMagick13/pkg-plist
index f11189d17d3e..443f8fe0607f 100644
--- a/graphics/GraphicsMagick13/pkg-plist
+++ b/graphics/GraphicsMagick13/pkg-plist
@@ -15,6 +15,7 @@ include/GraphicsMagick/Magick++/Montage.h
 include/GraphicsMagick/Magick++/Pixels.h
 include/GraphicsMagick/Magick++/STL.h
 include/GraphicsMagick/Magick++/TypeMetric.h
+include/GraphicsMagick/magick/analyze.h
 include/GraphicsMagick/magick/api.h
 include/GraphicsMagick/magick/attribute.h
 include/GraphicsMagick/magick/average.h
@@ -22,9 +23,11 @@ include/GraphicsMagick/magick/blob.h
 include/GraphicsMagick/magick/cdl.h
 include/GraphicsMagick/magick/channel.h
 include/GraphicsMagick/magick/color.h
+include/GraphicsMagick/magick/color_lookup.h
 include/GraphicsMagick/magick/colormap.h
 include/GraphicsMagick/magick/colorspace.h
 include/GraphicsMagick/magick/command.h
+include/GraphicsMagick/magick/common.h
 include/GraphicsMagick/magick/compare.h
 include/GraphicsMagick/magick/composite.h
 include/GraphicsMagick/magick/compress.h
@@ -73,6 +76,7 @@ include/GraphicsMagick/magick/symbols.h
 include/GraphicsMagick/magick/texture.h
 include/GraphicsMagick/magick/timer.h
 include/GraphicsMagick/magick/transform.h
+include/GraphicsMagick/magick/type.h
 include/GraphicsMagick/magick/utility.h
 include/GraphicsMagick/magick/version.h
 include/GraphicsMagick/wand/drawing_wand.h
@@ -87,21 +91,20 @@ lib/GraphicsMagick/config/type.mgk
 lib/libGraphicsMagick++.a
 lib/libGraphicsMagick++.la
 lib/libGraphicsMagick++.so
-lib/libGraphicsMagick++.so.5
+lib/libGraphicsMagick++.so.6
 lib/libGraphicsMagick.a
 lib/libGraphicsMagick.la
 lib/libGraphicsMagick.so
-lib/libGraphicsMagick.so.5
+lib/libGraphicsMagick.so.7
 lib/libGraphicsMagickWand.a
 lib/libGraphicsMagickWand.la
 lib/libGraphicsMagickWand.so
-lib/libGraphicsMagickWand.so.3
+lib/libGraphicsMagickWand.so.4
 libdata/pkgconfig/GraphicsMagick++.pc
 libdata/pkgconfig/GraphicsMagick.pc
 libdata/pkgconfig/GraphicsMagickWand.pc
 %%DATADIR%%/config/colors.mgk
 %%DATADIR%%/config/log.mgk
-%%DATADIR%%/config/magic.mgk
 %%DATADIR%%/config/modules.mgk
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2001
@@ -112,28 +115,32 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2006
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2007
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2008
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.2009
 %%PORTDOCS%%%%DOCSDIR%%/Copyright.txt
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
 %%PORTDOCS%%%%DOCSDIR%%/www/CVS.html
-%%PORTDOCS%%%%DOCSDIR%%/www/CVS.rst
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2001.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2002.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2003.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2004.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2005.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2006.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2007.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2008.html
+%%PORTDOCS%%%%DOCSDIR%%/www/ChangeLog-2009.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/www/FAQ.html
-%%PORTDOCS%%%%DOCSDIR%%/www/FAQ.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/GraphicsMagick.html
 %%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-unix.html
 %%PORTDOCS%%%%DOCSDIR%%/www/INSTALL-windows.html
 %%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.html
-%%PORTDOCS%%%%DOCSDIR%%/www/ImageMagickObject.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Blob.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.fig
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Cache.svg
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ChangeLog.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/CoderInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Color.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Documentation.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Documentation.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Drawable_example_1.png
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Enumerations.html
@@ -141,44 +148,30 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/FormatCharacters.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Future.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Geometry.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.fig
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Image.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageDesign.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/ImageMagick.png
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Install.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Magick++.png
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Montage.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/NEWS.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/PixelPacket.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/Pixels.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/STL.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/TypeMetric.html
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/gm-188x120t.png
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/index.html
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/index.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/montage-sample-framed.jpg
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/right_triangle.png
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.fig
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-framed.jpg
-%%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.fig
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-anatomy-plain.jpg
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-framed.jpg
 %%PORTDOCS%%%%DOCSDIR%%/www/Magick++/thumbnail-sample-plain.jpg
-%%PORTDOCS%%%%DOCSDIR%%/www/Makefile.am
 %%PORTDOCS%%%%DOCSDIR%%/www/NEWS.html
 %%PORTDOCS%%%%DOCSDIR%%/www/OpenMP.html
-%%PORTDOCS%%%%DOCSDIR%%/www/OpenMP.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/README.html
 %%PORTDOCS%%%%DOCSDIR%%/www/animate.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/Makefile.am
 %%PORTDOCS%%%%DOCSDIR%%/www/api/animate.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/annotate.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/api.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/api.rst
-%%PORTDOCS%%%%DOCSDIR%%/www/api/api_hyperlinks.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/api/attribute.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/average.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/blob.html
@@ -224,31 +217,22 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/api/texture.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/transform.html
 %%PORTDOCS%%%%DOCSDIR%%/www/api/types.html
-%%PORTDOCS%%%%DOCSDIR%%/www/api/types.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/api/widget.html
 %%PORTDOCS%%%%DOCSDIR%%/www/authors.html
-%%PORTDOCS%%%%DOCSDIR%%/www/authors.rst
-%%PORTDOCS%%%%DOCSDIR%%/www/benchmarks-1.2.html
-%%PORTDOCS%%%%DOCSDIR%%/www/benchmarks-1.2.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/benchmarks.html
-%%PORTDOCS%%%%DOCSDIR%%/www/benchmarks.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/bugs.html
-%%PORTDOCS%%%%DOCSDIR%%/www/bugs.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/color.html
 %%PORTDOCS%%%%DOCSDIR%%/www/compare.html
 %%PORTDOCS%%%%DOCSDIR%%/www/composite.html
 %%PORTDOCS%%%%DOCSDIR%%/www/conjure.html
 %%PORTDOCS%%%%DOCSDIR%%/www/contribute.html
-%%PORTDOCS%%%%DOCSDIR%%/www/contribute.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/convert.html
 %%PORTDOCS%%%%DOCSDIR%%/www/display.html
 %%PORTDOCS%%%%DOCSDIR%%/www/docutils-api.css
 %%PORTDOCS%%%%DOCSDIR%%/www/docutils-articles.css
 %%PORTDOCS%%%%DOCSDIR%%/www/download.html
-%%PORTDOCS%%%%DOCSDIR%%/www/download.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/www/formats.html
-%%PORTDOCS%%%%DOCSDIR%%/www/formats.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/gm.html
 %%PORTDOCS%%%%DOCSDIR%%/www/identify.html
 %%PORTDOCS%%%%DOCSDIR%%/www/images/ball.png
@@ -260,33 +244,26 @@ libdata/pkgconfig/GraphicsMagickWand.pc
 %%PORTDOCS%%%%DOCSDIR%%/www/images/right_triangle_option.png
 %%PORTDOCS%%%%DOCSDIR%%/www/import.html
 %%PORTDOCS%%%%DOCSDIR%%/www/index.html
-%%PORTDOCS%%%%DOCSDIR%%/www/index.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/links.html
-%%PORTDOCS%%%%DOCSDIR%%/www/links.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/magick.css
 %%PORTDOCS%%%%DOCSDIR%%/www/miff.html
-%%PORTDOCS%%%%DOCSDIR%%/www/miff.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/mission.html
-%%PORTDOCS%%%%DOCSDIR%%/www/mission.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/mogrify.html
 %%PORTDOCS%%%%DOCSDIR%%/www/montage.html
 %%PORTDOCS%%%%DOCSDIR%%/www/motion-picture.html
-%%PORTDOCS%%%%DOCSDIR%%/www/motion-picture.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/perl.html
-%%PORTDOCS%%%%DOCSDIR%%/www/perl.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/platforms.html
-%%PORTDOCS%%%%DOCSDIR%%/www/platforms.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/process.html
-%%PORTDOCS%%%%DOCSDIR%%/www/process.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/programming.html
-%%PORTDOCS%%%%DOCSDIR%%/www/programming.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/quantize.html
-%%PORTDOCS%%%%DOCSDIR%%/www/quantize.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/smile.c
 %%PORTDOCS%%%%DOCSDIR%%/www/tools.html
-%%PORTDOCS%%%%DOCSDIR%%/www/tools.rst
 %%PORTDOCS%%%%DOCSDIR%%/www/utilities.html
-%%PORTDOCS%%%%DOCSDIR%%/www/utilities.rst
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/drawing_wand.html
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/magick_wand.html
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/pixel_wand.html
+%%PORTDOCS%%%%DOCSDIR%%/www/wand/wand.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/wand
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/www/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/www/api
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/www/Magick++