3 files changed, 21 insertions, 12 deletions
diff --git a/multimedia/cmus/cmus.SlackBuild b/multimedia/cmus/cmus.SlackBuild
index fbd1d19c36..3d9e33996d 100644
--- a/multimedia/cmus/cmus.SlackBuild
+++ b/multimedia/cmus/cmus.SlackBuild
@@ -1,16 +1,14 @@
 #!/bin/sh
 
 # Slackware build script for cmus
-
 # Written by core (eroc@linuxmail.org)
 
-set -e
-
 PRGNAM=cmus
-VERSION=2.1.0
+VERSION=2.2.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -22,11 +20,13 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -jxvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -41,7 +41,7 @@ make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
@@ -51,7 +51,8 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING HACKING README $PKG/usr/share/doc/cmus/examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING HACKING README $PKG/usr/share/doc/cmus/examples \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 rm -rf $PKG/usr/share/doc
 chmod -x $PKG/usr/doc/$PRGNAM-$VERSION/examples/cmus-status-display
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/multimedia/cmus/cmus.info b/multimedia/cmus/cmus.info
index c1ce6b51a8..e3f23f6347 100644
--- a/multimedia/cmus/cmus.info
+++ b/multimedia/cmus/cmus.info
@@ -1,8 +1,8 @@
 PRGNAM="cmus"
-VERSION="2.1.0"
-HOMEPAGE="http://onion.dynserv.net/~timo/cmus.html"
-DOWNLOAD="http://onion.dynserv.net/~timo/files/cmus-2.1.0.tar.bz2"
-MD5SUM="11ca53a05442ee073b6e790e957b1433"
+VERSION="2.2.0"
+HOMEPAGE="http://cmus.sourceforge.net/"
+DOWNLOAD="http://mirror.greaterscope.net/cmus/cmus-2.2.0.tar.bz2"
+MD5SUM="7a9895ecfc10cd16577c73051436962f"
 MAINTAINER="core"
 EMAIL="eroc@linuxmail.org"
 APPROVED="BP{k}"
diff --git a/multimedia/cmus/slack-desc b/multimedia/cmus/slack-desc
index 4b53e39af3..2bde8facc6 100644
--- a/multimedia/cmus/slack-desc
+++ b/multimedia/cmus/slack-desc
@@ -1,4 +1,12 @@
-cmus: cmus - ncurses based music player.
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+    |-----handy-ruler------------------------------------------------------|
+cmus: cmus (ncurses based music player)
 cmus:
 cmus: cmus is a small and fast text mode music player
 cmus: for Linux and many other UNIX like operating systems.