5 files changed, 44 insertions, 29 deletions
diff --git a/games/warzone2100/README b/games/warzone2100/README
index 7c695e62c5..9edd6bc9ee 100644
--- a/games/warzone2100/README
+++ b/games/warzone2100/README
@@ -4,6 +4,11 @@ by Eidos Interactive in 1999.
  
 Warzone 2100 offers campaign, tutorial, multi-player and single-player 
 skirmish game modes, unit designer, unit experience system, and everything 
-you would expect from a modern RTS game.  
+you would expect from a modern RTS game.
+
+The 2.3 Beta4 release is network incompatible with previous versions. (You cannot play multiplayer games with previous versions of Warzone.)
+Skirmish savegames from past games do NOT work on this release.
+
+This requires physfs, quesoglc, and OpenAL.
+
 
-Warzone 2100 requires physfs and OpenAL (both available at SlackBuilds.org).
diff --git a/games/warzone2100/doinst.sh b/games/warzone2100/doinst.sh
index 22d4849bce..65fd352418 100644
--- a/games/warzone2100/doinst.sh
+++ b/games/warzone2100/doinst.sh
@@ -1,5 +1,4 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
 fi
 
diff --git a/games/warzone2100/slack-desc b/games/warzone2100/slack-desc
index 519ef5fffa..a47105d379 100644
--- a/games/warzone2100/slack-desc
+++ b/games/warzone2100/slack-desc
@@ -7,13 +7,13 @@
 
            |-----handy-ruler--------------------------------------------------|
 warzone2100: warzone2100 (a real-time 3D strategy game)
-warzone2100: 
+warzone2100:
 warzone2100: This is an improved version of Warzone 2100, a 3D science fiction
 warzone2100: real time strategy game developed by Pumpkin Studios and published
 warzone2100: by Eidos Interactive in year 1999. 
 warzone2100: Warzone 2100 offers campaign, tutorial, single- and multi-player
 warzone2100: skirmish game modes, unit designer, unit experience system, and
 warzone2100: everything you would expect from a modern RTS game.
-warzone2100: 
+warzone2100:
 warzone2100: Homepage: http://wz2100.net/
-warzone2100: 
+warzone2100:
diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild
index 487ccb6d4c..0df5740039 100644
--- a/games/warzone2100/warzone2100.SlackBuild
+++ b/games/warzone2100/warzone2100.SlackBuild
@@ -2,7 +2,7 @@
 
 # SlackBuild script for Warzone 2100
 
-# Copyright 2008  Andrew "ccfreak2k" Waters
+# Copyright 2010  Matthew "mfillpot" Fillpot
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=warzone2100
-VERSION=${VERSION:-2.0.10}
+VERSION=${VERSION:-2.3_beta4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,43 +34,52 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  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"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  echo "Unrecognized architecture type! Check the script: $0"
+  exit 1
 fi
 
+set -e
+
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
-  ./configure \
+./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-data=yes \
   --with-distributor=Slackware \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux 
+  --build=$ARCH-slackware-linux
 
-make || exit
+make
 make install-strip DESTDIR=$PKG
 
 # Let's not pollute the themed icon directory
 mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
 
-# --docdir= above works :) but leaves out a few things we want...
-cp COMPILE INSTALL TODO $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+# --docdir= above works :)
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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/warzone2100/warzone2100.info b/games/warzone2100/warzone2100.info
index de078752db..9cdcca6d1b 100644
--- a/games/warzone2100/warzone2100.info
+++ b/games/warzone2100/warzone2100.info
@@ -1,8 +1,10 @@
 PRGNAM="warzone2100"
-VERSION="2.0.10"
+VERSION="2.3_beta4"
 HOMEPAGE="http://wz2100.net"
-DOWNLOAD="http://download.gna.org/warzone/releases/2.0/warzone2100-2.0.10.tar.bz2"
-MD5SUM="d27b89fde2c8017020756441bdd2a67b"
-MAINTAINER="Andrew Waters"
-EMAIL="ccfreak2k@gmail.com"
-APPROVED="rworkman"
+DOWNLOAD="http://downloads.sourceforge.net/warzone2100/warzone2100-2.3_beta4.tar.gz"
+MD5SUM="b23bc83917d0b27c29029231202b59c8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Matthew Fillpot"
+EMAIL="mfillpot@gmail.com"
+APPROVED="Erik Hanson"