* Upgrade to 12.17.3. Changes in this version include:

  - integrated GSM support
  - new soxmix program

* Bump libvorbis version number in LIB_DEPENDS.
* Use new Ogg Vorbis RC3 encoder API.

* Replace incomplete list of supported formats and effects with a general
  blurb in DESCR.
* Update home page URL in DESCR.

Reviewed by:	Dan Nelson <dnelson@emsphone.com>

7 files changed, 30 insertions, 66 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 7e34200d620a..07b58c428a1e 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sox
-PORTVERSION=	12.17.2
-PORTREVISION=	1
+PORTVERSION=	12.17.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sox
@@ -15,22 +14,13 @@ MASTER_SITE_SUBDIR=	sox
 MAINTAINER=		dnelson@emsphone.com
 
 MAN1=			sox.1 play.1 soxexam.1
-MLINKS=			play.1 rec.1
+MLINKS=			play.1 rec.1 sox.1 soxmix.1
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS=		--enable-fast-ulaw --enable-fast-alaw
-
-.if defined(WITH_GSM)
-CONFIGURE_ARGS+=	--with-gsmlib=${LOCALBASE}/lib \
-		 	--with-gsminc=${LOCALBASE}/include
-LIB_DEPENDS+=		gsm.1:${PORTSDIR}/audio/gsm
-.else
-CONFIGURE_ARGS+=	--with-gsminc=no
-.endif
 
 .if defined(WITH_VORBIS)
 CONFIGURE_ARGS+=	--with-ogg-vorbisinc=${LOCALBASE}/include \
 		 	--with-ogg-vorbislib=${LOCALBASE}/lib
-LIB_DEPENDS+=		vorbis.0:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+=		vorbis.1:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=	--with-ogg-vorbisinc=no
 .endif
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index c1d19880b25f..725226a2f7a2 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1 +1 @@
-MD5 (sox-12.17.2.tar.gz) = 9a21c9161cc2238426fc153917b0d2c8
+MD5 (sox-12.17.3.tar.gz) = 1b9998387616ce0638c8edd1145f9932
diff --git a/audio/sox/files/patch-ad b/audio/sox/files/patch-ad
deleted file mode 100644
index 812abc4c4e56..000000000000
--- a/audio/sox/files/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- ima_rw.c.orig	Sun Oct 21 00:11:17 2001
-+++ ima_rw.c	Sun Oct 21 00:11:25 2001
-@@ -23,8 +23,8 @@
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include "ima_rw.h"
- #include "st.h"
-+#include "ima_rw.h"
- 
- /*
-  *
diff --git a/audio/sox/files/patch-ae b/audio/sox/files/patch-ae
deleted file mode 100644
index c4e0930b579b..000000000000
--- a/audio/sox/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- st.h.orig	Sun Oct 21 00:13:45 2001
-+++ st.h	Sun Oct 21 00:13:56 2001
-@@ -33,14 +33,9 @@
- #define st_free free
- 
- /* FIXME: Move to separate header */
--#ifdef __alpha__
- #include <sys/types.h>   /* To get defines for 32-bit integers */
- #define LONG    int32_t
- #define ULONG   u_int32_t
--#else
--#define LONG    long
--#define ULONG   unsigned long
--#endif
- 
- #define MAXLONG 0x7fffffffL
- #define MAXULONG 0xffffffffL
diff --git a/audio/sox/files/patch-vorbis.c b/audio/sox/files/patch-vorbis.c
new file mode 100644
index 000000000000..ac14ee56db2d
--- /dev/null
+++ b/audio/sox/files/patch-vorbis.c
@@ -0,0 +1,17 @@
+
+$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);

diff --git a/audio/sox/pkg-descr b/audio/sox/pkg-descr
index d0dd386471f9..c76071274ee2 100644
--- a/audio/sox/pkg-descr
+++ b/audio/sox/pkg-descr
@@ -1,17 +1,7 @@
-sox translates sound samples between different file formats,
-and performs various sound effects.
+SoX (also known as Sound eXchange) translates sound samples between
+different file formats, and optionally applies various sound effects.
+SoX is intended as the Swiss Army knife of sound processing tools.
+It doesn't do anything very well, but sooner or later it comes in
+very handy.
 
-This release understands "raw" files in various binary formats,
-raw textual data,
-Sound Blaster .VOC files, IRCAM SoundFile files, SUN Sparcstation 
-.au files, mutant DEC .au files, Apple/SGI AIFF files, 
-CD-R (music CD format), Macintosh HCOM files, Sounder files, 
-NeXT .snd files, SUN ADPCM (compressed) .au files,
-and Soundtool (DOS) files.
-
-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
+WWW: http://sox.sourceforge.net/
diff --git a/audio/sox/pkg-plist b/audio/sox/pkg-plist
index bcb6a70f8beb..19f3682da5b8 100644
--- a/audio/sox/pkg-plist
+++ b/audio/sox/pkg-plist
@@ -1,3 +1,5 @@
-bin/sox
+@comment $FreeBSD$
 bin/play
 bin/rec
+bin/sox
+bin/soxmix