Fix build on DragonFly.

3 files changed, 18 insertions, 16 deletions

diff --git a/audio/cmp3/distinfo b/audio/cmp3/distinfo
index 537f6832450..074687e09f7 100644
--- a/audio/cmp3/distinfo
+++ b/audio/cmp3/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2005/03/02 17:49:19 rxg Exp $
+$NetBSD: distinfo,v 1.7 2007/02/16 14:54:16 joerg Exp $
 
 SHA1 (cmp3-2.0pre6.tar.gz) = 5c1454117be282cf673de7a701f8d08f6224d2f8
 RMD160 (cmp3-2.0pre6.tar.gz) = c7d5f774c05734e8fca8ec8d536b2843cb99ad80
 Size (cmp3-2.0pre6.tar.gz) = 183749 bytes
 SHA1 (patch-aa) = 3881ea3b11f4949e0704ee13414ede93e23a7c50
-SHA1 (patch-ab) = d81276c1264d81455a623ef9c1f1eea98ed152ce
-SHA1 (patch-ac) = 92f7307c86f3e633f1e18a6ab1df421d5b09104c
+SHA1 (patch-ab) = 9a4a87691727a2ee4b63961415d137da08502edb
+SHA1 (patch-ac) = 03a9b0660a6167dd2b8ef3c58f16ec0c95a9921a
 SHA1 (patch-ad) = a50d87140e557eb3bef1a5d68ad3e18bba73e03e
 SHA1 (patch-ae) = 4ddb74587d34dc2698c2a49ca7c476b5b90540d9
 SHA1 (patch-af) = f15c60207248248f5cb7efa4c046cd246e247018
diff --git a/audio/cmp3/patches/patch-ab b/audio/cmp3/patches/patch-ab
index 81d91deadb0..f2b36cd770e 100644
--- a/audio/cmp3/patches/patch-ab
+++ b/audio/cmp3/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2005/03/02 17:50:18 rxg Exp $
+$NetBSD: patch-ab,v 1.4 2007/02/16 14:54:16 joerg Exp $
 
 --- cmp3.h.orig	2001-07-01 12:38:08.000000000 +0800
 +++ cmp3.h
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.3 2005/03/02 17:50:18 rxg Exp $
  #define _CMP3_H
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  #include <ncurses.h>
  #include <termios.h>
  #else
diff --git a/audio/cmp3/patches/patch-ac b/audio/cmp3/patches/patch-ac
index 9d9ac7447c5..c03adea880d 100644
--- a/audio/cmp3/patches/patch-ac
+++ b/audio/cmp3/patches/patch-ac
@@ -1,17 +1,19 @@
-$NetBSD: patch-ac,v 1.2 2005/03/02 17:50:18 rxg Exp $
+$NetBSD: patch-ac,v 1.3 2007/02/16 14:54:16 joerg Exp $
 
---- cmp3volume.c.orig	2001-07-01 12:38:08.000000000 +0800
+--- cmp3volume.c.orig	2001-07-01 04:38:08.000000000 +0000
 +++ cmp3volume.c
-@@ -5,6 +5,8 @@
+@@ -3,8 +3,8 @@
+ */    
+ 
  #include "cmp3funcs.h"
- #if defined(__FreeBSD__)
- #include <machine/soundcard.h>
-+#elif defined(__NetBSD__)
+-#if defined(__FreeBSD__)
+-#include <machine/soundcard.h>
++#if defined(__NetBSD__)
 +#include <sys/audioio.h>
  #else
  #include<sys/soundcard.h>
  #endif
-@@ -16,6 +18,63 @@ static int mixernum,                    
+@@ -16,6 +16,63 @@ static int mixernum,                    
   *  Initialize volume control
   *  Returns: nothing
   ****************************************************************************/
@@ -75,7 +77,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/02 17:50:18 rxg Exp $
  extern void initvol()
  {
      if ((mixernum=open("/dev/mixer", O_RDWR)) < 0) {
-@@ -30,6 +89,8 @@ extern void initvol()
+@@ -30,6 +87,8 @@ extern void initvol()
      return;
  }
  
@@ -84,7 +86,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/02 17:50:18 rxg Exp $
  extern void endvol()
  {
      close(mixernum);
-@@ -61,6 +122,23 @@ extern void volclean()
+@@ -61,6 +120,23 @@ extern void volclean()
   *  Although I hate users in general, we should probably do it.
   *  Returns: nothing
   ****************************************************************************/
@@ -108,7 +110,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/02 17:50:18 rxg Exp $
  extern void volup()
  {
      int i;
-@@ -75,10 +153,29 @@ extern void volup()
+@@ -75,10 +151,29 @@ extern void volup()
      return;
  }
  
@@ -138,7 +140,7 @@ $NetBSD: patch-ac,v 1.2 2005/03/02 17:50:18 rxg Exp $
  extern void voldown()
  {
      int i;
-@@ -93,4 +190,6 @@ extern void voldown()
+@@ -93,4 +188,6 @@ extern void voldown()
      return;
  }