Fix build on -current (machine/soundcard.h -> sys/soundcard.h) and

various compilation fixes to satisfy gcc 3.2

5 files changed, 54 insertions, 2 deletions

diff --git a/misc/muuz/files/patch-ad b/misc/muuz/files/patch-ad
index 87adf479aed0..81a70714b241 100644
--- a/misc/muuz/files/patch-ad
+++ b/misc/muuz/files/patch-ad
@@ -1,5 +1,14 @@
---- main.c.orig	Sat May 20 04:57:58 2000
-+++ main.c	Sun May 21 18:49:43 2000
+--- main.c.orig	Fri May 19 12:57:58 2000
++++ main.c	Sat Sep  7 17:04:30 2002
+@@ -80,7 +80,7 @@
+  */
+ 
+ /* HERE MAIN XXX */
+-void
++int
+ main(int argc, char *argv[])
+ {
+   int ch, perr = 0;
 @@ -532,6 +532,7 @@
    }
  
diff --git a/misc/muuz/files/patch-ae b/misc/muuz/files/patch-ae
new file mode 100644
index 000000000000..fbce8254ece1
--- /dev/null
+++ b/misc/muuz/files/patch-ae
@@ -0,0 +1,11 @@
+--- mixerControls.c.orig	Sat Sep  7 16:58:58 2002
++++ mixerControls.c	Sat Sep  7 16:59:43 2002
+@@ -11,7 +11,7 @@
+ #include "mixerControls.h"
+ #include "muuztypes.h"
+ #ifdef __FreeBSD__
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif /* __FreeBSD__ */
+ #include "copyright.h"
+ #include "errMessage.h"
diff --git a/misc/muuz/files/patch-af b/misc/muuz/files/patch-af
new file mode 100644
index 000000000000..b46ff79b6340
--- /dev/null
+++ b/misc/muuz/files/patch-af
@@ -0,0 +1,11 @@
+--- mixerControls.h.orig	Sat Sep  7 16:59:02 2002
++++ mixerControls.h	Sat Sep  7 16:59:49 2002
+@@ -8,7 +8,7 @@
+ #include "muuz.h"
+ #include "muuztypes.h"
+ #ifdef __FreeBSD__
+-#include <machine/soundcard.h>
++#include <sys/soundcard.h>
+ #endif /* __FreeBSD__ */
+ 
+ 
diff --git a/misc/muuz/files/patch-ag b/misc/muuz/files/patch-ag
new file mode 100644
index 000000000000..252a4dbc6e1d
--- /dev/null
+++ b/misc/muuz/files/patch-ag
@@ -0,0 +1,11 @@
+--- muuzbeats.c.orig	Sat Sep  7 16:59:09 2002
++++ muuzbeats.c	Sat Sep  7 16:59:14 2002
+@@ -8,7 +8,7 @@
+ #include	<sys/stat.h>
+ #include	<sys/types.h>
+ #include	<sys/ioctl.h>
+-#include	<machine/soundcard.h>
++#include	<sys/soundcard.h>
+ #include	<errno.h>
+ #include	<math.h>
+ }
diff --git a/misc/muuz/files/patch-ah b/misc/muuz/files/patch-ah
new file mode 100644
index 000000000000..b6eb6dc02e8a
--- /dev/null
+++ b/misc/muuz/files/patch-ah
@@ -0,0 +1,10 @@
+--- version.c.orig	Sat Sep  7 17:12:08 2002
++++ version.c	Sat Sep  7 17:12:19 2002
+@@ -2,6 +2,7 @@
+  * $Id: version.c,v 1.2 2000/05/19 19:53:32 kline Exp kline $
+  */
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #define VERSION "0.27.2"
+ void