summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--geography/opencpn/Makefile27
-rw-r--r--geography/opencpn/PLIST1319
-rw-r--r--geography/opencpn/distinfo20
-rw-r--r--geography/opencpn/patches/patch-CMakeLists.txt21
-rw-r--r--geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake16
-rw-r--r--geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt13
-rw-r--r--geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt10
-rw-r--r--geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake16
-rw-r--r--geography/opencpn/patches/patch-src_chartimg.cpp15
-rw-r--r--geography/opencpn/patches/patch-src_chcanv.cpp18
-rw-r--r--geography/opencpn/patches/patch-src_glu_libtess_sweep.c61
-rw-r--r--geography/opencpn/patches/patch-src_mipmap_mipmap.c15
12 files changed, 1043 insertions, 508 deletions
diff --git a/geography/opencpn/Makefile b/geography/opencpn/Makefile
index fd0aff15b7b..6679655f616 100644
--- a/geography/opencpn/Makefile
+++ b/geography/opencpn/Makefile
@@ -1,12 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2015/04/25 14:23:06 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2016/03/14 11:01:06 bouyer Exp $
#
-VERSION= 4.0.0
-DISTNAME= OpenCPN-${VERSION}-Source
+VERSION= 4.2.0
+#PKGREVISION= 1
+DISTNAME= OpenCPN-${VERSION}
PKGNAME= opencpn-${VERSION}
-PKGREVISION= 1
CATEGORIES= geography
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencpn/${VERSION}/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenCPN/}
+GITHUB_PROJECT= OpenCPN
+GITHUB_TAG= a555b4988b50f555be052394c184ef26c5ad0e8a
+EXTRACT_SUFX= .zip
MAINTAINER= bouyer@NetBSD.org
HOMEPAGE= http://www.opencpn.org/
@@ -19,12 +22,13 @@ 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_ARGS+= -DCMAKE_BUILD_TYPE=Debug
CMAKE_MODULE_PATH_OVERRIDE = \
- plugins/grib_pi/CMakeLists.txt \
- plugins/demo_pi_sample/src/CMakeLists.txt \
- plugins/demo_pi_sample/CMakeLists.txt \
- plugins/dashboard_pi/CMakeLists.txt \
- plugins/CMakeLists.txt
+ plugins/chartdldr_pi/CMakeLists.txt \
+ plugins/dashboard_pi/CMakeLists.txt \
+ plugins/grib_pi/CMakeLists.txt \
+ plugins/wmm_pi/CMakeLists.txt \
+ plugins/CMakeLists.txt
SUBST_CLASSES+= prefix
SUBST_STAGE.prefix= pre-configure
@@ -40,7 +44,7 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../devel/cmake/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/wxGTK28/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../archivers/bzip2/buildlink3.mk"
@@ -48,4 +52,5 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../textproc/tinyxml/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/geography/opencpn/PLIST b/geography/opencpn/PLIST
index 089b7d66082..6bc7fc21ecc 100644
--- a/geography/opencpn/PLIST
+++ b/geography/opencpn/PLIST
@@ -1,218 +1,271 @@
-@comment $NetBSD: PLIST,v 1.2 2015/01/22 12:34:15 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/03/14 11:01:06 bouyer Exp $
bin/opencpn
+lib/opencpn/libchartdldr_pi.so
lib/opencpn/libdashboard_pi.so
lib/opencpn/libgrib_pi.so
+lib/opencpn/libwmm_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/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/ca/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/ca/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/ca/LC_MESSAGES/opencpn-wmm_pi.mo
share/locale/ca_ES/LC_MESSAGES/opencpn.mo
+share/locale/cs/LC_MESSAGES/opencpn-chartdldr_pi.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-wmm_pi.mo
share/locale/cs/LC_MESSAGES/opencpn.mo
+share/locale/da/LC_MESSAGES/opencpn-chartdldr_pi.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-wmm_pi.mo
share/locale/da/LC_MESSAGES/opencpn.mo
+share/locale/de/LC_MESSAGES/opencpn-chartdldr_pi.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-wmm_pi.mo
share/locale/de/LC_MESSAGES/opencpn.mo
+share/locale/el/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/el/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/el/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/el/LC_MESSAGES/opencpn-wmm_pi.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-chartdldr_pi.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-wmm_pi.mo
share/locale/es/LC_MESSAGES/opencpn.mo
+share/locale/et/LC_MESSAGES/opencpn-chartdldr_pi.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-wmm_pi.mo
share/locale/et/LC_MESSAGES/opencpn.mo
+share/locale/fi/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/fi/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/fi/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/fi/LC_MESSAGES/opencpn-wmm_pi.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-chartdldr_pi.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-wmm_pi.mo
share/locale/fr/LC_MESSAGES/opencpn.mo
+share/locale/gl/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/gl/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/gl/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/gl/LC_MESSAGES/opencpn-wmm_pi.mo
share/locale/gl_ES/LC_MESSAGES/opencpn.mo
+share/locale/hu/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/hu/LC_MESSAGES/opencpn-dashboard_pi.mo
share/locale/hu/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/hu/LC_MESSAGES/opencpn-wmm_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-chartdldr_pi.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-wmm_pi.mo
share/locale/it/LC_MESSAGES/opencpn.mo
+share/locale/ja/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/ja/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/ja/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/ja/LC_MESSAGES/opencpn-wmm_pi.mo
+share/locale/nb/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/nb/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/nb/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/nb/LC_MESSAGES/opencpn-wmm_pi.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-chartdldr_pi.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-wmm_pi.mo
share/locale/nl/LC_MESSAGES/opencpn.mo
+share/locale/pl/LC_MESSAGES/opencpn-chartdldr_pi.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-wmm_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/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/pt/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/pt/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/pt/LC_MESSAGES/opencpn-wmm_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-chartdldr_pi.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-wmm_pi.mo
share/locale/ru/LC_MESSAGES/opencpn.mo
+share/locale/sv/LC_MESSAGES/opencpn-chartdldr_pi.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-wmm_pi.mo
share/locale/sv/LC_MESSAGES/opencpn.mo
+share/locale/tr/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/tr/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/tr/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/tr/LC_MESSAGES/opencpn-wmm_pi.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/vi/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/vi/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/vi/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/zh/LC_MESSAGES/opencpn-chartdldr_pi.mo
+share/locale/zh/LC_MESSAGES/opencpn-dashboard_pi.mo
+share/locale/zh/LC_MESSAGES/opencpn-grib_pi.mo
+share/locale/zh/LC_MESSAGES/opencpn-wmm_pi.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/0.jpg
+share/opencpn/doc/images/02.jpg
+share/opencpn/doc/images/03-Chart-Downloader-Tab-First-Time.jpg
+share/opencpn/doc/images/08-AfterDownloading.jpg
+share/opencpn/doc/images/1.jpg
+share/opencpn/doc/images/10_1mile.jpg
+share/opencpn/doc/images/15-Chart-Status-Selection.jpg
+share/opencpn/doc/images/16-Show-Local-Files.jpg
+share/opencpn/doc/images/17preferences.jpg
+share/opencpn/doc/images/1AU-Add-Edit-Custom-Chart-Source.jpg
+share/opencpn/doc/images/1AUAddNewChartSource-Predefined201.jpg
+share/opencpn/doc/images/1AUpreferences.jpg
+share/opencpn/doc/images/1Charts.jpg
+share/opencpn/doc/images/1PleaseUpdate.jpg
+share/opencpn/doc/images/1_2.jpg
+share/opencpn/doc/images/1ancorIcon.jpg
+share/opencpn/doc/images/1sliders.jpg
+share/opencpn/doc/images/2.jpg
+share/opencpn/doc/images/3.jpg
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/33Accuracy_10K.jpg
+share/opencpn/doc/images/33Accuracy_12m.jpg
+share/opencpn/doc/images/33Accuracy_info.jpg
+share/opencpn/doc/images/33Accuracy_info2.jpg
+share/opencpn/doc/images/33Aton2.jpg
+share/opencpn/doc/images/33AtonOnPos.jpg
+share/opencpn/doc/images/33Blacklist.jpg
+share/opencpn/doc/images/33Dash-App.jpg
+share/opencpn/doc/images/33GFS16.jpg
+share/opencpn/doc/images/33GribInterpolation.jpg
+share/opencpn/doc/images/33GribOverlayColors.jpg
+share/opencpn/doc/images/33GribPreference2.jpg
+share/opencpn/doc/images/33GribUnits.jpg
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/33HideTrack.jpg
+share/opencpn/doc/images/33VAton2.jpg
+share/opencpn/doc/images/33WxTable.jpg
+share/opencpn/doc/images/33WxTable_1.jpg
+share/opencpn/doc/images/33YellowOwnShip.jpg
+share/opencpn/doc/images/33_S57_info.jpg
+share/opencpn/doc/images/33ais-showname.jpg
+share/opencpn/doc/images/33gribcurrent.jpg
+share/opencpn/doc/images/33jmantoolbar.jpg
+share/opencpn/doc/images/33speed12.jpg
+share/opencpn/doc/images/33speed50.jpg
+share/opencpn/doc/images/33tradtoolbar.jpg
+share/opencpn/doc/images/33vec.jpg
+share/opencpn/doc/images/33vofpos.jpg
+share/opencpn/doc/images/3jmanflattoolbar.jpg
+share/opencpn/doc/images/4-S63-1.jpg
+share/opencpn/doc/images/4-S63.jpg
+share/opencpn/doc/images/4.jpg
+share/opencpn/doc/images/420OptionConnections.jpg
+share/opencpn/doc/images/421OptionConnections.jpg
+share/opencpn/doc/images/42AddSerialConnection.jpg
+share/opencpn/doc/images/48px-Under_construction_icon-blue.jpg
+share/opencpn/doc/images/4Chartgroups2.jpg
+share/opencpn/doc/images/4GL-expert.jpg
+share/opencpn/doc/images/4GribAreaSelection.jpg
+share/opencpn/doc/images/4GribControledColours.jpg
+share/opencpn/doc/images/4GribCurrent_0.jpg
+share/opencpn/doc/images/4GribDisplayChoices.jpg
+share/opencpn/doc/images/4GribGraph-Selection.jpg
+share/opencpn/doc/images/4MMSI-prop.jpg
+share/opencpn/doc/images/4MOB1.jpg
+share/opencpn/doc/images/4MOB3.jpg
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/4MOB6.jpg
+share/opencpn/doc/images/4Objq.jpg
+share/opencpn/doc/images/4OptChartTide.jpg
+share/opencpn/doc/images/4PlugIns.jpg
+share/opencpn/doc/images/4RNG.jpg
+share/opencpn/doc/images/4RealScaleBitmap.jpg
+share/opencpn/doc/images/4RightClRoute.jpg
+share/opencpn/doc/images/4RightclickLayerTrack.jpg
+share/opencpn/doc/images/4RightclickTrack.jpg
+share/opencpn/doc/images/4SendtoGPS.jpg
+share/opencpn/doc/images/4ShowRadarRings.jpg
+share/opencpn/doc/images/4Start-Charts.jpg
+share/opencpn/doc/images/4Start-Charts1.jpg
+share/opencpn/doc/images/4Start-Charts2.jpg
+share/opencpn/doc/images/4Start-Charts3.jpg
+share/opencpn/doc/images/4Start-Charts4.jpg
+share/opencpn/doc/images/4Target-Query1.jpg
+share/opencpn/doc/images/4Target-Query2.jpg
+share/opencpn/doc/images/4Target-Real-Size.jpg
+share/opencpn/doc/images/4TrackProperties.jpg
+share/opencpn/doc/images/4TracksTab.jpg
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/Anch4.png
-share/opencpn/doc/images/Anch5.png
-share/opencpn/doc/images/Anch6.png
-share/opencpn/doc/images/Anch8.png
-share/opencpn/doc/images/Anch9.png
+share/opencpn/doc/images/4fps.jpg
+share/opencpn/doc/images/4gribControl.jpg
+share/opencpn/doc/images/5.jpg
+share/opencpn/doc/images/500mb.jpg
+share/opencpn/doc/images/5GL-non-expert.jpg
+share/opencpn/doc/images/6.jpg
+share/opencpn/doc/images/7.jpg
+share/opencpn/doc/images/8.jpg
+share/opencpn/doc/images/9.jpg
+share/opencpn/doc/images/Activation_NVC-Charts.jpg
+share/opencpn/doc/images/Anch2.jpg
+share/opencpn/doc/images/Anch3.jpg
+share/opencpn/doc/images/Anch4.jpg
+share/opencpn/doc/images/Anch5.jpg
+share/opencpn/doc/images/Anch6.jpg
+share/opencpn/doc/images/Anch8.jpg
+share/opencpn/doc/images/Anch9.jpg
+share/opencpn/doc/images/AtoN_all.jpg
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-Grib.jpg
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/Chartbar32.jpg
+share/opencpn/doc/images/ClassicShell_zpsbfed952c.jpg
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
@@ -220,127 +273,279 @@ 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/Climatology-Wind-Dec.jpg
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/Connections-Output-Filter-Sentence.jpg
+share/opencpn/doc/images/Connections.jpg
+share/opencpn/doc/images/Dashprop322.jpg
share/opencpn/doc/images/Debug_win.jpg
+share/opencpn/doc/images/Des-activation_NVC-Charts.jpg
share/opencpn/doc/images/DeviceManager-1.jpg
-share/opencpn/doc/images/DeviceManager_zpsb0197e16.png
+share/opencpn/doc/images/DeviceManager_zpsb0197e16.jpg
+share/opencpn/doc/images/Diagram-0-sm.jpg
+share/opencpn/doc/images/Diagram-1-sm.jpg
+share/opencpn/doc/images/Diagram-2-sm.jpg
+share/opencpn/doc/images/Diagram-3-sm.jpg
+share/opencpn/doc/images/Diagram-4-sm.jpg
+share/opencpn/doc/images/Draw-Toolbar.jpg
+share/opencpn/doc/images/Draw_Manager_and_Draw_Toolbar_Icons.jpg
+share/opencpn/doc/images/Ecran_affichage_1.jpg
+share/opencpn/doc/images/Ecran_affichage_2.jpg
+share/opencpn/doc/images/Ecran_affichage_3.jpg
+share/opencpn/doc/images/Ecran_affichage_4.jpg
+share/opencpn/doc/images/FI-Setup.jpg
+share/opencpn/doc/images/Find-Logbook.jpg
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/GD_NGA24390.jpg
+share/opencpn/doc/images/GeolocationTCP_zps5cb554ea.jpg
+share/opencpn/doc/images/Girb-Hide-Data.jpg
+share/opencpn/doc/images/Grib-Menu-2.jpg
+share/opencpn/doc/images/Grib-Settings-Bottom-Slider.jpg
+share/opencpn/doc/images/Grib-Settings-Data-Air-Temperature.jpg
+share/opencpn/doc/images/Grib-Settings-Data-CAPE.jpg
+share/opencpn/doc/images/Grib-Settings-Data-Pressure.jpg
+share/opencpn/doc/images/Grib-Settings-Data-Waves-Data.jpg
+share/opencpn/doc/images/Grib-Settings-Data-Waves-Gui.jpg
+share/opencpn/doc/images/Grib-Settings-Data-Waves-Playback.jpg
+share/opencpn/doc/images/Grib-Settings-Data-Wind-Gust.jpg
+share/opencpn/doc/images/Grib-Settings-Data-Wind.jpg
+share/opencpn/doc/images/Grib-Settings-Message-Saildocs.jpg
+share/opencpn/doc/images/Grib-Settings-Message-Zygrib.jpg
+share/opencpn/doc/images/Help-About.jpg
+share/opencpn/doc/images/IEC_AIS_AtoN_sym-Real.jpg
+share/opencpn/doc/images/IEC_AIS_AtoN_sym-Virtual.jpg
+share/opencpn/doc/images/IMGP0105.jpg
+share/opencpn/doc/images/IMGP0107.jpg
+share/opencpn/doc/images/Icon-Enc-Text-On.jpg
+share/opencpn/doc/images/Installationnvc_pi_2.jpg
+share/opencpn/doc/images/Installationnvc_pi_3.jpg
+share/opencpn/doc/images/Installationnvc_pi_4.jpg
+share/opencpn/doc/images/Installationvc_pi_1.jpg
+share/opencpn/doc/images/Locations.jpg
+share/opencpn/doc/images/MMSI_Prop_List1.jpg
+share/opencpn/doc/images/MOB-choice.jpg
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/MenuBar.jpg
+share/opencpn/doc/images/Menubar-AIS.jpg
+share/opencpn/doc/images/Menubar-Help.jpg
+share/opencpn/doc/images/Menubar-Navigation.jpg
+share/opencpn/doc/images/Menubar-Tools.jpg
+share/opencpn/doc/images/Menubar-View.jpg
+share/opencpn/doc/images/Menubar-toolbar-chart.jpg
+share/opencpn/doc/images/NV_Verlag_web_site.jpg
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/Nr9.jpg
+share/opencpn/doc/images/OCPN-BSB4-DLL-Enable.jpg
+share/opencpn/doc/images/OCPN-BSB4-Install.jpg
+share/opencpn/doc/images/OCPN-OptionsMenu.jpg
+share/opencpn/doc/images/OD-Preferences-About.jpg
+share/opencpn/doc/images/OD-Preferences-Boundary-Point.jpg
+share/opencpn/doc/images/OD-Preferences-Boundary.jpg
+share/opencpn/doc/images/OD-Preferences-DR-Point.jpg
+share/opencpn/doc/images/OD-Preferences-DR.jpg
+share/opencpn/doc/images/OD-Preferences-EBL.jpg
+share/opencpn/doc/images/OD-Preferences-Path.jpg
+share/opencpn/doc/images/OD-Preferences-Text-Point.jpg
+share/opencpn/doc/images/OD-Preferences-dialog.jpg
+share/opencpn/doc/images/OD-objects.jpg
+share/opencpn/doc/images/OZ.jpg
+share/opencpn/doc/images/OZ1.jpg
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/Options-Chart-Buttons-ENC.jpg
+share/opencpn/doc/images/Options-Chart-Buttons-RNC-Icon.jpg
+share/opencpn/doc/images/Options-Charts-Icon.jpg
+share/opencpn/doc/images/Options-Connection-Icon.jpg
+share/opencpn/doc/images/Options-Connections-Network_0.jpg
+share/opencpn/doc/images/Options-Connections_zps80f51d7f.jpg
+share/opencpn/doc/images/Options-GPS-Orient-Icon.jpg
+share/opencpn/doc/images/Options-Plugins-Icon.jpg
+share/opencpn/doc/images/Options-Plugins.jpg
+share/opencpn/doc/images/Options-Ships-OwnShip-Routes.jpg
+share/opencpn/doc/images/Options-UserInterface_zpsfc3672fb.jpg
share/opencpn/doc/images/ParticleMap.jpg
+share/opencpn/doc/images/Polar-Pi-eliminate-zeros.jpg
share/opencpn/doc/images/Prolific.jpg
+share/opencpn/doc/images/Provisions.jpg
share/opencpn/doc/images/Puerto_Morelos1.jpg
-share/opencpn/doc/images/Puerto_Morelos2.png
+share/opencpn/doc/images/Puerto_Morelos2.jpg
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/Reduce-Data.jpg
+share/opencpn/doc/images/Reduce-Data1.jpg
+share/opencpn/doc/images/Right-Click-ENC-quilting.jpg
+share/opencpn/doc/images/Right-Click-ENC-single-chart.jpg
+share/opencpn/doc/images/Right-Click-RNC-quilting.jpg
+share/opencpn/doc/images/Right-Click-RNC-single-chart.jpg
share/opencpn/doc/images/Route-Properties.jpg
-share/opencpn/doc/images/Route-Properties1.png
-share/opencpn/doc/images/Route-Properties2.png
+share/opencpn/doc/images/Route-Properties1.jpg
+share/opencpn/doc/images/Route-Properties2.jpg
share/opencpn/doc/images/Route-rollover.jpg
-share/opencpn/doc/images/Route-rollover.png
-share/opencpn/doc/images/Route21.png
-share/opencpn/doc/images/Route23.png
+share/opencpn/doc/images/Route21.jpg
share/opencpn/doc/images/Routing1.jpg
-share/opencpn/doc/images/Routing2.png
-share/opencpn/doc/images/Routing3.png
-share/opencpn/doc/images/Routing5.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/Routing2.jpg
+share/opencpn/doc/images/Routing3.jpg
+share/opencpn/doc/images/Routing5.jpg
+share/opencpn/doc/images/Routing7.jpg
+share/opencpn/doc/images/Routing8.jpg
+share/opencpn/doc/images/S-63-keys-permits.png
+share/opencpn/doc/images/S-WDpi-01-Husky.jpg
+share/opencpn/doc/images/S-WDpi-02.jpg
+share/opencpn/doc/images/S-WDpi-03.jpg
+share/opencpn/doc/images/S-WDpi-04.jpg
+share/opencpn/doc/images/S-WDpi-04aa.jpg
+share/opencpn/doc/images/S-WDpi-04b.jpg
+share/opencpn/doc/images/S-WDpi-05.jpg
+share/opencpn/doc/images/S-WDpi-06.jpg
+share/opencpn/doc/images/S-WDpi-07.jpg
+share/opencpn/doc/images/S-WDpi-08_0.jpg
+share/opencpn/doc/images/S-WDpi-09.jpg
+share/opencpn/doc/images/S-WDpi-10.jpg
+share/opencpn/doc/images/S-WDpi-11.jpg
+share/opencpn/doc/images/S-WDpi-12.jpg
+share/opencpn/doc/images/S-WDpi-13_0.jpg
+share/opencpn/doc/images/S-WDpi-14.jpg
+share/opencpn/doc/images/S-WDpi-15.jpg
+share/opencpn/doc/images/S-WDpi-16.jpg
+share/opencpn/doc/images/S-WDpi-17.jpg
+share/opencpn/doc/images/S-WDpi-18.jpg
+share/opencpn/doc/images/S-WDpi-19.jpg
+share/opencpn/doc/images/S-WDpi-20.jpg
+share/opencpn/doc/images/S-WDpi-21_0.jpg
+share/opencpn/doc/images/S-WDpi-22.jpg
+share/opencpn/doc/images/S-WDpi-23.jpg
+share/opencpn/doc/images/S-WDpi-24.jpg
+share/opencpn/doc/images/S-WDpi-25.jpg
+share/opencpn/doc/images/S-WDpi-26.jpg
+share/opencpn/doc/images/S-WDpi-27.jpg
+share/opencpn/doc/images/S-WDpi-28.jpg
+share/opencpn/doc/images/S-WDpi-29.jpg
+share/opencpn/doc/images/S-WDpi-30.jpg
+share/opencpn/doc/images/S-WDpi-31.jpg
+share/opencpn/doc/images/S-WDpi-32_0.jpg
+share/opencpn/doc/images/S-WDpi-32a.jpg
+share/opencpn/doc/images/S-WDpi-32b.jpg
+share/opencpn/doc/images/S-WDpi-32c.jpg
+share/opencpn/doc/images/S-WDpi-33.jpg
+share/opencpn/doc/images/S-WDpi-34.jpg
+share/opencpn/doc/images/S-WDpi-35.jpg
+share/opencpn/doc/images/S-WDpi-36.jpg
+share/opencpn/doc/images/S-WDpi-37.jpg
+share/opencpn/doc/images/S-WDpi-38.jpg
+share/opencpn/doc/images/S-WDpi-39.jpg
+share/opencpn/doc/images/S-WDpi-40.jpg
+share/opencpn/doc/images/S-WDpi-41.jpg
+share/opencpn/doc/images/S-WDpi-42.jpg
+share/opencpn/doc/images/S-WDpi-43.jpg
+share/opencpn/doc/images/S-WDpi-44.jpg
+share/opencpn/doc/images/S-WDpi-45.jpg
+share/opencpn/doc/images/S-WDpi-46.jpg
+share/opencpn/doc/images/S-WDpi-47.jpg
+share/opencpn/doc/images/S-WDpi-48.jpg
+share/opencpn/doc/images/S-WDpi-49_0.jpg
+share/opencpn/doc/images/S-WDpi-50.jpg
+share/opencpn/doc/images/S-WDpi-51.jpg
+share/opencpn/doc/images/S-WDpi-52.jpg
+share/opencpn/doc/images/S-WDpi-53_0.jpg
+share/opencpn/doc/images/S-WDpi-54.jpg
+share/opencpn/doc/images/S-WDpi-55.jpg
+share/opencpn/doc/images/S-WDpi-56.jpg
+share/opencpn/doc/images/S-WDpi-57.jpg
+share/opencpn/doc/images/S-WDpi-58.jpg
+share/opencpn/doc/images/S-WDpi-59_0.jpg
+share/opencpn/doc/images/S-WDpi-60-0.jpg
+share/opencpn/doc/images/S-WDpi-61-0.jpg
+share/opencpn/doc/images/S-WDpi-62-0.jpg
+share/opencpn/doc/images/S-WDpi-62-01.jpg
+share/opencpn/doc/images/S-WDpi-62-02.jpg
+share/opencpn/doc/images/S-WDpi-63_0.jpg
+share/opencpn/doc/images/S-WDpi-64.jpg
+share/opencpn/doc/images/S-WDpi-65.jpg
+share/opencpn/doc/images/S-WDpi-66.jpg
+share/opencpn/doc/images/S-WDpi-67.jpg
+share/opencpn/doc/images/S-WDpi-68_0.jpg
+share/opencpn/doc/images/S-WDpi-69.jpg
+share/opencpn/doc/images/S-WDpi-70.jpg
+share/opencpn/doc/images/S-WDpi-71.jpg
+share/opencpn/doc/images/S-WDpi-72.jpg
+share/opencpn/doc/images/S-WDpi-73.jpg
+share/opencpn/doc/images/S-WDpi-AlarmAction.jpg
+share/opencpn/doc/images/S-WDpi-slider.jpg
+share/opencpn/doc/images/S63-3.jpg
+share/opencpn/doc/images/S63message.jpg
+share/opencpn/doc/images/S64usp.jpg
+share/opencpn/doc/images/S65inst.jpg
+share/opencpn/doc/images/SART1.jpg
+share/opencpn/doc/images/SART3.jpg
+share/opencpn/doc/images/SART4.jpg
+share/opencpn/doc/images/SART5.jpg
+share/opencpn/doc/images/SARTalarm.jpg
+share/opencpn/doc/images/Settings-Ship-MMSI-Add-MMSI-Properties.jpg
+share/opencpn/doc/images/Settings-Ship-MMSI-Less-than-Nine.jpg
+share/opencpn/doc/images/Settings.jpg
+share/opencpn/doc/images/Sight-1-Degrees-Minutes-Uncertainty.jpg
+share/opencpn/doc/images/Sight-2-Date-Time-Certainty-Shift.jpg
+share/opencpn/doc/images/Sight-3-Configuration.jpg
+share/opencpn/doc/images/Sight-4-Parameters.jpg
+share/opencpn/doc/images/Sight-5-Calculations.jpg
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/Tide1.png
-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/TS2.jpg
+share/opencpn/doc/images/TargetCPA.jpg
+share/opencpn/doc/images/Telechargement_nvc_pi-1.jpg
+share/opencpn/doc/images/Tide-interference.jpg
+share/opencpn/doc/images/Tide1.jpg
+share/opencpn/doc/images/Tide2.jpg
+share/opencpn/doc/images/Tide4.jpg
+share/opencpn/doc/images/Tide5.jpg
+share/opencpn/doc/images/Tide6.jpg
+share/opencpn/doc/images/Tide7.jpg
+share/opencpn/doc/images/ToolBAR22.jpg
+share/opencpn/doc/images/Toolbar-AIS.jpg
+share/opencpn/doc/images/Toolbar-Options-Charts-Chart-Files.jpg
+share/opencpn/doc/images/Toolbar-Options-Charts-Chart-Groups.jpg
+share/opencpn/doc/images/Toolbar-Options-Charts-Tides-Currents.jpg
+share/opencpn/doc/images/Toolbar-Options-Charts-Vector-Chart-Display.jpg
+share/opencpn/doc/images/Toolbar-Options-Connections-Net-1.jpg
+share/opencpn/doc/images/Toolbar-Options-Connections-Net-2.jpg
+share/opencpn/doc/images/Toolbar-Options-Display-Advanced.jpg
+share/opencpn/doc/images/Toolbar-Options-Display-General_0.jpg
+share/opencpn/doc/images/Toolbar-Options-Display-Units_0.jpg
+share/opencpn/doc/images/Toolbar-Options-Ships-AIS-Targets-1.jpg
+share/opencpn/doc/images/Toolbar-Options-Ships-AIS-Targets-2.jpg
+share/opencpn/doc/images/Toolbar-Options-Ships-Own-Ship.jpg
+share/opencpn/doc/images/Toolbar-Options-User-Interface.jpg
+share/opencpn/doc/images/Units.jpg
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/WH1.jpg
+share/opencpn/doc/images/WH2.jpg
+share/opencpn/doc/images/WMM1.jpg
+share/opencpn/doc/images/WMM2.jpg
+share/opencpn/doc/images/WMM3.jpg
+share/opencpn/doc/images/WMM4.jpg
+share/opencpn/doc/images/WMM5.jpg
+share/opencpn/doc/images/WMM6.jpg
+share/opencpn/doc/images/WMM7.jpg
+share/opencpn/doc/images/WMM8.jpg
+share/opencpn/doc/images/WMM9.jpg
+share/opencpn/doc/images/Waypoint-Rings-Bottom.jpg
+share/opencpn/doc/images/Waypoint-Rings.jpg
+share/opencpn/doc/images/Waypoint-Rings_0.jpg
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/Werror1.jpg
+share/opencpn/doc/images/Werror2.jpg
+share/opencpn/doc/images/Werror3.jpg
+share/opencpn/doc/images/Wpt21.jpg
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-1-File-Menu.jpg
+share/opencpn/doc/images/Wx-2-Retrieve-Menu.jpg
+share/opencpn/doc/images/Wx-A1-Ret-AudioCapture-Recieving.jpg
+share/opencpn/doc/images/Wx-B1-Ret-HFRadioSch-FilterTab-Menu.jpg
+share/opencpn/doc/images/Wx-B2-Ret-HFRadioSch-AlarmTab-Menu.jpg
+share/opencpn/doc/images/Wx-B3-Ret-HFRadioSch-CaptureOptionsTab-Menu.jpg
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
@@ -350,324 +555,377 @@ 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/Wx-C8-Ret-Inet-Downloaded-List.jpg
+share/opencpn/doc/images/ZeroXTE.jpg
+share/opencpn/doc/images/aa-mob.jpg
+share/opencpn/doc/images/action-filter.jpg
+share/opencpn/doc/images/activeroutewpt.jpg
+share/opencpn/doc/images/add_options.jpg
+share/opencpn/doc/images/after_clipboard.jpg
+share/opencpn/doc/images/aground.jpg
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/aisfocus.png
-share/opencpn/doc/images/anch.png
+share/opencpn/doc/images/ais-green.jpg
+share/opencpn/doc/images/ais-grey.jpg
+share/opencpn/doc/images/ais-lemon.jpg
+share/opencpn/doc/images/ais-lost.jpg
+share/opencpn/doc/images/ais-moor.jpg
+share/opencpn/doc/images/ais-red.jpg
+share/opencpn/doc/images/ais-yellow.jpg
+share/opencpn/doc/images/ais.jpg
+share/opencpn/doc/images/ais11.jpg
+share/opencpn/doc/images/ais2.jpg
+share/opencpn/doc/images/ais_alarm.jpg
+share/opencpn/doc/images/ais_alive_active.jpg
+share/opencpn/doc/images/ais_disabled.jpg
+share/opencpn/doc/images/ais_supressed.jpg
+share/opencpn/doc/images/aisfocus.jpg
+share/opencpn/doc/images/anch.jpg
share/opencpn/doc/images/anegpass.jpg
-share/opencpn/doc/images/aprs.png
+share/opencpn/doc/images/aprs.jpg
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/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/arpa1.jpg
+share/opencpn/doc/images/arpa2.jpg
+share/opencpn/doc/images/arpa3.jpg
+share/opencpn/doc/images/arpa4.jpg
+share/opencpn/doc/images/aton_off.jpg
+share/opencpn/doc/images/aton_std.jpg
+share/opencpn/doc/images/aton_virt.jpg
+share/opencpn/doc/images/attachment.jpg
+share/opencpn/doc/images/attachment_002.jpg
+share/opencpn/doc/images/attachment_003.jpg
+share/opencpn/doc/images/auto-follow_0.jpg
+share/opencpn/doc/images/base.jpg
+share/opencpn/doc/images/basestn.jpg
+share/opencpn/doc/images/bluesquare.jpg
+share/opencpn/doc/images/boundaryPoint.jpg
+share/opencpn/doc/images/br24_advanced_emu_osx.jpg
+share/opencpn/doc/images/br24_button.jpg
+share/opencpn/doc/images/br24_controls.jpg
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_overlay_messages.jpg
+share/opencpn/doc/images/br24_plugin_11_status.jpg
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/bramb2.png
+share/opencpn/doc/images/bramb.jpg
+share/opencpn/doc/images/bramb1.jpg
+share/opencpn/doc/images/bramb2.jpg
share/opencpn/doc/images/brazil.jpg
-share/opencpn/doc/images/bud-icon.png
-share/opencpn/doc/images/buttons-select.png
-share/opencpn/doc/images/classB.png
+share/opencpn/doc/images/bud-icon.jpg
+share/opencpn/doc/images/buttons-select.jpg
+share/opencpn/doc/images/classB.jpg
share/opencpn/doc/images/climatology1thumb.jpg
share/opencpn/doc/images/climatologyctr_0.jpg
-share/opencpn/doc/images/cm93.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/clipboard_gpsbabel.jpg
+share/opencpn/doc/images/cm93.jpg
+share/opencpn/doc/images/cm93grp.jpg
+share/opencpn/doc/images/colscheme.jpg
+share/opencpn/doc/images/composite.jpg
+share/opencpn/doc/images/composite1.jpg
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/current-digits.png
-share/opencpn/doc/images/current.png
-share/opencpn/doc/images/current1.png
-share/opencpn/doc/images/currents_box.png
-share/opencpn/doc/images/dark-green.png
+share/opencpn/doc/images/course-up_0.jpg
+share/opencpn/doc/images/current-digits.jpg
+share/opencpn/doc/images/current.jpg
+share/opencpn/doc/images/current1.jpg
+share/opencpn/doc/images/currents_box.jpg
+share/opencpn/doc/images/dark-green.jpg
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/dash-select-instr_0.jpg
+share/opencpn/doc/images/dash-set.jpg
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/dashboard-plugin32.jpg
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/dashn3.jpg
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/dpare.png
-share/opencpn/doc/images/dsc-alert.png
+share/opencpn/doc/images/dh.jpg
+share/opencpn/doc/images/dim1.jpg
+share/opencpn/doc/images/dpare.jpg
+share/opencpn/doc/images/dsc-alert.jpg
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-not-ok.jpg
+share/opencpn/doc/images/dsc-ok.jpg
+share/opencpn/doc/images/dsc-ok2.jpg
share/opencpn/doc/images/dsc_distress.jpg
-share/opencpn/doc/images/dse1.png
-share/opencpn/doc/images/dyngnaset.png
+share/opencpn/doc/images/dse1.jpg
+share/opencpn/doc/images/dyngnaset.jpg
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/europe3.jpg
+share/opencpn/doc/images/explain.jpg
+share/opencpn/doc/images/export_dr_gpx.jpg
+share/opencpn/doc/images/export_route.jpg
+share/opencpn/doc/images/eye33.jpg
+share/opencpn/doc/images/file_gpsbabel.jpg
+share/opencpn/doc/images/filtering.jpg
+share/opencpn/doc/images/fishing.jpg
+share/opencpn/doc/images/folderoptions.jpg
+share/opencpn/doc/images/font.jpg
+share/opencpn/doc/images/font1.jpg
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/gc1.jpg
+share/opencpn/doc/images/gc3.jpg
+share/opencpn/doc/images/gc4.jpg
+share/opencpn/doc/images/gc6.jpg
+share/opencpn/doc/images/gc7.jpg
+share/opencpn/doc/images/gc8.jpg
share/opencpn/doc/images/gdb.jpg
share/opencpn/doc/images/gdb1.jpg
-share/opencpn/doc/images/gl.png
-share/opencpn/doc/images/gps1.png
-share/opencpn/doc/images/gps2.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/gl.jpg
+share/opencpn/doc/images/gps1.jpg
+share/opencpn/doc/images/gps2.jpg
+share/opencpn/doc/images/gps3.jpg
+share/opencpn/doc/images/gpsGrn.jpg
+share/opencpn/doc/images/gpsRed.jpg
+share/opencpn/doc/images/gpsd-con1.jpg
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/gradar_domecont.jpg
+share/opencpn/doc/images/gradar_icon_green.jpg
+share/opencpn/doc/images/gradar_icon_red.jpg
+share/opencpn/doc/images/gradar_log.jpg
+share/opencpn/doc/images/gradar_noisecont.jpg
+share/opencpn/doc/images/gradar_opcont.jpg
+share/opencpn/doc/images/gradar_optionenable.jpg
+share/opencpn/doc/images/gradar_rangecont.jpg
+share/opencpn/doc/images/gradar_rightclick.jpg
+share/opencpn/doc/images/gray-nogps.jpg
+share/opencpn/doc/images/grib.jpg
+share/opencpn/doc/images/grib_0.jpg
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/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/group.jpg
+share/opencpn/doc/images/halfadegree.jpg
+share/opencpn/doc/images/havannah-ext.jpg
+share/opencpn/doc/images/havannah-noext.jpg
+share/opencpn/doc/images/headingline1.jpg
+share/opencpn/doc/images/help.jpg
+share/opencpn/doc/images/help_002.jpg
+share/opencpn/doc/images/help_1.jpg
+share/opencpn/doc/images/hidden-quilt.jpg
+share/opencpn/doc/images/highlight.jpg
+share/opencpn/doc/images/hotkeys3.jpg
+share/opencpn/doc/images/hotkeys3_(2).jpg
+share/opencpn/doc/images/hotkeys3_(3).jpg
+share/opencpn/doc/images/hotkeys3_(4).jpg
+share/opencpn/doc/images/hotkeys3_(5).jpg
+share/opencpn/doc/images/hotkeys3_(6).jpg
+share/opencpn/doc/images/hsc.jpg
+share/opencpn/doc/images/ifeahche_1.jpg
+share/opencpn/doc/images/import_dr_gpx.jpg
+share/opencpn/doc/images/import_dr_gpx_route_manager.jpg
+share/opencpn/doc/images/import_gpx.jpg
+share/opencpn/doc/images/in1.jpg
+share/opencpn/doc/images/in11.jpg
+share/opencpn/doc/images/in2.jpg
+share/opencpn/doc/images/in22.jpg
+share/opencpn/doc/images/incwpt.jpg
+share/opencpn/doc/images/incwpt1.jpg
+share/opencpn/doc/images/incwpt2.jpg
+share/opencpn/doc/images/incwpt3.jpg
+share/opencpn/doc/images/incwpt4.jpg
+share/opencpn/doc/images/incwpt5.jpg
+share/opencpn/doc/images/incwpt6.jpg
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/incwpt8.jpg
+share/opencpn/doc/images/inland-blue.jpg
+share/opencpn/doc/images/kml_clipboard.jpg
+share/opencpn/doc/images/last-button.jpg
+share/opencpn/doc/images/layer-prop.jpg
+share/opencpn/doc/images/layer-prop1.jpg
+share/opencpn/doc/images/layer-track2.jpg
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/layer_route1.jpg
+share/opencpn/doc/images/layers-show2.jpg
+share/opencpn/doc/images/lockwpt.jpg
+share/opencpn/doc/images/lowprec.jpg
+share/opencpn/doc/images/lowprec1.jpg
+share/opencpn/doc/images/mad-track.jpg
+share/opencpn/doc/images/mad-track2.jpg
+share/opencpn/doc/images/magnetic_show.jpg
+share/opencpn/doc/images/main_screen_start.jpg
+share/opencpn/doc/images/marina_grn.jpg
+share/opencpn/doc/images/mark-create.jpg
+share/opencpn/doc/images/mark-shipwreck.jpg
+share/opencpn/doc/images/mark-triangle.jpg
+share/opencpn/doc/images/mark-undo-create-waypoint.jpg
+share/opencpn/doc/images/mark10.jpg
+share/opencpn/doc/images/mark2.jpg
+share/opencpn/doc/images/mark3.jpg
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/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/mark6.jpg
+share/opencpn/doc/images/mark7.jpg
+share/opencpn/doc/images/mark8.jpg
+share/opencpn/doc/images/mark9.jpg
+share/opencpn/doc/images/menu_bar.jpg
+share/opencpn/doc/images/meta.jpg
+share/opencpn/doc/images/mob_btn.jpg
+share/opencpn/doc/images/moored.jpg
+share/opencpn/doc/images/multileg.jpg
+share/opencpn/doc/images/nmea-converter.jpg
+share/opencpn/doc/images/nmea-debug-dsc.jpg
+share/opencpn/doc/images/nogl.jpg
+share/opencpn/doc/images/north-up.jpg
+share/opencpn/doc/images/not_participate.jpg
+share/opencpn/doc/images/notundcom.jpg
+share/opencpn/doc/images/ob_options.jpg
+share/opencpn/doc/images/ob_using%20kml.jpg
+share/opencpn/doc/images/objq.jpg
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/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/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/opencpn2.jpg
+share/opencpn/doc/images/opencpn4.jpg
+share/opencpn/doc/images/opencpn_002.jpg
+share/opencpn/doc/images/options-Ships2.jpg
+share/opencpn/doc/images/options-Ships4.jpg
+share/opencpn/doc/images/options-Ships6.jpg
+share/opencpn/doc/images/orig.jpg
+share/opencpn/doc/images/orig1.jpg
+share/opencpn/doc/images/orig2.jpg
+share/opencpn/doc/images/ot_browse_button.jpg
+share/opencpn/doc/images/ot_interval_select.jpg
+share/opencpn/doc/images/ot_next_button.jpg
+share/opencpn/doc/images/ot_now_button.jpg
+share/opencpn/doc/images/ot_preferences.jpg
+share/opencpn/doc/images/ot_select_button.jpg
+share/opencpn/doc/images/ot_toolbar_icon.jpg
+share/opencpn/doc/images/out11.jpg
+share/opencpn/doc/images/out12.jpg
+share/opencpn/doc/images/out21.jpg
+share/opencpn/doc/images/out22.jpg
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/own_vector.png
-share/opencpn/doc/images/pencil.png
-share/opencpn/doc/images/pencil2.png
+share/opencpn/doc/images/own4.jpg
+share/opencpn/doc/images/own5.jpg
+share/opencpn/doc/images/own_vector.jpg
+share/opencpn/doc/images/pencil.jpg
+share/opencpn/doc/images/pencil2.jpg
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/polyconic.jpg
+share/opencpn/doc/images/portable.jpg
+share/opencpn/doc/images/ppa_1.jpg
+share/opencpn/doc/images/ppa_2.jpg
+share/opencpn/doc/images/ppa_3.jpg
+share/opencpn/doc/images/ppa_4.jpg
+share/opencpn/doc/images/ppa_5.jpg
+share/opencpn/doc/images/ppa_6.jpg
+share/opencpn/doc/images/print.jpg
+share/opencpn/doc/images/printroute.jpg
+share/opencpn/doc/images/quilt-ref.jpg
share/opencpn/doc/images/r820t.jpg
-share/opencpn/doc/images/rad13.jpeg
+share/opencpn/doc/images/rad13.jpg
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/rc_wpt-del-mv.jpg
+share/opencpn/doc/images/red-gps.jpg
+share/opencpn/doc/images/restrman_1.jpg
+share/opencpn/doc/images/rollover.jpg
+share/opencpn/doc/images/route-button.jpg
+share/opencpn/doc/images/route-legs.jpg
+share/opencpn/doc/images/route-legs1.jpg
+share/opencpn/doc/images/route.jpg
+share/opencpn/doc/images/route_002.jpg
+share/opencpn/doc/images/route_manager.jpg
+share/opencpn/doc/images/route_plugin.jpg
+share/opencpn/doc/images/routing6.jpg
+share/opencpn/doc/images/rtlsdr.jpg
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/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/sart-testing.jpg
+share/opencpn/doc/images/scin.jpg
+share/opencpn/doc/images/scout.jpg
+share/opencpn/doc/images/seg.jpg
+share/opencpn/doc/images/sentence-filters.jpg
+share/opencpn/doc/images/sentence-filters1.jpg
+share/opencpn/doc/images/sentence-filters2.jpg
+share/opencpn/doc/images/settings_002.jpg
+share/opencpn/doc/images/settings_003.jpg
+share/opencpn/doc/images/ship_grey.jpg
+share/opencpn/doc/images/ship_red.jpg
+share/opencpn/doc/images/show_dr_gpx.jpg
+share/opencpn/doc/images/skewed.jpg
+share/opencpn/doc/images/sounding.jpg
+share/opencpn/doc/images/stXhole1.jpg
+share/opencpn/doc/images/start.jpg
+share/opencpn/doc/images/start1.jpg
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/status-bar.jpg
+share/opencpn/doc/images/std-grib.jpg
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/text.jpg
+share/opencpn/doc/images/tide-select1.jpg
+share/opencpn/doc/images/tide-select2.jpg
+share/opencpn/doc/images/tide.jpg
+share/opencpn/doc/images/tmerc.jpg
+share/opencpn/doc/images/tongue.jpg
+share/opencpn/doc/images/toolbar-2.jpg
+share/opencpn/doc/images/tools_plugins.jpg
+share/opencpn/doc/images/track-pressed.jpg
+share/opencpn/doc/images/track-prop1.jpg
+share/opencpn/doc/images/track_off.jpg
+share/opencpn/doc/images/tracks.jpg
+share/opencpn/doc/images/trail.jpg
+share/opencpn/doc/images/us_rnc_charts_structure.jpg
+share/opencpn/doc/images/v05_settings.jpg
+share/opencpn/doc/images/vdr-control.jpg
+share/opencpn/doc/images/vdr-icons.jpg
share/opencpn/doc/images/vecoverz.jpg
-share/opencpn/doc/images/vector-light.png
+share/opencpn/doc/images/vector-light.jpg
+share/opencpn/doc/images/waypoint-active.jpg
+share/opencpn/doc/images/waypoint-delete.jpg
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/images/wpt_focus2.jpg
+share/opencpn/doc/images/wwm.jpg
+share/opencpn/doc/images/xxmtamessage2.jpg
+share/opencpn/doc/images/zoomin.jpg
+share/opencpn/doc/images/zoomout.jpg
share/opencpn/doc/readme
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/plugins/chartdldr_pi/data/chart_sources.xml
+share/opencpn/plugins/chartdldr_pi/data/doc/03-Chart-Downloader-Tab-First-Time.png
+share/opencpn/plugins/chartdldr_pi/data/doc/04-AddNewChartSource-Predefined.png
+share/opencpn/plugins/chartdldr_pi/data/doc/05-PleaseUpdate.png
+share/opencpn/plugins/chartdldr_pi/data/doc/08-AfterDownloading.png
+share/opencpn/plugins/chartdldr_pi/data/doc/12-Add-Edit-Custom-Chart-Source.png
+share/opencpn/plugins/chartdldr_pi/data/doc/15-Chart-Status-Selection.png
+share/opencpn/plugins/chartdldr_pi/data/doc/16-Show-Local-Files.png
+share/opencpn/plugins/chartdldr_pi/data/doc/MathJax.js
+share/opencpn/plugins/chartdldr_pi/data/doc/advanced.html
+share/opencpn/plugins/chartdldr_pi/data/doc/basic.html
+share/opencpn/plugins/chartdldr_pi/data/doc/github.min.css
+share/opencpn/plugins/chartdldr_pi/data/doc/highlight.min.js
+share/opencpn/plugins/chartdldr_pi/data/doc/index.html
+share/opencpn/plugins/chartdldr_pi/data/doc/preferences.png
+share/opencpn/plugins/chartdldr_pi/data/folder215.png
+share/opencpn/plugins/chartdldr_pi/data/open182.png
+share/opencpn/plugins/dashboard_pi/data/Dashboard.svg
+share/opencpn/plugins/dashboard_pi/data/Dashboard_rollover.svg
+share/opencpn/plugins/dashboard_pi/data/Dashboard_toggled.svg
+share/opencpn/plugins/grib_pi/data/altitude.svg
+share/opencpn/plugins/grib_pi/data/curdata.svg
+share/opencpn/plugins/grib_pi/data/grib.svg
+share/opencpn/plugins/grib_pi/data/grib_rollover.svg
+share/opencpn/plugins/grib_pi/data/grib_toggled.svg
+share/opencpn/plugins/grib_pi/data/ncurdata.svg
+share/opencpn/plugins/grib_pi/data/next.svg
+share/opencpn/plugins/grib_pi/data/now.svg
+share/opencpn/plugins/grib_pi/data/openfile.svg
+share/opencpn/plugins/grib_pi/data/play.svg
+share/opencpn/plugins/grib_pi/data/prev.svg
+share/opencpn/plugins/grib_pi/data/request.svg
+share/opencpn/plugins/grib_pi/data/request_end.svg
+share/opencpn/plugins/grib_pi/data/selzone.svg
+share/opencpn/plugins/grib_pi/data/setting.svg
+share/opencpn/plugins/grib_pi/data/slider.svg
+share/opencpn/plugins/grib_pi/data/stop.svg
+share/opencpn/plugins/grib_pi/data/zoomto.svg
+share/opencpn/plugins/wmm_pi/data/WMM.COF
+share/opencpn/plugins/wmm_pi/data/wmm_live.svg
+share/opencpn/plugins/wmm_pi/data/wmm_pi.svg
share/opencpn/s57data/S52RAZDS.RLE
share/opencpn/s57data/attdecode.csv
share/opencpn/s57data/chartsymbols.xml
@@ -683,7 +941,98 @@ share/opencpn/sounds/README.bells
share/opencpn/tcdata/HARMONIC
share/opencpn/tcdata/HARMONIC.IDX
share/opencpn/tcdata/README.harmonics
+share/opencpn/uidata/journeyman/CompassRose.svg
+share/opencpn/uidata/journeyman/CompassRoseBlue.svg
+share/opencpn/uidata/journeyman/gps1Bar.svg
+share/opencpn/uidata/journeyman/gps2Bar.svg
+share/opencpn/uidata/journeyman/gps3Bar.svg
+share/opencpn/uidata/journeyman/gpsGrn.svg
+share/opencpn/uidata/journeyman/gpsGry.svg
+share/opencpn/uidata/journeyman/gpsRed.svg
+share/opencpn/uidata/journeyman_flat/CompassRose.svg
+share/opencpn/uidata/journeyman_flat/CompassRoseBlue.svg
+share/opencpn/uidata/journeyman_flat/gps1Bar.svg
+share/opencpn/uidata/journeyman_flat/gps2Bar.svg
+share/opencpn/uidata/journeyman_flat/gps3Bar.svg
+share/opencpn/uidata/journeyman_flat/gpsGrn.svg
+share/opencpn/uidata/journeyman_flat/gpsGry.svg
+share/opencpn/uidata/journeyman_flat/gpsRed.svg
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/uidata/traditional/AIS.svg
+share/opencpn/uidata/traditional/AIS_AlertGeneral.svg
+share/opencpn/uidata/traditional/AIS_AlertGeneral_Active.svg
+share/opencpn/uidata/traditional/AIS_AlertGeneral_Active_rollover.svg
+share/opencpn/uidata/traditional/AIS_AlertGeneral_rollover.svg
+share/opencpn/uidata/traditional/AIS_Disabled.svg
+share/opencpn/uidata/traditional/AIS_Disabled_rollover.svg
+share/opencpn/uidata/traditional/AIS_Normal_Active.svg
+share/opencpn/uidata/traditional/AIS_Normal_Active_rollover.svg
+share/opencpn/uidata/traditional/AIS_Suppressed.svg
+share/opencpn/uidata/traditional/AIS_Suppressed_Active.svg
+share/opencpn/uidata/traditional/AIS_Suppressed_Active_rollover.svg
+share/opencpn/uidata/traditional/AIS_Suppressed_rollover.svg
+share/opencpn/uidata/traditional/AIS_rollover.svg
+share/opencpn/uidata/traditional/CompassRose.svg
+share/opencpn/uidata/traditional/CompassRoseBlue.svg
+share/opencpn/uidata/traditional/colorscheme.svg
+share/opencpn/uidata/traditional/colorscheme_rollover.svg
+share/opencpn/uidata/traditional/current.svg
+share/opencpn/uidata/traditional/current_rollover.svg
+share/opencpn/uidata/traditional/current_rollover_toggled.svg
+share/opencpn/uidata/traditional/current_toggled.svg
+share/opencpn/uidata/traditional/down.svg
+share/opencpn/uidata/traditional/follow.svg
+share/opencpn/uidata/traditional/follow_rollover.svg
+share/opencpn/uidata/traditional/follow_rollover_toggled.svg
+share/opencpn/uidata/traditional/follow_toggled.svg
+share/opencpn/uidata/traditional/gps1Bar.svg
+share/opencpn/uidata/traditional/gps2Bar.svg
+share/opencpn/uidata/traditional/gps3Bar.svg
+share/opencpn/uidata/traditional/gpsGrn.svg
+share/opencpn/uidata/traditional/gpsGry.svg
+share/opencpn/uidata/traditional/gpsRed.svg
+share/opencpn/uidata/traditional/help.svg
+share/opencpn/uidata/traditional/help_rollover.svg
+share/opencpn/uidata/traditional/left.svg
+share/opencpn/uidata/traditional/mob.svg
+share/opencpn/uidata/traditional/mob_btn.svg
+share/opencpn/uidata/traditional/mob_btn_rollover.svg
+share/opencpn/uidata/traditional/pencil.svg
+share/opencpn/uidata/traditional/print.svg
+share/opencpn/uidata/traditional/print_rollover.svg
+share/opencpn/uidata/traditional/right.svg
+share/opencpn/uidata/traditional/route.svg
+share/opencpn/uidata/traditional/route_manager.svg
+share/opencpn/uidata/traditional/route_manager_rollover.svg
+share/opencpn/uidata/traditional/route_rollover.svg
+share/opencpn/uidata/traditional/route_rollover_toggled.svg
+share/opencpn/uidata/traditional/route_toggled.svg
+share/opencpn/uidata/traditional/scin.svg
+share/opencpn/uidata/traditional/scin_disabled.svg
+share/opencpn/uidata/traditional/scin_rollover.svg
+share/opencpn/uidata/traditional/scout.svg
+share/opencpn/uidata/traditional/scout_disabled.svg
+share/opencpn/uidata/traditional/scout_rollover.svg
+share/opencpn/uidata/traditional/settings.svg
+share/opencpn/uidata/traditional/settings_disabled.svg
+share/opencpn/uidata/traditional/settings_rollover.svg
+share/opencpn/uidata/traditional/text.svg
+share/opencpn/uidata/traditional/text_rollover.svg
+share/opencpn/uidata/traditional/text_rollover_toggled.svg
+share/opencpn/uidata/traditional/text_toggled.svg
+share/opencpn/uidata/traditional/tide.svg
+share/opencpn/uidata/traditional/tide_rollover.svg
+share/opencpn/uidata/traditional/tide_rollover_toggled.svg
+share/opencpn/uidata/traditional/tide_toggled.svg
+share/opencpn/uidata/traditional/track.svg
+share/opencpn/uidata/traditional/track_rollover.svg
+share/opencpn/uidata/traditional/track_rollover_toggled.svg
+share/opencpn/uidata/traditional/track_toggled.svg
+share/opencpn/uidata/traditional/up.svg
+share/opencpn/uidata/traditional/zoomin.svg
+share/opencpn/uidata/traditional/zoomin_rollover.svg
+share/opencpn/uidata/traditional/zoomout.svg
+share/opencpn/uidata/traditional/zoomout_rollover.svg
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo
index 47503aeab34..bc55b3be81a 100644
--- a/geography/opencpn/distinfo
+++ b/geography/opencpn/distinfo
@@ -1,12 +1,20 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 00:08:43 agc Exp $
+$NetBSD: distinfo,v 1.5 2016/03/14 11:01:06 bouyer Exp $
-SHA1 (OpenCPN-4.0.0-Source.tar.gz) = a8fe31476a3472cff18e55179094cbc4434699ce
-RMD160 (OpenCPN-4.0.0-Source.tar.gz) = 614889e41c8cd5453f3210781201cb29912d8cc1
-SHA512 (OpenCPN-4.0.0-Source.tar.gz) = d815a0e299debb726c982341e43338ea4ebacc0346ddb31a033e5380f27b56615ecd730f2462696cab4096185207b3c463b8c3a071f81493adc8641e4def6317
-Size (OpenCPN-4.0.0-Source.tar.gz) = 193305992 bytes
-SHA1 (patch-CMakeLists.txt) = 57abad7a02bf5fa64a522aceeddc4c67a3d5a3e2
+SHA1 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 39baa5f89ded9a5c62824e6e1445dbfc4f168578
+RMD160 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = d344b9caffe40dabcad1d9ac148ce54d75f1573c
+SHA512 (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 3ea2136ab777f711aeaa66f34722b3b091af91104ff60303b61c587f95354826afae6dbc8f6a9228357399ae36e96a34098596c0a278d2184ce59283c88f4051
+Size (OpenCPN-4.2.0-a555b4988b50f555be052394c184ef26c5ad0e8a.zip) = 42779485 bytes
+SHA1 (patch-CMakeLists.txt) = 472b73f0e337d49d94b1cfb892962247d4e1959f
SHA1 (patch-FindPortaudio.cmake) = e1bebe2203c6f3dc76f92ee5bdcb01eca66b6b9a
+SHA1 (patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake) = 9d6ade1c32f7d52b53848a2e382a4838d0240530
+SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = f96234755ccdb0cf4d890b44c3983a71700e6de7
+SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = fbac6b6da5c8efceb6931a6b41bec4a8ea7cbccb
+SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = 086de4106760df22b30330a40e3ec52d88d8b996
SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6
+SHA1 (patch-src_chartimg.cpp) = f0e3841ab1920dcab74462a5007b74e905d794c0
+SHA1 (patch-src_chcanv.cpp) = af76f36b6fd6d613720945195d5a24902012a020
SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625
+SHA1 (patch-src_glu_libtess_sweep.c) = 68e3e69239d8bdce353bcad0f5606be5b447b5a7
+SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb
SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040
SHA1 (patch-src_texcmp_squish_squish.cpp) = 3a70d4da7a3d6b54cac122a3e80a35b46a91af19
diff --git a/geography/opencpn/patches/patch-CMakeLists.txt b/geography/opencpn/patches/patch-CMakeLists.txt
index bc788e4c15a..d6189b13dd2 100644
--- a/geography/opencpn/patches/patch-CMakeLists.txt
+++ b/geography/opencpn/patches/patch-CMakeLists.txt
@@ -1,8 +1,17 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2015/01/22 12:34:15 bouyer Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2016/03/14 11:01:06 bouyer Exp $
---- 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 @@
+--- CMakeLists.txt.orig 2016-02-03 18:44:17.000000000 +0100
++++ CMakeLists.txt 2016-02-17 17:40:51.000000000 +0100
+@@ -282,7 +282,7 @@
+
+ # Search for opengles, short of running a program to test the speed
+ # of acceleration, I simply use gles on "native linux" arm systems
+-IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) )
++IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Linux" )
+ find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h )
+ IF (OPENGLESv1_INCLUDE_DIR)
+ MESSAGE (STATUS "Found OpenGLESv1")
+@@ -1755,9 +1755,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.
@@ -12,5 +21,5 @@ $NetBSD: patch-CMakeLists.txt,v 1.2 2015/01/22 12:34:15 bouyer Exp $
-ENDIF(UNIX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux")
- IF(GTK2_FOUND)
- TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} gobject-2.0 )
+ IF(QT_LINUX)
+ TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} Qt5Widgets Qt5OpenGL Qt5Gui Qt5Test Qt5Core )
diff --git a/geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake b/geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake
new file mode 100644
index 00000000000..2b575bd772f
--- /dev/null
+++ b/geography/opencpn/patches/patch-plugins_chartdldr_pi_cmake_PluginConfigure.cmake
@@ -0,0 +1,16 @@
+--- plugins/chartdldr_pi/cmake/PluginConfigure.cmake.orig 2016-02-10 17:29:03.000000000 +0100
++++ plugins/chartdldr_pi/cmake/PluginConfigure.cmake 2016-02-10 17:29:36.000000000 +0100
+@@ -41,11 +41,9 @@
+ ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O2 -fexceptions" )
+ ENDIF(PROFILING)
+
+- IF(NOT APPLE)
+- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+- ELSE(NOT APPLE)
++ IF(APPLE)
+ SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
+- ENDIF(NOT APPLE)
++ ENDIF(APPLE)
+
+ ENDIF(NOT MSVC)
+
diff --git a/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt b/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt
new file mode 100644
index 00000000000..907f91e7eb8
--- /dev/null
+++ b/geography/opencpn/patches/patch-plugins_dashboard_pi_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- plugins/dashboard_pi/CMakeLists.txt.orig 2016-02-10 17:24:22.000000000 +0100
++++ plugins/dashboard_pi/CMakeLists.txt 2016-02-10 17:24:27.000000000 +0100
+@@ -43,10 +43,9 @@
+ #ADD_DEFINITIONS( "-Wall -ansi -pedantic -Wno-variadic-macros" )
+ #TODO: Should we use -fno-stack-protector
+ # IF NOT DEBUGGING CFLAGS="-O2 -march=native"
+ IF(NOT WIN32 AND NOT APPLE)
+ ADD_DEFINITIONS( "-Wall -O2 -fexceptions -fvisibility=hidden" )
+- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+ ENDIF(NOT WIN32 AND NOT APPLE)
+
+ IF( APPLE )
+ ADD_DEFINITIONS( "-O3 -fexceptions -fvisibility=hidden" )
diff --git a/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt b/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt
new file mode 100644
index 00000000000..dfa38d0125d
--- /dev/null
+++ b/geography/opencpn/patches/patch-plugins_grib_pi_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- plugins/grib_pi/CMakeLists.txt.orig 2016-02-10 17:26:23.000000000 +0100
++++ plugins/grib_pi/CMakeLists.txt 2016-02-10 17:27:16.000000000 +0100
+@@ -44,7 +44,6 @@
+ # IF NOT DEBUGGING CFLAGS="-O2 -march=native"
+ IF(NOT WIN32 AND NOT APPLE)
+ ADD_DEFINITIONS( "-Wall -fexceptions -fvisibility=hidden" )
+- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+ ENDIF(NOT WIN32 AND NOT APPLE)
+
+ IF( APPLE )
diff --git a/geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake b/geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake
new file mode 100644
index 00000000000..6909cd6513b
--- /dev/null
+++ b/geography/opencpn/patches/patch-plugins_wmm_pi_cmake_PluginConfigure.cmake
@@ -0,0 +1,16 @@
+--- plugins/wmm_pi/cmake/PluginConfigure.cmake.orig 2016-02-10 17:29:03.000000000 +0100
++++ plugins/wmm_pi/cmake/PluginConfigure.cmake 2016-02-10 17:30:10.000000000 +0100
+@@ -41,11 +41,9 @@
+ ADD_DEFINITIONS( "-Wall -Wno-unused-result -g -O2 -fexceptions" )
+ ENDIF(PROFILING)
+
+- IF(NOT APPLE)
+- SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+- ELSE(NOT APPLE)
++ IF(APPLE)
+ SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
+- ENDIF(NOT APPLE)
++ ENDIF(APPLE)
+
+ ENDIF(NOT MSVC)
+
diff --git a/geography/opencpn/patches/patch-src_chartimg.cpp b/geography/opencpn/patches/patch-src_chartimg.cpp
new file mode 100644
index 00000000000..d9ee9a58f1a
--- /dev/null
+++ b/geography/opencpn/patches/patch-src_chartimg.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_chartimg.cpp,v 1.1 2016/03/14 11:01:06 bouyer Exp $
+From master:
+https://github.com/OpenCPN/OpenCPN/commit/39f9b1af047330d0a8ea3a72ac66ddb15ff96285
+
+--- src/chartimg.cpp.orig
++++ src/chartimg.cpp
+@@ -2886,7 +2886,7 @@ void ChartBaseBSB::latlong_to_chartpix(double lat, double lon, double &pixx, dou
+ alat = lat + m_lat_datum_adjust;
+
+ // Get e/n from Projection
+- xlon = AdjustLongitude(xlon);
++ xlon = AdjustLongitude(alon);
+
+ toSM_ECC(alat, xlon, m_proj_lat, m_proj_lon, &easting, &northing);
+
diff --git a/geography/opencpn/patches/patch-src_chcanv.cpp b/geography/opencpn/patches/patch-src_chcanv.cpp
new file mode 100644
index 00000000000..f0035124ccc
--- /dev/null
+++ b/geography/opencpn/patches/patch-src_chcanv.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_chcanv.cpp,v 1.1 2016/03/14 11:01:06 bouyer Exp $
+From master:
+https://github.com/OpenCPN/OpenCPN/commit/39c0b7c3367181ed92adfe0e41d59b7fb65d3a9a
+
+--- src/chcanv.cpp.orig
++++ src/chcanv.cpp
+@@ -10172,6 +10172,11 @@ void ChartCanvas::DrawAllRoutesInBBox( ocpnDC& dc, LLBBox& BltBBox, const wxRegi
+ continue;
+ }
+
++ if ( 0 == pRouteDraw->GetnPoints() ) {
++ node = node->GetNext();
++ continue;
++ }
++
+ LLBBox test_box = pRouteDraw->GetBBox();
+
+ if( b_run ) test_box.Expand( gLon, gLat );
diff --git a/geography/opencpn/patches/patch-src_glu_libtess_sweep.c b/geography/opencpn/patches/patch-src_glu_libtess_sweep.c
new file mode 100644
index 00000000000..f2114f05a96
--- /dev/null
+++ b/geography/opencpn/patches/patch-src_glu_libtess_sweep.c
@@ -0,0 +1,61 @@
+$NetBSD: patch-src_glu_libtess_sweep.c,v 1.1 2016/03/14 11:01:06 bouyer Exp $
+Fix segfault; it seems that RegionAbove(regUp) can return NULL
+
+--- src/glu/libtess/sweep.c.orig 2016-02-03 18:44:17.000000000 +0100
++++ src/glu/libtess/sweep.c 2016-02-11 13:50:32.000000000 +0100
+@@ -33,6 +33,7 @@
+ */
+
+ #include "gluos.h"
++#include <stdio.h>
+ #include <assert.h>
+ #include <stddef.h>
+ #include <setjmp.h> /* longjmp */
+@@ -546,7 +547,9 @@
+ if( EdgeSign( eUp->Dst, eLo->Org, eUp->Org ) < 0 ) return FALSE;
+
+ /* eLo->Org appears to be above eUp, so splice eLo->Org into eUp */
+- RegionAbove(regUp)->dirty = regUp->dirty = TRUE;
++ if (RegionAbove(regUp))
++ RegionAbove(regUp)->dirty = TRUE;
++ regUp->dirty = TRUE;
+ if (__gl_meshSplitEdge( eUp->Sym ) == NULL) longjmp(tess->env,1);
+ if ( !__gl_meshSplice( eLo->Oprev, eUp ) ) longjmp(tess->env,1);
+ }
+@@ -584,7 +587,9 @@
+ if( EdgeSign( eUp->Dst, eLo->Dst, eUp->Org ) < 0 ) return FALSE;
+
+ /* eLo->Dst is above eUp, so splice eLo->Dst into eUp */
+- RegionAbove(regUp)->dirty = regUp->dirty = TRUE;
++ if (RegionAbove(regUp) != NULL)
++ RegionAbove(regUp)->dirty = TRUE;
++ regUp->dirty = TRUE;
+ e = __gl_meshSplitEdge( eUp );
+ if (e == NULL) longjmp(tess->env,1);
+ if ( !__gl_meshSplice( eLo->Sym, e ) ) longjmp(tess->env,1);
+@@ -1025,15 +1030,23 @@
+ tmp.eUp = vEvent->anEdge->Sym;
+ /* __GL_DICTLISTKEY */ /* __gl_dictListSearch */
+ regUp = (ActiveRegion *)dictKey( dictSearch( tess->dict, &tmp ));
+- regLo = RegionBelow( regUp );
++ if (regUp == NULL) {
++ fprintf(stderr, "ConnectLeftVertex botch 1\n");
++ return;
++ }
+ eUp = regUp->eUp;
+- eLo = regLo->eUp;
+
+ /* Try merging with U or L first */
+ if( EdgeSign( eUp->Dst, vEvent, eUp->Org ) == 0 ) {
+ ConnectLeftDegenerate( tess, regUp, vEvent );
+ return;
+ }
++ regLo = RegionBelow( regUp );
++ if (regLo == NULL) {
++ fprintf(stderr, "ConnectLeftVertex botch 2\n");
++ return;
++ }
++ eLo = regLo->eUp;
+
+ /* Connect vEvent to rightmost processed vertex of either chain.
+ * e->Dst is the vertex that we will connect to vEvent.
diff --git a/geography/opencpn/patches/patch-src_mipmap_mipmap.c b/geography/opencpn/patches/patch-src_mipmap_mipmap.c
new file mode 100644
index 00000000000..359a7ed5785
--- /dev/null
+++ b/geography/opencpn/patches/patch-src_mipmap_mipmap.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mipmap_mipmap.c,v 1.1 2016/03/14 11:01:06 bouyer Exp $
+
+be consistent with #if where the function is defined
+
+--- src/mipmap/mipmap.c.orig 2016-02-10 16:22:54.000000000 +0100
++++ src/mipmap/mipmap.c 2016-02-10 16:23:26.000000000 +0100
+@@ -184,7 +184,7 @@
+ MipMap_24 = MipMap_24_ssse3;
+ }
+
+-#if (GCC_VERSION > 40800) || defined(__MSVC__)
++#if defined(__AVX2__) || (defined(__MSVC__) && (_MSC_VER >= 1700))
+ if (nIds >= 0x00000007) {
+ cpuid(info,0x00000007);
+