Update to 13.0.0:

Note: flac support is not enabled because sox-13.0.0 only supports
the old obsolete API; pkgsrc has newer flac.

sox-13.0.0
----------

  File formats:

  o Support for .caf, .paf, .fap, .nist, .w64, .nist, Matlab 4.2/5.0
    (Octave 2.0/2.1), .pvf, .sds, .sd2 and .xi file formats via libsndfile.
    If available, libsndfile can also be used to handle all the other file
    formats it understands.  (Reuben Thomas)
  o Add FLAC support (robs@users.sf.net)
  o Support Maxis's XA format. (Dwayne C. Litzenberger)
  o Add support for 24-bit PCM raw, wav (WAVE_FORMAT_EXTENSIBLE) [FR# 801015],
    au, aiff, & flac files. (robs)
  o Add AIFF-C output support.  (shashimoto)
  o New .ima file format for raw IMA ADPCM.  (robs)
  o Allow the rate and number of channels of .au files to be overridden
    by command-line arguments. (robs@users.sf.net)
  o Add seek support for GSM data in WAV files. Rafal Maszkowski
  o Allow encoding quality to be specified (FLAC & Ogg, but not
    MP3 yet).  (robs)
  o Rename -b to -1, -w to -2, -l to -4, -d to -8, and mask to dither.
    (robs)
  o New options for specifying endianness (and separate options for
    nibble & bit reversal) [FR# 1621702].  (robs)
  o Improved multi-channel file reading; fixes [1599990].  (robs)

  Effects:

  o Equalizer effect (Pascal Giard)
  o bass and treble altering effects.  (robs)
  o New optional rabbit resample routine, using libsamplerate
    (aka Secret Rabbit Code).  (Reuben Thomas)
  o Added allpass filter effect.  (robs)
  o Documented the butterworth filter effects; added variable Q.  (robs)
  o "rate" effect made an alias for "resample".
  o Visualisation of various filters' frequency response via Octave.  (robs)
  o Can now specify width of many 2nd-order filters as: Hz, octaves,
    or Q.  (robs)
  o Dither/mask amount now specifiable.  (robs)
  o Consistent (and hopefully complete) clipping detection and
    reporting.  (robs)
  o Allow command-line time parameters of < 1 sec to omit the
    leading 0. (robs)
  o Improved synth usage and improved the synth entry in the man-
    page.  (robs)
  o Higher quality audio speed adjustment; also fixes [1155364].  (robs)
  o Replacement flanger effect; also fixes [1393245].  (robs)
  o Added silence padding effect.  (robs)
  o Added ability for noiseprof to use stdout and noisered to use stdin
    [FR# 1621694].  (Reuben Thomas)
  o vibro effect name deprecated in favour of tremolo; this effect
    reimplemented as a special case of synth.  (robs)

  Other new features:

  o Remove soxmix.  (Reuben Thomas)
  o Preview mode now removed, as all it did was use rate rather than
    resample, and rate has been removed.
  o -V now gives only user-relevant messages, use -V -V to get
    developer-relevant messages.  (robs)
  o -V output much improved and expanded; now includes display of
    (auto-)selected effects.  (robs)
  o sox man-page overhaul, new soxexam man-page entries.  (robs)
  o Added command line options for specifying the output file
    comment.  (robs)
  o Added ability to merge e.g. 2 mono files to 1 stereo file
    [FR# 1297076].  (robs)
  o Removed the restrictions whereby multiple input files had to have
    the same data encoding & size, and in most situations where they
    had to have the same # of channels, and for play where they had
    to have the same sampling-rate.  (robs)
  o Options to apply replay-gain on input; enabled by default
    with `play'.  (robs)
  o Can now use Ctrl-C to skip to next track when playing multiple
    files (e.g. play *.mp3); Ctrl-C twice to exit.  (robs)
  o Added --interactive option to prompt to overwrite pre-existing
    output file.  (robs)
  o Added large file support.  (Reuben Thomas)

  Bug fixes:

  o Fix writing MP3 files on AMD64 processors.
  o More fixes to MP3 tag reading.  Sometimes tags were
    detected as valid MP3 frames.
  o Fix to stop, avoiding a crash, when starting of effects fails.
    (Reuben Thomas)
  o Fixed a bug introduced in 12.18.2 that stopped the draining
    of effects from occuring.  This had stopped the reverse effect,
    among others, from working.  (Reuben Thomas)
  o Several effects are now optimised out in situations where they need
    do nothing, e.g. changing rate from 8000 to 8000, or changing volume
    by 0dB [Bug# 1395781].  (robs)
  o Fix rounding error when reading command-line time
    parameters. (robs)
  o Fix nul file hander ignoring other format options if rate
    option has not been given. (robs)
  o Fix synth length accuracy. (robs)
  o Fix broken audio when downmixing with any of the following
    effects: synth, deemph, vibro. (robs)
  o Fixed deemph & earwax effects to work with MP3, vorbis,
    & FLAC.  (robs)
  o Fix wav file handler discarding the last PCM sample in certain
    circumstances. (robs)
  o Fix [1627972] AIFF read bug when MARK chunk present.  (Richard Fuller)
  o Fix [1160154] VOX to WAV conversion problem.  (robs)
  o Removed (for output file only) the potentially
    problematic -v option.  Use the vol effect instead.  (robs)
  o Improved the accuracy of integer and floating point PCM
    conversions.  (robs)
  o Don't go into a loop on zero-padded WAVs.  (Jorge Serna)
  o Fix to AIFF writing to avoid writing invalid files in some situations.
    (Reuben Thomas)
  o Fix compander effect bugs: [1613030] Compand fails to compress
    clipping, [1181423] compand with 0 sec attack/release.  (robs)

  Internal improvements:

  o More and better self-tests. (robs@users.sf.net)
  o Build system overhaul to use the full set of GNU autotools.
    (Reuben Thomas)
  o Add new getopt1.c to win32 project file.
  o Remove old, optional rate change and alaw/ulaw conversion code.
    (Reuben Thomas)
  o Removed the old internally invoked (but mentioned in the man page)
    copy effect.  (robs)

sox-12.18.2
-----------
  o Adding in Debian's disk full fix (#313206).
  o Finally got rid of reference to cleanup() function in
    library.  Applications are now required to detect
    all failures from return codes and cleanup as they
    want.
  o Changed how list of formats and effects are stored internally.
    Effects libst users only. Dirk
  o Store effects usage so that its accessable by applications.
    Dirk
  o Modify the synth effect to not use SIGINT to stop processing
    and instead return ST_EOF.  This allows exact acount of
    samples to be written out instead of an approximate amount.
  o Fix hangup when attempting to write stereo MP3 files.
    (1512218) Kendrick Shaw
  o Deemp effect would lose stereo separation. (1479249)
  o Adding cross-platform support for getopt_long
  o Make help screens print much more information and add
    new --help-effect option.  (Originally from Dirk).
  o Add support for using an external gsm library instead of
    just the internal one.  Vladimir Nadvornik
  o Updates to nul file handler to prevent crashes during output.
    Martin Panter (1482869)

9 files changed, 90 insertions, 111 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index f1f23714ed7..6c939b8fb46 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2006/09/03 00:26:20 ben Exp $
+# $NetBSD: Makefile,v 1.40 2007/02/22 23:23:03 wiz Exp $
 
-DISTNAME=	sox-12.18.1
+DISTNAME=	sox-13.0.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sox/} \
 		http://www.cnpbagwell.com/
@@ -10,25 +10,26 @@ HOMEPAGE=	http://sox.sourceforge.net/
 COMMENT=	SOund eXchange - universal sound sample translator
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
-.include "../../mk/bsd.prefs.mk"
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-fast-ulaw
-CONFIGURE_ARGS+=	--enable-fast-alaw
-.if ${OPSYS} != "DragonFly" && ${OPSYS} != "FreeBSD"
-CONFIGURE_ARGS+=	--disable-oss-dsp
-.endif
-CONFIGURE_ARGS+=	--with-ogg-vorbislib=${BUILDLINK_PREFIX.libvorbis}/lib
-CONFIGURE_ARGS+=	--with-ogg-vorbisinc=${BUILDLINK_PREFIX.libvorbis}/include
-
-PLIST_SRC=		${PKGDIR}/PLIST.common
-
-.if ${OPSYS} != "Interix" && ${OPSYS} != "Darwin"
-CONFIGURE_ARGS+=	--with-sun-audio
-PLIST_SRC+=		${PKGDIR}/PLIST.play
-.endif
-
-.include "../../audio/libvorbis/buildlink3.mk"
+USE_LIBTOOL=		yes
+USE_TOOLS+=		pkg-config
+
+SUBST_CLASSES+=		lrf
+SUBST_FILES.lrf=	src/libst-config.in
+SUBST_SED.lrf=		-e "s!@LRF@!"${LINKER_RPATH_FLAG:Q}"!"
+SUBST_STAGE.lrf=	pre-configure
+
+SUBST_CLASSES+=		gsm
+SUBST_FILES.gsm=	configure src/gsm.c src/wav.c
+SUBST_SED.gsm=		-e "s!gsm/gsm.h!gsm.h!"
+SUBST_STAGE.gsm=	pre-configure
+
+# needs obsolete FLAC API
+#.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/PLIST b/audio/sox/PLIST
new file mode 100644
index 00000000000..114bb1facff
--- /dev/null
+++ b/audio/sox/PLIST
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST,v 1.4 2007/02/22 23:23:03 wiz Exp $
+bin/libst-config
+bin/play
+bin/rec
+bin/sox
+include/st.h
+include/ststdint.h
+lib/libst.la
+man/man1/play.1
+man/man1/rec.1
+man/man1/sox.1
+man/man3/libst.3
+man/man7/soxexam.7
diff --git a/audio/sox/PLIST.common b/audio/sox/PLIST.common
deleted file mode 100644
index 515e201eec6..00000000000
--- a/audio/sox/PLIST.common
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.1 2005/03/07 12:19:16 tv Exp $
-bin/sox
-bin/soxmix
-man/man1/sox.1
-man/man1/soxexam.1
-man/man1/soxmix.1
diff --git a/audio/sox/PLIST.play b/audio/sox/PLIST.play
deleted file mode 100644
index eabbefc8528..00000000000
--- a/audio/sox/PLIST.play
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.play,v 1.1 2005/03/07 12:19:16 tv Exp $
-bin/play
-bin/rec
-man/man1/play.1
-man/man1/rec.1
diff --git a/audio/sox/distinfo b/audio/sox/distinfo
index c2aa11fcb30..7b5fedf8432 100644
--- a/audio/sox/distinfo
+++ b/audio/sox/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2006/10/08 21:21:41 rillig Exp $
+$NetBSD: distinfo,v 1.15 2007/02/22 23:23:03 wiz Exp $
 
-SHA1 (sox-12.18.1.tar.gz) = 9591248680029a6e89468daeb4046cdab6e6e759
-RMD160 (sox-12.18.1.tar.gz) = 8177a5b606aad45d7bdf8bba9ea6d818b2399301
-Size (sox-12.18.1.tar.gz) = 473181 bytes
-SHA1 (patch-aa) = a1e3d17b0f674dd55405879337754c16846e5b03
-SHA1 (patch-ab) = 52157b6875ca4ca1b116ae898e26a99652bdb55b
-SHA1 (patch-ac) = b278e5a9d31af90fdbd15ee604e6f78fe4682bff
+SHA1 (sox-13.0.0.tar.gz) = db0e6a7356b8fcbc72cf0dca1d81782fc3fa48f4
+RMD160 (sox-13.0.0.tar.gz) = 84e7c8dea4f3a9145f9b42f7f03ac2329f3b83f2
+Size (sox-13.0.0.tar.gz) = 725259 bytes
+SHA1 (patch-aa) = c21bd9f1b9ba2440abd47b4aacc9721d0a2a6589
+SHA1 (patch-ab) = 3973227e19b0a1128b8faa4ab88074dcf51e100d
+SHA1 (patch-ac) = 53aee94b525c7856c49c8c948377c88973f2e651
+SHA1 (patch-ad) = 4499da3541b6d67aab7e2eb598986d0362527287
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
index 453629e076d..80ff3baeb8c 100644
--- a/audio/sox/patches/patch-aa
+++ b/audio/sox/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.9 2005/06/24 20:50:31 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2007/02/22 23:23:04 wiz Exp $
 
---- Makefile.in.orig	2004-11-07 23:37:20.000000000 +0100
-+++ Makefile.in
-@@ -18,6 +18,8 @@ includedir = @includedir@
+--- configure.orig	2007-02-22 22:45:00.000000000 +0000
++++ configure
+@@ -20972,6 +20972,7 @@ fi
  
- INSTALL	= @INSTALL@
- LN_S    = @LN_S@
-+RM      = rm -f
-+PLAY_SUPPORT = @PLAY_SUPPORT@
+ done
  
- all: 
- 	cd src && $(MAKE) $@
++with_oss=no
+ if test "$with_oss" = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
index 836b582a881..c9fd9805b7e 100644
--- a/audio/sox/patches/patch-ab
+++ b/audio/sox/patches/patch-ab
@@ -1,23 +1,12 @@
-$NetBSD: patch-ab,v 1.10 2006/04/26 07:41:17 rillig Exp $
+$NetBSD: patch-ab,v 1.11 2007/02/22 23:23:04 wiz Exp $
 
-SunPro does not like extern inline functions that reference static
-functions.
-
---- src/adpcm.c.orig	Tue Nov 23 00:07:37 2004
-+++ src/adpcm.c	Wed Apr 26 09:29:21 2006
-@@ -72,6 +72,7 @@ const short iCoef[7][2] = {
-                         { 392,-232}
- };
- 
-+static
- inline st_sample_t AdpcmDecode(st_sample_t c, MsState_t *state,
-                                st_sample_t sample1, st_sample_t sample2)
- {
-@@ -303,6 +304,7 @@ static long ReAvgDelta(int ch, int chans
- 
- #endif
- 
-+static
- inline void AdpcmMashChannel(
-         int ch,             /* channel number to encode, REQUIRE 0 <= ch < chans  */
-         int chans,          /* total channels */
+--- src/Makefile.in.orig	2007-02-11 19:49:58.000000000 +0000
++++ src/Makefile.in
+@@ -164,6 +164,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ RANLIB = @RANLIB@
++RM = rm -f
+ SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
+ SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
+ SED = @SED@
diff --git a/audio/sox/patches/patch-ac b/audio/sox/patches/patch-ac
index 584e9257e49..f46b460d3c9 100644
--- a/audio/sox/patches/patch-ac
+++ b/audio/sox/patches/patch-ac
@@ -1,41 +1,12 @@
-$NetBSD: patch-ac,v 1.9 2006/10/08 21:21:41 rillig Exp $
+$NetBSD: patch-ac,v 1.10 2007/02/22 23:23:04 wiz Exp $
 
-Fixed "test ==" and many stylistic issues.
-
---- scripts/audiogen.orig	2004-09-23 02:52:14.000000000 +0200
-+++ scripts/audiogen	2006-10-08 23:17:57.000000000 +0200
-@@ -1,24 +1,23 @@
- #!/bin/sh
- #
--# usage:audiogen <rate> <channels> <filename> <length> <audio generator options>
-+# usage: audiogen <rate> <channels> <filename> <length> <audio generator options>
- #
- # Example of using the "nul" file handler along with "synth" effect
- # to generate audio data.  Nul file handler pipes a stream of null
- # data non-stop.  Synth effect overrides it with its own data and
- # stops based on length parameter.
- 
--if [ "$5" == "" ]; then
--    echo "usage: $0 <rate> <channels> <filename> <length> <audio generator options>"
--  echo
--  echo "See sox man page and the \"synth\" effect for further information on audio generation options."
-+if [ $# -ne 5 ]; then
-+  { echo "usage: $0 <rate> <channels> <filename> <length> <audio generator options>"
-+    echo
-+    echo "See sox man page and the \"synth\" effect for further information on audio generation options."
-+  } 1>&2
-   exit 1
- fi
- 
- rate=$1
--shift
--channels=$1
--shift
--filename=$1
--shift
-+channels=$2
-+filename=$3
-+shift 3
- 
--sox -s -w -t nul -r $rate -c $channels /dev/null $filename synth $*
-+exec sox -s -w -t nul -r "$rate" -c "$channels" /dev/null "$filename" synth "$@"
+--- Makefile.in.orig	2007-02-11 19:48:39.000000000 +0000
++++ Makefile.in
+@@ -136,6 +136,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+ RANLIB = @RANLIB@
++RM = rm -f
+ SAMPLERATE_CFLAGS = @SAMPLERATE_CFLAGS@
+ SAMPLERATE_LIBS = @SAMPLERATE_LIBS@
+ SED = @SED@
diff --git a/audio/sox/patches/patch-ad b/audio/sox/patches/patch-ad
new file mode 100644
index 00000000000..283001ea0a8
--- /dev/null
+++ b/audio/sox/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.5 2007/02/22 23:23:04 wiz Exp $
+
+--- src/libst-config.in.orig	2004-09-01 19:49:24.000000000 +0000
++++ src/libst-config.in
+@@ -17,9 +17,9 @@ case "$1" in
+ --libdir)
+         echo $libdir;;
+ --libs)
+-        echo $libs;;
++        echo "-R'$libdir' -L'$libdir' $libs";;
+ --cflags)
+-        echo "-L'$libdir' -I'$includedir'";;
++        echo -I$includedir;;
+ *)
+         echo "Usage: $0 [--prefix|--includedir|--libdir|--cflags|--libs]"
+         exit 1;;