Update to 2.4.6.

pkgsrc change: Switch to new, official upstream, and use official
version numbering scheme
Note that because of this, pkgin fug won't pick up this new version
automatically.

changes since 20190228: portability fixes (which we basically had).

4 files changed, 9 insertions, 248 deletions

diff --git a/geography/opencpn-plugin-watchdog/Makefile b/geography/opencpn-plugin-watchdog/Makefile
index a709b31ecda..f4a08f3bf6e 100644
--- a/geography/opencpn-plugin-watchdog/Makefile
+++ b/geography/opencpn-plugin-watchdog/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.20 2019/07/21 22:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/09/11 15:50:11 bouyer Exp $
 #
 
-VERSION=	20190228
+VERSION=	2.4.6
 DISTNAME=	watchdog_pi-${VERSION}
 PKGNAME=	opencpn-plugin-watchdog-${VERSION}
-PKGREVISION=	1
 #PKGREVISION=	2
 CATEGORIES=	geography
-MASTER_SITES=	${MASTER_SITE_GITHUB:=seandepagnier/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=rgleason/}
 GITHUB_PROJECT=	watchdog_pi
-GITHUB_TAG=	71085bdc4cc90116799c820410fa5d020c8386ee
+GITHUB_TAG=	v${VERSION}
 
 MAINTAINER=	bouyer@NetBSD.org
 HOMEPAGE=	https://opencpn.org/OpenCPN/plugins/watchdog.html
diff --git a/geography/opencpn-plugin-watchdog/distinfo b/geography/opencpn-plugin-watchdog/distinfo
index 8b22e6e146d..ab4448b1c32 100644
--- a/geography/opencpn-plugin-watchdog/distinfo
+++ b/geography/opencpn-plugin-watchdog/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.12 2019/03/25 11:46:50 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2019/09/11 15:50:11 bouyer Exp $
 
-SHA1 (watchdog_pi-20190228-71085bdc4cc90116799c820410fa5d020c8386ee.tar.gz) = d57a3ee68d542f3224e6158bebe50c58cf5ef91c
-RMD160 (watchdog_pi-20190228-71085bdc4cc90116799c820410fa5d020c8386ee.tar.gz) = e42ef867ffcff0b1403b86979cc3d08d93bc1da6
-SHA512 (watchdog_pi-20190228-71085bdc4cc90116799c820410fa5d020c8386ee.tar.gz) = c7ad143616f8425388a85a7cf37d8f6ad63d92d538a51c9b7932aaa8f07f58744c2d5ab8e68d217c4eb7d4a2257de7c50adda894eee765e0af10e8fc0cbac6b4
-Size (watchdog_pi-20190228-71085bdc4cc90116799c820410fa5d020c8386ee.tar.gz) = 480528 bytes
+SHA1 (watchdog_pi-2.4.6.tar.gz) = c166ce31e5f494f5d44fbf3c2cf28914af4cccb2
+RMD160 (watchdog_pi-2.4.6.tar.gz) = a3102e59d1138b777c7db1fa77b54686ca345cb2
+SHA512 (watchdog_pi-2.4.6.tar.gz) = fb4346f2e50d931fe00a6391c9ab95c5a26babe9eeb015788bb32a836527504f2f16d47f72fe972eaf3ccd1a216dee523b7108e525606afb51fc0c54fcf37ce8
+Size (watchdog_pi-2.4.6.tar.gz) = 480546 bytes
 SHA1 (patch-cmake_PluginConfigure.cmake) = bc2d6409f95cffee145173280c33f9e7fe439864
-SHA1 (patch-src_Alarm.cpp) = 04bb807d6c0ea076abbbbad854b29f1d8b5eccc3
-SHA1 (patch-src_watchdog_pi.cpp) = b47afde07f9861d9290989ada590bbb0e82cf7a3
 SHA1 (patch-src_wddc.cpp) = 3c43974da65dfe9a18a77f4b84595a4ab602cfd9
diff --git a/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp b/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp
deleted file mode 100644
index 82355151e98..00000000000
--- a/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-$NetBSD: patch-src_Alarm.cpp,v 1.4 2019/03/25 11:46:50 bouyer Exp $
-
---- src/Alarm.cpp.orig	2019-02-28 05:20:36.000000000 +0100
-+++ src/Alarm.cpp	2019-03-13 17:14:34.899970778 +0100
-@@ -27,6 +27,7 @@
- #include <map>
- 
- #include <wx/wx.h>
-+#include <cmath>
- #include "wddc.h"
- 
- #include <wx/process.h>
-@@ -70,7 +71,7 @@
-     wxString Type() { return _("Anchor"); }
- 
-     bool Test() {
--        if(isnan(g_watchdog_pi->m_sog))
-+        if(std::isnan(g_watchdog_pi->m_sog))
-             return m_bNoData;
-         return Distance() > m_Radius;
-     }
-@@ -87,7 +88,7 @@
- 
-         double anchordist = Distance();
-         wxString s;
--        if(isnan(anchordist))
-+        if(std::isnan(anchordist))
-             s = "N/A";
-         else {
-             wxString fmt("%.0f ");
-@@ -152,7 +153,7 @@
- 
- private:
-     double Distance() {
--        if(isnan(g_watchdog_pi->m_cog))
-+        if(std::isnan(g_watchdog_pi->m_cog))
-             return NAN;
-         PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
- 
-@@ -181,7 +182,7 @@
- 
-     bool Test() {
-         double error = CourseError();
--        if(isnan(error))
-+        if(std::isnan(error))
-             return m_bNoData;
-             
-         return error > m_Tolerance;
-@@ -190,7 +191,7 @@
-     wxString GetStatus() {
-         double courseerror = CourseError();
-         wxString s;
--        if(isnan(courseerror))
-+        if(std::isnan(courseerror))
-             s = "N/A";
-         else {
-             wxString fmt("%.0f ");
-@@ -211,7 +212,7 @@
-         double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2, lat3, lon3;
-         double dist = lastfix.Sog;
- 
--        if(isnan(dist))
-+        if(std::isnan(dist))
-             return;
- 
-         PositionBearingDistanceMercator_Plugin(lat1, lon1, m_Course+m_Tolerance,
-@@ -302,7 +303,7 @@
- 
-     wxString GetStatus() {
-         wxString s;
--        if(isnan(g_watchdog_pi->m_sog))
-+        if(std::isnan(g_watchdog_pi->m_sog))
-             s = "N/A";
-         else {
-             wxString fmt("%.1f");
-@@ -336,7 +337,7 @@
- 
-     bool Test() {
-         double knots = Knots();
--        if(isnan(knots))
-+        if(std::isnan(knots))
-             return m_bNoData;
- 
-         if(m_Mode == UNDERSPEED)
-@@ -391,7 +392,7 @@
-     {
-         Alarm::OnTimer( tEvent );
-         double sog = g_watchdog_pi->LastFix().Sog;
--        if(!isnan(sog))
-+        if(!std::isnan(sog))
-             m_SOGqueue.push_front(sog);
-         while((int)m_SOGqueue.size() > m_iAverageTime)
-             m_SOGqueue.pop_back();
-@@ -453,12 +454,12 @@
-         switch(m_Mode) {
-         case UNDERSPEED:
-         case OVERSPEED:
--            if(isnan(m_speed))
-+            if(std::isnan(m_speed))
-                 return "N/A";
-             else
-                 return wxString::Format(fmt + (m_Mode == UNDERSPEED ? " < " : " > ") + fmt, m_speed, m_dVal);
-         case DIRECTION:
--            if(isnan(m_direction))
-+            if(std::isnan(m_direction))
-                 return "N/A";
-             else
-                 return wxString::Format(fmt + " < " + fmt + " < " + fmt,
-@@ -471,7 +472,7 @@
-     void Render(wdDC &dc, PlugIn_ViewPort &vp) {
-         if(m_Mode != DIRECTION)
-             return;
--        if(isnan(m_direction))
-+        if(std::isnan(m_direction))
-             return;
-         PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
- 
-@@ -645,7 +646,7 @@
-         s += " ";
-         
-         double val = Value();
--        if(isnan(val))
-+        if(std::isnan(val))
-             s += "N/A";
-         else {
-             wxString fmt("%.2f");
-@@ -784,7 +785,7 @@
-                 value = nmea.Mtw.Temperature;
-             break;
-         }
--        if(isnan(value))
-+        if(std::isnan(value))
-             return;
- 
-         m_WeatherDataTime = wxDateTime::Now();
-@@ -966,7 +967,7 @@
-     bool Test() {
-         PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
- 
--        if(isnan(lastfix.Lat))
-+        if(std::isnan(lastfix.Lat))
-             return m_bNoData;
- 
-         double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2;
-@@ -981,7 +982,7 @@
-             while(count < 10 && dist1 > 1e-6) {
-                 PositionBearingDistanceMercator_Plugin
-                     (lastfix.Lat, lastfix.Lon, lastfix.Cog, dist + dist1, &lat2, &lon2);
--                if(!wxIsNaN(lat2) && PlugIn_GSHHS_CrossesLand(lat1, lon1, lat2, lon2)) {
-+                if(!std::isnan(lat2) && PlugIn_GSHHS_CrossesLand(lat1, lon1, lat2, lon2)) {
-                     if(dist1 < 1) {
-                         m_LandFallTime = wxTimeSpan::Seconds(3600.0 * (dist + dist1) / lastfix.Sog);
-                         m_crossinglat1 = lat1, m_crossinglon1 = lon1;
-@@ -1073,7 +1074,7 @@
- 
-     void Render(wdDC &dc, PlugIn_ViewPort &vp) {
-         PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
--        if(isnan(m_crossinglat1))
-+        if(std::isnan(m_crossinglat1))
-             return;
- 
-         wxPoint r1, r2, r3, r4;
-@@ -1235,7 +1236,7 @@
-     bool Test() {
-         PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
- 
--        if(isnan(lastfix.Lat))
-+        if(std::isnan(lastfix.Lat))
-             return m_bNoData;
- 
-         double lat, lon;
-@@ -1273,7 +1274,7 @@
-         
-         switch(m_Mode) {
-             case TIME: {
--                if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon) ||wxIsNaN(lastfix.Cog) || wxIsNaN(lastfix.Sog)) break;
-+                if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon) ||std::isnan(lastfix.Cog) || std::isnan(lastfix.Sog)) break;
-                 if(ODVersionNewerThan( 1, 1, 1)) {
-                     dist = lastfix.Sog * ( m_TimeMinutes / 60 );
-                     PositionBearingDistanceMercator_Plugin(lastfix.Lat, lastfix.Lon, lastfix.Cog, dist, &lat, &lon);
-@@ -1472,7 +1473,7 @@
-                 break;
-             }
-             case DISTANCE: {
--                if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon)) break;
-+                if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon)) break;
-                 // check OD version to see which lookup to use
-                 if( ODVersionNewerThan( 1, 1, 1)) {
-                     BoundaryCrossingList.clear();
-@@ -1700,7 +1701,7 @@
-                 break;
-             }
-             case ANCHOR: {
--                if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon)) break;
-+                if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon)) break;
-                 if(m_BoundaryName == wxEmptyString)
-                     m_BoundaryName = g_BoundaryName;
-                 if(m_BoundaryDescription == wxEmptyString)
-@@ -1731,7 +1732,7 @@
-                 break;
-             }
-             case GUARD: {
--                if(wxIsNaN(g_AISTarget.m_dLat) || wxIsNaN(g_AISTarget.m_dLat)) break;
-+                if(std::isnan(g_AISTarget.m_dLat) || std::isnan(g_AISTarget.m_dLat)) break;
-                 Json::Value jMsg;
-                 Json::FastWriter writer;
-                 jMsg["Source"] = "WATCHDOG_PI";
diff --git a/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp b/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp
deleted file mode 100644
index 3432cb2d6e3..00000000000
--- a/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_watchdog_pi.cpp,v 1.3 2018/08/27 15:59:07 bouyer Exp $
-
---- src/watchdog_pi.cpp.orig	2018-08-25 23:08:44.000000000 +0200
-+++ src/watchdog_pi.cpp	2018-08-27 15:58:48.263716962 +0200
-@@ -26,6 +26,7 @@
- 
- #include <wx/wx.h>
- #include <wx/stdpaths.h>
-+#include <cmath>
- 
- #include "json/json.h"
- 
-@@ -343,14 +344,14 @@
- {
-     /* calculate course and speed over ground from gps */
-     double dt = m_lastfix.FixTime - m_lasttimerfix.FixTime;
--    if(!isnan(m_lastfix.Lat) && !isnan(m_lasttimerfix.Lat) && dt > 0) {
-+    if(!std::isnan(m_lastfix.Lat) && !std::isnan(m_lasttimerfix.Lat) && dt > 0) {
-         /* this way helps avoid surge speed from gps from surfing waves etc... */
-         double cog, sog;
-         DistanceBearingMercator_Plugin(m_lastfix.Lat, m_lastfix.Lon,
-                                        m_lasttimerfix.Lat, m_lasttimerfix.Lon, &cog, &sog);
-         sog *= (3600.0 / dt);
- 
--        if(isnan(m_cog))
-+        if(std::isnan(m_cog))
-             m_cog = cog, m_sog = sog;
-         else {
-             cog = heading_resolve(cog, m_cog);