4 files changed, 29 insertions, 33 deletions
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 1fd4d6d5d99..adabf0cea4f 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2004/10/03 00:13:09 tv Exp $
+# $NetBSD: Makefile,v 1.29 2004/10/18 13:24:47 cube Exp $
 
-DISTNAME=	sox-12.17.4
-PKGREVISION=	3
+DISTNAME=	sox-12.17.6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sox/} \
 		http://www.cnpbagwell.com/
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index c80a951c88f..0e2755904bc 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/03/25 09:14:06 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/10/18 13:24:47 cube Exp $
 
-SHA1 (sox-12.17.4.tar.gz) = d6fba1e40b20f73334917d4aaab113b6066283cd
-Size (sox-12.17.4.tar.gz) = 417497 bytes
-SHA1 (patch-ab) = 0632e13e99f358e1a54a2a1d64f39aacf11d4a0f
+SHA1 (sox-12.17.6.tar.gz) = d3e8548814daee5f2d6ace04afc2789ae6e74e58
+Size (sox-12.17.6.tar.gz) = 444125 bytes
+SHA1 (patch-aa) = 90a7d6da429853257d289d084e6485a3925eb849
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
new file mode 100644
index 00000000000..a45fd016a1a
--- /dev/null
+++ b/audio/sox/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.8 2004/10/18 13:24:48 cube Exp $
+
+--- Makefile.in.orig	2004-09-02 00:04:02.000000000 +0200
++++ Makefile.in
+@@ -18,6 +18,8 @@ includedir = @includedir@
+ 
+ INSTALL	= @INSTALL@
+ LN_S    = @LN_S@
++RM      = rm -f
++PLAY_SUPPORT = @PLAY_SUPPORT@
+ 
+ all: 
+ 	cd src && $(MAKE) $@
+@@ -27,6 +29,9 @@ man: $(srcdir)/sox.1 $(srcdir)/soxexam.1
+ 	nroff -man $(srcdir)/soxexam.1 | col -b > soxexam.txt
+ 	nroff -man $(srcdir)/libst.3 | col -b > libst.txt
+ 
++PLAY_INSTALL_0 =
++PLAY_INSTALL_1 = install-play
++
+ install: $(PLAY_INSTALL_$(PLAY_SUPPORT))
+ 	cd src && $(MAKE) $@
+ 	$(srcdir)/mkinstalldirs $(mandir)/man1
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
deleted file mode 100644
index 558568b60bf..00000000000
--- a/audio/sox/patches/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2002/07/12 19:30:51 mycroft Exp $
-
---- sunaudio.c.orig	Sat Dec  1 02:17:18 2001
-+++ sunaudio.c	Fri Jul 12 19:18:31 2002
-@@ -31,7 +31,9 @@
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #endif
-+#ifndef __NetBSD__
- #include <stropts.h>
-+#endif
- #include <malloc.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -170,7 +172,11 @@
-         return(ST_EOF);
-     }
-     /* Flush any data in the buffers - its probably in the wrong format */
-+#ifdef __NetBSD__
-+    ioctl(fileno(ft->fp), AUDIO_FLUSH);
-+#else
-     ioctl(fileno(ft->fp), I_FLUSH, FLUSHR);
-+#endif
-     /* Change to non-buffered I/O*/
-     setvbuf(ft->fp, NULL, _IONBF, sizeof(char) * ft->file.size);
-     sigintreg(ft);      /* Prepare to catch SIGINT */