git: 60cacedb31ba - main - emulators/virtualbox-ose-additions-70: Update CONFLICTS_INSTALL
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Oct 2025 00:39:32 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=60cacedb31bac4cd121ee9d8de309242bfb3d5e5
commit 60cacedb31bac4cd121ee9d8de309242bfb3d5e5
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-10-25 00:38:17 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-10-25 00:38:17 +0000
emulators/virtualbox-ose-additions-70: Update CONFLICTS_INSTALL
---
emulators/virtualbox-ose-additions-70/Makefile | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/emulators/virtualbox-ose-additions-70/Makefile b/emulators/virtualbox-ose-additions-70/Makefile
index 4ad0c6e541fa..855c3f405b8e 100644
--- a/emulators/virtualbox-ose-additions-70/Makefile
+++ b/emulators/virtualbox-ose-additions-70/Makefile
@@ -37,10 +37,14 @@ CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}"
MAKE_JOBS_UNSAFE= yes
-CONFLICTS_INSTALL= virtualbox-ose-additions \
+CONFLICTS_INSTALL= virtualbox-ose-additions-legacy \
+ virtualbox-ose-additions-nox11-legacy \
+ virtualbox-ose-additions \
virtualbox-ose-additions-nox11 \
- virtualbox-ose-additions-legacy \
- virtualbox-ose-additions-nox11-legacy
+ virtualbox-ose-additions-71 \
+ virtualbox-ose-additions-nox11-71 \
+ virtualbox-ose-additions-72 \
+ virtualbox-ose-additions-nox11-72
PATCHDIR= ${.CURDIR}/../${PORTNAME}-70/files
EXTRACT_AFTER_ARGS= --exclude tools/*.x86 --exclude tools/*.amd64 --exclude Firmware