From nobody Thu Sep 05 19:23:16 2024 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 4X08Qs2Z5fz5Tj3M; Thu, 05 Sep 2024 19:23:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X08Qs0HXjz4VjM; Thu, 5 Sep 2024 19:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725564197; 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=qt8cq4Im1BJM3qIM7a9CIeJFoHOT8ndcyBa+JAMdkVE=; b=eYoS8b35csYhPfj4cOtgYhBl9sEPZ8p6+Mp8ZO2ou7eixN4hXMckXcclUxr5kXP/LGxnB7 GCDozEFutm1j1yeJbUXVtUXwCJbur4nvK89Z6UdZTA4lvqNEV+odbi02hchSwK0tqWVjfx 0imUr0CkzGzv1ICDLK/qN+LbaoD8HcDqNGWkzwtaLb8FWS2r2VYmZoioh99L9yolbO3iHH bmHhFBsbXYzQQ2HS2BGMYvOzdFvyGTfqpLRZMVUz5hdGvHioNvGzA7FdPzWEQgpjKzp+wR 1rVK2SNsUs22lXJQQrpJ7HFx2Qy+p1obeXyjZEVAjjV/Igt1AHevKHJgTofvAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725564197; a=rsa-sha256; cv=none; b=ifla2AbQG1FIFpce9llcUfMtLxME1Rv5gbkT2GOg0e4D8TK0VZp6i8TbJBBAieWGp70WdO AFrZMaB1NUEiPUKNqP1W47iOR3CzaqCFizkLyDDVLCTxYT+U+ZE+0kso3Xw30bWwZeNzMN ezOnyVTBLal60aKsMEfo/AnsME2p/8sOORmR4O252emZaDiCBKLtgUDqeVSD6u31P2L0Bv GDfEcWthYQDNlZARnrokeG9CVEInVsQTOi0T7zRoHGar5IrF8apmt7a26mucYMNb20Hj82 3Nc86CUnGbpTbyz7piBRjWi6KiO9WI6bvV/2z68b7DTj8y6Ghzn/lLRnFPX16g== 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=1725564197; 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=qt8cq4Im1BJM3qIM7a9CIeJFoHOT8ndcyBa+JAMdkVE=; b=ADZyYxcPkZC1AHTrrIREOIoAJXa6vTQnhZjnIvRAeEKiwXw+FdskVHcBBu600pwKvGBQwH H3uHUfz6j8XFu7r/GgOQyhhl6aHtLvOmoYVhbYJFFDquYcNCvBEyCl+SHDUvEVF0T1gfX8 7YEUUyQFCFqA7RkHBI7vVcmmxPlDeFwyAQixBmknQMylzqtGJ9VKPNKlv8YomoPHNlRYAc t9rG5dkU0vHhEA2/bSH+i1/7MYYrjZ7H/LpruBEaPdXzMpIpC+d5hm0DRmFvdSl3ByDncC A11zNvHJ6zA88zkmQp6FL5cKFHU3eVGcpbfB0ohbf8d2dB8WGPsWjGwGah6VTA== 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 4X08Qr70vjzL25; Thu, 5 Sep 2024 19:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 485JNGCb043942; Thu, 5 Sep 2024 19:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485JNGPH043939; Thu, 5 Sep 2024 19:23:16 GMT (envelope-from git) Date: Thu, 5 Sep 2024 19:23:16 GMT Message-Id: <202409051923.485JNGPH043939@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: e1ad64962042 - main - textproc/quarto: Not arch-neutral; Remove 2 unnecessary files 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1ad649620426c1dde18f2919a6fb0f3801e197e Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=e1ad649620426c1dde18f2919a6fb0f3801e197e commit e1ad649620426c1dde18f2919a6fb0f3801e197e Author: Yuri Victorovich AuthorDate: 2024-09-05 19:22:17 +0000 Commit: Yuri Victorovich 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