3 files changed, 29 insertions, 14 deletions
diff --git a/games/xmoto/gcc-4.7.patch b/games/xmoto/gcc-4.7.patch
new file mode 100644
index 0000000000..59a6d8d974
--- /dev/null
+++ b/games/xmoto/gcc-4.7.patch
@@ -0,0 +1,10 @@
+--- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
++++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
+@@ -24,6 +24,7 @@
+ #include "Log.h"
+ #include "VExcept.h"
+ #include <sstream>
++#include <unistd.h>
+
+ std::vector<std::string>* System::getDisplayModes(int windowed) {
+     std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild
index fa923d80c5..9ab68e4103 100644
--- a/games/xmoto/xmoto.SlackBuild
+++ b/games/xmoto/xmoto.SlackBuild
@@ -4,7 +4,7 @@
 # Maintained by Alex Word <alex_word86@yahoo.com>
 
 PRGNAM=xmoto
-VERSION=0.5.8
+VERSION=${VERSION:-0.5.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -45,11 +45,14 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+patch -p1 < $CWD/gcc-4.7.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LIBS="-ldl" \
+LDFLAGS="-ldl" \
 ./configure \
   --prefix=/usr \
+  --bindir=/usr/games \
   --localstatedir=/var \
   --mandir=/usr/man \
   --localedir=/usr/share/locale \
@@ -57,11 +60,7 @@ LIBS="-ldl" \
   --with-localesdir=/usr/share/locale \
   --disable-dependency-tracking \
   --enable-threads=posix \
-  --with-internal-bz2=0 \
   --with-internal-xdg=1 \
-  --with-renderer-sdlGfx=0 \
-  --with-renderer-openGl=1 \
-  --with-x \
   --with-asian-ttf-file="/usr/share/fonts/TTF/wqy-zenhei.ttc" \
   --build=$ARCH-slackware-linux
 
@@ -72,14 +71,20 @@ find $PKG | xargs 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/share/{pixmaps,applications}
-install -m 0644 extra/$PRGNAM.xpm $PKG/usr/share/pixmaps/
-install -m 0644 extra/$PRGNAM.desktop $PKG/usr/share/applications/
+install -m 0644 extra/$PRGNAM.xpm $PKG/usr/share/pixmaps
+install -m 0644 extra/$PRGNAM.desktop $PKG/usr/share/applications
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-gzip -9 $PKG/usr/man/man?/*.?
+# Don't include fonts that are already shipped with Slackware.
+for i in $PKG/usr/share/$PRGNAM/Textures/Fonts/*.ttf; do
+  rm -f $i
+  ln -s $(find /usr/share/fonts -name $(basename $i)) $i
+done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL NEWS README TODO ChangeLog \
+  AUTHORS COPYING NEWS README TODO ChangeLog \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/xmoto/xmoto.info b/games/xmoto/xmoto.info
index ab60586f21..992ec4016e 100644
--- a/games/xmoto/xmoto.info
+++ b/games/xmoto/xmoto.info
@@ -1,10 +1,10 @@
 PRGNAM="xmoto"
-VERSION="0.5.8"
+VERSION="0.5.10"
 HOMEPAGE="http://xmoto.tuxfamily.org/"
-DOWNLOAD="http://download.tuxfamily.org/xmoto/xmoto/0.5.8/xmoto-0.5.8-src.tar.gz"
-MD5SUM="349b024cab936d572f72c6f1b14de31a"
+DOWNLOAD="http://download.tuxfamily.org/xmoto/xmoto/0.5.10/xmoto-0.5.10-src.tar.gz"
+MD5SUM="d15f1c4e498d937b943db0b6aea437f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Alex Word"
 EMAIL="alex_word86@yahoo.com"
-APPROVED="rworkman,Niels Horn,Erik Hanson"
+APPROVED="rworkman"