games/spring: Updated for version 0.80.5.2

4 files changed, 47 insertions, 17 deletions

diff --git a/games/spring/README b/games/spring/README
index 4cc7b896d007..7071aac368bd 100644
--- a/games/spring/README
+++ b/games/spring/README
@@ -1,4 +1,4 @@
 Spring is a project aiming to create a new and versatile RTS Engine.
 
-Build requirements, available at SlackBuilds.org:
-boost, OpenAL, DevIL, icu4c, glew, and scons
+This requires p7zip, OpenAL, DevIL, and icu4c.
+You will also need jdk from /extra.
diff --git a/games/spring/doinst.sh b/games/spring/doinst.sh
index 24e4bc11e095..e4e6459838cb 100644
--- a/games/spring/doinst.sh
+++ b/games/spring/doinst.sh
@@ -1,4 +1,8 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications &> /dev/null
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
 
diff --git a/games/spring/spring.SlackBuild b/games/spring/spring.SlackBuild
index 274b74d1cb48..9f15a552b51e 100644
--- a/games/spring/spring.SlackBuild
+++ b/games/spring/spring.SlackBuild
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 # Slackware build script for Spring
-# Written by Erik Hanson  erik@slackbuilds.org
+
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=spring
-VERSION=0.78.2.1
+VERSION=0.80.5.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -14,6 +33,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
 set -eu
 
 rm -rf $PKG
@@ -25,16 +50,15 @@ cd ${PRGNAM}_${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# This uses some form of auto-detection: rts/build/scons/detect.py
-# This should be safe, but does not create a redistributable package.
-scons configure \
-  prefix=/usr \
-  installprefix=$PKG/usr
-scons
-scons install
+cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \
+ .
+make
+make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE.html Documentation/* $PKG/usr/doc/$PRGNAM-$VERSION
@@ -45,4 +69,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/games/spring/spring.info b/games/spring/spring.info
index a6c960bc3602..ca3cf7dcdec4 100644
--- a/games/spring/spring.info
+++ b/games/spring/spring.info
@@ -1,8 +1,10 @@
 PRGNAM="spring"
-VERSION="0.78.2.1"
+VERSION="0.80.5.2"
 HOMEPAGE="http://springrts.com"
-DOWNLOAD="http://spring.clan-sy.com/dl/spring_0.78.2.1_src.tar.gz"
-MD5SUM="8f3dd6c79b254fde9c1b6643eca97729"
+DOWNLOAD="http://spring.clan-sy.com/dl/spring_0.80.5.2_src.tar.gz"
+MD5SUM="169b74ae3d3c66c72381690a3f87eb67"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="rworkman"