From nobody Sun Oct 01 13:13:05 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rz4Jd3Zq1z4vHfp; Sun, 1 Oct 2023 13:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rz4Jd33Lyz4QF4; Sun, 1 Oct 2023 13:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696165985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tpkvQUNoqZqAHddqJHt8xeowtXEfDHNiVotEbbUo3Vo=; b=urwUnBUXMBBtToIVS9rHbbXaSGxt5GoGQ1OTnBi4qN17aV+k+I5DnJKbszt0DCAf8PIENy bSjGynz+n6+JnaTRshJFHdfHIlQqI4sz37eWkANxCl43YDUsB2BE9FtWGXlbMhqdGOjIsf 7UwUwLIk1RnhLVlGj646MJOtbB2jE0ec0MR02Wf3TxJZfLxBMr1eOvK66YTflBK0IvtE++ UuTPpWooLHmTZ9/ccbAQ3KmZT7M0v2VJwRgfYnV7Y0pc8S+zLVIUwhvcvkZZy5iBZ/je7k W0zBNG1nFcXG4DRcwLgrs/SqWZiQD/O4SPC690NM7zIBlC5zT0PPBZynFb/JNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696165985; a=rsa-sha256; cv=none; b=ArE5CcRhGXjqq9CJcXa6EaeIis/W16Rz3oSN+P+903tjvEDXu5iQIptm4VCbzIb4CL16tn jCF07w1GbWLhLWN/EXcOZU3uU/vZ109ULRt1tUbt57VhezTf6PJerNzJX1yInrNGWIF3Ix tRKmUKDz/0SlD4YNLgKe+ZjXfRYcvn1YkiqGzHj83O6hqfF9ggG1dKB1vS9J1SIpYRTT6t dZGArHbA23zYMCBc6tg0EEybz76cOlzaZXy4eAUfKCXYo8kkAmtyBOR+Vi2qkdZ/Z11CL2 DQxXTd1O7FggHVoaZoWjA5VddNHQh1tWkR9HJKgQPbBfNvxVm/MW/zbEuTgAjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696165985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tpkvQUNoqZqAHddqJHt8xeowtXEfDHNiVotEbbUo3Vo=; b=mNZeU4KdutFWE6cexPkf2jDAslCDu7Dh5D9/go40CWV/VMEt42bbndxG0rHJ0mA2g7VbYj wutneCiHUufwBvn7NccegnFVQhpcjqArSlUZzFROarnJagckbQx4orXsamq167HqGH5h5u 6JSCvBp92AKkCjIfnZNvGXPx2Qj1MlK+ksn+TYjZLWETG8chA5CmSgpn5IJ3mGWJWbMiZl pkB1THAbzWJdhk027sOIgcBy0eYkYDT5SbviRJBW8/MINNbeZcP7IBuspcrWdJg7PDAXu3 ERJkyeRZe2PRG3nOoa9KC7UbRtoy8oYj8HBbSAo+s8PtMrvKJBlYF+9O0RGnEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rz4Jd25g9zX7b; Sun, 1 Oct 2023 13:13:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 391DD51J074449; Sun, 1 Oct 2023 13:13:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 391DD5MG074446; Sun, 1 Oct 2023 13:13:05 GMT (envelope-from git) Date: Sun, 1 Oct 2023 13:13:05 GMT Message-Id: <202310011313.391DD5MG074446@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Koichiro Iwao Subject: git: 54e58e1299b0 - 2023Q3 - sysutils/synergy: replace hardcoded path for evdev.xml List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 54e58e1299b062139a1ad244bc56253ce16e9819 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=54e58e1299b062139a1ad244bc56253ce16e9819 commit 54e58e1299b062139a1ad244bc56253ce16e9819 Author: Koichiro Iwao AuthorDate: 2023-09-25 07:31:09 +0000 Commit: Koichiro Iwao CommitDate: 2023-10-01 13:11:56 +0000 sysutils/synergy: replace hardcoded path for evdev.xml PR: 271200 Reported by: Koine Yuusuke Tested by: Koine Yuusuke 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|' \