Make this compile on NetBSD archs where size_t != unsigned int.

4 files changed, 42 insertions, 5 deletions

diff --git a/audio/csound/distinfo b/audio/csound/distinfo
index 6d9aa6acaf7..5915bd90e3b 100644
--- a/audio/csound/distinfo
+++ b/audio/csound/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2002/03/23 02:36:45 wiz Exp $
+$NetBSD: distinfo,v 1.7 2003/12/04 00:34:06 kristerw Exp $
 
 SHA1 (csound/unofficial-csound-4.13.0.2a-linux.src.tar.gz) = 4c329ff4148a775fba9af7e39ce6ba59912d809c
 Size (csound/unofficial-csound-4.13.0.2a-linux.src.tar.gz) = 1076545 bytes
+SHA1 (patch-aa) = 4a3a50375d301d3c8ec5c3a6037ed573dfbb2e79
 SHA1 (patch-ab) = 35e90d6265b2b7e2b51a0ab1b32ce81202952f5a
 SHA1 (patch-ac) = 3d99734ab4e7324fc5339530e2f0a326ff963c91
 SHA1 (patch-ad) = cd4c34a1ced10383c456cf409f053c366092d7ae
@@ -9,6 +10,7 @@ SHA1 (patch-ae) = e3755458138c0905068ea8f084fe06a4b74ae815
 SHA1 (patch-af) = 4f330a2468fe0a0b97c19076a7f682f6319cc198
 SHA1 (patch-ag) = 6cc2cf7c1ac03a5a44ecdefeb7fb43c87f4f2529
 SHA1 (patch-ah) = 379b41165b1ff39e5021f80809a9ab2e7db66668
+SHA1 (patch-ai) = a50611b09c6dbd481ee47ff90bf101058cbcbc19
 SHA1 (patch-aj) = 2d18cf881d09e447969a623c88866c0624b19990
 SHA1 (patch-ak) = eef2e5bf815a0359ca9c5474a26c8da038c5da0a
 SHA1 (patch-an) = 29c786bdfbed4b1ae022b8dfdf4fa17409fbd9c9
@@ -20,5 +22,5 @@ SHA1 (patch-as) = 41a3409f389bd146ff9a21d0b983a7ec2e2ff4b6
 SHA1 (patch-at) = 4d545c4fabcb5cf6211a0f00ea2ea983adb83cd7
 SHA1 (patch-au) = bf1d88e516b9d09d1ea6c6c87101654a30ba98fa
 SHA1 (patch-av) = 194dc38b80780a5626fb2b5262fa2b56d68d337e
-SHA1 (patch-aw) = 31caa505d7d525c573553db59c28c620a09e521b
+SHA1 (patch-aw) = 0444633e551c5dd293be377477a748fd48744cd5
 SHA1 (patch-ax) = 0333e4289152d8f80b1967ee6331ca697b1729b9
diff --git a/audio/csound/patches/patch-aa b/audio/csound/patches/patch-aa
new file mode 100644
index 00000000000..bfb9dd5e147
--- /dev/null
+++ b/audio/csound/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2003/12/04 00:34:06 kristerw Exp $
+
+--- linevent.c.orig	Wed Dec  3 23:44:39 2003
++++ linevent.c	Wed Dec  3 23:45:53 2003
+@@ -11,7 +11,7 @@
+ # include <unistd.h>
+ #else
+   extern int close(int);
+-#if !defined(_macintosh) && !defined(SYMANTEC) && !defined(LINUX)
++#if !defined(_macintosh) && !defined(SYMANTEC) && !defined(LINUX) && !defined(__NetBSD__)
+ extern int read(int, void*, unsigned);
+ #endif
+ #endif
diff --git a/audio/csound/patches/patch-ai b/audio/csound/patches/patch-ai
new file mode 100644
index 00000000000..577c42e6605
--- /dev/null
+++ b/audio/csound/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.3 2003/12/04 00:34:06 kristerw Exp $
+
+--- aiff.c.orig	Wed Dec  3 23:55:11 2003
++++ aiff.c	Wed Dec  3 23:56:19 2003
+@@ -15,7 +15,7 @@
+ #if defined(__BEOS__)
+ #include <unistd.h>
+ #else
+-#if !defined(macintosh) && !defined( SYMANTEC ) && !defined( LINUX )
++#if !defined(macintosh) && !defined( SYMANTEC ) && !defined( LINUX ) && !defined(__NetBSD__)
+ extern int write(int, const void*, unsigned int);
+ #endif
+ extern off_t lseek(int, off_t, int);
diff --git a/audio/csound/patches/patch-aw b/audio/csound/patches/patch-aw
index a8045cc8b22..d8e6f887172 100644
--- a/audio/csound/patches/patch-aw
+++ b/audio/csound/patches/patch-aw
@@ -1,7 +1,7 @@
-$NetBSD: patch-aw,v 1.1 2002/03/23 02:36:49 wiz Exp $
+$NetBSD: patch-aw,v 1.2 2003/12/04 00:34:06 kristerw Exp $
 
---- soundio.c.orig	Sat May 19 03:29:57 2001
-+++ soundio.c
+--- soundio.c.orig	Sat May 19 12:29:57 2001
++++ soundio.c	Wed Dec  3 23:54:20 2003
 @@ -57,7 +57,7 @@
  extern  int     rtrecord(char *, int);
  extern  void    rtplay(char *, int);
@@ -21,6 +21,15 @@ $NetBSD: patch-aw,v 1.1 2002/03/23 02:36:49 wiz Exp $
  #ifdef PIPES
  FILE* pin=NULL, *pout=NULL;
  /*sbrandon: added NeXT to line below*/
+@@ -166,7 +169,7 @@
+         return(sreadin(isfd,inbuf,nbytes,p));
+ }
+ 
+-#if !defined(SYMANTEC) && !defined(_macintosh) && !defined(LINUX) && !defined(__BEOS__)
++#if !defined(SYMANTEC) && !defined(_macintosh) && !defined(LINUX) && !defined(__BEOS__) && !defined(__NetBSD__)
+ extern int write(int, const void*, unsigned int);
+ #endif
+ /* RWD.2.98 WAVE floats format must be NORMALIZED +- 1 */
 @@ -469,6 +472,10 @@
  #endif
  # ifdef LINUX