5 files changed, 39 insertions, 28 deletions
diff --git a/system/qtfm/README b/system/qtfm/README
index 6f56f1322c..24cbd05f25 100644
--- a/system/qtfm/README
+++ b/system/qtfm/README
@@ -1,3 +1,2 @@
-qtFM is a small, lightweight file manager for Linux desktops based on
-pure Qt and works great with minimal desktop environments like Openbox.
-qtFm doesn't require KDE.
+QtFM is a small, lightweight file manager for Linux/BSD based on
+pure Qt and works great with minimal desktop environments like Fluxbox/Openbox.
diff --git a/system/qtfm/doinst.sh b/system/qtfm/doinst.sh
index 5fb28930db..aea0f894eb 100644
--- a/system/qtfm/doinst.sh
+++ b/system/qtfm/doinst.sh
@@ -1,3 +1,13 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild
index 59cb3c3203..a3e1a94248 100644
--- a/system/qtfm/qtfm.SlackBuild
+++ b/system/qtfm/qtfm.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for qtFM
+# Slackware build script for QtFM
 
 # Copyright 2011, 2012, Bojan Popovic, Belgrade, Serbia <bocke@slackware-srbija.org>
 # All rights reserved.
@@ -22,14 +22,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by Ole-André Rodlie, <ole.andre.rodlie@gmail.com>
+
 PRGNAM=qtfm
-VERSION=${VERSION:-5.5}
+VERSION=${VERSION:-6.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -69,25 +71,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Set doc path to /usr/doc/$PRGNAM-$VERSION in qtfm.pro
-sed -i "s,usr/share/doc/$PRGNAM,usr/doc/$PRGNAM-$VERSION," qtfm.pro
-
-# Commented out by rworkman -- why is this a good idea?
-# Set share path to /usr/share/$PRGNAM-$VERSION in qtfm.pro and main.cpp
-# sed -i "s,usr/share/$PRGNAM,usr/share/$PRGNAM-$VERSION," qtfm.pro src/main.cpp
-
 qmake \
+  PREFIX=/usr \
+  DOCDIR=/usr/doc \
+  MANDIR=/usr/man \
+  CONFIG+=release \
   QMAKE_CFLAGS="$SLKCFLAGS" \
-  QMAKE_CXXFLAGS="$SLKCFLAGS" \
-  $PRGNAM.pro
+  QMAKE_CXXFLAGS="$SLKCFLAGS"
 make
 make install INSTALL_ROOT=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+if [ ! -d "$PKG/usr/doc/$PRGNAM-$VERSION" ]; then
+  mkdir -p "$PKG/usr/doc/$PRGNAM-$VERSION"
+fi
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/qtfm/qtfm.info b/system/qtfm/qtfm.info
index f47835683e..964ce30a10 100644
--- a/system/qtfm/qtfm.info
+++ b/system/qtfm/qtfm.info
@@ -1,10 +1,10 @@
 PRGNAM="qtfm"
-VERSION="5.5"
-HOMEPAGE="http://www.qtfm.org/"
-DOWNLOAD="http://www.qtfm.org/qtfm-5.5.tar.gz"
-MD5SUM="cc1d930503bf0dedc824d6f2abdda719"
+VERSION="6.1.0"
+HOMEPAGE="https://qtfm.eu"
+DOWNLOAD="https://github.com/rodlie/qtfm/archive/6.1.0/qtfm-6.1.0.tar.gz"
+MD5SUM="79cabf71f2647ccf90cd37f6114e837d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Bojan Popovic"
-EMAIL="bocke@mycity.rs"
+MAINTAINER="Ole-André Rodlie"
+EMAIL="ole.andre.rodlie@gmail.com"
diff --git a/system/qtfm/slack-desc b/system/qtfm/slack-desc
index 515a47e831..ddfc5d6061 100644
--- a/system/qtfm/slack-desc
+++ b/system/qtfm/slack-desc
@@ -8,11 +8,11 @@
     |-----handy-ruler------------------------------------------------------|
 qtfm: qtfm (a lightweight Qt-based file manager)
 qtfm:
-qtfm: qtFM is a small, lightweight file manager for Linux desktops based on
+qtfm: QtFM is a small, lightweight file manager for Linux/BSD based on
 qtfm: pure Qt and works great with minimal desktop environments like
-qtfm: Openbox.  qtFm doesn't require KDE.
+qtfm: Fluxbox/Openbox.
 qtfm:
-qtfm: Homepage: http://www.qtfm.org/
+qtfm: Homepage: https://qtfm.eu
 qtfm:
 qtfm:
 qtfm: