Date: Fri, 01 May 2026 02:21:24 +0000 From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7c406bf706c9 - main - emulators/virtualbox-ose*: Flavorize Message-ID: <69f40e24.3f5b1.2145b6f2@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c406bf706c97c9cb4d23f6628306a36dda39398 commit 7c406bf706c97c9cb4d23f6628306a36dda39398 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2026-05-01 02:18:11 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2026-05-01 02:21:12 +0000 emulators/virtualbox-ose*: Flavorize While here make non-functional changes related to indentation and formatting, make simplification of CONFLICTS_INSTALL. Sponsored by: UNIS Labs --- MOVED | 5 +++ emulators/Makefile | 5 --- emulators/virtualbox-ose-70/Makefile | 46 +++++++++++------------- emulators/virtualbox-ose-71/Makefile | 49 ++++++++++++-------------- emulators/virtualbox-ose-72/Makefile | 49 ++++++++++++-------------- emulators/virtualbox-ose-legacy/Makefile | 49 ++++++++++++-------------- emulators/virtualbox-ose-nox11-70/Makefile | 11 ------ emulators/virtualbox-ose-nox11-71/Makefile | 11 ------ emulators/virtualbox-ose-nox11-72/Makefile | 11 ------ emulators/virtualbox-ose-nox11-legacy/Makefile | 11 ------ emulators/virtualbox-ose-nox11/Makefile | 11 ------ emulators/virtualbox-ose/Makefile | 48 ++++++++++++------------- 12 files changed, 118 insertions(+), 188 deletions(-) diff --git a/MOVED b/MOVED index 5926812841b4..dada2652594b 100644 --- a/MOVED +++ b/MOVED @@ -5258,3 +5258,8 @@ emulators/virtualbox-ose-additions-nox11|emulators/virtualbox-ose-additions@nox1 emulators/virtualbox-ose-additions-nox11-70|emulators/virtualbox-ose-additions-70@nox11|2026-04-30|Converted to a flavorized port emulators/virtualbox-ose-additions-nox11-71|emulators/virtualbox-ose-additions-71@nox11|2026-04-30|Converted to a flavorized port emulators/virtualbox-ose-additions-nox11-72|emulators/virtualbox-ose-additions-72@nox11|2026-04-30|Converted to a flavorized port +emulators/virtualbox-ose-nox11-legacy|emulators/virtualbox-ose-legacy@nox11|2026-04-30|Converted to a flavorized port +emulators/virtualbox-ose-nox11|emulators/virtualbox-ose@nox11|2026-04-30|Converted to a flavorized port +emulators/virtualbox-ose-nox11-70|emulators/virtualbox-ose-70@nox11|2026-04-30|Converted to a flavorized port +emulators/virtualbox-ose-nox11-71|emulators/virtualbox-ose-71@nox11|2026-04-30|Converted to a flavorized port +emulators/virtualbox-ose-nox11-72|emulators/virtualbox-ose-72@nox11|2026-04-30|Converted to a flavorized port diff --git a/emulators/Makefile b/emulators/Makefile index a3bfec80e00b..33ea84db8440 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -172,11 +172,6 @@ SUBDIR += virtualbox-ose-kmod-72 SUBDIR += virtualbox-ose-kmod-legacy SUBDIR += virtualbox-ose-legacy - SUBDIR += virtualbox-ose-nox11 - SUBDIR += virtualbox-ose-nox11-70 - SUBDIR += virtualbox-ose-nox11-71 - SUBDIR += virtualbox-ose-nox11-72 - SUBDIR += virtualbox-ose-nox11-legacy SUBDIR += visualboyadvance-m SUBDIR += vmips SUBDIR += vmsbackup diff --git a/emulators/virtualbox-ose-70/Makefile b/emulators/virtualbox-ose-70/Makefile index f4f6dd625723..02bc5f178f1d 100644 --- a/emulators/virtualbox-ose-70/Makefile +++ b/emulators/virtualbox-ose-70/Makefile @@ -1,10 +1,9 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.0.26 -PORTREVISION?= 7 +PORTREVISION= 8 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/vvd:docs -PKGNAMESUFFIX?= -70 DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \ @@ -31,6 +30,11 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-70 +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +_VER= ${DISTVERSION:R:S|.||} +${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} + USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox @@ -38,18 +42,16 @@ USE_BINUTILS= yes USE_GNOME= libxml2 USE_RC_SUBR= vboxheadless vboxwatchdog -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --disable-java --passive-mesa --disable-docs -CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs \ + --disable-java \ + --passive-mesa \ + --with-gcc="${CC}" \ + --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-legacy \ - virtualbox-ose-nox11-legacy \ - virtualbox-ose \ - virtualbox-ose-nox11 \ - virtualbox-ose-71 \ - virtualbox-ose-nox11-71 \ - virtualbox-ose-72 \ - virtualbox-ose-nox11-72 +_VERSIONS= _-legacy _ _-70 _-71 _-72 +CONFLICTS_INSTALL= ${_VERSIONS:S|_|${PORTNAME}|} \ + ${_VERSIONS:S|_|${PORTNAME}-nox11|} EXTRACT_AFTER_ARGS= --exclude kBuild/bin \ --no-same-owner --no-same-permissions @@ -85,15 +87,15 @@ PLIST_SUB= GUEST_VER=${DISTVERSION} \ PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \ VBOXGROUP=${VBOXGROUP} -SLAVE_PORT?= no - OPTIONS_DEFINE= AIO ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS OGG \ PULSEAUDIO PYTHON QT5 R0LOGGING TPM UDPTUNNEL VBOXIMG \ VDE VNC VORBIS VPX WEBSERVICE X11 -OPTIONS_DEFAULT= AIO DBUS QT5 TPM UDPTUNNEL VNC WEBSERVICE X11 -.if ${SLAVE_PORT} == no -OPTIONS_DEFAULT+= PYTHON -.endif +OPTIONS_DEFAULT_x11= PYTHON +OPTIONS_DEFAULT= AIO DBUS QT5 TPM UDPTUNNEL VNC WEBSERVICE X11 \ + ${OPTIONS_DEFAULT_${FLAVOR}} +OPTIONS_EXCLUDE_nox11= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS OGG PULSEAUDIO \ + QT5 VORBIS VPX X11 +OPTIONS_EXCLUDE= ${OPTIONS_EXCLUDE_${FLAVOR}} # Since version 6.1.24 pulseaudio is broken at runtime, preventing # virtual machines from starting if configured to use it. OPTIONS_EXCLUDE+= PULSEAUDIO @@ -160,12 +162,6 @@ ENV= .include <bsd.port.options.mk> -.if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11-70 -.else -CONFLICTS_INSTALL+= virtualbox-ose-70 -.endif - .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug KMK_FLAGS+= BUILD_TYPE=debug diff --git a/emulators/virtualbox-ose-71/Makefile b/emulators/virtualbox-ose-71/Makefile index d33f74199c65..1a5533cbe366 100644 --- a/emulators/virtualbox-ose-71/Makefile +++ b/emulators/virtualbox-ose-71/Makefile @@ -1,10 +1,9 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.1.18 -PORTREVISION?= 0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/vvd:docs -PKGNAMESUFFIX?= -71 DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \ @@ -34,6 +33,11 @@ LIB_DEPENDS= libpng.so:graphics/png \ libvpx.so:multimedia/libvpx RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-71 +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +_VER= ${DISTVERSION:R:S|.||} +${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} + USES= compiler:c++17-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox @@ -41,19 +45,18 @@ USE_BINUTILS= yes USE_GNOME= libxml2 USE_RC_SUBR= vboxheadless vboxwatchdog -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-docs --disable-java \ - --enable-libogg --enable-libvorbis --passive-mesa \ - --with-gcc="${CC}" --with-g++="${CXX}" +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs \ + --disable-java \ + --enable-libogg \ + --enable-libvorbis \ + --passive-mesa \ + --with-gcc="${CC}" \ + --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-legacy \ - virtualbox-ose-nox11-legacy \ - virtualbox-ose \ - virtualbox-ose-nox11 \ - virtualbox-ose-70 \ - virtualbox-ose-nox11-70 \ - virtualbox-ose-72 \ - virtualbox-ose-nox11-72 +_VERSIONS= _-legacy _ _-70 _-71 _-72 +CONFLICTS_INSTALL= ${_VERSIONS:S|_|${PORTNAME}|} \ + ${_VERSIONS:S|_|${PORTNAME}-nox11|} EXTRACT_AFTER_ARGS= --exclude kBuild/bin \ --no-same-owner --no-same-permissions @@ -89,15 +92,15 @@ PLIST_SUB= GUEST_VER=${DISTVERSION} \ PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \ VBOXGROUP=${VBOXGROUP} -SLAVE_PORT?= no - OPTIONS_DEFINE= AIO ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS \ PULSEAUDIO PYTHON QT6 R0LOGGING TPM UDPTUNNEL VBOXIMG \ VDE VNC WEBSERVICE X11 -OPTIONS_DEFAULT= AIO DBUS QT6 TPM UDPTUNNEL VNC WEBSERVICE X11 -.if ${SLAVE_PORT} == no -OPTIONS_DEFAULT+= PYTHON -.endif +OPTIONS_DEFAULT_x11= PYTHON +OPTIONS_DEFAULT= AIO DBUS QT6 TPM UDPTUNNEL VNC WEBSERVICE X11 \ + ${OPTIONS_DEFAULT_${FLAVOR}} +OPTIONS_EXCLUDE_nox11= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ + QT6 X11 +OPTIONS_EXCLUDE= ${OPTIONS_EXCLUDE_${FLAVOR}} # Since version 6.1.24 pulseaudio is broken at runtime, preventing # virtual machines from starting if configured to use it. OPTIONS_EXCLUDE+= PULSEAUDIO @@ -153,12 +156,6 @@ ENV= .include <bsd.port.options.mk> -.if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11-71 -.else -CONFLICTS_INSTALL+= virtualbox-ose-71 -.endif - .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug KMK_FLAGS+= BUILD_TYPE=debug diff --git a/emulators/virtualbox-ose-72/Makefile b/emulators/virtualbox-ose-72/Makefile index 8f35d3cd2bc9..2ef7eed613eb 100644 --- a/emulators/virtualbox-ose-72/Makefile +++ b/emulators/virtualbox-ose-72/Makefile @@ -1,10 +1,9 @@ PORTNAME= virtualbox-ose DISTVERSION= 7.2.8 -PORTREVISION?= 0 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ LOCAL/vvd:docs -PKGNAMESUFFIX?= -72 DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \ @@ -32,6 +31,11 @@ LIB_DEPENDS= libpng.so:graphics/png \ libvpx.so:multimedia/libvpx RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-72 +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +_VER= ${DISTVERSION:R:S|.||} +${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} + USES= compiler:c++17-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox @@ -39,19 +43,18 @@ USE_BINUTILS= yes USE_GNOME= libxml2 USE_RC_SUBR= vboxheadless vboxwatchdog -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --disable-docs --disable-java \ - --enable-libogg --enable-libvorbis --passive-mesa \ - --with-gcc="${CC}" --with-g++="${CXX}" +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs \ + --disable-java \ + --enable-libogg \ + --enable-libvorbis \ + --passive-mesa \ + --with-gcc="${CC}" \ + --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-legacy \ - virtualbox-ose-nox11-legacy \ - virtualbox-ose \ - virtualbox-ose-nox11 \ - virtualbox-ose-70 \ - virtualbox-ose-nox11-70 \ - virtualbox-ose-71 \ - virtualbox-ose-nox11-71 +_VERSIONS= _-legacy _ _-70 _-71 _-72 +CONFLICTS_INSTALL= ${_VERSIONS:S|_|${PORTNAME}|} \ + ${_VERSIONS:S|_|${PORTNAME}-nox11|} EXTRACT_AFTER_ARGS= --exclude kBuild/bin \ --no-same-owner --no-same-permissions @@ -87,15 +90,15 @@ PLIST_SUB= GUEST_VER=${DISTVERSION} \ PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \ VBOXGROUP=${VBOXGROUP} -SLAVE_PORT?= no - OPTIONS_DEFINE= AIO ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS \ PULSEAUDIO PYTHON QT6 R0LOGGING TPM UDPTUNNEL VBOXIMG \ VDE VNC WEBSERVICE X11 -OPTIONS_DEFAULT= AIO DBUS QT6 TPM UDPTUNNEL VNC WEBSERVICE X11 -.if ${SLAVE_PORT} == no -OPTIONS_DEFAULT+= PYTHON -.endif +OPTIONS_DEFAULT_x11= PYTHON +OPTIONS_DEFAULT= AIO DBUS QT6 TPM UDPTUNNEL VNC WEBSERVICE X11 \ + ${OPTIONS_DEFAULT_${FLAVOR}} +OPTIONS_EXCLUDE_nox11= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ + QT6 X11 +OPTIONS_EXCLUDE= ${OPTIONS_EXCLUDE_${FLAVOR}} # Since version 6.1.24 pulseaudio is broken at runtime, preventing # virtual machines from starting if configured to use it. OPTIONS_EXCLUDE+= PULSEAUDIO @@ -151,12 +154,6 @@ ENV= .include <bsd.port.options.mk> -.if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11-72 -.else -CONFLICTS_INSTALL+= virtualbox-ose-72 -.endif - .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug KMK_FLAGS+= BUILD_TYPE=debug diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 551cafdb9cd9..b57b623d8c56 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -1,10 +1,10 @@ PORTNAME= virtualbox-ose DISTVERSION= 5.2.44 -PORTREVISION?= 35 +PORTREVISION= 36 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ - LOCAL/bofh/emulators/virtualbox-ose-legacy:docs -PKGNAMESUFFIX?= -legacy + LOCAL/bofh/emulators/virtualbox-ose-legacy:docs \ + LOCAL/vvd:docs DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \ @@ -29,24 +29,27 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-legacy +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +_VER= legacy +${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} + USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USE_GNOME= libxml2 USE_RC_SUBR= vboxheadless vboxwatchdog -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --disable-java --passive-mesa --disable-docs -CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs \ + --disable-java \ + --passive-mesa \ + --with-gcc="${CC}" \ + --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose \ - virtualbox-ose-nox11 \ - virtualbox-ose-70 \ - virtualbox-ose-nox11-70 \ - virtualbox-ose-71 \ - virtualbox-ose-nox11-71 \ - virtualbox-ose-72 \ - virtualbox-ose-nox11-72 +_VERSIONS= _-legacy _ _-70 _-71 _-72 +CONFLICTS_INSTALL= ${_VERSIONS:S|_|${PORTNAME}|} \ + ${_VERSIONS:S|_|${PORTNAME}-nox11|} EXTRACT_AFTER_ARGS= --exclude kBuild/bin \ --no-same-owner --no-same-permissions @@ -80,14 +83,14 @@ PLIST_SUB= GUEST_VER=${DISTVERSION} \ PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \ VBOXGROUP=${VBOXGROUP} -SLAVE_PORT?= no - OPTIONS_DEFINE= ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS PULSEAUDIO \ PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC VPX WEBSERVICE X11 -OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 -.if ${SLAVE_PORT} == no -OPTIONS_DEFAULT+= PYTHON -.endif +OPTIONS_DEFAULT_x11= PYTHON +OPTIONS_DEFAULT= DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 \ + ${OPTIONS_DEFAULT_${FLAVOR}} +OPTIONS_EXCLUDE_nox11= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ + QT5 VPX X11 +OPTIONS_EXCLUDE= ${OPTIONS_EXCLUDE_${FLAVOR}} OPTIONS_SUB= yes DEBUG_DESC= Debug symbols, additional logs and assertions @@ -138,12 +141,6 @@ ENV= .include <bsd.port.options.mk> -.if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11-legacy -.else -CONFLICTS_INSTALL+= virtualbox-ose-legacy -.endif - .if ${ARCH} == "amd64" _ELF32!= kldstat -q -m elf32 && ${ECHO_CMD} yes || ${ECHO_CMD} no .endif diff --git a/emulators/virtualbox-ose-nox11-70/Makefile b/emulators/virtualbox-ose-nox11-70/Makefile deleted file mode 100644 index 20a2feb54f44..000000000000 --- a/emulators/virtualbox-ose-nox11-70/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PORTREVISION= 7 -PKGNAMESUFFIX= -nox11-70 - -MASTERDIR= ${.CURDIR}/../virtualbox-ose-70 - -OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS OGG PULSEAUDIO \ - QT5 VORBIS VPX X11 - -SLAVE_PORT= yes - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/virtualbox-ose-nox11-71/Makefile b/emulators/virtualbox-ose-nox11-71/Makefile deleted file mode 100644 index 06750b5e3471..000000000000 --- a/emulators/virtualbox-ose-nox11-71/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PORTREVISION= 0 -PKGNAMESUFFIX= -nox11-71 - -MASTERDIR= ${.CURDIR}/../virtualbox-ose-71 - -OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ - QT6 X11 - -SLAVE_PORT= yes - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/virtualbox-ose-nox11-72/Makefile b/emulators/virtualbox-ose-nox11-72/Makefile deleted file mode 100644 index b3eb31d41f59..000000000000 --- a/emulators/virtualbox-ose-nox11-72/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PORTREVISION= 0 -PKGNAMESUFFIX= -nox11-72 - -MASTERDIR= ${.CURDIR}/../virtualbox-ose-72 - -OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ - QT6 X11 - -SLAVE_PORT= yes - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/virtualbox-ose-nox11-legacy/Makefile b/emulators/virtualbox-ose-nox11-legacy/Makefile deleted file mode 100644 index 24912cd0622c..000000000000 --- a/emulators/virtualbox-ose-nox11-legacy/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PORTREVISION= 34 -PKGNAMESUFFIX= -nox11-legacy - -MASTERDIR= ${.CURDIR}/../virtualbox-ose-legacy - -OPTIONS_EXCLUDE+= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \ - QT5 VPX X11 - -SLAVE_PORT= yes - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile deleted file mode 100644 index 7505d9d26e06..000000000000 --- a/emulators/virtualbox-ose-nox11/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -PORTREVISION= 18 -PKGNAMESUFFIX= -nox11 - -MASTERDIR= ${.CURDIR}/../virtualbox-ose - -OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS OPUS PULSEAUDIO \ - QT5 VPX X11 - -SLAVE_PORT= yes - -.include "${MASTERDIR}/Makefile" diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 42e6d45e1981..ade317d4de59 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -1,9 +1,10 @@ PORTNAME= virtualbox-ose DISTVERSION= 6.1.50 -PORTREVISION?= 18 +PORTREVISION= 19 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \ - LOCAL/bofh/emulators/virtualbox-ose:docs + LOCAL/bofh/emulators/virtualbox-ose:docs \ + LOCAL/vvd:docs DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \ @@ -30,24 +31,27 @@ LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +_VER= # +${FLAVOR}_PKGNAMESUFFIX= -${${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-} + USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2 CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USE_GNOME= libxml2 USE_RC_SUBR= vboxheadless vboxwatchdog -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --disable-java --passive-mesa --disable-docs -CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --disable-docs \ + --disable-java \ + --passive-mesa \ + --with-gcc="${CC}" \ + --with-g++="${CXX}" -CONFLICTS_INSTALL= virtualbox-ose-legacy \ - virtualbox-ose-nox11-legacy \ - virtualbox-ose-70 \ - virtualbox-ose-nox11-70 \ - virtualbox-ose-71 \ - virtualbox-ose-nox11-71 \ - virtualbox-ose-72 \ - virtualbox-ose-nox11-72 +_VERSIONS= _-legacy _ _-70 _-71 _-72 +CONFLICTS_INSTALL= ${_VERSIONS:S|_|${PORTNAME}|} \ + ${_VERSIONS:S|_|${PORTNAME}-nox11|} EXTRACT_AFTER_ARGS= --exclude kBuild/bin \ --no-same-owner --no-same-permissions @@ -83,14 +87,14 @@ PLIST_SUB= GUEST_VER=${DISTVERSION} \ PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \ VBOXGROUP=${VBOXGROUP} -SLAVE_PORT?= no - OPTIONS_DEFINE= AIO ALSA DBUS DEBUG DOCS GUESTADDITIONS NLS OPUS PULSEAUDIO \ PYTHON QT5 R0LOGGING UDPTUNNEL VBOXIMG VDE VNC VPX WEBSERVICE X11 -OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 -.if ${SLAVE_PORT} == no -OPTIONS_DEFAULT+= PYTHON -.endif +OPTIONS_DEFAULT_x11= PYTHON +OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11 \ + ${OPTIONS_DEFAULT_${FLAVOR}} +OPTIONS_EXCLUDE_nox11= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS OPUS PULSEAUDIO \ + QT5 VPX X11 +OPTIONS_EXCLUDE= ${OPTIONS_EXCLUDE_${FLAVOR}} # Since version 6.1.24 pulseaudio is broken at runtime, preventing # virtual machines from starting if configured to use it. OPTIONS_EXCLUDE+= PULSEAUDIO @@ -151,12 +155,6 @@ ENV= .include <bsd.port.options.mk> -.if ${SLAVE_PORT} == no -CONFLICTS_INSTALL+= virtualbox-ose-nox11 -.else -CONFLICTS_INSTALL+= virtualbox-ose -.endif - .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug KMK_FLAGS+= BUILD_TYPE=debughome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f40e24.3f5b1.2145b6f2>