Disable support for the krita GraphicsMagick filter. It trys to use

long deprecated GraphicsMagick features that have now been removed in the
latest GraphicsMagick.

4 files changed, 18 insertions, 16 deletions

diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index c9f28df9029..0d88f9356b6 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2008/04/25 20:39:10 joerg Exp $
+# $NetBSD: Makefile,v 1.102 2008/05/06 23:50:42 markd Exp $
 
 DISTNAME=	koffice-1.6.3
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE:=koffice-1.6.3/src/}
 EXTRACT_SUFX=	.tar.bz2
@@ -56,7 +56,6 @@ post-install:
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../graphics/GraphicsMagick/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
diff --git a/misc/koffice/PLIST b/misc/koffice/PLIST
index faa09de37ae..e3b2a7cc04a 100644
--- a/misc/koffice/PLIST
+++ b/misc/koffice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2008/04/12 22:43:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.28 2008/05/06 23:50:42 markd Exp $
 bin/karbon
 bin/kchart
 bin/kexi
@@ -504,8 +504,6 @@ lib/kde3/libkprkword.la
 lib/kde3/libkrita_openexr_export.la
 lib/kde3/libkrita_openexr_import.la
 lib/kde3/libkrita_raw_import.la
-lib/kde3/libkritagmagickexport.la
-lib/kde3/libkritagmagickimport.la
 lib/kde3/libkritajpegexport.la
 lib/kde3/libkritajpegimport.la
 lib/kde3/libkritapart.la
@@ -1595,7 +1593,6 @@ share/icons/hicolor/scalable/apps/koshell.svgz
 share/icons/locolor/16x16/apps/kudesigner.png
 share/icons/locolor/32x32/apps/kudesigner.png
 share/kde/applnk/.hidden/krita_jpeg.desktop
-share/kde/applnk/.hidden/krita_magick.desktop
 share/kde/applnk/.hidden/krita_openexr.desktop
 share/kde/applnk/.hidden/krita_pdf.desktop
 share/kde/applnk/.hidden/krita_png.desktop
@@ -4674,8 +4671,6 @@ share/kde/services/krita_gray_u16_plugin.desktop
 share/kde/services/krita_jpeg_export.desktop
 share/kde/services/krita_jpeg_import.desktop
 share/kde/services/krita_lms_f32_plugin.desktop
-share/kde/services/krita_magick_export.desktop
-share/kde/services/krita_magick_import.desktop
 share/kde/services/krita_openexr_export.desktop
 share/kde/services/krita_openexr_import.desktop
 share/kde/services/krita_pdf_import.desktop
diff --git a/misc/koffice/distinfo b/misc/koffice/distinfo
index daed61b5613..fea61aa7812 100644
--- a/misc/koffice/distinfo
+++ b/misc/koffice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2007/11/08 21:36:03 markd Exp $
+$NetBSD: distinfo,v 1.44 2008/05/06 23:50:42 markd Exp $
 
 SHA1 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = a3d1d85567ccf729a2237f4aa837f7e025ce00ae
 RMD160 (koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff) = ab6ec62b1ee7c369e8a6f44ba285a56b8c5439b4
@@ -9,7 +9,7 @@ Size (koffice-1.6.3.tar.bz2) = 56829391 bytes
 SHA1 (koffice-xpdf-CVE-2007-3387.diff) = bff4f540389a77320bc87e2dedece50b82932e59
 RMD160 (koffice-xpdf-CVE-2007-3387.diff) = 7f620ec00ca05da91596f2d750d32ed8aa8bec95
 Size (koffice-xpdf-CVE-2007-3387.diff) = 601 bytes
-SHA1 (patch-ab) = f2e9067f24d1de2e3c9f139727c33ecaf6dc8503
+SHA1 (patch-ab) = f5a96b7271b854e28a144c861288eb5437f1cf73
 SHA1 (patch-af) = a79564e57f2ef8eb43e8c1e23bb6a8e3d2a1d110
 SHA1 (patch-ag) = f0ad29395bbf52f70dd96f65c291fdb2ff0c6083
 SHA1 (patch-ah) = 094eaa1ff9a5f38adc2bf2f74965b0e47ccd2843
diff --git a/misc/koffice/patches/patch-ab b/misc/koffice/patches/patch-ab
index 943385be54c..e247e802dca 100644
--- a/misc/koffice/patches/patch-ab
+++ b/misc/koffice/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.7 2006/10/17 09:33:15 markd Exp $
+$NetBSD: patch-ab,v 1.8 2008/05/06 23:50:42 markd Exp $
 
---- configure.orig	2006-10-08 12:08:50.000000000 +1300
+--- configure.orig	2007-05-31 09:56:35.000000000 +1200
 +++ configure
-@@ -41734,7 +41734,7 @@ fi
+@@ -33848,6 +33848,7 @@ echo "${ECHO_T}$kde_cv_path" >&6; }
+ 
+    fi
+ 
++GRAPHICS_MAGICK_CONFIG=
+ 
+ if test -n "$GRAPHICS_MAGICK_CONFIG"; then
+  vers=`$GRAPHICS_MAGICK_CONFIG --version 2>/dev/null | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+@@ -38534,7 +38535,7 @@ fi
  
  
  
@@ -11,7 +19,7 @@ $NetBSD: patch-ab,v 1.7 2006/10/17 09:33:15 markd Exp $
    compile_kexi_macros_plugin_TRUE=
    compile_kexi_macros_plugin_FALSE='#'
  else
-@@ -41743,7 +41743,7 @@ else
+@@ -38543,7 +38544,7 @@ else
  fi
  
  
@@ -20,7 +28,7 @@ $NetBSD: patch-ab,v 1.7 2006/10/17 09:33:15 markd Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define KEXI_MACROS_SUPPORT 1
-@@ -42176,6 +42176,10 @@ else
+@@ -38928,6 +38929,10 @@ else
    version=""2.5""
  fi