3 files changed, 33 insertions, 24 deletions
diff --git a/system/krusader/krusader.SlackBuild b/system/krusader/krusader.SlackBuild
index f18c43bef24da..e4093763a5658 100644
--- a/system/krusader/krusader.SlackBuild
+++ b/system/krusader/krusader.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for krusader
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net)
+# Copyright 2006-2007  Robby Workman  (http://rlworkman.net)
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
+# Modified by Michiel van Wessem for version 1.80.0
+# No additional license terms added
 
 PRGNAM=krusader
-VERSION=1.70.1
+VERSION=1.80.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -46,7 +47,7 @@ if [ -d /usr/lib/qt ]; then
 fi
 
 rm -rf $PKG
-mkdir -p $TMP $PKG/opt/kde $OUTPUT
+mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
 tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
@@ -57,7 +58,7 @@ chmod -R a-s,u+w,go+r-w .
 CFLAGS=$SLKCFLAGS \
 CXXFLAGS=$SLKCFLAGS \
 ./configure \
-  --prefix=/opt/kde \
+  --prefix=/usr \
   --program-prefix="" \
   --program-suffix="" \
   || exit 1
@@ -66,27 +67,25 @@ make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog FAQ INSTALL README TODO krusader.lsm doc/actions_tutorial.txt \
-  $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
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-mv $PKG/opt/kde/share/applnk/krusader.desktop $PKG/usr/share/applications
-cp -a $PKG/opt/kde/share/icons/crystalsvg/48x48/apps/krusader_user.png \
-  $PKG/usr/share/pixmaps
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
-
 ( 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
 )
 
-if [ -d $PKG/opt/kde/man ]; then
-  gzip -9 $PKG/opt/kde/man/man?/*
+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
 
+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
diff --git a/system/krusader/krusader.info b/system/krusader/krusader.info
index cb9562d21b46f..3ba4771f67a1e 100644
--- a/system/krusader/krusader.info
+++ b/system/krusader/krusader.info
@@ -1,8 +1,8 @@
 PRGNAM="krusader"
-VERSION="1.70.1"
+VERSION="1.80.0"
 HOMEPAGE="http://krusader.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/krusader/krusader-1.70.1.tar.gz"
-MD5SUM="d8b33c94385fe055d55f592f0dc15c36"
+DOWNLOAD="http://downloads.sourceforge.net/krusader/krusader-1.80.0.tar.gz"
+MD5SUM="32bfaf4de7ca62e0f612357f4aa065a9"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="BP{k}"
+APPROVED="BP{k},rworkman"
diff --git a/system/krusader/slack-desc b/system/krusader/slack-desc
index c3ebbe6d53f71..115292f53a16e 100644
--- a/system/krusader/slack-desc
+++ b/system/krusader/slack-desc
@@ -1,4 +1,12 @@
-krusader: Krusader File Manager 
+# 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------------------------------------------------------|
+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
@@ -7,3 +15,5 @@ krusader: possibly want.
 krusader:  
 krusader: Homepage: http://krusader.sourceforge.net/ 
 krusader:  
+krusader:  
+krusader: