1 files changed, 13 insertions, 7 deletions
diff --git a/games/xmoto/xmoto.SlackBuild b/games/xmoto/xmoto.SlackBuild
index 114c921c36d0a..2ae4d15b573e3 100644
--- a/games/xmoto/xmoto.SlackBuild
+++ b/games/xmoto/xmoto.SlackBuild
@@ -10,10 +10,8 @@
 # Modified by the SlackBuilds.org project
 # Updated by Alex Word <alex_word86@yahoo.com>
 
-set -e
-
 PRGNAM=xmoto
-VERSION=0.5.1
+VERSION=0.5.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -25,12 +23,17 @@ 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
+
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -41,11 +44,13 @@ chmod -R u+w,go+r-w,a-s .
 
 patch -p1 < $CWD/patches/sqlite3.diff
 patch -p1 < $CWD/patches/localedir.diff
+patch -p0 < $CWD/patches/xmoto-amd64_gcc441.diff
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --localstatedir=/var \
   --mandir=/usr/man \
   --localedir=/usr/share/locale \
@@ -64,13 +69,14 @@ make install-strip DESTDIR=$PKG
 
 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.desktop $PKG/usr/share/applications/
 
 gzip -9 $PKG/usr/man/man?/*.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ABOUT-NLS AUTHORS COPYING INSTALL NEWS README TODO ChangeLog \
-      $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ABOUT-NLS AUTHORS COPYING INSTALL NEWS README TODO ChangeLog \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -78,4 +84,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 -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}