4 files changed, 16 insertions, 15 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 533ee712baa6..f00b2bbddf89 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ImageMagick
-DISTVERSION=	6.2.9-3
+DISTVERSION=	6.2.9-8
 CATEGORIES=	graphics perl5
 MASTER_SITES=	ftp://ftp.imagemagick.org/pub/ImageMagick/ \
 		ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ \
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index c102fd2ea255..8bff6fcfc035 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,3 +1,3 @@
-MD5 (ImageMagick-6.2.9-3.tar.bz2) = 535a9304f0307cbd5a552b7b106d7f94
-SHA256 (ImageMagick-6.2.9-3.tar.bz2) = 2b55f53aba0cb83c0fea0352de76b4828920c68445f08cfdb3e3ceeb23ce0fa5
-SIZE (ImageMagick-6.2.9-3.tar.bz2) = 5365841
+MD5 (ImageMagick-6.2.9-8.tar.bz2) = 683b37415e4fc914f21c138205d4d451
+SHA256 (ImageMagick-6.2.9-8.tar.bz2) = 5ee77b53f52a5e2610f94600d4c31ce7b3207bf4e07b07e440c534855ed3374a
+SIZE (ImageMagick-6.2.9-8.tar.bz2) = 5347909
diff --git a/graphics/ImageMagick/files/patch-Makefile.in b/graphics/ImageMagick/files/patch-Makefile.in
index f430af6c1659..43628fff2754 100644
--- a/graphics/ImageMagick/files/patch-Makefile.in
+++ b/graphics/ImageMagick/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Sat May 20 23:25:57 2006
-+++ Makefile.in	Sat May 27 15:31:14 2006
-@@ -8118,11 +8118,11 @@
- @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-transform.lo `test -f 'magick/transform.c' || echo '$(srcdir)/'`magick/transform.c
+--- Makefile.in.orig	Thu Oct  5 17:53:57 2006
++++ Makefile.in	Thu Oct  5 17:56:31 2006
+@@ -8171,11 +8171,11 @@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagick_la-threshold.lo `test -f 'magick/threshold.c' || echo '$(srcdir)/'`magick/threshold.c
  
  magick/magick_libMagick_la-type.lo: magick/type.c
 -@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-type.lo -MD -MP -MF "magick/$(DEPDIR)/magick_libMagick_la-type.Tpo" -c -o magick/magick_libMagick_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c; \
@@ -14,7 +14,7 @@
  
  magick/magick_libMagick_la-utility.lo: magick/utility.c
  @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagick_la-utility.lo -MD -MP -MF "magick/$(DEPDIR)/magick_libMagick_la-utility.Tpo" -c -o magick/magick_libMagick_la-utility.lo `test -f 'magick/utility.c' || echo '$(srcdir)/'`magick/utility.c; \
-@@ -8643,11 +8643,11 @@
+@@ -8696,11 +8696,11 @@
  @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagick_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
  
  coders/magick_libMagick_la-svg.lo: coders/svg.c
@@ -28,12 +28,12 @@
  
  coders/magick_libMagick_la-tga.lo: coders/tga.c
  @am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagick_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagick_la-tga.lo -MD -MP -MF "coders/$(DEPDIR)/magick_libMagick_la-tga.Tpo" -c -o coders/magick_libMagick_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c; \
-@@ -9722,7 +9722,7 @@
+@@ -9773,7 +9773,7 @@
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
  
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
--@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' install && \
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) CC='@CC@' pure_install && \
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	$(MAKE) clean && rm -f  Makefile.old )
+-@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' pure_install
  
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl:
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@all-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index cd2f06d6a43e..bbb6c8225a14 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -448,6 +448,7 @@ libdata/pkgconfig/Wand.pc
 %%DATADIR%%/config/coder.xml
 %%DATADIR%%/config/log.xml
 %%DATADIR%%/config/magic.xml
+%%DATADIR%%/config/thresholds.xml
 %%DATADIR%%-%%PORTVERSION%%/LICENSE
 %%DATADIR%%-%%PORTVERSION%%/ChangeLog
 %%DATADIR%%-%%PORTVERSION%%/NEWS