summaryrefslogtreecommitdiff
path: root/audio/mpd/mpd.SlackBuild
diff options
context:
space:
mode:
authorAndrew Brouwers <abrouwers@gmail.com>2010-05-13 00:21:45 +0200
committerErik Hanson <erik@slackbuilds.org>2010-05-13 00:21:45 +0200
commit76c59e72ae2848065908818f52cfb6b192dc2adf (patch)
tree3f750886108a0526da77aca622e0c8c64e480de5 /audio/mpd/mpd.SlackBuild
parentf83b05207eec77737df63f47f24023adb8a999b0 (diff)
downloadslackbuilds-76c59e72ae2848065908818f52cfb6b192dc2adf.tar.gz
audio/mpd: Updated for version 0.15.8
Diffstat (limited to 'audio/mpd/mpd.SlackBuild')
-rw-r--r--audio/mpd/mpd.SlackBuild18
1 files changed, 12 insertions, 6 deletions
diff --git a/audio/mpd/mpd.SlackBuild b/audio/mpd/mpd.SlackBuild
index ce89100dcd..46c7fb0f97 100644
--- a/audio/mpd/mpd.SlackBuild
+++ b/audio/mpd/mpd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for mpd
-# Copyright 2008 Andrew Brouwers <abrouwers@gmail.com>
+# Copyright 2008, 2009 Andrew Brouwers <abrouwers@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=mpd
-VERSION=0.14.2
+VERSION=0.15.8
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG=_SBo}
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
set -e
@@ -56,6 +59,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--build=$ARCH-slackware-linux
@@ -64,7 +68,7 @@ make
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# Use sample config, without overwriting
install -D -m 644 doc/mpdconf.example $PKG/etc/mpd.conf.new
@@ -74,9 +78,11 @@ install -D -m 644 doc/mpdconf.example $PKG/etc/mpd.conf.new
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
)
+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-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}