From nobody Wed Jun 5 14:34:52 2024 X-Original-To: dev-commits-ports-all@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 4VvVNY0LxNz5N6Z4; Wed, 05 Jun 2024 14:34:53 +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 4VvVNX6dj5z42vv; Wed, 5 Jun 2024 14:34:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717598092; 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=Ld48qec5ZegkGzTNnnq73Cu4G9zoGrT0Vi8FfHCWF4c=; b=FCxA6dTt/7KOeWGvqxI4aObOtluiXA1fhd5fBrENMmZLL9E14G1ov2GMwRx0r2DBvdLnHv rXQ5lAhEVBoZXD2Vf/65k0NLU3/LmLTH/CdMQpwBTaSse1QUtycbUlm3YH5zLp/dFXj2tW m2biAydm9TvKCtTPkf6rkiAxcvQh6dLyObmLivQwvWvqyNtkMCr3BUCVSObeMbjPd22kVw xSv19lOUZ1xLgWkwZM4ffqwV8wBF4MVJhCR+Dd9tv5KESAPUZpUGtyGCkWVVQ2vuieahmG t6XaOZwXHhKljfi/GPkbGgrsz1KT/zuFOKgdt0fmovnh9oyIc8v4erbgLR7Xtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717598092; a=rsa-sha256; cv=none; b=gQhz9Z9jwlNQ9pOmDGg3jCf8b87Ey2wB/ZQ2UDR/4jw8EPFCHgsFgUoLQlcyba4TqFN+Yj ggjk6wWVICtt6wNUwMADoRDpwKqn027s9Zl8T9E83cIRjc0U6GvI8O+20coaVrRJ/crFDX T0z+ZuGam0BAHeUyYdCVWsUIvVOvdWK1xuiU90mAzTzwYCT0zioqUV40ig6NFPV7cC5J8K O4ChRpXlCYNZoUzlKlv/64teHNQFmfjNIn6Zxx3KfY+9afMW87MBQ14Z0wxF1pflV5zrD5 GAp3ST4RlihZbGzApfj6+2H8J8U2mes9BQM8UdXSmtEqEpdhBtRGNmtuOV/8JA== 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=1717598092; 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=Ld48qec5ZegkGzTNnnq73Cu4G9zoGrT0Vi8FfHCWF4c=; b=EOvxj1SY2abW+hg7KzqDqKotNPxNOlcoGqHmEeBqwKLp3UZ2PriSRkxNkqEU06SkBcf7Oy dGj919cujykHQNJ4ujcsbAamqQ5wwU2+aWDd1GtCZpH5V8eNUZIPgo8poVTMxiiW2D2yoc UPwlREWtDmoGpuI08yESEsoMzeU2+rpqsdf3erQFg/d4qt6eMgAwK7i0WzC2jusBIjk7g1 ouauDNOzZRX6JOwv7wXpeqEZFGV7SmDQo8w3BVTUmLZqlftkiIGd5m81a7W6i/manMWOon WluzvCC2qf9TJykopdKueV+W6IV5+LllurbRfYKPqZHCOkiIuhA+lnyxfVx7oQ== 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 4VvVNX6Dq5z15dg; Wed, 5 Jun 2024 14:34:52 +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 455EYq6L052473; Wed, 5 Jun 2024 14:34:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 455EYqQp052470; Wed, 5 Jun 2024 14:34:52 GMT (envelope-from git) Date: Wed, 5 Jun 2024 14:34:52 GMT Message-Id: <202406051434.455EYqQp052470@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: bc5cba2753c7 - main - devel/git: Fix build using SETENVI and WRK_ENV List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bc5cba2753c702214cfd9b7ed51385f6f2b8428f Auto-Submitted: auto-generated The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc5cba2753c702214cfd9b7ed51385f6f2b8428f commit bc5cba2753c702214cfd9b7ed51385f6f2b8428f Author: Renato Botelho AuthorDate: 2024-06-05 14:32:47 +0000 Commit: Renato Botelho CommitDate: 2024-06-05 14:34:45 +0000 devel/git: Fix build using SETENVI and WRK_ENV Followup needed changes after 572f23616926 and call upstream build scripts properly PR: 279527 Reported by: O. Hartmann MFH: 2024Q2 Sponsored by: Rubicon Communications, LLC ("Netgate") --- devel/git/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index ac58758f9044..fc1593d460b6 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,6 @@ PORTNAME= git DISTVERSION= 2.45.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -240,7 +241,8 @@ post-build: .if ${SUBPORT} == core post-build-CONTRIB-on: - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/contrib/diff-highlight + ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} \ + -C ${WRKSRC}/contrib/diff-highlight ${RM} ${WRKSRC}/contrib/diff-highlight/shebang.perl post-install: @@ -272,7 +274,7 @@ post-install-HTMLDOCS-on: ${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html post-install-SUBTREE-on: - cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \ + cd ${WRKSRC}/contrib/subtree && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \ ${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 \ ${MAKE_ARGS} install install-doc