games/firestorm: Updated for version 4.7.9.50527.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 19 insertions, 47 deletions

diff --git a/games/firestorm/README b/games/firestorm/README
index e4fc23cb211a..15cecf6dbb31 100644
--- a/games/firestorm/README
+++ b/games/firestorm/README
@@ -6,25 +6,7 @@ It has loads of new and innovative features added to improve
 performance, increase usability, and generally enhance the user's
 overall experience.
 
-Firestorm Viewer is a 32 bit application and does not run on standard
-64 bit systems.
+Firestorm Viewer is available as 32 bit and as 64 bit application.
 
-NOTE: Version 4.4.2 is an emergency correction for version 4.4.1 which 
-has been blocked from logging on to the SecondLife grid.
-
-NOTE: Linden Lab have stated they intend to begin rolling out Server 
-Side Appearance (formerly known as Server Side Baking) on July 9th 
-or shortly thereafter. It is of paramount importance that all 
-Firestorm users upgrade to 4.4.2 before the 9th of July.
-
-NOTE: the Phoenix Firestorm project require that you do a clean
-install when upgrading to version 4.4.2 from a previous version. 
-A detailed documention of the procedure is available at 
-http://wiki.phoenixviewer.com/doku.php?id=fs_clean_reinstall .
-
-NOTE: this SlackBuild is made for the Havok release of Firestorm.
-Due to licensing reasons, this version can only be used for the
-Second Life main grid and beta grid. If you want to connect to an
-open sim you must use the Opensim release of Firestorm for which
-a separate package is available. Both packages can be installed 
-in parallel on the same Slackware installation.
+NOTE: Since release 4.7.9 there is no Havoc version of Firestorm.
+Therefore this package now builds the Opensim version by default.
diff --git a/games/firestorm/firestorm.SlackBuild b/games/firestorm/firestorm.SlackBuild
index 27cb0f119623..ab6719161a04 100644
--- a/games/firestorm/firestorm.SlackBuild
+++ b/games/firestorm/firestorm.SlackBuild
@@ -23,18 +23,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-# NOTE: this SlackBuild is made for the Havok release of Firestorm.
-# Due to licensing reasons, this version can only be used for the
-# Second Life main grid and beta grid. If you want to connect to an
-# open sim you must use the Opensim release of Firestorm for which
-# a separate package is available.
-# Both packages can be installed in parallel on the same installation.
-
+# NOTE: Since release 4.7.9 there is no Havoc version of Firestorm.
+# Therefore this package now builds the Opensim version by default.
 
 PRGNAM=firestorm
-VERSION=${VERSION:-4.4.2.34167}
-EXTRAVERSION=${EXTRAVERSION:-SL}
+VERSION=${VERSION:-4.7.9.50527}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,29 +44,28 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" != "i686" ] ; then
- echo "Architecture other than i686 is not supported by upstream at this point."
- exit
+if [ "$ARCH" = "x86_64" ]; then
+  BUILDTYPE="OS-Releasex64"
+else
+  BUILDTYPE="OS-Release"
 fi
 
 set -e
 
-BASENAME="Phoenix_Firestorm-Release_i686_${VERSION}"
-FILENAME="Phoenix_Firestorm-Release_i686_${VERSION}${EXTRAVERSION}.tar.bz2"
+BASENAME="Phoenix_Firestorm${BUILDTYPE}_${ARCH}_${VERSION}"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $BASENAME
-tar xvjf $CWD/$FILENAME
+tar xvf $CWD/$BASENAME.tar.xz
 cd $BASENAME
-
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p $PKG/opt/$PRGNAM
 # copy files just like the install script would do
@@ -97,9 +89,7 @@ mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- FIRESTORM_DESKTOPINSTALL.txt README*.txt VivoxAUP.txt featuretable_linux.txt gpu_table.txt licenses.txt \
- $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/firestorm/firestorm.info b/games/firestorm/firestorm.info
index cfa2753e5303..dcc147aae259 100644
--- a/games/firestorm/firestorm.info
+++ b/games/firestorm/firestorm.info
@@ -1,10 +1,10 @@
 PRGNAM="firestorm"
-VERSION="4.4.2.34167"
+VERSION="4.7.9.50527"
 HOMEPAGE="http://www.phoenixviewer.com/"
-DOWNLOAD="http://phoenixviewer.googlecode.com/files/Phoenix_Firestorm-Release_i686_4.4.2.34167SL.tar.bz2"
-MD5SUM="d5e130c257da184cc4b578c1a51f5ecb"
-DOWNLOAD_x86_64="UNSUPPORTED"
-MD5SUM_x86_64="UNSUPPORTED"
+DOWNLOAD="http://downloads.firestormviewer.org/linux/Phoenix_FirestormOS-Release_i686_4.7.9.50527.tar.xz"
+MD5SUM="37d11d37e53af0b11625cf6572684d0f"
+DOWNLOAD_x86_64="http://downloads.firestormviewer.org/linux/Phoenix_FirestormOS-Releasex64_x86_64_4.7.9.50527.tar.xz"
+MD5SUM_x86_64="f3713b898ee782eee7a5c8401d260817"
 REQUIRES=""
 MAINTAINER="Martin Rogge"
 EMAIL="martin_rogge@users.sourceforge.net"