git: b4a6bc8744f4 - main - emulators/virtualbox-ose*: Improve ports
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Jan 2025 21:14:55 UTC
The branch main has been updated by vvd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=b4a6bc8744f4f15b0e510af1553afeb1c8a027b3
commit b4a6bc8744f4f15b0e510af1553afeb1c8a027b3
Author: Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-01-04 21:05:54 +0000
Commit: Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-01-04 21:14:31 +0000
emulators/virtualbox-ose*: Improve ports
* Replace PORTVERSION with DISTVERSION.
* Fix CONFLICTS_INSTALL.
* Fix PYTHON in DEFAULT_OPTIONS in emulators/virtualbox-ose.
* Pet portclippy and portlint.
* Formatting and etc.
PR: 258159
---
emulators/virtualbox-ose-additions-legacy/Makefile | 39 +++++-----
.../virtualbox-ose-additions-nox11-legacy/Makefile | 6 +-
emulators/virtualbox-ose-additions-nox11/Makefile | 6 +-
emulators/virtualbox-ose-additions/Makefile | 40 +++++-----
emulators/virtualbox-ose-kmod-legacy/Makefile | 26 +++----
emulators/virtualbox-ose-kmod/Makefile | 35 ++++-----
emulators/virtualbox-ose-legacy/Makefile | 77 +++++++++----------
emulators/virtualbox-ose-nox11-legacy/Makefile | 6 +-
emulators/virtualbox-ose-nox11/Makefile | 4 +-
emulators/virtualbox-ose/Makefile | 87 +++++++++++-----------
10 files changed, 161 insertions(+), 165 deletions(-)
diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile
index 8a16ffddefad..cb328055a7b4 100644
--- a/emulators/virtualbox-ose-additions-legacy/Makefile
+++ b/emulators/virtualbox-ose-additions-legacy/Makefile
@@ -1,10 +1,10 @@
PORTNAME= virtualbox-ose
-PORTVERSION= 5.2.44
+DISTVERSION= 5.2.44
PORTREVISION?= 6
CATEGORIES= emulators
-MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
+MASTER_SITES= https://download.virtualbox.com/virtualbox/${DISTVERSION}/
PKGNAMESUFFIX?= -additions-legacy
-DISTNAME= VirtualBox-${PORTVERSION}
+DISTNAME= VirtualBox-${DISTVERSION}
MAINTAINER= vbox@FreeBSD.org
COMMENT= VirtualBox additions for FreeBSD guests
@@ -14,21 +14,17 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= amd64 i386
-USES= compiler:c++11-lang cpe iconv kmod tar:bzip2
-USE_RC_SUBR= vboxguest vboxservice
BUILD_DEPENDS= yasm:devel/yasm \
kmk:devel/kBuild \
xsltproc:textproc/libxslt
+USES= compiler:c++11-lang cpe iconv kmod tar:bzip2
CPE_VENDOR= oracle
CPE_PRODUCT= vm_virtualbox
+USE_RC_SUBR= vboxguest vboxservice
-PATCHDIR= ${.CURDIR}/../${PORTNAME}-legacy/files
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
-MAKE_JOBS_UNSAFE= yes
-
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-alsa \
--disable-docs \
--disable-libvpx \
@@ -39,15 +35,16 @@ CONFIGURE_ARGS+= --disable-alsa \
--disable-xpcom
CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}"
-CONFLICTS_INSTALL= virtualbox-ose \
- virtualbox-ose-additions \
- virtualbox-ose-additions-devel \
- virtualbox-ose-devel \
- virtualbox-ose-lite \
- virtualbox-ose-nox11
+MAKE_JOBS_UNSAFE= yes
+CONFLICTS_INSTALL= virtualbox-ose-additions \
+ virtualbox-ose-additions-nox11
+
+PATCHDIR= ${.CURDIR}/../${PORTNAME}-legacy/files
EXTRACT_AFTER_ARGS= --exclude tools/*.x86 --exclude tools/*.amd64 --exclude Firmware
-PORTSCOUT= limit:^5\.
+PORTSCOUT= limit:^5\.
+
+WRKSRC= ${WRKDIR}/VirtualBox-${DISTVERSION}
OPTIONS_DEFINE= DBUS DEBUG X11
OPTIONS_DEFINE_i386= PAE
@@ -55,23 +52,23 @@ OPTIONS_DEFAULT= DBUS X11
OPTIONS_SUB= yes
PAE_DESC= Build kernel modules for PAE-kernels
-DBUS_CONFIGURE_OFF= --disable-dbus
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_OFF= --disable-dbus
DEBUG_CONFIGURE_ON= --build-debug
DEBUG_VARS= KMK_BUILDTYPE=debug
DEBUG_VARS_OFF= KMK_BUILDTYPE=release
X11_BUILD_DEPENDS= ${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server
X11_RUN_DEPENDS= xrandr:x11/xrandr
-X11_USE= XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
X11_USES= pkgconfig xorg
+X11_USE= XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
X11_VARS= VBOX_WITH_X11=1
.include <bsd.port.options.mk>
.if ${SLAVE_PORT} == no
-CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11
+CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11-legacy
.else
-CONFLICTS_INSTALL+= virtualbox-ose-additions
+CONFLICTS_INSTALL+= virtualbox-ose-additions-legacy
.endif
VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers
diff --git a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile b/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
index bbf0e4e133cf..d0641c37f11d 100644
--- a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
+++ b/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
@@ -1,8 +1,8 @@
-PKGNAMESUFFIX= -additions-nox11-legacy
PORTREVISION= 5
-
-OPTIONS_EXCLUDE= DBUS DEBUG OPENGL X11
+PKGNAMESUFFIX= -additions-nox11-legacy
MASTERDIR= ${.CURDIR}/../virtualbox-ose-additions-legacy
+OPTIONS_EXCLUDE= DBUS DEBUG OPENGL X11
+
.include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-additions-nox11/Makefile b/emulators/virtualbox-ose-additions-nox11/Makefile
index a6d493419d02..a3744275a9a3 100644
--- a/emulators/virtualbox-ose-additions-nox11/Makefile
+++ b/emulators/virtualbox-ose-additions-nox11/Makefile
@@ -1,8 +1,8 @@
-PKGNAMESUFFIX= -additions-nox11
PORTREVISION= 0
-
-OPTIONS_EXCLUDE= DBUS DEBUG OPENGL X11
+PKGNAMESUFFIX= -additions-nox11
MASTERDIR= ${.CURDIR}/../virtualbox-ose-additions
+OPTIONS_EXCLUDE= DBUS DEBUG OPENGL X11
+
.include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index e78cc219878c..0bcd8a8fe54a 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -1,10 +1,10 @@
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.50
+DISTVERSION= 6.1.50
PORTREVISION?= 0
CATEGORIES= emulators
-MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
+MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/
PKGNAMESUFFIX?= -additions
-DISTNAME= VirtualBox-${PORTVERSION}
+DISTNAME= VirtualBox-${DISTVERSION}
MAINTAINER= vbox@FreeBSD.org
COMMENT= VirtualBox additions for FreeBSD guests
@@ -14,21 +14,17 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
ONLY_FOR_ARCHS= amd64
-USES= compiler:c++11-lang cpe iconv kmod tar:bzip2
-USE_RC_SUBR= vboxguest vboxservice
BUILD_DEPENDS= yasm:devel/yasm \
kmk:devel/kBuild \
xsltproc:textproc/libxslt
+USES= compiler:c++11-lang cpe iconv kmod tar:bzip2
CPE_VENDOR= oracle
CPE_PRODUCT= vm_virtualbox
+USE_RC_SUBR= vboxguest vboxservice
-PATCHDIR= ${.CURDIR}/../${PORTNAME}/files
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
-MAKE_JOBS_UNSAFE= yes
-
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-alsa \
--disable-docs \
--disable-libvpx \
@@ -39,27 +35,29 @@ CONFIGURE_ARGS+= --disable-alsa \
--disable-xpcom
CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}"
-CONFLICTS_INSTALL= virtualbox-ose \
- virtualbox-ose-additions-devel \
- virtualbox-ose-additions-legacy \
- virtualbox-ose-devel \
- virtualbox-ose-legacy \
- virtualbox-ose-lite \
- virtualbox-ose-nox11
+MAKE_JOBS_UNSAFE= yes
+
+CONFLICTS_INSTALL= virtualbox-ose-additions-legacy \
+ virtualbox-ose-additions-nox11-legacy
+
+PATCHDIR= ${.CURDIR}/../${PORTNAME}/files
+EXTRACT_AFTER_ARGS= --exclude tools/*.x86 --exclude tools/*.amd64 --exclude Firmware
-OPTIONS_DEFINE= DBUS DEBUG X11
+WRKSRC= ${WRKDIR}/VirtualBox-${DISTVERSION}
+
+OPTIONS_DEFINE= DBUS DEBUG X11
OPTIONS_DEFAULT= DBUS X11
-OPTIONS_SUB= yes
+OPTIONS_SUB= yes
-DBUS_CONFIGURE_OFF= --disable-dbus
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_OFF= --disable-dbus
DEBUG_CONFIGURE_ON= --build-debug
DEBUG_VARS= KMK_BUILDTYPE=debug
DEBUG_VARS_OFF= KMK_BUILDTYPE=release
X11_BUILD_DEPENDS= ${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server
X11_RUN_DEPENDS= xrandr:x11/xrandr
-X11_USE= XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
X11_USES= pkgconfig xorg
+X11_USE= XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
X11_VARS= VBOX_WITH_X11=1
.include <bsd.port.options.mk>
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile
index 49d9a0154789..ede542c5e312 100644
--- a/emulators/virtualbox-ose-kmod-legacy/Makefile
+++ b/emulators/virtualbox-ose-kmod-legacy/Makefile
@@ -1,10 +1,10 @@
PORTNAME= virtualbox-ose
-PORTVERSION= 5.2.44
+DISTVERSION= 5.2.44
PORTREVISION= 7
CATEGORIES= emulators
-MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
+MASTER_SITES= https://download.virtualbox.com/virtualbox/${DISTVERSION}/
PKGNAMESUFFIX= -kmod-legacy
-DISTNAME= VirtualBox-${PORTVERSION}
+DISTNAME= VirtualBox-${DISTVERSION}
MAINTAINER= vbox@FreeBSD.org
COMMENT= VirtualBox kernel module for FreeBSD
@@ -13,21 +13,16 @@ WWW= https://www.virtualbox.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+ONLY_FOR_ARCHS= amd64 i386
+
BUILD_DEPENDS= kmk:devel/kBuild
+USES= cpe kmod tar:bzip2
CPE_VENDOR= oracle
CPE_PRODUCT= vm_virtualbox
-
-SUB_FILES= pkg-message
-SUB_LIST= OPSYS=${OPSYS} OSREL=${OSREL}
-
-USES= cpe kmod tar:bzip2
-PATCHDIR= ${.CURDIR}/../${PORTNAME}-legacy/files
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
USE_RC_SUBR= vboxnet
-ONLY_FOR_ARCHS= i386 amd64
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --build-headless
CONFIGURE_ARGS+= --disable-alsa \
--disable-dbus \
@@ -41,7 +36,12 @@ CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}"
CONFLICTS_INSTALL= virtualbox-ose-kmod
-PORTSCOUT= limit:^5\.
+PATCHDIR= ${.CURDIR}/../${PORTNAME}-legacy/files
+PORTSCOUT= limit:^5\.
+SUB_FILES= pkg-message
+SUB_LIST= OPSYS=${OPSYS} OSREL=${OSREL}
+
+WRKSRC= ${WRKDIR}/VirtualBox-${DISTVERSION}
OPTIONS_DEFINE= DEBUG VIMAGE
OPTIONS_DEFINE_i386= PAE
diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile
index cab5a72d755a..b06147d885d1 100644
--- a/emulators/virtualbox-ose-kmod/Makefile
+++ b/emulators/virtualbox-ose-kmod/Makefile
@@ -1,9 +1,9 @@
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.50
+DISTVERSION= 6.1.50
CATEGORIES= emulators
-MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
+MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/
PKGNAMESUFFIX= -kmod
-DISTNAME= VirtualBox-${PORTVERSION}
+DISTNAME= VirtualBox-${DISTVERSION}
MAINTAINER= vbox@FreeBSD.org
COMMENT= VirtualBox kernel module for FreeBSD
@@ -12,21 +12,16 @@ WWW= https://www.virtualbox.org/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+ONLY_FOR_ARCHS= amd64
+
BUILD_DEPENDS= kmk:devel/kBuild
+USES= cpe compiler:c++14-lang kmod tar:bzip2
CPE_VENDOR= oracle
CPE_PRODUCT= vm_virtualbox
-
-SUB_FILES= pkg-message
-SUB_LIST= OPSYS=${OPSYS} OSREL=${OSREL}
-
-USES= cpe compiler:c++14-lang kmod tar:bzip2
-PATCHDIR= ${.CURDIR}/../${PORTNAME}/files
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
USE_RC_SUBR= vboxnet
-ONLY_FOR_ARCHS= amd64
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --build-headless
CONFIGURE_ARGS+= --disable-alsa \
--disable-dbus \
@@ -40,11 +35,17 @@ CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}"
CONFLICTS_INSTALL= virtualbox-ose-kmod-legacy
-OPTIONS_DEFINE= DEBUG VIMAGE
-OPTIONS_DEFAULT=VIMAGE
-OPTIONS_SUB= yes
-DEBUG_DESC= Debug symbols, additional logs and assertions
-VIMAGE_DESC= VIMAGE virtual networking support
+PATCHDIR= ${.CURDIR}/../${PORTNAME}/files
+SUB_FILES= pkg-message
+SUB_LIST= OPSYS=${OPSYS} OSREL=${OSREL}
+
+WRKSRC= ${WRKDIR}/VirtualBox-${DISTVERSION}
+
+OPTIONS_DEFINE= DEBUG VIMAGE
+OPTIONS_DEFAULT= VIMAGE
+OPTIONS_SUB= yes
+DEBUG_DESC= Debug symbols, additional logs and assertions
+VIMAGE_DESC= VIMAGE virtual networking support
.include <bsd.port.options.mk>
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 080f12a029bc..1ac2ded032c4 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -1,14 +1,14 @@
PORTNAME= virtualbox-ose
-PORTVERSION= 5.2.44
+DISTVERSION= 5.2.44
PORTREVISION?= 23
CATEGORIES= emulators
-MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/:src \
+MASTER_SITES= https://download.virtualbox.com/virtualbox/${DISTVERSION}/:src \
LOCAL/bofh/emulators/virtualbox-ose-legacy:docs
PKGNAMESUFFIX?= -legacy
-DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX}:src \
- VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}:docs
-EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} \
- VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \
+ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs
+EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \
+ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= vbox@FreeBSD.org
COMMENT= General-purpose full virtualizer for x86 hardware
@@ -30,23 +30,25 @@ LIB_DEPENDS= libpng.so:graphics/png \
RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod-legacy
USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2
-USE_GNOME= libxml2
-
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
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-java --passive-mesa --disable-docs
CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}"
-CONFLICTS_INSTALL= virtualbox-ose-additions-* \
- virtualbox-ose-devel \
- virtualbox-ose \
- virtualbox-ose-lite
-
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
+CONFLICTS_INSTALL= virtualbox-ose \
+ virtualbox-ose-nox11
PORTSCOUT= limit:^5\.
+SUB_LIST= VBOXDIR=${VBOX_DIR} \
+ VBOXGROUP=${VBOXGROUP} \
+ VBOXUSER=${VBOXUSER} \
+ VBOXWSUSER=${VBOXWSUSER}
+
+WRKSRC= ${WRKDIR}/VirtualBox-${DISTVERSION}
VBOXUSER?= vboxusers
VBOXWSUSER?= vboxusers
@@ -62,6 +64,10 @@ VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
VBoxSVC VBoxXPCOMIPCD
+PLIST_SUB= GUEST_VER=${DISTVERSION} \
+ PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
+ VBOXGROUP=${VBOXGROUP}
+
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
@@ -78,54 +84,45 @@ VNC_DESC= Build with VNC support
VPX_DESC= Use libvpx for video recording
WEBSERVICE_DESC= Build Webservice
-ALSA_CONFIGURE_OFF= --disable-alsa
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
-DBUS_CONFIGURE_OFF= --disable-dbus
+ALSA_CONFIGURE_OFF= --disable-alsa
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_OFF= --disable-dbus
DEBUG_CONFIGURE_ON= --build-debug
NLS_IMPLIES= QT5
-PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
PYTHON_USES= python
PYTHON_USES_OFF= python:build
PYTHON_USE= PYTHON=distutils,noegginfo,noflavors
PYTHON_CONFIGURE_OFF= --disable-python
PYTHON_VARS= pydistutils_pkgname=vboxapi pydistutils_pkgversion=1.0
+QT5_IMPLIES= X11
QT5_USES= gl qmake:no_env qt:5 xorg
QT5_USE= QT=buildtools:build,core,dbus,gui,linguisttools:build,opengl \
QT=printsupport,widgets,x11extras XORG=xcb GL=gl
QT5_CONFIGURE_ON= --enable-qt5
QT5_CONFIGURE_OFF= --disable-qt
-QT5_IMPLIES= X11
R0LOGGING_IMPLIES= DEBUG
UDPTUNNEL_CONFIGURE_OFF= --disable-udptunnel
-VDE_CONFIGURE_ON= --enable-vde
VDE_RUN_DEPENDS= vde_switch:net/vde2
-VNC_CONFIGURE_ON= --enable-vnc
+VDE_CONFIGURE_ON= --enable-vde
VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver
-VPX_CONFIGURE_OFF= --disable-libvpx
+VNC_CONFIGURE_ON= --enable-vnc
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
+VPX_CONFIGURE_OFF= --disable-libvpx
WEBSERVICE_BUILD_DEPENDS= soapcpp2:devel/gsoap
X11_USES= sdl xorg
X11_USE= SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt
X11_CONFIGURE_OFF= --build-headless
-PLIST_SUB= GUEST_VER=${PORTVERSION} \
- PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
- VBOXGROUP=${VBOXGROUP}
-SUB_LIST= VBOXDIR=${VBOX_DIR} \
- VBOXGROUP=${VBOXGROUP} \
- VBOXUSER=${VBOXUSER} \
- VBOXWSUSER=${VBOXWSUSER}
-USE_RC_SUBR= vboxheadless vboxwatchdog
-
.include <bsd.port.options.mk>
.if ${SLAVE_PORT} == no
-CONFLICTS_INSTALL+= virtualbox-ose-nox11
+CONFLICTS_INSTALL+= virtualbox-ose-nox11-legacy
OPTIONS_DEFAULT+= PYTHON
.else
-CONFLICTS_INSTALL+= virtualbox-ose
+CONFLICTS_INSTALL+= virtualbox-ose-legacy
.endif
.if ${ARCH} == "amd64"
@@ -140,11 +137,11 @@ KMK_BUILDTYPE= release
.endif
.if ${PORT_OPTIONS:MGUESTADDITIONS}
-GUESTADDITIONS= VBoxGuestAdditions_${PORTVERSION}.iso
-DISTFILES+= ${GUESTADDITIONS}:src
-LICENSE+= Additions
-LICENSE_COMB= multi
-LICENSE_NAME_Additions= Guest Additions
+GUESTADDITIONS= VBoxGuestAdditions_${DISTVERSION}.iso
+DISTFILES+= ${GUESTADDITIONS}:src
+LICENSE+= Additions
+LICENSE_COMB= multi
+LICENSE_NAME_Additions= Guest Additions
LICENSE_PERMS_Additions= auto-accept
LICENSE_DISTFILES_Additions= ${GUESTADDITIONS}
.endif
@@ -357,7 +354,7 @@ do-install:
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/VirtualBox-docs-${PORTVERSION}/UserManual.pdf \
+ ${INSTALL_DATA} ${WRKDIR}/VirtualBox-docs-${DISTVERSION}/UserManual.pdf \
${STAGEDIR}${DOCSDIR}
.endif
diff --git a/emulators/virtualbox-ose-nox11-legacy/Makefile b/emulators/virtualbox-ose-nox11-legacy/Makefile
index f5b76395f8e9..5cc4fc68f34a 100644
--- a/emulators/virtualbox-ose-nox11-legacy/Makefile
+++ b/emulators/virtualbox-ose-nox11-legacy/Makefile
@@ -1,9 +1,9 @@
PORTREVISION= 19
PKGNAMESUFFIX= -nox11-legacy
-OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO
-OPTIONS_EXCLUDE+= QT5 VPX X11
-
MASTERDIR= ${.CURDIR}/../virtualbox-ose-legacy
+OPTIONS_EXCLUDE+= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \
+ QT5 VPX X11
+
.include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-nox11/Makefile b/emulators/virtualbox-ose-nox11/Makefile
index 285b8931e189..d4a66aac1642 100644
--- a/emulators/virtualbox-ose-nox11/Makefile
+++ b/emulators/virtualbox-ose-nox11/Makefile
@@ -1,9 +1,11 @@
PORTREVISION= 2
PKGNAMESUFFIX= -nox11
+MASTERDIR= ${.CURDIR}/../virtualbox-ose
+
OPTIONS_EXCLUDE= ALSA DBUS DEBUG GUESTADDITIONS DOCS NLS PULSEAUDIO \
QT5 VPX X11
-MASTERDIR= ${.CURDIR}/../virtualbox-ose
+SLAVE_PORT= yes
.include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 44f0dfce01f6..a7c9299b7351 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -1,13 +1,13 @@
PORTNAME= virtualbox-ose
-PORTVERSION= 6.1.50
-PORTREVISION?= 6
+DISTVERSION= 6.1.50
+PORTREVISION?= 7
CATEGORIES= emulators
-MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/:src \
+MASTER_SITES= https://download.virtualbox.org/virtualbox/${DISTVERSION}/:src \
LOCAL/bofh/emulators/virtualbox-ose:docs
-DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX}:src \
- VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}:docs
-EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} \
- VirtualBox-docs-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES= VirtualBox-${DISTVERSION}${EXTRACT_SUFX}:src \
+ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}:docs
+EXTRACT_ONLY= VirtualBox-${DISTVERSION}${EXTRACT_SUFX} \
+ VirtualBox-docs-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= vbox@FreeBSD.org
COMMENT= General-purpose full virtualizer for x86 hardware
@@ -28,21 +28,26 @@ LIB_DEPENDS= libpng.so:graphics/png \
RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod
USES= compiler:c++14-lang cpe gnome iconv pkgconfig ssl tar:bzip2
-USE_GNOME= libxml2
-
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
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-java --passive-mesa --disable-docs
CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}"
-CONFLICTS_INSTALL= virtualbox-ose-additions-* \
- virtualbox-ose-devel \
- virtualbox-ose-legacy \
- virtualbox-ose-lite
+CONFLICTS_INSTALL= virtualbox-ose-legacy \
+ virtualbox-ose-nox11-legacy
+
+SUB_FILES= pkg-message
+SUB_LIST= VBOXDIR=${VBOX_DIR} \
+ VBOX_ETC=${VBOX_ETC} \
+ VBOXGROUP=${VBOXGROUP} \
+ VBOXUSER=${VBOXUSER} \
+ VBOXWSUSER=${VBOXWSUSER}
-WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
+WRKSRC= ${WRKDIR}/VirtualBox-${DISTVERSION}
VBOXUSER?= vboxusers
VBOXWSUSER?= vboxusers
@@ -58,11 +63,18 @@ VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \
VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
VBoxSVC VBoxXPCOMIPCD
-SUB_FILES= pkg-message
+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 WEBSERVICE VPX X11
OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
+.if ${SLAVE_PORT} == no
+OPTIONS_DEFAULT+= PYTHON
+.endif
# Since version 6.1.24 pulseaudio is broken at runtime, preventing
# virtual machines from starting if configured to use it.
OPTIONS_EXCLUDE+= PULSEAUDIO
@@ -82,37 +94,37 @@ VNC_DESC= Build with VNC support
VPX_DESC= Use libvpx for video recording
WEBSERVICE_DESC= Build Webservice
-ALSA_CONFIGURE_OFF= --disable-alsa
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
-DBUS_CONFIGURE_OFF= --disable-dbus
+ALSA_CONFIGURE_OFF= --disable-alsa
DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_OFF= --disable-dbus
DEBUG_CONFIGURE_ON= --build-debug
NLS_IMPLIES= QT5
-OPUS_CONFIGURE_OFF= --disable-libopus
-OPUS_LIB_DEPENDS= libopus.so:audio/opus
OPUS_IMPLIES= VPX
-PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
+OPUS_LIB_DEPENDS= libopus.so:audio/opus
+OPUS_CONFIGURE_OFF= --disable-libopus
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
+PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
PYTHON_USES= python
PYTHON_USES_OFF= python:build
PYTHON_USE= PYTHON=distutils,noegginfo,noflavors
PYTHON_CONFIGURE_OFF= --disable-python
PYTHON_VARS= pydistutils_pkgname=vboxapi pydistutils_pkgversion=1.0
+QT5_IMPLIES= X11
QT5_USES= gl qmake:no_env qt:5 xorg
QT5_USE= QT=buildtools:build,core,dbus,gui,linguisttools:build,opengl \
QT=printsupport,widgets,x11extras XORG=xcb GL=gl
QT5_CONFIGURE_ON= --enable-qt5
QT5_CONFIGURE_OFF= --disable-qt
-QT5_IMPLIES= X11
R0LOGGING_IMPLIES= DEBUG
UDPTUNNEL_CONFIGURE_OFF= --disable-udptunnel
VBOXIMG_LIB_DEPENDS= libfuse.so.2:filesystems/fusefs-libs
-VDE_CONFIGURE_ON= --enable-vde
VDE_RUN_DEPENDS= vde_switch:net/vde2
-VNC_CONFIGURE_ON= --enable-vnc
+VDE_CONFIGURE_ON= --enable-vde
VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver
-VPX_CONFIGURE_OFF= --disable-libvpx
+VNC_CONFIGURE_ON= --enable-vnc
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
+VPX_CONFIGURE_OFF= --disable-libvpx
WEBSERVICE_BUILD_DEPENDS= soapcpp2:devel/gsoap
X11_USES= sdl xorg
X11_USE= SDL=sdl XORG=x11,xcursor,xext,xinerama,xmu,xorgproto,xt
@@ -121,21 +133,10 @@ X11_CONFIGURE_OFF= --build-headless
ENV=
.export ENV
-PLIST_SUB= GUEST_VER=${PORTVERSION} \
- PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
- VBOXGROUP=${VBOXGROUP}
-SUB_LIST= VBOXDIR=${VBOX_DIR} \
- VBOX_ETC=${VBOX_ETC} \
- VBOXGROUP=${VBOXGROUP} \
- VBOXUSER=${VBOXUSER} \
- VBOXWSUSER=${VBOXWSUSER}
-USE_RC_SUBR= vboxheadless vboxwatchdog
-
.include <bsd.port.options.mk>
.if ${SLAVE_PORT} == no
CONFLICTS_INSTALL+= virtualbox-ose-nox11
-OPTIONS_DEFAULT+= PYTHON
.else
CONFLICTS_INSTALL+= virtualbox-ose
.endif
@@ -148,11 +149,11 @@ KMK_BUILDTYPE= release
.endif
.if ${PORT_OPTIONS:MGUESTADDITIONS}
-GUESTADDITIONS= VBoxGuestAdditions_${PORTVERSION}.iso
-DISTFILES+= ${GUESTADDITIONS}:src
-LICENSE+= Additions
-LICENSE_COMB= multi
-LICENSE_NAME_Additions= Guest Additions
+GUESTADDITIONS= VBoxGuestAdditions_${DISTVERSION}.iso
+DISTFILES+= ${GUESTADDITIONS}:src
+LICENSE+= Additions
+LICENSE_COMB= multi
+LICENSE_NAME_Additions= Guest Additions
LICENSE_PERMS_Additions= auto-accept
LICENSE_DISTFILES_Additions= ${GUESTADDITIONS}
.endif
@@ -372,7 +373,7 @@ do-install:
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/VirtualBox-docs-${PORTVERSION}/UserManual.pdf \
+ ${INSTALL_DATA} ${WRKDIR}/VirtualBox-docs-${DISTVERSION}/UserManual.pdf \
${STAGEDIR}${DOCSDIR}
.endif