From 0a1bdd159abd240e46d7d943b3706d046a89bec1 Mon Sep 17 00:00:00 2001
From: Dugan Chen <dugan [underscore] c [at] fastmail [dot] fm>
Date: Sun, 23 Jan 2011 22:39:12 -0600
Subject: system/oss: Updated for version 4.2.2004.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/oss/oss.SlackBuild | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'system/oss/oss.SlackBuild')

diff --git a/system/oss/oss.SlackBuild b/system/oss/oss.SlackBuild
index e1d3d1f67376e..ad73ca7658f2f 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}
-- 
cgit v1.2.3