Le Fri, Jul 16, 2021 at 09:02:14AM +0200, Stefan Hagen a écrit : > Stefan Hagen wrote: > > Denis is right too. Even with that line changed, flameshot.1 ends up in > > share/man. I tried fixing it without success. Therefore my proposal is > > to move it post-install. > > So this would be my hacky patch that moves the manpage via cmake. > I think both solutions are fine. >
Thank you Stefan, I was missing the 'install' directive. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/flameshot/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile 1 Mar 2021 07:37:59 -0000 1.4 +++ Makefile 16 Jul 2021 08:05:49 -0000 @@ -5,7 +5,7 @@ CATEGORIES = graphics x11 GH_ACCOUNT = flameshot-org GH_PROJECT = flameshot -GH_TAGNAME = v0.9.0 +GH_TAGNAME = v0.10.0 HOMEPAGE = https://flameshot.org/ MAINTAINER = Denis Fondras <de...@openbsd.org> @@ -13,7 +13,7 @@ MAINTAINER = Denis Fondras <denis@openbs # GPLv3+ PERMIT_PACKAGE = Yes -WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Network WANTLIB += Qt5Svg Qt5Widgets c m MODULES = devel/cmake \ @@ -24,10 +24,8 @@ LIB_DEPENDS = x11/qt5/qtsvg RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic +CONFIGURE_ARGS += -DENABLE_CACHE=OFF + NO_TEST = Yes .include <bsd.port.mk> - -.if ${USE_CCACHE:L} != "yes" -CONFIGURE_ARGS += -DENABLE_CACHE=OFF -.endif Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/flameshot/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 1 Mar 2021 07:37:59 -0000 1.3 +++ distinfo 16 Jul 2021 08:05:49 -0000 @@ -1,2 +1,2 @@ -SHA256 (flameshot-0.9.0.tar.gz) = Z+C1eO+KaCKOdYy1k5W7dAS1wXbp28PKLYOmPxVKbyI= -SIZE (flameshot-0.9.0.tar.gz) = 7659641 +SHA256 (flameshot-0.10.0.tar.gz) = ROU8Xc792wW9b6GvZn3yh/RLqhdGRov6tfdjGMC7P4M= +SIZE (flameshot-0.10.0.tar.gz) = 7726638 Index: patches/patch-src_CMakeLists_txt =================================================================== RCS file: patches/patch-src_CMakeLists_txt diff -N patches/patch-src_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_CMakeLists_txt 16 Jul 2021 08:05:49 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +Install manpage to correct location + +Index: src/CMakeLists.txt +--- src/CMakeLists.txt.orig ++++ src/CMakeLists.txt +@@ -264,7 +264,7 @@ configure_file(${CMAKE_SOURCE_DIR}/data/dbus/org.flame + + # Install man pages + configure_file(${CMAKE_SOURCE_DIR}/data/man/man1/flameshot.1 +- ${CMAKE_CURRENT_BINARY_DIR}/share/man/man1/flameshot.1 COPYONLY) ++ ${CMAKE_CURRENT_BINARY_DIR}/man/man1/flameshot.1 COPYONLY) + + # Install Icons + configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/org.flameshot.Flameshot.png +@@ -287,6 +287,7 @@ configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/sc + ${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/flameshot.svg COPYONLY) + + # Install assets ++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man/ DESTINATION ${CMAKE_INSTALL_PREFIX}/man) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) + + # Install Translations Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/flameshot/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 1 Mar 2021 07:37:59 -0000 1.3 +++ pkg/PLIST 16 Jul 2021 08:05:49 -0000 @@ -1,5 +1,6 @@ @comment $OpenBSD: PLIST,v 1.3 2021/03/01 07:37:59 denis Exp $ @bin bin/flameshot +@man man/man1/flameshot.1 share/applications/org.flameshot.Flameshot.desktop share/bash-completion/completions/flameshot share/dbus-1/interfaces/org.flameshot.Flameshot.xml @@ -9,6 +10,7 @@ share/flameshot/translations/ share/flameshot/translations/Internationalization_ca.qm share/flameshot/translations/Internationalization_cs.qm share/flameshot/translations/Internationalization_de_DE.qm +share/flameshot/translations/Internationalization_el.qm share/flameshot/translations/Internationalization_es.qm share/flameshot/translations/Internationalization_eu.qm share/flameshot/translations/Internationalization_fr.qm @@ -17,6 +19,7 @@ share/flameshot/translations/Internation share/flameshot/translations/Internationalization_ja.qm share/flameshot/translations/Internationalization_ka.qm share/flameshot/translations/Internationalization_ko.qm +share/flameshot/translations/Internationalization_nb_NO.qm share/flameshot/translations/Internationalization_nl.qm share/flameshot/translations/Internationalization_nl_NL.qm share/flameshot/translations/Internationalization_pl.qm
