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

3 files changed, 26 insertions, 1 deletions

diff --git a/audio/fmio/files/patch-aa b/audio/fmio/files/patch-aa
new file mode 100644
index 000000000000..2922ad6a4644
--- /dev/null
+++ b/audio/fmio/files/patch-aa
@@ -0,0 +1,13 @@
+--- mixer.c.orig	Wed Oct 23 20:23:43 2002
++++ mixer.c	Wed Oct 23 20:23:55 2002
+@@ -34,9 +34,7 @@
+ #include <sys/ioctl.h>
+ #if defined (__OpenBSD__) || defined (__NetBSD__)
+ #include <sys/audioio.h>
+-#elif defined (__FreeBSD__)
+-#include <machine/soundcard.h>
+-#elif defined (linux)
++#elif defined (linux) || defined(__FreeBSD__)
+ #include <sys/soundcard.h>
+ #endif /* __OpenBSD__ || __NetBSD__ */
+ 
diff --git a/audio/fmio/files/patch-ab b/audio/fmio/files/patch-ab
new file mode 100644
index 000000000000..cde8d0917f12
--- /dev/null
+++ b/audio/fmio/files/patch-ab
@@ -0,0 +1,12 @@
+--- fmio.1.orig	Wed Oct 23 20:23:18 2002
++++ fmio.1	Wed Oct 23 20:23:32 2002
+@@ -108,8 +108,7 @@
+ .Dl <line name>=[+-]<left channel>,[+-]<right channel>.
+ For line names see:
+ .Dl /usr/include/sys/audioio.h under OpenBSD and NetBSD
+-.Dl /usr/include/machine/soundcard.h under FreeBSD
+-.Dl /usr/include/sys/soundcard.h under Linux
++.Dl /usr/include/sys/soundcard.h under FreeBSD Linux
+ .It Fl X Ar volume
+ Set volume of the sound card master output thru /dev/mixer.
+ Format of this option is similar to option
diff --git a/audio/rsynth/files/freebsdplay.c b/audio/rsynth/files/freebsdplay.c
index 065b21fb9e1c..3b8a63335220 100644
--- a/audio/rsynth/files/freebsdplay.c
+++ b/audio/rsynth/files/freebsdplay.c
@@ -21,7 +21,7 @@
 
 #include <sys/ioctl.h>
 
-#include <machine/soundcard.h>
+#include <sys/soundcard.h>
 #include "proto.h"
 #include "getargs.h"
 #include "hplay.h"