Clean up patches

submitted by Rob Windsor <windsor@warthog.com> in PR 6830

3 files changed, 29 insertions, 70 deletions

diff --git a/audio/xmix/patches/patch-aa b/audio/xmix/patches/patch-aa
index 1f319b36c47..1ed1b14b6c1 100644
--- a/audio/xmix/patches/patch-aa
+++ b/audio/xmix/patches/patch-aa
@@ -1,39 +1,16 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:36:21 agc Exp $
+$NetBSD: patch-aa,v 1.3 1999/01/17 20:07:28 hubertf Exp $
 
-diff -rc ../../xmix.orig/Imakefile ./Imakefile
-*** ../../xmix.orig/Imakefile	Fri Jun 30 18:49:35 1995
---- ./Imakefile	Fri Jun 30 20:11:30 1995
-***************
-*** 14,17 ****
-  
-  LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-  
-! NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),)
---- 14,19 ----
-  
-  LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-  
-! PROGRAM = $(PROGRAMS)
-! 
-! ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),)
-Only in ./: Imakefile.orig
-diff -rc ../../xmix.orig/xmix.c ./xmix.c
-*** ../../xmix.orig/xmix.c	Fri Jun 30 20:09:41 1995
---- ./xmix.c	Fri Jun 30 20:11:49 1995
-***************
-*** 77,83 ****
-  #include "square_empty.bit"
-  #include "square_with_x.bit"
-  
-! #include <linux/soundcard.h>
-  
-  #define SOUND_FULL_SCALE 100.0
-  #define MAX_SOUND_VOL 95
---- 77,83 ----
-  #include "square_empty.bit"
-  #include "square_with_x.bit"
-  
-! #include <machine/soundcard.h>
-  
-  #define SOUND_FULL_SCALE 100.0
-  #define MAX_SOUND_VOL 95
+diff -r -u ../../src/xmix-2.1/Imakefile ./Imakefile
+--- ../../src/xmix-2.1/Imakefile	Tue Feb  1 22:54:35 1994
++++ ./Imakefile	Sun Jan 17 13:16:12 1999
+@@ -12,6 +12,8 @@
+ 
+ all::  $(PROGRAMS)
+ 
+-LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lossaudio
+ 
+-NormalProgramTarget(xmix,$(OBJS1),,$(LOCAL_LIBRARIES),)
++PROGRAM = $(PROGRAMS)
++
++ComplexProgramTarget_1($(PROGRAM),$(LOCAL_LIBRARIES),)
diff --git a/audio/xmix/patches/patch-ab b/audio/xmix/patches/patch-ab
index 3a97fadd44a..c67feb49d79 100644
--- a/audio/xmix/patches/patch-ab
+++ b/audio/xmix/patches/patch-ab
@@ -1,30 +1,26 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:36:21 agc Exp $
-
-diff -u ../../work/xmix/Imakefile ./Imakefile
---- ../../work/xmix/Imakefile	Thu Oct 30 01:21:25 1997
-+++ ./Imakefile	Thu Oct 30 00:46:39 1997
-@@ -12,7 +12,7 @@
- 
- all::  $(PROGRAMS)
- 
--LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
-+LOCAL_LIBRARIES = $(XAWLIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lossaudio
- 
- PROGRAM = $(PROGRAMS)
- 
-diff -u ../../work/xmix/xmix.c ./xmix.c
---- ../../work/xmix/xmix.c	Thu Oct 30 01:21:25 1997
-+++ ./xmix.c	Thu Oct 30 00:45:45 1997
+diff -r -u ../../src/xmix-2.1/xmix.c ./xmix.c
+--- ../../src/xmix-2.1/xmix.c	Sun Jan 17 13:13:12 1999
++++ ./xmix.c	Sun Jan 17 13:16:12 1999
 @@ -77,7 +77,12 @@
  #include "square_empty.bit"
  #include "square_with_x.bit"
  
+-#include <linux/soundcard.h>
 +#ifdef __NetBSD__
 +#include <sys/ioctl.h>
 +#include <soundcard.h>
 +#else
- #include <machine/soundcard.h>
++#include <machine/soundcard.h>
 +#endif
  
  #define SOUND_FULL_SCALE 100.0
  #define MAX_SOUND_VOL 95
+@@ -742,7 +747,7 @@
+   mic.locked = 0;
+   reclvl.locked = 0;
+ 
+-  printf("supported = 0x%x\n",supported);
++  /*printf("supported = 0x%x\n",supported);*/
+   set_supported(&master,(supported & SOUND_MASK_VOLUME) != 0);
+   set_supported(&bass,(supported & SOUND_MASK_BASS) != 0);
+   set_supported(&treble,(supported & SOUND_MASK_TREBLE) != 0);
diff --git a/audio/xmix/patches/patch-ac b/audio/xmix/patches/patch-ac
deleted file mode 100644
index f6d8ee3a392..00000000000
--- a/audio/xmix/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:22 agc Exp $
-
-diff -u ../../work/xmix/xmix.c ./xmix.c
---- ../../work/xmix/xmix.c	Thu Oct 30 01:23:01 1997
-+++ ./xmix.c	Thu Oct 30 01:25:53 1997
-@@ -747,7 +747,7 @@
-   mic.locked = 0;
-   reclvl.locked = 0;
- 
--  printf("supported = 0x%x\n",supported);
-+  /*printf("supported = 0x%x\n",supported);*/
-   set_supported(&master,(supported & SOUND_MASK_VOLUME) != 0);
-   set_supported(&bass,(supported & SOUND_MASK_BASS) != 0);
-   set_supported(&treble,(supported & SOUND_MASK_TREBLE) != 0);