3 files changed, 11 insertions, 28 deletions
diff --git a/audio/sox/files/patch-Makefile.in b/audio/sox/files/patch-Makefile.in
new file mode 100644
index 000000000000..ed83c3bba67e
--- /dev/null
+++ b/audio/sox/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in~	Sat Feb  8 08:39:19 2003
++++ Makefile.in	Thu Mar 27 22:24:53 2003
+@@ -28,7 +28,7 @@
+ GSM_LIB_1 = -lgsm
+ GSM_SUPPORT  = @GSM_SUPPORT@
+ 
+-CFLAGS	= @CFLAGS@ -I$(srcdir) -I$(builddir)
++CFLAGS	= @CFLAGS@ @CPPFLAGS@ -I$(srcdir) -I$(builddir)
+ LDFLAGS	= -L. -L./gsm @LDFLAGS@
+ LIBS	= -lst $(GSM_LIB_$(GSM_SUPPORT)) @LIBS@
+ 
diff --git a/audio/sox/files/patch-ac b/audio/sox/files/patch-ac
deleted file mode 100644
index 6bd709649aff..000000000000
--- a/audio/sox/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in~	Wed Sep  5 11:06:01 2001
-+++ Makefile.in	Tue Oct  9 11:59:26 2001
-@@ -74,7 +74,7 @@
- 	$(CC) $(LDFLAGS) -o sox sox.o $(LIBS)
- 
- soxmix.o: sox.c
--	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $<
-+	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o sox.c
- 
- soxmix: libst.a soxmix.o
- 	$(CC) $(LDFLAGS) -o soxmix soxmix.o $(LIBS)
diff --git a/audio/sox/files/patch-vorbis.c b/audio/sox/files/patch-vorbis.c
deleted file mode 100644
index ac14ee56db2d..000000000000
--- a/audio/sox/files/patch-vorbis.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-$FreeBSD$
-
---- vorbis.c.orig	Thu Jan 17 01:11:39 2002
-+++ vorbis.c	Thu Jan 17 01:13:07 2002
-@@ -337,9 +337,8 @@
- 	fprintf(stdout, "Channels: %d  Rate: %ld\n", ft->info.channels,
- 		rate);
- 
--	/* Set encoding to average bit rate of 128kbps with no min or max */
--	vorbis_encode_init(&ve->vi, ft->info.channels, ft->info.rate,
--			   -1, 128000, -1);
-+	/* Set encoding to average bit rate of 112kbps VBR */
-+	vorbis_encode_init_vbr(&ve->vi, ft->info.channels, ft->info.rate, 0.3f);
- 
- 	vorbis_analysis_init(&ve->vd, &ve->vi);
- 	vorbis_block_init(&ve->vd, &ve->vb);