4 files changed, 41 insertions, 10 deletions
diff --git a/system/d-feet/README b/system/d-feet/README
index d91d5122e99e5..53cfec895fdf8 100644
--- a/system/d-feet/README
+++ b/system/d-feet/README
@@ -1 +1,5 @@
-D-Feet is a D-Bus debugger written in PyGtk by John (J5) Palmieri.
+D-Feet is a D-Bus debugger originally written in PyGtk
+by John (J5) Palmieri and now rewritten basing on
+gobject-introspection and gdbus by Thomas Bechtold.
+
+pep8 is an optional dependency to enable build-time tests.
diff --git a/system/d-feet/d-feet.SlackBuild b/system/d-feet/d-feet.SlackBuild
index 571de4bd05324..24f64824982aa 100644
--- a/system/d-feet/d-feet.SlackBuild
+++ b/system/d-feet/d-feet.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=d-feet
-VERSION=0.1.12
+VERSION=${VERSION:-0.3.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,13 +40,29 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+tests="--disable-tests" ; [ $(which pep8) ] && tests=""
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -55,14 +71,25 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
+
+make
+make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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 \
-  AUTHORS COPYING PKG-INFO README \
+  AUTHORS COPYING NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/d-feet/d-feet.info b/system/d-feet/d-feet.info
index ef76f0bd43e43..a725f96cf230e 100644
--- a/system/d-feet/d-feet.info
+++ b/system/d-feet/d-feet.info
@@ -1,8 +1,8 @@
 PRGNAM="d-feet"
-VERSION="0.1.12"
+VERSION="0.3.10"
 HOMEPAGE="http://live.gnome.org/DFeet/"
-DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/d-feet/0.1/d-feet-0.1.12.tar.bz2"
-MD5SUM="01b0296277b26330bc430742ad4e758a"
+DOWNLOAD="http://download.gnome.org/sources/d-feet/0.3/d-feet-0.3.10.tar.xz"
+MD5SUM="a1ad05205cc68650c2770eeeb7c81953"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/d-feet/slack-desc b/system/d-feet/slack-desc
index 0f08cf96a3b14..e120c2eedf1c6 100644
--- a/system/d-feet/slack-desc
+++ b/system/d-feet/slack-desc
@@ -8,7 +8,7 @@
       |-----handy-ruler------------------------------------------------------|
 d-feet: D-Feet (D-Bus Debugger)
 d-feet:
-d-feet: D-Feet is a D-Bus debugger written in PyGtk.
+d-feet: D-Feet is a D-Bus debugger.
 d-feet:
 d-feet: Current features include:
 d-feet: - View names on any bus