From nobody Tue May 13 18:40:43 2025 X-Original-To: dev-commits-ports-all@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 4ZxlfN1qgnz5vmsd; Tue, 13 May 2025 18:40:44 +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 4ZxlfN10WHz3hZP; Tue, 13 May 2025 18:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747161644; 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=Pi04dOr2MdYIM81DVdbsF6FjPYuXTrqe4cgut/8MyGM=; b=toomfkIVscebxetmMJj7dQ9lnHDyNiEdvPHufpbtKk0qPWcJar4ZxS88XMTdmdajfdZW9O CXTCxGPZSf9Cwv1m+7mLNrvmbYUcIcuwzLBYA/QEy/7cLfkFnlcBBLBLGaMgX5prxVU1u2 rlxbVR9BE6ZiZeJz2ttXT8Up0M7dcNGNA1T8XX+CMAjG88gIU71xHXaq3tyxTgCFqdaK8u zcdF+t16AC1VS/DKxx9KuJmxtB4N2pIBKvGV2KBNs+xqGDxsLxpL3P8MLsRw4eVavfMCIc jlVgxvUUGt/qakwRS1iCBjpnjEUv2YgBcJu8baTCH+xZTfd6xdCTC+/jhBYKxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747161644; 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=Pi04dOr2MdYIM81DVdbsF6FjPYuXTrqe4cgut/8MyGM=; b=vIHFa75gqfgvAo5mUrB9Zrza+18sFzvZPH1RDvzbqqtZfd0F3+QunPb9j5K3blat5tx+4i daaw3jYliL4/BzAuIUqQ2Vop5SeTcoHe389klu+abZtEPBT/f+xS2h7LaIrZViL25ogyRL ViHpdUg0oQ4e58z3N2CjAfEMdEseyjNkEsaD2Jdir31PzP5iwNt6AlO61a2TBO3Zm/m0ct qgg6AHjTnWt8ltUZOc4Ov+B0iVeslVCEwBhgVYn59plWhP2tH0SRvlam49kskbpDsUXwOL pAcNrfkmdFGQptRu9yCpfRKeDQWkn7iL/SIu2tGiy1yi3uX76ZMNdS61xdecrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747161644; a=rsa-sha256; cv=none; b=Mqz4LWxPATbJAecMoSAKOCiZOGp+CnLnjm2jcgYoQvah4nd8enxh/VzPS7cALou6r+2IMy SDFlhWKW3nZuEABxl0wmJ4BTRidbkKQOnW/eoq9uWibBeWIupb75QBwydf1s5aay3vZjJw em3YDM9JevXwYKbg4dtnD71O8Hd3NwAKOYrkux769MHF4Q9KykeY4Nlne9qIgWyUYntXwC CZsiI90jJ3EWfdPyEGWgN4kSEEDEK1gBVXNd4mrg2DCK26fw1NkW50iWpoawIUJMyZHpOc RCeLYG8we5cVh92NFB4t0XotrS2Tw+1vdy/R/eTOvlvB3dX9flxkN6qYbGZ2cA== 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 4ZxlfN0ZTBzyMN; Tue, 13 May 2025 18:40:44 +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 54DIehQn042265; Tue, 13 May 2025 18:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54DIehpC042262; Tue, 13 May 2025 18:40:43 GMT (envelope-from git) Date: Tue, 13 May 2025 18:40:43 GMT Message-Id: <202505131840.54DIehpC042262@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 96a498cc9e18 - 2025Q2 - emulators/virtualbox-ose{,-additions,-kmod}{,-70,-legacy}: Update CONFLICTS_INSTALL before committing new ports with VirtualBox 7.1.x List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2025Q2 X-Git-Reftype: branch X-Git-Commit: 96a498cc9e18ce14d6ea31eecc101f9aafa64ed2 Auto-Submitted: auto-generated The branch 2025Q2 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=96a498cc9e18ce14d6ea31eecc101f9aafa64ed2 commit 96a498cc9e18ce14d6ea31eecc101f9aafa64ed2 Author: Vladimir Druzenko AuthorDate: 2025-05-11 01:02:57 +0000 Commit: Vladimir Druzenko 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