git: 1dfc4d117b71 - main - emulators/virtualbox-ose: Avoid overwriting slave ports OPTIONS_EXCLUDE

Guido Falsi madpilot at FreeBSD.org
Fri Sep 3 19:58:13 UTC 2021


The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1dfc4d117b71085ec0351310d6ee435622b53ada

commit 1dfc4d117b71085ec0351310d6ee435622b53ada
Author:     Guido Falsi <madpilot at FreeBSD.org>
AuthorDate: 2021-09-03 19:49:46 +0000
Commit:     Guido Falsi <madpilot at FreeBSD.org>
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)


More information about the dev-commits-ports-main mailing list