4 files changed, 23 insertions, 45 deletions
diff --git a/audio/volumeicon/README b/audio/volumeicon/README
index fa39390ce0..ccd30857ba 100644
--- a/audio/volumeicon/README
+++ b/audio/volumeicon/README
@@ -1,23 +1,20 @@
-Volume Icon aims to be a lightweight volume control that sits in your
-systray.
+Volume Icon is a lightweight volume control that sits in the 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
-* Hotkey support
-* Optional notification support
+Change volume by scrolling on the systray icon
+Ability to choose which channel to control
+Configurable stepsize (percentage of volume change per scrollwheel step)
+Several icon themes (with gtk theme as default)
+Configurable external mixer
+Volume Slider (horizontal or vertical)
+Hotkey support
+Optional notification support
 
 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.
 
 To enable notifications, you will need to run the script like this:
 NOTIFY=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 38495d3d59..51b5b00598 100644
--- a/audio/volumeicon/slack-desc
+++ b/audio/volumeicon/slack-desc
@@ -9,11 +9,11 @@
 volumeicon: volumeicon (volume control)
 volumeicon:
 volumeicon: volumeicon aims to be a lightweight volume control that
-volumeicon: sits in your systray.
+volumeicon: sits in the systray.
 volumeicon:
+volumeicon: Homepage: http://softwarebakery.com/maato/volumeicon.html
 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 b2458eb8e1..5584f98228 100644
--- a/audio/volumeicon/volumeicon.SlackBuild
+++ b/audio/volumeicon/volumeicon.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Daniel Cash
 
 PRGNAM=volumeicon
-VERSION=${VERSION:-0.4.3}
+VERSION=${VERSION:-0.4.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -36,28 +36,10 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Pass OSS=yes if you want to build with OSS support. Enabling this will
-# disable ALSA support.
-OSS=${OSS:-"NO"}
-
-
-# Pass NOTIFY=yes to enable notifications. This adds a dependency
-# for libnotify >= 0.5.0.
-NOTIFY=${NOTIFY:-"NO"}
-
 set -e
 
-if [ "${OSS:-yes}" = "yes" ]; then
-  oss_params="--enable-oss"
-else
-  oss_params=""
-fi
-
-if [ "${NOTIFY:-yes}" = "yes" ]; then
-  notify_params="--enable-notify"
-else
-  notify_params=""
-fi
+oss_params=""    ; [ "${OSS:-no}" != "no" ]    && oss_params="--enable-oss"
+notify_params="" ; [ "${NOTIFY:-no}" != "no" ] && notify_params="--enable-notify"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -81,9 +63,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  $oss_params \
-  $notify_params \
-  --build=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux \
+  $oss_params $notify_params
 
 make
 make install-strip DESTDIR=$PKG
diff --git a/audio/volumeicon/volumeicon.info b/audio/volumeicon/volumeicon.info
index 25656413e5..13faa594a9 100644
--- a/audio/volumeicon/volumeicon.info
+++ b/audio/volumeicon/volumeicon.info
@@ -1,10 +1,10 @@
 PRGNAM="volumeicon"
-VERSION="0.4.3"
+VERSION="0.4.5"
 HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
-DOWNLOAD="http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.4.3.tar.gz"
-MD5SUM="6d90e13a385f8e77f5ca568fdfaaaa35"
+DOWNLOAD="http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.4.5.tar.gz"
+MD5SUM="4758428004366a04a9617bd083f007b7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Daniel Cash"
 EMAIL="dacashman@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="rworkman"