4 files changed, 33 insertions, 20 deletions
diff --git a/network/frostwire/frostwire.SlackBuild b/network/frostwire/frostwire.SlackBuild
index 275ffcb07fac3..cbc0314289fca 100644
--- a/network/frostwire/frostwire.SlackBuild
+++ b/network/frostwire/frostwire.SlackBuild
@@ -27,11 +27,12 @@
 # Updated for new version - Edward Koenig <kingbeowulf@gmail.com>
 
 PRGNAM=frostwire
-VERSION=5.1.4
-ARCH=noarch	# Leave this alone for frostwire
+VERSION=5.2.11
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+ARCH=noarch	# Leave this alone for frostwire
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -41,9 +42,12 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG/opt $OUTPUT
-cd $PKG/opt
-tar xvf $CWD/$PRGNAM-$VERSION.$ARCH.tar.gz
-mv $PRGNAM-$VERSION.$ARCH $PRGNAM-$VERSION
+
+tar xvf $CWD/$PRGNAM-$VERSION.$ARCH.tar.gz -C $PKG/opt
+mv $PKG/opt/$PRGNAM-$VERSION.$ARCH $PKG/opt/$PRGNAM-$VERSION
+
+# Fix to correctly find version from "java -version"
+patch -p0 -d $PKG/opt/$PRGNAM-$VERSION < $CWD/frostwire_checkjava.diff
 
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/$PRGNAM
@@ -53,7 +57,7 @@ cd /opt/frostwire
 EOF
 chmod 0755 $PKG/usr/bin/$PRGNAM
 
-ln -s $PRGNAM-$VERSION $PRGNAM
+ln -s $PRGNAM-$VERSION $PKG/opt/$PRGNAM
 
 # Install desktop file and icon
 install -D -m 0644 $PKG/opt/$PRGNAM-$VERSION/$PRGNAM.desktop \
@@ -64,11 +68,9 @@ install -D -m 0644 $CWD/$PRGNAM.png \
 # Let's not move the docs, as there aren't any, but we will add the build script to them
 install -D -m 0644 $CWD/$PRGNAM.SlackBuild \
   $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
-  for FILE in COPYING EULA.txt changelog; do
-    ln -s /opt/$PRGNAM-$VERSION/$FILE $FILE ;
-  done
-)
+for FILE in COPYING EULA.txt changelog; do
+  ln -s /opt/$PRGNAM-$VERSION/$FILE $PKG/usr/doc/$PRGNAM-$VERSION/$FILE ;
+done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -78,4 +80,4 @@ cd $PKG
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 find . -type d -name '.svn' | xargs rm -rf
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/frostwire/frostwire.info b/network/frostwire/frostwire.info
index c3a53995ab0bd..0512531be9ca9 100644
--- a/network/frostwire/frostwire.info
+++ b/network/frostwire/frostwire.info
@@ -1,10 +1,10 @@
 PRGNAM="frostwire"
-VERSION="5.1.4"
+VERSION="5.2.11"
 HOMEPAGE="http://www.frostwire.com/"
-DOWNLOAD="http://dl.frostwire.com/frostwire/5.1.4/frostwire-5.1.4.noarch.tar.gz"
-MD5SUM="90aa9dec3609fc751e624927697c7313"
+DOWNLOAD="http://dl.frostwire.com/frostwire/5.2.11/frostwire-5.2.11.noarch.tar.gz"
+MD5SUM="16683cdcc481c89830b8d35579fc5226"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Edward Koenig"
 EMAIL="kingbeowulf@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/network/frostwire/frostwire_checkjava.diff b/network/frostwire/frostwire_checkjava.diff
new file mode 100644
index 0000000000000..3fb05fb574471
--- /dev/null
+++ b/network/frostwire/frostwire_checkjava.diff
@@ -0,0 +1,11 @@
+--- frostwire	2011-11-22 08:50:52.000000000 -0800
++++ frostwire.new	2011-12-26 13:56:41.676000352 -0800
+@@ -73,7 +73,7 @@
+       return 1
+   fi
+ 
+-  JAVA_HEADER=`${JAVA_PROGRAM_DIR}java -version 2>&1 | head -n 1`
++  JAVA_HEADER=`${JAVA_PROGRAM_DIR}java -version 2>&1 | grep java`
+   JAVA_IMPL=`echo ${JAVA_HEADER} | cut -f1 -d' '`
+   if [ "$JAVA_IMPL" = "java" ] ; then
+     VERSION=`echo ${JAVA_HEADER} | sed "s/java version \"\(.*\)\"/\1/"`
diff --git a/network/frostwire/slack-desc b/network/frostwire/slack-desc
index ceec843caf2c6..d99224a98ef97 100644
--- a/network/frostwire/slack-desc
+++ b/network/frostwire/slack-desc
@@ -10,10 +10,10 @@ frostwire: frostwire (P2P File sharing Client)
 frostwire:
 frostwire: Frostwire is a cross-platform, open-source peer-to-peer filesharing
 frostwire: client for the Gnutella and BitTorrent protocols.
-frostwire: It is written in Java and is a fork of Limewire that includes all of
-frostwire: the free LimeWire version's functionality, plus a few features of
-frostwire: LimeWire Pro's fee based upgrades.
+frostwire: It is written in Java and is a fork of Limewire that includes all
+frostwire: of the free LimeWire version's functionality, plus a few features
+frostwire: of LimeWire Pro's fee based upgrades.
 frostwire:
-frostwire: This is essentially a repackaging of the official binary from
+frostwire: This is essentially a repackaging of the official binary from 
 frostwire: http://www.frostwire.com/
 frostwire: