From nobody Sun Feb 02 19:20:47 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YmKGm15dYz5mmmt; Sun, 02 Feb 2025 19:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmKGl56mVz3KM1; Sun, 02 Feb 2025 19:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738524047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ipXrFgGqI6l72yHWZUO60WsQ1qdc+oxEYlXWS1C51o=; b=jp47gwVU6Gw8dzYxlcXo3nPWGhf12JC8ftulom/I6wLn8FJ/a7e6BE0zYm44zXrkTww700 LpBDY09B0zyT7LudxzhuL7hhvazhYe2BqQdpmcOssKsNz8I5DO9k+D/ZMS/ZAPf7k3Xj9B IPTpVDO8pzV0VEaAxoM8RyKI9A5YJAnKxYGu2ct3wDGkX0UHe5MwVNJJSoiKQpnA8obtHi HX/A6l+ExOa9xJ3gff/mRPcNcgBbPr1bglQ0nnFlb/KpjY0PERDb4n3CF58MMp5rvQr60n HbnCCqI+V4CzgbGyF+MhTxPf/3Gjx1s87Qee4Jkul44rJiREQvggiyILOBj72g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738524047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ipXrFgGqI6l72yHWZUO60WsQ1qdc+oxEYlXWS1C51o=; b=X3nIBKdT73qRZAm2Q4iYEXK/C9v7VpCX5mcojzxkt7P8uqZ+XpxjwX0/Xs+spjKuVQ0DJ1 EdnKUUXlU/gBf2qUE6kTbzUOvV67AM6Cjl5R2f/9cKxWe9RlXVP7kyfGj8h47s9kX8VQG7 k1swnv+v58Jlv79N6D5mGmVhbNKxCPMFA6vqOzYFJmZ1pAj/FuNgpeoqlxOjU9P/2u+dHg +/3YYsN2XZiutunw1Gf8M39GyAH7FxQhdir3Il4xafBl56is5y0XUI9iwsf69iHSOw80i6 WKSf9Y2QJp1BXTgwI59oATnHMpzeuGSMIsPLJVXt92uIASEYuOpibqP1aIfD+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738524047; a=rsa-sha256; cv=none; b=babgJjUADZQQglxnLtzdRT4Bk6EcgpGt51yuTiOrbKFwdx7ws69GzhqVFYJj/aOYAb7bnd a9oRrr2uQRZsu35YiYGsT3Cx4dydabetm2tQl/eracv693tQNYv/XFhb3JrJN4cIYNqmRT VY/U1lJJgcofioRdnUIUFkqoXUlPQ2b9ygee1XkrudZb5twEsph/pzQLF5PRmkkjzFcbmT OxCv7FL4TO7kx/V8dsTEfdOl/Jh+2Vpud8KasQienQKNwEq7ZEKT9WyQfkIvFDIc499fMO 1BxhOrtuMfjf1ERWhsOXtmka3dmyDX5fDe134tk0njtCxgHDA602Cjpr8gtGUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YmKGl4cSVz12jQ; Sun, 02 Feb 2025 19:20:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 512JKla3087560; Sun, 2 Feb 2025 19:20:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 512JKlJa087557; Sun, 2 Feb 2025 19:20:47 GMT (envelope-from git) Date: Sun, 2 Feb 2025 19:20:47 GMT Message-Id: <202502021920.512JKlJa087557@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 179f17fc36fd - main - emulators/virtualbox-ose{,-additions,-kmod}{,-legacy}: Update CONFLICTS_INSTALL and PORTSCOUT before commit new ports with VirtualBox 7.0.x List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 179f17fc36fde67de42ba661b7b043e8d728578e Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=179f17fc36fde67de42ba661b7b043e8d728578e commit 179f17fc36fde67de42ba661b7b043e8d728578e Author: Vladimir Druzenko AuthorDate: 2025-02-02 19:15:13 +0000 Commit: Vladimir Druzenko 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} \