update to zyGrib 5.1.4

2012-06-03 : zyGrib Version 5.1.4

    New translation: Finnish (paljon kiitoksia Kari Salovaara).
    Bug fixed: memory leak while saving images of animations.
    User can choose the type of wave arrows.

7 files changed, 30 insertions, 49 deletions

diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index 4daada0e785..cb2473f23b3 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2012/03/14 14:49:06 plunky Exp $
+# $NetBSD: Makefile,v 1.28 2012/07/01 07:21:35 plunky Exp $
 #
 
-DISTNAME=	zyGrib-5.1.3
+DISTNAME=	zyGrib-5.1.4
 CATEGORIES=	misc
 MASTER_SITES=	http://www.zygrib.org/getfile.php?file=
 EXTRACT_SUFX=	.tgz
@@ -54,6 +54,8 @@ INSTALL_FILES+=	gis/cities_10k-more.txt.gz
 INSTALL_FILES+=	gis/cities_3k-10k.txt.gz
 INSTALL_FILES+=	gis/countries_en.txt.gz
 INSTALL_FILES+=	gis/countries_fr.txt.gz
+INSTALL_FILES+=	gis/states_en.txt.gz
+INSTALL_FILES+=	gis/stations_metar.txt.gz
 INSTALL_FILES+=	img/1leftarrow.png
 INSTALL_FILES+=	img/1rightarrow.png
 INSTALL_FILES+=	img/2leftarrow.png
@@ -67,6 +69,7 @@ INSTALL_FILES+=	img/drapeau_cz.png
 INSTALL_FILES+=	img/drapeau_de.png
 INSTALL_FILES+=	img/drapeau_en.png
 INSTALL_FILES+=	img/drapeau_es.png
+INSTALL_FILES+=	img/drapeau_fi.png
 INSTALL_FILES+=	img/drapeau_fr.png
 INSTALL_FILES+=	img/drapeau_it.png
 INSTALL_FILES+=	img/drapeau_nl.png
@@ -126,6 +129,8 @@ INSTALL_FILES+=	tr/zyGrib_de.qm
 INSTALL_FILES+=	tr/zyGrib_de.ts
 INSTALL_FILES+=	tr/zyGrib_es.qm
 INSTALL_FILES+=	tr/zyGrib_es.ts
+INSTALL_FILES+=	tr/zyGrib_fi.qm
+INSTALL_FILES+=	tr/zyGrib_fi.ts
 INSTALL_FILES+=	tr/zyGrib_fr.qm
 INSTALL_FILES+=	tr/zyGrib_fr.ts
 INSTALL_FILES+=	tr/zyGrib_it.qm
diff --git a/misc/zyGrib/PLIST b/misc/zyGrib/PLIST
index cc7ea6f30ff..16aa3d79db4 100644
--- a/misc/zyGrib/PLIST
+++ b/misc/zyGrib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/03/14 14:49:06 plunky Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/07/01 07:21:35 plunky Exp $
 bin/zyGrib
 share/zyGrib/colors/colors_binary.txt
 share/zyGrib/colors/colors_cape_jkg.txt
@@ -18,6 +18,8 @@ share/zyGrib/gis/cities_10k-more.txt.gz
 share/zyGrib/gis/cities_3k-10k.txt.gz
 share/zyGrib/gis/countries_en.txt.gz
 share/zyGrib/gis/countries_fr.txt.gz
+share/zyGrib/gis/states_en.txt.gz
+share/zyGrib/gis/stations_metar.txt.gz
 share/zyGrib/img/1leftarrow.png
 share/zyGrib/img/1rightarrow.png
 share/zyGrib/img/2leftarrow.png
@@ -31,6 +33,7 @@ share/zyGrib/img/drapeau_cz.png
 share/zyGrib/img/drapeau_de.png
 share/zyGrib/img/drapeau_en.png
 share/zyGrib/img/drapeau_es.png
+share/zyGrib/img/drapeau_fi.png
 share/zyGrib/img/drapeau_fr.png
 share/zyGrib/img/drapeau_it.png
 share/zyGrib/img/drapeau_nl.png
@@ -90,6 +93,8 @@ share/zyGrib/tr/zyGrib_de.qm
 share/zyGrib/tr/zyGrib_de.ts
 share/zyGrib/tr/zyGrib_es.qm
 share/zyGrib/tr/zyGrib_es.ts
+share/zyGrib/tr/zyGrib_fi.qm
+share/zyGrib/tr/zyGrib_fi.ts
 share/zyGrib/tr/zyGrib_fr.qm
 share/zyGrib/tr/zyGrib_fr.ts
 share/zyGrib/tr/zyGrib_it.qm
diff --git a/misc/zyGrib/distinfo b/misc/zyGrib/distinfo
index e219eb0890e..6a558035f2a 100644
--- a/misc/zyGrib/distinfo
+++ b/misc/zyGrib/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.14 2012/06/15 18:56:57 joerg Exp $
+$NetBSD: distinfo,v 1.15 2012/07/01 07:21:35 plunky Exp $
 
-SHA1 (zyGrib-5.1.3.tgz) = e8965dd6ec1f8cbf13a302540f01b9e42ec4bab2
-RMD160 (zyGrib-5.1.3.tgz) = 8f378d726f076a701b0ed1d529c9ef2195ede29e
-Size (zyGrib-5.1.3.tgz) = 17046935 bytes
-SHA1 (patch-Terrain.cpp) = bb9ffacbf9434cb1288bbd21162aa1e9b165b2e3
-SHA1 (patch-aa) = be561cd1d7d784d09071cde600819ad4bbc41d22
-SHA1 (patch-ab) = dcd400ea957ae6e1f550e4277ce2f5337fc4eac8
-SHA1 (patch-map_Projection__libproj.cpp) = be1db6ab90cc9d6bff84a5bb8d2ec3a43622c7fa
+SHA1 (zyGrib-5.1.4.tgz) = 3a4fe888af4f65b89d10098111c2605140a575c6
+RMD160 (zyGrib-5.1.4.tgz) = 93b201c23e79404bc1d60bae2219a36d9091d443
+Size (zyGrib-5.1.4.tgz) = 17208231 bytes
+SHA1 (patch-Terrain.cpp) = 83a2f54cebd466918ab1267f1c1d94ec0d88d8a4
+SHA1 (patch-aa) = c56e9e8b3621d7b41a259bcf872f1707b8c164b6
+SHA1 (patch-ab) = 7b9abde8a75ce0ebe5e2e35003041b827524af9f
diff --git a/misc/zyGrib/patches/patch-Terrain.cpp b/misc/zyGrib/patches/patch-Terrain.cpp
index 90939d8e565..55c9904857e 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.1 2012/06/15 18:56:58 joerg Exp $
+$NetBSD: patch-Terrain.cpp,v 1.2 2012/07/01 07:21:35 plunky Exp $
 
---- Terrain.cpp.orig	2012-06-15 13:44:42.000000000 +0000
+--- Terrain.cpp.orig	2012-06-03 21:03:41.000000000 +0000
 +++ Terrain.cpp
-@@ -1024,7 +1024,7 @@ void Terrain::paintEvent(QPaintEvent * /
+@@ -1032,7 +1032,7 @@ void Terrain::paintEvent(QPaintEvent * /
              
              if (showOrthodromie)
              {
diff --git a/misc/zyGrib/patches/patch-aa b/misc/zyGrib/patches/patch-aa
index be97438d143..1b25cc85b6c 100644
--- a/misc/zyGrib/patches/patch-aa
+++ b/misc/zyGrib/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.7 2012/03/15 22:46:01 plunky Exp $
+$NetBSD: patch-aa,v 1.8 2012/07/01 07:21:35 plunky Exp $
 
 libbz2, libz and libproj are all provided by the buildlink3.mk
 framework; no need to use private versions.
 
---- zyGrib.pro.orig	2012-03-11 20:26:38.000000000 +0000
+--- zyGrib.pro.orig	2012-06-03 21:03:41.000000000 +0000
 +++ zyGrib.pro
 @@ -5,7 +5,7 @@ TEMPLATE = app
  TARGET   = zyGrib
diff --git a/misc/zyGrib/patches/patch-ab b/misc/zyGrib/patches/patch-ab
index f30cf779173..41fd40c77c9 100644
--- a/misc/zyGrib/patches/patch-ab
+++ b/misc/zyGrib/patches/patch-ab
@@ -1,22 +1,13 @@
-$NetBSD: patch-ab,v 1.4 2012/03/15 22:46:01 plunky Exp $
+$NetBSD: patch-ab,v 1.5 2012/07/01 07:21:35 plunky Exp $
 
---- map/Projection.h.orig	2012-03-11 20:26:38.000000000 +0000
+--- map/Projection.h.orig	2012-06-03 21:03:41.000000000 +0000
 +++ map/Projection.h
 @@ -20,7 +20,7 @@ along with this program.  If not, see <h
  #define PROJECTION_H
  #include <QObject>
  
--#include "projects.h"		// libproj
-+#include <proj_api.h>		// libproj
- 
+-#include "proj_api.h"
++#include <proj_api.h>
  
  class Projection : public QObject
-@@ -136,7 +136,7 @@ class Projection_libproj : public Projec
- 		int   getProjection()   {return currentProj;}
- 
- 	private :
--		PJ   *libProj;
-+		projPJ libProj;
- 		int  currentProj;
- };
- 
+ {
diff --git a/misc/zyGrib/patches/patch-map_Projection__libproj.cpp b/misc/zyGrib/patches/patch-map_Projection__libproj.cpp
deleted file mode 100644
index c5043f652d2..00000000000
--- a/misc/zyGrib/patches/patch-map_Projection__libproj.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-map_Projection__libproj.cpp,v 1.1 2012/03/15 22:46:01 plunky Exp $
-
---- map/Projection_libproj.cpp.orig	2012-03-15 16:25:37.000000000 +0000
-+++ map/Projection_libproj.cpp
-@@ -90,13 +90,13 @@ void Projection_libproj::setProjection(i
- 	}
- 	params[nbpar++] = (char*) "ellps=WGS84";
- 	params[nbpar++] = (char*) "no_defs";
-+	params[nbpar++] = (char*) "over";	// allow longitude > 180°
- 
- 	libProj = pj_init(nbpar, params);
- 	if (!libProj)
- 		printf("proj error: %s\n", pj_strerrno(pj_errno));
- 	assert(libProj);
- 	currentProj = code;
--	libProj->over = 1;		// allow longitude > 180°
- //printf("Projection: %s\n", libProj->descr);
- }
-