3 files changed, 27 insertions, 12 deletions
diff --git a/games/firestorm/README b/games/firestorm/README
index 13c52155e82b8..3275a32e5b658 100644
--- a/games/firestorm/README
+++ b/games/firestorm/README
@@ -8,3 +8,15 @@ overall experience.
 
 Firestorm Viewer is a 32 bit application and does not run on standard
 64 bit systems.
+
+NOTE: please observe that according to the release notes available at 
+http://wiki.phoenixviewer.com/firestorm_release_4.3.1.31155_change_log
+Firestorm Viewer 4.3.1 requires a clean install when upgrading from an
+earlier version. A detailed description of the procedure is available at
+http://wiki.phoenixviewer.com/fs_clean_reinstall
+
+NOTE: this SlackBuild is made for the Havok release of Firestorm Viewer
+4.3.1. 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
+OpenSim you must use the OpenSim version available at
+http://wiki.phoenixviewer.com/fs_downloads_opensim
diff --git a/games/firestorm/firestorm.SlackBuild b/games/firestorm/firestorm.SlackBuild
index ce156f11565cf..fa7c95ae3c248 100644
--- a/games/firestorm/firestorm.SlackBuild
+++ b/games/firestorm/firestorm.SlackBuild
@@ -24,7 +24,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=firestorm
-VERSION=${VERSION:-4.1.1.28744}
+VERSION=${VERSION:-4.3.1.31155}
+EXTRAVERSION=${EXTRAVERSION:-SL}    # set to OS for OPenSim version
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -49,13 +50,14 @@ fi
 set -e
 
 BASENAME="Phoenix_Firestorm-Release_i686_${VERSION}"
-FILENAME="Phoenix_Firestorm-Release_i686_${VERSION}.tar.bz2"
+#FILENAME="Phoenix_Firestorm-Release_${VERSION//./-}.tar.bz2"
+FILENAME="Phoenix_Firestorm-Release_i686_${VERSION}${EXTRAVERSION}.tar.bz2"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $BASENAME
-tar xvjf $CWD/$FILENAME
+tar xvf $CWD/$FILENAME
 cd $BASENAME
 
 chown -R root:root .
@@ -65,15 +67,16 @@ mkdir -p $PKG/opt/$PRGNAM
 # copy files just like the install script would do
 cp -a * $PKG/opt/$PRGNAM
 # avoid overwriting the previous configuration
-mv $PKG/opt/$PRGNAM/firestorm $PKG/opt/$PRGNAM/firestorm.new
+mv $PKG/opt/$PRGNAM/$PRGNAM $PKG/opt/$PRGNAM/$PRGNAM.new
 # sound configuration for standard Slackware installation
-cat firestorm | sed -e 's/^#export LL_BAD_OPENAL_DRIVER=x/export LL_BAD_OPENAL_DRIVER=x/' > $PKG/opt/$PRGNAM/firestorm.new
+cat firestorm | sed -e 's/^#export LL_BAD_OPENAL_DRIVER=x/export LL_BAD_OPENAL_DRIVER=x/' \
+  > $PKG/opt/$PRGNAM/$PRGNAM.new
 
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/$PRGNAM
 #!/bin/bash
 cd /opt/$PRGNAM
-exec /opt/$PRGNAM/firestorm
+exec /opt/$PRGNAM/$PRGNAM
 EOF
 chmod 755 $PKG/usr/bin/$PRGNAM
 
@@ -83,9 +86,9 @@ 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/
+DOCS="FIRESTORM_DESKTOPINSTALL.txt README*.txt VivoxAUP.txt featuretable_linux.txt gpu_table.txt licenses.txt"
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+( cd $PKG/opt/$PRGNAM ; rm -f $DOCS )
 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 8d4d9f5f8c8bb..fb753c8b58766 100644
--- a/games/firestorm/firestorm.info
+++ b/games/firestorm/firestorm.info
@@ -1,8 +1,8 @@
 PRGNAM="firestorm"
-VERSION="4.1.1.28744"
+VERSION="4.3.1.31155"
 HOMEPAGE="http://www.phoenixviewer.com/"
-DOWNLOAD="http://downloads.phoenixviewer.com/Linux/Phoenix_Firestorm-Release_i686_4.1.1.28744.tar.bz2"
-MD5SUM="950cbdfab0b24ea4a259e1840b083024"
+DOWNLOAD="http://downloads.phoenixviewer.com/Linux/Phoenix_Firestorm-Release_i686_4.3.1.31155SL.tar.bz2"
+MD5SUM="ca07e4a7abefbf4325a5ed62bd3ff013"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64="UNSUPPORTED"
 REQUIRES=""