summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2010-05-11 19:45:45 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-11 19:45:45 +0200
commit61d98bf983e0297b3bbaefc5e5dd1849e7b84394 (patch)
treeda0d98a86619ad372fdcba124db03d903e6d0315
parent34a25ea70f92d32b4a331c7198fea2c65943a86f (diff)
downloadslackbuilds-61d98bf983e0297b3bbaefc5e5dd1849e7b84394.tar.gz
multimedia/xmms2: Updated for version 0.2DrJekyll
-rw-r--r--multimedia/xmms2/README5
-rw-r--r--multimedia/xmms2/slack-desc10
-rw-r--r--multimedia/xmms2/xmms2.SlackBuild44
-rw-r--r--multimedia/xmms2/xmms2.info6
4 files changed, 36 insertions, 29 deletions
diff --git a/multimedia/xmms2/README b/multimedia/xmms2/README
index c5d42b0072..b9ef79a682 100644
--- a/multimedia/xmms2/README
+++ b/multimedia/xmms2/README
@@ -5,6 +5,5 @@ maintain and integrate with. In terms of the listening experience, XMMS2
makes it possible for anyone to easily manage their music collection and to
interact with it in a flexible manner.
-To compile this package, you will need SQLite and SCons, both of which
-are also available from SlackBuilds.org
-
+To compile this package, you will need SQLite, which is also available
+from SlackBuilds.org.
diff --git a/multimedia/xmms2/slack-desc b/multimedia/xmms2/slack-desc
index 50b6876ed8..923c627d5a 100644
--- a/multimedia/xmms2/slack-desc
+++ b/multimedia/xmms2/slack-desc
@@ -1,4 +1,12 @@
-xmms2: XMMS2
+# 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------------------------------------------------------|
+xmms2: XMMS2 (XMMS2 music player)
xmms2:
xmms2: XMMS2 is the next generation of XMMS. The XMMS2 team is committed
xmms2: to producing a better music player, while diligently maintaining a
diff --git a/multimedia/xmms2/xmms2.SlackBuild b/multimedia/xmms2/xmms2.SlackBuild
index 79e085ff7e..7cf8dbf332 100644
--- a/multimedia/xmms2/xmms2.SlackBuild
+++ b/multimedia/xmms2/xmms2.SlackBuild
@@ -3,15 +3,16 @@
# Slackware build script for xmms2
# Written by Kyle Guinn <elyk03@gmail.com>
-# Modified by the SlackBuilds.org project
+# Updated by Rainer Wittmaack <ningo@gmx.net>
-VERSION="0.2DrHouse"
+PRGNAM=xmms2
+VERSION="0.2DrJekyll"
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-xmms2
+PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
@@ -20,23 +21,23 @@ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-rm -rf xmms2-$VERSION
-tar -xjvf $CWD/xmms2-$VERSION.tar.bz2 || exit 1
-cd xmms2-$VERSION || exit 1
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-scons \
- PREFIX=/usr \
- CCFLAGS="$SLKCFLAGS" \
- CXXFLAGS="$SLKCFLAGS" \
- || exit 1
-scons \
- INSTALLDIR=$PKG \
- install || exit 1
+export CCFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+
+./waf configure --prefix=/usr
+./waf
+./waf install --destdir=$PKG
( cd $PKG
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -44,16 +45,15 @@ scons \
)
# The man pages are pre-gzipped, we don't have to do that here.
+# However, we do need to move them to the proper location.
+mv $PKG/usr/share/man $PKG/usr
-mkdir -p $PKG/usr/doc/xmms2-$VERSION
-cp -a AUTHORS COPYING* INSTALL README TODO $PKG/usr/doc/xmms2-$VERSION
-cat $CWD/xmms2.SlackBuild > $PKG/usr/doc/xmms2-$VERSION/xmms2.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
-# Permissions fix: This file is executable when it shouldn't be.
-chmod -x $PKG/usr/include/xmms2/xmmsclient/xmmsclient++/dict.h
-
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/xmms2-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/multimedia/xmms2/xmms2.info b/multimedia/xmms2/xmms2.info
index af6a544ec5..f28287cd6b 100644
--- a/multimedia/xmms2/xmms2.info
+++ b/multimedia/xmms2/xmms2.info
@@ -1,8 +1,8 @@
PRGNAM="xmms2"
-VERSION="0.2DrHouse"
+VERSION="0.2DrJekyll"
HOMEPAGE="http://wiki.xmms2.xmms.se/"
-DOWNLOAD="http://prdownloads.sourceforge.net/xmms2/xmms2-0.2DrHouse.tar.bz2"
-MD5SUM="8f7293b21bd6cb28e7705559a9deab10"
+DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.2DrJekyll.tar.bz2"
+MD5SUM="768de76a98b6a9766cec157ff0a12543"
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"
APPROVED="rworkman"