1 files changed, 12 insertions, 25 deletions
diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild
index 3cd5e30e45..fe82deaa18 100644
--- a/audio/audacity/audacity.SlackBuild
+++ b/audio/audacity/audacity.SlackBuild
@@ -29,7 +29,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=audacity
-VERSION=${VERSION:-2.0.2}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,24 +46,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "${SOUNDTOUCH:-no}" = "no" ]; then
-    do_soundtouch="without"
-else
-    do_soundtouch="with"
-fi
-
-if [ "${TWOLAME:-no}" = "no" ]; then
-    do_twolame="without"
-else
-    do_twolame="with"
-fi
-
-if [ "${FFMPEG:-no}" = "no" ]; then
-    do_ffmpeg="without"
-else
-    do_ffmpeg="with"
-fi
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -78,13 +60,18 @@ else
   LIBDIRSUFFIX=""
 fi
 
+do_soundtouch="out" ; [ "${SOUNDTOUCH:-no}" != "no" ] && do_soundtouch=""
+do_twolame="out"    ; [ "${TWOLAME:-no}" != "no" ]    && do_twolame=""
+do_vamp="out"       ; [ "${VAMP:-no}" != "no" ]       && do_vamp=""
+do_ffmpeg="out"     ; [ "${FFMPEG:-no}" != "no" ]     && do_ffmpeg=""
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-src-$VERSION
-tar xvf $CWD/$PRGNAM-minsrc-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-minsrc-$VERSION.tar.?z*
 cd $PRGNAM-src-$VERSION
 chown -R root:root .
 find . \
@@ -112,9 +99,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-libsndfile \
   --with-libid3tag \
   --with-libresample \
-  --$do_ffmpeg-ffmpeg \
-  --$do_soundtouch-soundtouch \
-  --$do_twolame-libtwolame
+  --with$do_ffmpeg-ffmpeg \
+  --with$do_soundtouch-soundtouch \
+  --with$do_twolame-libtwolame \
+  --with$do_vamp-libvamp
 
 make
 make install DESTDIR=$PKG
@@ -133,9 +121,8 @@ install -D -m 0644 images/AudacityLogo48x48.xpm \
 mv $PKG/usr/share/man $PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/audacity/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -fr $PKG/usr/share/doc
 cp LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION
-rm -r $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install