games/Pyfa: Updated for version 1.31.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 20 insertions, 18 deletions

diff --git a/games/Pyfa/Pyfa.SlackBuild b/games/Pyfa/Pyfa.SlackBuild
index da30f540c2..610b02f3d1 100644
--- a/games/Pyfa/Pyfa.SlackBuild
+++ b/games/Pyfa/Pyfa.SlackBuild
@@ -23,9 +23,12 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=Pyfa
-VERSION=${VERSION:-1.25.0}
+VERSION=${VERSION:-1.31.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
+SRCNAM=pyfa
+
 ARCH=noarch
 
 CWD=$(pwd)
@@ -38,10 +41,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
-
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM
+unzip $CWD/$SRCNAM-$VERSION-*.zip
+cd $SRCNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -49,18 +51,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 cd $TMP
+
 mkdir -p $PKG/opt/
-mv $PRGNAM-$VERSION $PKG/opt/
+mv $SRCNAM $PKG/opt/$PRGNAM-$VERSION
+
+mkdir -p $PKG/usr/bin
+ln -s /opt/$PRGNAM-$VERSION/pyfa.py $PKG/usr/bin/pyfa
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $PKG/opt/$PRGNAM-$VERSION/{README.md,LICENSE} \
+  $PKG/usr/doc/$PRGNAM-$VERSION/
 cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/
 
-mkdir -p $PKG/usr/bin
-(
- cd $PKG/usr/bin
- ln -s /opt/$PRGNAM-$VERSION/pyfa.py pyfa
-)
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/games/Pyfa/Pyfa.info b/games/Pyfa/Pyfa.info
index 2b1609b966..ba83a07350 100644
--- a/games/Pyfa/Pyfa.info
+++ b/games/Pyfa/Pyfa.info
@@ -1,8 +1,8 @@
 PRGNAM="Pyfa"
-VERSION="1.25.0"
-HOMEPAGE="http://www.pyfa.net"
-DOWNLOAD="https://github.com/DarkFenX/Pyfa/archive/v1.25.0.tar.gz"
-MD5SUM="c33c2be4557f42aa07690ddfe955cdcd"
+VERSION="1.31.0"
+HOMEPAGE="https://github.com/pyfa-org/Pyfa"
+DOWNLOAD="https://github.com/pyfa-org/Pyfa/releases/download/v1.31.0/pyfa-1.31.0-yc119.8-1.0-linux.zip"
+MD5SUM="ab53f8765c4220114ac69a8195fbcad4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython SQLAlchemy python-dateutil"
diff --git a/games/Pyfa/README b/games/Pyfa/README
index 442289558b..49dfd0cd13 100644
--- a/games/Pyfa/README
+++ b/games/Pyfa/README
@@ -7,7 +7,7 @@ Optional dependencies used for graphing tool, available on SBo:
 libraries/matplotlib - http://matplotlib.sourceforge.net/
 development/numpy - http://numpy.scipy.org/
 
-This buildscript installs pyfa to /opt/Pyfa-<version> and then
+This SlackBuild installs pyfa to /opt/Pyfa-<version> and then
 symlinks /usr/bin/pyfa to the /opt/Pyfa-<version>/pyfa.py run script.
 Removing Pyfa via the package manager may not remove all templates from
 the directory and therefore may require additional manual deletion of
diff --git a/games/Pyfa/slack-desc b/games/Pyfa/slack-desc
index 2b44683640..fe012959ce 100644
--- a/games/Pyfa/slack-desc
+++ b/games/Pyfa/slack-desc
@@ -13,7 +13,7 @@ Pyfa: that can be used natively on any platform where python and wxwidgets
 Pyfa: are available. It provides many advanced features such as graphs and
 Pyfa: full calculations of any possible combination of modules, fits, etc.
 Pyfa:
-Pyfa: Homepage: http://www.pyfa.net/
+Pyfa: Homepage: https://github.com/pyfa-org/Pyfa
 Pyfa: IRC: evefit@irc.coldfront.net
 Pyfa:
 Pyfa: