Date: Thu, 1 Feb 2024 23:00:18 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 855dce6bdda8 - main - sysutils/e2fsprogs: handle PORTREVISION==0 in *_DEPENDS Message-ID: <202402012300.411N0IZd033152@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=855dce6bdda8eef359d09383e65530514932ac54 commit 855dce6bdda8eef359d09383e65530514932ac54 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2024-02-01 22:57:33 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402012300.411N0IZd033152>