multimedia/streamtuner: Updated for version 0.99.99

4 files changed, 17 insertions, 20 deletions

diff --git a/multimedia/streamtuner/README b/multimedia/streamtuner/README
index 9b7e995d8101..91909b6eee9a 100644
--- a/multimedia/streamtuner/README
+++ b/multimedia/streamtuner/README
@@ -1,4 +1,3 @@
 streamtuner is a stream directory browser. Through the use of
 a plugin system, it offers an intuitive GTK+ 2.0 interface to
 Internet radio directories such as SHOUTcast and Live365.
-
diff --git a/multimedia/streamtuner/slack-desc b/multimedia/streamtuner/slack-desc
index f309738e405b..029aad7afdfb 100644
--- a/multimedia/streamtuner/slack-desc
+++ b/multimedia/streamtuner/slack-desc
@@ -1,3 +1,11 @@
+# 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------------------------------------------------------|
 streamtuner: streamtuner (Stream Directory Browser)
 streamtuner:
 streamtuner: streamtuner is a stream directory browser. Through the use of
diff --git a/multimedia/streamtuner/streamtuner.SlackBuild b/multimedia/streamtuner/streamtuner.SlackBuild
index 02217217539e..58b99b4fc15f 100644
--- a/multimedia/streamtuner/streamtuner.SlackBuild
+++ b/multimedia/streamtuner/streamtuner.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for streamtuner
 
-# Copyright 2007  MagicMan <MagicMan07@bluebottle.com>
+# Copyright 2007  Frank Caraballo <fecaraballo[AT]gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,17 +24,12 @@
 
 # Modified by the SlackBuilds.org project
 
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit 1
-fi
-
 PRGNAM=streamtuner
 VERSION=0.99.99
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -53,13 +48,12 @@ cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
 tar -xvf $CWD/$PRGNAM-$VERSION.tar.* || exit 1
 cd $PRGNAM-$VERSION || exit 1
-
-# Apply streamtuner-0.99.99-live365.diff patch:
-cat $CWD/$PRGNAM-$VERSION-live365.diff | patch -p0 --verbose || exit 1
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+# Apply streamtuner-0.99.99-live365.diff patch:
+patch -p0 < $CWD/$PRGNAM-$VERSION-live365.diff || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -77,16 +71,12 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Create link to html docs:
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION
-  ln -s ../../share/gtk-doc/html/$PRGNAM html
+  ln -s /usr/share/gtk-doc/html/$PRGNAM html
 )
 
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-# Fix path to icon in desktop file:
-sed -i 's#^Icon=\(.\+\)$#Icon=/usr/share/pixmaps/\1#' \
-  $PKG/usr/share/applications/$PRGNAM.desktop || exit 1
-
 cd $PKG
 /sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/multimedia/streamtuner/streamtuner.info b/multimedia/streamtuner/streamtuner.info
index bc8b3cc7aade..d6551d740c93 100644
--- a/multimedia/streamtuner/streamtuner.info
+++ b/multimedia/streamtuner/streamtuner.info
@@ -3,6 +3,6 @@ VERSION="0.99.99"
 HOMEPAGE="http://www.nongnu.org/streamtuner/"
 DOWNLOAD="http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99.tar.gz"
 MD5SUM="2027b7c34e85b594524b0b4351c14362"
-MAINTAINER="MagicMan"
-EMAIL="MagicMan07@bluebottle.com"
-APPROVED="robw810"
+MAINTAINER="Frank Caraballo"
+EMAIL="fecaraballo[AT]gmail.com"
+APPROVED="rworkman"