graphics/openorienteering-mapper: prepare for Qt5-5.14

- update to 0.9.2 which works out of the box

PR:		244964

4 files changed, 30 insertions, 28 deletions

diff --git a/graphics/openorienteering-mapper/Makefile b/graphics/openorienteering-mapper/Makefile
index 35a3c3fd98ff..53d563b76ff1 100644
--- a/graphics/openorienteering-mapper/Makefile
+++ b/graphics/openorienteering-mapper/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	openorienteering-mapper
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	graphics geography
 
 MAINTAINER=	sikmir@gmail.com
@@ -18,8 +17,8 @@ LIB_DEPENDS=	libpolyclipping.so:graphics/polyclipping \
 
 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_QT=		buildtools_build help qmake_build concurrent core gui \
+		network printsupport testlib widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenOrienteering
 GH_PROJECT=	mapper
diff --git a/graphics/openorienteering-mapper/distinfo b/graphics/openorienteering-mapper/distinfo
index 4976b5776954..119cbb6b175b 100644
--- a/graphics/openorienteering-mapper/distinfo
+++ b/graphics/openorienteering-mapper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575541772
-SHA256 (OpenOrienteering-mapper-v0.9.1_GH0.tar.gz) = 3e345d7883236b369e860f40b59687e686a96b0a65518bb3b0625659abf0d200
-SIZE (OpenOrienteering-mapper-v0.9.1_GH0.tar.gz) = 9634841
+TIMESTAMP = 1586012779
+SHA256 (OpenOrienteering-mapper-v0.9.2_GH0.tar.gz) = 1a797c3db4ee795585cd324b50b0a37fc9e545233f02cc28660e6f9790e49a51
+SIZE (OpenOrienteering-mapper-v0.9.2_GH0.tar.gz) = 11503101
diff --git a/graphics/openorienteering-mapper/files/patch-CMakeLists.txt b/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
index 05f910e7f07d..3dd0be8fb86d 100644
--- a/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
+++ b/graphics/openorienteering-mapper/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2019-12-05 06:33:57 UTC
+--- CMakeLists.txt.orig	2020-04-04 15:19:17 UTC
 +++ CMakeLists.txt
 @@ -66,6 +66,11 @@ option(Mapper_DEBUG_TRANSLATIONS "Debug missing transl
  # Used for some Linux distributions which do not provide the polyclipping lib.
@@ -11,32 +11,30 @@
 +
  option(Mapper_USE_GDAL   "Use the GDAL library" ON)
  
- if(CMAKE_BUILD_TYPE MATCHES Release|MinSizeRel|RelWithDebInfo)
-@@ -247,10 +252,20 @@ endif()
+ if(ANDROID)
+@@ -260,10 +265,20 @@ endif()
  
  # Subdirectories
  
--add_subdirectory("doc/manual")
--add_subdirectory("examples")
 +if (Mapper_WITH_DOCS)
-+	add_subdirectory("doc/manual")
+ add_subdirectory("doc/manual")
 +endif()
 +if (Mapper_WITH_EXAMPLES)
-+	add_subdirectory("examples")
+ add_subdirectory("examples")
 +endif()
  add_subdirectory("symbol sets")
 -add_subdirectory("translations")
 +if (Mapper_WITH_NLS)
-+	add_subdirectory("translations")
++       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/")
++       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")
-@@ -271,7 +286,7 @@ if(CMAKE_CROSSCOMPILING)
+ if(Mapper_WITH_COVE)
+ 	add_feature_info(Mapper_WITH_COVE "${Mapper_WITH_COVE}" "Contour line vectorization")
+ 	add_subdirectory("3rd-party/cove")
+@@ -287,7 +302,7 @@ if(CMAKE_CROSSCOMPILING)
  	add_custom_target(TEST_WARNING ALL
  	  COMMENT "Crosscompiling, skipping all tests")
  	add_dependencies(TEST_WARNING Mapper)
diff --git a/graphics/openorienteering-mapper/pkg-plist b/graphics/openorienteering-mapper/pkg-plist
index 8a7b8585d161..96ab387c0700 100644
--- a/graphics/openorienteering-mapper/pkg-plist
+++ b/graphics/openorienteering-mapper/pkg-plist
@@ -2,8 +2,9 @@ bin/Mapper
 man/man1/Mapper.1.gz
 share/applications/Mapper.desktop
 %%DOCSDIR%%/3rd-party/qtsingleapplication.txt
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qch
-%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.1 Manual.qhc
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/3rd-party/potrace-1.6.txt
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.2 Manual.qch
+%%DOCS%%%%PORTDOCS%%%%DOCSDIR%%/Mapper 0.9.2 Manual.qhc
 %%DOCSDIR%%/common-licenses/GPL-3.txt
 %%DOCSDIR%%/licensing.html
 share/icons/hicolor/128x128/apps/Mapper.png
@@ -46,19 +47,19 @@ share/mime/packages/openorienteering-mapper.xml
 %%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/4000/ISSprOM 2019_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 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/ISOM 2017-2-ISSprOM 2019.crt
 %%DATADIR%%/symbol sets/ISOM2000-ISOM 2017-2.crt
-%%DATADIR%%/symbol sets/ISOM2000-ISSOM.crt
+%%DATADIR%%/symbol sets/ISSOM-ISSprOM 2019.crt
 %%DATADIR%%/symbol sets/OSM-ISOM 2017-2.crt
-%%DATADIR%%/symbol sets/OSM-ISSOM.crt
 %%DATADIR%%/symbol sets/OSM-ISSkiOM 2019.crt
+%%DATADIR%%/symbol sets/OSM-ISSprOM 2019.crt
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_cs.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_da.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_de.qm
@@ -67,6 +68,7 @@ share/mime/packages/openorienteering-mapper.xml
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_es.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fi.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_fr.qm
+%%NLS%%%%DATADIR%%/translations/OpenOrienteering_hr.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_hu.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_id.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_it.qm
@@ -76,6 +78,7 @@ share/mime/packages/openorienteering-mapper.xml
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_nl.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pl.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_pt_BR.qm
+%%NLS%%%%DATADIR%%/translations/OpenOrienteering_pt_PT.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_ru.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_sv.qm
 %%NLS%%%%DATADIR%%/translations/OpenOrienteering_uk.qm
@@ -87,8 +90,10 @@ share/mime/packages/openorienteering-mapper.xml
 %%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_hr.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_hu.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_it.qm
+%%NLS%%%%DATADIR%%/translations/map_symbols_nb.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_ru.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_sv.qm
 %%NLS%%%%DATADIR%%/translations/map_symbols_uk.qm