4 files changed, 10 insertions, 33 deletions
diff --git a/misc/zyGrib/Makefile.patch b/misc/zyGrib/Makefile.patch
deleted file mode 100644
index 7de540183af3..000000000000
--- a/misc/zyGrib/Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.orig	2013-01-06 08:44:57.000000000 +0000
-+++ Makefile	2013-02-22 16:33:32.302831589 +0000
-@@ -36,15 +36,15 @@
- install: zyGrib
- 	mkdir -p $(INSTALLDIR)
- 	mkdir -p $(INSTALLDIR)/bin
-+	mkdir -p $(INSTALLDIR)/../../usr/bin
- 	cp -a data $(INSTALLDIR)
- 	cp -a grib $(INSTALLDIR)
- 	rm -f ./zyGrib
- 	rm -f $(INSTALLDIR)/bin/zyGrib
- 	cp  -a src/zyGrib $(INSTALLDIR)/bin
--	echo "#!/bin/bash" >> ./zyGrib
--	echo "cd $(INSTALLDIR)" >> ./zyGrib
--	echo 'bin/zyGrib $$*' >> ./zyGrib
--	chmod 755 ./zyGrib
--	cp -af zyGrib $(INSTALLDIR)
-+	echo "#!/bin/bash" >> $(INSTALLDIR)/../../usr/bin/zyGrib
-+	echo "cd /opt/zyGrib" >> $(INSTALLDIR)/../../usr/bin/zyGrib
-+	echo 'bin/zyGrib $$*' >> $(INSTALLDIR)/../../usr/bin/zyGrib
-+	chmod 755 $(INSTALLDIR)/../../usr/bin/zyGrib
- 
- 
diff --git a/misc/zyGrib/zyGrib.SlackBuild b/misc/zyGrib/zyGrib.SlackBuild
index 73c217845db2..0c1eab6870e6 100644
--- a/misc/zyGrib/zyGrib.SlackBuild
+++ b/misc/zyGrib/zyGrib.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=zyGrib
-VERSION=${VERSION:-6.2.3}
+VERSION=${VERSION:-7.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -72,15 +72,15 @@ 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Makefile installs a good local installation, but we need a system installation
-patch -p0 < $CWD/Makefile.patch
-
-make
+make QMAKE=/usr/bin/qmake
 make install INSTALLDIR=$PKG/opt/$PRGNAM
 
-mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
+mkdir -p $PKG/usr/bin/
+ln -sfv /opt/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
+
+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
 
diff --git a/misc/zyGrib/zyGrib.info b/misc/zyGrib/zyGrib.info
index 37d9adcf52a0..4d9c34256403 100644
--- a/misc/zyGrib/zyGrib.info
+++ b/misc/zyGrib/zyGrib.info
@@ -1,8 +1,8 @@
 PRGNAM="zyGrib"
-VERSION="6.2.3"
+VERSION="7.0.0"
 HOMEPAGE="http://www.zygrib.org/"
-DOWNLOAD="http://www.zygrib.org/getfile.php?file=zyGrib-6.2.3.tgz"
-MD5SUM="bc74bb78b991c93297d22ced77f2f716"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/zyGrib/zyGrib-7.0.0.tgz"
+MD5SUM="3503105677c0293575785d1f71c6ce70"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="qwt proj libnova"
diff --git a/misc/zyGrib/zyGrib.png b/misc/zyGrib/zyGrib.png
index fc6364912194..6ada16e72813 100644
--- a/misc/zyGrib/zyGrib.png
+++ b/misc/zyGrib/zyGrib.png