Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Oct 2023 13:13:05 GMT
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 54e58e1299b0 - 2023Q3 - sysutils/synergy: replace hardcoded path for evdev.xml
Message-ID:  <202310011313.391DD5MG074446@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by meta:

URL: https://cgit.FreeBSD.org/ports/commit/?id=54e58e1299b062139a1ad244bc56253ce16e9819

commit 54e58e1299b062139a1ad244bc56253ce16e9819
Author:     Koichiro Iwao <meta@FreeBSD.org>
AuthorDate: 2023-09-25 07:31:09 +0000
Commit:     Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2023-10-01 13:11:56 +0000

    sysutils/synergy: replace hardcoded path for evdev.xml
    
    PR:             271200
    Reported by:    Koine Yuusuke <koinec@yahoo.co.jp>
    Tested by:      Koine Yuusuke <koinec@yahoo.co.jp>
    Reviewed by:    meta
    Approved by:    maintainer timeout (> 4 months)
    
    (cherry picked from commit 755d5c1bfec3e50b4b6b4fce895dc992c568f5a9)
---
 sysutils/synergy/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index bb0e89937935..1ec24ab5cbdb 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	synergy
 DISTVERSION=	1.14.5.14
 DISTVERSIONSUFFIX=	-stable
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	sysutils
 
@@ -50,6 +51,10 @@ LEGACY_CONFIGURE_ENV_OFF=	SYNERGY_NO_LEGACY=true
 LEGACY_USE=			QT=gui
 
 post-patch:
+	# Hardcoded path needs to be replaced with
+	#   --with-xkb-base defined in x11/keyboard-config
+	@${REINPLACE_CMD} -e 's|/usr/share/X11/xkb|${PREFIX}/share/X11/xkb"|' \
+		${WRKSRC}/src/lib/synergy/unix/AppUtilUnix.cpp
 	@${REINPLACE_CMD} -e 's|return "/etc"|return "${PREFIX}/etc"|' \
 		${WRKSRC}/src/lib/arch/unix/ArchFileUnix.cpp
 	@${REINPLACE_CMD} -e 's|/etc/synergy.conf|${PREFIX}/etc/synergy.conf|' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310011313.391DD5MG074446>