diff options
Diffstat (limited to 'misc/zyGrib')
| -rw-r--r-- | misc/zyGrib/DESCR | 2 | ||||
| -rw-r--r-- | misc/zyGrib/Makefile | 14 | ||||
| -rw-r--r-- | misc/zyGrib/PLIST | 9 | ||||
| -rw-r--r-- | misc/zyGrib/distinfo | 12 | ||||
| -rw-r--r-- | misc/zyGrib/patches/patch-aa | 26 | ||||
| -rw-r--r-- | misc/zyGrib/patches/patch-ab | 4 |
6 files changed, 38 insertions, 29 deletions
diff --git a/misc/zyGrib/DESCR b/misc/zyGrib/DESCR index 48340636e76..efebd1d92ea 100644 --- a/misc/zyGrib/DESCR +++ b/misc/zyGrib/DESCR @@ -15,3 +15,5 @@ Weather data display: - CAPE (convective available potential energy) at earth level. - Data in altitude (850, 700, 500, 300, 200 hPa) : geopotential altitude, wind, temperature, theta-e, relative humidity. + - Waves : height, direction, period, whitecap probability, for wind waves, + swell, and for significant, maximum, primary, secondary waves. diff --git a/misc/zyGrib/Makefile b/misc/zyGrib/Makefile index 38cbe3928ba..87bc5f81f0c 100644 --- a/misc/zyGrib/Makefile +++ b/misc/zyGrib/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2012/03/03 00:13:38 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2012/03/09 10:22:33 plunky Exp $ # -DISTNAME= zyGrib-5.0.6 -PKGREVISION= 5 +DISTNAME= zyGrib-5.1.2 CATEGORIES= misc MASTER_SITES= http://www.zygrib.org/getfile.php?file= EXTRACT_SUFX= .tgz @@ -41,11 +40,15 @@ 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_current_kts.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_waveheight_m.txt +INSTALL_FILES+= colors/colors_whitecap_prb.txt +INSTALL_FILES+= colors/colors_whitecap_prb.txt.colors 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/anim.png INSTALL_FILES+= img/back.png INSTALL_FILES+= img/connect_no.png INSTALL_FILES+= img/down.png +INSTALL_FILES+= img/drapeau_ar.png INSTALL_FILES+= img/drapeau_cz.png INSTALL_FILES+= img/drapeau_de.png INSTALL_FILES+= img/drapeau_en.png @@ -114,6 +118,8 @@ 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_ar.qm +INSTALL_FILES+= tr/zyGrib_ar.ts INSTALL_FILES+= tr/zyGrib_cz.qm INSTALL_FILES+= tr/zyGrib_cz.ts INSTALL_FILES+= tr/zyGrib_de.qm @@ -144,5 +150,5 @@ do-install: .include "../../security/openssl/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" -.include "../../x11/qwt-qt4/buildlink3.mk" +.include "../../x11/qwt6-qt4/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/zyGrib/PLIST b/misc/zyGrib/PLIST index 0350a0a3351..9ef43570c5f 100644 --- a/misc/zyGrib/PLIST +++ b/misc/zyGrib/PLIST @@ -1,14 +1,18 @@ -@comment $NetBSD: PLIST,v 1.4 2011/06/17 15:57:13 plunky Exp $ +@comment $NetBSD: PLIST,v 1.5 2012/03/09 10:22:33 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_current_kts.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_waveheight_m.txt +share/zyGrib/colors/colors_whitecap_prb.txt +share/zyGrib/colors/colors_whitecap_prb.txt.colors share/zyGrib/colors/colors_wind_kts.txt share/zyGrib/gis/cities_10k-more.txt.gz share/zyGrib/gis/cities_3k-10k.txt.gz @@ -22,6 +26,7 @@ share/zyGrib/img/anim.png share/zyGrib/img/back.png share/zyGrib/img/connect_no.png share/zyGrib/img/down.png +share/zyGrib/img/drapeau_ar.png share/zyGrib/img/drapeau_cz.png share/zyGrib/img/drapeau_de.png share/zyGrib/img/drapeau_en.png @@ -77,6 +82,8 @@ 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_ar.qm +share/zyGrib/tr/zyGrib_ar.ts 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 27a757f9219..4bac7558044 100644 --- a/misc/zyGrib/distinfo +++ b/misc/zyGrib/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2011/10/04 08:59:02 plunky Exp $ +$NetBSD: distinfo,v 1.11 2012/03/09 10:22:33 plunky Exp $ -SHA1 (zyGrib-5.0.6.tgz) = f5cb47b4eb24536de2d5aac5cb404c91e9e0518b -RMD160 (zyGrib-5.0.6.tgz) = 3588a22a08206a20eedf4c3218066bd5f1708367 -Size (zyGrib-5.0.6.tgz) = 16958321 bytes -SHA1 (patch-aa) = 246b64ed3dabbc582b6cc9afde998d7b5257df40 -SHA1 (patch-ab) = 0be80e7d5b784da70b65db3eb7d31aa62f660a1d +SHA1 (zyGrib-5.1.2.tgz) = 2e3615eba33fb7bbd027cc355a7752d3db7356ed +RMD160 (zyGrib-5.1.2.tgz) = 29c5f42a8ed0c7986ef421fda237f5bcb4d68b58 +Size (zyGrib-5.1.2.tgz) = 17007590 bytes +SHA1 (patch-aa) = 81d67e6ea4e7191752f0f3ea1a757867360be140 +SHA1 (patch-ab) = a65348d043e260835cbf5c832998a7eecb0ad6ea diff --git a/misc/zyGrib/patches/patch-aa b/misc/zyGrib/patches/patch-aa index bca8eba3479..81e7aefe88f 100644 --- a/misc/zyGrib/patches/patch-aa +++ b/misc/zyGrib/patches/patch-aa @@ -1,30 +1,24 @@ -$NetBSD: patch-aa,v 1.5 2011/07/30 21:27:37 plunky Exp $ +$NetBSD: patch-aa,v 1.6 2012/03/09 10:22:33 plunky Exp $ libbz2, libz and libproj are all provided by the buildlink3.mk framework; no need to use private versions. ---- zyGrib.pro.orig 2011-07-15 11:41:40.000000000 +0100 -+++ zyGrib.pro 2011-07-30 21:51:05.000000000 +0100 -@@ -5,10 +5,10 @@ +--- zyGrib.pro.orig 2012-02-26 09:02:53.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 += curvedrawer --LIBS += -Lbzip2 -lbz2 -Lzlib-1.2.3 -lz -Lproj-4.6.0/src -lproj -+LIBS += -lbz2 -lz -lproj - - # ---------------------------------------------------- - # platform specific -@@ -28,8 +28,7 @@ - ICON = ../img/zyGrib.icns + # LIBS += -Lbzip2 -lbz2 -Lzlib-1.2.3 -lz -Lproj-4.6.0/src -lproj +@@ -31,7 +31,6 @@ macx { + ICON = ../data/img/zyGrib.icns } else { -- INCLUDEPATH += /usr/include/qwt-qt4/ -- LIBS += -lqwt-qt4 -+ LIBS += -lqwt +- INCLUDEPATH += /usr/include/qwt + LIBS += -lbz2 -lz -lproj -lqwt DESTDIR = . } - } diff --git a/misc/zyGrib/patches/patch-ab b/misc/zyGrib/patches/patch-ab index dba660f8953..a3670b015e4 100644 --- a/misc/zyGrib/patches/patch-ab +++ b/misc/zyGrib/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2010/10/16 06:50:52 plunky Exp $ +$NetBSD: patch-ab,v 1.3 2012/03/09 10:22:33 plunky Exp $ ---- map/Projection.h.orig 2008-11-07 17:34:23.000000000 +0000 +--- map/Projection.h.orig 2012-02-26 09:02:53.000000000 +0000 +++ map/Projection.h @@ -20,7 +20,7 @@ along with this program. If not, see <h #define PROJECTION_H |