5 files changed, 79 insertions, 66 deletions
diff --git a/misc/zyGrib/README b/misc/zyGrib/README
index 426c0d04c946..9e27493cb116 100644
--- a/misc/zyGrib/README
+++ b/misc/zyGrib/README
@@ -1,20 +1,33 @@
-zyGrib is a Visualization of meteo data from files in GRIB Format 1
+zyGrib is a program to download and visualize meteorological forecast data in
+the standard formats GRIB 1 and 2. The available datasets include NOAA-GFS
+(weather and wind conditions, above ground and at altitude) and FNMOC-WW3 (wave
+conditions). It is possible to create animations from the forecast data of the
+selected region and to export them as a set of images.
 
-Available meteo infos (W and CH - *):
+The available data include:
 
-    Surface Pressure (*)
-    Wind 10 m above mean sea level (*)
-    Wind gust (*)
-    Temperature 2 m above mean sea level (*)
-    Potential Temperature min - max 2 m above mean sea level
-    Relative Humidity 2 m above mean sea level (*)
-    Total Precipitation (mm/h) (*)
-    Total Cloud Cover (%) (*)
-    Dew Point 2 m above mean sea level (*)
-    0C Isotherm
-    Snow (Depth - Risk)
-    CAPE (convective available potential energy) at earth level (*)
-    Data in altitude (850 (*), 700 (*), 500 (*), 300, 200 hPa) : geopotential
-        altitude, wind (*), temperature (*), theta-e, relative humidity (*).
-    Waves : height, direction, period, whitecap probability, for wind waves,
-        swell, and for significant, maximum, primary, secondary waves. 
+- Mean sea level pressure
+- Wind 10m above surface
+- Wind gusts
+- Temperature 2m above surface
+- Minimum and maximum temperature 2m above surface
+- Relative humidity 2m above surface
+- Total precipitation (mm/h)
+- Cloud cover (%)
+- Dew point 2m above surface
+- 0 deg C isotherm
+- Snow (rain-snow line and snowfall risk)
+- CAPE (convective available potential energy) and CIN (convective inhibition)
+- Data at altitude (wind, temperature, theta-e, geopotential altitude, relative
+  humidity) at 925, 850, 700, 600, 500, 400, 300 and 200 hPa levels
+- Atmospheric sounding forecast displayed on SkewT-LogP thermodynamic diagrams
+- Waves (height, direction, period, whitecap probability for wind waves, swell,
+  and for significant, maximum, primary and secondary waves)
+- Sea currents (not provided by zyGrib's data server)
+
+The zyGrib source package ships with the code for Qwt (an extension library for
+QT) and NOAA's g2clib (decoder/encoder routines for GRIB 2): both are built
+automatically and linked statically: this will not affect already installed
+libraries.
+
+zyGrib is distributed under the GNU GPL, version 3.
diff --git a/misc/zyGrib/slack-desc b/misc/zyGrib/slack-desc
index 8d0304b7872f..4f50acc43b3f 100644
--- a/misc/zyGrib/slack-desc
+++ b/misc/zyGrib/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-zyGrib: zyGrib (Visualization of meteo data from files in GRIB Format 1)
-zyGrib:
-zyGrib: Homepage: http://www.zygrib.org/
-zyGrib:
-zyGrib:
-zyGrib:
+zyGrib: zyGrib (visualize meteo data from files in GRIB format 1 and 2)
 zyGrib:
+zyGrib: zyGrib is a program to download and visualize meteorological forecast
+zyGrib: data in the standard formats GRIB 1 and 2. The available datasets
+zyGrib: include NOAA-GFS (weather and wind conditions above ground and at
+zyGrib: altitude) and FNMOC-WW3 (wave conditions).
 zyGrib:
+zyGrib: Homepage: http://www.zygrib.org/
 zyGrib:
 zyGrib:
 zyGrib:
diff --git a/misc/zyGrib/zyGrib.SlackBuild b/misc/zyGrib/zyGrib.SlackBuild
index 5154d8d40fa3..34753bb65f48 100644
--- a/misc/zyGrib/zyGrib.SlackBuild
+++ b/misc/zyGrib/zyGrib.SlackBuild
@@ -3,7 +3,9 @@
 # Slackware build script for zyGrib
 
 # Copyright 2011, 2012, 2013  Chris Abela, Malta
-# Copyright 2014  Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org
+# Copyright 2014 Ryan P.C. McQuen, WA
+# Copyright 2017 Philip Lacroix <slackph at posteo dot de>
+#
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zyGrib
-VERSION=${VERSION:-7.0.0}
+VERSION=${VERSION:-8.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,31 +43,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
-# In case the source was fetched with wget or some other downloader:
-SRCTAR=$PRGNAM-$VERSION.tgz
-[ -e "getfile.php?file=$SRCTAR" ] && SRCTAR="getfile.php?file=$SRCTAR"
-
 rm -rf $PKG
 mkdir -p $TMP $PKG/opt/$PRGNAM $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCTAR
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
+
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -74,21 +59,36 @@ 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 {} \;
 
-make QMAKE=/usr/bin/qmake
+if [ "$ARCH" != x86_64 ]; then
+  # fixup for i586/i686 from Arch
+  sed -i -E 's:(^CFLAGS.*)-m64(.*)-D.*$:\1\2:' src/g2clib/makefile
+fi
+
+make QMAKE=/usr/bin/qmake-qt5
 make install INSTALLDIR=$PKG/opt/$PRGNAM
 
-mkdir -p $PKG/usr/bin/
-ln -sfv /opt/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
+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
+
+PRGBIN=$PKG/usr/bin
+PRGSHR=$PKG/usr/share
+PRGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 
-mkdir -p $PKG/usr/share/applications/ $PKG/usr/share/pixmaps/
-cat $CWD/zyGrib.desktop > $PKG/usr/share/applications/zyGrib.desktop
-cat $CWD/zyGrib.png > $PKG/usr/share/pixmaps/zyGrib.png
+# Move startup script, set path.
+mkdir -p $PRGBIN
+mv $PKG/opt/$PRGNAM/$PRGNAM $PRGBIN/
+sed -i "s~^cd .*~cd /opt/$PRGNAM~" $PRGBIN/$PRGNAM
 
-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
+mkdir -p $PRGSHR/{applications,pixmaps}
+cp -a $CWD/$PRGNAM.desktop $PRGSHR/applications/
+cp -a $CWD/$PRGNAM.png $PRGSHR/pixmaps/
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Install documentation (not available for zyGrib itself, hence the README).
+mkdir -p $PRGDOC/{qwt,g2clib}
+cp -a $CWD/README $PRGDOC/
+cp -a src/g2clib/README $PRGDOC/g2clib/
+cp -a src/qwt*/{README,COPYING} $PRGDOC/qwt/
+cat $CWD/$PRGNAM.SlackBuild > $PRGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/zyGrib/zyGrib.desktop b/misc/zyGrib/zyGrib.desktop
index edd6b8f8f472..c1e4e81a011e 100644
--- a/misc/zyGrib/zyGrib.desktop
+++ b/misc/zyGrib/zyGrib.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=zyGrib
-GenericName=GRIB file viewer
-Exec=zyGrib
-Icon=zyGrib
-Terminal=false
+GenericName=GRIB Meteo Data Viewer
 Type=Application
+Terminal=false
 StartupNotify=true
-Categories=Network;
+Categories=Utility;Education;
+Icon=zyGrib
+Exec=zyGrib
diff --git a/misc/zyGrib/zyGrib.info b/misc/zyGrib/zyGrib.info
index 647c2354f692..5da0727ebaba 100644
--- a/misc/zyGrib/zyGrib.info
+++ b/misc/zyGrib/zyGrib.info
@@ -1,10 +1,10 @@
 PRGNAM="zyGrib"
-VERSION="7.0.0"
+VERSION="8.0.1"
 HOMEPAGE="http://www.zygrib.org/"
-DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/zyGrib/zyGrib-7.0.0.tgz"
-MD5SUM="3503105677c0293575785d1f71c6ce70"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/zyGrib/zyGrib-8.0.1.tgz"
+MD5SUM="6a6acc0490f0927b3cecd4b79bd770fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="qwt proj libnova"
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+REQUIRES="libnova proj qt5"
+MAINTAINER="Philip Lacroix"
+EMAIL="slackph at posteo dot de"