Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id AD0797A3D8 for ; Mon, 18 Jul 2016 14:23:48 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 5AA2185EF4; Mon, 18 Jul 2016 14:23:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E02C385EE6 for ; Mon, 18 Jul 2016 14:23:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id f2JJxAd3hFYq for ; Mon, 18 Jul 2016 14:23:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 29BE785E6E for ; Mon, 18 Jul 2016 14:23:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 24A8DFBB5; Mon, 18 Jul 2016 14:23:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_146885182715550" MIME-Version: 1.0 Date: Mon, 18 Jul 2016 14:23:47 +0000 From: "Manuel Bouyer" Subject: CVS commit: pkgsrc/geography/opencpn-plugin-weather_routing To: pkgsrc-changes@NetBSD.org Reply-To: bouyer@netbsd.org X-Mailer: log_accum Message-Id: <20160718142347.24A8DFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_146885182715550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bouyer Date: Mon Jul 18 14:23:47 UTC 2016 Modified Files: pkgsrc/geography/opencpn-plugin-weather_routing: Makefile distinfo pkgsrc/geography/opencpn-plugin-weather_routing/patches: patch-src_RouteMap.cpp Log Message: Update to 20160716. Changes since previous: bug fixes, improved error messages, updates for newer draw plugin. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile \ pkgsrc/geography/opencpn-plugin-weather_routing/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_146885182715550 Content-Disposition: inline Content-Length: 4859 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/geography/opencpn-plugin-weather_routing/Makefile diff -u pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.5 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.6 --- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.5 Thu Jun 16 16:03:55 2016 +++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile Mon Jul 18 14:23:46 2016 @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.5 2016/06/16 16:03:55 bouyer Exp $ +# $NetBSD: Makefile,v 1.6 2016/07/18 14:23:46 bouyer Exp $ # -VERSION= 20160611 +VERSION= 20160716 DISTNAME= weather_routing_pi-${VERSION} PKGNAME= opencpn-plugin-weather_routing-${VERSION} CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_GITHUB:=seandepagnier/} GITHUB_PROJECT= weather_routing_pi -GITHUB_TAG= 264605a7a9e3b33e10bbd2375a7d3fd55518b3dc +GITHUB_TAG= 7a016521e0a1e1ca4e97016dad8d0d16f09da912 MAINTAINER= bouyer@NetBSD.org HOMEPAGE= http://opencpn.org/ocpn/weather_routing_plugin Index: pkgsrc/geography/opencpn-plugin-weather_routing/distinfo diff -u pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.5 pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.6 --- pkgsrc/geography/opencpn-plugin-weather_routing/distinfo:1.5 Thu Jun 16 16:03:55 2016 +++ pkgsrc/geography/opencpn-plugin-weather_routing/distinfo Mon Jul 18 14:23:46 2016 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2016/06/16 16:03:55 bouyer Exp $ +$NetBSD: distinfo,v 1.6 2016/07/18 14:23:46 bouyer Exp $ -SHA1 (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = aac7a6e11ac087d3654cdfe7907e28a8d6fe8d3b -RMD160 (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = 7040af0413957cac5a2e09f16f6afd05467f24ce -SHA512 (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = 920e878d4c25059e30259bcc3d68e32219a7dacb23e35a4b969a568e1ecdd10718bc7b978e4468efcf7faad8927a8bee0076ab8e00a29e51563e1c84083e5006 -Size (weather_routing_pi-20160611-264605a7a9e3b33e10bbd2375a7d3fd55518b3dc.tar.gz) = 847325 bytes +SHA1 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 131045d458326c9febd21605cf784f247bc1e848 +RMD160 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = c8d0cf451091047ae155e0e7ce08ae47329d09a8 +SHA512 (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 18ffb602f57f92b41fb152a34a8552e1c2a877eea70228c84602b79bc37809b2152e45afafad054f97b84d9d1c338f3ea92b39fc26eedc392babcd1ee3985b30 +Size (weather_routing_pi-20160716-7a016521e0a1e1ca4e97016dad8d0d16f09da912.tar.gz) = 846632 bytes SHA1 (patch-cmake_PluginConfigure.cmake) = e2873cbba3d776227d72b8538634f687dc04c439 -SHA1 (patch-src_RouteMap.cpp) = e705e8f11d58675d443c1992c7cf5ab26f2be856 +SHA1 (patch-src_RouteMap.cpp) = a733a901f04eeb1699805e590325c0485ce26d1b Index: pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp diff -u pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp:1.1 pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp:1.2 --- pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp:1.1 Thu Jun 16 16:03:55 2016 +++ pkgsrc/geography/opencpn-plugin-weather_routing/patches/patch-src_RouteMap.cpp Mon Jul 18 14:23:46 2016 @@ -1,16 +1,16 @@ -$NetBSD: patch-src_RouteMap.cpp,v 1.1 2016/06/16 16:03:55 bouyer Exp $ +$NetBSD: patch-src_RouteMap.cpp,v 1.2 2016/07/18 14:23:46 bouyer Exp $ ---- src/RouteMap.cpp.orig 2016-06-13 18:14:41.000000000 +0200 -+++ src/RouteMap.cpp 2016-06-13 18:17:23.000000000 +0200 -@@ -550,7 +550,7 @@ +--- src/RouteMap.cpp.orig 2016-07-16 16:02:32.000000000 +0200 ++++ src/RouteMap.cpp 2016-07-18 15:51:20.000000000 +0200 +@@ -546,7 +546,7 @@ VB = polar.Speed(H, VW); /* failed to determine speed.. */ - if(isnan(B) || isnan(VB)) { + if(std::isnan(B) || std::isnan(VB)) { + // when does this hit?? + printf("polar failed bad! %f %f %f %f\n", W, VW, B, VB); configuration.polar_failed = true; - return false; //B = VB = 0; - } @@ -662,7 +662,7 @@ B = W + H; /* rotated relative to true wind */ @@ -20,7 +20,7 @@ $NetBSD: patch-src_RouteMap.cpp,v 1.1 20 double bearing3 = heading_resolve(B); if((bearing1 > bearing2 && bearing3 > bearing2 && bearing3 < bearing1) || (bearing1 < bearing2 && (bearing3 > bearing2 || bearing3 < bearing1))) { -@@ -2092,7 +2092,7 @@ +@@ -2089,7 +2089,7 @@ /* did we tack thru the wind? apply penalty */ bool tacked = false; @@ -29,7 +29,7 @@ $NetBSD: patch-src_RouteMap.cpp,v 1.1 20 tacked = true; dt += configuration.TackingTime; #if 0 -@@ -2101,7 +2101,7 @@ +@@ -2098,7 +2098,7 @@ #endif } --_----------=_146885182715550--