3 files changed, 8 insertions, 32 deletions
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index c81f6111ab0..3c5d21f920a 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.35 2006/04/30 17:55:12 adam Exp $
+$NetBSD: patch-aa,v 1.36 2006/05/08 11:39:07 adam Exp $
 
---- configure.orig	2006-04-24 03:19:39.000000000 +0200
+--- configure.orig	2006-05-07 17:10:26.000000000 +0200
 +++ configure
-@@ -25315,9 +25315,6 @@ fi
+@@ -25305,9 +25305,6 @@ fi
  # Enable building/use of libltdl if we are building shared libraries regardless
  # of whether modules are built or not.
  with_ltdl='no'
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
index 088734e1026..c45ba4af68a 100644
--- a/graphics/ImageMagick/patches/patch-ab
+++ b/graphics/ImageMagick/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.18 2006/04/30 17:55:12 adam Exp $
+$NetBSD: patch-ab,v 1.19 2006/05/08 11:39:07 adam Exp $
 
---- Makefile.in.orig	2006-04-24 03:19:49.000000000 +0200
+--- Makefile.in.orig	2006-05-07 17:10:38.000000000 +0200
 +++ Makefile.in
-@@ -3264,8 +3264,6 @@ WAND_CLEANFILES = \
+@@ -3263,8 +3263,6 @@ WAND_CLEANFILES = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.18 2006/04/30 17:55:12 adam Exp $
  
  @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_PKGCONFIG = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc
-@@ -3315,7 +3313,6 @@ WAND_CLEANFILES = \
+@@ -3314,7 +3312,6 @@ WAND_CLEANFILES = \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/INSTALL \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/NEWS \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/README \
@@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.18 2006/04/30 17:55:12 adam Exp $
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/bin/Magick++-config.in \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/ImageMagick++.pc.in \
  @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/demo/model.miff \
-@@ -4583,7 +4580,6 @@ pkgconfig_DATA = \
+@@ -4582,7 +4579,6 @@ pkgconfig_DATA = \
  # Manual pages to install
  man_MANS = \
  	$(MAGICK_MANS) \
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
deleted file mode 100644
index e88a0674840..00000000000
--- a/graphics/ImageMagick/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.14 2006/05/03 22:57:22 wiz Exp $
-
---- coders/png.c.orig	2006-04-07 02:33:15.000000000 +0000
-+++ coders/png.c
-@@ -1755,7 +1755,7 @@ static Image *ReadOnePNGImage(MngInfo *m
- #if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
- && (PNG_LIBPNG_VER >= 10200)
-   /* Disable thread-unsafe features of pnggccrd */
--  if (png_access_version() >= 10200)
-+  if (png_access_version_number() >= 10200)
-   {
-     png_uint_32 mmx_disable_mask=0;
-     png_uint_32 asm_flags;
-@@ -1764,8 +1764,8 @@ static Image *ReadOnePNGImage(MngInfo *m
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_SUB   \
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_AVG   \
-                         | PNG_ASM_FLAG_MMX_READ_FILTER_PAETH );
--    asm_flags=png_get_asm_flags(png_ptr);
--    png_set_asm_flags(png_ptr, asm_flags & ~mmx_disable_mask);
-+    asm_flags=png_get_asm_flags(ping);
-+    png_set_asm_flags(ping, asm_flags & ~mmx_disable_mask);
-   }
- #endif
-