update zyGrib to 3.5.1

improvements include new weather features (convective available potential
energy - an indicator of potential thunderstorm strength), several new
translations (German, Spanish, Italian, Russian, Dutch) plus bugfixes

5 files changed, 39 insertions, 16 deletions

diff --git a/misc/zyGrib/DESCR b/misc/zyGrib/DESCR
index e6909c565be..908b568af17 100644
--- a/misc/zyGrib/DESCR
+++ b/misc/zyGrib/DESCR
@@ -10,3 +10,4 @@ Weather data display:
     - dew point (degC)
     - altitude of 0C isotherm
     - snow depth and risk
+    - convective available potential energy
diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index 5e3b7519b3b..a920a52a92c 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/05/19 08:59:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/08/07 13:45:01 plunky Exp $
 #
 
-DISTNAME=	zyGrib-3.3.0
+DISTNAME=	zyGrib-3.5.1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.zygrib.org/files/
 EXTRACT_SUFX=	.tgz
@@ -20,7 +20,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_MESSAGE.paths=	Fixing shared data paths.
-SUBST_FILES.paths=	GisReader.cpp MenuBar.cpp MainWindow.cpp main.cpp
+SUBST_FILES.paths=	GisReader.cpp GribAnimator.cpp
+SUBST_FILES.paths+=	MenuBar.cpp MainWindow.cpp main.cpp
 SUBST_SED.paths+=	-e "s|maps/|${PREFIX}/share/zyGrib/maps/|"
 SUBST_SED.paths+=	-e "s|img/|${PREFIX}/share/zyGrib/img/|"
 SUBST_SED.paths+=	-e "s|tr/|${PREFIX}/share/zyGrib/tr/|"
@@ -80,14 +81,24 @@ INSTALL_FILES+=	maps/gshhs/wdb_borders_l.b
 INSTALL_FILES+=	maps/gshhs/wdb_rivers_c.b
 INSTALL_FILES+=	maps/gshhs/wdb_rivers_i.b
 INSTALL_FILES+=	maps/gshhs/wdb_rivers_l.b
+INSTALL_FILES+=	tr/zyGrib_de.qm
+INSTALL_FILES+=	tr/zyGrib_de.ts
 INSTALL_FILES+=	tr/zyGrib_en.qm
 INSTALL_FILES+=	tr/zyGrib_en.ts
+INSTALL_FILES+=	tr/zyGrib_es.qm
+INSTALL_FILES+=	tr/zyGrib_es.ts
+INSTALL_FILES+=	tr/zyGrib_it.qm
+INSTALL_FILES+=	tr/zyGrib_it.ts
+INSTALL_FILES+=	tr/zyGrib_nl.qm
+INSTALL_FILES+=	tr/zyGrib_nl.ts
+INSTALL_FILES+=	tr/zyGrib_ru.qm
+INSTALL_FILES+=	tr/zyGrib_ru.ts
 
 do-configure:
 	cd ${WRKSRC} && ${QTDIR}/bin/qmake
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/zyGrib ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/../zyGrib ${DESTDIR}${PREFIX}/bin
 .for f in ${INSTALL_FILES}
 	${INSTALL_DATA} ${WRKDIR}/zyGrib/${f} ${DESTDIR}${PREFIX}/share/zyGrib/${f}
 .endfor
diff --git a/misc/zyGrib/PLIST b/misc/zyGrib/PLIST
index e9b5b540a45..0aed8ea70b2 100644
--- a/misc/zyGrib/PLIST
+++ b/misc/zyGrib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/02/14 20:55:41 plunky Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/08/07 13:45:01 plunky Exp $
 bin/zyGrib
 share/zyGrib/img/1leftarrow.png
 share/zyGrib/img/1rightarrow.png
@@ -50,5 +50,15 @@ share/zyGrib/maps/gshhs/wdb_borders_l.b
 share/zyGrib/maps/gshhs/wdb_rivers_c.b
 share/zyGrib/maps/gshhs/wdb_rivers_i.b
 share/zyGrib/maps/gshhs/wdb_rivers_l.b
+share/zyGrib/tr/zyGrib_de.qm
+share/zyGrib/tr/zyGrib_de.ts
 share/zyGrib/tr/zyGrib_en.qm
 share/zyGrib/tr/zyGrib_en.ts
+share/zyGrib/tr/zyGrib_es.qm
+share/zyGrib/tr/zyGrib_es.ts
+share/zyGrib/tr/zyGrib_it.qm
+share/zyGrib/tr/zyGrib_it.ts
+share/zyGrib/tr/zyGrib_nl.qm
+share/zyGrib/tr/zyGrib_nl.ts
+share/zyGrib/tr/zyGrib_ru.qm
+share/zyGrib/tr/zyGrib_ru.ts
diff --git a/misc/zyGrib/distinfo b/misc/zyGrib/distinfo
index 6641833981e..d98b2884d76 100644
--- a/misc/zyGrib/distinfo
+++ b/misc/zyGrib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/02/14 20:55:41 plunky Exp $
+$NetBSD: distinfo,v 1.2 2009/08/07 13:45:01 plunky Exp $
 
-SHA1 (zyGrib-3.3.0.tgz) = ad5a9f0854673e5b836f59f7d611cf75bee93c7d
-RMD160 (zyGrib-3.3.0.tgz) = dc221174166ad39bca61df0dc58bb4c97d649a72
-Size (zyGrib-3.3.0.tgz) = 14964263 bytes
-SHA1 (patch-aa) = 6d5169f3db5b6f9a27ae0a8bd777cd7d8c0a8ac1
+SHA1 (zyGrib-3.5.1.tgz) = 322dbc77080a13da85389d1961f55bece1fa1515
+RMD160 (zyGrib-3.5.1.tgz) = c36c4e52b0f15f3c9090aa88dec64e5132292fd0
+Size (zyGrib-3.5.1.tgz) = 15112983 bytes
+SHA1 (patch-aa) = bed5cff6bdd7806b52daf29d80400e5d5d8a69c6
 SHA1 (patch-ab) = 5ebe5d0f4138ebb2c922b255de4dc7afdbcf832e
diff --git a/misc/zyGrib/patches/patch-aa b/misc/zyGrib/patches/patch-aa
index f1267f3c3e9..0cb56c3a135 100644
--- a/misc/zyGrib/patches/patch-aa
+++ b/misc/zyGrib/patches/patch-aa
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/02/14 20:55:41 plunky Exp $
+$NetBSD: patch-aa,v 1.2 2009/08/07 13:45:01 plunky Exp $
 
 libbz2, libz and libproj are all provided by the buildlink3.mk
 framework; no need to use private versions.
 
---- zyGrib.pro.orig	2008-12-18 20:21:44.000000000 +0000
+--- zyGrib.pro.orig	2009-04-10 23:07:17.000000000 +0000
 +++ zyGrib.pro
-@@ -4,8 +4,7 @@ CONFIG += qt
- TEMPLATE = app
- TARGET = 
+@@ -5,8 +5,8 @@ TEMPLATE = app
+ TARGET   = zyGrib
+ 
  DEPENDPATH += .
--INCLUDEPATH += bzip2 zlib-1.2.3 proj-4.6.0/src
+-INCLUDEPATH += GUI bzip2 zlib-1.2.3 proj-4.6.0/src
 -LIBS += -Lbzip2 -lbz2 -Lzlib-1.2.3 -lz -Lproj-4.6.0/src -lproj
++INCLUDEPATH += GUI
 +LIBS += -lbz2 -lz -lproj
  
  win32 {