Add a patch to (hopefully) fix compilation on alpha.

While here, fix patch-ai: we only want to patch one file per patch file.

5 files changed, 47 insertions, 27 deletions

diff --git a/audio/csound-bath/distinfo b/audio/csound-bath/distinfo
index d25c0ec67f2..090f3b83f39 100644
--- a/audio/csound-bath/distinfo
+++ b/audio/csound-bath/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/04/27 17:17:16 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/01/21 11:28:16 wiz Exp $
 
 SHA1 (csound/Csound4.12.tar.gz) = 5f8b6d70c5373f95f69689c724e124457f7a9f7d
 Size (csound/Csound4.12.tar.gz) = 893317 bytes
@@ -8,10 +8,13 @@ SHA1 (patch-ad) = a09ad93b20b367d74e441736dfe267a9f4e30df5
 SHA1 (patch-ae) = 68689eea46c27ff27c0bac9cb341d22567a735a7
 SHA1 (patch-af) = c298bf79b7d81d986c0e88b1c3349c9ce83bc034
 SHA1 (patch-ag) = ad644879744664669cb1316be0851463e93af3de
-SHA1 (patch-ai) = df656bd83fb107caa4f7d6de97a8ede0f68d4610
+SHA1 (patch-ai) = 7766101a8943fd66bf5b50c2aebefc741feb0c45
 SHA1 (patch-aj) = cd6796b3fc7016b815632336b32831b37b6cb678
 SHA1 (patch-ak) = af233b89afa2b9b4ba2473dc8f33472e9a630ca2
 SHA1 (patch-al) = b4e8ec2ba935e205bd28aa7ffdfe4d0def7dc4dc
 SHA1 (patch-am) = f925c70452402bf90f63b953fa1b6ef02480d912
 SHA1 (patch-an) = c0d2052fef1eb16a88c14e3c7cc6471b9a15dcf8
 SHA1 (patch-ao) = f8e2d2ea177d0f5fa97aa3a04e0775dcc50b179d
+SHA1 (patch-ap) = 183386b90a0aabb3d8f4d6c80b430e4db565c396
+SHA1 (patch-aq) = 9ec7d7250fac2a34f210ceab43b475cf41fa5f80
+SHA1 (patch-ar) = f57ecfcd3481c22f949c749e4f4b20f05b2f9c9b
diff --git a/audio/csound-bath/patches/patch-ai b/audio/csound-bath/patches/patch-ai
index 2fc9de2b62f..84a4f4b45c8 100644
--- a/audio/csound-bath/patches/patch-ai
+++ b/audio/csound-bath/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/04/27 17:17:18 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2002/01/21 11:28:16 wiz Exp $
 
---- anal/adsyn/makef.orig	Sun Dec 17 06:18:36 2000
-+++ anal/adsyn/makef	Sun Dec 17 06:18:45 2000
+--- anal/adsyn/makef.orig	Tue Aug 15 12:28:17 2000
++++ anal/adsyn/makef
 @@ -6,7 +6,7 @@
  
  OBJS =  main.o $T/hetro.o $T/filopen.o $T/sfheader.o $T/soundin.o \
@@ -11,25 +11,3 @@ $NetBSD: patch-ai,v 1.1.1.1 2001/04/27 17:17:18 wiz Exp $
          $T/sdif.o $T/sdif-mem.o $T/getstring.o
  
  adsyns:	hetro
---- anal/lpc/makef.orig	Sun Dec 17 06:19:25 2000
-+++ anal/lpc/makef	Sun Dec 17 06:19:40 2000
-@@ -6,7 +6,7 @@
- 
- OBJS =   main.o $T/lpanal.o $T/lptrkfns.o $T/filopen.o $T/sfheader.o \
- 	$T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o \
--        $T/memalloc.o $T/window.o $T/winX11.o $T/winascii.o $T/winEPS.o \
-+        $T/memalloc.o $T/window.o $T/winascii.o $T/winEPS.o \
-         $T/aifc.o $T/getstring.o
- 
- lpcs:		lpanal
---- anal/pvoc/makef.orig	Sun Dec 17 06:21:30 2000
-+++ anal/pvoc/makef	Sun Dec 17 06:21:42 2000
-@@ -6,7 +6,7 @@
- 
- OBJS =  main.o $T/pvanal.o $T/filopen.o $T/sfheader.o \
- 	$T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o $T/memalloc.o \
--	$T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winX11.o $T/winascii.o \
-+	$T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winascii.o \
- 	$T/winEPS.o $T/aifc.o $T/getstring.o
- 
- pvocs:	pvanal
diff --git a/audio/csound-bath/patches/patch-ap b/audio/csound-bath/patches/patch-ap
new file mode 100644
index 00000000000..475a791fc33
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2002/01/21 11:28:16 wiz Exp $
+
+--- anal/lpc/makef.orig	Sun May 16 20:04:06 1999
++++ anal/lpc/makef
+@@ -6,7 +6,7 @@
+ 
+ OBJS =   main.o $T/lpanal.o $T/lptrkfns.o $T/filopen.o $T/sfheader.o \
+ 	$T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o \
+-        $T/memalloc.o $T/window.o $T/winX11.o $T/winascii.o $T/winEPS.o \
++        $T/memalloc.o $T/window.o $T/winascii.o $T/winEPS.o \
+         $T/aifc.o $T/getstring.o
+ 
+ lpcs:		lpanal
diff --git a/audio/csound-bath/patches/patch-aq b/audio/csound-bath/patches/patch-aq
new file mode 100644
index 00000000000..45b467ade0e
--- /dev/null
+++ b/audio/csound-bath/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2002/01/21 11:28:16 wiz Exp $
+
+--- anal/pvoc/makef.orig	Sun May 16 20:04:33 1999
++++ anal/pvoc/makef
+@@ -6,7 +6,7 @@
+ 
+ OBJS =  main.o $T/pvanal.o $T/filopen.o $T/sfheader.o \
+ 	$T/soundin.o $T/ulaw.o $T/aiff.o $T/wave.o $T/ieee80.o $T/memalloc.o \
+-	$T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winX11.o $T/winascii.o \
++	$T/pvoc.o $T/fft.o $T/dsputil.o $T/window.o $T/winascii.o \
+ 	$T/winEPS.o $T/aifc.o $T/getstring.o
+ 
+ pvocs:	pvanal
diff --git a/audio/csound-bath/patches/patch-ar b/audio/csound-bath/patches/patch-ar
new file mode 100644
index 00000000000..3657ec78527
--- /dev/null
+++ b/audio/csound-bath/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2002/01/21 11:28:17 wiz Exp $
+
+--- sread.c.orig	Sat Feb 24 22:51:08 2001
++++ sread.c
+@@ -1056,7 +1056,7 @@
+      * On Alpha we need to round up to 8 bytes (64 bits).
+      * heh 981101
+      */
+-    bp = (SRTBLK *) ((((LONG) nxp) + 7) & ~0x7);
++    bp = (SRTBLK *) ((((long) nxp) + 7) & ~0x7);
+ #else
+     bp = (SRTBLK *) ((((long) nxp) + 3) & -4);
+ #endif