games/openarena: Updated for version 0.8.5.

3 files changed, 36 insertions, 30 deletions

diff --git a/games/openarena/README b/games/openarena/README
index 3930d68d20..27cdfce76c 100644
--- a/games/openarena/README
+++ b/games/openarena/README
@@ -1,17 +1,19 @@
-OpenArena is an open-source content package for Quake III Arena
-licensed under the GPL, effectively creating a free stand-alone game.
-You do not need Quake III Arena to play this game.
+OpenArena is an open-source content package for Quake III Arena licensed under
+the GPL, effectively creating a free stand-alone game.  You do not need Quake
+III Arena to play this game.
 
-OpenArena has bots, network playability, many maps and most of the
-other features you would expect from a commercial first person
-shooter.
+OpenArena has bots, network playability, many maps and most of the other
+features you would expect from a commercial first person shooter.
 
-OpenArena requires the OpenAL library found on SlackBuilds.org.  It
-also requires 3D accelerated video drivers but runs quite well on the
-open-source Intel drivers.
+OpenArena requires the OpenAL library found on SlackBuilds.org.  It also
+requires 3D accelerated video drivers but runs quite well on the open-source
+Intel drivers.
 
-Please be advised that the main game zip file, oa080.zip, is about
-309MB.  Also, the download site listed in the openarena.info file is a
-direct link, but it is very, very slow.  You may wish to visit the
-openarena homepage (openarena.ws), click on "Files," and look for
+Although the $VERSION is listed as 0.8.1, this script actually builds OpenArena
+0.8.1 plus the 0.8.5 patch (which is the latest version as of April 14, 2010).
+
+Please be advised that the main game zip file, oa080.zip, is about 309MB, and
+the oa085p.zip patch is another 40MB.  Also, the download site listed in the
+openarena.info file is a direct link, but it is very, very slow.  You may wish
+to visit the openarena homepage (openarena.ws), click on "Files," and look for
 much faster download sites that do not offer direct links.
diff --git a/games/openarena/openarena.SlackBuild b/games/openarena/openarena.SlackBuild
index 839e431c0c..29a63ae8e5 100644
--- a/games/openarena/openarena.SlackBuild
+++ b/games/openarena/openarena.SlackBuild
@@ -24,9 +24,9 @@
 
 PRGNAM=openarena
 VERSION=${VERSION:-0.8.1}
-FINAL_VERSION=${FINAL_VERSION:-0.8.1} # Keep this for future patches
+FINAL_VERSION=${FINAL_VERSION:-0.8.5} # Keep this for future patches
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -34,7 +34,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="CHANGES COPYING CREDITS LINUXNOTES README WENEED \
+DOCS="CHANGES COPYING CREDITS LINUXNOTES README WENEED readme_085.txt \
 $CWD/$PRGNAM.SlackBuild"
 
 if [ "$ARCH" = "i486" ]; then
@@ -52,12 +52,12 @@ set -e # Exit on most errors
 
 # Keep the following for future patches.  Based on past history, this
 # is inevitable.
-#if test ! -f "oa077-patch.zip"; then
-#    echo "You need the oa77-patch.zip file in order to proceed."
-#    echo "Please visit the OpenArena homepage and download the"
-#    echo "patch file before continuing."
-#    exit 1
-#fi
+if test ! -f "oa085p.zip"; then
+    echo "You need the oa085p.zip file in order to proceed."
+    echo "Please visit the OpenArena homepage and download the"
+    echo "patch file before continuing."
+    exit 1
+fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -65,7 +65,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 unzip -o $CWD/oa081.zip
 # Keep the following for any future patches
-#unzip -o $CWD/oa077-patch.zip
+unzip -o $CWD/oa085p.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -78,11 +78,11 @@ find . \
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 # Uncomment the next line to disable semi-nude models
-# rm -f baseoa/pak2-players-mature.pk3
+#rm -f baseoa/pak2-players-mature.pk3
 
 install -D -m 0644 $CWD/openarena-server.desktop \
   $PKG/usr/share/applications/openarena-server.desktop
@@ -96,8 +96,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$FINAL_VERSION
 cp $DOCS $PKG/usr/doc/$PRGNAM-$FINAL_VERSION
 find $PKG/usr/doc/$PRGNAM-$FINAL_VERSION -type f -exec chmod 0644 {} \;
 
-mkdir -p $PKG/usr/share/games/openarena/baseoa
-cp -a baseoa/* $PKG/usr/share/games/openarena/baseoa
+mkdir -p $PKG/usr/share/games/openarena/{baseoa,missionpack}
+cp -rf {baseoa,missionpack}/ $PKG/usr/share/games/openarena/
+#mkdir -p $PKG/usr/share/games/openarena/legacy
+#cp -a legacy/* $PKG/usr/share/games/openarena/legacy
 find $PKG/usr/share/games/openarena/baseoa -type f -exec chmod 0644 {} \;
 cp oa_ded{.i386,.x86_64} openarena{.i386,.x86_64} \
 $PKG/usr/share/games/openarena
diff --git a/games/openarena/openarena.info b/games/openarena/openarena.info
index b11b12bf0b..07d5810064 100644
--- a/games/openarena/openarena.info
+++ b/games/openarena/openarena.info
@@ -1,9 +1,11 @@
 PRGNAM="openarena"
-VERSION="0.8.1"
+VERSION="0.8.5"
 HOMEPAGE="http://www.openarena.ws"
-DOWNLOAD="http://download.tuxfamily.net/openarena/rel/081/oa081.zip"
+DOWNLOAD="http://download.tuxfamily.net/openarena/rel/081/oa081.zip \
+  http://download.tuxfamily.net/openarena/rel/085/oa085p.zip"
 DOWNLOAD_x86_64=""
-MD5SUM="49006bcb02b4e8ea3d06749e8f4e4887"
+MD5SUM="49006bcb02b4e8ea3d06749e8f4e4887 \
+  b2a0437da751cd50dd2351ed9e0c4e9d"
 MD5SUM_x86_64=""
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"