overdue update to 12.17.7, all our changes have been incorporated

audio/sox/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.30 2005/02/22 22:04:41 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.31 2005/05/15 19:40:36 naddy Exp $
 
 COMMENT=	"SOund eXchange - universal sound sample translator"
 
-DISTNAME=	sox-12.17.6
+DISTNAME=	sox-12.17.7
 CATEGORIES=	audio
 HOMEPAGE=	http://sox.sourceforge.net/
 

audio/sox/distinfo

@@ -1,4 +1,4 @@
-MD5 (sox-12.17.6.tar.gz) = ea368e7baf6618a2116f3ed6c111bd4a
-RMD160 (sox-12.17.6.tar.gz) = 30975ee4a87cbedb2552d30f5141bb1d8215a64e
-SHA1 (sox-12.17.6.tar.gz) = d3e8548814daee5f2d6ace04afc2789ae6e74e58
-SIZE (sox-12.17.6.tar.gz) = 444125
+MD5 (sox-12.17.7.tar.gz) = a6876289602c1f2896b39e6a88e2a574
+RMD160 (sox-12.17.7.tar.gz) = 602c111acca325a84e743794230977d652b82a51
+SHA1 (sox-12.17.7.tar.gz) = 94fe3605f37bf2d6d3df93e8d462877d5e100fe3
+SIZE (sox-12.17.7.tar.gz) = 466570

audio/sox/patches/patch-Makefile_in

@@ -1,28 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2004/10/15 18:45:50 naddy Exp $
---- Makefile.in.orig	Thu Sep  2 00:04:02 2004
-+++ Makefile.in	Fri Oct 15 18:27:13 2004
-@@ -27,19 +27,22 @@ 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
- 	$(INSTALL) -c -m 644 $(srcdir)/sox.1 $(mandir)/man1
- 	if [ -f $(mandir)/man1/soxmix.1 ] ; then $(RM) $(mandir)/man1/soxmix.1; fi
--	$(LN_S) $(mandir)/man1/sox.1 $(mandir)/man1/soxmix.1
-+	cd $(mandir)/man1 && $(LN_S) sox.1 soxmix.1
- 	$(INSTALL) -c -m 644 $(srcdir)/soxexam.1 $(mandir)/man1
- 
- install-play:
- 	if [ -f $(mandir)/man1/rec.1 ]; then $(RM) $(mandir)/man1/rec.1; fi
- 	$(srcdir)/mkinstalldirs $(mandir)/man1
- 	$(INSTALL) -c -m 644 $(srcdir)/play.1 $(mandir)/man1
--	$(LN_S) $(mandir)/man1/play.1 $(mandir)/man1/rec.1
-+	cd $(mandir)/man1 && $(LN_S) play.1 rec.1
- 
- install-lib:
- 	cd src && $(MAKE) $@

audio/sox/patches/patch-src_Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2004/10/15 18:45:50 naddy Exp $
---- src/Makefile.in.orig	Fri Oct 15 18:02:17 2004
-+++ src/Makefile.in	Fri Oct 15 18:03:40 2004
-@@ -110,7 +110,7 @@ install-play:
- 	if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec; fi
- 	$(top_srcdir)/mkinstalldirs $(bindir)
- 	$(INSTALL) -c -m 755 play $(bindir)
--	$(LN_S) $(bindir)/play $(bindir)/rec
-+	cd $(bindir) && $(LN_S) play rec
- 
- install-lib: libst.a
- 	$(top_srcdir)/mkinstalldirs $(libdir)

audio/sox/patches/patch-src_play_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_play_in,v 1.1 2004/10/15 18:45:50 naddy Exp $
---- src/play.in.orig	Fri Oct 15 18:13:23 2004
-+++ src/play.in	Fri Oct 15 18:13:34 2004
-@@ -187,7 +187,7 @@ case $arch in
- 	device="/dev/dsp"
-     fi
-     ;;
--  NetBSD)
-+  NetBSD|OpenBSD)
-     arch_defines="-t sunau"
-     if [ -z "$device" ]; then
-         device="/dev/audio"

audio/sox/patches/patch-src_sunaudio_c

@@ -1,35 +0,0 @@
-$OpenBSD: patch-src_sunaudio_c,v 1.1 2004/10/15 18:45:50 naddy Exp $
---- src/sunaudio.c.orig	Fri Oct 15 18:15:46 2004
-+++ src/sunaudio.c	Fri Oct 15 18:18:08 2004
-@@ -20,8 +20,8 @@
- #if     defined(HAVE_SUNAUDIO)
- 
- #include <sys/ioctl.h>
--#if defined(__SVR4) || defined(__NetBSD__)
--#ifdef __NetBSD__
-+#if defined(__SVR4) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if defined( __NetBSD__) || defined(__OpenBSD__)
- #include <sys/types.h>  /* This should be in audioio.h itself but its not */
- #endif
- #include <sys/audioio.h>
-@@ -31,10 +31,9 @@
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #endif
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
- #include <stropts.h>
- #endif
--#include <malloc.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <fcntl.h>
-@@ -172,7 +171,7 @@ int st_sunstartread(ft_t ft)
-         return(ST_EOF);
-     }
-     /* Flush any data in the buffers - its probably in the wrong format */
--#ifdef __NetBSD__
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-     ioctl(fileno(ft->fp), AUDIO_FLUSH);
- #else
-     ioctl(fileno(ft->fp), I_FLUSH, FLUSHR);