aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/xmms2/xmms2.SlackBuild24
-rw-r--r--audio/xmms2/xmms2.info8
2 files changed, 13 insertions, 19 deletions
diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild
index 3dc928e7b54a7..ceef2441b98a7 100644
--- a/audio/xmms2/xmms2.SlackBuild
+++ b/audio/xmms2/xmms2.SlackBuild
@@ -7,7 +7,7 @@
# Updated by Andrew Brouwers, abrouwers at gmail d0t com (13.0, 64-bit)
PRGNAM=xmms2
-VERSION="0.6DrMattDestruction"
+VERSION="0.7DrNo"
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -36,26 +36,18 @@ 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 .
-# Sorry waf, you have no right outside of $TMP
-# NOTE: this is fixed in master with a configure option (--without-ldconfig)
-sed -i 's#/sbin/ldconfig#/bin/true#' wscript
-
-# Don't be fooled by --with-libdir (fixed upstream, too)
-patch -Np1 -i $CWD/0.6_fix_libdir.diff
-
-# Fix compile for ruby 1.9
-# patch -Np1 -i $CWD/xmms2-ruby-1.9.patch
-
export CCFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
./waf --prefix=/usr \
- --with-libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--with-pkgconfigdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \
- --with-mandir=/usr/man \
+ --mandir=/usr/man \
+ --without-ldconfig \
-p configure
./waf build
@@ -69,8 +61,10 @@ export CXXFLAGS="$SLKCFLAGS"
)
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
+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
diff --git a/audio/xmms2/xmms2.info b/audio/xmms2/xmms2.info
index 11e3247fb941c..dc9a7e3840d1a 100644
--- a/audio/xmms2/xmms2.info
+++ b/audio/xmms2/xmms2.info
@@ -1,10 +1,10 @@
PRGNAM="xmms2"
-VERSION="0.6DrMattDestruction"
+VERSION="0.7DrNo"
HOMEPAGE="http://wiki.xmms2.xmms.se/"
-DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.6DrMattDestruction.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.7DrNo.tar.bz2"
DOWNLOAD_x86_64=""
-MD5SUM="954fb9c76b5db5e324a105e81b273200"
+MD5SUM="60e50b591078acb6a85cd83de0f2b077"
MD5SUM_x86_64=""
MAINTAINER="Andrew Brouwers"
EMAIL="abrouwers@gmail.com"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"