Fri Apr 1 19:56:02 2016 UTC ()
Repeat after me:
  I shall not "use namespace std;" before including 3rd party headers.


(joerg)
diff -r1.6 -r1.7 pkgsrc/geography/opencpn/distinfo
diff -r0 -r1.1 pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp
diff -r0 -r1.1 pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp

cvs diff -r1.6 -r1.7 pkgsrc/geography/opencpn/distinfo (expand / switch to unified diff)

--- pkgsrc/geography/opencpn/distinfo 2016/03/23 14:54:39 1.6
+++ pkgsrc/geography/opencpn/distinfo 2016/04/01 19:56:02 1.7
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1$NetBSD: distinfo,v 1.6 2016/03/23 14:54:39 bouyer Exp $ 1$NetBSD: distinfo,v 1.7 2016/04/01 19:56:02 joerg Exp $
2 2
3SHA1 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 39baa5f89ded9a5c62824e6e1445dbfc4f168578 3SHA1 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 39baa5f89ded9a5c62824e6e1445dbfc4f168578
4RMD160 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = d344b9caffe40dabcad1d9ac148ce54d75f1573c 4RMD160 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = d344b9caffe40dabcad1d9ac148ce54d75f1573c
5SHA512 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 3ea2136ab777f711aeaa66f34722b3b091af91104ff60303b61c587f95354826afae6dbc8f6a9228357399ae36e96a34098596c0a278d2184ce59283c88f4051 5SHA512 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 3ea2136ab777f711aeaa66f34722b3b091af91104ff60303b61c587f95354826afae6dbc8f6a9228357399ae36e96a34098596c0a278d2184ce59283c88f4051
6Size (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 42779485 bytes 6Size (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 42779485 bytes
7SHA1 (patch-CMakeLists.txt) = 124a5f3836cf57b61c1452a5ded65dc7b16a4c69 7SHA1 (patch-CMakeLists.txt) = 124a5f3836cf57b61c1452a5ded65dc7b16a4c69
8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a 8SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
9SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 9d6ade1c32f7d52b53848a2e382a4838d0240530 9SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 9d6ade1c32f7d52b53848a2e382a4838d0240530
10SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = f96234755ccdb0cf4d890b44c3983a71700e6de7 10SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = f96234755ccdb0cf4d890b44c3983a71700e6de7
11SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = fbac6b6da5c8efceb6931a6b41bec4a8ea7cbccb 11SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = fbac6b6da5c8efceb6931a6b41bec4a8ea7cbccb
12SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = 086de4106760df22b30330a40e3ec52d88d8b996 12SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = 086de4106760df22b30330a40e3ec52d88d8b996
13SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6 13SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
14SHA1 (patch-src_chartimg.cpp) = f0e3841ab1920dcab74462a5007b74e905d794c0 14SHA1 (patch-src_chartimg.cpp) = f0e3841ab1920dcab74462a5007b74e905d794c0
15SHA1 (patch-src_chcanv.cpp) = af76f36b6fd6d613720945195d5a24902012a020 15SHA1 (patch-src_chcanv.cpp) = af76f36b6fd6d613720945195d5a24902012a020
16SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 16SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
17SHA1 (patch-src_glu_libtess_sweep.c) = 68e3e69239d8bdce353bcad0f5606be5b447b5a7 17SHA1 (patch-src_glu_libtess_sweep.c) = 68e3e69239d8bdce353bcad0f5606be5b447b5a7
18SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb 18SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
 19SHA1 (patch-src_printtable.cpp) = 940e7f42dd7e6a9776db2009027989ca79429cb1
 20SHA1 (patch-src_routeprintout.cpp) = bbf135bd71e3fc87100b0c6d4e200f68754937c3
19SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040 21SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040

File Added: pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp
$NetBSD: patch-src_printtable.cpp,v 1.1 2016/04/01 19:56:02 joerg Exp $

--- src/printtable.cpp.orig	2016-04-01 19:47:54.585451048 +0000
+++ src/printtable.cpp
@@ -28,7 +28,6 @@
 #include <sstream>
 #include <vector>
 #include <algorithm>
-using namespace std;
 
 #include "wx/wxprec.h"
 
@@ -74,6 +73,8 @@ using namespace std;
 
 #include "printtable.h"
 
+using namespace std;
+
 void PrintCell::Init( const wxString& _content, wxDC* _dc, int _width, int _cellpadding, bool _bold_font )
 {
     bold_font   = _bold_font;

File Added: pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp
$NetBSD: patch-src_routeprintout.cpp,v 1.1 2016/04/01 19:56:02 joerg Exp $

--- src/routeprintout.cpp.orig	2016-04-01 19:46:52.064847404 +0000
+++ src/routeprintout.cpp
@@ -24,7 +24,6 @@
  **************************************************************************/
 
 #include <iostream>
-using namespace std;
 
 #include "wx/wxprec.h"
 
@@ -72,6 +71,8 @@ using namespace std;
 #include "printtable.h"
 #include "wx28compat.h"
 
+using namespace std;
+
 #define PRINT_WP_NAME 0
 #define PRINT_WP_POSITION 1
 #define PRINT_WP_COURSE 2