From nobody Thu Feb 01 23:00:18 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 4TQvWQ3Jg4z58s6y; Thu, 1 Feb 2024 23:00:18 +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 4TQvWQ2fCCz4qLH; Thu, 1 Feb 2024 23:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706828418; 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=003HeOd0jv8N6nTuXE6W4PUWRQHbBKH/FK/65zbZVBQ=; b=LTzNYIY4LfWJoH0laz3MWkUjuTZZrKr+RBDdmAjMSVNr3LhGNl5KYldpoYwm72mdaQa6YH ZbltE/niSdv8RxpwrgzuAIBtT/YeFNkxtJo563KhKRY1KeoCdFKX063ZDICyfmbhSjsubq f/9DrmEhgLkBYO50s+iEOxpx6hfBEYDpipJXgIu8U02nl2mWaBKivg/RY35lyh6/6LEaKz JnTFYmnV2Om+QZrEb41e7xrnKT3SBxt+/zpLm5rnRdvXCQYoK3/CdSZXfjTqlHlA8lcjFH FCeiMS4BMbB1SkyYolgujwoqWi7LrQpKia7g8DtlFHb+ve1InbGB+oKekPjycg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706828418; 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=003HeOd0jv8N6nTuXE6W4PUWRQHbBKH/FK/65zbZVBQ=; b=bwNHUgThkpoeGtI2IyGNoghwB3PA8iUX4Qg+bXeFnghPaIuuE4S3/y5w8p3mB0mKPmhjd/ UPLBPO3d8S33M7B3Gn6R4YOsQCThNeFqQ++B0uKvy4l5Bl1GBHwdwaiAhod+FLFXi+8Ul8 w3fN10oBV3KIs6uYVaN6CsdfyTqiOfWvNQPDx7f3iA0+I2VBveQimONEShY92vOlhDyTp6 vT8JAxpeWrs/SL7qtiGMi9qoprF2BC+AfeeiwSt5wKBBr0JWH1ymmgmhVG8SG5uzYYgZug DI+xvaPuZQYKsiRIC/gucJnk+uDvM1+Z23HtgJ6jfZrOZpYj/+9SaLC2nTGjhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706828418; a=rsa-sha256; cv=none; b=nBxUqT0atIAzAcCHk7Q0qzZIHUCn8xNxWLsZbGFa3NeLbOSjdpqm1tQ4MZQ7dvRZofwe3E 6FagEHesx7jI8X9TfoG6h3JZmwRq0OAihkJP0nf/G5THWGRzOvIBShMOo1A1B6J0zJdGej kwd8MdB7qCT97vbPRunAN1ix1QeBYgmYeRGzyjdIlBQEdf6YLGhbUncxdDNXZ7XIA4EC6Y P6Au/unUTDXD6VCsG1j2ZWkqaTnLOqBr7NO+wXQO0pqAm+Hq+XqDb6TEEl55sgo3AGrNTU z/5VbVmdViqCyd+9vQzPfqzYVyT5V4W1KPL/dfY0ADOl5+ansejwKPRoqy/Klg== 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 4TQvWQ1hdkz1KfX; Thu, 1 Feb 2024 23:00:18 +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 411N0I6Q033161; Thu, 1 Feb 2024 23:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411N0IZd033152; Thu, 1 Feb 2024 23:00:18 GMT (envelope-from git) Date: Thu, 1 Feb 2024 23:00:18 GMT Message-Id: <202402012300.411N0IZd033152@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 855dce6bdda8 - main - sysutils/e2fsprogs: handle PORTREVISION==0 in *_DEPENDS 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 855dce6bdda8eef359d09383e65530514932ac54 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=855dce6bdda8eef359d09383e65530514932ac54 commit 855dce6bdda8eef359d09383e65530514932ac54 Author: Matthias Andree AuthorDate: 2024-02-01 22:57:33 +0000 Commit: Matthias Andree CommitDate: 2024-02-01 22:57:33 +0000 sysutils/e2fsprogs: handle PORTREVISION==0 in *_DEPENDS Else we would depend on, say, e2fsprogs-core-1.48.0_ (trailing underscore) character when PORTREVISION was zeroed or omitted. (Note that bsd.port.mk will default it to 0 value). Use make(1)'s varname:?trueval:falseval: expansion to guard the expansion. (_SUF1 is private in bsd.port.mk, let's avoid that). Reported by: Tomoaki AOKI PR: 276643 --- sysutils/e2fsprogs/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index 3a6f004f37ed..ed7eaaf3965f 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -2,7 +2,7 @@ PORTNAME= e2fsprogs CATEGORIES= sysutils PORTVERSION= 1.47.0 PORTREVISION= 1 -BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}_${PORTREVISION}:sysutils/e2fsprogs-core +BUILD_DEPENDS= e2fsprogs-core=${PORTVERSION}${${PORTREVISION} > 0:?_${PORTREVISION}:}:sysutils/e2fsprogs-core RUN_DEPENDS= ${BUILD_DEPENDS} DISTFILES= # empty NO_BUILD= yes