Replaced several hunks that didn't apply properly.

Also, removed one hunk from patch-ac which seemed no longer needed.

3 files changed, 19 insertions, 31 deletions

diff --git a/audio/nas/files/patch-ab b/audio/nas/files/patch-ab
index 76240cc17e0b..df614f791471 100644
--- a/audio/nas/files/patch-ab
+++ b/audio/nas/files/patch-ab
@@ -11,6 +11,6 @@
 + #define NO_16_BIT_SAMPLING
 + #endif
 + 
-  static void setupSoundcard(sndStat)
-  SndStat* sndStat;
+  static void setupSoundcard(sndStatPtr)
+  SndStat* sndStatPtr;
   {
diff --git a/audio/nas/files/patch-ac b/audio/nas/files/patch-ac
index 2dd87a172353..67ce9ac3f3b6 100644
--- a/audio/nas/files/patch-ac
+++ b/audio/nas/files/patch-ac
@@ -10,15 +10,3 @@
   /* stolen from <X11/Xproto.h> */
   typedef struct {
 --- 52,57 ----
-*** ./lib/audio/Alibint.c.orig	Thu Nov  3 11:58:07 1994
---- ./lib/audio/Alibint.c	Thu Nov  3 11:58:47 1994
-***************
-*** 1266,1272 ****
-  static char *_SysErrorMsg (n)
-      int n;
-  {
--     extern char *sys_errlist[];
-      extern int sys_nerr;
-      char *s = ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
-  
---- 1266,1271 ----
diff --git a/audio/nas/files/patch-ad b/audio/nas/files/patch-ad
index 6e9fe4a45c5c..06c979d270ef 100644
--- a/audio/nas/files/patch-ad
+++ b/audio/nas/files/patch-ad
@@ -1,24 +1,24 @@
-*** clients/audio/auedit/Graph.c.orig	Thu Apr  7 11:19:00 1994
---- clients/audio/auedit/Graph.c	Sun Nov  6 17:16:59 1994
+*** clients/audio/auedit/Graph.c.orig	Wed Dec  6 10:11:03 1995
+--- clients/audio/auedit/Graph.c	Sat Oct  5 11:37:52 1996
 ***************
-*** 27,33 ****
-   * $NCDId: @(#)Graph.c,v 1.10 1994/04/07 18:19:00 greg Exp $
+*** 28,34 ****
    */
   
+  #ifndef WIN32
 ! #include <values.h>
-  #include <X11/IntrinsicP.h>
-  #include <X11/StringDefs.h>
-  #include "GraphP.h"
---- 27,33 ----
-   * $NCDId: @(#)Graph.c,v 1.10 1994/04/07 18:19:00 greg Exp $
+  #else /* WIN32 */
+  #define MAXSHORT 0x7fff
+  #endif /* WIN32 */
+--- 28,34 ----
    */
   
-! #include <limits.h> 
-  #include <X11/IntrinsicP.h>
-  #include <X11/StringDefs.h>
-  #include "GraphP.h"
+  #ifndef WIN32
+! #include <limits.h>
+  #else /* WIN32 */
+  #define MAXSHORT 0x7fff
+  #endif /* WIN32 */
 ***************
-*** 318,325 ****
+*** 322,329 ****
   
   		for (x = 0; x < (int) w->core.width; x++)
   		{
@@ -27,7 +27,7 @@
   
   		    for (; (int) k == x && p < end; k += w->graph.hscale)
   		    {
---- 318,325 ----
+--- 322,329 ----
   
   		for (x = 0; x < (int) w->core.width; x++)
   		{
@@ -37,7 +37,7 @@
   		    for (; (int) k == x && p < end; k += w->graph.hscale)
   		    {
 ***************
-*** 387,393 ****
+*** 391,397 ****
   GraphWidget     w;
   {
       w->graph.vscale = (float) w->core.height / w->graph.numTracks /
@@ -45,7 +45,7 @@
   
       w->graph.hscale = (float) ((int) w->core.width - 1) /
   	(w->graph.end - w->graph.start);
---- 387,393 ----
+--- 391,397 ----
   GraphWidget     w;
   {
       w->graph.vscale = (float) w->core.height / w->graph.numTracks /