Update opencpn to 4.4.0.

Changes since 4.2.0:
The 4.4.0 Release is primarily a bug-fix/maintenance update.
There is one new feature, however.
The integrated GRIB PlugIn now supports GRIB V2 format files. This update
enables some new sources for worldwide GRIB data from a variety of sources.

6 files changed, 121 insertions, 132 deletions

diff --git a/geography/opencpn/Makefile b/geography/opencpn/Makefile
index d0be37e8546..e6d644af039 100644
--- a/geography/opencpn/Makefile
+++ b/geography/opencpn/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2016/05/25 14:38:48 bouyer Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/16 15:52:56 bouyer Exp $
 #
 
-VERSION=	4.2.0
-PKGREVISION=	1
+VERSION=	4.4.0
+#PKGREVISION=	0
 DISTNAME=	OpenCPN-${VERSION}
 PKGNAME=	opencpn-${VERSION}
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenCPN/}
 GITHUB_PROJECT=	OpenCPN
-GITHUB_TAG=	a555b4988b50f555be052394c184ef26c5ad0e8a
+GITHUB_TAG=	ec4fb21cf1f8f0a8e6bd6768a235699fc76848a2
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	bouyer@NetBSD.org
diff --git a/geography/opencpn/PLIST b/geography/opencpn/PLIST
index 6bc7fc21ecc..5fc05fff7ed 100644
--- a/geography/opencpn/PLIST
+++ b/geography/opencpn/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/03/14 11:01:06 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/06/16 15:52:56 bouyer Exp $
 bin/opencpn
 lib/opencpn/libchartdldr_pi.so
 lib/opencpn/libdashboard_pi.so
@@ -9,130 +9,118 @@ share/doc/opencpn/changelog.Debian.gz
 share/doc/opencpn/copyright
 share/icons/hicolor/48x48/apps/opencpn.png
 share/icons/hicolor/scalable/apps/opencpn.svg
-share/locale/ca/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/ca/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/ca/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/ca/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/ca_ES/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/ca_ES/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/ca_ES/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/ca_ES/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/ca_ES/LC_MESSAGES/opencpn.mo
-share/locale/cs/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/cs/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/cs/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/cs/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/cs/LC_MESSAGES/opencpn.mo
-share/locale/da/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/da/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/da/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/da/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/cs_CZ/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/cs_CZ/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/cs_CZ/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/cs_CZ/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/da/LC_MESSAGES/opencpn.mo
-share/locale/de/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/de/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/de/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/de/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/da_DK/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/da_DK/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/da_DK/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/da_DK/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/de/LC_MESSAGES/opencpn.mo
-share/locale/el/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/el/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/el/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/el/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/de_DE/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/de_DE/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/de_DE/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/de_DE/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/el_GR/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/el_GR/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/el_GR/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/el_GR/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/el_GR/LC_MESSAGES/opencpn.mo
-share/locale/es/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/es/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/es/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/es/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/es/LC_MESSAGES/opencpn.mo
-share/locale/et/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/et/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/et/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/et/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/es_ES/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/es_ES/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/es_ES/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/es_ES/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/et/LC_MESSAGES/opencpn.mo
-share/locale/fi/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/fi/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/fi/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/fi/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/et_EE/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/et_EE/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/et_EE/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/et_EE/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/fi_FI/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/fi_FI/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/fi_FI/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/fi_FI/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/fi_FI/LC_MESSAGES/opencpn.mo
-share/locale/fr/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/fr/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/fr/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/fr/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/fr/LC_MESSAGES/opencpn.mo
-share/locale/gl/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/gl/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/gl/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/gl/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/fr_FR/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/fr_FR/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/fr_FR/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/fr_FR/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/gl_ES/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/gl_ES/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/gl_ES/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/gl_ES/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/gl_ES/LC_MESSAGES/opencpn.mo
-share/locale/hu/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/hu/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/hu/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/hu/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/hu_HU/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/hu_HU/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/hu_HU/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/hu_HU/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/hu_HU/LC_MESSAGES/opencpn.mo
-share/locale/it/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/it/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/it/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/it/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/it/LC_MESSAGES/opencpn.mo
-share/locale/ja/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/ja/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/ja/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/ja/LC_MESSAGES/opencpn-wmm_pi.mo
-share/locale/nb/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/nb/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/nb/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/nb/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/it_IT/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/it_IT/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/it_IT/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/it_IT/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/ja_JP/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/ja_JP/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/ja_JP/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/ja_JP/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/nb_NO/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/nb_NO/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/nb_NO/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/nb_NO/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/nb_NO/LC_MESSAGES/opencpn.mo
-share/locale/nl/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/nl/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/nl/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/nl/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/nl/LC_MESSAGES/opencpn.mo
-share/locale/pl/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/pl/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/pl/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pl/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/nl_NL/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/nl_NL/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/nl_NL/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/nl_NL/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/pl/LC_MESSAGES/opencpn.mo
+share/locale/pl_PL/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/pl_PL/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/pl_PL/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pt/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/pt/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/pt/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pt/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/pl_PL/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/pt_BR/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/pt_BR/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/pt_BR/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/pt_BR/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/pt_BR/LC_MESSAGES/opencpn.mo
+share/locale/pt_PT/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/pt_PT/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/pt_PT/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/pt_PT/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/pt_PT/LC_MESSAGES/opencpn.mo
-share/locale/ru/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/ru/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/ru/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/ru/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/ru/LC_MESSAGES/opencpn.mo
-share/locale/sv/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/sv/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/sv/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/sv/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/ru_RU/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/ru_RU/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/ru_RU/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/ru_RU/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/sv/LC_MESSAGES/opencpn.mo
-share/locale/tr/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/tr/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/tr/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/tr/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/sv_SE/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/sv_SE/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/sv_SE/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/sv_SE/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/tr_TR/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/tr_TR/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/tr_TR/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/tr_TR/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/tr_TR/LC_MESSAGES/opencpn.mo
-share/locale/vi/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/vi/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/vi/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/zh/LC_MESSAGES/opencpn-chartdldr_pi.mo
-share/locale/zh/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/zh/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/zh/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/vi_VN/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/vi_VN/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/vi_VN/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/vi_VN/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/zh_TW/LC_MESSAGES/opencpn-chartdldr_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn-dashboard_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/zh_TW/LC_MESSAGES/opencpn-wmm_pi.mo
 share/locale/zh_TW/LC_MESSAGES/opencpn.mo
 share/opencpn/doc/help_en_US.html
 share/opencpn/doc/help_web.html
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo
index d0f3d81d06a..31ce1b311dd 100644
--- a/geography/opencpn/distinfo
+++ b/geography/opencpn/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2016/05/25 14:38:48 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2016/06/16 15:52:56 bouyer Exp $
 
-SHA1 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 39baa5f89ded9a5c62824e6e1445dbfc4f168578
-RMD160 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = d344b9caffe40dabcad1d9ac148ce54d75f1573c
-SHA512 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 3ea2136ab777f711aeaa66f34722b3b091af91104ff60303b61c587f95354826afae6dbc8f6a9228357399ae36e96a34098596c0a278d2184ce59283c88f4051
-Size (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 42779485 bytes
+SHA1 (OpenCPN-4.4.0-ec4fb21cf1f8f0a8e6bd6768a235699fc76848a2.zip) = fe8ca6924a1c73f25eea75b8c353f7fb162fc101
+RMD160 (OpenCPN-4.4.0-ec4fb21cf1f8f0a8e6bd6768a235699fc76848a2.zip) = 625a0749673dd7353c1fa66254018e3e886abb5b
+SHA512 (OpenCPN-4.4.0-ec4fb21cf1f8f0a8e6bd6768a235699fc76848a2.zip) = 0c3cc19be09ee1c4c8a4abf634715252f5248d3b714930d17d304737080c64188dc1601a3ae751cb52e2a94b27ce8d48f968a80e410ef6386d95661baec44ed2
+Size (OpenCPN-4.4.0-ec4fb21cf1f8f0a8e6bd6768a235699fc76848a2.zip) = 43115502 bytes
 SHA1 (patch-CMakeLists.txt) = c61ed69c19d98bc5407cd28857b21d5158c9c1f9
 SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
 SHA1 (patch-plugins_chartdldr_pi_CMakeLists.txt) = 52962f6feac45a766fc2dff08d2802e946ccfc85
@@ -11,11 +11,10 @@ SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 29fbfaee37e2a932
 SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da180c263c231e
 SHA1 (patch-plugins_demo_pi_sample_CMakeLists.txt) = 6fde2dae588e0d8250bd1e0d60a465fb20d9a599
 SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49
+SHA1 (patch-plugins_grib_pi_src_GribUIDialog.cpp) = 7cc1efa50569eff2d398bfc476a0b5f929bb6c3b
 SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046
 SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a
 SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
-SHA1 (patch-src_chartimg.cpp) = f0e3841ab1920dcab74462a5007b74e905d794c0
-SHA1 (patch-src_chcanv.cpp) = af76f36b6fd6d613720945195d5a24902012a020
 SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
 SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62
 SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
diff --git a/geography/opencpn/patches/patch-plugins_grib_pi_src_GribUIDialog.cpp b/geography/opencpn/patches/patch-plugins_grib_pi_src_GribUIDialog.cpp
new file mode 100644
index 00000000000..f1b5b7bd93a
--- /dev/null
+++ b/geography/opencpn/patches/patch-plugins_grib_pi_src_GribUIDialog.cpp
@@ -0,0 +1,35 @@
+$NetBSD: patch-plugins_grib_pi_src_GribUIDialog.cpp,v 1.1 2016/06/16 15:52:56 bouyer Exp $
+
+from https://github.com/OpenCPN/OpenCPN/pull/662
+fix grib plugin timeline request from crashing when no grib file is loaded
+
+--- plugins/grib_pi/src/GribUIDialog.cpp.orig
++++ plugins/grib_pi/src/GribUIDialog.cpp
+@@ -1251,11 +1251,14 @@ wxDateTime GRIBUICtrlBar::TimelineTime()
+         int tl = (m_TimeLineHours == 0) ? 0 : m_sTimeline->GetValue();
+         int stepmin = m_OverlaySettings.GetMinFromIndex(m_OverlaySettings.m_SlicesPerUpdate);
+         return MinTime() + wxTimeSpan( tl * stepmin / 60, (tl * stepmin) % 60 );
+-    } else {
+-        ArrayOfGribRecordSets *rsa = m_bGRIBActiveFile->GetRecordSetArrayPtr();
+-        int index = m_cRecordForecast->GetCurrentSelection() < 1 ? 0 : m_cRecordForecast->GetCurrentSelection();
+-        return rsa->Item(index).m_Reference_Time;
+     }
++    
++    ArrayOfGribRecordSets *rsa = m_bGRIBActiveFile->GetRecordSetArrayPtr();
++    int index = m_cRecordForecast->GetCurrentSelection() < 1 ? 0 : m_cRecordForecast->GetCurrentSelection();
++    if(rsa && index<rsa->GetCount())
++        return rsa->Item(index).m_Reference_Time;        
++
++    return wxDateTime::Now();
+ }
+ 
+ wxDateTime GRIBUICtrlBar::MinTime()
+@@ -1265,7 +1268,7 @@ wxDateTime GRIBUICtrlBar::MinTime()
+         GribRecordSet &first = rsa->Item(0);
+         return first.m_Reference_Time;
+     }
+-    return wxDateTime(0.0);
++    return wxDateTime::Now();
+ }
+ 
+ GribTimelineRecordSet* GRIBUICtrlBar::GetTimeLineRecordSet(wxDateTime time)
diff --git a/geography/opencpn/patches/patch-src_chartimg.cpp b/geography/opencpn/patches/patch-src_chartimg.cpp
deleted file mode 100644
index d9ee9a58f1a..00000000000
--- a/geography/opencpn/patches/patch-src_chartimg.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_chartimg.cpp,v 1.1 2016/03/14 11:01:06 bouyer Exp $
-From master:
-https://github.com/OpenCPN/OpenCPN/commit/39f9b1af047330d0a8ea3a72ac66ddb15ff96285
-
---- src/chartimg.cpp.orig
-+++ src/chartimg.cpp
-@@ -2886,7 +2886,7 @@ void ChartBaseBSB::latlong_to_chartpix(double lat, double lon, double &pixx, dou
-                   alat = lat + m_lat_datum_adjust;
- 
-                 //      Get e/n from  Projection
--                  xlon = AdjustLongitude(xlon);
-+                  xlon = AdjustLongitude(alon);
- 
-                   toSM_ECC(alat, xlon, m_proj_lat, m_proj_lon, &easting, &northing);
-
diff --git a/geography/opencpn/patches/patch-src_chcanv.cpp b/geography/opencpn/patches/patch-src_chcanv.cpp
deleted file mode 100644
index f0035124ccc..00000000000
--- a/geography/opencpn/patches/patch-src_chcanv.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_chcanv.cpp,v 1.1 2016/03/14 11:01:06 bouyer Exp $
-From master:
-https://github.com/OpenCPN/OpenCPN/commit/39c0b7c3367181ed92adfe0e41d59b7fb65d3a9a
-
---- src/chcanv.cpp.orig
-+++ src/chcanv.cpp
-@@ -10172,6 +10172,11 @@ void ChartCanvas::DrawAllRoutesInBBox( ocpnDC& dc, LLBBox& BltBBox, const wxRegi
-                 continue;
-             }
- 
-+            if ( 0 == pRouteDraw->GetnPoints() ) {
-+                node = node->GetNext();
-+                continue;
-+            }
-+            
-             LLBBox test_box = pRouteDraw->GetBBox();
- 
-             if( b_run ) test_box.Expand( gLon, gLat );