Update to sox 12.17.3. Numerous bugs fixed, and most of the NetBSD patches

integrated.

13 files changed, 46 insertions, 159 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index a566d2fccf2..0a88d695287 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2001/07/01 21:47:12 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2002/07/12 19:30:50 mycroft Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp 
 #
 
-DISTNAME=	sox-12.17.1
+DISTNAME=	sox-12.17.3
 CATEGORIES=	audio
 MASTER_SITES=	http://home.sprynet.com/~cbagwell/
 
@@ -17,10 +17,4 @@ CONFIGURE_ARGS+=	--enable-fast-ulaw \
 			--with-sun-audio \
 			--without-oss-dsp
 
-pre-build:
-	cd ${WRKSRC};							\
-	[ -f play.BAK ] || ${MV} play play.BAK;				\
-	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
-		play.BAK > play
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/PLIST b/audio/sox/PLIST
index e8eebb33ede..a0af2b9d610 100644
--- a/audio/sox/PLIST
+++ b/audio/sox/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:17:56 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/07/12 19:30:50 mycroft Exp $
 bin/play
 bin/rec
 bin/sox
+bin/soxmix
 man/man1/play.1
 man/man1/rec.1
 man/man1/sox.1
 man/man1/soxexam.1
+man/man1/soxmix.1
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index a40cde05196..5f7ec95b1db 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,14 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 12:14:38 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/07/12 19:30:50 mycroft Exp $
 
-SHA1 (sox-12.17.1.tar.gz) = 67c1fa9da11f95b0c151f51e1eb22be296751298
-Size (sox-12.17.1.tar.gz) = 312208 bytes
-SHA1 (patch-aa) = dac5666e8684b7d7e878d8e94cf8619d1a65e4eb
-SHA1 (patch-ab) = 94753db1d82ed4b984867042d0a353a5be2ccd56
-SHA1 (patch-ac) = 6eff289de2993667830e8eea6b283c42c204cec9
-SHA1 (patch-ad) = ff4917e7e42c863c9b82a2061a8fc3019c7ffd65
-SHA1 (patch-ae) = 8922996a7acfe9034e62f1a185cc804b4b21f8b2
-SHA1 (patch-af) = 980556feee78100ca4db20116d0a4ef920e8d0d5
-SHA1 (patch-ag) = a61cf7b815d713d99a105dd3a0bb41de6c41d84e
-SHA1 (patch-ah) = 6e5f74d5a68a709b43fc52971738c47a2660f97f
-SHA1 (patch-ai) = a9d1646e58958e559c99c83c140897125f8f9469
-SHA1 (patch-aj) = eedcf3cf5abaa8e6a7b7473def8ee27371b18093
+SHA1 (sox-12.17.3.tar.gz) = 2598f5b64305430a644d74f061843ed993cfe316
+Size (sox-12.17.3.tar.gz) = 405660 bytes
+SHA1 (patch-aa) = d651b2bf19b27a603bc1f40d7c670561e757e28e
+SHA1 (patch-ab) = 0632e13e99f358e1a54a2a1d64f39aacf11d4a0f
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
index 2a8bf43f1d8..b7fd067441a 100644
--- a/audio/sox/patches/patch-aa
+++ b/audio/sox/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.5 1999/10/26 01:31:04 hubertf Exp $
+$NetBSD: patch-aa,v 1.6 2002/07/12 19:30:50 mycroft Exp $
 
---- sunaudio.c.orig	Sun Jul 18 20:57:36 1999
-+++ sunaudio.c	Thu Sep 30 01:43:33 1999
-@@ -17,7 +17,10 @@
-  */
+--- Makefile.in.orig	Sun Dec 16 22:47:37 2001
++++ Makefile.in	Fri Jul 12 19:22:14 2002
+@@ -78,7 +78,7 @@
+ 	$(CC) $(LDFLAGS) -o sox sox.o $(LIBS)
  
- #include <sys/ioctl.h>
--#ifdef __SVR4
-+#if defined(__SVR4) || defined(__NetBSD__)
-+#ifdef __NetBSD__
-+#include <sys/types.h>
-+#endif
- #include <sys/audioio.h>
- #else
- #include <sun/audioio.h>
+ soxmix.o: sox.c
+-	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o $<
++	$(CC) $(CFLAGS) -DSOXMIX -c -o soxmix.o sox.c
+ 
+ soxmix: libst.a $(GSM_$(GSM_SUPPORT)) soxmix.o
+ 	$(CC) $(LDFLAGS) -o soxmix soxmix.o $(LIBS)
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
index 2cf331986bc..558568b60bf 100644
--- a/audio/sox/patches/patch-ab
+++ b/audio/sox/patches/patch-ab
@@ -1,26 +1,26 @@
-$NetBSD: patch-ab,v 1.5 1999/10/26 01:31:07 hubertf Exp $
+$NetBSD: patch-ab,v 1.6 2002/07/12 19:30:51 mycroft Exp $
 
---- play.orig	Tue Oct 26 03:16:27 1999
-+++ play	Tue Oct 26 03:19:33 1999
-@@ -14,7 +14,7 @@
- 
- # Set up path so that it can find Sox if user's path doesn't already
- # include it.
--PATH=$PATH:/usr/local/bin
-+PATH=$PATH:@PREFIX@/bin
- program_name=`basename $0`
- program_version="2.0"
- 
-@@ -171,6 +171,12 @@
-     esac
-     if [ -z "$device" ]; then
- 	device="/dev/audio"
-+    fi
-+    ;;
-+  NetBSD)
-+    arch_defines="-t sunau"
-+    if [ -z "$device" ]; then
-+        device="/dev/audio"
-     fi
-     ;;
-   Linux|FreeBSD)
+--- 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 */
diff --git a/audio/sox/patches/patch-ac b/audio/sox/patches/patch-ac
deleted file mode 100644
index 9ffdb7d74a7..00000000000
--- a/audio/sox/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2000/12/27 00:55:03 wiz Exp $
-
---- au.c.orig	Fri Sep  1 18:08:24 2000
-+++ au.c
-@@ -22,6 +22,7 @@
- #include "st.h"
- #include "g72x.h"
- #include <stdlib.h>
-+#include <string.h>
- 
- /* Magic numbers used in Sun and NeXT audio files */
- #define SUN_MAGIC 	0x2e736e64		/* Really '.snd' */
diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad
deleted file mode 100644
index 5c9d998449b..00000000000
--- a/audio/sox/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2000/12/27 00:55:04 wiz Exp $
-
---- pitch.c.orig	Wed Jun  7 20:35:39 2000
-+++ pitch.c
-@@ -38,6 +38,7 @@
- #include "st.h"
- 
- #include <stdlib.h> /* malloc(), free() */
-+#include <string.h> /* memcpy() */
- 
- #include <math.h>   /* cos(), pow() */
- #include <limits.h> /* LONG_MAX */
diff --git a/audio/sox/patches/patch-ae b/audio/sox/patches/patch-ae
deleted file mode 100644
index 944524a60ef..00000000000
--- a/audio/sox/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2000/12/27 00:55:04 wiz Exp $
-
---- copy.c.orig	Wed Jun  7 20:35:38 2000
-+++ copy.c
-@@ -12,6 +12,7 @@
-  */
- 
- #include "st.h"
-+#include <string.h>
- 
- /*
-  * Process options
diff --git a/audio/sox/patches/patch-af b/audio/sox/patches/patch-af
deleted file mode 100644
index 36562777f12..00000000000
--- a/audio/sox/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2000/12/27 00:55:04 wiz Exp $
-
---- resample.c.orig	Fri Sep  1 18:08:24 2000
-+++ resample.c
-@@ -180,7 +180,7 @@
- 	resample_t r = (resample_t) effp->priv;
- 	LONG Xoff, gcdrate;
- 	int i;
--	extern long st_gcd(P2(long a,long b));
-+	extern LONG st_gcd(P2(LONG a,LONG b));
- 
- 	r->Factor = (double)effp->outinfo.rate / (double)effp->ininfo.rate;
- 
diff --git a/audio/sox/patches/patch-ag b/audio/sox/patches/patch-ag
deleted file mode 100644
index 61c7c06dfbc..00000000000
--- a/audio/sox/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/12/27 00:55:04 wiz Exp $
-
---- avr.c.orig	Tue Aug 15 04:10:58 2000
-+++ avr.c
-@@ -38,7 +38,7 @@
-   unsigned short midi; /* 0xffff = no MIDI note assigned,
- 			  0xffXX = single key note assignment
- 			  0xLLHH = key split, low/hi note */
--  ULONG int rate;	       /* sample frequency in hertz */
-+  ULONG rate;	       /* sample frequency in hertz */
-   ULONG size;	       /* sample length in bytes or words (see rez) */
-   ULONG lbeg;	       /* offset to start of loop in bytes or words.
- 			  set to zero if unused. */
diff --git a/audio/sox/patches/patch-ah b/audio/sox/patches/patch-ah
deleted file mode 100644
index 260da7ef85e..00000000000
--- a/audio/sox/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2000/12/27 00:55:04 wiz Exp $
-
---- polyphas.c.orig	Tue Aug 22 17:19:43 2000
-+++ polyphas.c
-@@ -31,6 +31,7 @@
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <limits.h>
- #include "st.h"
- 
diff --git a/audio/sox/patches/patch-ai b/audio/sox/patches/patch-ai
deleted file mode 100644
index f1b09777e7d..00000000000
--- a/audio/sox/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2000/12/27 00:55:05 wiz Exp $
-
---- trim.c.orig	Thu Nov 16 18:48:52 2000
-+++ trim.c
-@@ -11,6 +11,7 @@
-  * Sound Tools skeleton effect file.
-  */
- 
-+#include <string.h>
- #include "st.h"
- 
- /* Time resolutin one millisecond */
diff --git a/audio/sox/patches/patch-aj b/audio/sox/patches/patch-aj
deleted file mode 100644
index 6c3fd63fbb0..00000000000
--- a/audio/sox/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2000/12/27 00:55:05 wiz Exp $
-
---- stretch.c.orig	Wed Jun  7 20:35:40 2000
-+++ stretch.c
-@@ -22,6 +22,7 @@
- #include "st.h"
- 
- #include <stdlib.h> /* malloc and free */
-+#include <string.h> /* memcpy */
- #include <limits.h> /* LONG_MAX */
- 
- #ifndef MIN