summaryrefslogtreecommitdiffstats
path: root/audio/herrie
diff options
context:
space:
mode:
Diffstat (limited to 'audio/herrie')
-rw-r--r--audio/herrie/README16
-rw-r--r--audio/herrie/herrie.SlackBuild22
-rw-r--r--audio/herrie/herrie.info2
3 files changed, 25 insertions, 15 deletions
diff --git a/audio/herrie/README b/audio/herrie/README
index 91533cccdf..9686e0b8ba 100644
--- a/audio/herrie/README
+++ b/audio/herrie/README
@@ -4,17 +4,17 @@ including playlists.
Herrie has a split-screen user interface, with a playlist at the top
of the screen and a file browser at the bottom. Herrie supports XMMS
-shortcuts for playback control and can play in XMMS mode or "party" mode
-(which acts as a song queue). Herrie also has some more exotic features,
-including support for AudioScrobbler and the ability to chroot() itself
-into a directory.
+shortcuts for playback control and can play in XMMS mode or "party"
+mode (which acts as a song queue). Herrie also has some more exotic
+features, including support for AudioScrobbler and the ability to
+chroot() itself into a directory.
The default options for this Slackbuild are set for no scrobbler,
modplugin, wave, or XSPF support. ALSA is the chosen sound output. This
-makes it so the program can be built with the least amount of dependencies
-(with these options all of them should be included in Slackware 12.1).
-See the README in the herrie source for the dependencies needed if you
-enable other options.
+makes it so the program can be built with the least amount of
+dependencies (with these options all of them should be included
+in Slackware 12.1). See the README in the herrie source for the
+dependencies needed if you enable other options.
This SlackBuild also includes some experimental patches to add
functionality to herrie. These include adding more signals and remote
diff --git a/audio/herrie/herrie.SlackBuild b/audio/herrie/herrie.SlackBuild
index 5eb8856611..da88030a95 100644
--- a/audio/herrie/herrie.SlackBuild
+++ b/audio/herrie/herrie.SlackBuild
@@ -1,22 +1,32 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for herrie
# Written by Phillip Warner <pc_warner@yahoo.com>
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=herrie
VERSION=${VERSION:-2.2}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -35,8 +45,8 @@ SIGNALS=${SIGNALS:-NO}
FILTER=${FILTER:-NO}
########################
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -136,4 +146,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/herrie/herrie.info b/audio/herrie/herrie.info
index 9c8e6c110e..2e8985302d 100644
--- a/audio/herrie/herrie.info
+++ b/audio/herrie/herrie.info
@@ -1,7 +1,7 @@
PRGNAM="herrie"
VERSION="2.2"
HOMEPAGE="http://herrie.info/"
-DOWNLOAD="http://herrie.info/distfiles/herrie-2.2.tar.bz2"
+DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/8/8/88832b10298ab89473730eb0c93b6ddf/herrie-2.2.tar.bz2"
MD5SUM="88832b10298ab89473730eb0c93b6ddf"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""