Fix compilation on alpha, and handle most warnings while I'm here.

9 files changed, 107 insertions, 1 deletions

diff --git a/audio/sox/files/patch-sum b/audio/sox/files/patch-sum
index b5e176bd965..cfc953e583b 100644
--- a/audio/sox/files/patch-sum
+++ b/audio/sox/files/patch-sum
@@ -1,4 +1,12 @@
-$NetBSD: patch-sum,v 1.3 1999/10/26 01:31:03 hubertf Exp $
+$NetBSD: patch-sum,v 1.4 2000/12/27 00:55:03 wiz Exp $
 
 MD5 (patch-aa) = cd51cb79c99a7e3c42242ef2b25435e7
 MD5 (patch-ab) = 6af49267e1bc93ee3c94133be56db1f5
+MD5 (patch-ac) = 774c367bd3717c2639259bbd06e9bc3d
+MD5 (patch-ad) = a5122cd5e7840b0bd3d16ff3ea2d1979
+MD5 (patch-ae) = 3a62f2d69977efdb0178599612886c9d
+MD5 (patch-af) = c18a1ef80f190397c4766bf96f6689fa
+MD5 (patch-ag) = 97f16e1d2e5fdddc6b44cdb0f7dfbc14
+MD5 (patch-ah) = 66efe9d45ea5b8a2f70bdcd55d56acca
+MD5 (patch-ai) = bf69268e8a8b935c307da57af4e220e7
+MD5 (patch-aj) = 0e6c662dc574275533bb8b4284bee678
diff --git a/audio/sox/patches/patch-ac b/audio/sox/patches/patch-ac
new file mode 100644
index 00000000000..9ffdb7d74a7
--- /dev/null
+++ b/audio/sox/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.4 2000/12/27 00:55:03 wiz Exp $
+
+--- au.c.orig	Fri Sep  1 18:08:24 2000
++++ au.c
+@@ -22,6 +22,7 @@
+ #include "st.h"
+ #include "g72x.h"
+ #include <stdlib.h>
++#include <string.h>
+ 
+ /* Magic numbers used in Sun and NeXT audio files */
+ #define SUN_MAGIC 	0x2e736e64		/* Really '.snd' */
diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad
new file mode 100644
index 00000000000..5c9d998449b
--- /dev/null
+++ b/audio/sox/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 2000/12/27 00:55:04 wiz Exp $
+
+--- pitch.c.orig	Wed Jun  7 20:35:39 2000
++++ pitch.c
+@@ -38,6 +38,7 @@
+ #include "st.h"
+ 
+ #include <stdlib.h> /* malloc(), free() */
++#include <string.h> /* memcpy() */
+ 
+ #include <math.h>   /* cos(), pow() */
+ #include <limits.h> /* LONG_MAX */
diff --git a/audio/sox/patches/patch-ae b/audio/sox/patches/patch-ae
new file mode 100644
index 00000000000..944524a60ef
--- /dev/null
+++ b/audio/sox/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.4 2000/12/27 00:55:04 wiz Exp $
+
+--- copy.c.orig	Wed Jun  7 20:35:38 2000
++++ copy.c
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include "st.h"
++#include <string.h>
+ 
+ /*
+  * Process options
diff --git a/audio/sox/patches/patch-af b/audio/sox/patches/patch-af
new file mode 100644
index 00000000000..36562777f12
--- /dev/null
+++ b/audio/sox/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2000/12/27 00:55:04 wiz Exp $
+
+--- resample.c.orig	Fri Sep  1 18:08:24 2000
++++ resample.c
+@@ -180,7 +180,7 @@
+ 	resample_t r = (resample_t) effp->priv;
+ 	LONG Xoff, gcdrate;
+ 	int i;
+-	extern long st_gcd(P2(long a,long b));
++	extern LONG st_gcd(P2(LONG a,LONG b));
+ 
+ 	r->Factor = (double)effp->outinfo.rate / (double)effp->ininfo.rate;
+ 
diff --git a/audio/sox/patches/patch-ag b/audio/sox/patches/patch-ag
new file mode 100644
index 00000000000..61c7c06dfbc
--- /dev/null
+++ b/audio/sox/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2000/12/27 00:55:04 wiz Exp $
+
+--- avr.c.orig	Tue Aug 15 04:10:58 2000
++++ avr.c
+@@ -38,7 +38,7 @@
+   unsigned short midi; /* 0xffff = no MIDI note assigned,
+ 			  0xffXX = single key note assignment
+ 			  0xLLHH = key split, low/hi note */
+-  ULONG int rate;	       /* sample frequency in hertz */
++  ULONG rate;	       /* sample frequency in hertz */
+   ULONG size;	       /* sample length in bytes or words (see rez) */
+   ULONG lbeg;	       /* offset to start of loop in bytes or words.
+ 			  set to zero if unused. */
diff --git a/audio/sox/patches/patch-ah b/audio/sox/patches/patch-ah
new file mode 100644
index 00000000000..260da7ef85e
--- /dev/null
+++ b/audio/sox/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2000/12/27 00:55:04 wiz Exp $
+
+--- polyphas.c.orig	Tue Aug 22 17:19:43 2000
++++ polyphas.c
+@@ -31,6 +31,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <limits.h>
+ #include "st.h"
+ 
diff --git a/audio/sox/patches/patch-ai b/audio/sox/patches/patch-ai
new file mode 100644
index 00000000000..f1b09777e7d
--- /dev/null
+++ b/audio/sox/patches/patch-ai
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2000/12/27 00:55:05 wiz Exp $
+
+--- trim.c.orig	Thu Nov 16 18:48:52 2000
++++ trim.c
+@@ -11,6 +11,7 @@
+  * Sound Tools skeleton effect file.
+  */
+ 
++#include <string.h>
+ #include "st.h"
+ 
+ /* Time resolutin one millisecond */
diff --git a/audio/sox/patches/patch-aj b/audio/sox/patches/patch-aj
new file mode 100644
index 00000000000..6c3fd63fbb0
--- /dev/null
+++ b/audio/sox/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2000/12/27 00:55:05 wiz Exp $
+
+--- stretch.c.orig	Wed Jun  7 20:35:40 2000
++++ stretch.c
+@@ -22,6 +22,7 @@
+ #include "st.h"
+ 
+ #include <stdlib.h> /* malloc and free */
++#include <string.h> /* memcpy */
+ #include <limits.h> /* LONG_MAX */
+ 
+ #ifndef MIN