emulators/virtualbox-ose-additions*: Flavorize, add xlibre flavor

Flavors: xorg (default), xlibre, nox11.

While here add PAE option for ARCH=i386, fix warnings from portclippy,
make non-functional changes related to indentation and formatting,
make simplification of CONFLICTS_INSTALL, make unification.

PR:		294806
Sponsored by:	UNIS Labs
Co-authored-by:	b-aaz <b-aazbsd@proton.me>

13 files changed, 188 insertions, 251 deletions

diff --git a/MOVED b/MOVED
index ec1360255f3e..cac604d25929 100644
--- a/MOVED
+++ b/MOVED
@@ -5253,3 +5253,8 @@ sysutils/py-azure-cli-base||2026-04-21|Remove obsoleted port
 games/coronapoker||2026-04-25|Remove for security concerns: downloads closed source binary modules, should not be restored unless https://github.com/tonikelope/coronapoker/issues/7 is addressed
 sysutils/py-ioztat|filesystems/py-ioztat|2026-04-27|Move to more appropriate category
 misc/py-aider-chat||2026-04-27|Upstream project has stopped active releases and doesn't match ports dependencies
+emulators/virtualbox-ose-additions-nox11-legacy|emulators/virtualbox-ose-additions-legacy@nox11|Converted to a flavorized port
+emulators/virtualbox-ose-additions-nox11|emulators/virtualbox-ose-additions@nox11|Converted to a flavorized port
+emulators/virtualbox-ose-additions-nox11-70|emulators/virtualbox-ose-additions-70@nox11|Converted to a flavorized port
+emulators/virtualbox-ose-additions-nox11-71|emulators/virtualbox-ose-additions-71@nox11|Converted to a flavorized port
+emulators/virtualbox-ose-additions-nox11-72|emulators/virtualbox-ose-additions-72@nox11|Converted to a flavorized port
diff --git a/emulators/Makefile b/emulators/Makefile
index f39333180844..a3bfec80e00b 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -166,11 +166,6 @@
     SUBDIR += virtualbox-ose-additions-71
     SUBDIR += virtualbox-ose-additions-72
     SUBDIR += virtualbox-ose-additions-legacy
-    SUBDIR += virtualbox-ose-additions-nox11
-    SUBDIR += virtualbox-ose-additions-nox11-70
-    SUBDIR += virtualbox-ose-additions-nox11-71
-    SUBDIR += virtualbox-ose-additions-nox11-72
-    SUBDIR += virtualbox-ose-additions-nox11-legacy
     SUBDIR += virtualbox-ose-kmod
     SUBDIR += virtualbox-ose-kmod-70
     SUBDIR += virtualbox-ose-kmod-71
diff --git a/emulators/virtualbox-ose-additions-70/Makefile b/emulators/virtualbox-ose-additions-70/Makefile
index 320ecefe352c..48b5efc16fc0 100644
--- a/emulators/virtualbox-ose-additions-70/Makefile
+++ b/emulators/virtualbox-ose-additions-70/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	virtualbox-ose
 DISTVERSION=	7.0.26
-PORTREVISION?=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${DISTVERSION}/
-PKGNAMESUFFIX?=	-additions-70
 DISTNAME=	VirtualBox-${DISTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
@@ -22,34 +21,35 @@ BUILD_DEPENDS=	yasm:devel/yasm \
 		kmk:devel/kBuild \
 		xsltproc:textproc/libxslt
 
+FLAVORS=	xorg xlibre nox11
+FLAVOR?=	${FLAVORS:[1]}
+_SUFFIX=	-additions
+_VER=		${DISTVERSION:R:S|.||}
+${FLAVOR}_PKGNAMESUFFIX=	${${_SUFFIX} ${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-}
+
 USES=		compiler:c++14-lang cpe iconv kmod tar:bzip2
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 USE_RC_SUBR=	vboxguest vboxservice
 
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-alsa \
-			--disable-docs \
-			--disable-libvpx \
-			--disable-opengl \
-			--disable-pulse \
-			--disable-python \
-			--disable-sdl-ttf \
-			--disable-xpcom
-CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-alsa \
+		--disable-docs \
+		--disable-libvpx \
+		--disable-opengl \
+		--disable-pulse \
+		--disable-python \
+		--disable-sdl-ttf \
+		--disable-xpcom \
+		--nofatal \
+		--with-gcc="${CC}" \
+		--with-g++="${CXX}"
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS_INSTALL=	virtualbox-ose-additions-legacy \
-			virtualbox-ose-additions-nox11-legacy \
-			virtualbox-ose-additions \
-			virtualbox-ose-additions-nox11 \
-			virtualbox-ose-additions-71 \
-			virtualbox-ose-additions-nox11-71 \
-			virtualbox-ose-additions-72 \
-			virtualbox-ose-additions-nox11-72
+CONFLICTS_INSTALL=	${PORTNAME}${_SUFFIX}*
 
-PATCHDIR=		${.CURDIR}/../${PORTNAME}-70/files
+PATCHDIR=		${.CURDIR}/../${${PORTNAME} ${_VER}:L:ts-}/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--exclude tools/*.amd64 \
 			--exclude Firmware \
@@ -57,30 +57,28 @@ EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--no-same-owner --no-same-permissions
 PORTSCOUT=		limit:^7\.0\.
 
+BUILD_WRKSRC=		${VBOX_BIN}/src
 WRKSRC=			${WRKDIR}/VirtualBox-${DISTVERSION}
 
 OPTIONS_DEFINE=		DBUS DEBUG X11
+OPTIONS_DEFINE_i386=	PAE
 OPTIONS_DEFAULT=	DBUS X11
+nox11_OPTIONS_EXCLUDE=	DBUS DEBUG X11
+OPTIONS_EXCLUDE=	${${FLAVOR}_OPTIONS_EXCLUDE}
 OPTIONS_SUB=		yes
 
+PAE_DESC=		Build kernel modules for PAE-kernels
 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_USES=		pkgconfig xorg
-X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
+X11_USES=		pkgconfig ${FLAVOR:Mxlibre} xorg
+X11_USE=		${FLAVOR:tu}=${FLAVOR}-server \
+			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-70
-.else
-CONFLICTS_INSTALL+=	virtualbox-ose-additions-70
-.endif
+X11_VARS_OFF=		VBOX_WITH_X11=
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
@@ -90,15 +88,8 @@ VBOX_SBINS=	VBoxControl \
 		VBoxService \
 		mount_vboxvfs
 
-BUILD_WRKSRC=	${VBOX_BIN}/src
-
 KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
-KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys VBOX_ONLY_ADDITIONS=1
-
-.if ${PORT_OPTIONS:MX11}
-.else
-VBOX_WITH_X11=
-.endif
+KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys VBOX_ONLY_ADDITIONS=1
 
 .include <bsd.port.pre.mk>
 
@@ -135,6 +126,9 @@ post-patch:
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
+.if ${PORT_OPTIONS:MPAE}
+	@${ECHO_CMD} 'VBOX_FREEBSD = -DPAE' >> ${WRKSRC}/LocalConfig.kmk
+.endif
 .if ${OSVERSION} >= 1500038
 	@${ECHO_CMD} 'HAVE_MNTOPTS_IN_LIBUTIL = 1' >> \
 	    ${WRKSRC}/LocalConfig.kmk
diff --git a/emulators/virtualbox-ose-additions-71/Makefile b/emulators/virtualbox-ose-additions-71/Makefile
index 4fe2e2a1815e..94cdcea9e79d 100644
--- a/emulators/virtualbox-ose-additions-71/Makefile
+++ b/emulators/virtualbox-ose-additions-71/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	virtualbox-ose
 DISTVERSION=	7.1.18
-PORTREVISION?=	0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${DISTVERSION}/
-PKGNAMESUFFIX?=	-additions-71
 DISTNAME=	VirtualBox-${DISTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
@@ -22,34 +21,35 @@ BUILD_DEPENDS=	yasm:devel/yasm \
 		kmk:devel/kBuild \
 		xsltproc:textproc/libxslt
 
+FLAVORS=	xorg xlibre nox11
+FLAVOR?=	${FLAVORS:[1]}
+_SUFFIX=	-additions
+_VER=		${DISTVERSION:R:S|.||}
+${FLAVOR}_PKGNAMESUFFIX=	${${_SUFFIX} ${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-}
+
 USES=		compiler:c++17-lang cpe iconv kmod tar:bzip2
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 USE_RC_SUBR=	vboxguest vboxservice
 
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-alsa \
-			--disable-docs \
-			--disable-libvpx \
-			--disable-opengl \
-			--disable-pulse \
-			--disable-python \
-			--disable-sdl-ttf \
-			--disable-xpcom
-CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-alsa \
+		--disable-docs \
+		--disable-libvpx \
+		--disable-opengl \
+		--disable-pulse \
+		--disable-python \
+		--disable-sdl-ttf \
+		--disable-xpcom \
+		--nofatal \
+		--with-gcc="${CC}" \
+		--with-g++="${CXX}"
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS_INSTALL=	virtualbox-ose-additions-legacy \
-			virtualbox-ose-additions-nox11-legacy \
-			virtualbox-ose-additions \
-			virtualbox-ose-additions-nox11 \
-			virtualbox-ose-additions-70 \
-			virtualbox-ose-additions-nox11-70 \
-			virtualbox-ose-additions-72 \
-			virtualbox-ose-additions-nox11-72
+CONFLICTS_INSTALL=	${PORTNAME}${_SUFFIX}*
 
-PATCHDIR=		${.CURDIR}/../${PORTNAME}-71/files
+PATCHDIR=		${.CURDIR}/../${${PORTNAME} ${_VER}:L:ts-}/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--exclude tools/*.amd64 \
 			--exclude Firmware \
@@ -57,30 +57,28 @@ EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--no-same-owner --no-same-permissions
 PORTSCOUT=		limit:^7\.1\.
 
+BUILD_WRKSRC=		${VBOX_BIN}/src
 WRKSRC=			${WRKDIR}/VirtualBox-${DISTVERSION}
 
 OPTIONS_DEFINE=		DBUS DEBUG X11
+OPTIONS_DEFINE_i386=	PAE
 OPTIONS_DEFAULT=	DBUS X11
+nox11_OPTIONS_EXCLUDE=	DBUS DEBUG X11
+OPTIONS_EXCLUDE=	${${FLAVOR}_OPTIONS_EXCLUDE}
 OPTIONS_SUB=		yes
 
+PAE_DESC=		Build kernel modules for PAE-kernels
 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_USES=		pkgconfig xorg
-X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
+X11_USES=		pkgconfig ${FLAVOR:Mxlibre} xorg
+X11_USE=		${FLAVOR:tu}=${FLAVOR}-server \
+			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-71
-.else
-CONFLICTS_INSTALL+=	virtualbox-ose-additions-71
-.endif
+X11_VARS_OFF=		VBOX_WITH_X11=
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
@@ -90,15 +88,8 @@ VBOX_SBINS=	VBoxControl \
 		VBoxService \
 		mount_vboxvfs
 
-BUILD_WRKSRC=	${VBOX_BIN}/src
-
 KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
-KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys VBOX_ONLY_ADDITIONS=1
-
-.if ${PORT_OPTIONS:MX11}
-.else
-VBOX_WITH_X11=
-.endif
+KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys VBOX_ONLY_ADDITIONS=1
 
 .include <bsd.port.pre.mk>
 
@@ -135,6 +126,9 @@ post-patch:
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
+.if ${PORT_OPTIONS:MPAE}
+	@${ECHO_CMD} 'VBOX_FREEBSD = -DPAE' >> ${WRKSRC}/LocalConfig.kmk
+.endif
 .if ${OSVERSION} >= 1500038
 	@${ECHO_CMD} 'HAVE_MNTOPTS_IN_LIBUTIL = 1' >> \
 	    ${WRKSRC}/LocalConfig.kmk
diff --git a/emulators/virtualbox-ose-additions-72/Makefile b/emulators/virtualbox-ose-additions-72/Makefile
index 4cb8eab9dd1f..e6db8f18b595 100644
--- a/emulators/virtualbox-ose-additions-72/Makefile
+++ b/emulators/virtualbox-ose-additions-72/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	virtualbox-ose
 DISTVERSION=	7.2.8
-PORTREVISION?=	0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${DISTVERSION}/
-PKGNAMESUFFIX?=	-additions-72
 DISTNAME=	VirtualBox-${DISTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
@@ -19,34 +18,35 @@ BUILD_DEPENDS=	yasm:devel/yasm \
 		kmk:devel/kBuild \
 		xsltproc:textproc/libxslt
 
+FLAVORS=	xorg xlibre nox11
+FLAVOR?=	${FLAVORS:[1]}
+_SUFFIX=	-additions
+_VER=		${DISTVERSION:R:S|.||}
+${FLAVOR}_PKGNAMESUFFIX=	${${_SUFFIX} ${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-}
+
 USES=		compiler:c++17-lang cpe iconv kmod tar:bzip2
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 USE_RC_SUBR=	vboxguest vboxservice
 
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-alsa \
-			--disable-docs \
-			--disable-libvpx \
-			--disable-opengl \
-			--disable-pulse \
-			--disable-python \
-			--disable-sdl-ttf \
-			--disable-xpcom
-CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-alsa \
+		--disable-docs \
+		--disable-libvpx \
+		--disable-opengl \
+		--disable-pulse \
+		--disable-python \
+		--disable-sdl-ttf \
+		--disable-xpcom \
+		--nofatal \
+		--with-gcc="${CC}" \
+		--with-g++="${CXX}"
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS_INSTALL=	virtualbox-ose-additions-legacy \
-			virtualbox-ose-additions-nox11-legacy \
-			virtualbox-ose-additions \
-			virtualbox-ose-additions-nox11 \
-			virtualbox-ose-additions-70 \
-			virtualbox-ose-additions-nox11-70 \
-			virtualbox-ose-additions-71 \
-			virtualbox-ose-additions-nox11-71
+CONFLICTS_INSTALL=	${PORTNAME}${_SUFFIX}*
 
-PATCHDIR=		${.CURDIR}/../${PORTNAME}-72/files
+PATCHDIR=		${.CURDIR}/../${${PORTNAME} ${_VER}:L:ts-}/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--exclude tools/*.amd64 \
 			--exclude Firmware \
@@ -54,30 +54,28 @@ EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--no-same-owner --no-same-permissions
 PORTSCOUT=		limit:^7\.2\.
 
+BUILD_WRKSRC=		${VBOX_BIN}/src
 WRKSRC=			${WRKDIR}/VirtualBox-${DISTVERSION}
 
 OPTIONS_DEFINE=		DBUS DEBUG X11
+OPTIONS_DEFINE_i386=	PAE
 OPTIONS_DEFAULT=	DBUS X11
+nox11_OPTIONS_EXCLUDE=	DBUS DEBUG X11
+OPTIONS_EXCLUDE=	${${FLAVOR}_OPTIONS_EXCLUDE}
 OPTIONS_SUB=		yes
 
+PAE_DESC=		Build kernel modules for PAE-kernels
 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_USES=		pkgconfig xorg
-X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
+X11_USES=		pkgconfig ${FLAVOR:Mxlibre} xorg
+X11_USE=		${FLAVOR:tu}=${FLAVOR}-server \
+			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-72
-.else
-CONFLICTS_INSTALL+=	virtualbox-ose-additions-72
-.endif
+X11_VARS_OFF=		VBOX_WITH_X11=
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
@@ -87,15 +85,8 @@ VBOX_SBINS=	VBoxControl \
 		VBoxService \
 		mount_vboxvfs
 
-BUILD_WRKSRC=	${VBOX_BIN}/src
-
 KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
-KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys VBOX_ONLY_ADDITIONS=1
-
-.if ${PORT_OPTIONS:MX11}
-.else
-VBOX_WITH_X11=
-.endif
+KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys VBOX_ONLY_ADDITIONS=1
 
 .include <bsd.port.pre.mk>
 
@@ -132,6 +123,9 @@ post-patch:
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
+.if ${PORT_OPTIONS:MPAE}
+	@${ECHO_CMD} 'VBOX_FREEBSD = -DPAE' >> ${WRKSRC}/LocalConfig.kmk
+.endif
 .if ${OSVERSION} >= 1500038
 	@${ECHO_CMD} 'HAVE_MNTOPTS_IN_LIBUTIL = 1' >> \
 	    ${WRKSRC}/LocalConfig.kmk
diff --git a/emulators/virtualbox-ose-additions-legacy/Makefile b/emulators/virtualbox-ose-additions-legacy/Makefile
index db4b8ebbe269..1be6ea30244d 100644
--- a/emulators/virtualbox-ose-additions-legacy/Makefile
+++ b/emulators/virtualbox-ose-additions-legacy/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	virtualbox-ose
 DISTVERSION=	5.2.44
-PORTREVISION?=	10
+PORTREVISION=	11
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${DISTVERSION}/
-PKGNAMESUFFIX?=	-additions-legacy
 DISTNAME=	VirtualBox-${DISTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
@@ -19,34 +18,35 @@ BUILD_DEPENDS=	yasm:devel/yasm \
 		kmk:devel/kBuild \
 		xsltproc:textproc/libxslt
 
+FLAVORS=	xorg xlibre nox11
+FLAVOR?=	${FLAVORS:[1]}
+_SUFFIX=	-additions
+_VER=		legacy
+${FLAVOR}_PKGNAMESUFFIX=	${${_SUFFIX} ${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-}
+
 USES=		compiler:c++11-lang cpe iconv kmod tar:bzip2
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 USE_RC_SUBR=	vboxguest vboxservice
 
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-alsa \
-			--disable-docs \
-			--disable-libvpx \
-			--disable-opengl \
-			--disable-pulse \
-			--disable-python \
-			--disable-sdl-ttf \
-			--disable-xpcom
-CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-alsa \
+		--disable-docs \
+		--disable-libvpx \
+		--disable-opengl \
+		--disable-pulse \
+		--disable-python \
+		--disable-sdl-ttf \
+		--disable-xpcom \
+		--nofatal \
+		--with-gcc="${CC}" \
+		--with-g++="${CXX}"
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS_INSTALL=	virtualbox-ose-additions \
-			virtualbox-ose-additions-nox11 \
-			virtualbox-ose-additions-70 \
-			virtualbox-ose-additions-nox11-70 \
-			virtualbox-ose-additions-71 \
-			virtualbox-ose-additions-nox11-71 \
-			virtualbox-ose-additions-72 \
-			virtualbox-ose-additions-nox11-72
+CONFLICTS_INSTALL=	${PORTNAME}${_SUFFIX}*
 
-PATCHDIR=		${.CURDIR}/../${PORTNAME}-legacy/files
+PATCHDIR=		${.CURDIR}/../${${PORTNAME} ${_VER}:L:ts-}/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--exclude tools/*.amd64 \
 			--exclude Firmware \
@@ -54,11 +54,14 @@ EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--no-same-owner --no-same-permissions
 PORTSCOUT=		limit:^5\.
 
+BUILD_WRKSRC=		${VBOX_BIN}/src
 WRKSRC=			${WRKDIR}/VirtualBox-${DISTVERSION}
 
 OPTIONS_DEFINE=		DBUS DEBUG X11
 OPTIONS_DEFINE_i386=	PAE
 OPTIONS_DEFAULT=	DBUS X11
+nox11_OPTIONS_EXCLUDE=	DBUS DEBUG X11
+OPTIONS_EXCLUDE=	${${FLAVOR}_OPTIONS_EXCLUDE}
 OPTIONS_SUB=		yes
 
 PAE_DESC=		Build kernel modules for PAE-kernels
@@ -67,19 +70,12 @@ 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_USES=		pkgconfig xorg
-X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
+X11_USES=		pkgconfig ${FLAVOR:Mxlibre} xorg
+X11_USE=		${FLAVOR:tu}=${FLAVOR}-server \
+			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-legacy
-.else
-CONFLICTS_INSTALL+=	virtualbox-ose-additions-legacy
-.endif
+X11_VARS_OFF=		VBOX_WITH_X11=
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
@@ -89,15 +85,8 @@ VBOX_SBINS=	VBoxControl \
 		VBoxService \
 		mount_vboxvfs
 
-BUILD_WRKSRC=	${VBOX_BIN}/src
-
 KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
-KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
-
-.if ${PORT_OPTIONS:MX11}
-.else
-VBOX_WITH_X11=
-.endif
+KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 
 .include <bsd.port.pre.mk>
 
@@ -184,10 +173,10 @@ do-install-X11-on:
 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${STAGEDIR}${PREFIX}/share/autostart/
 	${MKDIR} ${STAGEDIR}${VIDEODIR}
-	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_system.so \
+	${INSTALL_LIB} ${VBOX_BIN}/vboxvideo_drv_system.so \
 	    ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
 	${MKDIR} ${STAGEDIR}${INPUTDIR}
-	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \
+	${INSTALL_LIB} ${VBOX_BIN}/vboxmouse_drv_system.so \
 	    ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so
 
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-additions-legacy/pkg-message b/emulators/virtualbox-ose-additions-legacy/pkg-message
index 035001f3083e..9b858849abdb 100644
--- a/emulators/virtualbox-ose-additions-legacy/pkg-message
+++ b/emulators/virtualbox-ose-additions-legacy/pkg-message
@@ -3,22 +3,34 @@
   message: <<EOM
 VirtualBox Guest Additions are installed.
 
-To enable the required services:
+To enable and start the required services:
 
 # sysrc vboxguest_enable="YES"
 # sysrc vboxservice_enable="YES"
 
 To start the services, restart the system.
 
+In some situations, a panic will occur when the kernel module loads.
+Having no more than one virtual CPU might mitigate the issue.
+
 For features such as window scaling and clipboard sharing, membership of
-the wheel group is required. With username jerry as an example:
+the wheel group is required. With username "jerry" as an example:
 
 # pw groupmod wheel -m jerry
 
 The settings dialogue for FreeBSD guests encourages use of the VMSVGA
 graphics controller. Whilst this might suit installations of FreeBSD
-without a desktop environment (a common use case), it may be inappropriate
-where legacy Guest Additions are installed.
+without a desktop environment (a common use case), it is not appropriate
+where Guest Additions are installed.
+
+Where Guest Additions are installed:
+
+1. prefer VBoxSVGA
+
+2. do not enable 3D acceleration (doing so will invisibly
+   lose the preference for VBoxSVGA)
+
+You may ignore the yellow alert that encourages use of VMSVGA.
 EOM
 }
 ]
diff --git a/emulators/virtualbox-ose-additions-nox11-70/Makefile b/emulators/virtualbox-ose-additions-nox11-70/Makefile
deleted file mode 100644
index 8a54512f59a6..000000000000
--- a/emulators/virtualbox-ose-additions-nox11-70/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PORTREVISION=	1
-PKGNAMESUFFIX=	-additions-nox11-70
-
-MASTERDIR=	${.CURDIR}/../virtualbox-ose-additions-70
-
-OPTIONS_EXCLUDE=	DBUS DEBUG OPENGL X11
-
-.include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-additions-nox11-71/Makefile b/emulators/virtualbox-ose-additions-nox11-71/Makefile
deleted file mode 100644
index ef057aa1f5f2..000000000000
--- a/emulators/virtualbox-ose-additions-nox11-71/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	-additions-nox11-71
-
-MASTERDIR=	${.CURDIR}/../virtualbox-ose-additions-71
-
-OPTIONS_EXCLUDE=	DBUS DEBUG OPENGL X11
-
-.include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-additions-nox11-72/Makefile b/emulators/virtualbox-ose-additions-nox11-72/Makefile
deleted file mode 100644
index ed7edcf49366..000000000000
--- a/emulators/virtualbox-ose-additions-nox11-72/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	-additions-nox11-72
-
-MASTERDIR=	${.CURDIR}/../virtualbox-ose-additions-72
-
-OPTIONS_EXCLUDE=	DBUS DEBUG OPENGL X11
-
-.include "${MASTERDIR}/Makefile"
diff --git a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile b/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
deleted file mode 100644
index 7fef05133b84..000000000000
--- a/emulators/virtualbox-ose-additions-nox11-legacy/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PORTREVISION=	9
-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
deleted file mode 100644
index a13626bde395..000000000000
--- a/emulators/virtualbox-ose-additions-nox11/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PORTREVISION=	3
-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 967dbf287ba8..91dd688ec05d 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	virtualbox-ose
 DISTVERSION=	6.1.50
-PORTREVISION?=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.virtualbox.org/virtualbox/${DISTVERSION}/
-PKGNAMESUFFIX?=	-additions
 DISTNAME=	VirtualBox-${DISTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
@@ -22,34 +21,35 @@ BUILD_DEPENDS=	yasm:devel/yasm \
 		kmk:devel/kBuild \
 		xsltproc:textproc/libxslt
 
+FLAVORS=	xorg xlibre nox11
+FLAVOR?=	${FLAVORS:[1]}
+_SUFFIX=	-additions
+_VER=		#
+${FLAVOR}_PKGNAMESUFFIX=	${${_SUFFIX} ${FLAVOR:N${FLAVORS:[1]}} ${_VER}:L:ts-}
+
 USES=		compiler:c++11-lang cpe iconv kmod tar:bzip2
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 USE_RC_SUBR=	vboxguest vboxservice
 
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-alsa \
-			--disable-docs \
-			--disable-libvpx \
-			--disable-opengl \
-			--disable-pulse \
-			--disable-python \
-			--disable-sdl-ttf \
-			--disable-xpcom
-CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-alsa \
+		--disable-docs \
+		--disable-libvpx \
+		--disable-opengl \
+		--disable-pulse \
+		--disable-python \
+		--disable-sdl-ttf \
+		--disable-xpcom \
+		--nofatal \
+		--with-gcc="${CC}" \
+		--with-g++="${CXX}"
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS_INSTALL=	virtualbox-ose-additions-legacy \
-			virtualbox-ose-additions-nox11-legacy \
-			virtualbox-ose-additions-70 \
-			virtualbox-ose-additions-nox11-70 \
-			virtualbox-ose-additions-71 \
-			virtualbox-ose-additions-nox11-71 \
-			virtualbox-ose-additions-72 \
-			virtualbox-ose-additions-nox11-72
+CONFLICTS_INSTALL=	${PORTNAME}${_SUFFIX}*
 
-PATCHDIR=		${.CURDIR}/../${PORTNAME}/files
+PATCHDIR=		${.CURDIR}/../${${PORTNAME} ${_VER}:L:ts-}/files
 EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--exclude tools/*.amd64 \
 			--exclude Firmware \
@@ -57,30 +57,28 @@ EXTRACT_AFTER_ARGS=	--exclude tools/*.x86 \
 			--no-same-owner --no-same-permissions
 PORTSCOUT=		limit:^6\.
 
+BUILD_WRKSRC=		${VBOX_BIN}/src
 WRKSRC=			${WRKDIR}/VirtualBox-${DISTVERSION}
 
 OPTIONS_DEFINE=		DBUS DEBUG X11
+OPTIONS_DEFINE_i386=	PAE
 OPTIONS_DEFAULT=	DBUS X11
+nox11_OPTIONS_EXCLUDE=	DBUS DEBUG X11
+OPTIONS_EXCLUDE=	${${FLAVOR}_OPTIONS_EXCLUDE}
 OPTIONS_SUB=		yes
 
+PAE_DESC=		Build kernel modules for PAE-kernels
 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_USES=		pkgconfig xorg
-X11_USE=		XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt
+X11_USES=		pkgconfig ${FLAVOR:Mxlibre} xorg
+X11_USE=		${FLAVOR:tu}=${FLAVOR}-server \
+			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
-.else
-CONFLICTS_INSTALL+=	virtualbox-ose-additions
-.endif
+X11_VARS_OFF=		VBOX_WITH_X11=
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
@@ -90,15 +88,8 @@ VBOX_SBINS=	VBoxControl \
 		VBoxService \
 		mount_vboxvfs
 
-BUILD_WRKSRC=	${VBOX_BIN}/src
-
 KMK_ARCH=	freebsd.${ARCH:S/i386/x86/}
-KMK_CONFIG+=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
-
-.if ${PORT_OPTIONS:MX11}
-.else
-VBOX_WITH_X11=
-.endif
+KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys
 
 .include <bsd.port.pre.mk>
 
@@ -135,6 +126,9 @@ post-patch:
 	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
 	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
+.if ${PORT_OPTIONS:MPAE}
+	@${ECHO_CMD} 'VBOX_FREEBSD = -DPAE' >> ${WRKSRC}/LocalConfig.kmk
+.endif
 .if ${OSVERSION} >= 1500038
 	@${ECHO_CMD} 'HAVE_MNTOPTS_IN_LIBUTIL = 1' >> \
 	    ${WRKSRC}/LocalConfig.kmk