git: 179f17fc36fd - main - emulators/virtualbox-ose{,-additions,-kmod}{,-legacy}: Update CONFLICTS_INSTALL and PORTSCOUT before commit new ports with VirtualBox 7.0.x

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=179f17fc36fde67de42ba661b7b043e8d728578e

commit 179f17fc36fde67de42ba661b7b043e8d728578e
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-02-02 19:15:13 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-02-02 19:15:13 +0000

    emulators/virtualbox-ose{,-additions,-kmod}{,-legacy}: Update CONFLICTS_INSTALL and PORTSCOUT before commit new ports with VirtualBox 7.0.x
    
    PR:     271146
---
 emulators/virtualbox-ose-additions-legacy/Makefile | 4 +++-
 emulators/virtualbox-ose-additions/Makefile        | 5 ++++-
 emulators/virtualbox-ose-kmod-legacy/Makefile      | 3 ++-
 emulators/virtualbox-ose-kmod/Makefile             | 4 +++-
 emulators/virtualbox-ose-legacy/Makefile           | 4 +++-
 emulators/virtualbox-ose/Makefile                  | 5 ++++-
 6 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile
index 44ded329e282..a4c09636c070 100644
--- a/emulators/virtualbox-ose-additions-legacy/Makefile
+++ b/emulators/virtualbox-ose-additions-legacy/Makefile
@@ -38,7 +38,9 @@ CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS_INSTALL=	virtualbox-ose-additions \
-			virtualbox-ose-additions-nox11
+			virtualbox-ose-additions-nox11 \
+			virtualbox-ose-additions-70 \
+			virtualbox-ose-additions-nox11-70
 
 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 744878d43317..b724757cd1df 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -38,10 +38,13 @@ CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 MAKE_JOBS_UNSAFE=	yes
 
 CONFLICTS_INSTALL=	virtualbox-ose-additions-legacy \
-			virtualbox-ose-additions-nox11-legacy
+			virtualbox-ose-additions-nox11-legacy \
+			virtualbox-ose-additions-70 \
+			virtualbox-ose-additions-nox11-70
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 --exclude tools/*.amd64 --exclude Firmware
+PORTSCOUT=		limit:^6\.
 
 WRKSRC=			${WRKDIR}/VirtualBox-${DISTVERSION}
 
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index 418abd8da945..da9ca28e61c8 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -34,7 +34,8 @@ CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
-CONFLICTS_INSTALL=	virtualbox-ose-kmod
+CONFLICTS_INSTALL=	virtualbox-ose-kmod \
+			virtualbox-ose-kmod-70
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}-legacy/files
 PORTSCOUT=		limit:^5\.
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index 252ba10585de..9bbd0e6d5fa6 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -34,9 +34,11 @@ CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
-CONFLICTS_INSTALL=	virtualbox-ose-kmod-legacy
+CONFLICTS_INSTALL=	virtualbox-ose-kmod-legacy \
+			virtualbox-ose-kmod-70
 
 PATCHDIR=		${.CURDIR}/../${PORTNAME}/files
+PORTSCOUT=		limit:^6\.
 SUB_FILES=		pkg-message
 SUB_LIST=		OPSYS=${OPSYS} OSREL=${OSREL}
 
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 3452686ce26f..eda612ba35ee 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -40,7 +40,9 @@ CONFIGURE_ARGS=		--disable-java --passive-mesa --disable-docs
 CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose \
-			virtualbox-ose-nox11
+			virtualbox-ose-nox11 \
+			virtualbox-ose-70 \
+			virtualbox-ose-nox11-70
 
 PORTSCOUT=	limit:^5\.
 SUB_LIST=	VBOXDIR=${VBOX_DIR} \
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index ce6fe1e095a2..fdd678179189 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -38,8 +38,11 @@ CONFIGURE_ARGS=		--disable-java --passive-mesa --disable-docs
 CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-legacy \
-			virtualbox-ose-nox11-legacy
+			virtualbox-ose-nox11-legacy \
+			virtualbox-ose-70 \
+			virtualbox-ose-nox11-70
 
+PORTSCOUT=	limit:^6\.
 SUB_FILES=	pkg-message
 SUB_LIST=	VBOXDIR=${VBOX_DIR} \
 		VBOX_ETC=${VBOX_ETC} \