summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/krusader/doinst.sh4
-rw-r--r--system/krusader/krusader.SlackBuild41
-rw-r--r--system/krusader/krusader.info8
-rw-r--r--system/krusader/slack-desc10
4 files changed, 30 insertions, 33 deletions
diff --git a/system/krusader/doinst.sh b/system/krusader/doinst.sh
index 3412314ed0..220e1b6593 100644
--- a/system/krusader/doinst.sh
+++ b/system/krusader/doinst.sh
@@ -1,5 +1,5 @@
-if [ -x usr/bin/update-desktop-database ]; then
- ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q ./usr/share/applications >/dev/null 2>&1
fi
diff --git a/system/krusader/krusader.SlackBuild b/system/krusader/krusader.SlackBuild
index e4093763a5..d46cf2439d 100644
--- a/system/krusader/krusader.SlackBuild
+++ b/system/krusader/krusader.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for krusader
-# Copyright 2006-2007 Robby Workman (http://rlworkman.net)
+# Copyright 2006-2008 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified by Michiel van Wessem for version 1.80.0
-# No additional license terms added
-
PRGNAM=krusader
-VERSION=1.80.0
+VERSION=1.90.0
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -37,8 +35,10 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i686" ]; then
+ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
# Avoid a version number in .la files:
@@ -46,12 +46,14 @@ if [ -d /usr/lib/qt ]; then
QTDIR=/usr/lib/qt
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R a-s,u+w,go+r-w .
@@ -59,29 +61,24 @@ CFLAGS=$SLKCFLAGS \
CXXFLAGS=$SLKCFLAGS \
./configure \
--prefix=/usr \
+ --sysconfdir=/etc/kde \
--program-prefix="" \
--program-suffix="" \
- || exit 1
+ --build=$ARCH-slackware-linux
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING CVSNEWS ChangeLog FAQ INSTALL README TODO krusader.lsm \
doc/actions_tutorial.txt $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG
- find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
- find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-if [ -d $PKG/usr/share/man ]; then
- gzip -9 $PKG/usr/share/man/man?/*
- mv $PKG/usr/share/man $PKG/usr
-elif [ -d $PKG/usr/man ]; then
- gzip -9 $PKG/usr/man/man?/*
-fi
+mv $PKG/usr/share/man $PKG/usr
+gzip -9 $PKG/usr/man/man?/*
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/krusader/krusader.info b/system/krusader/krusader.info
index 3ba4771f67..0e25017b45 100644
--- a/system/krusader/krusader.info
+++ b/system/krusader/krusader.info
@@ -1,8 +1,8 @@
PRGNAM="krusader"
-VERSION="1.80.0"
+VERSION="1.90.0"
HOMEPAGE="http://krusader.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/krusader/krusader-1.80.0.tar.gz"
-MD5SUM="32bfaf4de7ca62e0f612357f4aa065a9"
+DOWNLOAD="http://downloads.sourceforge.net/krusader/krusader-1.90.0.tar.gz"
+MD5SUM="0bcf8f4d03484dae0390ffafa953ac40"
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
-APPROVED="BP{k},rworkman"
+APPROVED="Erik Hanson"
diff --git a/system/krusader/slack-desc b/system/krusader/slack-desc
index 115292f53a..bea97a5b9a 100644
--- a/system/krusader/slack-desc
+++ b/system/krusader/slack-desc
@@ -5,13 +5,13 @@
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
- |-----handy-ruler------------------------------------------------------|
+ |-----handy-ruler----------------------------------------------------|
krusader: krusader (Krusader File Manager)
krusader:
-krusader: krusader is an advanced twin panel (commander style) file manager for
-krusader: KDE and other desktops in the *nix world, similar to Midnight or Total
-krusader: Commander. It provides all the file management features you could
-krusader: possibly want.
+krusader: krusader is an advanced twin panel (commander style) file manager
+krusader: for KDE and other desktops in the *nix world, similar to Midnight
+krusader: or Total Commander. It provides all the file management features
+krusader: you could possibly want.
krusader:
krusader: Homepage: http://krusader.sourceforge.net/
krusader: