Fix build using recent ImageMagick's. Fixes problems seen in the

bulkbuilds.
Also don't install a mimelnk file that kdelibs now installs.
Bump PKGREVISION.

6 files changed, 63 insertions, 10 deletions

diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index e0718a254fe..0e949a70da6 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/07/28 13:18:11 markd Exp $
+# $NetBSD: Makefile,v 1.12 2004/09/11 12:11:52 markd Exp $
 #
 
 DISTNAME=	pixieplus-0.5.4
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/pixieplus/ \
 		http://www.mosfet.org/pixie/
diff --git a/graphics/pixieplus/PLIST b/graphics/pixieplus/PLIST
index 4b0262ad91e..a8fc3b2be46 100644
--- a/graphics/pixieplus/PLIST
+++ b/graphics/pixieplus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/09/25 04:21:52 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/11 12:11:52 markd Exp $
 bin/pixie
 lib/libpixie_misc.a
 lib/libpixie_misc.la
@@ -236,7 +236,6 @@ share/kde/icons/locolor/16x16/apps/run.png
 share/kde/icons/locolor/22x22/actions/thumb.png
 share/kde/icons/locolor/32x32/actions/thumb.png
 share/kde/mimelnk/image/x-miff.desktop
-share/kde/mimelnk/image/x-pcx.desktop
 share/kde/mimelnk/image/x-pict.desktop
 share/kde/mimelnk/image/x-tga.desktop
 share/kde/mimelnk/image/x-xwd.desktop
diff --git a/graphics/pixieplus/distinfo b/graphics/pixieplus/distinfo
index 02ec3a321f5..2929b15df00 100644
--- a/graphics/pixieplus/distinfo
+++ b/graphics/pixieplus/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2004/06/19 10:59:28 markd Exp $
+$NetBSD: distinfo,v 1.3 2004/09/11 12:11:52 markd Exp $
 
 SHA1 (pixieplus-0.5.4.tar.gz) = bea6ce3e030fecb9ecceaaf85d155ccc9a4550d5
 Size (pixieplus-0.5.4.tar.gz) = 2297945 bytes
 SHA1 (patch-aa) = 613c2087201458c43ab8f49ce53537fdb58195a3
 SHA1 (patch-ab) = 8b8530ad5d0827504947d9c798efda2e11e0f415
-SHA1 (patch-ac) = b9b06b254ee7f401128ff294de9da5c5e8585f7d
+SHA1 (patch-ac) = 38824b02aba0695e025fe3995f31bc376dd44518
+SHA1 (patch-ad) = 7deca58da1d8e181bf62c39f598f696584a1ed26
+SHA1 (patch-ae) = e9d4ca1bede5f07d79d2d6a5bc5b2d97f298a93f
diff --git a/graphics/pixieplus/patches/patch-ac b/graphics/pixieplus/patches/patch-ac
index eaa36fc2369..f5b76665b86 100644
--- a/graphics/pixieplus/patches/patch-ac
+++ b/graphics/pixieplus/patches/patch-ac
@@ -1,13 +1,27 @@
-$NetBSD: patch-ac,v 1.1 2004/06/15 13:24:44 markd Exp $
+$NetBSD: patch-ac,v 1.2 2004/09/11 12:11:53 markd Exp $
 
 --- app/ifapp.cpp.orig	2003-02-09 17:56:50.000000000 +1300
 +++ app/ifapp.cpp
-@@ -34,7 +34,7 @@ int xioErrorHandler(Display *dpy);
+@@ -33,18 +33,18 @@ int xioErrorHandler(Display *dpy);
+ 
  // ImageMagick message and progress stubs
  extern "C"{
-     unsigned int magickMonitor(const char *msg, const off_t value,
+-    unsigned int magickMonitor(const char *msg, const off_t value,
 -                               const size_t span, ExceptionInfo *)
++    MagickBooleanType magickMonitor(const char *msg, const off_t value,
 +                               const MagickSizeType span, ExceptionInfo *)
      {
          if(!appPtr)
-             return(true);
+-            return(true);
++            return(MagickTrue);
+         int val = (int)((((float)value)/((float)span))*100.0);
+         if(appPtr->magickMessageProgress())
+             appPtr->magickMessageProgress()->setValue(val);
+         if(appPtr->magickMessageLabel())
+             appPtr->magickMessageLabel()->setText(msg);
+         appPtr->processEvents();
+-        return(true);
++        return(MagickTrue);
+     }
+ 
+     void magickWarning(const ExceptionType /*warning*/, const char *reason,
diff --git a/graphics/pixieplus/patches/patch-ad b/graphics/pixieplus/patches/patch-ad
new file mode 100644
index 00000000000..4a4419e1a02
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2004/09/11 12:11:53 markd Exp $
+
+--- app/batch.cpp.orig	2004-09-11 23:18:29.000000000 +1200
++++ app/batch.cpp
+@@ -618,9 +618,9 @@ bool BatchEffect::applyMagickEffect(cons
+     else if(type == Equalize)
+         EqualizeImage(img);
+     else if(type == IncContrast)
+-        ContrastImage(img, true);
++        ContrastImage(img, MagickTrue);
+     else if(type == DecContrast)
+-        ContrastImage(img, false);
++        ContrastImage(img, MagickFalse);
+     else if(type == Solarize)
+         SolarizeImage(img, weight);
+     else if(type == Threshold)
+@@ -752,7 +752,7 @@ bool BatchEffect::applyMagickEffect(cons
+             save = false;
+     }
+     else if(type == Shade){
+-        Image *tmp = ShadeImage(img, useColor, a, e, &exception);
++        Image *tmp = ShadeImage(img, useColor ? MagickTrue : MagickFalse, a, e, &exception);
+         if(tmp){
+             if(img->next)
+                 DestroyImageList(img);
diff --git a/graphics/pixieplus/patches/patch-ae b/graphics/pixieplus/patches/patch-ae
new file mode 100644
index 00000000000..e1aa9eccb05
--- /dev/null
+++ b/graphics/pixieplus/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/09/11 12:11:53 markd Exp $
+
+--- mimetypes/Makefile.in.orig	2004-09-11 23:49:52.000000000 +1200
++++ mimetypes/Makefile.in
+@@ -240,7 +240,7 @@ x_libraries = @x_libraries@
+ 
+ datadir = $(kde_mimedir)/image
+ 
+-data_DATA = x-pcx.desktop x-xwd.desktop x-miff.desktop x-tga.desktop \
++data_DATA = x-xwd.desktop x-miff.desktop x-tga.desktop \
+ 	x-pict.desktop
+ 
+