Remove now unnecessary sys/soundcard.h -> soundcard.h change.

3 files changed, 18 insertions, 24 deletions

diff --git a/audio/gmodplay/distinfo b/audio/gmodplay/distinfo
index b8d06406c5c..b4e0e369b77 100644
--- a/audio/gmodplay/distinfo
+++ b/audio/gmodplay/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2003/07/22 19:34:30 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/12/13 17:59:57 ben Exp $
 
 SHA1 (gmodplay-0.08.tar.gz) = fb19c21cfd08b96e5a4ef5bb802127803260c3bd
 Size (gmodplay-0.08.tar.gz) = 104056 bytes
 SHA1 (patch-aa) = 9017c2645ff85792f606007270ec2cbf31eca4b1
 SHA1 (patch-ab) = bb3ab618f39109d9c528770feaf1ae8516c9162f
-SHA1 (patch-ac) = cf92a3f02d14c2670b6f29c924db67dfddbe5077
+SHA1 (patch-ac) = 34bb9d525107359c0decd35af197ded216cd588a
 SHA1 (patch-ad) = 3cd04b588226e2e5f2fb2c899ca6c61297a5ccbf
-SHA1 (patch-ae) = 9ecff7f878ecbcb49241d0df19291813173826e3
+SHA1 (patch-ae) = 09c7f894b6289d9fb262d825c594f3ab875714d5
 SHA1 (patch-af) = 6f5614591a9a544958ad6f4541db217da47c203b
 SHA1 (patch-ag) = a8e1e1d54ecb17dfb8fbd438b5b7a81bf73c085b
 SHA1 (patch-ah) = 44073bbefd4b48414588e15e5eb2da073b815007
diff --git a/audio/gmodplay/patches/patch-ac b/audio/gmodplay/patches/patch-ac
index 353fcec91b0..3731c4a9c49 100644
--- a/audio/gmodplay/patches/patch-ac
+++ b/audio/gmodplay/patches/patch-ac
@@ -1,17 +1,14 @@
-$NetBSD: patch-ac,v 1.2 2003/07/22 19:34:31 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2003/12/13 17:59:57 ben Exp $
 
---- common/devices.cpp.orig	1998-09-28 23:59:27.000000000 +0200
+--- common/devices.cpp.orig	1998-09-28 14:59:27.000000000 -0700
 +++ common/devices.cpp
-@@ -13,8 +13,9 @@
+@@ -13,6 +13,7 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <stdio.h>
 +#include <stdlib.h>
  #include <sys/ioctl.h>
--#include <sys/soundcard.h>
-+#include <soundcard.h>
- 
- #include "modplay.h"
+ #include <sys/soundcard.h>
  
 @@ -24,13 +25,26 @@ OpenDSP(DSPInfo * DSP)
  	int val;
diff --git a/audio/gmodplay/patches/patch-ae b/audio/gmodplay/patches/patch-ae
index 8f2da2780da..35e5a6d7526 100644
--- a/audio/gmodplay/patches/patch-ae
+++ b/audio/gmodplay/patches/patch-ae
@@ -1,19 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2003/12/13 17:59:57 ben Exp $
 
---- common/modplay.cpp.orig	Mon Oct  5 01:29:52 1998
-+++ common/modplay.cpp	Sun Jan 28 14:01:34 2001
-@@ -14,8 +14,9 @@
- #include <fcntl.h>
- #include <math.h>
+--- common/modplay.cpp.orig	1998-10-05 01:29:52.000000000 -0700
++++ common/modplay.cpp
+@@ -16,6 +16,7 @@
  #include <sys/ioctl.h>
--#include <sys/soundcard.h>
-+#include <soundcard.h>
+ #include <sys/soundcard.h>
  #include <string.h>
 +#include <libgen.h>
  
  #include "stdafx.h"
  #include "sndfile.h"
-@@ -88,9 +89,9 @@
+@@ -88,9 +89,9 @@ ResetPlayer(PlayerInfo * Player)
  	}
  	else {
  		int val = Player->stereo?1:0;
@@ -25,7 +22,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
  	}
  
  	bufsize = (TIMELEN * Player->dsp.sample_rate) / 1000;
-@@ -127,8 +128,8 @@
+@@ -127,8 +128,8 @@ PausePlayer(PlayerInfo * Player)
  	Player->paused = true;
  	/* FIXME:  Useless when doing a close(dsp)??
  	if (!Player->stopped) {
@@ -36,7 +33,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
  	}
  	*/
  	if (Player->buffer) {
-@@ -143,8 +144,8 @@
+@@ -143,8 +144,8 @@ StopPlayer(PlayerInfo * Player)
  {
  	if (Player->stopped)
  		return 0;
@@ -47,7 +44,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
  	if (Player->buffer) {
  		delete Player->buffer;
  		Player->buffer = NULL;
-@@ -330,6 +331,14 @@
+@@ -330,6 +331,14 @@ Help()
  	printf("   -n, --nospectrum   don't display spectrum\n");
  	printf("   -x                 disable X11 interface\n");
  	printf("   -v, --version      output version information and exit\n");
@@ -62,7 +59,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
  }
  
  void
-@@ -370,11 +379,55 @@
+@@ -370,11 +379,55 @@ ParseArgs(PlayerInfo * Player, int Count
  			Player->updatespectro = false;
  			continue;
  		}
@@ -118,7 +115,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2001/03/19 19:35:52 wiz Exp $
  		if (strcmp(Args[i], "--") == 0) {
  			more_params = false;
  			continue;
-@@ -413,18 +466,19 @@
+@@ -413,18 +466,19 @@ main(int argc, char **argv)
  
  	Player->dsp.name = NULL;
  	Player->dsp.fd = -1;