3 files changed, 16 insertions, 15 deletions
diff --git a/system/oss/oss.SlackBuild b/system/oss/oss.SlackBuild
index e1d3d1f673..ad73ca7658 100644
--- a/system/oss/oss.SlackBuild
+++ b/system/oss/oss.SlackBuild
@@ -5,13 +5,14 @@
 # Written by Dugan Chen (dugan [underscore] c [at] fastmail [dot] fm).
 
 PRGNAM=oss
-VERSION=${VERSION:-4.2}
-SUBVERSION=${SUBVERSION:-2003}
+VERSION=${VERSION:-4.2.2004}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=v${VERSION}-build${SUBVERSION}-src-gpl
-PKGVERSION=${VERSION}.${SUBVERSION}
+MAJOR=$(printf $VERSION | cut -d. -f-2)
+MINOR=$(printf $VERSION | cut -d. -f3)
+
+SRCVERSION=v${MAJOR}-build${MINOR}-src-gpl
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,20 +78,20 @@ mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.oss > $PKG/etc/rc.d/rc.oss.new
 
 mkdir -p $PKG/etc/xdg/autostart
-cat $CWD/ossxmix.desktop > $PKG/etc/xdg/autostart/ossxmix.desktop.new
+cat $CWD/ossxmix.desktop > $PKG/etc/xdg/autostart/ossxmix.desktop
 
 # Fix location of manual pages
 mv $PKG/usr/share/man $PKG/usr
 rm -rf $PKG/usr/share
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION
-cp -a COPYING Changelog RELNOTES.txt $PKG/usr/doc/$PRGNAM-$PKGVERSION
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$PKGVERSION/README.SLACKWARE
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING Changelog RELNOTES.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/oss/oss.info b/system/oss/oss.info
index ec45ded930..e03997f940 100644
--- a/system/oss/oss.info
+++ b/system/oss/oss.info
@@ -1,10 +1,10 @@
 PRGNAM="oss"
-VERSION="4.2.2003"
+VERSION="4.2.2004"
 HOMEPAGE="http://www.opensound.com"
-DOWNLOAD="http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2003-src-gpl.tar.bz2"
-MD5SUM="d5bcdc505f5ad140791b8d0051fda74d"
+DOWNLOAD="http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2004-src-gpl.tar.bz2"
+MD5SUM="256aba264d523fb8ee444aaacfb8d3da"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Dugan Chen"
 EMAIL="dugan [underscore] c [at] fastmail [dot] fm"
-APPROVED="Erik Hanson"
+APPROVED="rworkman"
diff --git a/system/oss/slack-desc b/system/oss/slack-desc
index be80183e3d..364013377f 100644
--- a/system/oss/slack-desc
+++ b/system/oss/slack-desc
@@ -15,5 +15,5 @@ oss: any sound controller hardware, even though the hardware interface
 oss: varies greatly from one type to another. OSS is free software,
 oss: distributed (here) under the GPL license.
 oss:
-oss: Learn more at:  http://www.opensound.com/
+oss: Learn more at: http://www.opensound.com/
 oss: