Index: head/graphics/openorienteering-mapper/Makefile
===================================================================
--- head/graphics/openorienteering-mapper/Makefile	(revision 519237)
+++ head/graphics/openorienteering-mapper/Makefile	(revision 519238)
@@ -1,53 +1,53 @@
 # Created by: Nikolay Korotkiy <sikmir@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	openorienteering-mapper
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics geography
 
 MAINTAINER=	sikmir@gmail.com
 COMMENT=	Map drawing program from OpenOrienteering
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
 		libproj.so:graphics/proj
 
 USES=		cmake:noninja compiler:c++14-lang \
 		desktop-file-utils gmake qt:5 shared-mime-info
 USE_QT=		buildtools_build help qmake_build core gui \
 		network printsupport widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenOrienteering
 GH_PROJECT=	mapper
 
 CMAKE_ARGS+=	-DLICENSING_PROVIDER=freebsd \
 		-DMapper_PACKAGE_NAME=${PORTNAME} \
 		-Wno-dev
 
 OPTIONS_DEFINE=	DOCS EXAMPLES GDAL NLS POSITIONING TEST TIFF
 OPTIONS_DEFAULT=	DOCS EXAMPLES GDAL NLS TIFF
 OPTIONS_SUB=	yes
 DOCS_CMAKE_BOOL=	Mapper_WITH_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOCS_USE=	QT=assistant_run
 EXAMPLES_CMAKE_BOOL=	Mapper_WITH_EXAMPLES
 GDAL_DESC=	Use the GDAL library
 GDAL_CMAKE_BOOL=	Mapper_USE_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 NLS_CMAKE_BOOL=	Mapper_WITH_NLS
 NLS_USE=	QT=linguisttools_build
 NLS_USES=	gettext-runtime
 POSITIONING_DESC=	GPS positioning
 POSITIONING_CMAKE_ON=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=0 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=0
 POSITIONING_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=1 -DCMAKE_DISABLE_FIND_PACKAGE_Qt5SerialPort=1
 POSITIONING_USE=	QT=location,sensors,serialport
 TEST_CMAKE_BOOL=	Mapper_WITH_TEST
 TEST_USE=	QT=testlib_build
 TEST_TEST_TARGET=	test
 TIFF_DESC=	Support for TIFF
 TIFF_USE=	QT=imageformats
 
 .include <bsd.port.mk>
Index: head/graphics/openorienteering-mapper/distinfo
===================================================================
--- head/graphics/openorienteering-mapper/distinfo	(revision 519237)
+++ head/graphics/openorienteering-mapper/distinfo	(revision 519238)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571822907
-SHA256 (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = d545e6d798346a34eb37240d8ed6218039adef42b4edf9384ee34d8eff96cb59
-SIZE (OpenOrienteering-mapper-v0.9.0_GH0.tar.gz) = 9414101
+TIMESTAMP = 1575541772
+SHA256 (OpenOrienteering-mapper-v0.9.1_GH0.tar.gz) = 3e345d7883236b369e860f40b59687e686a96b0a65518bb3b0625659abf0d200
+SIZE (OpenOrienteering-mapper-v0.9.1_GH0.tar.gz) = 9634841
Index: head/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
===================================================================
--- head/graphics/openorienteering-mapper/files/patch-CMakeLists.txt	(revision 519237)
+++ head/graphics/openorienteering-mapper/files/patch-CMakeLists.txt	(revision 519238)
@@ -1,47 +1,47 @@
---- CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
+--- CMakeLists.txt.orig	2019-12-05 06:33:57 UTC
 +++ CMakeLists.txt
-@@ -73,6 +73,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
+@@ -66,6 +66,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
  # Used for some Linux distributions which do not provide the polyclipping lib.
  option(Mapper_BUILD_CLIPPER "Build the Clipper package from source" OFF)
  
 +option(Mapper_WITH_DOCS "Build and/or install documentation" ON)
 +option(Mapper_WITH_EXAMPLES "Build and/or install examples" ON)
 +option(Mapper_WITH_NLS "Native Language Support" ON)
 +option(Mapper_WITH_TEST "Build the test suite" ON)
 +
  option(Mapper_USE_GDAL   "Use the GDAL library" ON)
  
  if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo)
-@@ -231,10 +236,20 @@ endif()
+@@ -247,10 +252,20 @@ endif()
  
  # Subdirectories
  
 -add_subdirectory("doc/manual")
 -add_subdirectory("examples")
 +if (Mapper_WITH_DOCS)
 +	add_subdirectory("doc/manual")
 +endif()
 +if (Mapper_WITH_EXAMPLES)
 +	add_subdirectory("examples")
 +endif()
  add_subdirectory("symbol sets")
 -add_subdirectory("translations")
 +if (Mapper_WITH_NLS)
 +	add_subdirectory("translations")
 +else()
 +	execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory "packaging/linux")
 +	execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${PROJECT_SOURCE_DIR}/packaging/linux/Mapper.desktop" "packaging/linux/")
 +	execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${PROJECT_SOURCE_DIR}/packaging/linux/openorienteering-mapper.xml" "packaging/linux/")
 +endif()
  add_subdirectory("3rd-party/qbezier")
  if(NOT ANDROID)
  	add_subdirectory("3rd-party/qtsingleapplication")
-@@ -254,7 +269,7 @@ if(CMAKE_CROSSCOMPILING)
+@@ -271,7 +286,7 @@ if(CMAKE_CROSSCOMPILING)
  	add_custom_target(TEST_WARNING ALL
  	  COMMENT "Crosscompiling, skipping all tests")
  	add_dependencies(TEST_WARNING Mapper)
 -else()
 +elseif(Mapper_WITH_TEST)
  	enable_testing()
  	add_subdirectory("test")
  endif()
Index: head/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt
===================================================================
--- head/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt	(revision 519237)
+++ head/graphics/openorienteering-mapper/files/patch-packaging_CMakeLists.txt	(revision 519238)
@@ -1,11 +1,11 @@
---- packaging/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
+--- packaging/CMakeLists.txt.orig	2019-12-05 06:33:57 UTC
 +++ packaging/CMakeLists.txt
-@@ -437,7 +437,7 @@ endforeach(_qt_plugin)
+@@ -426,7 +426,7 @@ endforeach(_qt_plugin)
  if(UNIX AND NOT APPLE AND NOT ANDROID)
  	install(
  	  FILES "${PROJECT_SOURCE_DIR}/doc/man/Mapper.1"
 -	  DESTINATION "share/man/man1")
 +	  DESTINATION "man/man1")
  	install(
  	  FILES "${CMAKE_CURRENT_BINARY_DIR}/linux/Mapper.desktop"
  	  DESTINATION "share/applications")
Index: head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in
===================================================================
--- head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in	(revision 519237)
+++ head/graphics/openorienteering-mapper/files/patch-packaging_custom__install.cmake.in	(revision 519238)
@@ -1,8 +1,8 @@
---- packaging/custom_install.cmake.in.orig	2019-10-23 12:42:51.349480000 +0300
-+++ packaging/custom_install.cmake.in	2019-10-23 12:42:57.488297000 +0300
-@@ -122,4 +122,4 @@
+--- packaging/custom_install.cmake.in.orig	2019-12-05 06:33:57 UTC
++++ packaging/custom_install.cmake.in
+@@ -122,4 +122,4 @@ endif()
  set(runtime "")
  set(dirs "@MAPPER_LIB_HINTS@")
  handle_qt_conf()
 -fixup_bundle_portable("${runtime}" "${dirs}")
 +#fixup_bundle_portable("${runtime}" "${dirs}")
Index: head/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt
===================================================================
--- head/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt	(revision 519237)
+++ head/graphics/openorienteering-mapper/files/patch-src_CMakeLists.txt	(revision 519238)
@@ -1,13 +1,15 @@
---- src/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
+Add translation files only if the NLS knob is set
+
+--- src/CMakeLists.txt.orig	2019-12-05 06:33:57 UTC
 +++ src/CMakeLists.txt
-@@ -286,7 +286,9 @@ target_compile_definitions(Mapper_Common PRIVATE
-   # MAPPER_ENABLE_COMPATIBILITY
+@@ -287,7 +287,9 @@ target_compile_definitions(Mapper_Common INTERFACE
  )
+ 
  
 -mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
 +if(Mapper_WITH_NLS)
 +	mapper_translations_sources(${Mapper_Common_SRCS} ${Mapper_Common_HEADERS})
 +endif()
  
  
  # Mapper executable
Index: head/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt
===================================================================
--- head/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt	(revision 519237)
+++ head/graphics/openorienteering-mapper/files/patch-src_gdal_CMakeLists.txt	(revision 519238)
@@ -1,13 +1,15 @@
---- src/gdal/CMakeLists.txt.orig	2018-12-23 20:55:50 UTC
+Add translation files only if the NLS knob is set
+
+--- src/gdal/CMakeLists.txt.orig	2019-12-05 06:33:57 UTC
 +++ src/gdal/CMakeLists.txt
-@@ -35,7 +35,9 @@ set(MAPPER_GDAL_SOURCES
+@@ -36,7 +36,9 @@ set(MAPPER_GDAL_SOURCES
    mapper-osmconf.ini
  )
  	
 -mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})
 +if(Mapper_WITH_NLS)
 +	mapper_translations_sources(${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES})
 +endif()
  
  add_library(mapper-gdal STATIC ${MAPPER_GDAL_HEADERS} ${MAPPER_GDAL_SOURCES} "${PROJECT_BINARY_DIR}/gdal/mapper-osmconf.ini")
  
Index: head/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in
===================================================================
--- head/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in	(revision 519237)
+++ head/graphics/openorienteering-mapper/files/patch-src_mapper__config.h.in	(revision 519238)
@@ -1,10 +1,10 @@
---- src/mapper_config.h.in.orig	2018-12-23 20:55:50 UTC
+--- src/mapper_config.h.in.orig	2019-12-05 06:33:57 UTC
 +++ src/mapper_config.h.in
-@@ -30,6 +30,7 @@
+@@ -32,6 +32,7 @@
  
  #cmakedefine Mapper_DEBUG_TRANSLATIONS
  #cmakedefine Mapper_PACKAGE_NAME
 +#cmakedefine Mapper_WITH_DOCS
  #define MAPPER_DATA_DESTINATION  "@CMAKE_INSTALL_PREFIX@/@MAPPER_DATA_DESTINATION@"
  #define MAPPER_ABOUT_DESTINATION "@CMAKE_INSTALL_PREFIX@/@MAPPER_ABOUT_DESTINATION@"
  
Index: head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt
===================================================================
--- head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt	(revision 519237)
+++ head/graphics/openorienteering-mapper/files/patch-src_sensors_CMakeLists.txt	(revision 519238)
@@ -1,18 +1,18 @@
 Add translation files only if the NLS knob is set
 
---- src/sensors/CMakeLists.txt.orig	2019-10-23 13:52:38.938027000 +0300
-+++ src/sensors/CMakeLists.txt	2019-10-23 13:53:09.513288000 +0300
-@@ -104,7 +104,9 @@
+--- src/sensors/CMakeLists.txt.orig	2019-12-05 06:33:57 UTC
++++ src/sensors/CMakeLists.txt
+@@ -104,7 +104,9 @@ endforeach()
  
  # Translations
  
 -mapper_translations_sources(
 -  ${MAPPER_SENSORS_SOURCES}
 -  ${POWERSHELL_POSITION_SOURCES}
 -)
 +if(Mapper_WITH_NLS)
 +	mapper_translations_sources(
 +	  ${MAPPER_SENSORS_SOURCES}
 +	  ${POWERSHELL_POSITION_SOURCES}
 +	)
 +endif()
Index: head/graphics/openorienteering-mapper/pkg-plist
===================================================================
--- head/graphics/openorienteering-mapper/pkg-plist	(revision 519237)
+++ head/graphics/openorienteering-mapper/pkg-plist	(revision 519238)
@@ -1,98 +1,99 @@
 bin/Mapper
 man/man1/Mapper.1.gz
 share/applications/Mapper.desktop
 %%DOCSDIR%%/3rd-party/qtsingleapplication.txt
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qch
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.0 Manual.qhc
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qch
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qhc
 %%DOCSDIR%%/common-licenses/GPL-3.txt
 %%DOCSDIR%%/licensing.html
 share/icons/hicolor/128x128/apps/Mapper.png
 share/icons/hicolor/128x128/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/128x128/mimetypes/application-x-openorienteering-xmap.png
 share/icons/hicolor/16x16/apps/Mapper.png
 share/icons/hicolor/16x16/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/16x16/mimetypes/application-x-openorienteering-xmap.png
 share/icons/hicolor/24x24/apps/Mapper.png
 share/icons/hicolor/24x24/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/24x24/mimetypes/application-x-openorienteering-xmap.png
 share/icons/hicolor/256x256/apps/Mapper.png
 share/icons/hicolor/256x256/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/256x256/mimetypes/application-x-openorienteering-xmap.png
 share/icons/hicolor/32x32/apps/Mapper.png
 share/icons/hicolor/32x32/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/32x32/mimetypes/application-x-openorienteering-xmap.png
 share/icons/hicolor/48x48/apps/Mapper.png
 share/icons/hicolor/48x48/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/48x48/mimetypes/application-x-openorienteering-xmap.png
 share/icons/hicolor/512x512/apps/Mapper.png
 share/icons/hicolor/512x512/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/512x512/mimetypes/application-x-openorienteering-xmap.png
 share/icons/hicolor/96x96/apps/Mapper.png
 share/icons/hicolor/96x96/mimetypes/application-x-openorienteering-ocd.png
 share/icons/hicolor/96x96/mimetypes/application-x-openorienteering-xmap.png
 share/mime/packages/openorienteering-mapper.xml
 %%EXAMPLES%%%%DATADIR%%/examples/complete map.omap
 %%EXAMPLES%%%%DATADIR%%/examples/forest sample.omap
 %%EXAMPLES%%%%DATADIR%%/examples/overprinting.omap
 %%GDAL%%%%DATADIR%%/gdal/mapper-osmconf.ini
 %%DATADIR%%/symbol sets/10000/Course_Design_10000.omap
 %%DATADIR%%/symbol sets/10000/ISMTBOM_10000.omap
 %%DATADIR%%/symbol sets/10000/ISOM 2017-2_10000.omap
-%%DATADIR%%/symbol sets/10000/ISOM2000_10000.omap
-%%DATADIR%%/symbol sets/10000/ISSkiOM_10000.omap
+%%DATADIR%%/symbol sets/10000/ISSkiOM 2019_10000.omap
+%%DATADIR%%/symbol sets/12500/ISSkiOM 2019_12500.omap
 %%DATADIR%%/symbol sets/15000/Course_Design_15000.omap
 %%DATADIR%%/symbol sets/15000/ISMTBOM_15000.omap
 %%DATADIR%%/symbol sets/15000/ISOM 2017-2_15000.omap
-%%DATADIR%%/symbol sets/15000/ISOM2000_15000.omap
-%%DATADIR%%/symbol sets/15000/ISSkiOM_15000.omap
+%%DATADIR%%/symbol sets/15000/ISSkiOM 2019_15000.omap
 %%DATADIR%%/symbol sets/20000/ISMTBOM_20000.omap
 %%DATADIR%%/symbol sets/4000/Course_Design_4000.omap
 %%DATADIR%%/symbol sets/4000/ISSOM_4000.omap
 %%DATADIR%%/symbol sets/5000/Course_Design_5000.omap
 %%DATADIR%%/symbol sets/5000/ISMTBOM_5000.omap
 %%DATADIR%%/symbol sets/5000/ISSOM_5000.omap
-%%DATADIR%%/symbol sets/5000/ISSkiOM_5000.omap
+%%DATADIR%%/symbol sets/5000/ISSkiOM 2019_5000.omap
 %%DATADIR%%/symbol sets/7500/ISMTBOM_7500.omap
+%%DATADIR%%/symbol sets/7500/ISSkiOM 2019_7500.omap
+%%DATADIR%%/symbol sets/ISOM 2017-2-ISSkiOM 2019.crt
 %%DATADIR%%/symbol sets/ISOM2000-ISOM 2017-2.crt
 %%DATADIR%%/symbol sets/ISOM2000-ISSOM.crt
 %%DATADIR%%/symbol sets/OSM-ISOM 2017-2.crt
-%%DATADIR%%/symbol sets/OSM-ISOM2000.crt
 %%DATADIR%%/symbol sets/OSM-ISSOM.crt
+%%DATADIR%%/symbol sets/OSM-ISSkiOM 2019.crt
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_de.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_en.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_eo.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_es.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fi.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fr.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_hu.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_id.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_it.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_ja.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_lv.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_nb.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_nl.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pl.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pt_BR.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_ru.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_sv.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_uk.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_zh_CN.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_cs.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_da.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_de.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_eo.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_es.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_fi.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_fr.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_hu.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_it.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_ru.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_sv.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_uk.qm
 %%NLS%%%%DATADIR%%/translations/qt_eo.qm
 %%NLS%%%%DATADIR%%/translations/qt_et.qm
 %%NLS%%%%DATADIR%%/translations/qt_id.qm
 %%NLS%%%%DATADIR%%/translations/qt_nb.qm
 %%NLS%%%%DATADIR%%/translations/qt_nl.qm