Fix OSS audio mixer on DragonFly. Kill a malloc.h include.

Based on patch from wa1ter@myrealbox.com on DragonFly's user list.
Bump revision.

5 files changed, 48 insertions, 3 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 097860b9ff7..cd07eb7bf58 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:06 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/05/10 23:05:00 joerg Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index b7cec7d8a74..0c53636b0db 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/05/08 22:14:27 joerg Exp $
+$NetBSD: distinfo,v 1.28 2006/05/10 23:05:00 joerg Exp $
 
 SHA1 (kdemultimedia-3.5.2.tar.bz2) = 68e5e24709a2c06777bb3f12fc76e733f5896c5d
 RMD160 (kdemultimedia-3.5.2.tar.bz2) = 4f6fcb790e63f4af7a309677babd5e2ed938514f
@@ -14,6 +14,9 @@ SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
 SHA1 (patch-ai) = 8f724e5e96996913906dfd2034f577fee66d0db2
 SHA1 (patch-aj) = 853651ba68cbd2dc8906a0753bb17a89b46153af
 SHA1 (patch-ak) = b55f0915a356949b00c588b25c0aa435aedc109d
+SHA1 (patch-al) = c8c3d6c44d19053c596b41060ab574a051c73eeb
+SHA1 (patch-am) = d08ebf77d69d8c9527728eccaa430b28664a74dd
+SHA1 (patch-an) = 79b26912aeeacb881664cd1557417bd99b96451e
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
diff --git a/multimedia/kdemultimedia3/patches/patch-al b/multimedia/kdemultimedia3/patches/patch-al
new file mode 100644
index 00000000000..e00aef59d92
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2006/05/10 23:05:00 joerg Exp $
+
+--- kmix/kmix-platforms.cpp.orig	2006-05-10 20:05:22.000000000 +0000
++++ kmix/kmix-platforms.cpp
+@@ -46,7 +46,7 @@
+ #define OSS_MIXER
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE) || defined(__DragonFly__)
+ #define OSS_MIXER
+ #endif
+ 
diff --git a/multimedia/kdemultimedia3/patches/patch-am b/multimedia/kdemultimedia3/patches/patch-am
new file mode 100644
index 00000000000..75698f7491f
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.3 2006/05/10 23:05:00 joerg Exp $
+
+--- kmix/mixer_oss.cpp.orig	2006-05-10 20:07:25.000000000 +0000
++++ kmix/mixer_oss.cpp
+@@ -150,7 +150,7 @@ int Mixer_OSS::open()
+             writeVolumeToHW( idx, md->getVolume() );
+           }
+ 
+-#if !defined(__FreeBSD__)
++#if defined(SOUND_MIXER_INFO)
+       struct mixer_info l_mix_info;
+       if (ioctl(m_fd, SOUND_MIXER_INFO, &l_mix_info) != -1)
+         {
diff --git a/multimedia/kdemultimedia3/patches/patch-an b/multimedia/kdemultimedia3/patches/patch-an
new file mode 100644
index 00000000000..9cd718b6ef4
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.1 2006/05/10 23:05:00 joerg Exp $
+
+--- kscd/kscdmagic/xlib.c.orig	2006-05-10 20:09:55.000000000 +0000
++++ kscd/kscdmagic/xlib.c
+@@ -33,11 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#ifndef __FreeBSD__
+-#include <malloc.h>
+-#else
+ #include <stdlib.h>
+-#endif
+ #include "xlib.h"
+ #ifdef AMIGA
+ #define XFlush(x) while(0)