Update to the latest version. Dan Nelson is now the maintainer, since

the previous maintainer doesn't seem to want to take care of it
anymore (no updates for a long time.)

PR:		12658
Submitted by:	Dan Nelson <dnelson@emsphone.com>

6 files changed, 13 insertions, 90 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index da6e0a9e30e9..2747739b0263 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -3,22 +3,18 @@
 # Date created:		17 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.8 1996/11/18 11:21:36 asami Exp $
+# $Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp $
 #
 
-DISTNAME=	soxgamma
-PKGNAME=	sox-12.12
+DISTNAME=	sox-12.16
 CATEGORIES=	audio
-MASTER_SITES=	http://www.spies.com/Sox/Archive/
+MASTER_SITES=	http://home.sprynet.com/~cbagwell/
 
-MAINTAINER=	torstenb@FreeBSD.ORG
+MAINTAINER=	dnelson@emsphone.com
 
-NO_WRKSUBDIR=		yes
-MAKEFILE=	Makefile.unx
-MAN1=		sox.1
-
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/sox ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/sox.man ${PREFIX}/man/man1/sox.1
+MAN1=		sox.1 play.1
+MLINKS=		play.1 rec.1
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-fast-ulaw --enable-fast-alaw
 
 .include <bsd.port.mk>
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index b325642f1740..9675ab315ab5 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1 +1 @@
-MD5 (soxgamma.tar.gz) = ed5586a59ee9fed5e7cea90e46a6c51b
+MD5 (sox-12.16.tar.gz) = c42277b664f46514f2fb35221795dcfa
diff --git a/audio/sox/files/patch-aa b/audio/sox/files/patch-aa
deleted file mode 100644
index 090adb375032..000000000000
--- a/audio/sox/files/patch-aa
+++ /dev/null
@@ -1,61 +0,0 @@
-*** 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);
diff --git a/audio/sox/files/patch-ab b/audio/sox/files/patch-ab
deleted file mode 100644
index bb8eb1cf617b..000000000000
--- a/audio/sox/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.unx.orig	Sat Oct  8 09:14:48 1994
-+++ Makefile.unx	Mon Jan 27 15:09:32 1997
-@@ -153,6 +153,13 @@
- # RM  = del /q
- 
- 
-+
-+# FreeBSD 1.x / 2.x / 3.x
-+CFLAGS		+= -DLINUXSOUND -D_HAVE_PARAM_H
-+CC		= cc
-+AR		= ar r
-+RANLIB		= ranlib
-+
- all: sox
- 
- sox: sox.o $(SOUNDLIB)
diff --git a/audio/sox/pkg-descr b/audio/sox/pkg-descr
index 01c81932b855..d0dd386471f9 100644
--- a/audio/sox/pkg-descr
+++ b/audio/sox/pkg-descr
@@ -13,3 +13,5 @@ The sound effects include changing the sample rate, adding echo
 delay lines, applying low-, high, and band-pass filtering, 
 reversing a sample in order to search for Satanic messages,
 and the infamous Fender Vibro effect.
+
+WWW: http://home.sprynet.com/~cbagwell/sox.html
diff --git a/audio/sox/pkg-plist b/audio/sox/pkg-plist
index e61762af1ace..bcb6a70f8beb 100644
--- a/audio/sox/pkg-plist
+++ b/audio/sox/pkg-plist
@@ -1 +1,3 @@
 bin/sox
+bin/play
+bin/rec