From 6bf4cc1a2e279bb468ef5ac955d46eb1cf32c9f7 Mon Sep 17 00:00:00 2001
From: kris <kris@FreeBSD.org>
Date: Sun, 8 Sep 2002 01:20:05 +0000
Subject: Fix build on -current (machine/soundcard.h -> sys/soundcard.h, and
 avoid duplicate bogus declaration of sys_nerr)

---
 audio/nas/files/patch-ab | 36 +++++++++++++++++++++++-------------
 audio/nas/files/patch-ah | 12 ++++++++++++
 2 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 audio/nas/files/patch-ah

(limited to 'audio/nas')

diff --git a/audio/nas/files/patch-ab b/audio/nas/files/patch-ab
index b01c243d0e4..6f8bc40a642 100644
--- a/audio/nas/files/patch-ab
+++ b/audio/nas/files/patch-ab
@@ -1,17 +1,27 @@
---- server/dda/voxware/auvoxware.c.orig	Fri Dec 28 16:33:46 2001
-+++ server/dda/voxware/auvoxware.c	Fri Dec 28 16:58:50 2001
-@@ -156,7 +156,9 @@
+--- ./server/dda/voxware/auvoxware.c.orig	Sun Apr 29 17:11:08 2001
++++ ./server/dda/voxware/auvoxware.c	Sat Sep  7 17:02:34 2002
+@@ -154,16 +154,11 @@
+ #include <sys/param.h>
+ #include <assert.h>
  
- #ifdef __FreeBSD__
- # include <machine/soundcard.h>
+-#ifdef __FreeBSD__
+-# include <machine/soundcard.h>
 -# include <machine/pcaudioio.h>
-+# ifdef __i386__
-+#  include <machine/pcaudioio.h>
-+# endif
++#ifdef __NetBSD__
++# include <sys/ioctl.h>
++# include <soundcard.h>
  #else
- # ifdef __NetBSD__
- #  include <sys/ioctl.h>
-@@ -624,7 +626,11 @@
+-# ifdef __NetBSD__
+-#  include <sys/ioctl.h>
+-#  include <soundcard.h>
+-# else
+-#  include <sys/soundcard.h>
+-# endif
++# include <sys/soundcard.h>
+ #endif
+ 
+ #include <audio/audio.h>
+@@ -624,7 +619,11 @@
  
      if(sndStatOut.fd == -1)
      {
@@ -23,7 +33,7 @@
         {
             osLogMsg("openDevice: waiting on output device\n");
             sleep(1);
-@@ -1269,6 +1275,11 @@
+@@ -1269,6 +1268,11 @@
  /*
   * Setup soundcard at maximum audio quality.
   */
@@ -35,7 +45,7 @@
  static void setupSoundcard(sndStatPtr)
  SndStat* sndStatPtr;
  {
-@@ -1425,7 +1436,11 @@
+@@ -1425,7 +1429,11 @@
  	  osLogMsg("openDevice OUT %s mode %d\n", 
  		   sndStatOut.device, sndStatOut.howToOpen);
  	
diff --git a/audio/nas/files/patch-ah b/audio/nas/files/patch-ah
new file mode 100644
index 00000000000..62d5d049bbb
--- /dev/null
+++ b/audio/nas/files/patch-ah
@@ -0,0 +1,12 @@
+--- ./lib/audio/Alibint.c.orig	Sat Sep  7 17:07:48 2002
++++ ./lib/audio/Alibint.c	Sat Sep  7 17:07:58 2002
+@@ -1349,8 +1349,8 @@
+ {
+ #if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__)
+     extern char *sys_errlist[];
+-#endif
+     extern int sys_nerr;
++#endif
+     char *s = (char *)((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
+ 
+     return (s ? s : "no such error");
-- 
cgit