Date: Tue, 23 Dec 2025 16:40:48 +0000 From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 10e4b134fbf0 - main - math/calc: Stop conflicting with itself Message-ID: <694ac610.226b6.3b8f1256@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by adamw: URL: https://cgit.FreeBSD.org/ports/commit/?id=10e4b134fbf0da70600e44e8324bc39ae8c3b018 commit 10e4b134fbf0da70600e44e8324bc39ae8c3b018 Author: Adam Weinberger <adamw@FreeBSD.org> AuthorDate: 2025-12-23 16:30:11 +0000 Commit: Adam Weinberger <adamw@FreeBSD.org> CommitDate: 2025-12-23 16:40:45 +0000 math/calc: Stop conflicting with itself My initial hope was that pkg would identify and skip tautologies, and the tests I ran seemed to work at the time, but it doesn't work in practice. Instead, teach calc not to conflict with calc, and calc-tiny not to conflict with calc-tiny. --- math/calc/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/math/calc/Makefile b/math/calc/Makefile index 1511cc4d38c3..7b2bcec6b68b 100644 --- a/math/calc/Makefile +++ b/math/calc/Makefile @@ -1,5 +1,6 @@ PORTNAME= calc PORTVERSION= 2.16.0.2 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= math @@ -20,7 +21,7 @@ MAKE_ARGS= DATADIR="${DATADIR}" MAKE_JOBS_UNSAFE= yes TEST_TARGET= check -CONFLICTS_INSTALL= calc calc-tiny schilyutils +CONFLICTS_INSTALL= schilyutils PLIST_SUB+= VERSION=${PORTVERSION} VERSION_R=${PORTVERSION:R} OPTIONS_DEFINE= FULL HELP @@ -35,6 +36,9 @@ PKGNAMESUFFIX= -tiny MAKE_ENV+= BLD_TYPE=calc-static-only PLIST_FILES= bin/calc PLIST= # Use only PLIST_FILES +CONFLICTS_INSTALL+= calc +.else +CONFLICTS_INSTALL+= calc-tiny .endif .include <bsd.port.pre.mk>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?694ac610.226b6.3b8f1256>