From nobody Tue Mar 7 06:06:42 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 4PW4hf3x0pz3wx9M; Tue, 7 Mar 2023 06:06:42 +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 4PW4hf1mnRz4GLN; Tue, 7 Mar 2023 06:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678169202; 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=oXb2LlOtdXlEVH1L1YjRD8YT15frbMuFcgQrtE1wGVk=; b=fJT6zVwKjJcl7Ra1OLKxh2dVYklWBNtJZxcek787YcSeZuEBNWkj2XUAHi+Bhku7VvsmMP idoK+K711DAtbyA8AvlQLmZBG1QKjFHXPVtxFy1bF8PfCNFcYSLfZA67oEVoBmLHoA8kkb P4qeSWq6TGFSi31TktD9vpuLWRiv+MgvNRYfDSUq3ME6+Jd5QUK5Yv0yiqwMx6/dKQ9ofC gCREPRonQrbkfyrl1oVpwxR76WqNrWRuamNU9iL8RNVKHL1xldxGdsDudG/MleJHwzcnVn WZGP24qSPgKSE5YJMIGYtoN2IDsHn1daQOsIZwPbSe0DgCy4lUJfiERJsZzlQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678169202; 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=oXb2LlOtdXlEVH1L1YjRD8YT15frbMuFcgQrtE1wGVk=; b=QObm0OM//D/4sU7w6BIAwTeVTkD7LhfhbbSSmHkXp6cmesJBoS70UrkV+GxJwXbf1rYFVW jeEoBMI60S/vr/WGwINPA6WlQYmKTKsUcuhqTO8/BVSw4YH6N/Y0h6eke6VL8d4Vli05Am j5Mv9WYLZ8+h5CXGod1Bc2XXXRCo6erifJXUS5+g1XaC1NmQ4eR+3Q4hymPIEil7mH8heq VqW2FoRRV7uBP2yBNjvt2oCHrr1oSdyakypiP3HA8pevVnkYpanUdd4VQKqDE3gHR9vNSL ZZWXAHy6yvnIXRki6A/8qY6rcGL5iOnHQlR1u86edG+noUE1IsbTzIiw1GS0PQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678169202; a=rsa-sha256; cv=none; b=G9sSYBKNw8XmTZA22scUtodL8kZXXmGHUR3iEQtq7XaSrsOlUj86UarzSbglasj5CAyNT3 ntcCD1LU0p1EMhPO6IBfLDNu38RLSzT9g4WcC2r2qxlLFkBjS5IvVebrQ70Qafa8vc2A9Y gjBTLgiia9tvjP9igdPV7StWPeli51dtPETMZbS29UBS3G/CrN+X798O+l+m1meByunRqV GXUakKj27BGCPaS020U3sipghxw5PQgWYMIJ7UKxrgKvCj11BCZYIES73jke70FSf3mSJc aOAKqxcSf9DoZmqzpEWSmudNLSK8pB4evgL/84px5acdvC46OloVbPItG6hDPw== 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 4PW4hf0snTzXlG; Tue, 7 Mar 2023 06:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32766g7I056240; Tue, 7 Mar 2023 06:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32766gOS056239; Tue, 7 Mar 2023 06:06:42 GMT (envelope-from git) Date: Tue, 7 Mar 2023 06:06:42 GMT Message-Id: <202303070606.32766gOS056239@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: a80ae88b4bfd - main - editors/linux-r7-office: Bring back ${LOCALBASE} substitution. 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: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a80ae88b4bfd5adbcc979b6e3ec26acc11c835ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a80ae88b4bfd5adbcc979b6e3ec26acc11c835ed commit a80ae88b4bfd5adbcc979b6e3ec26acc11c835ed Author: Gleb Popov AuthorDate: 2023-03-07 06:05:34 +0000 Commit: Gleb Popov CommitDate: 2023-03-07 06:06:07 +0000 editors/linux-r7-office: Bring back ${LOCALBASE} substitution. Reported by: fluffy Sponsored by: Serenity Cybersecurity, LLC --- editors/linux-r7-office/Makefile | 1 + .../linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors | 6 +++--- editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer | 2 +- editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/editors/linux-r7-office/Makefile b/editors/linux-r7-office/Makefile index 4d242d6ef6e2..977ab79fbb9e 100644 --- a/editors/linux-r7-office/Makefile +++ b/editors/linux-r7-office/Makefile @@ -33,6 +33,7 @@ post-extract: cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} data.tar.xz ${EXTRACT_AFTER_ARGS} post-patch: + ${REINPLACE_CMD} -i '' 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKDIR}/usr/bin/r7-office-* ${REINPLACE_CMD} -i '' 's|/usr/bin/|${PREFIX}/bin/|' ${WRKDIR}/usr/share/applications/*.desktop do-install: diff --git a/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors b/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors index 7de4e77687cc..75b72e5e421e 100644 --- a/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors +++ b/editors/linux-r7-office/files/patch-usr_bin_r7-office-desktopeditors @@ -5,7 +5,7 @@ fi - SOURCE_DOC_DIR="/opt/r7-office/desktopeditors/converter/empty" -+ SOURCE_DOC_DIR="/usr/local/share/r7-office/desktopeditors/converter/empty" ++ SOURCE_DOC_DIR="%%LOCALBASE%%/share/r7-office/desktopeditors/converter/empty" set_names_ru @@ -15,8 +15,8 @@ -DIR=/opt/r7-office/desktopeditors -DIR_MV=/opt/r7-office/mediaviewer -+DIR=/usr/local/share/r7-office/desktopeditors -+DIR_MV=/usr/local/share/r7-office/mediaviewer ++DIR=%%LOCALBASE%%/share/r7-office/desktopeditors ++DIR_MV=%%LOCALBASE%%/share/r7-office/mediaviewer export LD_LIBRARY_PATH=$DIR:$DIR/converter:$DIR_MV:$LD_LIBRARY_PATH export VLC_PLUGIN_PATH=$DIR_MV/plugins +export LC_CTYPE=ru_RU.UTF-8 diff --git a/editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer b/editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer index 5960cd6c0c2e..7ec1ac69fec2 100644 --- a/editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer +++ b/editors/linux-r7-office/files/patch-usr_bin_r7-office-imageviewer @@ -4,7 +4,7 @@ #!/bin/sh -DIR=/opt/r7-office/mediaviewer -+DIR=/usr/local/share/r7-office/mediaviewer ++DIR=%%LOCALBASE%%/share/r7-office/mediaviewer export LD_LIBRARY_PATH=$DIR:$LD_LIBRARY_PATH +export LC_CTYPE=ru_RU.UTF-8 exec $DIR/ImageViewer "$@" diff --git a/editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer b/editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer index 9dd1d6ce0258..6ac537853f7c 100644 --- a/editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer +++ b/editors/linux-r7-office/files/patch-usr_bin_r7-office-videoplayer @@ -4,7 +4,7 @@ #!/bin/sh -DIR=/opt/r7-office/mediaviewer -+DIR=/usr/local/share/r7-office/mediaviewer ++DIR=%%LOCALBASE%%/share/r7-office/mediaviewer export LD_LIBRARY_PATH=$DIR:$LD_LIBRARY_PATH +export LC_CTYPE=ru_RU.UTF-8 exec $DIR/VideoPlayer "$@"