Update opencpn to 4.0.0. Changes since 3.2.2:

- Increased performance in all modes, particularly when using OpenGL graphics
  acceleration.
- Additional network interface methods, including TCP/IP client/server and
  UDP broadcast.
- Support for multiple data source instances, including
    Filtering and prioritization of messages
    Output of NMEA data streams for real-time integration into ship systems
- Improved support for Mac OS X systems, including 64 bit native support.
- Integrated Tablet/Touch screen support.
- AIS Personal Locater Beacon (PLB) configuration and tracking.
- Enhanced AIS target tracking modes.
- GRIB PlugIn feature additions.
  Graphical GRIB email request generation.
  Moving particle wind overlay.
  Enhanced GRIB data type support.
- Dashboard PlugIn feature additions.
  More selectable instruments.
- Major update to embedded Users Manual.
- Measurably improved performance and reliability over all supported platforms.

8 files changed, 715 insertions, 450 deletions

diff --git a/geography/opencpn/Makefile b/geography/opencpn/Makefile
index b6a5d6303ee..34a8948a2b3 100644
--- a/geography/opencpn/Makefile
+++ b/geography/opencpn/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2014/07/08 14:59:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/22 12:34:15 bouyer Exp $
 #
 
-VERSION=	3.2.2
+VERSION=	4.0.0
 DISTNAME=	OpenCPN-${VERSION}-Source
 PKGNAME=	opencpn-${VERSION}
-PKGREVISION=	1
 CATEGORIES=	geography
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opencpn/${VERSION}/}
 
@@ -18,6 +17,7 @@ USE_TOOLS=		gettext
 USE_CMAKE=		yes
 
 CMAKE_ARGS+=	-DPREFIX:PATH=${PREFIX} -DPREFIX_PLUGINS:PATH=${PREFIX}/lib/opencpn
+CMAKE_ARGS+=	-DBUNDLE_DOCS=ON -DBUNDLE_GSHHS=CRUDE -DBUNDLE_TCDATA=ON
 CMAKE_MODULE_PATH_OVERRIDE = \
 		plugins/grib_pi/CMakeLists.txt \
 		plugins/demo_pi_sample/src/CMakeLists.txt \
diff --git a/geography/opencpn/PLIST b/geography/opencpn/PLIST
index 37ebf5c4b20..089b7d66082 100644
--- a/geography/opencpn/PLIST
+++ b/geography/opencpn/PLIST
@@ -1,448 +1,689 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/25 18:26:57 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/01/22 12:34:15 bouyer Exp $
 bin/opencpn
-share/opencpn/gshhs/poly-c-1.dat
-share/opencpn/gshhs/poly-i-1.dat
-share/opencpn/gshhs/poly-l-1.dat
-share/opencpn/gshhs/wdb_borders_c.b
-share/opencpn/gshhs/wdb_borders_i.b
-share/opencpn/gshhs/wdb_borders_l.b
-share/opencpn/gshhs/wdb_rivers_c.b
-share/opencpn/gshhs/wdb_rivers_i.b
-share/opencpn/gshhs/wdb_rivers_l.b
-share/opencpn/uidata/styles.xml
-share/opencpn/uidata/toolicons_journeyman.png
-share/opencpn/uidata/toolicons_journeyman_flat.png
-share/opencpn/uidata/toolicons_traditional.png
-share/opencpn/s57data/attdecode.csv
-share/opencpn/s57data/S52RAZDS.RLE
-share/opencpn/s57data/s57attributes.csv
-share/opencpn/s57data/s57expectedinput.csv
-share/opencpn/s57data/s57objectclasses.csv
-share/opencpn/s57data/rastersymbols-dark.png
-share/opencpn/s57data/rastersymbols-day.png
-share/opencpn/s57data/rastersymbols-dusk.png
-share/opencpn/s57data/chartsymbols.xml
-share/opencpn/tcdata/HARMONIC
-share/opencpn/tcdata/HARMONIC.IDX
-share/opencpn/tcdata/README.harmonics
-share/opencpn/license.txt
-share/opencpn/sounds/8bells.wav
-share/opencpn/sounds/5bells.wav
-share/opencpn/sounds/README.bells
-share/opencpn/sounds/7bells.wav
-share/opencpn/sounds/1bells.wav
-share/opencpn/sounds/2bells.wav
-share/opencpn/sounds/4bells.wav
-share/opencpn/sounds/6bells.wav
-share/opencpn/sounds/3bells.wav
-share/opencpn/doc/images/area-query.png
-share/opencpn/doc/images/aton_off.png
-share/opencpn/doc/images/ship_grey.png
-share/opencpn/doc/images/incwpt1.png
-share/opencpn/doc/images/grib.png
-share/opencpn/doc/images/ship_red.png
-share/opencpn/doc/images/WH1.png
-share/opencpn/doc/images/add-Chart.png
+lib/opencpn/libdashboard_pi.so
+lib/opencpn/libgrib_pi.so
+share/applications/opencpn.desktop
+share/doc/opencpn/changelog.Debian.gz
+share/doc/opencpn/copyright
+share/icons/hicolor/48x48/apps/opencpn.png
+share/icons/hicolor/scalable/apps/opencpn.svg
+share/locale/ca_ES/LC_MESSAGES/opencpn.mo
+share/locale/cs/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/cs/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/cs/LC_MESSAGES/opencpn.mo
+share/locale/da/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/da/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/da/LC_MESSAGES/opencpn.mo
+share/locale/de/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/de/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/de/LC_MESSAGES/opencpn.mo
+share/locale/el_GR/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/el_GR/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/el_GR/LC_MESSAGES/opencpn.mo
+share/locale/es/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/es/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/es/LC_MESSAGES/opencpn.mo
+share/locale/et/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/et/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/et/LC_MESSAGES/opencpn.mo
+share/locale/fi_FI/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/fi_FI/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/fi_FI/LC_MESSAGES/opencpn.mo
+share/locale/fr/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/fr/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/fr/LC_MESSAGES/opencpn.mo
+share/locale/gl_ES/LC_MESSAGES/opencpn.mo
+share/locale/hu/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/hu_HU/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/hu_HU/LC_MESSAGES/opencpn.mo
+share/locale/it/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/it/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/it/LC_MESSAGES/opencpn.mo
+share/locale/nb_NO/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/nb_NO/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/nb_NO/LC_MESSAGES/opencpn.mo
+share/locale/nl/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/nl/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/nl/LC_MESSAGES/opencpn.mo
+share/locale/pl/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/pl/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/pl/LC_MESSAGES/opencpn.mo
+share/locale/pl_PL/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/pl_PL/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/pt_BR/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/pt_BR/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/pt_BR/LC_MESSAGES/opencpn.mo
+share/locale/pt_PT/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/pt_PT/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/pt_PT/LC_MESSAGES/opencpn.mo
+share/locale/ru/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/ru/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/ru/LC_MESSAGES/opencpn.mo
+share/locale/sv/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/sv/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/sv/LC_MESSAGES/opencpn.mo
+share/locale/tr_TR/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/tr_TR/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/tr_TR/LC_MESSAGES/opencpn.mo
+share/locale/zh_TW/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/zh_TW/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/zh_TW/LC_MESSAGES/opencpn.mo
+share/opencpn/doc/help_en_US.html
+share/opencpn/doc/help_web.html
+share/opencpn/doc/images/0.png
+share/opencpn/doc/images/10_1mile.png
+share/opencpn/doc/images/1_2.png
+share/opencpn/doc/images/2.png
+share/opencpn/doc/images/2624.png
+share/opencpn/doc/images/3.png
+share/opencpn/doc/images/33AISlist2.jpg
+share/opencpn/doc/images/33AISlist2.png
+share/opencpn/doc/images/33Accuracy_10K.png
+share/opencpn/doc/images/33Accuracy_12m.png
+share/opencpn/doc/images/33Accuracy_info.png
+share/opencpn/doc/images/33Accuracy_info2.png
+share/opencpn/doc/images/33Aton2.png
+share/opencpn/doc/images/33AtonOnPos.png
+share/opencpn/doc/images/33Blacklist.png
+share/opencpn/doc/images/33Dash-App.png
+share/opencpn/doc/images/33GFS16.png
+share/opencpn/doc/images/33GribInterpolation.png
+share/opencpn/doc/images/33GribOverlayColors.png
+share/opencpn/doc/images/33GribPreference2.png
+share/opencpn/doc/images/33GribUnits.png
+share/opencpn/doc/images/33Gribmail1.jpg
+share/opencpn/doc/images/33Gribmail10.jpg
+share/opencpn/doc/images/33Gribmail10.png
+share/opencpn/doc/images/33Gribmail2.jpg
+share/opencpn/doc/images/33Gribmail2.png
+share/opencpn/doc/images/33Gribmail3.jpg
+share/opencpn/doc/images/33Gribmail3.png
+share/opencpn/doc/images/33Gribmail4.jpg
+share/opencpn/doc/images/33Gribmail4.png
+share/opencpn/doc/images/33Gribmail5.jpg
+share/opencpn/doc/images/33Gribmail5.png
+share/opencpn/doc/images/33Gribmail6.jpg
+share/opencpn/doc/images/33Gribmail6.png
+share/opencpn/doc/images/33Gribmail7.jpg
+share/opencpn/doc/images/33Gribmail7.png
+share/opencpn/doc/images/33Gribmail8.jpg
+share/opencpn/doc/images/33Gribmail8.png
+share/opencpn/doc/images/33Gribmail9.jpg
+share/opencpn/doc/images/33Gribmail9.png
+share/opencpn/doc/images/33HideTrack.png
+share/opencpn/doc/images/33OptionsConnections.png
+share/opencpn/doc/images/33VAton2.png
+share/opencpn/doc/images/33WxTable.png
+share/opencpn/doc/images/33WxTable_1.png
+share/opencpn/doc/images/33YellowOwnShip.png
+share/opencpn/doc/images/33_S57_info.png
+share/opencpn/doc/images/33ais-showname.png
+share/opencpn/doc/images/33ereqZy2.png
+share/opencpn/doc/images/33gribcurrent.png
+share/opencpn/doc/images/33jmantoolbar.png
+share/opencpn/doc/images/33speed12.png
+share/opencpn/doc/images/33speed50.png
+share/opencpn/doc/images/33tradtoolbar.png
+share/opencpn/doc/images/33vec.png
+share/opencpn/doc/images/33vofpos.png
+share/opencpn/doc/images/3jmanflattoolbar.png
+share/opencpn/doc/images/4-S63-1.png
+share/opencpn/doc/images/4-S63.png
+share/opencpn/doc/images/4.png
+share/opencpn/doc/images/48px-Under_construction_icon-blue.png
+share/opencpn/doc/images/4Chartgroups2.png
+share/opencpn/doc/images/4DefaultMark.png
+share/opencpn/doc/images/4GL-expert.png
+share/opencpn/doc/images/4GribAreaSelection.png
+share/opencpn/doc/images/4GribControledColours.png
+share/opencpn/doc/images/4GribCurrent_0.png
+share/opencpn/doc/images/4GribDisplayChoices.png
+share/opencpn/doc/images/4GribGraph-Selection.png
+share/opencpn/doc/images/4GribRequest.png
+share/opencpn/doc/images/4GribSettings.png
+share/opencpn/doc/images/4GribSettingsATemp.png
+share/opencpn/doc/images/4GribSettingsCAPE.png
+share/opencpn/doc/images/4GribSettingsGusts.png
+share/opencpn/doc/images/4GribSettingsPressure.png
+share/opencpn/doc/images/4GribSettingsWaves.png
+share/opencpn/doc/images/4GribWind.png
+share/opencpn/doc/images/4MMSI-prop.png
+share/opencpn/doc/images/4MOB1.png
+share/opencpn/doc/images/4MOB3.png
+share/opencpn/doc/images/4MOB4.jpg
+share/opencpn/doc/images/4MOB4.png
+share/opencpn/doc/images/4MOB6.png
+share/opencpn/doc/images/4Objq.png
+share/opencpn/doc/images/4OptChartTide.png
+share/opencpn/doc/images/4Options-Connections.jpg
+share/opencpn/doc/images/4Options-Connections.png
+share/opencpn/doc/images/4OptionsDisplayAdvanced2.png
+share/opencpn/doc/images/4OptionsOwnShipAddMMSI_1.png
+share/opencpn/doc/images/4OptionsUserInterface2.png
+share/opencpn/doc/images/4PlugIns.png
+share/opencpn/doc/images/4RNG.png
+share/opencpn/doc/images/4RealScaleBitmap.png
+share/opencpn/doc/images/4RightClRoute.png
+share/opencpn/doc/images/4RightclickLayerTrack.png
+share/opencpn/doc/images/4RightclickTrack.png
+share/opencpn/doc/images/4SendtoGPS.png
+share/opencpn/doc/images/4ShowRadarRings.png
+share/opencpn/doc/images/4Start-Charts.png
+share/opencpn/doc/images/4Start-Charts1.png
+share/opencpn/doc/images/4Start-Charts2.png
+share/opencpn/doc/images/4Start-Charts3.png
+share/opencpn/doc/images/4Start-Charts4.png
+share/opencpn/doc/images/4Target-Query1.png
+share/opencpn/doc/images/4Target-Query2.png
+share/opencpn/doc/images/4Target-Real-Size.png
+share/opencpn/doc/images/4TrackProperties.png
+share/opencpn/doc/images/4TracksTab.png
+share/opencpn/doc/images/4VectorChartsDisplay.jpg
+share/opencpn/doc/images/4fps.png
+share/opencpn/doc/images/4gribControl.png
+share/opencpn/doc/images/5.png
+share/opencpn/doc/images/500mb.png
+share/opencpn/doc/images/5GL-non-expert.png
+share/opencpn/doc/images/6.png
+share/opencpn/doc/images/7.png
+share/opencpn/doc/images/8.png
+share/opencpn/doc/images/9.png
+share/opencpn/doc/images/About32.png
+share/opencpn/doc/images/Anch2.png
 share/opencpn/doc/images/Anch3.png
-share/opencpn/doc/images/mark8.png
-share/opencpn/doc/images/meta.png
-share/opencpn/doc/images/base.png
-share/opencpn/doc/images/base_vector_quilt.png
-share/opencpn/doc/images/help_002.png
-share/opencpn/doc/images/in1.png
-share/opencpn/doc/images/base_vectot_single1.png
-share/opencpn/doc/images/mob_btn.png
-share/opencpn/doc/images/options-Ships2.png
-share/opencpn/doc/images/dash-big-fonts.png
-share/opencpn/doc/images/out21.png
-share/opencpn/doc/images/inland-blue.png
-share/opencpn/doc/images/Routing1.png
-share/opencpn/doc/images/dsc-ok.png
-share/opencpn/doc/images/gc4.png
-share/opencpn/doc/images/WH2.png
-share/opencpn/doc/images/pencil.png
-share/opencpn/doc/images/incwpt8.png
-share/opencpn/doc/images/in11.png
-share/opencpn/doc/images/vectorSettings.png
-share/opencpn/doc/images/mark9.png
-share/opencpn/doc/images/Mob2.png
-share/opencpn/doc/images/rollover.png
+share/opencpn/doc/images/Anch4.png
+share/opencpn/doc/images/Anch5.png
+share/opencpn/doc/images/Anch6.png
 share/opencpn/doc/images/Anch8.png
-share/opencpn/doc/images/ifeahche_1.png
-share/opencpn/doc/images/Routing7.png
-share/opencpn/doc/images/opencpn.png
-share/opencpn/doc/images/attachment.jpeg
-share/opencpn/doc/images/Quilt3.png
-share/opencpn/doc/images/vector-light.png
-share/opencpn/doc/images/hotkeys2.gif
-share/opencpn/doc/images/ais-grey.png
-share/opencpn/doc/images/dash-set.png
-share/opencpn/doc/images/offsets6.png
-share/opencpn/doc/images/in22.png
-share/opencpn/doc/images/options-charts-tides-2.png
-share/opencpn/doc/images/mad-track2.png
-share/opencpn/doc/images/Route-Properties.png
-share/opencpn/doc/images/notundcom.png
-share/opencpn/doc/images/anch.png
-share/opencpn/doc/images/ais_alarm.png
-share/opencpn/doc/images/classB.png
-share/opencpn/doc/images/anegpass.png
-share/opencpn/doc/images/WH.png
-share/opencpn/doc/images/ais_alive_active.png
-share/opencpn/doc/images/dataconnections4.png
-share/opencpn/doc/images/zoomin.png
-share/opencpn/doc/images/options-plugins.png
-share/opencpn/doc/images/nsplattform.png
-share/opencpn/doc/images/48px-Under_construction_icon-blue.png
-share/opencpn/doc/images/ais-green.png
-share/opencpn/doc/images/sounding.png
-share/opencpn/doc/images/Mob.png
-share/opencpn/doc/images/VDR-AIS_Simulation-2.png
-share/opencpn/doc/images/mark6.png
-share/opencpn/doc/images/dh.png
-share/opencpn/doc/images/ais-lost.png
+share/opencpn/doc/images/Anch9.png
+share/opencpn/doc/images/BGchart.jpg
+share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-Current.jpg
+share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-SeaLevelPressure.jpg
+share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-SeaSurfaceTemperatur.jpg
+share/opencpn/doc/images/CCC-Castine-Climatology-Config-Standard-Wind.jpg
+share/opencpn/doc/images/CCC-Castine-Climatology-Config-Wind.jpg
+share/opencpn/doc/images/CCC-Castine-Grib.png
+share/opencpn/doc/images/CCC-Castine-Wx-Rte-1d-23h.jpg
+share/opencpn/doc/images/CM-top.jpg
+share/opencpn/doc/images/ChartGroups321.jpg
+share/opencpn/doc/images/ChartGroups322.jpg
+share/opencpn/doc/images/ChartGroups322.png
+share/opencpn/doc/images/Chartbar32.png
+share/opencpn/doc/images/Chartbar322.png
+share/opencpn/doc/images/ClassicShell_zpsbfed952c.png
+share/opencpn/doc/images/Climatology-Clouds-in-July.jpg
+share/opencpn/doc/images/Climatology-Current-Dec.png
+share/opencpn/doc/images/Climatology-Cyclones-Dec.jpg
+share/opencpn/doc/images/Climatology-Precipitation-in-July.jpg
+share/opencpn/doc/images/Climatology-Pressure-Dec.jpg
+share/opencpn/doc/images/Climatology-RelativeHumidity-in-July.jpg
+share/opencpn/doc/images/Climatology-SeaDepth.jpg
+share/opencpn/doc/images/Climatology-SeaLevelPressure-in-July.jpg
+share/opencpn/doc/images/Climatology-SeaLevelTemperature-in-July.jpg
+share/opencpn/doc/images/Climatology-Wind-Dec.png
+share/opencpn/doc/images/ClimatologyCycloneConfig.jpg
+share/opencpn/doc/images/Con-net2.png
+share/opencpn/doc/images/Connections.png
+share/opencpn/doc/images/Dash24.png
 share/opencpn/doc/images/Dashprop322.png
+share/opencpn/doc/images/Debug_win.jpg
+share/opencpn/doc/images/DeviceManager-1.jpg
+share/opencpn/doc/images/DeviceManager_zpsb0197e16.png
+share/opencpn/doc/images/Four-Circles-of-Position.jpg
+share/opencpn/doc/images/Four-Sights-Entered.jpg
+share/opencpn/doc/images/GD_NGA24390.png
+share/opencpn/doc/images/GeolocationTCP_zps5cb554ea.png
+share/opencpn/doc/images/MOB-choice.png
+share/opencpn/doc/images/MagnifierZoomB.jpg
+share/opencpn/doc/images/Menu-Tools.png
+share/opencpn/doc/images/MenuBar.png
+share/opencpn/doc/images/MenuBar3.png
+share/opencpn/doc/images/MenuBar5.png
+share/opencpn/doc/images/MenuBarView.png
+share/opencpn/doc/images/MenuNavigateExit.png
+share/opencpn/doc/images/Mob2.png
+share/opencpn/doc/images/Nassau_to_Newport_May.jpg
+share/opencpn/doc/images/Nr9.png
+share/opencpn/doc/images/OZ.png
+share/opencpn/doc/images/OZ1.png
+share/opencpn/doc/images/OZ2-INT702.jpg
+share/opencpn/doc/images/OZ2-INT702.png
+share/opencpn/doc/images/Options-Charts-ChartFiles.png
+share/opencpn/doc/images/Options-Charts-ChartGroups.png
+share/opencpn/doc/images/Options-Charts-Tides.png
+share/opencpn/doc/images/Options-Charts-VectorChartDisplay.png
+share/opencpn/doc/images/Options-Connections-Network_0.png
+share/opencpn/doc/images/Options-Connections-Serial_0.png
+share/opencpn/doc/images/Options-Connections_zps80f51d7f.png
+share/opencpn/doc/images/Options-Display-General.png
+share/opencpn/doc/images/Options-Display-Units.png
+share/opencpn/doc/images/Options-Plugins-32.png
+share/opencpn/doc/images/Options-Plugins.png
+share/opencpn/doc/images/Options-Ships-AisTargets.jpg
+share/opencpn/doc/images/Options-Ships-OwnShip-Routes.png
+share/opencpn/doc/images/Options-Ships-OwnShip.png
+share/opencpn/doc/images/Options-UserInterface_zpsfc3672fb.png
+share/opencpn/doc/images/ParticleMap.jpg
+share/opencpn/doc/images/Prolific.jpg
+share/opencpn/doc/images/Puerto_Morelos1.jpg
+share/opencpn/doc/images/Puerto_Morelos2.png
+share/opencpn/doc/images/Quilt1.jpg
+share/opencpn/doc/images/Quilt2.jpg
 share/opencpn/doc/images/Quilt2.png
+share/opencpn/doc/images/Quilt3.jpg
+share/opencpn/doc/images/Quilt3.png
+share/opencpn/doc/images/Quilt4.jpg
+share/opencpn/doc/images/Quilt4.png
+share/opencpn/doc/images/Reduce-Data.png
+share/opencpn/doc/images/Reduce-Data1.png
+share/opencpn/doc/images/Route-Properties.jpg
 share/opencpn/doc/images/Route-Properties1.png
-share/opencpn/doc/images/DeviceManager-1.jpg
-share/opencpn/doc/images/vecoverz.png
-share/opencpn/doc/images/mad-track.png
+share/opencpn/doc/images/Route-Properties2.png
+share/opencpn/doc/images/Route-rollover.jpg
+share/opencpn/doc/images/Route-rollover.png
 share/opencpn/doc/images/Route21.png
-share/opencpn/doc/images/currents_box.png
+share/opencpn/doc/images/Route23.png
+share/opencpn/doc/images/Routing1.jpg
+share/opencpn/doc/images/Routing2.png
 share/opencpn/doc/images/Routing3.png
-share/opencpn/doc/images/incwpt2.png
-share/opencpn/doc/images/grib2.png
-share/opencpn/doc/images/havannah-ext.png
-share/opencpn/doc/images/AIS-list.png
-share/opencpn/doc/images/8.png
-share/opencpn/doc/images/composite1.png
-share/opencpn/doc/images/quilt-ref.png
-share/opencpn/doc/images/route_manager.png
-share/opencpn/doc/images/mark4.png
-share/opencpn/doc/images/Anch5.png
-share/opencpn/doc/images/route-legs.png
-share/opencpn/doc/images/ais-yellow.png
-share/opencpn/doc/images/track-pressed.png
-share/opencpn/doc/images/dashn3.png
-share/opencpn/doc/images/tide-select1.png
-share/opencpn/doc/images/incwpt5.png
-share/opencpn/doc/images/Anch2.png
-share/opencpn/doc/images/default-mark.png
-share/opencpn/doc/images/rc_wpt-del-mv.png
-share/opencpn/doc/images/print.html
-share/opencpn/doc/images/Debug_win.png
 share/opencpn/doc/images/Routing5.png
-share/opencpn/doc/images/not_participate.png
-share/opencpn/doc/images/bluesquare.png
-share/opencpn/doc/images/course-up_0.png
-share/opencpn/doc/images/out12.png
-share/opencpn/doc/images/gps1.png
-share/opencpn/doc/images/10_1mile.png
-share/opencpn/doc/images/hdg-cog.png
-share/opencpn/doc/images/auto-follow_0.png
-share/opencpn/doc/images/gpsRed.png
-share/opencpn/doc/images/1_2.png
-share/opencpn/doc/images/cm93grp.png
-share/opencpn/doc/images/incwpt.png
-share/opencpn/doc/images/help_1.png
-share/opencpn/doc/images/7.png
+share/opencpn/doc/images/Routing7.png
+share/opencpn/doc/images/Routing8.png
+share/opencpn/doc/images/S63-3.png
+share/opencpn/doc/images/S63message.png
+share/opencpn/doc/images/S64usp.png
+share/opencpn/doc/images/S65inst.png
+share/opencpn/doc/images/SART1.png
+share/opencpn/doc/images/SART3.png
+share/opencpn/doc/images/SART4.png
+share/opencpn/doc/images/SART5.png
+share/opencpn/doc/images/SARTalarm.png
+share/opencpn/doc/images/Sight-1-Degrees-Minutes-Uncertainty.png
+share/opencpn/doc/images/Sight-2-Date-Time-Certainty-Shift.png
+share/opencpn/doc/images/Sight-3-Configuration.png
+share/opencpn/doc/images/Sight-4-Parameters.png
+share/opencpn/doc/images/Sight-5-Calculations.png
+share/opencpn/doc/images/TS1.jpg
+share/opencpn/doc/images/TS2.png
+share/opencpn/doc/images/TargetCPA.png
 share/opencpn/doc/images/Tide-interference.png
-share/opencpn/doc/images/ChartGroups322.png
-share/opencpn/doc/images/options-Ships5.png
-share/opencpn/doc/images/aa-mob.png
-share/opencpn/doc/images/dashboard32.png
 share/opencpn/doc/images/Tide1.png
-share/opencpn/doc/images/filtering.png
-share/opencpn/doc/images/tracks.png
-share/opencpn/doc/images/plan5.png
-share/opencpn/doc/images/orig.png
-share/opencpn/doc/images/options-ships-ais.png
-share/opencpn/doc/images/printroute.png
-share/opencpn/doc/images/gps3.png
-share/opencpn/doc/images/toolbar-2.png
-share/opencpn/doc/images/Chartbar32.png
-share/opencpn/doc/images/zoomout.png
-share/opencpn/doc/images/ship_red.html
+share/opencpn/doc/images/Tide2.png
+share/opencpn/doc/images/Tide4.png
+share/opencpn/doc/images/Tide5.png
+share/opencpn/doc/images/Tide6.png
+share/opencpn/doc/images/Tide7.png
+share/opencpn/doc/images/ToolBAR22.png
+share/opencpn/doc/images/VDR-AIS_Simulation-2.jpg
+share/opencpn/doc/images/VDR-AIS_Simulation-2.png
+share/opencpn/doc/images/WH.jpg
+share/opencpn/doc/images/WH1.png
+share/opencpn/doc/images/WH2.png
+share/opencpn/doc/images/WMM1.png
+share/opencpn/doc/images/WMM2.png
+share/opencpn/doc/images/WMM3.png
+share/opencpn/doc/images/WMM4.png
+share/opencpn/doc/images/WMM5.png
+share/opencpn/doc/images/WMM6.png
+share/opencpn/doc/images/WMM7.png
+share/opencpn/doc/images/WMM8.png
+share/opencpn/doc/images/WMM9.png
+share/opencpn/doc/images/WeatherRoutingConfiguration.jpg
+share/opencpn/doc/images/WeatherRoutingConfiguration1.jpg
+share/opencpn/doc/images/Werror1.png
+share/opencpn/doc/images/Werror2.png
+share/opencpn/doc/images/Werror3.png
+share/opencpn/doc/images/Wpt21.png
+share/opencpn/doc/images/Wx-0-Retrieve-Internet-Overlaid-on-Chart.jpg
+share/opencpn/doc/images/Wx-1-File-Menu.png
+share/opencpn/doc/images/Wx-2-Retrieve-Menu.png
+share/opencpn/doc/images/Wx-A1-Ret-AudioCapture-Recieving.png
+share/opencpn/doc/images/Wx-B1-Ret-HFRadioSch-FilterTab-Menu.png
+share/opencpn/doc/images/Wx-B2-Ret-HFRadioSch-AlarmTab-Menu.png
+share/opencpn/doc/images/Wx-B3-Ret-HFRadioSch-CaptureOptionsTab-Menu.png
+share/opencpn/doc/images/Wx-B4-Ret-HFRadioSch-InfoTab-Menu.jpg
+share/opencpn/doc/images/Wx-C0-Ret-Inet-Menu-1_0.jpg
+share/opencpn/doc/images/Wx-C1-Ret-Inet-Aviation-Americas.jpg
+share/opencpn/doc/images/Wx-C2-Ret-Inet-Passsage-Atlantic-012Wind.jpg
+share/opencpn/doc/images/Wx-C3-Ret-Inet-Bermuda-3day.jpg
+share/opencpn/doc/images/Wx-C4-Ret-Inet-Noaa-Atlantic-24hr-500mb.jpg
+share/opencpn/doc/images/Wx-C5-Ret-Inet-Noaa-Atlantic-24hrSurf.jpg
+share/opencpn/doc/images/Wx-C6-Ret-Inet-Passage-NE.jpg
+share/opencpn/doc/images/Wx-C7-Ret-Inet-Passage-NovaSoctia.jpg
+share/opencpn/doc/images/Wx-C8-Ret-Inet-Downloaded-List.png
+share/opencpn/doc/images/ZeroXTE.png
+share/opencpn/doc/images/aa-mob.png
+share/opencpn/doc/images/action-filter.png
+share/opencpn/doc/images/activeroutewpt.png
+share/opencpn/doc/images/aground.png
+share/opencpn/doc/images/ais-alarm.jpg
+share/opencpn/doc/images/ais-green.png
+share/opencpn/doc/images/ais-grey.png
+share/opencpn/doc/images/ais-lemon.png
+share/opencpn/doc/images/ais-lost.png
+share/opencpn/doc/images/ais-moor.png
+share/opencpn/doc/images/ais-red.png
+share/opencpn/doc/images/ais-yellow.png
+share/opencpn/doc/images/ais.png
+share/opencpn/doc/images/ais11.png
+share/opencpn/doc/images/ais2.png
+share/opencpn/doc/images/ais_alarm.png
+share/opencpn/doc/images/ais_alive_active.png
+share/opencpn/doc/images/ais_disabled.png
 share/opencpn/doc/images/ais_supressed.png
-share/opencpn/doc/images/route-legs1.png
-share/opencpn/doc/images/course-up.png
-share/opencpn/doc/images/offsets2.png
-share/opencpn/doc/images/stXhole1.png
-share/opencpn/doc/images/incwpt3.png
-share/opencpn/doc/images/grib_0.png
-share/opencpn/doc/images/grig-plug.png
-share/opencpn/doc/images/vdr-control.png
+share/opencpn/doc/images/aisfocus.png
+share/opencpn/doc/images/anch.png
+share/opencpn/doc/images/anegpass.jpg
+share/opencpn/doc/images/aprs.png
+share/opencpn/doc/images/area-query.jpg
+share/opencpn/doc/images/arpa1.png
+share/opencpn/doc/images/arpa2.png
+share/opencpn/doc/images/arpa3.png
+share/opencpn/doc/images/arpa4.png
+share/opencpn/doc/images/aton_off.png
+share/opencpn/doc/images/aton_std.png
+share/opencpn/doc/images/aton_virt.png
+share/opencpn/doc/images/attachment.jpeg
+share/opencpn/doc/images/attachment_002.jpeg
+share/opencpn/doc/images/attachment_003.jpeg
+share/opencpn/doc/images/auto-follow_0.png
+share/opencpn/doc/images/base.png
+share/opencpn/doc/images/base_raster_quilt.png
+share/opencpn/doc/images/base_raster_single.png
+share/opencpn/doc/images/base_vector_quilt.png
+share/opencpn/doc/images/base_vectot_single1.png
 share/opencpn/doc/images/basestn.png
-share/opencpn/doc/images/current.png
-share/opencpn/doc/images/gc7.png
-share/opencpn/doc/images/plan1.png
-share/opencpn/doc/images/explain.png
-share/opencpn/doc/images/gc3.png
-share/opencpn/doc/images/TS1.png
-share/opencpn/doc/images/objq.png
-share/opencpn/doc/images/settings_003.png
-share/opencpn/doc/images/mark3.png
+share/opencpn/doc/images/bluesquare.png
+share/opencpn/doc/images/br24_advanced_emu_osx.png
+share/opencpn/doc/images/br24_button.png
+share/opencpn/doc/images/br24_controls.png
+share/opencpn/doc/images/br24_emulator.jpg
+share/opencpn/doc/images/br24_overlay_messages.png
+share/opencpn/doc/images/br24_plugin_11_status.png
+share/opencpn/doc/images/br24_preferences_097.jpg
+share/opencpn/doc/images/br24_preferences_097.png
+share/opencpn/doc/images/bramb.png
 share/opencpn/doc/images/bramb1.png
-share/opencpn/doc/images/Anch6.png
-share/opencpn/doc/images/sentence-filters2.png
-share/opencpn/doc/images/offsets4.png
-share/opencpn/doc/images/north-up.png
-share/opencpn/doc/images/Chartbar322.png
-share/opencpn/doc/images/gpsg_buddy.jpg
-share/opencpn/doc/images/3.png
-share/opencpn/doc/images/About32.png
 share/opencpn/doc/images/bramb2.png
-share/opencpn/doc/images/seg.png
-share/opencpn/doc/images/restrman_1.png
-share/opencpn/doc/images/ais11.png
-share/opencpn/doc/images/skewed32.png
-share/opencpn/doc/images/help.png
-share/opencpn/doc/images/SART4.png
-share/opencpn/doc/images/hidden-quilt.png
-share/opencpn/doc/images/0.png
-share/opencpn/doc/images/aground.png
-share/opencpn/doc/images/print.png
-share/opencpn/doc/images/dsc_distress.jpg
-share/opencpn/doc/images/status-bar.png
-share/opencpn/doc/images/moored.png
-share/opencpn/doc/images/Routing2.png
-share/opencpn/doc/images/in2.png
+share/opencpn/doc/images/brazil.jpg
 share/opencpn/doc/images/bud-icon.png
 share/opencpn/doc/images/buttons-select.png
-share/opencpn/doc/images/colscheme.png
-share/opencpn/doc/images/.directory
-share/opencpn/doc/images/displayspeed.png
-share/opencpn/doc/images/route_plugin.png
-share/opencpn/doc/images/Quilt1.png
-share/opencpn/doc/images/aton_virt.png
-share/opencpn/doc/images/2.png
-share/opencpn/doc/images/TS2.png
-share/opencpn/doc/images/portable.png
+share/opencpn/doc/images/classB.png
+share/opencpn/doc/images/climatology1thumb.jpg
+share/opencpn/doc/images/climatologyctr_0.jpg
 share/opencpn/doc/images/cm93.png
-share/opencpn/doc/images/options-Ships6.png
-share/opencpn/doc/images/gray-nogps.png
-share/opencpn/doc/images/own_vector.png
-share/opencpn/doc/images/pencil2.png
+share/opencpn/doc/images/cm93grp.png
+share/opencpn/doc/images/colscheme.png
+share/opencpn/doc/images/composite.png
+share/opencpn/doc/images/composite1.png
+share/opencpn/doc/images/course-up.jpg
+share/opencpn/doc/images/course-up_0.png
 share/opencpn/doc/images/cur1_0.png
-share/opencpn/doc/images/settings.png
-share/opencpn/doc/images/Mob1.png
-share/opencpn/doc/images/trad-tool.png
-share/opencpn/doc/images/rc_active-route.png
-share/opencpn/doc/images/MOB-choice.png
-share/opencpn/doc/images/SART1.png
-share/opencpn/doc/images/mark10.png
-share/opencpn/doc/images/orig2.png
-share/opencpn/doc/images/out22.png
-share/opencpn/doc/images/highlight.png
-share/opencpn/doc/images/BGchart.png
-share/opencpn/doc/images/Route-Properties2.png
-share/opencpn/doc/images/options-display.png
-share/opencpn/doc/images/gc1.png
-share/opencpn/doc/images/SART3.png
-share/opencpn/doc/images/incwpt6.png
-share/opencpn/doc/images/layer-prop.png
-share/opencpn/doc/images/route.png
-share/opencpn/doc/images/scin.png
-share/opencpn/doc/images/sart-alarm2.png
+share/opencpn/doc/images/current-digits.png
+share/opencpn/doc/images/current.png
 share/opencpn/doc/images/current1.png
-share/opencpn/doc/images/track-prop.png
-share/opencpn/doc/images/ship_grey.html
-share/opencpn/doc/images/track_off.png
-share/opencpn/doc/images/wpt_focus2.png
-share/opencpn/doc/images/gc6.png
-share/opencpn/doc/images/charts_MT.png
-share/opencpn/doc/images/qtvlm1.png
-share/opencpn/doc/images/ais-moor.png
-share/opencpn/doc/images/ais-alarm.png
-share/opencpn/doc/images/ToolBAR22.png
-share/opencpn/doc/images/ais_disabled.png
-share/opencpn/doc/images/nmea-debug-dsc.png
-share/opencpn/doc/images/skewed.png
-share/opencpn/doc/images/layers-show2.png
-share/opencpn/doc/images/Tide7.png
-share/opencpn/doc/images/charts-tides.png
-share/opencpn/doc/images/font.png
-share/opencpn/doc/images/Tide2.png
-share/opencpn/doc/images/dyngnaset.png
-share/opencpn/doc/images/Con-net2.png
-share/opencpn/doc/images/5.png
-share/opencpn/doc/images/Reduce-Data1.png
-share/opencpn/doc/images/Quilt4.png
-share/opencpn/doc/images/aisfocus.png
-share/opencpn/doc/images/gc8.png
-share/opencpn/doc/images/options-Ships3.png
+share/opencpn/doc/images/currents_box.png
+share/opencpn/doc/images/dark-green.png
+share/opencpn/doc/images/dash-big-fonts.jpg
+share/opencpn/doc/images/dash-drag.jpg
+share/opencpn/doc/images/dash-select-instr_0.png
+share/opencpn/doc/images/dash-set.png
+share/opencpn/doc/images/dashboard-docked32.jpg
+share/opencpn/doc/images/dashboard-docked32.png
 share/opencpn/doc/images/dashboard-plugin32.png
-share/opencpn/doc/images/attachment_003.jpeg
-share/opencpn/doc/images/incwpt4.png
-share/opencpn/doc/images/jman-tool.png
-share/opencpn/doc/images/ais.png
-share/opencpn/doc/images/lockwpt.png
-share/opencpn/doc/images/options-user2.png
-share/opencpn/doc/images/rasteroverz.png
-share/opencpn/doc/images/aton_std.png
-share/opencpn/doc/images/Tide5.png
-share/opencpn/doc/images/gpsGrn.png
-share/opencpn/doc/images/sentence-filters.png
-share/opencpn/doc/images/text.png
-share/opencpn/doc/images/font1.png
-share/opencpn/doc/images/Dash24.png
-share/opencpn/doc/images/base_raster_quilt.png
-share/opencpn/doc/images/polyconic.png
-share/opencpn/doc/images/trail.png
-share/opencpn/doc/images/initial-vector.png
-share/opencpn/doc/images/route_002.png
-share/opencpn/doc/images/options-charts-groups-1.png
-share/opencpn/doc/images/Route-rollover.png
-share/opencpn/doc/images/sentence-filters1.png
-share/opencpn/doc/images/out11.png
-share/opencpn/doc/images/tide-select2.png
-share/opencpn/doc/images/dash-drag.png
-share/opencpn/doc/images/Wpt21.png
-share/opencpn/doc/images/2624.png
-share/opencpn/doc/images/tmerc.png
-share/opencpn/doc/images/base_raster_single.png
-share/opencpn/doc/images/folderoptions.png
-share/opencpn/doc/images/europe3.png
-share/opencpn/doc/images/SARTalarm.png
-share/opencpn/doc/images/options-charts-load-1.png
-share/opencpn/doc/images/attachment_002.jpeg
-share/opencpn/doc/images/red-gps.png
+share/opencpn/doc/images/dashboard32.jpg
+share/opencpn/doc/images/dashboard32.png
+share/opencpn/doc/images/dashn3.png
+share/opencpn/doc/images/dataconnections4.png
+share/opencpn/doc/images/ddd1.jpg
+share/opencpn/doc/images/ddd2.jpg
+share/opencpn/doc/images/ddd2.png
+share/opencpn/doc/images/ddd3.jpg
+share/opencpn/doc/images/ddd3.png
+share/opencpn/doc/images/ddd4.jpg
+share/opencpn/doc/images/ddd4.png
+share/opencpn/doc/images/dh.png
 share/opencpn/doc/images/dim1.png
-share/opencpn/doc/images/dash-select-instr_0.png
-share/opencpn/doc/images/activeroutewpt.png
-share/opencpn/doc/images/incwpt7.png
-share/opencpn/doc/images/layer22.png
+share/opencpn/doc/images/dpare.png
+share/opencpn/doc/images/dsc-alert.png
+share/opencpn/doc/images/dsc-list.jpg
+share/opencpn/doc/images/dsc-not-ok.png
+share/opencpn/doc/images/dsc-ok.png
+share/opencpn/doc/images/dsc-ok2.png
+share/opencpn/doc/images/dsc_distress.jpg
+share/opencpn/doc/images/dse1.png
+share/opencpn/doc/images/dyngnaset.png
+share/opencpn/doc/images/europe1.jpg
+share/opencpn/doc/images/europe3.png
+share/opencpn/doc/images/explain.png
+share/opencpn/doc/images/eye33.png
+share/opencpn/doc/images/filtering.png
+share/opencpn/doc/images/fishing.png
+share/opencpn/doc/images/folderoptions.png
+share/opencpn/doc/images/font.png
+share/opencpn/doc/images/font1.png
+share/opencpn/doc/images/gc-comp.jpg
+share/opencpn/doc/images/gc1.png
+share/opencpn/doc/images/gc3.png
+share/opencpn/doc/images/gc4.png
+share/opencpn/doc/images/gc6.png
+share/opencpn/doc/images/gc7.png
+share/opencpn/doc/images/gc8.png
+share/opencpn/doc/images/gdb.jpg
+share/opencpn/doc/images/gdb1.jpg
 share/opencpn/doc/images/gl.png
-share/opencpn/doc/images/brazil.png
-share/opencpn/doc/images/offsets5.png
-share/opencpn/doc/images/options-Ships1.png
-share/opencpn/doc/images/ais-red.png
-share/opencpn/doc/images/nogl.png
-share/opencpn/doc/images/hsc.png
-share/opencpn/doc/images/Ships_aistargets.png
-share/opencpn/doc/images/layer_route1.png
-share/opencpn/doc/images/dashboard-docked32.png
-share/opencpn/doc/images/gribplug.png
-share/opencpn/doc/images/Routing8.png
-share/opencpn/doc/images/platquery.png
-share/opencpn/doc/images/ais2.png
-share/opencpn/doc/images/6.png
-share/opencpn/doc/images/9.png
+share/opencpn/doc/images/gps1.png
 share/opencpn/doc/images/gps2.png
-share/opencpn/doc/images/vdr-icons.png
-share/opencpn/doc/images/SART5.png
+share/opencpn/doc/images/gps3.png
+share/opencpn/doc/images/gpsGrn.png
+share/opencpn/doc/images/gpsRed.png
+share/opencpn/doc/images/gpsd-con1.png
+share/opencpn/doc/images/gpsg_buddy.jpg
+share/opencpn/doc/images/gradar_domecont.png
+share/opencpn/doc/images/gradar_icon_green.png
+share/opencpn/doc/images/gradar_icon_red.png
+share/opencpn/doc/images/gradar_noisecont.png
+share/opencpn/doc/images/gradar_opcont.png
+share/opencpn/doc/images/gradar_rangecont.png
+share/opencpn/doc/images/gradar_rightclick.png
+share/opencpn/doc/images/gray-nogps.png
+share/opencpn/doc/images/grib.png
+share/opencpn/doc/images/grib2.png
+share/opencpn/doc/images/grib_0.png
+share/opencpn/doc/images/gribplugin33.jpg
+share/opencpn/doc/images/gribplugin33.png
+share/opencpn/doc/images/group.jpeg
+share/opencpn/doc/images/halfadegree.png
+share/opencpn/doc/images/havannah-ext.png
 share/opencpn/doc/images/havannah-noext.png
-share/opencpn/doc/images/route-button.png
-share/opencpn/doc/images/routing6.png
-share/opencpn/doc/images/gc-comp.png
-share/opencpn/doc/images/4.png
+share/opencpn/doc/images/headingline1.png
+share/opencpn/doc/images/help.png
+share/opencpn/doc/images/help_002.png
+share/opencpn/doc/images/help_1.png
+share/opencpn/doc/images/hidden-quilt.png
+share/opencpn/doc/images/highlight.png
+share/opencpn/doc/images/hotkeys3.gif
+share/opencpn/doc/images/hsc.png
+share/opencpn/doc/images/ifeahche_1.png
+share/opencpn/doc/images/in1.png
+share/opencpn/doc/images/in11.png
+share/opencpn/doc/images/in2.png
+share/opencpn/doc/images/in22.png
+share/opencpn/doc/images/incwpt.png
+share/opencpn/doc/images/incwpt1.png
+share/opencpn/doc/images/incwpt2.png
+share/opencpn/doc/images/incwpt3.png
+share/opencpn/doc/images/incwpt4.png
+share/opencpn/doc/images/incwpt5.png
+share/opencpn/doc/images/incwpt6.png
+share/opencpn/doc/images/incwpt7.jpg
+share/opencpn/doc/images/incwpt7.png
+share/opencpn/doc/images/incwpt8.png
+share/opencpn/doc/images/inland-blue.png
+share/opencpn/doc/images/last-button.png
+share/opencpn/doc/images/layer-prop.png
+share/opencpn/doc/images/layer-prop1.png
 share/opencpn/doc/images/layer-track2.png
+share/opencpn/doc/images/layer22.jpg
+share/opencpn/doc/images/layer22.png
+share/opencpn/doc/images/layer_route1.png
+share/opencpn/doc/images/layers-show2.png
+share/opencpn/doc/images/lockwpt.png
+share/opencpn/doc/images/lowprec.png
+share/opencpn/doc/images/lowprec1.png
+share/opencpn/doc/images/mad-track.png
+share/opencpn/doc/images/mad-track2.png
+share/opencpn/doc/images/magnetic_show.png
+share/opencpn/doc/images/marina_grn.png
+share/opencpn/doc/images/mark10.png
+share/opencpn/doc/images/mark2.png
+share/opencpn/doc/images/mark3.png
+share/opencpn/doc/images/mark4.jpg
+share/opencpn/doc/images/mark4.png
+share/opencpn/doc/images/mark6.png
+share/opencpn/doc/images/mark7.png
+share/opencpn/doc/images/mark8.png
+share/opencpn/doc/images/mark9.png
+share/opencpn/doc/images/meta.png
+share/opencpn/doc/images/mob_btn.png
+share/opencpn/doc/images/moored.png
 share/opencpn/doc/images/multileg.png
-share/opencpn/doc/images/own4.png
-share/opencpn/doc/images/AISTargetQuery.png
-share/opencpn/doc/images/route_focus3.png
+share/opencpn/doc/images/nmea-debug-dsc.png
+share/opencpn/doc/images/nogl.png
+share/opencpn/doc/images/north-up.png
+share/opencpn/doc/images/not_participate.png
+share/opencpn/doc/images/notundcom.png
+share/opencpn/doc/images/objq.png
+share/opencpn/doc/images/offsets2.jpg
+share/opencpn/doc/images/offsets2.png
+share/opencpn/doc/images/offsets4.jpg
+share/opencpn/doc/images/offsets4.png
+share/opencpn/doc/images/offsets5.jpg
+share/opencpn/doc/images/offsets5.png
+share/opencpn/doc/images/offsets6.jpg
+share/opencpn/doc/images/offsets6.png
+share/opencpn/doc/images/opencpn.jpg
+share/opencpn/doc/images/opencpn2.png
+share/opencpn/doc/images/opencpn_002.png
+share/opencpn/doc/images/options-Ships2.png
+share/opencpn/doc/images/options-Ships3.png
 share/opencpn/doc/images/options-Ships4.png
-share/opencpn/doc/images/Reduce-Data.png
-share/opencpn/doc/images/Prolific.jpg
-share/opencpn/doc/images/TargetCPA.png
-share/opencpn/doc/images/mark7.png
-share/opencpn/doc/images/composite.png
-share/opencpn/doc/images/gpsd-con1.png
-share/opencpn/doc/images/mark2.png
-share/opencpn/doc/images/action-filter.png
-share/opencpn/doc/images/bramb.png
-share/opencpn/doc/images/atanchor.png
-share/opencpn/doc/images/track-prop1.png
-share/opencpn/doc/images/dsc-list.png
-share/opencpn/doc/images/ChartGroups321.png
+share/opencpn/doc/images/options-Ships5.png
+share/opencpn/doc/images/options-Ships6.png
+share/opencpn/doc/images/options-charts-tides-2.png
+share/opencpn/doc/images/options-ships-ais.png
+share/opencpn/doc/images/options-user2.png
+share/opencpn/doc/images/orig.png
 share/opencpn/doc/images/orig1.png
-share/opencpn/doc/images/jman-flat-tool.png
-share/opencpn/doc/images/tide.png
-share/opencpn/doc/images/add-Chart1.png
-share/opencpn/doc/images/plan2.png
-share/opencpn/doc/images/settings_002.png
-share/opencpn/doc/images/dsc-ok2.png
-share/opencpn/doc/images/Anch9.png
-share/opencpn/doc/images/dsc-not-ok.png
+share/opencpn/doc/images/orig2.png
+share/opencpn/doc/images/out11.png
+share/opencpn/doc/images/out12.png
+share/opencpn/doc/images/out21.png
+share/opencpn/doc/images/out22.png
+share/opencpn/doc/images/overzoom.jpg
+share/opencpn/doc/images/overzoom2.jpg
+share/opencpn/doc/images/overzoom2.png
+share/opencpn/doc/images/own4.png
 share/opencpn/doc/images/own5.png
-share/opencpn/doc/images/Tide6.png
-share/opencpn/doc/images/fishing.png
-share/opencpn/doc/images/Tide4.png
-share/opencpn/doc/images/last-button.png
-share/opencpn/doc/images/swlook.png
+share/opencpn/doc/images/own_vector.png
+share/opencpn/doc/images/pencil.png
+share/opencpn/doc/images/pencil2.png
+share/opencpn/doc/images/plan1.jpg
+share/opencpn/doc/images/plan2.jpg
+share/opencpn/doc/images/plan2.png
+share/opencpn/doc/images/plan5.jpg
+share/opencpn/doc/images/plan5.png
+share/opencpn/doc/images/polyconic.png
+share/opencpn/doc/images/portable.png
+share/opencpn/doc/images/print.png
+share/opencpn/doc/images/printroute.png
+share/opencpn/doc/images/quilt-ref.png
+share/opencpn/doc/images/r820t.jpg
+share/opencpn/doc/images/rad13.jpeg
+share/opencpn/doc/images/rasteroverz.jpg
+share/opencpn/doc/images/rc_active-route.png
+share/opencpn/doc/images/rc_wpt-del-mv.png
+share/opencpn/doc/images/red-gps.png
+share/opencpn/doc/images/restrman_1.png
+share/opencpn/doc/images/rollover.png
+share/opencpn/doc/images/route-button.png
+share/opencpn/doc/images/route-legs.png
+share/opencpn/doc/images/route-legs1.png
+share/opencpn/doc/images/route.png
+share/opencpn/doc/images/route_002.png
+share/opencpn/doc/images/route_focus3.png
+share/opencpn/doc/images/route_manager.png
+share/opencpn/doc/images/route_plugin.png
+share/opencpn/doc/images/routing6.png
+share/opencpn/doc/images/rtlsdr.png
+share/opencpn/doc/images/sart-alarm2.jpg
+share/opencpn/doc/images/sart-alarm2.png
+share/opencpn/doc/images/sart-testing.png
+share/opencpn/doc/images/scin.png
 share/opencpn/doc/images/scout.png
-share/opencpn/doc/images/europe1.png
-share/opencpn/doc/images/Anch4.png
-share/opencpn/doc/images/Route23.png
-share/opencpn/doc/images/layer-prop1.png
-share/opencpn/doc/help_en_US.html
-share/opencpn/doc/help_web.html
+share/opencpn/doc/images/seg.png
+share/opencpn/doc/images/sentence-filters.png
+share/opencpn/doc/images/sentence-filters1.png
+share/opencpn/doc/images/sentence-filters2.png
+share/opencpn/doc/images/settings.png
+share/opencpn/doc/images/settings_002.png
+share/opencpn/doc/images/settings_003.png
+share/opencpn/doc/images/ship_grey.png
+share/opencpn/doc/images/ship_red.png
+share/opencpn/doc/images/skewed.png
+share/opencpn/doc/images/skewed32.png
+share/opencpn/doc/images/sounding.png
+share/opencpn/doc/images/stXhole1.png
+share/opencpn/doc/images/start.png
+share/opencpn/doc/images/start1.png
+share/opencpn/doc/images/start2.png
+share/opencpn/doc/images/start3.jpg
+share/opencpn/doc/images/start3.png
+share/opencpn/doc/images/status-bar.png
+share/opencpn/doc/images/std-grib.png
+share/opencpn/doc/images/swlook.jpg
+share/opencpn/doc/images/text.png
+share/opencpn/doc/images/tide-select1.png
+share/opencpn/doc/images/tide-select2.png
+share/opencpn/doc/images/tide.png
+share/opencpn/doc/images/tmerc.png
+share/opencpn/doc/images/tongue.gif
+share/opencpn/doc/images/toolbar-2.png
+share/opencpn/doc/images/track-pressed.png
+share/opencpn/doc/images/track-prop1.png
+share/opencpn/doc/images/track_off.png
+share/opencpn/doc/images/tracks.png
+share/opencpn/doc/images/trail.png
+share/opencpn/doc/images/us_rnc_charts_structure.png
+share/opencpn/doc/images/vdr-control.png
+share/opencpn/doc/images/vdr-icons.png
+share/opencpn/doc/images/vecoverz.jpg
+share/opencpn/doc/images/vector-light.png
+share/opencpn/doc/images/weather_route_data_types_1.jpg
+share/opencpn/doc/images/wpt_focus2.png
+share/opencpn/doc/images/zoomin.png
+share/opencpn/doc/images/zoomout.png
 share/opencpn/doc/readme
-share/doc/opencpn/copyright
-share/doc/opencpn/changelog.Debian.gz
-share/icons/hicolor/48x48/apps/opencpn.png
-share/icons/hicolor/scalable/apps/opencpn.svg
-share/applications/opencpn.desktop
-share/locale/cs/LC_MESSAGES/opencpn.mo
-share/locale/cs/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/cs/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/da/LC_MESSAGES/opencpn.mo
-share/locale/da/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/da/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/de/LC_MESSAGES/opencpn.mo
-share/locale/de/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/de/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/es/LC_MESSAGES/opencpn.mo
-share/locale/es/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/es/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/fr/LC_MESSAGES/opencpn.mo
-share/locale/fr/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/fr/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/it/LC_MESSAGES/opencpn.mo
-share/locale/it/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/it/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/nl/LC_MESSAGES/opencpn.mo
-share/locale/nl/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/nl/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/pl/LC_MESSAGES/opencpn.mo
-share/locale/pl/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pl/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/ru/LC_MESSAGES/opencpn.mo
-share/locale/ru/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/ru/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/sv/LC_MESSAGES/opencpn.mo
-share/locale/sv/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/sv/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/et/LC_MESSAGES/opencpn.mo
-share/locale/et/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/et/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/pt_PT/LC_MESSAGES/opencpn.mo
-share/locale/pt_PT/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pt_PT/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/pt_BR/LC_MESSAGES/opencpn.mo
-share/locale/pt_BR/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pt_BR/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/nb_NO/LC_MESSAGES/opencpn.mo
-share/locale/nb_NO/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/nb_NO/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/tr_TR/LC_MESSAGES/opencpn.mo
-share/locale/tr_TR/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/tr_TR/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/fi_FI/LC_MESSAGES/opencpn.mo
-share/locale/fi_FI/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/fi_FI/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/el_GR/LC_MESSAGES/opencpn.mo
-share/locale/el_GR/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/el_GR/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/zh_TW/LC_MESSAGES/opencpn.mo
-share/locale/zh_TW/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/zh_TW/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/hu_HU/LC_MESSAGES/opencpn.mo
-share/locale/hu_HU/LC_MESSAGES/opencpn-dashboard_pi.mo
-share/locale/gl_ES/LC_MESSAGES/opencpn.mo
-share/locale/ca_ES/LC_MESSAGES/opencpn.mo
-share/locale/hu/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pl_PL/LC_MESSAGES/opencpn-grib_pi.mo
-share/locale/pl_PL/LC_MESSAGES/opencpn-dashboard_pi.mo
-lib/opencpn/libgrib_pi.so
-lib/opencpn/libdashboard_pi.so
+share/opencpn/gshhs/poly-c-1.dat
+share/opencpn/gshhs/wdb_borders_c.b
+share/opencpn/gshhs/wdb_rivers_c.b
+share/opencpn/license.txt
+share/opencpn/s57data/S52RAZDS.RLE
+share/opencpn/s57data/attdecode.csv
+share/opencpn/s57data/chartsymbols.xml
+share/opencpn/s57data/rastersymbols-dark.png
+share/opencpn/s57data/rastersymbols-day.png
+share/opencpn/s57data/rastersymbols-dusk.png
+share/opencpn/s57data/s57attributes.csv
+share/opencpn/s57data/s57expectedinput.csv
+share/opencpn/s57data/s57objectclasses.csv
+share/opencpn/sounds/1bells.wav
+share/opencpn/sounds/2bells.wav
+share/opencpn/sounds/README.bells
+share/opencpn/tcdata/HARMONIC
+share/opencpn/tcdata/HARMONIC.IDX
+share/opencpn/tcdata/README.harmonics
+share/opencpn/uidata/styles.xml
+share/opencpn/uidata/toolicons_journeyman.png
+share/opencpn/uidata/toolicons_journeyman_flat.png
+share/opencpn/uidata/toolicons_traditional.png
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo
index 2c679e78821..f25fec94e9e 100644
--- a/geography/opencpn/distinfo
+++ b/geography/opencpn/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.1 2014/05/25 18:26:57 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2015/01/22 12:34:15 bouyer Exp $
 
-SHA1 (OpenCPN-3.2.2-Source.tar.gz) = 7395a97e50c2a47adce5bd9f62bf56cea1e41746
-RMD160 (OpenCPN-3.2.2-Source.tar.gz) = 8a0232a52c3cd954fc934b3edcec78c45149f250
-Size (OpenCPN-3.2.2-Source.tar.gz) = 158329955 bytes
-SHA1 (patch-CMakeLists.txt) = 2b4d3f525843ca8fa0e6d0b17cc51273a08f92e9
-SHA1 (patch-FindPortaudio.cmake) = 8e8de78e3b19e83cb35781161c28c4f655ca26fc
-SHA1 (patch-src_chart1.cpp) = d80d301d6e814ecd21c3fca1eed4af108774ffd2
-SHA1 (patch-src_tcmgr.cpp) = efdd45f07a19f2acf256307fa5195f9909d46961
+SHA1 (OpenCPN-4.0.0-Source.tar.gz) = a8fe31476a3472cff18e55179094cbc4434699ce
+RMD160 (OpenCPN-4.0.0-Source.tar.gz) = 614889e41c8cd5453f3210781201cb29912d8cc1
+Size (OpenCPN-4.0.0-Source.tar.gz) = 193305992 bytes
+SHA1 (patch-CMakeLists.txt) = 57abad7a02bf5fa64a522aceeddc4c67a3d5a3e2
+SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
+SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
+SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
+SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040
diff --git a/geography/opencpn/patches/patch-CMakeLists.txt b/geography/opencpn/patches/patch-CMakeLists.txt
index 62255e85a10..bc788e4c15a 100644
--- a/geography/opencpn/patches/patch-CMakeLists.txt
+++ b/geography/opencpn/patches/patch-CMakeLists.txt
@@ -1,17 +1,16 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2014/05/25 18:26:57 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2015/01/22 12:34:15 bouyer Exp $
 
-/usr/lib/libdl* is not available on NetBSD
-
---- CMakeLists.txt.orig	2014-05-23 16:28:34.000000000 +0200
-+++ CMakeLists.txt	2014-05-23 16:28:41.000000000 +0200
-@@ -818,10 +818,6 @@
+--- CMakeLists.txt.orig	2014-05-26 21:26:36.000000000 +0200
++++ CMakeLists.txt	2014-06-16 11:41:17.000000000 +0200
+@@ -1007,9 +1007,9 @@
  
  #   Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries
  #   So, add them manually.  These declarations may be redundant in some architectures, but do no harm.
 -IF(UNIX)
--TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
++IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
+ TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl )
 -ENDIF(UNIX)
--
++ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
+ 
  IF(GTK2_FOUND)
  TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} gobject-2.0 )
- ENDIF(GTK2_FOUND)
diff --git a/geography/opencpn/patches/patch-FindPortaudio.cmake b/geography/opencpn/patches/patch-FindPortaudio.cmake
index f343c3fda9a..0a38f81d4a2 100644
--- a/geography/opencpn/patches/patch-FindPortaudio.cmake
+++ b/geography/opencpn/patches/patch-FindPortaudio.cmake
@@ -1,9 +1,9 @@
-$NetBSD: patch-FindPortaudio.cmake,v 1.1 2014/05/25 18:26:57 bouyer Exp $
+$NetBSD: patch-FindPortaudio.cmake,v 1.2 2015/01/22 12:34:15 bouyer Exp $
 
 really find portaudio in portaudio2 subdir
 
---- FindPortaudio.cmake.orig	2013-05-08 17:41:43.000000000 +0200
-+++ FindPortaudio.cmake	2014-05-24 21:28:16.000000000 +0200
+--- FindPortaudio.cmake.orig	2014-05-26 21:26:36.000000000 +0200
++++ FindPortaudio.cmake	2014-05-26 21:30:22.000000000 +0200
 @@ -45,24 +45,13 @@
  set(PORTAUDIO_FOUND TRUE)
  else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
diff --git a/geography/opencpn/patches/patch-src_chart1.cpp b/geography/opencpn/patches/patch-src_chart1.cpp
index d86a592dac7..5a11506c4b3 100644
--- a/geography/opencpn/patches/patch-src_chart1.cpp
+++ b/geography/opencpn/patches/patch-src_chart1.cpp
@@ -1,10 +1,11 @@
-$NetBSD: patch-src_chart1.cpp,v 1.1 2014/05/25 18:26:57 bouyer Exp $
+$NetBSD: patch-src_chart1.cpp,v 1.2 2015/01/22 12:34:15 bouyer Exp $
 
 Adapt for tty devices on NetBSD
+Reported in FS#1403
 
---- src/chart1.cpp.orig	2014-05-23 15:58:32.000000000 +0200
-+++ src/chart1.cpp	2014-05-23 16:03:10.000000000 +0200
-@@ -7305,7 +7305,9 @@
+--- src/chart1.cpp.orig	2014-05-26 21:26:36.000000000 +0200
++++ src/chart1.cpp	2014-05-26 21:30:22.000000000 +0200
+@@ -8032,7 +8032,9 @@
  
  #include <termios.h>
  #include <sys/ioctl.h>
@@ -14,7 +15,7 @@ Adapt for tty devices on NetBSD
  
  #endif
  
-@@ -7371,6 +7373,15 @@
+@@ -8098,6 +8100,15 @@
  
  int isTTYreal(const char *dev)
  {
@@ -30,7 +31,7 @@ Adapt for tty devices on NetBSD
      struct serial_struct serinfo;
      int ret = 0;
  
-@@ -7387,6 +7398,7 @@
+@@ -8114,6 +8125,7 @@
      }
  
      return ret;
@@ -38,7 +39,7 @@ Adapt for tty devices on NetBSD
  }
  
  
-@@ -7427,11 +7439,13 @@
+@@ -8154,11 +8166,13 @@
  
  //        We try to add a few more, arbitrarily, for those systems that have fixed, traditional COM ports
  
diff --git a/geography/opencpn/patches/patch-src_crashprint.cpp b/geography/opencpn/patches/patch-src_crashprint.cpp
new file mode 100644
index 00000000000..7ec35c335d5
--- /dev/null
+++ b/geography/opencpn/patches/patch-src_crashprint.cpp
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_crashprint.cpp,v 1.1 2015/01/22 12:34:15 bouyer Exp $
+
+backtrace support is linux-only for now
+
+--- src/crashprint.cpp.orig	2015-01-20 16:46:17.000000000 +0000
++++ src/crashprint.cpp	2015-01-20 16:46:24.000000000 +0000
+@@ -76,6 +76,7 @@
+ // general functions
+ 
+ void wxCrashPrint::Report () {
++#if defined(__linux__)
+     wxString appname = wxTheApp->GetAppName();
+ 
+     // get the backtrace with symbols
+@@ -136,5 +137,5 @@
+             wxPrintf (_T("%s\n"), lines[i].c_str());
+         }
+     }
+-
++#endif
+ }
diff --git a/geography/opencpn/patches/patch-src_tcmgr.cpp b/geography/opencpn/patches/patch-src_tcmgr.cpp
index 95c59c1b142..3e751c96429 100644
--- a/geography/opencpn/patches/patch-src_tcmgr.cpp
+++ b/geography/opencpn/patches/patch-src_tcmgr.cpp
@@ -1,9 +1,11 @@
-$NetBSD: patch-src_tcmgr.cpp,v 1.1 2014/05/25 18:26:57 bouyer Exp $
+$NetBSD: patch-src_tcmgr.cpp,v 1.2 2015/01/22 12:34:15 bouyer Exp $
+
 64bit time_t fix
+Reported in FS#1403
 
---- src/tcmgr.cpp.orig	2014-05-23 17:16:52.000000000 +0200
-+++ src/tcmgr.cpp	2014-05-23 17:18:08.000000000 +0200
-@@ -569,7 +569,7 @@
+--- src/tcmgr.cpp.orig	2014-05-26 21:26:36.000000000 +0200
++++ src/tcmgr.cpp	2014-05-26 21:30:22.000000000 +0200
+@@ -518,7 +518,7 @@
          f += fact * w[n] * (fr[deriv-n] - fl[deriv-n]);
          fact *= (double)(deriv - n)/(n+1) * (1.0/TIDE_BLEND_TIME);
      }