- Update to 6.0.1

  For what's new in 6.0 please read
  http://www.imagemagick.org/www/News.html

5 files changed, 92 insertions, 91 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 2837b5648bfb..d4bec46757f7 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-PORTVERSION=	5.5.7.16
-PORTREVISION=	1
+PORTVERSION=	6.0.1.3
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
@@ -41,8 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-shared
 INSTALLS_SHLIB=	yes
 
-MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 \
-		composite.1 convert.1 identify.1 mogrify.1 montage.1
+MAN1=		ImageMagick.1 Magick++-config.1 Magick-config.1 Wand-config.1 \
+		compare.1 composite.1 convert.1 identify.1 mogrify.1 montage.1
 MAN4=		miff.4
 MAN5=		quantize.5
 
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 54c0747bad03..395eca317aed 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,2 +1,2 @@
-MD5 (ImageMagick-5.5.7-16.tar.bz2) = 3fa45042694e709917f1b196d977b9f0
-SIZE (ImageMagick-5.5.7-16.tar.bz2) = 4563159
+MD5 (ImageMagick-6.0.1-3.tar.bz2) = 56d61961951f76fd875fcf656e81b8df
+SIZE (ImageMagick-6.0.1-3.tar.bz2) = 5606799
diff --git a/graphics/ImageMagick/files/patch-configure b/graphics/ImageMagick/files/patch-configure
index 530c9a8d220c..b90ca456650c 100644
--- a/graphics/ImageMagick/files/patch-configure
+++ b/graphics/ImageMagick/files/patch-configure
@@ -8,42 +8,3 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -37277,10 +37278,10 @@
- done
-        if test -n "$freetype_config"
-        then
--          freetype_prefix=`freetype-config --prefix`
--          freetype_exec_prefix=`freetype-config --exec-prefix`
--          LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
--          CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
-+          freetype_cflags=`$freetype_config --cflags`
-+          freetype_libs=`$freetype_config --libs`
-+          LDFLAGS="$LDFLAGS $freetype_libs"
-+          CPPFLAGS="$freetype_cflags $CPPFLAGS"
-        fi
-     fi
- 
-@@ -37621,10 +37622,10 @@
- done
-        if test -n "$freetype_config"
-        then
--          freetype_prefix=`freetype-config --prefix`
--          freetype_exec_prefix=`freetype-config --exec-prefix`
--          LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
--          CPPFLAGS="-I${freetype_prefix}/include/freetype2 $CPPFLAGS"
-+          freetype_cflags=`$freetype_config --cflags`
-+          freetype_libs=`$freetype_config --libs`
-+          LDFLAGS="$LDFLAGS $freetype_libs"
-+          CPPFLAGS="$freetype_cflags $CPPFLAGS"
-        fi
-     fi
- 
-@@ -37906,7 +37907,7 @@
- fi
- 
- 
--    if test "$have_freetype_h" = 'yes'
-+    if test "$ac_cv_header_ft2build_h" = 'yes' || test "$have_freetype_h" = 'yes'
-     then
-       passed=`expr $passed + 1`
-     else
diff --git a/graphics/ImageMagick/files/patch-magick_config.h.in b/graphics/ImageMagick/files/patch-magick_config.h.in
deleted file mode 100644
index 9301267db880..000000000000
--- a/graphics/ImageMagick/files/patch-magick_config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- magick/magick_config.h.in.orig	Thu Dec 18 09:12:27 2003
-+++ magick/magick_config.h.in	Wed Apr 21 16:53:23 2004
-@@ -79,6 +79,9 @@
- /* define if the compiler supports the explicit keyword */
- #undef HAVE_EXPLICIT
- 
-+/* Define to 1 if you have the <ft2build.h> header file. */
-+#undef HAVE_FT2BUILD_H
-+
- /* Define to 1 if you have the <freetype/freetype.h> header file. */
- #undef HAVE_FREETYPE_FREETYPE_H
- 
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 0a6e18835b3c..534d2ae79a89 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -1,6 +1,8 @@
 bin/Magick++-config
 bin/Magick-config
+bin/Wand-config
 %%X11%%bin/animate
+bin/compare
 bin/composite
 %%WITH_CONJURE%%bin/conjure
 bin/convert
@@ -22,49 +24,84 @@ include/Magick++/Montage.h
 include/Magick++/Pixels.h
 include/Magick++/STL.h
 include/Magick++/TypeMetric.h
+include/magick/ImageMagick.h
 include/magick/PreRvIcccm.h
+include/magick/annotate.h
 include/magick/api.h
 include/magick/attribute.h
 include/magick/blob.h
 include/magick/cache.h
 include/magick/cache_view.h
-include/magick/command.h
+include/magick/client.h
+include/magick/coder.h
+include/magick/color.h
+include/magick/colorspace.h
+include/magick/compare.h
+include/magick/composite.h
 include/magick/compress.h
+include/magick/configure.h
+include/magick/conjure.h
+include/magick/constitute.h
+include/magick/convert.h
+include/magick/decorate.h
 include/magick/delegate.h
 include/magick/deprecate.h
-include/magick/drawing_wand.h
+include/magick/draw.h
+include/magick/effect.h
+include/magick/enhance.h
 include/magick/error.h
+include/magick/fx.h
 include/magick/gem.h
+include/magick/geometry.h
 include/magick/hashmap.h
+include/magick/identify.h
 include/magick/image.h
-include/magick/info.h
+include/magick/import.h
 include/magick/list.h
+include/magick/locale_.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/memory_.h
+include/magick/methods.h
 include/magick/module.h
+include/magick/mogrify.h
 include/magick/monitor.h
+include/magick/montage.h
+include/magick/option.h
 include/magick/paint.h
-include/magick/pixel_wand.h
+include/magick/profile.h
 include/magick/quantize.h
+include/magick/random.h
 include/magick/registry.h
-include/magick/render.h
-include/magick/resource.h
-include/magick/semaphore.h
+include/magick/resize.h
+include/magick/resource_.h
+include/magick/segment.h
+include/magick/shear.h
 include/magick/signature.h
+include/magick/stream.h
+include/magick/string_.h
 include/magick/timer.h
+include/magick/token.h
+include/magick/transform.h
+include/magick/type.h
 include/magick/utility.h
 include/magick/version.h
-include/magick/widget.h
 include/magick/xwindow.h
-lib/ImageMagick/colors.mgk
-lib/ImageMagick/delegates.mgk
-lib/ImageMagick/english.mgk
-lib/ImageMagick/locale.mgk
-lib/ImageMagick/log.mgk
-lib/ImageMagick/magic.mgk
+include/wand/drawing_wand.h
+include/wand/magick_wand.h
+include/wand/pixel_iterator.h
+include/wand/pixel_wand.h
+lib/ImageMagick/config/colors.mgk
+lib/ImageMagick/config/configure.mgk
+lib/ImageMagick/config/delegates.mgk
+lib/ImageMagick/config/english.mgk
+lib/ImageMagick/config/locale.mgk
+lib/ImageMagick/config/type.mgk
+lib/ImageMagick/config/type-ghostscript.mgk
+lib/ImageMagick/config/type-solaris.mgk
+lib/ImageMagick/config/type-windows.mgk
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/art.la
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/art.so
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/avi.la
@@ -127,7 +164,6 @@ lib/ImageMagick/magic.mgk
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/meta.so
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/miff.la
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/miff.so
-%%Q8%%lib/ImageMagick/modules-Q8/coders/modules.mgk
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/mono.la
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/mono.so
 %%Q8%%%%MODULES%%lib/ImageMagick/modules-Q8/coders/mpc.la
@@ -308,7 +344,6 @@ lib/ImageMagick/magic.mgk
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/coders/meta.so
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/coders/miff.la
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/coders/miff.so
-%%Q16%%lib/ImageMagick/modules-Q16/coders/modules.mgk
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/coders/mono.la
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/coders/mono.so
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/coders/mpc.la
@@ -427,10 +462,6 @@ lib/ImageMagick/magic.mgk
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/coders/yuv.so
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/filters/analyze.la
 %%Q16%%%%MODULES%%lib/ImageMagick/modules-Q16/filters/analyze.so
-lib/ImageMagick/type-ghostscript.mgk
-lib/ImageMagick/type-solaris.mgk
-lib/ImageMagick/type-windows.mgk
-lib/ImageMagick/type.mgk
 lib/libMagick++.a
 lib/libMagick++.la
 lib/libMagick++.so
@@ -439,22 +470,32 @@ lib/libMagick.a
 lib/libMagick.la
 lib/libMagick.so
 lib/libMagick.so.6
+lib/libWand.a
+lib/libWand.la
+lib/libWand.so
+lib/libWand.so.6
 libdata/pkgconfig/ImageMagick++.pc
 libdata/pkgconfig/ImageMagick.pc
+libdata/pkgconfig/Wand.pc
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Image/Magick.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.a
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/extralibs.ld
-share/ImageMagick-5.5.7/Copyright.txt
-share/ImageMagick-5.5.7/QuickStart.txt
+share/ImageMagick/config/coder.mgk
+share/ImageMagick/config/log.mgk
+share/ImageMagick/config/magic.mgk
+share/ImageMagick-6.0.1/LICENSE
+share/ImageMagick-6.0.1/Magick.pdf
+share/ImageMagick-6.0.1/NOTICE
+share/ImageMagick-6.0.1/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/images/background.gif
+%%PORTDOCS%%share/doc/ImageMagick/images/dogwaffle.png
 %%PORTDOCS%%share/doc/ImageMagick/images/examples.jpg
 %%PORTDOCS%%share/doc/ImageMagick/images/granite.png
 %%PORTDOCS%%share/doc/ImageMagick/images/logo.png
 %%PORTDOCS%%share/doc/ImageMagick/images/magick.png
+%%PORTDOCS%%share/doc/ImageMagick/images/magick-icon.png
 %%PORTDOCS%%share/doc/ImageMagick/images/networkeleven.png
 %%PORTDOCS%%share/doc/ImageMagick/images/pair.png
 %%PORTDOCS%%share/doc/ImageMagick/images/patterns/bricks.png
@@ -514,18 +555,20 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/images/screen.png
 %%PORTDOCS%%share/doc/ImageMagick/images/script.gif
 %%PORTDOCS%%share/doc/ImageMagick/images/sprite.png
-%%PORTDOCS%%share/doc/ImageMagick/images/star.png
-%%PORTDOCS%%share/doc/ImageMagick/images/top.jpg
+%%PORTDOCS%%share/doc/ImageMagick/images/star.gif
+%%PORTDOCS%%share/doc/ImageMagick/images/top.gif
 %%PORTDOCS%%share/doc/ImageMagick/images/twi.png
 %%PORTDOCS%%share/doc/ImageMagick/index.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Authors.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Changelog.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Copyright.html
 %%PORTDOCS%%share/doc/ImageMagick/www/FAQ.html
-%%PORTDOCS%%share/doc/ImageMagick/www/INSTALL-mac.html
-%%PORTDOCS%%share/doc/ImageMagick/www/INSTALL-unix.html
-%%PORTDOCS%%share/doc/ImageMagick/www/INSTALL-vms.html
-%%PORTDOCS%%share/doc/ImageMagick/www/INSTALL-windows.html
+%%PORTDOCS%%share/doc/ImageMagick/www/ImageMagick.html
 %%PORTDOCS%%share/doc/ImageMagick/www/ImageMagickObject.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Install-mac.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Install-unix.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Install-vms.html
+%%PORTDOCS%%share/doc/ImageMagick/www/Install-windows.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Blob.html
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Cache.fig
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/Cache.png
@@ -564,7 +607,9 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-anatomy-plain.jpg
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-sample-framed.jpg
 %%PORTDOCS%%share/doc/ImageMagick/www/Magick++/thumbnail-sample-plain.jpg
+%%PORTDOCS%%share/doc/ImageMagick/www/News.html
 %%PORTDOCS%%share/doc/ImageMagick/www/QuickStart.html
+%%PORTDOCS%%share/doc/ImageMagick/www/README.html
 %%PORTDOCS%%share/doc/ImageMagick/www/animate.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/animate.html
@@ -574,8 +619,10 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/www/api/cache.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/cache_view.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/color.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/colorspace.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/composite.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/constitute.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/draw.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/decorate.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/deprecate.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/display.html
@@ -592,10 +639,11 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/www/api/monitor.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/montage.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/paint.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/pixel_iterator.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/pixel_wand.html
+%%PORTDOCS%%share/doc/ImageMagick/www/api/profile.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/quantize.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/registry.html
-%%PORTDOCS%%share/doc/ImageMagick/www/api/render.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/resize.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/resource.html
 %%PORTDOCS%%share/doc/ImageMagick/www/api/segment.html
@@ -609,15 +657,18 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/www/archives.html
 %%PORTDOCS%%share/doc/ImageMagick/www/cd.html
 %%PORTDOCS%%share/doc/ImageMagick/www/color.html
+%%PORTDOCS%%share/doc/ImageMagick/www/compare.html
 %%PORTDOCS%%share/doc/ImageMagick/www/composite.html
 %%PORTDOCS%%share/doc/ImageMagick/www/conjure.html
 %%PORTDOCS%%share/doc/ImageMagick/www/convert.html
 %%PORTDOCS%%share/doc/ImageMagick/www/cvs.html
 %%PORTDOCS%%share/doc/ImageMagick/www/display.html
+%%PORTDOCS%%share/doc/ImageMagick/www/download.html
 %%PORTDOCS%%share/doc/ImageMagick/www/formats.html
 %%PORTDOCS%%share/doc/ImageMagick/www/help.html
 %%PORTDOCS%%share/doc/ImageMagick/www/identify.html
 %%PORTDOCS%%share/doc/ImageMagick/www/import.html
+%%PORTDOCS%%share/doc/ImageMagick/www/index.html
 %%PORTDOCS%%share/doc/ImageMagick/www/install.html
 %%PORTDOCS%%share/doc/ImageMagick/www/magick-list.html
 %%PORTDOCS%%share/doc/ImageMagick/www/magick.css
@@ -632,7 +683,6 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%PORTDOCS%%share/doc/ImageMagick/www/sponsor.html
 %%PORTDOCS%%share/doc/ImageMagick/www/tools.html
 %%PORTDOCS%%share/doc/ImageMagick/www/topics.html
-%%PORTDOCS%%share/doc/ImageMagick/www/utilities.html
 %%PORTDOCS%%share/doc/ImageMagick/www/windows.html
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/www/api
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/www/Magick++
@@ -640,7 +690,8 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/images/patterns
 %%PORTDOCS%%@dirrm share/doc/ImageMagick/images
 %%PORTDOCS%%@dirrm share/doc/ImageMagick
-@dirrm share/ImageMagick-5.5.7
+@dirrm share/ImageMagick-6.0.1
+@dirrm share/ImageMagick/config
 @dirrm share/ImageMagick
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image
@@ -651,6 +702,8 @@ share/ImageMagick-5.5.7/QuickStart.txt
 %%Q16%%@dirrm lib/ImageMagick/modules-Q16/filters
 %%Q16%%@dirrm lib/ImageMagick/modules-Q16/coders
 %%Q16%%@dirrm lib/ImageMagick/modules-Q16
+@dirrm lib/ImageMagick/config
 @dirrm lib/ImageMagick
+@dirrm include/wand
 @dirrm include/magick
 @dirrm include/Magick++