1 files changed, 15 insertions, 33 deletions
diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild
index 69aeef61ca..c1a8e7d6a4 100644
--- a/games/scummvm/scummvm.SlackBuild
+++ b/games/scummvm/scummvm.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=scummvm
-VERSION=0.11.0
+VERSION=0.13.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,38 +34,18 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DISTRO=${DISTRO:-slackware}
-
-if [ $DISTRO = slackware ]; then
-	PKGARCH=$ARCH
-else
-	PKGARCH=${ARCH}_${DISTRO}
-fi
-
-if [ $DISTRO = slamd64 ]; then
-	LIBDIRSUFFIX=64
-	SLKLDFLAGS="-L/usr/lib64"
-else
-	LIBDIRSUFFIX=
-	SLKLDFLAGS=
-fi
-
 DOCS="AUTHORS COPYING NEWS README TODO"
 
-case "$ARCH" in
-  i486)      SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-             ;;
-  i686)      SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-             ;;
-  s390)      SLKCFLAGS="-O2"
-             ;;
-  powerpc)   SLKCFLAGS="-O2"
-             ;;
-  x86_64)    SLKCFLAGS="-O2 -fPIC"
-             ;;
-  athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer"
-             ;;
-esac
+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
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -80,6 +60,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --bindir=/usr/games \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --mandir=/usr/man \
   --disable-debug \
   || exit 1
@@ -87,7 +69,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make || exit 1
 make install DESTDIR=$PKG || exit 1
 
-strip --strip-unneeded $PKG/usr/bin/scummvm 2> /dev/null
+strip --strip-unneeded $PKG/usr/games/scummvm 2> /dev/null
 
 # The .desktop file for the menu is not being installed
 install -D -m 0644 dists/scummvm.desktop \
@@ -113,4 +95,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-$PKGARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}