From owner-dev-commits-ports-main@freebsd.org Fri Sep 3 19:58:13 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69F2A67C99E; Fri, 3 Sep 2021 19:58:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H1T9x2B0rz3JWG; Fri, 3 Sep 2021 19:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 22537234E; Fri, 3 Sep 2021 19:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 183JwDlj016580; Fri, 3 Sep 2021 19:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 183JwDSu016579; Fri, 3 Sep 2021 19:58:13 GMT (envelope-from git) Date: Fri, 3 Sep 2021 19:58:13 GMT Message-Id: <202109031958.183JwDSu016579@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 1dfc4d117b71 - main - emulators/virtualbox-ose: Avoid overwriting slave ports OPTIONS_EXCLUDE MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dfc4d117b71085ec0351310d6ee435622b53ada Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Sep 2021 19:58:13 -0000 The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=1dfc4d117b71085ec0351310d6ee435622b53ada commit 1dfc4d117b71085ec0351310d6ee435622b53ada Author: Guido Falsi AuthorDate: 2021-09-03 19:49:46 +0000 Commit: Guido Falsi CommitDate: 2021-09-03 19:58:08 +0000 emulators/virtualbox-ose: Avoid overwriting slave ports OPTIONS_EXCLUDE To disable the PULSEAUDIO option I used the OPTIONS_EXCLUDE variable in commit 416b34d584e268. Turns out this overwrites OPTIONS_EXCLUDE from slave ports. I'm fixing this by only adding the PULSEAUDIO exclusion to the existing EXCLUDE variable if defined. NOTE: While it would be enough to bump PORTREVISION in the slave port, I'm bumping PORTREVISION on master port to avoid adding variables that are easily forgotten in future changes and could cause even more breakage. PR: 258256 Pointy Hat: myself --- emulators/virtualbox-ose/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index af6e998b9676..80cb68c32315 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -2,6 +2,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 6.1.26 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} @@ -57,7 +58,7 @@ OPTIONS_DEFINE= AIO ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \ OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 # Since version 6.1.24 pulseaudio is broken at runtime, preventing # virtual machines from starting if configured to use it. -OPTIONS_EXCLUDE= PULSEAUDIO +OPTIONS_EXCLUDE+= PULSEAUDIO OPTIONS_SUB= yes AIO_DESC= Enable Asyncronous IO support (check pkg-message)