Update to zyGrib 6.2.4, ChangeLog as follows:

2014-11-02 : zyGrib Version 6.2.4

    Reading grib files at high resolution from model SKIRON (University
      of Athens, Department of Physics, Atmospheric Modelling and Weather
      Forecasting Group) available here : http://wild-silk.org/en.

2014-01-09 : zyGrib Version 6.2.3

    New color scale for the waves, with a max range of 20m instead of 15m.
    Bug fixed: the arrows winds was not always displayed when the map
      contained the longitude of 180°.

2014-01-04 : zyGrib Version 6.2.2

    Bug fixed: the wave model was not always displayed correctly in the
    headers (confusion between FNMOC-WW3-GLOBAL and FNMOC-WW3-MEDIT).
    Fortunately, the displayed data were correct.

2013-11-25 : zyGrib Version 6.2.1

    Bug fixed: it was impossible to disable isolines.

2013-11-13 : zyGrib Version 6.2.0

    Map scrolling with the mouse (+Ctrl).
      Note: this first version is not really optimized. The movements
        are jerky if the grib file is too large or if the machine
        is too slow.
      Reminder: click with the middle button to move the target point to
        the center of the window.
    Enhancements of the curves module (thank you François-X): the main
      window remains active, other curves can be opened.
    wind gust display with lines.
    temperature display is correct even if the grib does not contain the
      min/max temperatures.
    deflection curve of the wind no longer interferes with the pressure
      and cloudiness.
    More accurate display of jet streams with a color scale modified
      (adaptation of a proposal from Sailingyachto2 aka ON3CHD). the wind
      below 40 kts is ignored and the scale goes up to 240 kts.
      Use key combination 'Ctrl+Maj+J' to toggle between jet stream
      colormap and the standard one, or navigate in the menu 'Weather
      map'->'Options'.
    Bug fixed: loss of the altitude displayed at startup or when
      loading a new file.
    Pseudo bug fixed: a stable version of the qwt library is installed
      with source files, because it is not compatible with itself from
      one version to another.

2013-04-28 : zyGrib Version 6.1.4

    Bug fixed: the levels 400 and 600 hPa are fully taken into account.

2013-04-08 : zyGrib Version 6.1.3

    New russian translation (####### Yaroslav Zavarzin).
    Export SkewT data in a spreadsheet format.
    2 new levels of altitude : 400 hPa and 600 hPa.
    Warning : you have to check "SkewT" in the tab "Altitude" to retreive
      data, so files are big.

2013-01-06 : zyGrib Version 6.1.2

    Update spanish translation (muchas gracias Luis Mederos).

2013-01-02 : zyGrib Version 6.1.1

    Display of color scales in saved images.
    SkewT-LogP diagrams more complete :
    Color display of areas of convection.
    Display of surface level (mean altitude moyenne in the grid).
    Convection indices calculation :
      LI: Lifted Index
      SI: Showalter Index
      KI: K-Index
      TT: Total Totals Index
      SW: SWEAT Index
    CAPE / CIN: pseudo-graphical method very approximate, for
      comparison with the values ##given by the model forecast.
    Bug fixed : with Windows, sometimes, it was impossible to put
      forward the main window when meteotable or skewt was displayed.

2012-12-10 : zyGrib Version 6.1.0

    Color maps an isolines for the theta-e (Equivalent potential
      temperature) at levels 925, 850, 700, 500, 300, 200 hPa.
    Isotherms at levels 925, 850, 700, 500, 300, 200 hPa, in addition to 2m.
    Sun and Moon rise and set in the meteotables.
    Restructuring menus that became too long.
    Start a new instance with the same geographic parameters (Ctrl+Shift+N).
    Zoom on Grib area becomes an option (menu Earth) to keep the current position and scale.
    Possibility to choose run GFS (Last, 0h, 6h, 12h, 18h) at download. Warning : it is slow, except for the last run.
    The maximum size of the files generated by the server is 100 MB (instead of 50).
    The values panel is in a scrollable area.
    Bug fixed in the curve drawer module (thanks François-X).
    Less bad estimate of the size of the files.
    Indication of the absence of data in the diagrams SkewT.
    Remove external libraries from source (must install them separately to compile in Windows).
    Improved zyGrib.pro file to compile without change in Debian and Ubuntu.

2012-09-30 : zyGrib Version 6.0.2

    Update spanish translation (muchas gracias Luis Mederos).
    Bug fixed: bad wind unit in the curve drawer module (merci François X).
    Bug fixed: loss of the grib file directory.
    And a few minor bugs fixed.

8 files changed, 86 insertions, 35 deletions

diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index 327caa708b7..bb13181037c 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.42 2014/02/12 23:18:16 tron Exp $
+# $NetBSD: Makefile,v 1.43 2014/12/30 08:50:55 plunky Exp $
 #
 
-DISTNAME=	zyGrib-6.0.1
-PKGREVISION=	10
+DISTNAME=	zyGrib-6.2.4
 CATEGORIES=	misc
 MASTER_SITES=	http://www.zygrib.org/getfile.php?file=
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	plunky@rya-online.net
+MAINTAINER=	plunky@NetBSD.org
 HOMEPAGE=	http://www.zygrib.org/
 COMMENT=	GRIB file viewer for weather data
 LICENSE=	gnu-gpl-v3
@@ -24,7 +23,7 @@ SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_MESSAGE.paths=	Fixing shared data paths.
 SUBST_FILES.paths=	util/Util.h
-SUBST_SED.paths+=	-e "s|\"data/|\"${PREFIX}/share/zyGrib/|"
+SUBST_VARS.paths=	PREFIX
 
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	share/zyGrib/colors
@@ -37,6 +36,7 @@ INSTALLATION_DIRS+=	share/zyGrib/tr
 
 INSTALL_FILES+=	colors/colors_binary.txt
 INSTALL_FILES+=	colors/colors_cape_jkg.txt
+INSTALL_FILES+=	colors/colors_cin_jkg.txt
 INSTALL_FILES+=	colors/colors_clouds_black_pc.txt
 INSTALL_FILES+=	colors/colors_clouds_white_pc.txt
 INSTALL_FILES+=	colors/colors_current_kts.txt
@@ -45,9 +45,12 @@ INSTALL_FILES+=	colors/colors_humidrel_pc.txt
 INSTALL_FILES+=	colors/colors_rain_mmh.txt
 INSTALL_FILES+=	colors/colors_snowdepth_m.txt
 INSTALL_FILES+=	colors/colors_temp_celcius.txt
+INSTALL_FILES+=	colors/colors_thetae_celcius.txt
+INSTALL_FILES+=	colors/colors_thetae_celcius_1.txt
 INSTALL_FILES+=	colors/colors_waveheight_m.txt
 INSTALL_FILES+=	colors/colors_whitecap_prb.txt
 INSTALL_FILES+=	colors/colors_whitecap_prb.txt.colors
+INSTALL_FILES+=	colors/colors_wind_jet_kts.txt
 INSTALL_FILES+=	colors/colors_wind_kts.txt
 INSTALL_FILES+=	gis/cities_10k-more.txt.gz
 INSTALL_FILES+=	gis/cities_3k-10k.txt.gz
@@ -59,6 +62,7 @@ INSTALL_FILES+=	img/1leftarrow.png
 INSTALL_FILES+=	img/1rightarrow.png
 INSTALL_FILES+=	img/2leftarrow.png
 INSTALL_FILES+=	img/2rightarrow.png
+INSTALL_FILES+=	img/airport.png
 INSTALL_FILES+=	img/anim.png
 INSTALL_FILES+=	img/back.png
 INSTALL_FILES+=	img/connect_no.png
@@ -92,8 +96,11 @@ INSTALL_FILES+=	img/player_playlist.png
 INSTALL_FILES+=	img/player_rew.png
 INSTALL_FILES+=	img/player_start.png
 INSTALL_FILES+=	img/player_stop.png
+INSTALL_FILES+=	img/printer.png
 INSTALL_FILES+=	img/reload.png
 INSTALL_FILES+=	img/resource.rc
+INSTALL_FILES+=	img/spreadsheet.png
+INSTALL_FILES+=	img/time_icon.png
 INSTALL_FILES+=	img/up.png
 INSTALL_FILES+=	img/viewmag+.png
 INSTALL_FILES+=	img/viewmag-.png
@@ -152,6 +159,7 @@ do-install:
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../geography/libnova/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/misc/zyGrib/PLIST b/misc/zyGrib/PLIST
index 16aa3d79db4..fb570cdce39 100644
--- a/misc/zyGrib/PLIST
+++ b/misc/zyGrib/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2012/07/01 07:21:35 plunky Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/12/30 08:50:55 plunky Exp $
 bin/zyGrib
 share/zyGrib/colors/colors_binary.txt
 share/zyGrib/colors/colors_cape_jkg.txt
+share/zyGrib/colors/colors_cin_jkg.txt
 share/zyGrib/colors/colors_clouds_black_pc.txt
 share/zyGrib/colors/colors_clouds_white_pc.txt
 share/zyGrib/colors/colors_current_kts.txt
@@ -10,9 +11,12 @@ share/zyGrib/colors/colors_humidrel_pc.txt
 share/zyGrib/colors/colors_rain_mmh.txt
 share/zyGrib/colors/colors_snowdepth_m.txt
 share/zyGrib/colors/colors_temp_celcius.txt
+share/zyGrib/colors/colors_thetae_celcius.txt
+share/zyGrib/colors/colors_thetae_celcius_1.txt
 share/zyGrib/colors/colors_waveheight_m.txt
 share/zyGrib/colors/colors_whitecap_prb.txt
 share/zyGrib/colors/colors_whitecap_prb.txt.colors
+share/zyGrib/colors/colors_wind_jet_kts.txt
 share/zyGrib/colors/colors_wind_kts.txt
 share/zyGrib/gis/cities_10k-more.txt.gz
 share/zyGrib/gis/cities_3k-10k.txt.gz
@@ -24,6 +28,7 @@ share/zyGrib/img/1leftarrow.png
 share/zyGrib/img/1rightarrow.png
 share/zyGrib/img/2leftarrow.png
 share/zyGrib/img/2rightarrow.png
+share/zyGrib/img/airport.png
 share/zyGrib/img/anim.png
 share/zyGrib/img/back.png
 share/zyGrib/img/connect_no.png
@@ -57,8 +62,11 @@ share/zyGrib/img/player_playlist.png
 share/zyGrib/img/player_rew.png
 share/zyGrib/img/player_start.png
 share/zyGrib/img/player_stop.png
+share/zyGrib/img/printer.png
 share/zyGrib/img/reload.png
 share/zyGrib/img/resource.rc
+share/zyGrib/img/spreadsheet.png
+share/zyGrib/img/time_icon.png
 share/zyGrib/img/up.png
 share/zyGrib/img/viewmag+.png
 share/zyGrib/img/viewmag-.png
diff --git a/misc/zyGrib/distinfo b/misc/zyGrib/distinfo
index 9b4d3b7d466..8453503258f 100644
--- a/misc/zyGrib/distinfo
+++ b/misc/zyGrib/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.18 2013/05/04 12:59:47 joerg Exp $
+$NetBSD: distinfo,v 1.19 2014/12/30 08:50:55 plunky Exp $
 
-SHA1 (zyGrib-6.0.1.tgz) = 8e6dd3acd84707a7a1717920d6e1219c90783335
-RMD160 (zyGrib-6.0.1.tgz) = 6485f2a0d4418686579957db7a1b7bfc4f0b229d
-Size (zyGrib-6.0.1.tgz) = 17243124 bytes
-SHA1 (patch-ColorScale.cpp) = 9ddc09d64c7cf89c72ee66a17fcd003d6b0cdae6
-SHA1 (patch-Terrain.cpp) = 83a2f54cebd466918ab1267f1c1d94ec0d88d8a4
-SHA1 (patch-aa) = c56e9e8b3621d7b41a259bcf872f1707b8c164b6
-SHA1 (patch-ab) = 7b9abde8a75ce0ebe5e2e35003041b827524af9f
+SHA1 (zyGrib-6.2.4.tgz) = 7060ff13329db6a14ddfbf0fbe02af8dcb58a108
+RMD160 (zyGrib-6.2.4.tgz) = 2fc6f7890e1ba149d9b37e9ae0bbfe28817b4f5d
+Size (zyGrib-6.2.4.tgz) = 15257852 bytes
+SHA1 (patch-ColorScale.cpp) = 26255acc30d81aba2abd7f51ef96677446645c78
+SHA1 (patch-Terrain.cpp) = cda31862011b758aa6b1c3655b9383dd1b38aceb
+SHA1 (patch-aa) = 54bb3e7207a722f47667bb4c52d30084e5d5a675
+SHA1 (patch-ab) = 1da0e837a68b7942ab8d4a829b92eef6b8e359e8
+SHA1 (patch-util_Util.h) = a7ae101a11de7ca29e8e6e8ccf173c5216ea3ac7
diff --git a/misc/zyGrib/patches/patch-ColorScale.cpp b/misc/zyGrib/patches/patch-ColorScale.cpp
index d01b71a2e42..2cb110451f6 100644
--- a/misc/zyGrib/patches/patch-ColorScale.cpp
+++ b/misc/zyGrib/patches/patch-ColorScale.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-ColorScale.cpp,v 1.1 2013/05/04 12:59:47 joerg Exp $
+$NetBSD: patch-ColorScale.cpp,v 1.2 2014/12/30 08:50:55 plunky Exp $
 
---- ColorScale.cpp.orig	2013-05-04 00:40:33.000000000 +0000
+--- ColorScale.cpp.orig	2014-11-02 00:01:52.000000000 +0000
 +++ ColorScale.cpp
 @@ -16,6 +16,7 @@ You should have received a copy of the G
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/misc/zyGrib/patches/patch-Terrain.cpp b/misc/zyGrib/patches/patch-Terrain.cpp
index 55c9904857e..1c008d61edb 100644
--- a/misc/zyGrib/patches/patch-Terrain.cpp
+++ b/misc/zyGrib/patches/patch-Terrain.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-Terrain.cpp,v 1.2 2012/07/01 07:21:35 plunky Exp $
+$NetBSD: patch-Terrain.cpp,v 1.3 2014/12/30 08:50:55 plunky Exp $
 
---- Terrain.cpp.orig	2012-06-03 21:03:41.000000000 +0000
+--- Terrain.cpp.orig	2014-11-02 00:01:52.000000000 +0000
 +++ Terrain.cpp
-@@ -1032,7 +1032,7 @@ void Terrain::paintEvent(QPaintEvent * /
+@@ -1109,7 +1109,7 @@ void Terrain::paintEvent(QPaintEvent *)
              
              if (showOrthodromie)
              {
diff --git a/misc/zyGrib/patches/patch-aa b/misc/zyGrib/patches/patch-aa
index 1b25cc85b6c..e13cb4f7e70 100644
--- a/misc/zyGrib/patches/patch-aa
+++ b/misc/zyGrib/patches/patch-aa
@@ -1,24 +1,25 @@
-$NetBSD: patch-aa,v 1.8 2012/07/01 07:21:35 plunky Exp $
+$NetBSD: patch-aa,v 1.9 2014/12/30 08:50:55 plunky Exp $
 
-libbz2, libz and libproj are all provided by the buildlink3.mk
-framework; no need to use private versions.
+libraries are provided by the buildlink3.mk framework;
+no need to provide paths
 
---- zyGrib.pro.orig	2012-06-03 21:03:41.000000000 +0000
+--- zyGrib.pro.orig	2014-11-02 00:01:52.000000000 +0000
 +++ zyGrib.pro
 @@ -5,7 +5,7 @@ TEMPLATE = app
  TARGET   = zyGrib
  
  DEPENDPATH  += . util map GUI
--INCLUDEPATH += . util map GUI bzip2 zlib-1.2.3 proj-4.6.0/src
-+INCLUDEPATH += . util map GUI
- INCLUDEPATH += curvedrawer
+-INCLUDEPATH += . util map GUI curvedrawer qwt-6.0.1/src
++INCLUDEPATH += . util map GUI curvedrawer
  
- # LIBS += -Lbzip2 -lbz2 -Lzlib-1.2.3 -lz -Lproj-4.6.0/src -lproj
-@@ -31,7 +31,6 @@ macx {
- 	ICON = ../data/img/zyGrib.icns
+ # ----------------------------------------------------
+ # platform specific
+@@ -26,7 +26,7 @@ macx {
  }
  else {
--	INCLUDEPATH += /usr/include/qwt
- 	LIBS += -lbz2 -lz -lproj -lqwt
  	DESTDIR = .
+-	LIBS += -lbz2 -lz -lproj -lnova -Lqwt-6.0.1/lib/ -lqwt
++	LIBS += -lbz2 -lz -lproj -lnova -lqwt
  }
+ }
+ # ----------------------------------------------------
diff --git a/misc/zyGrib/patches/patch-ab b/misc/zyGrib/patches/patch-ab
index 41fd40c77c9..a7327127aba 100644
--- a/misc/zyGrib/patches/patch-ab
+++ b/misc/zyGrib/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.5 2012/07/01 07:21:35 plunky Exp $
+$NetBSD: patch-ab,v 1.6 2014/12/30 08:50:55 plunky Exp $
 
---- map/Projection.h.orig	2012-06-03 21:03:41.000000000 +0000
+--- map/Projection.h.orig	2014-11-02 00:01:52.000000000 +0000
 +++ map/Projection.h
-@@ -20,7 +20,7 @@ along with this program.  If not, see <h
- #define PROJECTION_H
+@@ -21,7 +21,7 @@ along with this program.  If not, see <h
  #include <QObject>
+ #include <cstdio>
  
 -#include "proj_api.h"
 +#include <proj_api.h>
diff --git a/misc/zyGrib/patches/patch-util_Util.h b/misc/zyGrib/patches/patch-util_Util.h
new file mode 100644
index 00000000000..e929d9b9265
--- /dev/null
+++ b/misc/zyGrib/patches/patch-util_Util.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-util_Util.h,v 1.1 2014/12/30 08:50:55 plunky Exp $
+
+zyGrib normally runs in the build directory, but we install data files
+to PREFIX/share/zyGrib, so fix the path part there.
+
+--- util/Util.h.orig	2014-12-27 20:51:22.000000000 +0000
++++ util/Util.h
+@@ -70,16 +70,16 @@ class Util : public QObject
+ 	static QString getOpenFileName (QWidget *parent, const QString &caption, 
+ 							const QString &dir, const QString &filter=QString());
+ 		
+-	static QString pathData ()   {return "./";};
+-	static QString pathColors () {return pathData()+"data/colors/";}
+-	static QString pathConfig () {return pathData()+"data/config/";}
+-	static QString pathFonts ()  {return pathData()+"data/fonts/";}
+-	static QString pathGis ()    {return pathData()+"data/gis/";}
+-	static QString pathGshhs ()  {return pathData()+"data/maps/gshhs/";}
+-	static QString pathStuff ()  {return pathData()+"data/stuff/";}
++	static QString pathData ()   {return "@PREFIX@/share/zyGrib/";};
++	static QString pathColors () {return pathData()+"colors/";}
++	static QString pathConfig () {return pathData()+"config/";}
++	static QString pathFonts ()  {return pathData()+"fonts/";}
++	static QString pathGis ()    {return pathData()+"gis/";}
++	static QString pathGshhs ()  {return pathData()+"maps/gshhs/";}
++	static QString pathStuff ()  {return pathData()+"stuff/";}
+ 	
+-	static QString pathImg (const char *fname) {return pathData()+"data/img/"+fname;}
+-	static QString pathTr  (QString lang)   {return pathData()+"data/tr/zyGrib_"+lang;}
++	static QString pathImg (const char *fname) {return pathData()+"img/"+fname;}
++	static QString pathTr  (QString lang)   {return pathData()+"tr/zyGrib_"+lang;}
+ 	static QString getServerName ();
+ 
+     static void     setSetting (const QString &key, const QVariant &value);