defuzz

7 files changed, 75 insertions, 67 deletions

diff --git a/audio/xamp/patches/patch-aa b/audio/xamp/patches/patch-aa
index 2e713c03e20..6b5082acff5 100644
--- a/audio/xamp/patches/patch-aa
+++ b/audio/xamp/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 1999/11/15 13:07:12 rh Exp $
 
---- ../audioIO.c.old	Sun Oct 26 10:55:27 1997
-+++ ../audioIO.c	Sun Oct 26 10:56:03 1997
+--- ../audioIO.c.orig	Sat May 31 19:47:58 1997
++++ ../audioIO.c	Mon Nov 15 13:58:45 1999
 @@ -18,7 +18,7 @@
    #include "audioIO_HPUX.c"
  #endif
@@ -11,59 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
    #include "audioIO_SunOS.c"
  #endif
  
---- ../audioIO.h.old	Sun Oct 26 10:57:10 1997
-+++ ../audioIO.h	Fri Oct 31 06:43:07 1997
-@@ -27,3 +27,7 @@
- #ifdef OS_SunOS
-   #define AUSIZ 4096
- #endif
-+
-+#ifdef OS_NetBSD
-+  #define AUSIZ 32768
-+#endif
---- ../audioIO_SunOS.c.old	Sun Oct 26 10:58:36 1997
-+++ ../audioIO_SunOS.c	Sun Oct 26 11:13:51 1997
-@@ -8,7 +8,11 @@
- 
- #include "amp.h"
- #include <sys/types.h>
-+#ifndef OS_NetBSD
- #include <sys/stropts.h>
-+#else
-+#include <sys/ioctl.h>
-+#endif
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdio.h>
-@@ -36,8 +40,7 @@
- 	}
- 	DB(audio, msg("Audio device opened on %d\n",audio_fd) );
- 
--	if (ioctl(audio_fd,AUDIO_GETINFO,&auinfo)<0)
--		die("Unable to get audio info\n");
-+	AUDIO_INITINFO(&auinfo);
- 
- 	auinfo.play.precision=16;
- 	auinfo.play.encoding=AUDIO_ENCODING_LINEAR;
---- configure.in.old	Sun Oct 26 10:53:03 1997
-+++ configure.in	Sun Oct 26 10:54:32 1997
-@@ -58,7 +58,7 @@
-     DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-     ;;
- 
--  Linux|FreeBSD)
-+  Linux|FreeBSD|NetBSD)
-     CC="gcc"
-     if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"
---- configure.old	Sun Oct 26 11:18:18 1997
-+++ configure	Sun Oct 26 11:18:45 1997
-@@ -1398,7 +1398,7 @@
-     DEFINES="-DOS_$OS_TYPE -DARCH_$ARCH_TYPE"
-     ;;
- 
--  Linux|FreeBSD)
-+  Linux|FreeBSD|NetBSD)
-     CC="gcc"
-     if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"
diff --git a/audio/xamp/patches/patch-af b/audio/xamp/patches/patch-af
new file mode 100644
index 00000000000..b10f4e184f0
--- /dev/null
+++ b/audio/xamp/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1 1999/11/15 13:07:12 rh Exp $
+
+--- ../audioIO.h.orig	Sat May 31 19:47:58 1997
++++ ../audioIO.h	Mon Nov 15 13:58:45 1999
+@@ -26,3 +26,7 @@
+ #ifdef OS_SunOS
+   #define AUSIZ 4096
+ #endif
++
++#ifdef OS_NetBSD
++  #define AUSIZ 32768
++#endif
diff --git a/audio/xamp/patches/patch-ag b/audio/xamp/patches/patch-ag
new file mode 100644
index 00000000000..608ba040344
--- /dev/null
+++ b/audio/xamp/patches/patch-ag
@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.1 1999/11/15 13:07:12 rh Exp $
+
+--- ../audioIO_SunOS.c.orig	Sat May 31 19:47:58 1997
++++ ../audioIO_SunOS.c	Mon Nov 15 13:58:45 1999
+@@ -8,7 +8,11 @@
+ 
+ #include "amp.h"
+ #include <sys/types.h>
++#ifndef OS_NetBSD
+ #include <sys/stropts.h>
++#else
++#include <sys/ioctl.h>
++#endif
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
+@@ -36,8 +40,7 @@
+ 	}
+ 	DB(audio, msg("Audio device opened on %d\n",audio_fd) );
+ 
+-	if (ioctl(audio_fd,AUDIO_GETINFO,&auinfo)<0)
+-		die("Unable to get audio info\n");
++	AUDIO_INITINFO(&auinfo);
+ 
+ 	auinfo.play.precision=16;
+ 	auinfo.play.encoding=AUDIO_ENCODING_LINEAR;
diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah
new file mode 100644
index 00000000000..da218fd7bf9
--- /dev/null
+++ b/audio/xamp/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 1999/11/15 13:07:12 rh Exp $
+
+--- configure.in.orig	Sun Oct  5 18:42:34 1997
++++ configure.in	Mon Nov 15 13:58:45 1999
+@@ -57,7 +57,7 @@
+     CFLAGS="-O3 -ffast-math -funroll-loops"
+     ;;
+ 
+-  Linux|FreeBSD)
++  Linux|FreeBSD|NetBSD)
+     CC="gcc"
+     if test "$ARCH_TYPE" = "i486" ; then
+       CFLAGS_ARCH="-m486"
diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai
new file mode 100644
index 00000000000..41f6cb4b65a
--- /dev/null
+++ b/audio/xamp/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 1999/11/15 13:07:13 rh Exp $
+
+--- configure.orig	Sun Oct 26 17:55:34 1997
++++ configure	Mon Nov 15 13:58:45 1999
+@@ -1700,7 +1700,7 @@
+     CFLAGS="-O3 -ffast-math -funroll-loops"
+     ;;
+ 
+-  Linux|FreeBSD)
++  Linux|FreeBSD|NetBSD)
+     CC="gcc"
+     if test "$ARCH_TYPE" = "i486" ; then
+       CFLAGS_ARCH="-m486"
diff --git a/audio/xwave/files/patch-sum b/audio/xwave/files/patch-sum
index af3c9e74f7f..2ec382e9337 100644
--- a/audio/xwave/files/patch-sum
+++ b/audio/xwave/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/10/22 13:25:53 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 1999/11/15 13:15:11 rh Exp $
 
 MD5 (patch-aa) = 6993e0001cda0ed4af7fd71ab5894b21
 MD5 (patch-ab) = 34635cd40b579d8b92d39e509cf37e89
@@ -8,7 +8,7 @@ MD5 (patch-ae) = 511e5b747b19c8681c308ac049ced5b3
 MD5 (patch-af) = 88132dd318d38f0490bbf31252e03669
 MD5 (patch-ag) = f595b47c977e5b0ab7b2002316b0521a
 MD5 (patch-ah) = e38c7a7de11da0724a6f31ac70ab6ef1
-MD5 (patch-ai) = 886e1787db1bd647571792581471577f
+MD5 (patch-ai) = e019a211123002ca714b18db243d6dd6
 MD5 (patch-aj) = bc246589f05b9cf3a769bc7016e9bda8
 MD5 (patch-ak) = 7c613383978fa3a5766c79068359596e
 MD5 (patch-al) = 8e778223e2f29c042cc84f62cace3fb8
diff --git a/audio/xwave/patches/patch-ai b/audio/xwave/patches/patch-ai
index 83de51112b3..041159c154c 100644
--- a/audio/xwave/patches/patch-ai
+++ b/audio/xwave/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.2 1998/08/07 10:36:24 agc Exp $
+$NetBSD: patch-ai,v 1.3 1999/11/15 13:15:12 rh Exp $
 
---- orig/xwave/src/record_dialog.c	Tue Nov 19 15:24:36 1996
-+++ src/record_dialog.c	Sat Sep 13 04:28:58 1997
-@@ -498,7 +498,7 @@
-     sprintf(MD->mw->messages,"%.2f kbytes (%.2fs)",
- 	    (float)playsize/1024,recordtime);
+--- src/record_dialog.c.orig	Mon Nov 15 14:11:49 1999
++++ src/record_dialog.c	Mon Nov 15 14:11:50 1999
+@@ -524,7 +524,7 @@
+     sprintf(MD->mw->messages,"%.2lf kbytes (%.2lfs)",
+ 	    (double)playsize/1024,recordtime);
      XtVaSetValues(label5,XtNlabel, MD->mw->messages, NULL);
 -#if defined(linux)||defined(FreeBSD)||defined(sun)
 +#if defined(linux)||defined(FreeBSD)||defined(sun) || defined(__NetBSD__)