Wed Feb 8 00:05:55 2017 UTC ()
Don't order pointer, but check the value intended instead. Bump
revision.


(joerg)
diff -r1.8 -r1.9 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
diff -r1.6 -r1.7 pkgsrc/geography/opencpn-plugin-weather_routing/distinfo
diff -r0 -r1.1 pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_Polar.cpp
cvs diff -r1.8 -r1.9 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile (expand / switch to unified diff)

--- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile 2017/02/06 13:55:24 1.8
+++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile 2017/02/08 00:05:55 1.9
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.8 2017/02/06 13:55:24 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2017/02/08 00:05:55 joerg Exp $
2# 2#
3 3
4VERSION= 20160716 4VERSION= 20160716
5DISTNAME= weather_routing_pi-${VERSION} 5DISTNAME= weather_routing_pi-${VERSION}
6PKGNAME= opencpn-plugin-weather_routing-${VERSION} 6PKGNAME= opencpn-plugin-weather_routing-${VERSION}
7PKGREVISION= 2 7PKGREVISION= 3
8CATEGORIES= geography 8CATEGORIES= geography
9MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/}
10GITHUB_PROJECT= weather_routing_pi 10GITHUB_PROJECT= weather_routing_pi
11GITHUB_TAG= 7a016521e0a1e1ca4e97016dad8d0d16f09da912 11GITHUB_TAG= 7a016521e0a1e1ca4e97016dad8d0d16f09da912
12 12
13MAINTAINER= bouyer@NetBSD.org 13MAINTAINER= bouyer@NetBSD.org
14HOMEPAGE= http://opencpn.org/ocpn/weather_routing_plugin 14HOMEPAGE= http://opencpn.org/ocpn/weather_routing_plugin
15COMMENT= Concise ChartPlotter/Navigator - developement version 15COMMENT= Concise ChartPlotter/Navigator - developement version
16LICENSE= gnu-gpl-v2 16LICENSE= gnu-gpl-v2
17 17
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_TOOLS= gettext 19USE_TOOLS= gettext
20USE_CMAKE= yes 20USE_CMAKE= yes
cvs diff -r1.6 -r1.7 pkgsrc/geography/opencpn-plugin-weather_routing/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/opencpn-plugin-weather_routing/distinfo 2016/07/18 14:23:46 1.6
+++ pkgsrc/geography/opencpn-plugin-weather_routing/distinfo 2017/02/08 00:05:55 1.7
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.6 2016/07/18 14:23:46 bouyer Exp $ 1$NetBSD: distinfo,v 1.7 2017/02/08 00:05:55 joerg Exp $
2 2
3SHA1 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 131045d458326c9febd21605cf784f247bc1e848 3SHA1 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 131045d458326c9febd21605cf784f247bc1e848
4RMD160 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = c8d0cf451091047ae155e0e7ce08ae47329d09a8 4RMD160 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = c8d0cf451091047ae155e0e7ce08ae47329d09a8
5SHA512 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 18ffb602f57f92b41fb152a34a8552e1c2a877eea70228c84602b79bc37809b2152e45afafad054f97b84d9d1c338f3ea92b39fc26eedc392babcd1ee3985b30 5SHA512 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 18ffb602f57f92b41fb152a34a8552e1c2a877eea70228c84602b79bc37809b2152e45afafad054f97b84d9d1c338f3ea92b39fc26eedc392babcd1ee3985b30
6Size (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 846632 bytes 6Size (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 846632 bytes
7SHA1 (patch-cmake_PluginConfigure.cmake) = e2873cbba3d776227d72b8538634f687dc04c439 7SHA1 (patch-cmake_PluginConfigure.cmake) = e2873cbba3d776227d72b8538634f687dc04c439
 8SHA1 (patch-src_Polar.cpp) = fa7af26e0dcba1dda3ae358c35353c6304d4f941
8SHA1 (patch-src_RouteMap.cpp) = a733a901f04eeb1699805e590325c0485ce26d1b 9SHA1 (patch-src_RouteMap.cpp) = a733a901f04eeb1699805e590325c0485ce26d1b
File Added: pkgsrc/geography/opencpn-plugin-weather_routing/patches/Attic/patch-src_Polar.cpp
$NetBSD: patch-src_Polar.cpp,v 1.1 2017/02/08 00:05:55 joerg Exp $

Pointers are not relative to 0, so check correct variable.

--- src/Polar.cpp.orig	2017-01-08 19:55:10.199446917 +0000
+++ src/Polar.cpp
@@ -180,7 +180,7 @@ Polar::Polar()
 
 #define MAX_WINDSPEEDS_IN_TABLE 200
 #define MESSAGE(S) (S + wxString(_T("\n")) + wxString::FromUTF8(filename) \
-                    + (line > 0 ? (_(" line ") + wxString::Format(_T("%d"), linenum)) : _T("")))
+                    + (linenum > 0 ? (_(" line ") + wxString::Format(_T("%d"), linenum)) : _T("")))
 #define PARSE_WARNING(S) do { if(message.empty()) message = MESSAGE(S); } while (0)
 #define PARSE_ERROR(S) if(message.empty()) do { message = _("Boat polar failed") + wxString(_T("\n")) \
                                   + MESSAGE(S); goto failed; } while (0)