games/openarena: Updated for version 0.8.1

7 files changed, 69 insertions, 47 deletions

diff --git a/games/openarena/README b/games/openarena/README
index 2fe5ac9dd865..221c6299d937 100644
--- a/games/openarena/README
+++ b/games/openarena/README
@@ -1,23 +1,22 @@
-OpenArena is an open-source content package for Quake III Arena licensed 
-under the GPL, effectively creating a free stand-alone 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, oa070.zip, is about 250MB.  
-Additionally, one must download the following patch:
-	http://oxygen4.free.fr/dl/oa071-patch.zip
-	md5sum 5fa31998009f8241ad3ded93eb81e701
-which is about 12MB, and place it in the directory with the SlackBuild and 
-the main game zip file.  The SlackBuild will patch the original source and 
-install version 0.7.1 of OpenArena.  
+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
+much faster download sites that do not offer direct links.
 
-Note: this SlackBuild sets things up for i386, but 64 bit binaries are also 
-copied into the game directory, so with minor edits to the doinst.sh and the 
-two *.desktop files this script could be used with 64 bit systems, but this 
-is untested.
+Note: this SlackBuild sets things up for i386, but 64 bit binaries are
+also copied into the game directory, so with minor edits to the two
+launchers (see SlackBuild for instructions) this script could be used
+with 64 bit systems, but this is untested.
diff --git a/games/openarena/doinst.sh b/games/openarena/doinst.sh
index 2cf8c08ed345..800ab3f267c8 100644
--- a/games/openarena/doinst.sh
+++ b/games/openarena/doinst.sh
@@ -1,7 +1,7 @@
-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 -q usr/share/applications
 fi
 
-if [ -x usr/bin/update-mime-database ]; then
-  ./usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1
+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/openarena/oa_ded.launcher b/games/openarena/oa_ded.launcher
new file mode 100644
index 000000000000..29d2c74584f1
--- /dev/null
+++ b/games/openarena/oa_ded.launcher
@@ -0,0 +1,8 @@
+#!/bin/sh
+# These launchers came from Arch Linux
+
+PK3_DIR=/usr/share/games/openarena
+BINARY=/usr/share/games/openarena/oa_ded.i386
+
+$BINARY +set fs_basepath $PK3_DIR $*
+exit $?
diff --git a/games/openarena/openarena.SlackBuild b/games/openarena/openarena.SlackBuild
index 62e8dcc3e7de..fbcb35f28e26 100644
--- a/games/openarena/openarena.SlackBuild
+++ b/games/openarena/openarena.SlackBuild
@@ -5,8 +5,8 @@
 # Written by Chess Griffin <chess@chessgriffin.com>
 
 PRGNAM=openarena
-VERSION=${VERSION:-0.7.0}
-FINAL_VERSION=${FINAL_VERSION:-0.7.1}
+VERSION=${VERSION:-0.8.1}
+FINAL_VERSION=${FINAL_VERSION:-0.8.1} # Keep this for future patches
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -16,30 +16,35 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="CHANGES COPYING CREDITS LINUXNOTES README $CWD/$PRGNAM.SlackBuild"
+DOCS="CHANGES COPYING CREDITS LINUXNOTES README WENEED \
+$CWD/$PRGNAM.SlackBuild"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e # Exit on most errors
 
-if test ! -f "oa071-patch.zip";
-	then echo "You need the oa71-patch.zip file in order to proceed. \
-Please download it from: \
-http://oxygen4.free.fr/dl/oa071-patch.zip and then re-run \
-this SlackBuild."
-	exit 1
-fi
+# 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
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-unzip -o $CWD/oa070.zip 
-unzip -o $CWD/oa071-patch.zip
+unzip -o $CWD/oa081.zip
+# Keep the following for any future patches
+#unzip -o $CWD/oa077-patch.zip
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -65,13 +70,14 @@ mkdir -p $PKG/usr/share/pixmaps
 cp $CWD/*.png $PKG/usr/share/pixmaps
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$FINAL_VERSION
-cp -a $DOCS $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
 find $PKG/usr/share/games/openarena/baseoa -type f -exec chmod 0644 {} \;
-cp -a ioq* lib* openarena* $PKG/usr/share/games/openarena
+cp oa_ded{.i386,.x86_64} openarena{.i386,.x86_64} \
+$PKG/usr/share/games/openarena
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -80,10 +86,11 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 chmod 755 $PKG/usr/share/games/openarena/*
 
 mkdir -p $PKG/usr/games
-cd $PKG/usr/games
-  ln -sf /usr/share/games/openarena/ioquake3.i386 openarena
-  ln -sf /usr/share/games/openarena/ioq3ded.i386 openarena-server
-cd -
+# For x86_64: edit the two included launchers listed below to point to
+# the 64 bit binaries in /usr/share/games/openarena instead of i386.
+cp $CWD/openarena.launcher $PKG/usr/games/openarena
+cp $CWD/oa_ded.launcher $PKG/usr/games/openarena-server
+chmod 755 $PKG/usr/games/openarena*
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$FINAL_VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/games/openarena/openarena.info b/games/openarena/openarena.info
index 662d1fcd8b03..de78e61f04ea 100644
--- a/games/openarena/openarena.info
+++ b/games/openarena/openarena.info
@@ -1,8 +1,8 @@
 PRGNAM="openarena"
-VERSION="0.7.0"
+VERSION="0.8.1"
 HOMEPAGE="http://www.openarena.ws"
-DOWNLOAD="http://download.tuxfamily.net/cooker/openarena/rel070/oa070.zip"
-MD5SUM="739548bfc5dc1d129d20c0f67d54df48"
+DOWNLOAD="http://download.tuxfamily.net/openarena/rel/081/oa081.zip"
+MD5SUM="49006bcb02b4e8ea3d06749e8f4e4887"
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="dsomero"
diff --git a/games/openarena/openarena.launcher b/games/openarena/openarena.launcher
new file mode 100644
index 000000000000..ae562dc78380
--- /dev/null
+++ b/games/openarena/openarena.launcher
@@ -0,0 +1,8 @@
+#!/bin/sh
+# These launchers came from Arch Linux.
+
+PK3_DIR=/usr/share/games/openarena
+BINARY=/usr/share/games/openarena/openarena.i386
+
+$BINARY +set fs_basepath $PK3_DIR $*
+exit $?
diff --git a/games/openarena/slack-desc b/games/openarena/slack-desc
index 39f65109ab03..d8200473f489 100644
--- a/games/openarena/slack-desc
+++ b/games/openarena/slack-desc
@@ -11,9 +11,9 @@ openarena:
 openarena: OpenArena is an open-source content package for Quake III Arena
 openarena: licensed under the GPL, effectively creating a free stand-alone
 openarena: game.  You do not need Quake III Arena to play this game.
-openarena: OpenArena has bots, network playability, many maps, and most of the
-openarena: other features you would expect from a commercial first person
-openarena: shooter game.
+openarena: OpenArena has bots, network playability, many maps, and most of
+openarena: the other features you would expect from a commercial first
+openarena: person shooter game.
 openarena:
 openarena: Homepage:  http://www.openarena.ws
 openarena: