git: e1ad64962042 - main - textproc/quarto: Not arch-neutral; Remove 2 unnecessary files
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 05 Sep 2024 19:23:16 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e1ad649620426c1dde18f2919a6fb0f3801e197e
commit e1ad649620426c1dde18f2919a6fb0f3801e197e
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-09-05 19:22:17 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-09-05 19:23:14 +0000
textproc/quarto: Not arch-neutral; Remove 2 unnecessary files
---
textproc/quarto/Makefile | 8 +++++---
textproc/quarto/pkg-plist | 2 --
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/textproc/quarto/Makefile b/textproc/quarto/Makefile
index 791437d918c0..7df09816de7c 100644
--- a/textproc/quarto/Makefile
+++ b/textproc/quarto/Makefile
@@ -1,5 +1,6 @@
PORTNAME= quarto # html output is broken due to a missing dependency
DISTVERSION= 1.6.9
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= https://github.com/quarto-dev/quarto-cli/releases/download/v${DISTVERSION}/
DISTFILES= quarto-${DISTVERSION}-linux-amd64.tar.gz # same for all architectures
@@ -30,11 +31,10 @@ XARCH!= uname -m
PLIST_SUB+= XARCH=${XARCH}
NO_BUILD= yes
-NO_ARCH= yes
-pre-install:
+post-patch:
# replace tokens in the quarto executable and in run-tests.sh
- ${REINPLACE_CMD} \
+ ${REINPLACE_CMD} -i '' \
-e 's|%%SCRIPT_PATH%%|${DATADIR}/bin|; s|%%ARCH_DIR%%|${XARCH}|' \
${WRKSRC}/bin/quarto
${REINPLACE_CMD} \
@@ -46,6 +46,8 @@ do-install:
@cd ${WRKSRC} && \
${COPYTREE_SHARE} bin ${STAGEDIR}${DATADIR} && \
${COPYTREE_SHARE} share ${STAGEDIR}${DATADIR}
+ # remove unnecessary files
+ ${RM} ${STAGEDIR}${DATADIR}/bin/quarto.orig
# adjust architecture
${MV} ${STAGEDIR}${DATADIR}/bin/tools/x86_64 ${STAGEDIR}${DATADIR}/bin/tools/${XARCH}
cd ${STAGEDIR}${DATADIR}/bin/tools && ${LN} -s amd64 x86_64
diff --git a/textproc/quarto/pkg-plist b/textproc/quarto/pkg-plist
index 6645c5413768..16cb60a47f5f 100644
--- a/textproc/quarto/pkg-plist
+++ b/textproc/quarto/pkg-plist
@@ -1,8 +1,6 @@
bin/quarto
%%DATADIR%%/bin/quarto
-%%DATADIR%%/bin/quarto.bak
%%DATADIR%%/bin/quarto.js
-%%DATADIR%%/bin/quarto.orig
%%DATADIR%%/bin/tools/%%XARCH%%/deno
%%DATADIR%%/bin/tools/%%XARCH%%/esbuild
%%DATADIR%%/bin/tools/%%XARCH%%/pandoc