Stuart Henderson wrote:
> On 2021/07/15 14:52, Denis Fondras wrote:
>> Thank you Stefan.
>>
>> Le Wed, Jul 14, 2021 at 08:31:14PM +0200, Stefan Hagen a écrit :
>>> You can fix this by patching:
>>> src/CMakeLists.txt: ${CMAKE_CURRENT_BINARY_DIR}/share/man/man1/flameshot.1
>>> COPYONLY)
>>>
>>
>> I could not fix it. My cmake mastery is not good enough.
>> The install script will copy all share/ at once and will not mind about man/
>> being outside.
>
> No he's right, it just needs that single patch, it doesn't copy all of share/
> at once..
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.
The distfile checksum changed. Version v0.10.0 was retagged 17 hours ago.
I also included the other requested changes.
Index: graphics/flameshot/Makefile
===================================================================
RCS file: /cvs/ports/graphics/flameshot/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- graphics/flameshot/Makefile 1 Mar 2021 07:37:59 -0000 1.4
+++ graphics/flameshot/Makefile 16 Jul 2021 06:11:25 -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,14 @@ 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>
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/man/man1
+ ${INSTALL_DATA} ${PREFIX}/share/man/man1/flameshot.1 \
+ ${PREFIX}/man/man1/flameshot.1
+ rm -rf ${PREFIX}/share/man
-.if ${USE_CCACHE:L} != "yes"
-CONFIGURE_ARGS += -DENABLE_CACHE=OFF
-.endif
+.include <bsd.port.mk>
Index: graphics/flameshot/distinfo
===================================================================
RCS file: /cvs/ports/graphics/flameshot/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- graphics/flameshot/distinfo 1 Mar 2021 07:37:59 -0000 1.3
+++ graphics/flameshot/distinfo 16 Jul 2021 06:11:25 -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: graphics/flameshot/pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/flameshot/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- graphics/flameshot/pkg/PLIST 1 Mar 2021 07:37:59 -0000 1.3
+++ graphics/flameshot/pkg/PLIST 16 Jul 2021 06:11:25 -0000
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/03/01 07:37:59 denis Exp $
+@comment $OpenBSD: PLIST,v$
@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
