Attachment #232367 for bug #261522

Lines 5-10 they are unavoidable. Link Here

(-)b/UPDATING (+8 lines)
5	You should get into the habit of checking this file for changes each time	5	You should get into the habit of checking this file for changes each time
6	you update your ports collection, before attempting any port upgrades.	6	you update your ports collection, before attempting any port upgrades.
7		7
		8	20220309:
		9	AFFECTS: users of emulators/virtualbox-ose
		10	AUTHOR: grembo@FreeBSD.org
		11
		12	In order to comply to hier(7), VirtualBox's configuration of non-default
		13	IP ranges to be used in host-only mode moved from /etc/vbox/networks.conf
		14	to ${LOCALBASE}/etc/vbox/networks.conf.
		15
8	20220227:	16	20220227:
9	AFFECTS: users of graphics/bmeps	17	AFFECTS: users of graphics/bmeps
10	AUTHOR: takefu@airport.fm	18	AUTHOR: takefu@airport.fm

Lines 2-7 Link Here

(-)b/emulators/virtualbox-ose/Makefile (+6 lines)
2		2
3	PORTNAME= virtualbox-ose	3	PORTNAME= virtualbox-ose
4	PORTVERSION= 6.1.32	4	PORTVERSION= 6.1.32
		5	PORTREVISION= 1
5	CATEGORIES= emulators	6	CATEGORIES= emulators
6	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/	7	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
7	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}	8	DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
Lines 52-57 VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \ Link Here
52	VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \	53	VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
53	VBoxSVC VBoxXPCOMIPCD	54	VBoxSVC VBoxXPCOMIPCD
54		55
		56	SUB_FILES= pkg-message
		57
55	OPTIONS_DEFINE= AIO ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \	58	OPTIONS_DEFINE= AIO ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS OPUS PULSEAUDIO \
56	PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11	59	PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
57	OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11	60	OPTIONS_DEFAULT= AIO DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
Lines 307-316 post-patch: Link Here
307	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \	310	${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \
308	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk	311	${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk
309	.endif	312	.endif
		313	# Causes a "reinplace" QA warning with default LOCALBASE
310	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	314	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
311	${WRKSRC}/Config.kmk ${WRKSRC}/configure \	315	${WRKSRC}/Config.kmk ${WRKSRC}/configure \
312	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \	316	${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
313	${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \	317	${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
		318	${WRKSRC}/src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp \
314	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py	319	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
315	@${REINPLACE_CMD} \	320	@${REINPLACE_CMD} \
316	-e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' \	321	-e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' \
Lines 321-326 post-patch: Link Here
321	${WRKSRC}/src/VBox/Runtime/Makefile.kmk	326	${WRKSRC}/src/VBox/Runtime/Makefile.kmk
322	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk	327	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
323	.endif	328	.endif
		329	# Causes a "reinplace" QA warning with default PREFIX/VBOX_DIR
324	@${REINPLACE_CMD} -e 's\|/usr/local/lib/virtualbox\|${VBOX_DIR}\|' \	330	@${REINPLACE_CMD} -e 's\|/usr/local/lib/virtualbox\|${VBOX_DIR}\|' \
325	-e 's\|/usr/local\|${PREFIX}\|' \	331	-e 's\|/usr/local\|${PREFIX}\|' \
326	${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh	332	${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh

Lines 1-6 Link Here

(-)b/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh (-3 / +10 lines)
1	--- src/VBox/Installer/freebsd/VBox.sh.orig 2016-08-27 05:10:34 UTC	1	--- src/VBox/Installer/freebsd/VBox.sh.orig 2016-08-27 05:10:34 UTC
2	+++ src/VBox/Installer/freebsd/VBox.sh	2	+++ src/VBox/Installer/freebsd/VBox.sh
3	@@ -0,0 +1,67 @@	3	@@ -0,0 +1,74 @@
4	+#!/bin/sh	4	+#!/bin/sh
5	+#	5	+#
6	+# Oracle VM VirtualBox startup script, FreeBSD hosts.	6	+# Oracle VM VirtualBox startup script, FreeBSD hosts.
Lines 26-35 Link Here
26	+ test -f /usr/local/lib/virtualbox/VBoxRT.so; then	26	+ test -f /usr/local/lib/virtualbox/VBoxRT.so; then
27	+ INSTALL_DIR=/usr/local/lib/virtualbox	27	+ INSTALL_DIR=/usr/local/lib/virtualbox
28	+ else	28	+ else
29	+ echo "Could not find VirtualBox installation. Please reinstall."	29	+ >&2 echo "Could not find VirtualBox installation. Please reinstall."
30	+ exit 1	30	+ exit 1
31	+ fi	31	+ fi
32	+	32	+
		33	+if [ -d /etc/vbox ]; then
		34	+ >&2 cat <<-EOH
		35	+ WARNING: Directory /etc/vbox found, but ignored. VirtualBox
		36	+ configuration files are stored in /usr/local/etc/vbox/.
		37	+ EOH
		38	+fi
		39	+
33	+# workaround for the KDE dialog problem	40	+# workaround for the KDE dialog problem
34	+KDE_FORK_SLAVES=1; export KDE_FORK_SLAVES	41	+KDE_FORK_SLAVES=1; export KDE_FORK_SLAVES
35	+	42	+
Lines 63-69 Link Here
63	+ exec "$INSTALL_DIR/vboxwebsrv" "$@"	70	+ exec "$INSTALL_DIR/vboxwebsrv" "$@"
64	+ ;;	71	+ ;;
65	+ *)	72	+ *)
66	+ echo "Unknown application - $APP"	73	+ >&2 echo "Unknown application - $APP"
67	+ exit 1	74	+ exit 1
68	+ ;;	75	+ ;;
69	+esac	76	+esac

Added Link Here

(-)b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_adpctl_VBoxNetAdpCtl.cpp (+11 lines)
1	--- src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp.orig 2022-01-13 18:57:40 UTC
2	+++ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp
3	@@ -737,7 +737,7 @@ int Adapter::doIOCtl(unsigned long iCmd, VBOXNETADPREQ
4	* Global config file implementation *
5	*********************************************************************************************************************************/
6
7	-#define VBOX_GLOBAL_NETWORK_CONFIG_PATH "/etc/vbox/networks.conf"
8	+#define VBOX_GLOBAL_NETWORK_CONFIG_PATH "/usr/local/etc/vbox/networks.conf"
9	#define VBOXNET_DEFAULT_IPV4MASK "255.255.255.0"
10
11	class NetworkAddress

Lines 60-65 vfs.aio.max_aio_per_proc=8192 Link Here

(-)b/emulators/virtualbox-ose/files/pkg-message.in (-1 / +15 lines)
60	vfs.aio.max_aio_queue=65536	60	vfs.aio.max_aio_queue=65536
61	To check if AIO is used use: kldstat -v \| grep aio	61	To check if AIO is used use: kldstat -v \| grep aio
62		62
		63	When assigning IP addresses in host-only mode from ranges outside
		64	of VirtualBox's defaults, the respective ranges need to be listed
		65	in %%LOCALBASE%%/etc/vbox/networks.conf (PR#259399).
		66
63	Check wiki page for known issues and troubleshooting:	67	Check wiki page for known issues and troubleshooting:
64	http://wiki.freebsd.org/VirtualBox	68	http://wiki.freebsd.org/VirtualBox
65		69
Lines 78-81 machines using the Pulseaudio host audio driver to use another Link Here
78	supported one.	82	supported one.
79	EOM	83	EOM
80	}	84	}
		85	{ type: upgrade
		86	minimum_version: 6.1.26
		87	maximum_version: 6.1.32_1
		88	message: <<EOM
		89	To comply to hier(7) requirements, networks.conf's location changed
		90	to %%LOCALBASE%%/etc/vbox/networks.conf.
		91
		92	In case /etc/vbox/networks.conf exists, it needs to be moved to
		93	%%LOCALBASE%%/etc/vbox and /etc/vbox should be deleted.
		94	EOM
		95	}
81	]	96	]
82	-

Return to bug 261522