Simple update qmapshack-1.18.0. Lightly tested on amd64. OK?

Cheers Rafael

diff --git a/geo/qmapshack/Makefile b/geo/qmapshack/Makefile
index 8583aa853b5..ab7ec51e97b 100644
--- a/geo/qmapshack/Makefile
+++ b/geo/qmapshack/Makefile
@@ -4,8 +4,7 @@ COMMENT =	map management tool
 
 GH_ACCOUNT =	Maproom
 GH_PROJECT =	qmapshack
-GH_TAGNAME =	V_1.16.0
-REVISION =	2
+GH_TAGNAME =	V_1.18.0
 
 CATEGORIES =	geo
 
@@ -14,23 +13,29 @@ HOMEPAGE =	https://github.com/Maproom/qmapshack/wiki
 # GPLv3
 PERMIT_PACKAGE =	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Help
-WANTLIB += Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
-WANTLIB += Qt5Quick Qt5Sql Qt5WebChannel Qt5WebEngineCore Qt5WebEngineWidgets
-WANTLIB += Qt5Widgets Qt5Xml c gdal jpeg m proj quazip1-qt5 routino
-WANTLIB += z
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Core Qt6Core5Compat Qt6DBus
+WANTLIB += Qt6Gui Qt6Help Qt6Network Qt6OpenGL Qt6OpenGLWidgets
+WANTLIB += Qt6Positioning Qt6PrintSupport Qt6Qml Qt6QmlMeta Qt6QmlModels
+WANTLIB += Qt6QmlWorkerScript Qt6Quick Qt6Sql Qt6UiTools Qt6WebChannel
+WANTLIB += Qt6WebEngineCore Qt6WebEngineWidgets Qt6Widgets Qt6Xml
+WANTLIB += bz2 c gdal jpeg m proj routino z
 
-MODULES =		devel/cmake x11/qt5
+MODULES =		devel/cmake x11/qt6
 
 RUN_DEPENDS =		devel/desktop-file-utils \
 			x11/gtk+4,-guic
-LIB_DEPENDS =		archivers/quazip>=1.3 \
+
+LIB_DEPENDS =		archivers/bzip2 \
 			devel/proj \
 			geo/gdal,-main \
 			geo/routino \
-			x11/qt5/qtdeclarative \
-			x11/qt5/qttools \
-			x11/qt5/qtwebengine
+			graphics/jpeg \
+			x11/qt6/qt5compat \
+			x11/qt6/qtdeclarative \
+			x11/qt6/qtpositioning \
+			x11/qt6/qttools \
+			x11/qt6/qtwebchannel \
+			x11/qt6/qtwebengine
 
 CONFIGURE_ARGS =	-Wno-dev
 
diff --git a/geo/qmapshack/distinfo b/geo/qmapshack/distinfo
index 886ffdd2605..263921b0ea9 100644
--- a/geo/qmapshack/distinfo
+++ b/geo/qmapshack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qmapshack-1.16.0.tar.gz) = C+rhBj/BfAM+YITqcbwMyV3lBfb8BNqc+LcPgAPfQwI=
-SIZE (qmapshack-1.16.0.tar.gz) = 54233332
+SHA256 (qmapshack-1.18.0.tar.gz) = 4JQSP3oOaMRmy/OUc0AqagY0PH+h5URQ64/cyclWJco=
+SIZE (qmapshack-1.18.0.tar.gz) = 58026362
diff --git a/geo/qmapshack/patches/patch-CMakeLists_txt b/geo/qmapshack/patches/patch-CMakeLists_txt
index f2f445814b5..36574f25e86 100644
--- a/geo/qmapshack/patches/patch-CMakeLists_txt
+++ b/geo/qmapshack/patches/patch-CMakeLists_txt
@@ -1,14 +1,22 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -162,10 +162,6 @@ if(${Qt5Widgets_VERSION} VERSION_LESS 5.8.0)
-     message( SEND_ERROR "You need at least Qt5.8 or newer.")
- endif()
+@@ -144,7 +144,7 @@ if(MSVC)
+ endif(MSVC)
  
--if(${PROJ_VERSION} VERSION_LESS 7.2.1)
--    message( SEND_ERROR "You need at least PROJ 7.2.1 or newer.")
+ if(UNIX)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -lm")
++    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  -lm")
+     add_definitions(-Wall -Wpedantic -Wno-switch -Wno-strict-aliasing)
+ 
+     # Use ASAN for development versions
+@@ -202,9 +202,6 @@ qt_standard_project_setup(
+     I18N_TRANSLATED_LANGUAGES ca cs de es fr it nl ru
+ )
+ 
+-if(${PROJ_VERSION} VERSION_LESS 8.0.0)
+-    message( SEND_ERROR "You need at least PROJ 8.0.0 or newer.")
 -endif()
--
- if(USE_QT5DBus)
-     find_package(Qt5DBus REQUIRED)
-     if(Qt5DBus_FOUND)
+ 
+ if(USE_QT6DBus)
+     find_package(Qt6DBus REQUIRED)
diff --git a/geo/qmapshack/patches/patch-cmake_Modules_DefineInstallationPaths_cmake b/geo/qmapshack/patches/patch-cmake_Modules_DefineInstallationPaths_cmake
index 222ab276416..d37004826bf 100644
--- a/geo/qmapshack/patches/patch-cmake_Modules_DefineInstallationPaths_cmake
+++ b/geo/qmapshack/patches/patch-cmake_Modules_DefineInstallationPaths_cmake
@@ -3,21 +3,21 @@ Install man pages and documentation in correct directories
 Index: cmake/Modules/DefineInstallationPaths.cmake
 --- cmake/Modules/DefineInstallationPaths.cmake.orig
 +++ cmake/Modules/DefineInstallationPaths.cmake
-@@ -59,7 +59,7 @@ if (UNIX)
-     FORCE
+@@ -51,7 +51,7 @@ if (UNIX)
+     CACHE PATH "The parent directory where applications can install their data (default prefix/share/${_PROJECT_NAME})"
    )
    SET(HTML_INSTALL_DIR
 -    "${DATA_INSTALL_PREFIX}/doc/HTML"
 +    "${DATA_INSTALL_PREFIX}/doc/qmapshack/HTML"
      CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
-     FORCE
    )
-@@ -97,7 +97,7 @@ if (UNIX)
-     FORCE
+   SET(ICON_INSTALL_DIR
+@@ -82,7 +82,7 @@ if (UNIX)
+     CACHE PATH "The ${_PROJECT_NAME} sysconfig install dir (default prefix/etc)"
    )
    SET(MAN_INSTALL_DIR
 -    "${SHARE_INSTALL_PREFIX}/man"
 +    "${EXEC_INSTALL_PREFIX}/man"
      CACHE PATH "The ${_PROJECT_NAME} man install dir (default prefix/man)"
-     FORCE
    )
+   SET(INFO_INSTALL_DIR
diff --git a/geo/qmapshack/patches/patch-src_qmapshack_CAbout_cpp b/geo/qmapshack/patches/patch-src_qmapshack_CAbout_cpp
index 9c625e2d4fe..6f81130cf8b 100644
--- a/geo/qmapshack/patches/patch-src_qmapshack_CAbout_cpp
+++ b/geo/qmapshack/patches/patch-src_qmapshack_CAbout_cpp
@@ -1,12 +1,12 @@
 Index: src/qmapshack/CAbout.cpp
 --- src/qmapshack/CAbout.cpp.orig
 +++ src/qmapshack/CAbout.cpp
-@@ -48,7 +48,7 @@ CAbout::CAbout(QWidget* parent)
-         labelRoutinoVersion->setText(tr("%1 (API V%2)").arg(Routino_Version).arg(Routino_APIVersion));
-     }
+@@ -46,7 +46,7 @@ CAbout::CAbout(QWidget* parent) : QDialog(parent) {
+     labelRoutinoVersion->setText(tr("%1 (API V%2)").arg(Routino_Version).arg(Routino_APIVersion));
+   }
  
 -#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined (Q_OS_OPENBSD)
-     #if defined (HAVE_DBUS)
-     labelNoDBus->setText("");
-     #else
+ #if defined(HAVE_DBUS)
+   labelNoDBus->setText("");
+ #else
diff --git a/geo/qmapshack/patches/patch-src_qmapshack_gis_CGisListWks_cpp b/geo/qmapshack/patches/patch-src_qmapshack_gis_CGisListWks_cpp
index e5f9ad98518..ba0caca2d2f 100644
--- a/geo/qmapshack/patches/patch-src_qmapshack_gis_CGisListWks_cpp
+++ b/geo/qmapshack/patches/patch-src_qmapshack_gis_CGisListWks_cpp
@@ -1,10 +1,10 @@
 Index: src/qmapshack/gis/CGisListWks.cpp
 --- src/qmapshack/gis/CGisListWks.cpp.orig
 +++ src/qmapshack/gis/CGisListWks.cpp
-@@ -20,7 +20,7 @@
- 
- #include "canvas/CCanvas.h"
+@@ -21,7 +21,7 @@
  #include "CMainWindow.h"
+ #include "canvas/CCanvas.h"
+ #include "gis/fit2/CFit2Project.h"
 -#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
 +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined (Q_OS_OPENBSD)
  #include "device/CDeviceWatcherLinux.h"
diff --git a/geo/qmapshack/patches/patch-src_qmapshack_helpers_CDraw_cpp b/geo/qmapshack/patches/patch-src_qmapshack_helpers_CDraw_cpp
index 704cf50e8c4..e55e8e912ef 100644
--- a/geo/qmapshack/patches/patch-src_qmapshack_helpers_CDraw_cpp
+++ b/geo/qmapshack/patches/patch-src_qmapshack_helpers_CDraw_cpp
@@ -1,7 +1,7 @@
 Index: src/qmapshack/helpers/CDraw.cpp
 --- src/qmapshack/helpers/CDraw.cpp.orig
 +++ src/qmapshack/helpers/CDraw.cpp
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
  #include <QPainterPath>
  #include <QPointF>
  #include <QtMath>
diff --git a/geo/qmapshack/patches/patch-src_qmapshack_helpers_CToolBarSetupDialog_cpp b/geo/qmapshack/patches/patch-src_qmapshack_helpers_CToolBarSetupDialog_cpp
index a241800c3d1..947db4d5a34 100644
--- a/geo/qmapshack/patches/patch-src_qmapshack_helpers_CToolBarSetupDialog_cpp
+++ b/geo/qmapshack/patches/patch-src_qmapshack_helpers_CToolBarSetupDialog_cpp
@@ -1,9 +1,9 @@
 Index: src/qmapshack/helpers/CToolBarSetupDialog.cpp
 --- src/qmapshack/helpers/CToolBarSetupDialog.cpp.orig
 +++ src/qmapshack/helpers/CToolBarSetupDialog.cpp
-@@ -19,6 +19,7 @@
+@@ -18,6 +18,7 @@
+ **********************************************************************************************/
  
- #include "helpers/CToolBarConfig.h"
  #include "helpers/CToolBarSetupDialog.h"
 +#include <QtWidgets>
  
diff --git a/geo/qmapshack/patches/patch-src_qmapshack_setup_IAppSetup_cpp b/geo/qmapshack/patches/patch-src_qmapshack_setup_IAppSetup_cpp
index e7ecb585d1d..fc478739e46 100644
--- a/geo/qmapshack/patches/patch-src_qmapshack_setup_IAppSetup_cpp
+++ b/geo/qmapshack/patches/patch-src_qmapshack_setup_IAppSetup_cpp
@@ -1,12 +1,21 @@
 Index: src/qmapshack/setup/IAppSetup.cpp
 --- src/qmapshack/setup/IAppSetup.cpp.orig
 +++ src/qmapshack/setup/IAppSetup.cpp
-@@ -36,7 +36,7 @@ IAppSetup* IAppSetup::getPlatformInstance()
-     {
+@@ -23,7 +23,7 @@
+ #include "CCommandProcessor.h"
  #if defined(Q_OS_MAC)
-         instance = new CAppSetupMac();
+ #include "setup/CAppSetupMac.h"
 -#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__)
-+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined (Q_OS_OPENBSD)
-         instance = new CAppSetupLinux();
- #elif defined (Q_OS_WIN32)
-         instance = new CAppSetupWin();
++#elif defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+ #include "setup/CAppSetupLinux.h"
+ #elif defined(Q_OS_WIN32)
+ #include "setup/CAppSetupWin.h"
+@@ -37,7 +37,7 @@ IAppSetup* IAppSetup::getPlatformInstance() {
+   if (nullptr == instance) {
+ #if defined(Q_OS_MAC)
+     instance = new CAppSetupMac();
+-#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__)
++#elif defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__)
+     instance = new CAppSetupLinux();
+ #elif defined(Q_OS_WIN32)
+     instance = new CAppSetupWin();
diff --git a/geo/qmapshack/patches/patch-src_qmaptool_helpers_CDraw_cpp b/geo/qmapshack/patches/patch-src_qmaptool_helpers_CDraw_cpp
index 8bc415ee11e..702258b99de 100644
--- a/geo/qmapshack/patches/patch-src_qmaptool_helpers_CDraw_cpp
+++ b/geo/qmapshack/patches/patch-src_qmaptool_helpers_CDraw_cpp
@@ -1,11 +1,11 @@
 Index: src/qmaptool/helpers/CDraw.cpp
 --- src/qmaptool/helpers/CDraw.cpp.orig
 +++ src/qmaptool/helpers/CDraw.cpp
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
  #include <QPainterPath>
  #include <QPointF>
  #include <QtMath>
 +#include <QPainterPath>
  
- QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2);
- QPen CDraw::penBorderGray(Qt::lightGray, 2);
+ #include "canvas/CCanvas.h"
+ 
diff --git a/geo/qmapshack/patches/patch-src_qmaptool_setup_IAppSetup_cpp b/geo/qmapshack/patches/patch-src_qmaptool_setup_IAppSetup_cpp
index fbe26022259..79128e43aa6 100644
--- a/geo/qmapshack/patches/patch-src_qmaptool_setup_IAppSetup_cpp
+++ b/geo/qmapshack/patches/patch-src_qmaptool_setup_IAppSetup_cpp
@@ -1,12 +1,12 @@
 Index: src/qmaptool/setup/IAppSetup.cpp
 --- src/qmaptool/setup/IAppSetup.cpp.orig
 +++ src/qmaptool/setup/IAppSetup.cpp
-@@ -56,7 +56,7 @@ IAppSetup& IAppSetup::createInstance(QObject* parent)
-     }
+@@ -47,7 +47,7 @@ IAppSetup& IAppSetup::createInstance(QObject* parent) 
+   }
  #if defined(Q_OS_MAC)
-     new CAppSetupMac(parent);
--#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(Q_OS_CYGWIN)
-+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(Q_OS_CYGWIN) || defined(Q_OS_OPENBSD)
-     new CAppSetupLinux(parent);
- #elif defined (Q_OS_WIN32)
-     new CAppSetupWin(parent);
+   new CAppSetupMac(parent);
+-#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
++#elif defined(Q_OS_LINUX) || defined(Q_OS_OPENBSD) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
+     defined(Q_OS_CYGWIN)
+   new CAppSetupLinux(parent);
+ #elif defined(Q_OS_WIN32)
diff --git a/geo/qmapshack/pkg/PLIST b/geo/qmapshack/pkg/PLIST
index af51a0c4669..e5afd149ae7 100644
--- a/geo/qmapshack/pkg/PLIST
+++ b/geo/qmapshack/pkg/PLIST
@@ -61,6 +61,7 @@ share/pixmaps/QMapShack.png
 share/pixmaps/QMapTool.png
 share/qmapshack/
 share/qmapshack/translations/
+share/qmapshack/translations/qmapshack.qm
 share/qmapshack/translations/qmapshack_ca.qm
 share/qmapshack/translations/qmapshack_cs.qm
 share/qmapshack/translations/qmapshack_de.qm
@@ -71,12 +72,14 @@ share/qmapshack/translations/qmapshack_nl.qm
 share/qmapshack/translations/qmapshack_ru.qm
 share/qmaptool/
 share/qmaptool/translations/
+share/qmaptool/translations/qmaptool.qm
 share/qmaptool/translations/qmaptool_de.qm
 share/qmaptool/translations/qmaptool_es.qm
 share/qmaptool/translations/qmaptool_it.qm
 share/qmaptool/translations/qmaptool_ru.qm
 share/qmt_rgb2pct/
 share/qmt_rgb2pct/translations/
+share/qmt_rgb2pct/translations/qmt_rgb2pct.qm
 share/qmt_rgb2pct/translations/qmt_rgb2pct_de.qm
 @tag gtk-update-icon-cache %D/share/icons/hicolor
 @tag update-desktop-database