git: 96a498cc9e18 - 2025Q2 - emulators/virtualbox-ose{,-additions,-kmod}{,-70,-legacy}: Update CONFLICTS_INSTALL before committing new ports with VirtualBox 7.1.x

The branch 2025Q2 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=96a498cc9e18ce14d6ea31eecc101f9aafa64ed2

commit 96a498cc9e18ce14d6ea31eecc101f9aafa64ed2
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-05-11 01:02:57 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-13 18:37:20 +0000

    emulators/virtualbox-ose{,-additions,-kmod}{,-70,-legacy}: Update CONFLICTS_INSTALL before committing new ports with VirtualBox 7.1.x
    
    PR:     284439
    (cherry picked from commit 806da99dc22608ce8ff9e87903fcbc1fb4a2ab8d)
---
 emulators/virtualbox-ose-70/Makefile               | 4 +++-
 emulators/virtualbox-ose-additions-legacy/Makefile | 4 +++-
 emulators/virtualbox-ose-additions/Makefile        | 4 +++-
 emulators/virtualbox-ose-kmod-70/Makefile          | 5 +++--
 emulators/virtualbox-ose-kmod-legacy/Makefile      | 3 ++-
 emulators/virtualbox-ose-kmod/Makefile             | 3 ++-
 emulators/virtualbox-ose-legacy/Makefile           | 4 +++-
 emulators/virtualbox-ose/Makefile                  | 4 +++-
 8 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/emulators/virtualbox-ose-70/Makefile b/emulators/virtualbox-ose-70/Makefile
index c1823c5bd1a5..6ba801e71daf 100644
--- a/emulators/virtualbox-ose-70/Makefile
+++ b/emulators/virtualbox-ose-70/Makefile
@@ -43,7 +43,9 @@ CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 CONFLICTS_INSTALL=	virtualbox-ose-legacy \
 			virtualbox-ose-nox11-legacy \
 			virtualbox-ose \
-			virtualbox-ose-nox11
+			virtualbox-ose-nox11 \
+			virtualbox-ose-70 \
+			virtualbox-ose-nox11-70
 
 PORTSCOUT=	limit:^7\.0\.
 SUB_FILES=	pkg-message
diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile
index 2b3dc9f5941c..eb2767e9c7dc 100644
--- a/emulators/virtualbox-ose-additions-legacy/Makefile
+++ b/emulators/virtualbox-ose-additions-legacy/Makefile
@@ -40,7 +40,9 @@ MAKE_JOBS_UNSAFE=	yes
 CONFLICTS_INSTALL=	virtualbox-ose-additions \
 			virtualbox-ose-additions-nox11 \
 			virtualbox-ose-additions-70 \
-			virtualbox-ose-additions-nox11-70
+			virtualbox-ose-additions-nox11-70 \
+			virtualbox-ose-additions-71 \
+			virtualbox-ose-additions-nox11-71
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}-legacy/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 --exclude tools/*.amd64 --exclude Firmware
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 8be00b188670..395ad0a8517d 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -40,7 +40,9 @@ MAKE_JOBS_UNSAFE=	yes
 CONFLICTS_INSTALL=	virtualbox-ose-additions-legacy \
 			virtualbox-ose-additions-nox11-legacy \
 			virtualbox-ose-additions-70 \
-			virtualbox-ose-additions-nox11-70
+			virtualbox-ose-additions-nox11-70 \
+			virtualbox-ose-additions-71 \
+			virtualbox-ose-additions-nox11-71
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 --exclude tools/*.amd64 --exclude Firmware
diff --git a/emulators/virtualbox-ose-kmod-70/Makefile b/emulators/virtualbox-ose-kmod-70/Makefile
index ce9164751791..4ad6ad62ca85 100644
--- a/emulators/virtualbox-ose-kmod-70/Makefile
+++ b/emulators/virtualbox-ose-kmod-70/Makefile
@@ -33,8 +33,9 @@ CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
-CONFLICTS_INSTALL=	virtualbox-ose-kmod \
-			virtualbox-ose-kmod-legacy
+CONFLICTS_INSTALL=	virtualbox-ose-kmod-legacy \
+			virtualbox-ose-kmod \
+			virtualbox-ose-kmod-71
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}-70/files
 PORTSCOUT=		limit:^7\.0\.
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index da9ca28e61c8..c3770f902d8e 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -35,7 +35,8 @@ CONFIGURE_ARGS+=	--disable-alsa \
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-kmod \
-			virtualbox-ose-kmod-70
+			virtualbox-ose-kmod-70 \
+			virtualbox-ose-kmod-71
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}-legacy/files
 PORTSCOUT=		limit:^5\.
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 9bbd0e6d5fa6..28f57d2c777c 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -35,7 +35,8 @@ CONFIGURE_ARGS+=	--disable-alsa \
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-kmod-legacy \
-			virtualbox-ose-kmod-70
+			virtualbox-ose-kmod-70 \
+			virtualbox-ose-kmod-71
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}/files
 PORTSCOUT=		limit:^6\.
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 65b639ce52f0..43b3760e55d1 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -42,7 +42,9 @@ CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 CONFLICTS_INSTALL=	virtualbox-ose \
 			virtualbox-ose-nox11 \
 			virtualbox-ose-70 \
-			virtualbox-ose-nox11-70
+			virtualbox-ose-nox11-70 \
+			virtualbox-ose-71 \
+			virtualbox-ose-nox11-71
 
 PORTSCOUT=	limit:^5\.
 SUB_LIST=	VBOXDIR=${VBOX_DIR} \
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 8e6d0f8ba790..101b19ebd385 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -40,7 +40,9 @@ CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 CONFLICTS_INSTALL=	virtualbox-ose-legacy \
 			virtualbox-ose-nox11-legacy \
 			virtualbox-ose-70 \
-			virtualbox-ose-nox11-70
+			virtualbox-ose-nox11-70 \
+			virtualbox-ose-71 \
+			virtualbox-ose-nox11-71
 
 PORTSCOUT=	limit:^6\.
 SUB_FILES=	pkg-message