4 files changed, 35 insertions, 10 deletions
diff --git a/audio/volumeicon/README b/audio/volumeicon/README
index 34ef08830e59..a2db2865fecb 100644
--- a/audio/volumeicon/README
+++ b/audio/volumeicon/README
@@ -1 +1,16 @@
-volumeicon aims to be a lightweight volume control that sits in your systray.
-\ No newline at end of file
+Volume Icon aims to be a lightweight volume control that sits in your systray.
+
+Features :
+Change volume by scrolling on the systray icon
+Ability to choose which channel to control
+Configurable stepsize (percentage of volume increase/decrease per scrollwheel step)
+Several icon themes (with gtk theme as default)
+Configurable external mixer
+Volume Slider
+
+To enable OSS support, you will need to run the script like this:
+OSS=yes ./volumeicon.SlackBuild
+
+By default Volume Icon will be built with ALSA as its backend.
+Note that it is not possible to build with both ALSA and OSS support at the moment,
+so using this flag will disable ALSA support.
diff --git a/audio/volumeicon/slack-desc b/audio/volumeicon/slack-desc
index 8481e1f3fb3a..b260d51bb3f4 100644
--- a/audio/volumeicon/slack-desc
+++ b/audio/volumeicon/slack-desc
@@ -11,9 +11,9 @@ volumeicon:
 volumeicon: volumeicon aims to be a lightweight volume control that
 volumeicon: sits in your systray.
 volumeicon:
-volumeicon: Homepage: http://softwarebakery.com/maato/volumeicon.html
-volumeicon:
+volumeicon: 
 volumeicon:
 volumeicon:
 volumeicon:
+volumeicon: Homepage: http://softwarebakery.com/maato/volumeicon.html
 volumeicon:
diff --git a/audio/volumeicon/volumeicon.SlackBuild b/audio/volumeicon/volumeicon.SlackBuild
index f8b84ce2c222..34482764c705 100644
--- a/audio/volumeicon/volumeicon.SlackBuild
+++ b/audio/volumeicon/volumeicon.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Daniel Cash
 
 PRGNAM=volumeicon
-VERSION=${VERSION:-0.2.1}
+VERSION=${VERSION:-0.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -18,7 +18,6 @@ if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) export ARCH=i486 ;;
     arm*) export ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
   esac
 fi
@@ -37,8 +36,18 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Pass OSS=yes if you want to build with OSS support. Enabling this will
+# disable ALSA support.
+OSS=${OSS:-"NO"}
+
 set -e
 
+if [ "${OSS:-yes}" = "yes" ]; then
+  oss_params="--enable-oss"
+else
+  oss_params=""
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -61,6 +70,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  $oss_params \
   --build=$ARCH-slackware-linux
 
 make
@@ -68,7 +78,7 @@ make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING \
+  AUTHORS COPYING ChangeLog NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/audio/volumeicon/volumeicon.info b/audio/volumeicon/volumeicon.info
index aed09e9770ad..fe6467016eca 100644
--- a/audio/volumeicon/volumeicon.info
+++ b/audio/volumeicon/volumeicon.info
@@ -1,10 +1,10 @@
 PRGNAM="volumeicon"
-VERSION="0.2.1"
+VERSION="0.3.0"
 HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
-DOWNLOAD="http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.2.1.tar.gz"
-MD5SUM="45f9f42f324e1d368798f2295031bcaa"
+DOWNLOAD="http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.3.0.tar.gz"
+MD5SUM="803f2a376f6ddcb10fb4ca979baf3ef1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Daniel Cash"
 EMAIL="dacashman@gmail.com"
-APPROVED="dsomero"
+APPROVED="Michiel van Wessem"