Remove messy patches and define "unix" manually, fixes PR pkg/5604

Tim Rightnour.

3 files changed, 67 insertions, 133 deletions

diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
index 090adb37503..cd4e3821a9f 100644
--- a/audio/sox/patches/patch-aa
+++ b/audio/sox/patches/patch-aa
@@ -1,61 +1,57 @@
-*** sbdsp.c.orig	Thu Aug 18 06:11:01 1994
---- sbdsp.c	Mon Jan 27 02:47:53 1997
-***************
-*** 21,27 ****
-  #include <i386/isa/sblast.h>
-  #else
-  #ifdef LINUXSOUND
-! #include <linux/soundcard.h>
-  #else
-  #include <sys/sb.h>
-  #endif
---- 21,27 ----
-  #include <i386/isa/sblast.h>
-  #else
-  #ifdef LINUXSOUND
-! #include <machine/soundcard.h>
-  #else
-  #include <sys/sb.h>
-  #endif
-***************
-*** 78,84 ****
-  	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
-  #else
-  #if defined(LINUXSOUND)
-! 	ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate);
-  #else
-  	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 0);
-  	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
---- 78,88 ----
-  	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
-  #else
-  #if defined(LINUXSOUND)
-!   #if SOUND_VERSION >= 200
-! 	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate);
-!   #else
-! 	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, ft->info.rate);
-!   #endif
-  #else
-  	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 0);
-  	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
-***************
-*** 148,154 ****
-  #else
-  #if defined(LINUXSOUND)
-  	ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0);
-! 	ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate);
-  #else
-  	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 1);
-  	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
---- 152,162 ----
-  #else
-  #if defined(LINUXSOUND)
-  	ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0);
-!   #if SOUND_VERSION >= 200
-! 	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate);
-!   #else
-! 	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, ft->info.rate);
-!   #endif
-  #else
-  	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 1);
-  	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
+--- sbdsp.c.orig	Wed Aug 17 23:11:01 1994
++++ sbdsp.c	Fri Jun 19 19:01:35 1998
+@@ -21,7 +21,12 @@
+ #include <i386/isa/sblast.h>
+ #else
+ #ifdef LINUXSOUND
+-#include <linux/soundcard.h>
++#ifdef __NetBSD__
++#include <sys/ioctl.h>
++#include <soundcard.h>
++#else
++#include <machine/soundcard.h>
++#endif
+ #else
+ #include <sys/sb.h>
+ #endif
+@@ -77,8 +82,18 @@
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &off);
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
+ #else
++#ifdef __NetBSD__
++	{
++		int fmt = AFMT_U8;
++		ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt);
++	}
++#endif
+ #if defined(LINUXSOUND)
+-	ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate);
++  #if SOUND_VERSION >= 200
++	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate);
++  #else
++	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, ft->info.rate);
++  #endif
+ #else
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 0);
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
+@@ -146,9 +161,19 @@
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &on);
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
+ #else
++#ifdef __NetBSD__
++	{
++		int fmt = AFMT_U8;
++		ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt);
++	}
++#endif
+ #if defined(LINUXSOUND)
+ 	ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0);
+-	ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate);
++  #if SOUND_VERSION >= 200
++	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate);
++  #else
++	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, ft->info.rate);
++  #endif
+ #else
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 1);
+ 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
index e00a39ff672..1f015edd242 100644
--- a/audio/sox/patches/patch-ab
+++ b/audio/sox/patches/patch-ab
@@ -1,12 +1,12 @@
---- Makefile.unx.orig	Sat Oct  8 09:14:48 1994
-+++ Makefile.unx	Mon Jan 27 15:09:32 1997
-@@ -153,6 +153,13 @@
+--- Makefile.unx.orig	Sat Oct  8 01:14:48 1994
++++ Makefile.unx	Fri Jun 19 19:05:49 1998
+@@ -153,10 +153,17 @@
  # RM  = del /q
  
  
 +
-+# FreeBSD 1.x / 2.x / 3.x
-+CFLAGS		= -O -DLINUXSOUND -D_HAVE_PARAM_H
++# NetBSD 1.3
++CFLAGS		= -O -DLINUXSOUND -D_HAVE_PARAM_H -Dunix
 +CC		= cc
 +AR		= ar r
 +RANLIB		= ranlib
@@ -14,3 +14,8 @@
  all: sox
  
  sox: sox.o $(SOUNDLIB)
+-	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm
++	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm -lossaudio
+ 
+ $(SOUNDLIB): $(LIBOBJS)
+ 	$(RM) $(SOUNDLIB)
diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad
deleted file mode 100644
index 2b0c9c9f5a5..00000000000
--- a/audio/sox/patches/patch-ad
+++ /dev/null
@@ -1,67 +0,0 @@
-Only in .: .build_done
-diff -u ../work/Makefile.unx ./Makefile.unx
---- ../work/Makefile.unx	Wed Oct 29 02:43:00 1997
-+++ ./Makefile.unx	Wed Oct 29 02:26:11 1997
-@@ -154,7 +154,7 @@
- 
- 
- 
--# FreeBSD 1.x / 2.x / 3.x
-+# NetBSD 1.3
- CFLAGS		= -O -DLINUXSOUND -D_HAVE_PARAM_H
- CC		= cc
- AR		= ar r
-@@ -163,7 +163,7 @@
- all: sox
- 
- sox: sox.o $(SOUNDLIB)
--	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm
-+	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm -lossaudio
- 
- $(SOUNDLIB): $(LIBOBJS)
- 	$(RM) $(SOUNDLIB)
-Only in .: libst.a
-diff -u ../work/sbdsp.c ./sbdsp.c
---- ../work/sbdsp.c	Wed Oct 29 02:42:59 1997
-+++ ./sbdsp.c	Wed Oct 29 02:42:09 1997
-@@ -21,7 +21,12 @@
- #include <i386/isa/sblast.h>
- #else
- #ifdef LINUXSOUND
-+#ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#else
- #include <machine/soundcard.h>
-+#endif
- #else
- #include <sys/sb.h>
- #endif
-@@ -77,6 +82,12 @@
- 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &off);
- 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
- #else
-+#ifdef __NetBSD__
-+	{
-+		int fmt = AFMT_U8;
-+		ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt);
-+	}
-+#endif
- #if defined(LINUXSOUND)
-   #if SOUND_VERSION >= 200
- 	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate);
-@@ -150,6 +161,12 @@
- 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &on);
- 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
- #else
-+#ifdef __NetBSD__
-+	{
-+		int fmt = AFMT_U8;
-+		ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt);
-+	}
-+#endif
- #if defined(LINUXSOUND)
- 	ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0);
-   #if SOUND_VERSION >= 200
-Only in .: sox
-Only in .: ut