games/springlobby: Updated for version 0.40

4 files changed, 51 insertions, 18 deletions

diff --git a/games/springlobby/README b/games/springlobby/README
index 7dce87d1cb..a47c0e58b9 100644
--- a/games/springlobby/README
+++ b/games/springlobby/README
@@ -1,4 +1,3 @@
 SpringLobby is a free cross-platform lobby client for the Spring RTS project.
 
-Build requirements, available at SlackBuilds.org:
-wxpython (or wxgtk), and libtorrent-rasterbar
+This requires wxpython (or wxGTK), SDL_sound, and libtorrent-rasterbar.
diff --git a/games/springlobby/doinst.sh b/games/springlobby/doinst.sh
index 24e4bc11e0..1f8ff67ded 100644
--- a/games/springlobby/doinst.sh
+++ b/games/springlobby/doinst.sh
@@ -1,4 +1,10 @@
 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 [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
 fi
 
diff --git a/games/springlobby/springlobby.SlackBuild b/games/springlobby/springlobby.SlackBuild
index 9c1f4150f7..2861b629a9 100644
--- a/games/springlobby/springlobby.SlackBuild
+++ b/games/springlobby/springlobby.SlackBuild
@@ -1,10 +1,29 @@
 #!/bin/sh
-
+#
 # Slackware build script for SpringLobby
-# 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=springlobby
-VERSION=0.0.1.10420
+VERSION=0.40
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,8 +35,13 @@ 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 -eu
@@ -31,16 +55,18 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var/lib \
-  --build=$ARCH-slackware-linux
 
+cmake \
+ -DCMAKE_CXX_FLAGS=${SLKCFLAGS} \
+ -DCMAKE_C_FLAGS=${SLKCFLAGS} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIBDIR=/usr/lib${LIBDIRSUFFIX} \
+ .
 make
-make install-strip DESTDIR=$PKG
+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
 
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
@@ -53,4 +79,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/springlobby/springlobby.info b/games/springlobby/springlobby.info
index b5908c61e1..cc0c60568d 100644
--- a/games/springlobby/springlobby.info
+++ b/games/springlobby/springlobby.info
@@ -1,8 +1,10 @@
 PRGNAM="springlobby"
-VERSION="0.0.1.10420"
+VERSION="0.40"
 HOMEPAGE="http://springlobby.info/"
-DOWNLOAD="http://www.springlobby.info/tarballs/springlobby-0.0.1.10420.tar.bz2"
-MD5SUM="e186e006176cb914d8cc61b3004a839d"
+DOWNLOAD="http://www.springlobby.info/tarballs/springlobby-0.40.tar.bz2"
+MD5SUM="8dd959b55de4ae85c419afdc23535417"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="rworkman"