Changes 6.6.6.5:

* Make the PNG encoder always rebuild the palette, to avoid losing
  transparency when it is out of sync with the pixel data.
  Eliminated CompressColormapTransFirst() since the palette is already
  compressed and sorted by opacty now when it's recreated.
* Account for virtual canvas for the -flip / -flop options.
* Also for -transpose and transverse options
* Support -metric fuzz option.

Changes 6.6.6.4:
* Replace IsMagickColorSimilar() which provides the Fuzz Factor threshold
  function.  Note function does not calculate 'distance' in total but
  short-circuits when threshold is reached for faster processing.
* Ordered Dithered handling of Alpha channel was incorrect - fixing
  Bug was introduced v6.6.5-6

Changes 6.6.6.3:
* Fixed two more cases where the PNG encoder lost transparency.

Changes 6.6.6.2:
* Affine multiplication reversed when translating.

Changes 6.6.6.2:
* Revised the "c7x7b" and "c7x7w" ordered-dither maps to be complementary
  to each other.

Changes 6.6.6.1:
* Add support for -evaluate-sequence median.

Changes 6.6.6.0:
* Fixed two more cases where the PNG encoder lost transparency.
* The policy.xml sets not-to-exceed resource values (e.g. policy memory limit
  1GB, -limit 2GB exceeds policy maximum so memory limit is 1GB).
* Support NCC (normalized cross correlation) compare metric.

5 files changed, 44 insertions, 15 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 40e420889c4..ef4f2a502c2 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.166 2010/09/16 21:03:48 drochner Exp $
+# $NetBSD: Makefile,v 1.167 2010/12/14 10:08:40 adam Exp $
 
 .include "Makefile.common"
 
@@ -15,9 +15,10 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		c c++ c99
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-openmp
+CONFIGURE_ARGS+=	--disable-assert
+CONFIGURE_ARGS+=	--with-fontconfig
 PKGCONFIG_OVERRIDE=	Magick++/lib/ImageMagick++.pc.in
 PKGCONFIG_OVERRIDE+=	magick/ImageMagick.pc.in
 
@@ -44,12 +45,21 @@ CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--with-ltdl-include=${BUILDLINK_PREFIX.libltdl}/include
 CONFIGURE_ARGS+=	--with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib
 
+# Put our CONFIGURE_ARGS into configure.xml, otherwise WRKDIR gets mentioned.
+SUBST_CLASSES+=		fix-cfg
+SUBST_STAGE.fix-cfg=	pre-configure
+SUBST_MESSAGE.fix-cfg=	Fixing configure.xml.
+SUBST_FILES.fix-cfg=	config/configure.xml.in
+SUBST_VARS.fix-cfg=	CONFIGURE_ARGS
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../math/fftw/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
index 9d310461ab2..6fe89d1349f 100644
--- a/graphics/ImageMagick/Makefile.common
+++ b/graphics/ImageMagick/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.88 2010/09/16 21:03:48 drochner Exp $
+# $NetBSD: Makefile.common,v 1.89 2010/12/14 10:08:40 adam Exp $
 #
 # used by graphics/p5-PerlMagick/Makefile
 
-IM_MAJOR_VER=		6.6.4
-IM_MINOR_VER=		1
+IM_MAJOR_VER=		6.6.6
+IM_MINOR_VER=		5
 IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}
 
 .if (${IM_MINOR_VER} != NONE)
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 7a7c606a208..1a12c20ff91 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.67 2010/09/16 21:03:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.68 2010/12/14 10:08:40 adam Exp $
 bin/Magick++-config
 bin/Magick-config
 bin/MagickCore-config
@@ -195,6 +195,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/images/bluebells_lin.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/bluebells_log.jpg
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/button.gif
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/configure.jpg
+share/doc/ImageMagick-${IM_MAJOR_VER}/images/cylinder_shaded.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/definitive-guide.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/difference.png
 share/doc/ImageMagick-${IM_MAJOR_VER}/images/examples.jpg
@@ -1018,6 +1019,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick-wand.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/magick.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/memory.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/module.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/mogrify.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/monitor.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/montage.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/api/morphology.html
@@ -1058,6 +1060,7 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/download.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/escape.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/examples.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/exception.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/export.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/favicon.ico
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/formats.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/fx.html
@@ -1085,10 +1088,27 @@ share/doc/ImageMagick-${IM_MAJOR_VER}/www/quantize.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/resources.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/search.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/sitemap.html
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/analyze.c
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/coder.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/colors.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/configure.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/core.c
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/delegates.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/english.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/examples.pl
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/incantation.msl
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/locale.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/log.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/magic.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/piechart.mvg
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/piechart.svg
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type-ghostscript.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/type.xml
+share/doc/ImageMagick-${IM_MAJOR_VER}/www/source/wand.c
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/sponsors.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/stream.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/subversion.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/t-shirt.html
 share/doc/ImageMagick-${IM_MAJOR_VER}/www/wand.png
-@pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters
 @pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/coders
+@pkgdir lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules-Q16/filters
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 5eb49a343a1..16b43ffd796 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.104 2010/09/16 21:03:49 drochner Exp $
+$NetBSD: distinfo,v 1.105 2010/12/14 10:08:40 adam Exp $
 
-SHA1 (ImageMagick-6.6.4-1.tar.bz2) = 8337317b1fd941bfd8bc1d7b4c0534951e445d8e
-RMD160 (ImageMagick-6.6.4-1.tar.bz2) = cbb7549328057cd0349487e84267ac9758d98c4f
-Size (ImageMagick-6.6.4-1.tar.bz2) = 8669192 bytes
+SHA1 (ImageMagick-6.6.6-5.tar.bz2) = 0b41c2fd613636c76094e821bb03669ce104d996
+RMD160 (ImageMagick-6.6.6-5.tar.bz2) = d11219cae8ec24f544f5b6dfed58bf1e50753bb6
+Size (ImageMagick-6.6.6-5.tar.bz2) = 8824856 bytes
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 16d8b15446a..4b357b81381 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,6 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2010/09/16 21:05:23 drochner Exp $
-
-PKG_DESTDIR_SUPPORT=	user-destdir
+# $NetBSD: Makefile,v 1.73 2010/12/14 10:08:40 adam Exp $
 
 .include "../../graphics/ImageMagick/Makefile.common"
 
@@ -16,6 +14,7 @@ DISTINFO_FILE=	${.CURDIR}/../../graphics/ImageMagick/distinfo
 FILESDIR=	${.CURDIR}/../../graphics/ImageMagick/files
 PATCHDIR=	${.CURDIR}/../../graphics/ImageMagick/patches
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes