From nobody Wed Jan 24 15:32:28 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 4TKnyN4xdnz58CYD; Wed, 24 Jan 2024 15:32:28 +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 4TKnyN4Sz2z4nbg; Wed, 24 Jan 2024 15:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706110348; 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=H62kjd0F74mShLITS7Asxor2t8+gs2DvNJDMmOjIMNE=; b=Q3bZBqLsyhDzLmASMMasVRZx9mNgpCZmVBulntib+ufKAK5Qpd6eK4+iJm9IkoLp+TWwUj Jd5hvtwJWzCZTC6kWJOkUPUicwe+/QfjCZa0XKLV3KpR/q+7OAYuI1a2rxYLq1dUZTLTS5 NvSNhJS++LXllXz+LGKhrfynqV4mYZLrwrwqbLkkQenOO1uIL9m1ZhIPxsLc43RBvJZocG xsZA0JA8UFx4eF2KoF+yTViimVJDh9H/U2QAhHD0CmZquZNvgqEzQjPeNKxzJFju3ihMZJ 3HsezOxeBctz332d1I8CiNyPM2ZerYsS/5jct4C91PfiKNfsJssDv0R4VlK3/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706110348; 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=H62kjd0F74mShLITS7Asxor2t8+gs2DvNJDMmOjIMNE=; b=uk47lawXZoFS1A+bUv8cOABZJzeBWjPsFRz2MoMG0wZs0R8csvAp4UMyE15BUhKWdoIunY RiT2mT9+hN6b7Cdx5XDhZeeKkU3gLK2MkF/cB7y8NqbvqKxaHEiAtGk2dVyOUz4sJqDZEM 7LLooF93ncW3ksqDSy5Z/Qa1jLZrVSGgy1E6Txqb1lRonphmOuMY4/4atw/sZPI2SO0Dh2 8DcnYNKo1vvs0vPVn9BmQUhWk0c/8ERi0dZPgutzpc2cV46PWtSVJ1e+PDHfR+klMINXIg PFE/EGWP5DfMu+9M/sFgZHib4s3KjZgZR4/2TynhwH36IOD7zpT9Li4X+7AW2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706110348; a=rsa-sha256; cv=none; b=lrvBKwY31By6ATcFfQzq8I4997eZ0E5r3tG8tjTqzY5e+Gm1Ncjh5eE6hsSRY8WOzCAPu1 8LvEqIteTvVkH8j6kMzwHowd32oLWssErx1azzrzabk2rha+p36q+QOc3JtTGB/x2SU0Zi Beo/cczWYVLFu5SFg4Kbn1kzSIyxaCN/qgIDstR2W+1t4WeaM89FjZRe1V7QsN4c51PZbl dRmWIow3PKpiHHY+tLGQfOSQM8UuVJOzxkkP1GlA0tVBLfucSBPDs1eGK5sVyUJVx6/cRq ijtVWQvlGHbmudwquaZrR87bRxTBaEV5t0Mz8IJ8Tc1hSejEUnzxBRfkPM3d8A== 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 4TKnyN3X1XzKml; Wed, 24 Jan 2024 15:32:28 +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 40OFWSS5081936; Wed, 24 Jan 2024 15:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OFWS9b081933; Wed, 24 Jan 2024 15:32:28 GMT (envelope-from git) Date: Wed, 24 Jan 2024 15:32:28 GMT Message-Id: <202401241532.40OFWS9b081933@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: eecf3562b01d - main - devel/jujutsu: fix install on other targets than amd64 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eecf3562b01d12c4e962a106bdaad4361e5b0034 Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=eecf3562b01d12c4e962a106bdaad4361e5b0034 commit eecf3562b01d12c4e962a106bdaad4361e5b0034 Author: Stefan Eßer AuthorDate: 2024-01-24 15:27:00 +0000 Commit: Stefan Eßer CommitDate: 2024-01-24 15:32:02 +0000 devel/jujutsu: fix install on other targets than amd64 This software uses a virtual manifest in its Cargo.toml, and it seems that there is no generic way to deal with such Cargo.toml files, unless building with direct access to the GitHub repository during the install phase. I'd appreciate any hint regarding a better way to install this program to the stage directory than the hacked do-install target I use. --- devel/jujutsu/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devel/jujutsu/Makefile b/devel/jujutsu/Makefile index 98dc7ef6a968..72d413fee28e 100644 --- a/devel/jujutsu/Makefile +++ b/devel/jujutsu/Makefile @@ -1,6 +1,7 @@ PORTNAME= jujutsu DISTVERSIONPREFIX= v DISTVERSION= 0.13.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= se@FreeBSD.org @@ -17,10 +18,8 @@ USE_GITHUB= yes GH_ACCOUNT= martinvonz GH_PROJECT= jj -__ARCH= ${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl} - do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/target/${__ARCH}/release/jj \ + ${INSTALL_PROGRAM} ${WRKDIR}/target/*-unknown-freebsd/release/jj \ ${STAGEDIR}${PREFIX}/bin/ .include