diff --git a/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake
index 8fd3709ff063..77acfa3e0c2b 100644
--- a/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake
+++ b/astro/qmapshack/files/patch-cmake_Modules_DefineInstallationPaths.cmake
@@ -1,20 +1,20 @@
 --- cmake/Modules/DefineInstallationPaths.cmake.orig	2020-03-27 08:07:31 UTC
 +++ cmake/Modules/DefineInstallationPaths.cmake
 @@ -59,7 +59,7 @@ if (UNIX)
      FORCE
    )
    SET(HTML_INSTALL_DIR
 -    "${DATA_INSTALL_PREFIX}/doc/HTML"
 +	  "${DATA_INSTALL_PREFIX}/doc/${_PROJECT_NAME}/HTML"
      CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
      FORCE
    )
 @@ -97,7 +97,7 @@ if (UNIX)
      FORCE
    )
    SET(MAN_INSTALL_DIR
 -    "${SHARE_INSTALL_PREFIX}/man"
-+    "${CMAKE_INSTALL_PREFIX}/man"
++    "${CMAKE_INSTALL_PREFIX}/share/man"
      CACHE PATH "The ${_PROJECT_NAME} man install dir (default prefix/man)"
      FORCE
    )
diff --git a/astro/qmapshack/pkg-plist b/astro/qmapshack/pkg-plist
index e442b203fbc4..79e13c72fc1b 100644
--- a/astro/qmapshack/pkg-plist
+++ b/astro/qmapshack/pkg-plist
@@ -1,63 +1,63 @@
 bin/qmapshack
 bin/qmaptool
 bin/qmt_map2jnx
 bin/qmt_rgb2pct
-man/man1/qmapshack.1.gz
-man/man1/qmaptool.1.gz
-man/man1/qmt_map2jnx.1.gz
-man/man1/qmt_rgb2pct.1.gz
+share/man/man1/qmapshack.1.gz
+share/man/man1/qmaptool.1.gz
+share/man/man1/qmt_map2jnx.1.gz
+share/man/man1/qmt_rgb2pct.1.gz
 share/applications/qmapshack.desktop
 share/applications/qmaptool.desktop
 share/icons/hicolor/128x128/apps/QMapShack.png
 share/icons/hicolor/128x128/apps/QMapTool.png
 share/icons/hicolor/16x16/apps/QMapShack.png
 share/icons/hicolor/16x16/apps/QMapTool.png
 share/icons/hicolor/192x192/apps/QMapShack.png
 share/icons/hicolor/192x192/apps/QMapTool.png
 share/icons/hicolor/22x22/apps/QMapShack.png
 share/icons/hicolor/22x22/apps/QMapTool.png
 share/icons/hicolor/24x24/apps/QMapShack.png
 share/icons/hicolor/24x24/apps/QMapTool.png
 share/icons/hicolor/256x256/apps/QMapShack.png
 share/icons/hicolor/256x256/apps/QMapTool.png
 share/icons/hicolor/32x32/apps/QMapShack.png
 share/icons/hicolor/32x32/apps/QMapTool.png
 share/icons/hicolor/36x36/apps/QMapShack.png
 share/icons/hicolor/36x36/apps/QMapTool.png
 share/icons/hicolor/40x40/apps/QMapShack.png
 share/icons/hicolor/40x40/apps/QMapTool.png
 share/icons/hicolor/42x42/apps/QMapShack.png
 share/icons/hicolor/42x42/apps/QMapTool.png
 share/icons/hicolor/48x48/apps/QMapShack.png
 share/icons/hicolor/48x48/apps/QMapTool.png
 share/icons/hicolor/512x512/apps/QMapShack.png
 share/icons/hicolor/512x512/apps/QMapTool.png
 share/icons/hicolor/64x64/apps/QMapShack.png
 share/icons/hicolor/64x64/apps/QMapTool.png
 share/icons/hicolor/72x72/apps/QMapShack.png
 share/icons/hicolor/72x72/apps/QMapTool.png
 share/icons/hicolor/80x80/apps/QMapShack.png
 share/icons/hicolor/80x80/apps/QMapTool.png
 share/icons/hicolor/8x8/apps/QMapShack.png
 share/icons/hicolor/8x8/apps/QMapTool.png
 share/icons/hicolor/96x96/apps/QMapShack.png
 share/icons/hicolor/96x96/apps/QMapTool.png
 share/pixmaps/QMapShack.png
 share/pixmaps/QMapTool.png
 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/translations/qmt_rgb2pct_de.qm
 %%DATADIR%%/translations/qmapshack_ca.qm
 %%DATADIR%%/translations/qmapshack_cs.qm
 %%DATADIR%%/translations/qmapshack_de.qm
 %%DATADIR%%/translations/qmapshack_es.qm
 %%DATADIR%%/translations/qmapshack_fr.qm
 %%DATADIR%%/translations/qmapshack_it.qm
 %%DATADIR%%/translations/qmapshack_nl.qm
 %%DATADIR%%/translations/qmapshack_ru.qm
 %%PORTDOCS%%%%DOCSDIR%%/HTML/QMSHelp.qch
 %%PORTDOCS%%%%DOCSDIR%%/HTML/QMSHelp.qhc
 %%PORTDOCS%%%%DOCSDIR%%/HTML/QMTHelp.qch
 %%PORTDOCS%%%%DOCSDIR%%/HTML/QMTHelp.qhc