Date: Tue, 7 Mar 2023 06:06:42 GMT
From: Gleb Popov <arrowd@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: a80ae88b4bfd - main - editors/linux-r7-office: Bring back ${LOCALBASE} substitution.
Message-ID: <202303070606.32766gOS056239@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a80ae88b4bfd5adbcc979b6e3ec26acc11c835ed commit a80ae88b4bfd5adbcc979b6e3ec26acc11c835ed Author: Gleb Popov <arrowd@FreeBSD.org> AuthorDate: 2023-03-07 06:05:34 +0000 Commit: Gleb Popov <arrowd@FreeBSD.org> 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 "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303070606.32766gOS056239>