games/firestorm: Updated for version 4.4.1.34164.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 44 insertions, 32 deletions

diff --git a/games/firestorm/README b/games/firestorm/README
index 3275a32e5b65..d22b6b4d52d3 100644
--- a/games/firestorm/README
+++ b/games/firestorm/README
@@ -9,14 +9,19 @@ 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: 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.1 before the 9th of July.
 
-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
+NOTE: the Phoenix Firestorm project require that you do a clean
+install when upgrading to version 4.4.1 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
-OpenSim you must use the OpenSim version available at
-http://wiki.phoenixviewer.com/fs_downloads_opensim
+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.
diff --git a/games/firestorm/firestorm.SlackBuild b/games/firestorm/firestorm.SlackBuild
index fa7c95ae3c24..8db3d067df1a 100644
--- a/games/firestorm/firestorm.SlackBuild
+++ b/games/firestorm/firestorm.SlackBuild
@@ -23,18 +23,27 @@
 # 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.
+
+
 PRGNAM=firestorm
-VERSION=${VERSION:-4.3.1.31155}
-EXTRAVERSION=${EXTRAVERSION:-SL}    # set to OS for OPenSim version
+VERSION=${VERSION:-4.4.1.34164}
+EXTRAVERSION=${EXTRAVERSION:-SL}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i686 ;;
-    arm*) ARCH=arm ;;
-    *) ARCH=$( uname -m ) ;;
-  esac
+ case "$( uname -m )" in
+ i?86) ARCH=i686 ;;
+ arm*) ARCH=arm ;;
+ *) ARCH=$( uname -m ) ;;
+ esac
 fi
 
 CWD=$(pwd)
@@ -50,14 +59,13 @@ fi
 set -e
 
 BASENAME="Phoenix_Firestorm-Release_i686_${VERSION}"
-#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 xvf $CWD/$FILENAME
+tar xvjf $CWD/$FILENAME
 cd $BASENAME
 
 chown -R root:root .
@@ -67,16 +75,15 @@ 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/$PRGNAM $PKG/opt/$PRGNAM/$PRGNAM.new
+mv $PKG/opt/$PRGNAM/firestorm $PKG/opt/$PRGNAM/firestorm.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/$PRGNAM.new
+cat firestorm | sed -e 's/^#export LL_BAD_OPENAL_DRIVER=x/export LL_BAD_OPENAL_DRIVER=x/' > $PKG/opt/$PRGNAM/firestorm.new
 
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/$PRGNAM
 #!/bin/bash
 cd /opt/$PRGNAM
-exec /opt/$PRGNAM/$PRGNAM
+exec /opt/$PRGNAM/firestorm
 EOF
 chmod 755 $PKG/usr/bin/$PRGNAM
 
@@ -86,9 +93,9 @@ mkdir -p $PKG/usr/share/applications
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $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 )
+cp -a \
+ FIRESTORM_DESKTOPINSTALL.txt README*.txt VivoxAUP.txt featuretable_linux.txt gpu_table.txt licenses.txt \
+ $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -96,4 +103,4 @@ 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.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
\ No newline at end of file
diff --git a/games/firestorm/firestorm.info b/games/firestorm/firestorm.info
index fb753c8b5876..78a02cd66ea7 100644
--- a/games/firestorm/firestorm.info
+++ b/games/firestorm/firestorm.info
@@ -1,8 +1,8 @@
 PRGNAM="firestorm"
-VERSION="4.3.1.31155"
+VERSION="4.4.1.34164"
 HOMEPAGE="http://www.phoenixviewer.com/"
-DOWNLOAD="http://downloads.phoenixviewer.com/Linux/Phoenix_Firestorm-Release_i686_4.3.1.31155SL.tar.bz2"
-MD5SUM="ca07e4a7abefbf4325a5ed62bd3ff013"
+DOWNLOAD="http://phoenixviewer.googlecode.com/files/Phoenix_Firestorm-Release_i686_4.4.1.34164SL.tar.bz2"
+MD5SUM="366965a5c7553aa7b34f2b39bbfe3163"
 DOWNLOAD_x86_64="UNSUPPORTED"
 MD5SUM_x86_64="UNSUPPORTED"
 REQUIRES=""
diff --git a/games/firestorm/slack-desc b/games/firestorm/slack-desc
index 63d4f5b47dac..a0c7d7b80e71 100644
--- a/games/firestorm/slack-desc
+++ b/games/firestorm/slack-desc
@@ -6,10 +6,10 @@
 # leave one space after the ':'.
 
          |-----handy-ruler------------------------------------------------------|
-firestorm: firestorm (alternative client for SecondLife)
+firestorm: firestorm (an alternative Second Life client)
 firestorm:
-firestorm: Firestorm Viewer is an alternative client program for SecondLife, a
-firestorm: virtual world developed by Linden Lab accessible via the internet.
+firestorm: Firestorm Viewer is an alternative client program for Second Life,
+firestorm: a virtual world developed by Linden Lab accessible via the internet.
 firestorm:
 firestorm: Firestorm Viewer is based on Linden Lab's Viewer versions 2 and 3.
 firestorm: It has loads of new and innovative features added to improve