CVS commit: pkgsrc/geography/opencpn-plugin-weather_routing

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon Aug 27 16:19:22 UTC 2018

Modified Files:
        pkgsrc/geography/opencpn-plugin-weather_routing: Makefile distinfo
Added Files:
        pkgsrc/geography/opencpn-plugin-weather_routing/patches:
            patch-src_RouteMapOverlay.cpp

Log Message:
Update to 20180827. Changes since 20180405:
- fix and cleanup wind barb rendering along route
- ADD max wind in ReportDialog
- ADD comfort status in the WeatherRouting panel and ReportDialog
  This allows to:
  * Display directly in the table what will be the worst
    sailing comfort conditions found on the way.
  * Display in the ReportDialog the most comfortable route and date
    to start.
- ADD option for a safety distance from land
  The idea is to add a safety distance to calculate the weather route from
  any land that can be found on the way.
- various cleanups and bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
    pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/geography/opencpn-plugin-weather_routing/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMapOverlay.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.18 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.19
--- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.18       Thu Jul 19 17:58:58 2018
+++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile    Mon Aug 27 16:19:21 2018
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2018/07/19 17:58:58 bouyer Exp $
+# $NetBSD: Makefile,v 1.19 2018/08/27 16:19:21 bouyer Exp $
 #
 
-VERSION=       20180405
+VERSION=       20180827
 DISTNAME=      weather_routing_pi-${VERSION}
 PKGNAME=       opencpn-plugin-weather_routing-${VERSION}
-PKGREVISION=   3
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=seandepagnier/}
 GITHUB_PROJECT=        weather_routing_pi
-GITHUB_TAG=    c4dc8231ef0da6c7da52be22f2cded1c2880dfa4
+GITHUB_TAG=    44695011d39c390784220589b9bd25932b73af3e
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
 HOMEPAGE=      https://opencpn.org/OpenCPN/plugins/weatherroute.html
@@ -26,6 +25,20 @@ CMAKE_MODULE_PATH_OVERRIDE = \
                cmake/PluginLocalization.cmake \
                cmake/PluginPackage.cmake
 
+SUBST_CLASSES+=        isnan
+SUBST_STAGE.isnan=     pre-configure
+SUBST_MESSAGE.isnan=   replace wxIsNaN with std::isnan
+SUBST_FILES.isnan=     src/BoatDialog.cpp \
+                       src/ReportDialog.cpp \
+                       src/EditPolarDialog.cpp \
+                       src/Polar.cpp \
+                       src/RouteMap.cpp \
+                       src/RouteMapOverlay.cpp \
+                       src/SailboatTransform.cpp \
+                       src/WeatherRouting.cpp
+SUBST_SED.isnan=       -e s,wxIsNaN,std::isnan,g
+
+
 .include "../../devel/cmake/buildlink3.mk"
 .include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../textproc/tinyxml/buildlink3.mk"

Index: pkgsrc/geography/opencpn-plugin-weather_routing/distinfo
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.10 pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.11
--- pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.10       Thu Apr  5 16:49:15 2018
+++ pkgsrc/geography/opencpn-plugin-weather_routing/distinfo    Mon Aug 27 16:19:21 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2018/04/05 16:49:15 bouyer Exp $
+$NetBSD: distinfo,v 1.11 2018/08/27 16:19:21 bouyer Exp $
 
-SHA1 (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = 9e6147e75957637129bc91a44d2eab592e1e1c6a
-RMD160 (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = c3573cabfb0a18ac6f1c47da6cf951960989f0a9
-SHA512 (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = 
3584effab662dc3343e14b12d37399f06116b0386f92491c5cc4bd46c08915f1cc6e8861ac1dbadebfe5c3bc3383f31a2c7634574cf333d23f7865c82b46feb2
-Size (weather_routing_pi-20180405-c4dc8231ef0da6c7da52be22f2cded1c2880dfa4.tar.gz) = 918697 bytes
+SHA1 (weather_routing_pi-20180827-44695011d39c390784220589b9bd25932b73af3e.tar.gz) = 101dcb74c5537a9e57b42e6f20f0c3507a0a4ae8
+RMD160 (weather_routing_pi-20180827-44695011d39c390784220589b9bd25932b73af3e.tar.gz) = af27094ab8c526f8998087a0639ed1a4c6237990
+SHA512 (weather_routing_pi-20180827-44695011d39c390784220589b9bd25932b73af3e.tar.gz) = 
d69c065b55f9aa8308fc77e199562c4308fd295e6a71b60d2811b09dede1e636aeff16281610258269597117a29b99622346cb08e74f83077be5680d5cfb77c3
+Size (weather_routing_pi-20180827-44695011d39c390784220589b9bd25932b73af3e.tar.gz) = 921177 bytes
 SHA1 (patch-cmake_PluginConfigure.cmake) = 5f0b145d34c064870090eaa598b5474020eb887d
+SHA1 (patch-src_RouteMapOverlay.cpp) = 4ab2ad49eba7540dfe6bc43c100c5942bb40c5a2

Added files:

Index: pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMapOverlay.cpp
diff -u /dev/null pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMapOverlay.cpp:1.3
--- /dev/null   Mon Aug 27 16:19:22 2018
+++ pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMapOverlay.cpp       Mon Aug 27 16:19:22 2018
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_RouteMapOverlay.cpp,v 1.3 2018/08/27 16:19:22 bouyer Exp $
+
+--- src/RouteMapOverlay.cpp.orig       2018-08-27 16:21:31.958800595 +0200
++++ src/RouteMapOverlay.cpp    2018-08-27 16:21:42.479225410 +0200
+@@ -1448,7 +1448,7 @@
+         }
+         Unlock();
+ 
+-        if(isinf(mindt)) {
++        if(std::isinf(mindt)) {
+             goto not_able_to_propagate;
+         }
+         destination_position = new Position(configuration.EndLat, configuration.EndLon,