academic/gpredict: Updated for version 2.2.1 + new maintainer.

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

3 files changed, 29 insertions, 25 deletions

diff --git a/academic/gpredict/README b/academic/gpredict/README
index dabc39704f..9776f53783 100644
--- a/academic/gpredict/README
+++ b/academic/gpredict/README
@@ -1,13 +1,13 @@
-Gpredict is a real-time satellite tracking and orbit prediction 
-application. It can track an unlimited number of satellites and 
-display their position and other data in lists, tables, maps, and 
-polar plots (radar view). Gpredict can also predict the time of 
+Gpredict is a real-time satellite tracking and orbit prediction
+application. It can track an unlimited number of satellites and
+display their position and other data in lists, tables, maps, and
+polar plots (radar view). Gpredict can also predict the time of
 future.
 
-Gpredict is different from other satellite tracking programs 
-in that it allows you to group the satellites into visualisation 
-modules. Each of these modules can be configured independently 
-from the others giving you unlimited flexibility concerning the 
-look and feel of the modules. Naturally, Gpredict will also 
-allow you to track satellites relatively to different observer 
+Gpredict is different from other satellite tracking programs
+in that it allows you to group the satellites into visualisation
+modules. Each of these modules can be configured independently
+from the others giving you unlimited flexibility concerning the
+look and feel of the modules. Naturally, Gpredict will also
+allow you to track satellites relatively to different observer
 locations - at the same time.
diff --git a/academic/gpredict/gpredict.SlackBuild b/academic/gpredict/gpredict.SlackBuild
index 6095af836c..9f509eb443 100644
--- a/academic/gpredict/gpredict.SlackBuild
+++ b/academic/gpredict/gpredict.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Slackware build script for gpredict
+# Yth | Pont-en-Royans, France | yth@ythogtha.org
 
 # Copyright 2013  David  Fillpot
 # All rights reserved.
@@ -23,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gpredict
-VERSION=${VERSION:-1.3}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -64,10 +65,12 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -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 {} \;
+
+./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -83,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -93,6 +96,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 AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/academic/gpredict/gpredict.info b/academic/gpredict/gpredict.info
index 25489e6257..1b08c53140 100644
--- a/academic/gpredict/gpredict.info
+++ b/academic/gpredict/gpredict.info
@@ -1,10 +1,10 @@
 PRGNAM="gpredict"
-VERSION="1.3"
+VERSION="2.2.1"
 HOMEPAGE="http://gpredict.oz9aec.net"
-DOWNLOAD="http://downloads.sourceforge.net/gpredict/gpredict-1.3.tar.gz"
-MD5SUM="5547ab7dd1fd2af3bbb85a5e2c4e1e69"
+DOWNLOAD="https://github.com/csete/gpredict/archive/v2.2.1/gpredict-2.2.1.tar.gz"
+MD5SUM="1e947f195c7182a52a2984c35594fef8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="goocanvas"
-MAINTAINER="David Fillpot"
-EMAIL="mfillpot@gmail.com"
+REQUIRES="goocanvas2 hamlib"
+MAINTAINER="Yth - Arnaud"
+EMAIL="yth@ythogtha.org"