update to zyGrib version 4.0.1:

# 2011-05-21 : zyGrib Version 4.0.1

    * User can choose visible data in the left board (right clic in the panel).
    * Bug fixed: crash sometimes with data out of the "normal" range.

# 2011-05-08 : zyGrib Version 4.0

    * NOAA data up to 8 days rather than 7.
    * Color scales.
    * Data values panel can be hidden (Ctrl+V).
    * Colors scale panel can be hidden (Ctrl+Y).
    * Warning : changes in directories structure.
    * Totally new colors scheme.
      Color scales are editable (text files colors_xxx.txt).
          o 1 ligne per threshold : v r g b
            v = threshold value
            r g b = rgb level (red, green, blue) between 0 and 255
          o values must be in ascending order
          o color is attributed to values ##less than or equal to v
            except the last which is also the color of all excess values##
          o fixed color (no interpolation) below the first value or above the last.
    * More complete list of cities (source GeoNames)
      Around 60,000 cities come with zygrib (population >= 3000).
      Around 100,000 smaller cities are available in additional files (see download page).
    * New population threshold for shown cities:
         1. population >= 1000000
         2. population >= 100000
         3. population >= 10000
         4. population >= 1000
         5. population < 1000
    * Bug fixed : values displayed for the position under the mouse are updated when the date is changed using the keyboard.
    * Bug fixed : crash (sometimes) when the mouse was moved on a POI while reading aa grib file.

4 files changed, 60 insertions, 25 deletions

diff --git a/misc/zyGrib/DESCR b/misc/zyGrib/DESCR
index ed2d6d56c25..48340636e76 100644
--- a/misc/zyGrib/DESCR
+++ b/misc/zyGrib/DESCR
@@ -1,9 +1,10 @@
-Download and display weather data contained in GRIB1 files.
+Download and display Meteorological data in GRIB Format 1 files.
 
 Weather data display:
     - Surface Pressure
     - Wind 10 m above mean sea level
-    - Temperature 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)
diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile
index ab5d02a090e..2b22145ab39 100644
--- a/misc/zyGrib/Makefile
+++ b/misc/zyGrib/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2011/04/22 13:44:14 obache Exp $
+# $NetBSD: Makefile,v 1.18 2011/06/17 15:57:13 plunky Exp $
 #
 
-DISTNAME=	zyGrib-3.9.9.1
-PKGREVISION=	1
+DISTNAME=	zyGrib-4.0.1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.zygrib.org/getfile.php?file=
 EXTRACT_SUFX=	.tgz
@@ -25,18 +24,33 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_MESSAGE.paths=	Fixing shared data paths.
-SUBST_FILES.paths=	map/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/|"
+SUBST_FILES.paths=	util/Util.h
+SUBST_SED.paths+=	-e "s|\"data/|\"${PREFIX}/share/zyGrib/|"
 
-INSTALLATION_DIRS+=	bin share/zyGrib/img
-INSTALLATION_DIRS+=	share/zyGrib/maps/gis
+INSTALLATION_DIRS+=	bin
+INSTALLATION_DIRS+=	share/zyGrib/colors
+INSTALLATION_DIRS+=	share/zyGrib/config
+INSTALLATION_DIRS+=	share/zyGrib/gis
+INSTALLATION_DIRS+=	share/zyGrib/img
 INSTALLATION_DIRS+=	share/zyGrib/maps/gshhs
+INSTALLATION_DIRS+=	share/zyGrib/stuff
 INSTALLATION_DIRS+=	share/zyGrib/tr
 
-INSTALL_FILES=	img/1leftarrow.png
+INSTALL_FILES+=	colors/colors_binary.txt
+INSTALL_FILES+=	colors/colors_cape_jkg.txt
+INSTALL_FILES+=	colors/colors_clouds_black_pc.txt
+INSTALL_FILES+=	colors/colors_clouds_white_pc.txt
+INSTALL_FILES+=	colors/colors_deltatemp_celcius.txt
+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_wind_kts.txt
+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+=	img/1leftarrow.png
 INSTALL_FILES+=	img/1rightarrow.png
 INSTALL_FILES+=	img/2leftarrow.png
 INSTALL_FILES+=	img/2rightarrow.png
@@ -60,6 +74,7 @@ INSTALL_FILES+=	img/forward.png
 INSTALL_FILES+=	img/help.png
 INSTALL_FILES+=	img/info.png
 INSTALL_FILES+=	img/media-floppy.png
+INSTALL_FILES+=	img/meteoblue.png
 INSTALL_FILES+=	img/network.png
 INSTALL_FILES+=	img/player_eject.png
 INSTALL_FILES+=	img/player_end.png
@@ -71,14 +86,15 @@ INSTALL_FILES+=	img/player_rew.png
 INSTALL_FILES+=	img/player_start.png
 INSTALL_FILES+=	img/player_stop.png
 INSTALL_FILES+=	img/reload.png
+INSTALL_FILES+=	img/resource.rc
 INSTALL_FILES+=	img/up.png
 INSTALL_FILES+=	img/viewmag+.png
 INSTALL_FILES+=	img/viewmag-.png
 INSTALL_FILES+=	img/viewmag1.png
 INSTALL_FILES+=	img/viewmagfit.png
-INSTALL_FILES+=	maps/gis/cities.txt.gz
-INSTALL_FILES+=	maps/gis/countries_en.txt.gz
-INSTALL_FILES+=	maps/gis/countries_fr.txt.gz
+INSTALL_FILES+=	img/zyGrib.icns
+INSTALL_FILES+=	img/zyGrib_32.ico
+INSTALL_FILES+=	img/zyGrib_32.xpm
 INSTALL_FILES+=	maps/gshhs/README.gshhs
 INSTALL_FILES+=	maps/gshhs/README.gshhs.rangs
 INSTALL_FILES+=	maps/gshhs/gshhs_2.rim
@@ -96,6 +112,7 @@ 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+=	stuff/boat_parameters.csv
 INSTALL_FILES+=	tr/zyGrib_cz.qm
 INSTALL_FILES+=	tr/zyGrib_cz.ts
 INSTALL_FILES+=	tr/zyGrib_de.qm
@@ -117,7 +134,7 @@ do-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zyGrib ${DESTDIR}${PREFIX}/bin
 .for f in ${INSTALL_FILES}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/${f} ${DESTDIR}${PREFIX}/share/zyGrib/${f}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/data/${f} ${DESTDIR}${PREFIX}/share/zyGrib/${f}
 .endfor
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/misc/zyGrib/PLIST b/misc/zyGrib/PLIST
index 9f16a4f3f71..0350a0a3351 100644
--- a/misc/zyGrib/PLIST
+++ b/misc/zyGrib/PLIST
@@ -1,5 +1,19 @@
-@comment $NetBSD: PLIST,v 1.3 2010/10/16 06:50:52 plunky Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/06/17 15:57:13 plunky Exp $
 bin/zyGrib
+share/zyGrib/colors/colors_binary.txt
+share/zyGrib/colors/colors_cape_jkg.txt
+share/zyGrib/colors/colors_clouds_black_pc.txt
+share/zyGrib/colors/colors_clouds_white_pc.txt
+share/zyGrib/colors/colors_deltatemp_celcius.txt
+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_wind_kts.txt
+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/img/1leftarrow.png
 share/zyGrib/img/1rightarrow.png
 share/zyGrib/img/2leftarrow.png
@@ -24,6 +38,7 @@ share/zyGrib/img/forward.png
 share/zyGrib/img/help.png
 share/zyGrib/img/info.png
 share/zyGrib/img/media-floppy.png
+share/zyGrib/img/meteoblue.png
 share/zyGrib/img/network.png
 share/zyGrib/img/player_eject.png
 share/zyGrib/img/player_end.png
@@ -35,14 +50,15 @@ share/zyGrib/img/player_rew.png
 share/zyGrib/img/player_start.png
 share/zyGrib/img/player_stop.png
 share/zyGrib/img/reload.png
+share/zyGrib/img/resource.rc
 share/zyGrib/img/up.png
 share/zyGrib/img/viewmag+.png
 share/zyGrib/img/viewmag-.png
 share/zyGrib/img/viewmag1.png
 share/zyGrib/img/viewmagfit.png
-share/zyGrib/maps/gis/cities.txt.gz
-share/zyGrib/maps/gis/countries_en.txt.gz
-share/zyGrib/maps/gis/countries_fr.txt.gz
+share/zyGrib/img/zyGrib.icns
+share/zyGrib/img/zyGrib_32.ico
+share/zyGrib/img/zyGrib_32.xpm
 share/zyGrib/maps/gshhs/README.gshhs
 share/zyGrib/maps/gshhs/README.gshhs.rangs
 share/zyGrib/maps/gshhs/gshhs_2.rim
@@ -60,6 +76,7 @@ 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/stuff/boat_parameters.csv
 share/zyGrib/tr/zyGrib_cz.qm
 share/zyGrib/tr/zyGrib_cz.ts
 share/zyGrib/tr/zyGrib_de.qm
diff --git a/misc/zyGrib/distinfo b/misc/zyGrib/distinfo
index 9fd7c817e6a..5c5256ace67 100644
--- a/misc/zyGrib/distinfo
+++ b/misc/zyGrib/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2011/03/21 11:44:58 plunky Exp $
+$NetBSD: distinfo,v 1.8 2011/06/17 15:57:13 plunky Exp $
 
-SHA1 (zyGrib-3.9.9.1.tgz) = 9d76da4740af04f9b3d156a077fe726047bfeff5
-RMD160 (zyGrib-3.9.9.1.tgz) = 37d941a6279b2d1ffc17b8c4807864458965fe0d
-Size (zyGrib-3.9.9.1.tgz) = 16643813 bytes
+SHA1 (zyGrib-4.0.1.tgz) = bcf231220ddeb4a69d3d61c8c719a35f87d17071
+RMD160 (zyGrib-4.0.1.tgz) = 9672bd90effd50abe7001428824a3cf28a325f82
+Size (zyGrib-4.0.1.tgz) = 16935568 bytes
 SHA1 (patch-aa) = c15ab1aa116a6d81477e173bb246fc7c5bee1d18
 SHA1 (patch-ab) = 0be80e7d5b784da70b65db3eb7d31aa62f660a1d