head	1.3;
access;
symbols
	pkgsrc-2018Q4:1.2.0.4
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.2
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.1.0.2
	pkgsrc-2018Q2-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2019.03.25.11.34.05;	author bouyer;	state dead;
branches;
next	1.2;
commitid	sWRCoAcXGnNnSJgB;

1.2
date	2018.07.03.15.14.15;	author bouyer;	state Exp;
branches;
next	1.1;
commitid	CLj3CV7XlcKRCHIA;

1.1
date	2018.04.09.18.44.50;	author bouyer;	state Exp;
branches
	1.1.2.1;
next	;
commitid	jRj8Je3gx6OEwNxA;

1.1.2.1
date	2018.08.18.10.31.59;	author bsiegert;	state Exp;
branches;
next	;
commitid	4hRbEu6IrKgUAAOA;


desc
@@


1.3
log
@Update OpenCPN to 5.0.0. Changes since 4.8.8:
As a successor to OpenCPN Version 4.8, OpenCPN Version 5.0 contains many
new features and enhanced functions.
Among them are:

..Redesigned user interface, incorporating modern user interface elements and
  concepts.
..Support for multiple chart views simultaneously, using different charts
  display options if desired.
..User defined templates for easy recall of multiple configurations.
..Support for the widely available MBTiles chart format.
..Extended options for route and Waypoint creation.
..Expanded display of vector chart (ENC) information, including embedded
  images.
..Measurably improved performance and reliability over all supported platforms.
@
text
@$NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.2 2018/07/03 15:14:15 bouyer Exp $

--- plugins/wmm_pi/src/MagneticPlotMap.cpp.orig	2018-02-07 12:08:26.000000000 +0100
+++ plugins/wmm_pi/src/MagneticPlotMap.cpp	2018-07-02 12:16:38.589797991 +0200
@@@@ -32,6 +32,7 @@@@
 #endif //precompiled headers
 
 #include <wx/progdlg.h>
+#include <cmath>
 
 #include "ocpn_plugin.h"
 
@@@@ -230,7 +231,7 @@@@
         else
             p = CalcParameter(lonval, rx);
 
-        if(isnan(p)) /* is this actually correct? */
+        if(std::isnan(p)) /* is this actually correct? */
             return true;
 
         if(m_type == DECLINATION && p-ry*m_Spacing < -180) /* way off, try other way around */
@@@@ -290,7 +291,7 @@@@
     double p3 = CachedCalcParameter(lat2, lon1);
     double p4 = CachedCalcParameter(lat2, lon2);
 
-    if(isnan(p1) || isnan(p2) || isnan(p3) || isnan(p4))
+    if(std::isnan(p1) || std::isnan(p2) || std::isnan(p3) || std::isnan(p4))
         return;
 
     double ry1, ry2, ry3, ry4 = 0.0;
@@@@ -318,7 +319,7 @@@@
     ry1*=m_Spacing, ry2*=m_Spacing, ry3*=m_Spacing, ry4*=m_Spacing;
 
     /* determine which interpolations need line segments */
-    switch(((isnan(lat4)*2 + isnan(lat3))*2 + isnan(lon4))*2 + isnan(lon3)) {
+    switch(((std::isnan(lat4)*2 + std::isnan(lat3))*2 + std::isnan(lon4))*2 + std::isnan(lon3)) {
     case 0: /* all 4 sides? need to recurse to get better resolution */
         lon3 = (lon1+lon2)/2;
         lat3 = (lat1+lat2)/2;
@


1.2
log
@newer gcc (e.g. 8.0_RC2) requires <cmath> for std::isnan().
This is only a build fix so no revision bump
@
text
@d1 1
a1 1
$NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.1 2018/04/09 18:44:50 bouyer Exp $
@


1.1
log
@the compiler on netbsd-HEAD/earmv7hf doens't accept isnan(), use std::isnan()
@
text
@d1 1
a1 1
$NetBSD: $
d3 11
a13 3
--- plugins/wmm_pi/src/MagneticPlotMap.cpp.orig	2018-04-09 18:01:32.900360435 +0200
+++ plugins/wmm_pi/src/MagneticPlotMap.cpp	2018-04-09 18:02:29.319040318 +0200
@@@@ -230,7 +230,7 @@@@
d22 1
a22 1
@@@@ -290,7 +290,7 @@@@
d31 1
a31 1
@@@@ -318,7 +318,7 @@@@
@


1.1.2.1
log
@Pullup ticket #5804 - requested by bouyer
geography/opencpn: build fix

Revisions pulled up:
- geography/opencpn-plugin-debugger/Makefile                    1.11
- geography/opencpn-plugin-draw/Makefile                        1.17
- geography/opencpn-plugin-statusbar/Makefile                   1.8
- geography/opencpn-plugin-watchdog/Makefile                    1.15
- geography/opencpn-plugin-watchdog/distinfo                    1.10
- geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp 1.2
- geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp 1.2
- geography/opencpn-plugin-weather_routing/Makefile             1.18
- geography/opencpn/Makefile                                    1.24
- geography/opencpn/distinfo                                    1.19-1.20
- geography/opencpn/patches/patch-CMakeLists.txt                1.7
- geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp 1.2

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Tue Jul  3 15:14:16 UTC 2018

   Modified Files:
   	pkgsrc/geography/opencpn: distinfo
   	pkgsrc/geography/opencpn-plugin-watchdog: distinfo
   	pkgsrc/geography/opencpn-plugin-watchdog/patches: patch-src_Alarm.cpp
   	    patch-src_watchdog_pi.cpp
   	pkgsrc/geography/opencpn/patches:
   	    patch-plugins_wmm_pi_src_MagneticPlotMap.cpp

   Log Message:
   newer gcc (e.g. 8.0_RC2) requires <cmath> for std::isnan().
   This is only a build fix so no revision bump

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Thu Jul 19 17:58:58 UTC 2018

   Modified Files:
   	pkgsrc/geography/opencpn: Makefile distinfo
   	pkgsrc/geography/opencpn-plugin-debugger: Makefile
   	pkgsrc/geography/opencpn-plugin-draw: Makefile
   	pkgsrc/geography/opencpn-plugin-statusbar: Makefile
   	pkgsrc/geography/opencpn-plugin-watchdog: Makefile
   	pkgsrc/geography/opencpn-plugin-weather_routing: Makefile
   	pkgsrc/geography/opencpn/patches: patch-CMakeLists.txt

   Log Message:
   Do not include buildlink3 files already inclued by wxGTK30/buildlink3.mk
   (especially, remove gtk2 buildlink3).
   Make opencpn build with gtk3
   Conservatively bump PKGREVISIONs
@
text
@d1 1
a1 1
$NetBSD$
d3 3
a5 11
--- plugins/wmm_pi/src/MagneticPlotMap.cpp.orig	2018-02-07 12:08:26.000000000 +0100
+++ plugins/wmm_pi/src/MagneticPlotMap.cpp	2018-07-02 12:16:38.589797991 +0200
@@@@ -32,6 +32,7 @@@@
 #endif //precompiled headers
 
 #include <wx/progdlg.h>
+#include <cmath>
 
 #include "ocpn_plugin.h"
 
@@@@ -230,7 +231,7 @@@@
d14 1
a14 1
@@@@ -290,7 +291,7 @@@@
d23 1
a23 1
@@@@ -318,7 +319,7 @@@@
@