From nobody Sun Oct 01 13:07:45 2023 X-Original-To: dev-commits-ports-main@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 4Rz4BT426Xz4vHDQ; Sun, 1 Oct 2023 13:07:45 +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 4Rz4BT3RHSz4Psh; Sun, 1 Oct 2023 13:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696165665; 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=d5rFPsWDxxB5vXr6DTMdac8yiL0IhYkj7YiewgMjbPA=; b=wOhjEkbbiXtq4APOdR9vMsZ3hENw9QrLUZyiCcqVKSPU7ZO7qp8PX++p/JInuo+iimVnTq HqsWiqSB1/tPIk9qIKjwcATl/UxfLF+BSN644jG9ZQNSdlE+OAqqfgpP/pYN2ufwa8kicc UJkkhMMGb2HGyHqcCg5RBRRj6fgUu9ZQa+97E4BQlb9lyyuU64LVSKjOLGCvQz/lMYVrfj NyB1+5L4CTvZO2H1xIMOd4OPXyoqjIo7n/CQm3GVYcHg7cofamI+GO9BF/aqYLC5xyApNI obI4VxSTul74h0S9yj1fZJCOlscRoNl8ArAehEabtvWQoEfgYzoPBiZLe7raiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696165665; a=rsa-sha256; cv=none; b=uuK0IuQh8tn7vNmTxmgnY8OoE60hDgLHy9OipPznpLn3/ha7ttm0iKFpyriy6V0A4xRiyV i1Q04m+t0Mzl4OosEvGNOM4ouvSz3yPQn9WpYp/cLDiFDN1hTQJXaQeOjqMFMzbMg1ln4a mdt1Lprtjfq+5c0xyBgjsfIrtcyBisrs0NQx2CJxHryloyw4ESaQPQxFnxmf0U4yyl+Ny9 6WR66BAUaEHyBkIxUX2fJXdCfc4INaoFvAK8na0xmfBClVWeqZoAimoa/25LT/pWwfSC2x Ve2qjEt7pKizI+xK7VtXAIsvuaZaM480BNgD89C4rTTAUYaXYweXwjHF253q6g== 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=1696165665; 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=d5rFPsWDxxB5vXr6DTMdac8yiL0IhYkj7YiewgMjbPA=; b=lx+pW7Bg2U28C6OsLpW8ZiX13p4DcVuCEdP5WAb3XsjkMQHxenCUSky8uYnUikElVLTB9Z uwOU5bBZ+RDDxWVfc4XPhOqtugdDexUdaCCnv651XpwouO90U2th1Qq5Fai37+g0BTYxXy PJdaCzSdJ0QXZW/Ooc4YrQeegBnNDmEIlq0XFD8EsWmVQd52e/Et6IUkc80I3E/GyU7U8D t9XW/AAguaUsViGs51+TrjogvnUuRkhMKjlj5J1n6KFY36Jq6gccfiTU+rty5CbZYHmQ2x j7CRQsTdxr4Q55jdJ9ZxzaMAFZ3sXv/3dtJmsbLWMmWJw1INQAurR9hyI2InXQ== 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 4Rz4BT2TqQzWfS; Sun, 1 Oct 2023 13:07:45 +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 391D7jwS058796; Sun, 1 Oct 2023 13:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 391D7jWX058793; Sun, 1 Oct 2023 13:07:45 GMT (envelope-from git) Date: Sun, 1 Oct 2023 13:07:45 GMT Message-Id: <202310011307.391D7jWX058793@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: 755d5c1bfec3 - main - sysutils/synergy: replace hardcoded path for evdev.xml List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 755d5c1bfec3e50b4b6b4fce895dc992c568f5a9 Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=755d5c1bfec3e50b4b6b4fce895dc992c568f5a9 commit 755d5c1bfec3e50b4b6b4fce895dc992c568f5a9 Author: Koichiro Iwao AuthorDate: 2023-09-25 07:31:09 +0000 Commit: Koichiro Iwao CommitDate: 2023-10-01 13:06:28 +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) --- sysutils/synergy/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile index 4ef1e45dddf1..1b93684741e9 100644 --- a/sysutils/synergy/Makefile +++ b/sysutils/synergy/Makefile @@ -1,6 +1,7 @@ PORTNAME= synergy DISTVERSION= 1.14.6.19 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|' \