From 5022bb1d2c932a9a00d8f4b604a1a275d457f217 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 23 Mar 2012 13:16:41 +0000
Subject: [PATCH] update to sox-14.4.0 from maintainer, Jan Stary - also bump
 SHARED_LIBS major

---
 audio/sox/Makefile  | 18 ++++++++++++++----
 audio/sox/distinfo  | 10 +++++-----
 audio/sox/pkg/PLIST |  3 +--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 87bcc0c919d..5eec9aee5bd 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.49 2011/06/15 08:29:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.50 2012/03/23 13:16:41 sthen Exp $
 
 COMMENT=	Sound eXchange, the Swiss Army knife of audio manipulation
 
-DISTNAME=	sox-14.3.2
-SHARED_LIBS +=	sox 2.0 # .1.0
+DISTNAME=	sox-14.4.0
+SHARED_LIBS +=	sox 3.0 # .2.0
 
 CATEGORIES=	audio
 HOMEPAGE=	http://sox.sourceforge.net/
@@ -20,6 +20,7 @@ MODULES=		converters/libiconv
 WANTLIB += c m ogg sndio z
 WANTLIB += vorbis vorbisenc vorbisfile FLAC magic
 WANTLIB += mad id3tag mp3lame wavpack png gsm
+WANTLIB += sndfile twolame
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sox/}
 
@@ -29,6 +30,8 @@ LIB_DEPENDS=	audio/libvorbis \
 		devel/libmagic \
 		audio/libmad \
 		audio/libid3tag \
+		audio/libsndfile \
+		audio/twolame \
 		audio/lame \
 		audio/wavpack \
 		graphics/png \
@@ -38,6 +41,7 @@ USE_GROFF=	Yes
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--datarootdir=${LOCALBASE}      \
 		--disable-silent-libtool
 
 # Don't use modules
@@ -46,11 +50,15 @@ CONFIGURE_ARGS+=--without-libltdl
 # Sound drivers
 CONFIGURE_ARGS+=--without-ao \
 		--without-oss \
+		--without-alsa		\
+		--without-coreaudio	\
+		--without-pulseaudio	\
+		--without-waveaudio	\
 		--with-sndio \
 		--without-sunaudio
 
 # Additional file formats
-CONFIGURE_ARGS+=--without-sndfile \
+CONFIGURE_ARGS+=--with-sndfile \
 		--with-oggvorbis \
 		--with-flac \
 		--without-ffmpeg \
@@ -58,10 +66,12 @@ CONFIGURE_ARGS+=--without-sndfile \
 		--with-mad \
 		--with-id3tag \
 		--with-lame \
+		--with-twolame 	\
 		--without-amrwb \
 		--without-amrnb \
 		--with-wavpack \
 		--with-png \
+		--with-gsm \
 		--without-ladspa
 
 CONFIGURE_ENV= \
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index 89c55d64fba..f9b517885fa 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,5 +1,5 @@
-MD5 (sox-14.3.2.tar.gz) = 6dNc87D4h4WW4LfEn56DAg==
-RMD160 (sox-14.3.2.tar.gz) = W46GvWSt4tlTSZMxdHTDO0EJAYM=
-SHA1 (sox-14.3.2.tar.gz) = rUYhFP9HsJQHjxgUi8ninjG0K5I=
-SHA256 (sox-14.3.2.tar.gz) = BmjMCHw0b3xAhK4pTGdqEd3vtGKXS8P2e+MNeJyFDo8=
-SIZE (sox-14.3.2.tar.gz) = 1110175
+MD5 (sox-14.4.0.tar.gz) = sMFc/3pLoOwX/cdOah+c8Q==
+RMD160 (sox-14.4.0.tar.gz) = rxtsAtKcmI+bDf7Jyp67MJSbBmM=
+SHA1 (sox-14.4.0.tar.gz) = 2AnKs4LHqdAVSRxpBRqdHBoaRPE=
+SHA256 (sox-14.4.0.tar.gz) = PuNLFN0mfeN46KEXqugexMrjMHcjQualW79lIKCoiqM=
+SIZE (sox-14.4.0.tar.gz) = 1105756
diff --git a/audio/sox/pkg/PLIST b/audio/sox/pkg/PLIST
index ae04c913955..6893c40e604 100644
--- a/audio/sox/pkg/PLIST
+++ b/audio/sox/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/01/08 19:48:21 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.7 2012/03/23 13:16:41 sthen Exp $
 @pkgpath audio/sox,mp3
 @pkgpath audio/sox,mp3,vorbis
 @pkgpath audio/sox,vorbis
@@ -8,7 +8,6 @@ bin/rec
 @bin bin/sox
 bin/soxi
 include/sox.h
-include/soxstdint.h
 lib/libsox.a
 lib/libsox.la
 lib/pkgconfig/