summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/xfce4-taskmanager/doinst.sh3
-rw-r--r--desktop/xfce4-taskmanager/xfce4-taskmanager.SlackBuild20
-rw-r--r--desktop/xfce4-taskmanager/xfce4-taskmanager.info2
3 files changed, 17 insertions, 8 deletions
diff --git a/desktop/xfce4-taskmanager/doinst.sh b/desktop/xfce4-taskmanager/doinst.sh
index b310837870..4e8ba7071d 100644
--- a/desktop/xfce4-taskmanager/doinst.sh
+++ b/desktop/xfce4-taskmanager/doinst.sh
@@ -1,5 +1,4 @@
-
if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
diff --git a/desktop/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/desktop/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
index e8d1b246e7..f429483eb6 100644
--- a/desktop/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
+++ b/desktop/xfce4-taskmanager/xfce4-taskmanager.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xfce4-taskmanager
-# Copyright 2006-2008 Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2009 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -35,10 +35,13 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ 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
@@ -60,6 +63,8 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc/xfce \
--enable-shared=yes \
--enable-static=no \
--enable-debug=no \
@@ -69,13 +74,16 @@ make
make install DESTDIR=$PKG
( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null || true
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+ xargs strip --strip-unneeded 2> /dev/null
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
@@ -83,4 +91,4 @@ 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}
diff --git a/desktop/xfce4-taskmanager/xfce4-taskmanager.info b/desktop/xfce4-taskmanager/xfce4-taskmanager.info
index 371b5f2f12..3717642e6e 100644
--- a/desktop/xfce4-taskmanager/xfce4-taskmanager.info
+++ b/desktop/xfce4-taskmanager/xfce4-taskmanager.info
@@ -2,7 +2,9 @@ PRGNAM="xfce4-taskmanager"
VERSION="0.4.1"
HOMEPAGE="http://goodies.xfce.org/"
DOWNLOAD="http://goodies.xfce.org/releases/xfce4-taskmanager/xfce4-taskmanager-0.4.1.tar.bz2"
+DOWNLOAD_x86_64=""
MD5SUM="4ed599faf6b734b2d2e7be16adf0b2d9"
+MD5SUM_x86_64=""
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
APPROVED="dsomero"