git: 319f22ef48ad - main - x11-wm/cosmic-comp: chase config after 60a36bc91e5d

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=319f22ef48ade3729f0c0c4228e2982cb004735e

commit 319f22ef48ade3729f0c0c4228e2982cb004735e
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-08-19 01:59:31 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-08-20 00:20:18 +0000

    x11-wm/cosmic-comp: chase config after 60a36bc91e5d
    
    ====> Running Q/A tests (stage-qa)
    Warning: Possible REINPLACE_CMD issues:
    - - REINPLACE_CMD ran, but did not modify file contents: src/config/mod.rs
    
    https://github.com/pop-os/cosmic-comp/commit/553c49b42b59
---
 x11-wm/cosmic-comp/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index 17119db5c0b9..85efe15bc4ac 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cosmic-comp
 PORTVERSION=	s20240726
+PORTREVISION=	1
 CATEGORIES=	x11-wm wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -26,6 +27,7 @@ GH_TAGNAME=	fdde46f
 GH_TUPLE=	pop-os:iced:0.4.2-2010-gfa817c70:iced/../${WRKSRC_crate_iced:T}/iced
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \
+		share/cosmic/com.system76.CosmicSettings.Shortcuts/v1/defaults/keybindings.ron \
 		share/wayland-sessions/${PORTNAME:S/-comp//}.desktop \
 
 .if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH:Marmv?}
@@ -41,9 +43,6 @@ post-patch:
 # XXX Drop [patch.<url>] section to help "make cargo-configure"
 	@${REINPLACE_CMD} -e '/\[patch/,$$d' \
 		${WRKSRC}/Cargo.toml
-# Respect PREFIX for system-wide config
-	@${REINPLACE_CMD} -e 's,/etc,${PREFIX}&,' \
-		${WRKSRC}/src/config/mod.rs
 # /sys by default is a symlink to /usr/src/sys
 	@${REINPLACE_CMD} -e 's,/sys,${LINUXBASE}&,' \
 		${WRKSRC}/src/debug.rs
@@ -51,7 +50,7 @@ post-patch:
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 # Install extras similar to ${WRKSRC}/Makefile
-.for f in data/*.desktop
+.for f in data/*.desktop data/*.ron
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}:H}
 	${INSTALL_DATA} ${WRKSRC}/${f} \
 		${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.${f:E}}