git: 905bef7a6630 - 2025Q1 - emulators/virtualbox-ose{,-nox11}-legacy: Fix PYTHON in DEFAULT_OPTIONS, return clearing of ENV
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 18 Jan 2025 20:27:22 UTC
The branch 2025Q1 has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=905bef7a663061c2604b2b097b1b8400393de30c
commit 905bef7a663061c2604b2b097b1b8400393de30c
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-01-18 19:51:23 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-01-18 20:27:06 +0000
emulators/virtualbox-ose{,-nox11}-legacy: Fix PYTHON in DEFAULT_OPTIONS, return clearing of ENV
MFH: 2025Q1
(cherry picked from commit 8d2e646b54ae40f7935f080103d73ae5d525537a)
---
emulators/virtualbox-ose-legacy/Makefile | 9 +++++++--
emulators/virtualbox-ose-nox11-legacy/Makefile | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index b611471a27c4..bd18a1694f9b 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -1,6 +1,6 @@
PORTNAME= virtualbox-ose
DISTVERSION= 5.2.44
-PORTREVISION?= 25
+PORTREVISION?= 26
CATEGORIES= emulators
MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \
LOCAL/bofh/emulators/virtualbox-ose-legacy:docs
@@ -71,6 +71,9 @@ PLIST_SUB= GUEST_VER=${DISTVERSION} \
OPTIONS_DEFINE= ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS PULSEAUDIO \
PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
+.if ${SLAVE_PORT} == no
+OPTIONS_DEFAULT+= PYTHON
+.endif
OPTIONS_SUB= yes
DEBUG_DESC= Debug symbols, additional logs and assertions
@@ -116,11 +119,13 @@ X11_USES= sdl xorg
X11_USE= SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt
X11_CONFIGURE_OFF= --build-headless
+ENV=
+.export ENV
+
.include <bsd.port.options.mk>
.if ${SLAVE_PORT} == no
CONFLICTS_INSTALL+= virtualbox-ose-nox11-legacy
-OPTIONS_DEFAULT+= PYTHON
.else
CONFLICTS_INSTALL+= virtualbox-ose-legacy
.endif
diff --git a/emulators/virtualbox-ose-nox11-legacy/Makefile b/emulators/virtualbox-ose-nox11-legacy/Makefile
index 393e93999c31..b4ec649c321a 100644
--- a/emulators/virtualbox-ose-nox11-legacy/Makefile
+++ b/emulators/virtualbox-ose-nox11-legacy/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION= 25
+PORTREVISION= 26
PKGNAMESUFFIX= -nox11-legacy
MASTERDIR= ${.CURDIR}/../virtualbox-ose-legacy