system/xfe: Updated for version 1.32.1

7 files changed, 42 insertions, 15 deletions

diff --git a/system/xfe/README b/system/xfe/README
index 6a84a5d7757e..eeb3c337364c 100644
--- a/system/xfe/README
+++ b/system/xfe/README
@@ -4,4 +4,4 @@ by Maxim Baranov.
 Xfe aims to be the file manager of choice for all light-thinking
 UNIX addicts!
 
-XFE requires the fox-toolkit library (which is also available here)
+XFE requires fox-toolkit.
diff --git a/system/xfe/doinst.sh b/system/xfe/doinst.sh
index cbc484f9f170..4e8ba7071dea 100644
--- a/system/xfe/doinst.sh
+++ b/system/xfe/doinst.sh
@@ -1,3 +1,4 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q 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/xfe/patch b/system/xfe/patch
new file mode 100644
index 000000000000..835f3873a6d8
--- /dev/null
+++ b/system/xfe/patch
@@ -0,0 +1,21 @@
+diff -pruN 1.32.1-2/src/xfeutils.cpp 1.32.1-2ubuntu1/src/xfeutils.cpp
+--- 1.32.1-2/src/xfeutils.cpp	2009-11-09 16:17:17.000000000 +0000
++++ 1.32.1-2ubuntu1/src/xfeutils.cpp	2010-01-26 21:33:35.000000000 +0000
+@@ -512,7 +512,7 @@ FXbool isUtf8(const FXchar* string, FXui
+ 
+ 
+ // Replacement of the stat function
+-inline FXint statrep(const FXchar* filename, struct stat* buf)
++FXint statrep(const FXchar* filename, struct stat* buf)
+ {
+ #if defined(linux)
+ 
+@@ -546,7 +546,7 @@ inline FXint statrep(const FXchar* filen
+ 
+ 
+ // Replacement of the lstat function
+-inline FXint lstatrep(const FXchar* filename, struct stat* buf)
++FXint lstatrep(const FXchar* filename, struct stat* buf)
+ {
+ #if defined(linux)
+ 
diff --git a/system/xfe/slack-desc b/system/xfe/slack-desc
index 4c3aa14a7e8a..c6d7b890ca2e 100644
--- a/system/xfe/slack-desc
+++ b/system/xfe/slack-desc
@@ -7,7 +7,7 @@
 
       |-----handy-ruler------------------------------------------------------|
 xfe: X File Explorer (xfe)
-xfe: 
+xfe:
 xfe: Xfe is a Microsoft Explorer-like file manager for X. It is based on
 xfe: the popular, but discontinued, X Win Commander, originally developed
 xfe: by Maxim Baranov.
diff --git a/system/xfe/xfe.SlackBuild b/system/xfe/xfe.SlackBuild
index 84a419b609d4..b2b95880864e 100644
--- a/system/xfe/xfe.SlackBuild
+++ b/system/xfe/xfe.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xfe
 
-# Copyright 2006-2008  Robby Workman, Northport, Alabama, USA
+# Copyright 2006-2010  Robby Workman, Northport, Alabama, USA
 # 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=xfe
-VERSION=1.19.2
+VERSION=1.32.1
 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"
+  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,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-debug \
@@ -74,7 +78,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 mkdir -p $PKG/usr/share/applications
-install -m 0644 $CWD/xfe.desktop $PKG/usr/share/applications/xfe.desktop
+cat $CWD/xfe.desktop > $PKG/usr/share/applications/xfe.desktop
 
 ( cd $PKG/usr/man || exit 1
   find . -type f -exec gzip -9 {} \;
@@ -82,8 +86,9 @@ install -m 0644 $CWD/xfe.desktop $PKG/usr/share/applications/xfe.desktop
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO  \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS 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
@@ -91,4 +96,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/system/xfe/xfe.desktop b/system/xfe/xfe.desktop
index 5ed95c0cd263..abed65a4ccf4 100644
--- a/system/xfe/xfe.desktop
+++ b/system/xfe/xfe.desktop
@@ -1,10 +1,8 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Terminal=false
 Icon=xfe
 Type=Application
-InitialPreference=2
 Categories=System;
 Exec=xfe
 TryExec=xfe
diff --git a/system/xfe/xfe.info b/system/xfe/xfe.info
index f402869d28c0..e9cdd6b088df 100644
--- a/system/xfe/xfe.info
+++ b/system/xfe/xfe.info
@@ -1,8 +1,10 @@
 PRGNAM="xfe"
-VERSION="1.19.2"
+VERSION="1.32.1"
 HOMEPAGE="http://roland65.free.fr/xfe/"
-DOWNLOAD="http://downloads.sourceforge.net/xfe/xfe-1.19.2.tar.gz"
-MD5SUM="64e976fbd8ee3faceddd9c73efdc5dee"
+DOWNLOAD="http://downloads.sourceforge.net/xfe/xfe-1.32.1.tar.gz"
+MD5SUM="7ccbc35fc92cf72d2e405d32bfd741bc"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
 APPROVED="michiel"