Index: head/emulators/virtualbox-ose/Makefile =================================================================== --- head/emulators/virtualbox-ose/Makefile (revision 421520) +++ head/emulators/virtualbox-ose/Makefile (revision 421521) @@ -1,382 +1,428 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.0.26 -PORTREVISION= 1 +PORTVERSION= 5.1.4 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} EXTRACT_ONLY= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER?= vbox@FreeBSD.org COMMENT= General-purpose full virtualizer for x86 hardware LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:devel/yasm \ xsltproc:textproc/libxslt \ kmk:devel/kBuild \ gtar:archivers/gtar \ cdrecord:sysutils/cdrtools LIB_DEPENDS= libpng.so:graphics/png \ libxslt.so:textproc/libxslt \ libcurl.so:ftp/curl RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod \ cdrecord:sysutils/cdrtools CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} ONLY_FOR_ARCHS= i386 amd64 USES= compiler cpe iconv pkgconfig ssl tar:bzip2 USE_GNOME= libidl libxml2 HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-java --passive-mesa CONFIGURE_ARGS+= --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-additions-[4,5]* \ virtualbox-ose-additions-devel-4* \ virtualbox-ose-devel-4* \ virtualbox-ose-legacy-4* .if defined(LITE) -CONFIGURE_ARGS+= --disable-alsa --disable-dbus --disable-docs \ - --disable-pulse --disable-qt4 --disable-libvpx \ - --build-headless +CONFIGURE_ARGS+= --build-headless --disable-alsa --disable-dbus \ + --disable-docs --disable-libvpx --disable-pulse CONFLICTS_INSTALL+= ${PORTNAME}-[4,5]* PKGNAMESUFFIX= -lite PLIST_SUB= GUESTADDITIONS="@comment " MANUAL="@comment " \ - NLS="@comment " QT4="@comment " X11="@comment " + NLS="@comment " QT="@comment " X11="@comment " .else CONFLICTS_INSTALL+= ${PORTNAME}-lite-[4,5]* .endif VBOXUSER?= vboxusers VBOXWSUSER?= vboxusers VBOXGROUP?= vboxusers USERS= ${VBOXUSER} GROUPS= ${VBOXGROUP} -VBOX_DIR= ${PREFIX}/lib/virtualbox +VBOX_DIR= ${PREFIX}/${VBOX_DIR_REL} +VBOX_DIR_REL= lib/virtualbox VBOX_LINKS= VBoxVRDP -VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxHeadless VBoxManage +VBOX_PROGS= VBoxAutostart VBoxBalloonCtrl VBoxBugReport VBoxHeadless \ + VBoxManage VBOX_UTILS= VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \ VBoxSVC VBoxXPCOMIPCD OPTIONS_DEFINE= PYTHON R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE OPTIONS_DEFAULT= UDPTUNNEL VNC .if !defined(LITE) OPTIONS_DEFINE+= ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO -OPTIONS_DEFINE+= QT4 VPX X11 -OPTIONS_DEFAULT+= DBUS PYTHON QT4 WEBSERVICE X11 +OPTIONS_DEFINE+= VPX X11 +OPTIONS_DEFAULT+= DBUS PYTHON QT5 WEBSERVICE X11 +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= QT4 QT5 .endif OPTIONS_SUB= yes DEBUG_DESC= Debug symbols, additional logs and assertions GUESTADDITIONS_DESC= Build with Guest Additions MANUAL_DESC= Build with user manual QT4_DESC= Build with QT4 Frontend +QT5_DESC= Build with QT5 Frontend R0LOGGING_DESC= Enable R0 logging UDPTUNNEL_DESC= Build with UDP tunnel support VDE_DESC= Build with VDE support VNC_DESC= Build with VNC support VPX_DESC= Use vpx for video capturing WEBSERVICE_DESC= Build Webservice MANUAL_BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml PYTHON_CONFIGURE_OFF= --disable-python UDPTUNNEL_CONFIGURE_OFF= --disable-udptunnel VDE_CONFIGURE_ON= --enable-vde VDE_RUN_DEPENDS= vde_switch:net/vde2 VNC_CONFIGURE_ON= --enable-vnc VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver .if !defined(LITE) ALSA_CONFIGURE_OFF= --disable-alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib DBUS_CONFIGURE_OFF= --disable-dbus DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DEBUG_CONFIGURE_ON= --build-debug MANUAL_CONFIGURE_OFF= --disable-docs PULSEAUDIO_CONFIGURE_OFF= --disable-pulse PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -QT4_CONFIGURE_OFF= --disable-qt4 VPX_CONFIGURE_OFF= --disable-libvpx VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx X11_CONFIGURE_OFF= --build-headless .endif # bmake doesn't know about unsetenv=true .if defined(.PARSEDIR) ENV= .export ENV .else .SHELL: path="/bin/sh" unsetenv=true .endif PLIST_SUB+= GUEST_VER=${PORTVERSION} \ PYTHON_VER=${PYTHON_VER} \ PYTHON_VERU=${PYTHON_VER:S/./_/} \ VBOXGROUP=${VBOXGROUP} SUB_LIST+= VBOXDIR=${VBOX_DIR} \ VBOXGROUP=${VBOXGROUP} \ VBOXUSER=${VBOXUSER} \ VBOXWSUSER=${VBOXWSUSER} USE_RC_SUBR+= vboxheadless vboxwatchdog .include -.if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT4) && !defined(LITE) -BROKEN= NLS support requires QT4 frontend. Run 'make config' again! +.if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT[45]) && !defined(LITE) +BROKEN= NLS support requires QT frontend. Run 'make config' again! .endif -.if ${PORT_OPTIONS:MQT4} && empty(PORT_OPTIONS:MX11) -BROKEN= QT4 frontend requires X11 support. Run 'make config' again! +.if ${PORT_OPTIONS:MQT[45]} && empty(PORT_OPTIONS:MX11) +BROKEN= QT frontend requires X11 support. Run 'make config' again! .endif .if ${PORT_OPTIONS:MDEBUG} KMK_BUILDTYPE= debug KMK_FLAGS+= BUILD_TYPE=debug .else KMK_BUILDTYPE= release .endif .if ${PORT_OPTIONS:MR0LOGGING} && empty(PORT_OPTIONS:MDEBUG) BROKEN= R0 logging requires debug build .endif .if ${PORT_OPTIONS:MGUESTADDITIONS} GUESTADDITIONS= VBoxGuestAdditions_${PORTVERSION}.iso RESTRICTED= for personal use only RESTRICTED_FILES= ${GUESTADDITIONS} .endif .if ${PORT_OPTIONS:MMANUAL} DBKXMLDIR= ${LOCALBASE}/share/xml/docbook/4.4 DBKXSLDIR= ${LOCALBASE}/share/xsl/docbook USE_TEX= dvipsk:build formats:build .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python:2 USE_PYTHON= distutils noegginfo PYDISTUTILS_PKGNAME= vboxapi PYDISTUTILS_PKGVERSION= 1.0 .else USES+= python:build .endif -.if ${PORT_OPTIONS:MQT4} +.if ${PORT_OPTIONS:MQT[45]} +PLIST_SUB+= QT="" QT_NONSTANDARD= yes USE_GL= gl -USE_QT4= corelib gui linguist_build moc_build network -USE_QT4+= opengl rcc_build uic_build +USE_XORG= xcb INSTALLS_ICONS= yes VBOX_PROGS+= VirtualBox VBOX_UTILS+= VBoxTestOGL -VBOX_WITH_QT4= 1 +VBOX_WITH_QT= 1 +.if ${PORT_OPTIONS:MQT4} +CONFIGURE_ARGS+= --enable-qt4 +USE_QT4= corelib gui linguist_build moc_build network opengl +USE_QT4+= rcc_build uic_build .else -VBOX_WITH_QT4= +CONFIGURE_ARGS+= --enable-qt5 +USE_QT5= buildtools_build core dbus gui linguist_build opengl +USE_QT5+= printsupport widgets x11extras .endif +.else +CONFIGURE_ARGS+= --disable-qt +PLIST_SUB+= QT="@comment " +.endif .if ${PORT_OPTIONS:MWEBSERVICE} BUILD_DEPENDS+= soapcpp2:devel/gsoap USE_RC_SUBR+= vboxwebsrv VBOX_LINKS+= vboxwebsrv VBOX_UTILS+= vboxwebsrv webtest .endif .if ${PORT_OPTIONS:MX11} USE_SDL= sdl -USE_XORG= inputproto x11 xcursor xext xinerama xmu xt +USE_XORG+= inputproto x11 xcursor xext xinerama xmu xt VBOX_PROGS+= VBoxSDL .endif .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE} PLIST_SUB+= SDK="" .else PLIST_SUB+= SDK="@comment " .endif .if ${ARCH} == i386 KMK_ARCH= freebsd.x86 PLIST_SUB+= I386="" .else KMK_ARCH= freebsd.${ARCH} PLIST_SUB+= I386="@comment " .endif PLIST_SUB+= ARCH="${KMK_ARCH}" KMK_BUILDDIR= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE} KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_FLAGS+= -j${MAKE_JOBS_NUMBER} .include .if ${COMPILER_TYPE} == clang PATCH_DEPENDS+= ${LOCALBASE}/share/kBuild/tools/GXX3.kmk:devel/kBuild EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ ${PATCHDIR}/extrapatch-src-VBox-Devices-PC-ipxe-Makefile.kmk \ ${PATCHDIR}/extrapatch-src-recompiler-Makefile.kmk .endif .if ${SSL_DEFAULT} != base CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" .endif pre-everything:: .if ${ARCH} == "amd64" .if !exists(/usr/lib32/libc.so) @${ECHO} 'Requires 32-bit libraries installed under /usr/lib32.' @${ECHO} 'Do: cd /usr/src; make build32 install32; /etc/rc.d/ldconfig restart' @${FALSE} .endif .endif post-patch: - @${ECHO} 'TOOL_QT4_BIN_SUFF = -qt4' > ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' >> \ + @${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_RUNPATH = ${VBOX_DIR}' >> \ ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> \ + ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk .if ${SSL_DEFAULT} != base @${ECHO} 'VBOX_WITH_ALT_HASH_CODE = 1' >> ${WRKSRC}/LocalConfig.kmk .endif @${ECHO} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> \ + ${WRKSRC}/LocalConfig.kmk @${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT4}' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT4}' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT}' >> \ + ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT}' >> \ + ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk -.if ${PORT_OPTIONS:MWEBSERVICE} - @${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk +.if empty(PORT_OPTIONS:MALSA) + @${ECHO} 'VBOX_WITH_AUDIO_ALSA =' >> ${WRKSRC}/LocalConfig.kmk .endif +.if empty(PORT_OPTIONS:MPULSEAUDIO) + @${ECHO} 'VBOX_WITH_AUDIO_PULSE =' >> ${WRKSRC}/LocalConfig.kmk +.endif +.if ${PORT_OPTIONS:MQT4} + @${ECHO} 'TOOL_QT4_BIN_SUFF = -qt4' >> ${WRKSRC}/LocalConfig.kmk +.endif +.if empty(PORT_OPTIONS:MQT5) + @${ECHO} 'VBOX_WITH_QTGUI_V5 =' >> ${WRKSRC}/LocalConfig.kmk +.endif .if ${PORT_OPTIONS:MR0LOGGING} @${ECHO} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk .endif +.if ${PORT_OPTIONS:MWEBSERVICE} + @${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> \ + ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> \ + ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> \ + ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> \ + ${WRKSRC}/LocalConfig.kmk +.endif .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk - @${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk - @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> ${WRKSRC}/LocalConfig.kmk + @${REINPLACE_CMD} -e 's| -fpermissive||' ${WRKSRC}/Config.kmk \ + ${WRKSRC}/src/VBox/Main/webservice/Makefile.kmk + @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> \ + ${WRKSRC}/LocalConfig.kmk @${ECHO} 'TOOL_VBoxGccFreeBSD_LD = ${CXX}' >> ${WRKSRC}/LocalConfig.kmk - @${SED} -e 's|GXX3|VBoxGccFreeBSD|g' ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk + @${SED} -e 's|GXX3|VBoxGccFreeBSD|g' \ + ${LOCALBASE}/share/kBuild/tools/GXX3.kmk > \ + ${WRKSRC}/tools/kBuildTools/VBoxGccFreeBSD.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/Config.kmk ${WRKSRC}/configure \ - ${WRKSRC}/kBuild/units/qt3.kmk ${WRKSRC}/kBuild/units/qt4.kmk \ - ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ - ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py - @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure + ${WRKSRC}/Config.kmk ${WRKSRC}/configure \ + ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \ + ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ + ${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py + @${REINPLACE_CMD} \ + -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \ + ${WRKSRC}/configure .if empty(ICONV_LIB) @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \ ${WRKSRC}/src/VBox/Runtime/Makefile.kmk @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local/lib/virtualbox|${VBOX_DIR}|' \ -e 's|/usr/local|${PREFIX}|' \ ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh do-build: - cd ${WRKSRC} && \ - ${SH} -c '. ${WRKSRC}/env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' + cd ${WRKSRC} && ${SH} -c '. ${WRKSRC}/env.sh && \ + ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' .if ${PORT_OPTIONS:MPYTHON} - ${PYTHON_CMD} -mcompileall ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom + ${PYTHON_CMD} -mcompileall \ + ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom .endif do-install: ${MKDIR} ${STAGEDIR}${DATADIR} - cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR} + cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \ + ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${PREFIX}/include/virtualbox - cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox + cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && \ + ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox ${MKDIR} ${STAGEDIR}${VBOX_DIR} cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \ "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR} - ${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR} + ${LN} -fs ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR} ${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \ ${STAGEDIR}${VBOX_DIR} .for f in ${VBOX_PROGS} ${VBOX_UTILS} ${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${VBOX_DIR} .endfor .for f in ${VBOX_PROGS} ${VBOX_LINKS} - ${LN} -sf ${VBOX_DIR}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f} + ${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f} .endfor .for f in ${VBOX_PROGS} - ${LN} -sf ${VBOX_DIR}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f:tl} + ${LN} -fs ../${VBOX_DIR_REL}/VBox.sh ${STAGEDIR}${PREFIX}/bin/${f:tl} .endfor .if ${PORT_OPTIONS:MGUESTADDITIONS} ${MKDIR} ${STAGEDIR}${VBOX_DIR}/additions ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} \ ${STAGEDIR}${VBOX_DIR}/additions/ - ${LN} -sf ${VBOX_DIR}/additions/${GUESTADDITIONS} \ + ${LN} -fs ${VBOX_DIR}/additions/${GUESTADDITIONS} \ ${STAGEDIR}${VBOX_DIR}/additions/VBoxGuestAdditions.iso .endif .if ${PORT_OPTIONS:MMANUAL} ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${KMK_BUILDDIR}/bin/UserManual*.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${KMK_BUILDDIR}/bin/UserManual*.pdf \ + ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MNLS} && !defined(LITE) - cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls + cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && \ + ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls .endif .if ${PORT_OPTIONS:MPYTHON} cd ${KMK_BUILDDIR}/bin/sdk/installer && \ ${SETENV} VBOX_INSTALL_PATH="${VBOX_DIR}" \ ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR} @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom && \ ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom @${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python - ${LN} -sf ${PYTHON_SITELIBDIR}/xpcom \ + ${LN} -fs ${PYTHON_SITELIBDIR}/xpcom \ ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python .endif -.if ${PORT_OPTIONS:MQT4} - ${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png - ${INSTALL_DATA} ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop +.if ${PORT_OPTIONS:MQT[45]} + ${INSTALL_DATA} \ + ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/VBox.png + ${INSTALL_DATA} \ + ${WRKSRC}/src/VBox/Installer/freebsd/virtualbox.desktop \ + ${STAGEDIR}${PREFIX}/share/applications/virtualbox.desktop .endif .if ${PORT_OPTIONS:MVNC} ${MKDIR} ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH} ${INSTALL_DATA} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/ExtPack* \ ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/ ${INSTALL_LIB} ${KMK_BUILDDIR}/bin/ExtensionPacks/VNC/${KMK_ARCH}/* \ ${STAGEDIR}${VBOX_DIR}/ExtensionPacks/VNC/${KMK_ARCH}/ .endif .if ${PORT_OPTIONS:MWEBSERVICE} ${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice ${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \ ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/ .endif .include Index: head/emulators/virtualbox-ose/distinfo =================================================================== --- head/emulators/virtualbox-ose/distinfo (revision 421520) +++ head/emulators/virtualbox-ose/distinfo (revision 421521) @@ -1,5 +1,5 @@ -TIMESTAMP = 1468866832 -SHA256 (VirtualBox-5.0.26.tar.bz2) = 78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e -SIZE (VirtualBox-5.0.26.tar.bz2) = 111244869 -SHA256 (VBoxGuestAdditions_5.0.26.iso) = 7458ee5a7121a7d243fd6a7528ba427945d9120c5efc7cd75b3951fb01f09c59 -SIZE (VBoxGuestAdditions_5.0.26.iso) = 58232832 +TIMESTAMP = 1472243715 +SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf +SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581 +SHA256 (VBoxGuestAdditions_5.1.4.iso) = e385b698338003595f6cdeee7b631ec6713058ba1227d1f2a1da342bdf741982 +SIZE (VBoxGuestAdditions_5.1.4.iso) = 59262976 Index: head/emulators/virtualbox-ose/files/patch-include_iprt_string.h =================================================================== --- head/emulators/virtualbox-ose/files/patch-include_iprt_string.h (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-include_iprt_string.h (nonexistent) @@ -1,11 +0,0 @@ ---- include/iprt/string.h.orig 2015-10-15 11:50:51 UTC -+++ include/iprt/string.h -@@ -107,7 +107,7 @@ char *strpbrk(const char *pszStr, const - RT_C_DECLS_END - #endif - --#if !defined(RT_OS_LINUX) || !defined(_GNU_SOURCE) -+#if !defined(RT_OS_FREEBSD) && (!defined(RT_OS_LINUX) || !defined(_GNU_SOURCE)) - RT_C_DECLS_BEGIN - void *memrchr(const char *pv, int ch, size_t cb); - RT_C_DECLS_END Property changes on: head/emulators/virtualbox-ose/files/patch-include_iprt_string.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_load.c =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_load.c (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_load.c (nonexistent) @@ -1,34 +0,0 @@ ---- src/VBox/Additions/common/crOpenGL/load.c.orig 2016-07-18 11:50:44 UTC -+++ src/VBox/Additions/common/crOpenGL/load.c -@@ -1123,7 +1123,7 @@ stubInit(void) - return bRc; - } - --#if defined(Linux) && !defined(VBOXOGL_FAKEDRI) -+#if (defined(Linux) || defined(FreeBSD)) && !defined(VBOXOGL_FAKEDRI) - # include - /* We only support being used by GLX clients. If the X server GLX extension - * tries to use our OpenGL library it will fail, as it is written specifically -@@ -1136,7 +1136,7 @@ stubInit(void) - * can do, better for GLX to fail than the whole X server). To keep things as - * simple and fail-safe as possible, we use a fixed path to the system GL - * library. */ --#ifndef RTLD_DEEPBIND -+#if defined(Linux) && !defined(RTLD_DEEPBIND) - # define RTLD_DEEPBIND 0x8 - #endif - -@@ -1146,8 +1146,13 @@ void __attribute__ ((constructor)) check - - if (!pszDisplay || !*pszDisplay) - { -+#ifdef Linux - dlopen("/var/lib/VBoxGuestAdditions/lib/system/libGL.so.1", RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND); - dlopen("/var/lib/VBoxGuestAdditions/lib/system/libEGL.so.1", RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND); -+#else -+ dlopen("/usr/local/lib/.mesa/libGL.so.1", RTLD_LAZY | RTLD_GLOBAL); -+ dlopen("/usr/local/lib/.mesa/libEGL.so.1", RTLD_LAZY | RTLD_GLOBAL); -+#endif - } - } - #endif Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_load.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk (nonexistent) @@ -1,29 +0,0 @@ ---- src/VBox/Devices/Makefile.kmk.orig 2016-07-18 11:54:57 UTC -+++ src/VBox/Devices/Makefile.kmk -@@ -547,7 +547,7 @@ if !defined(VBOX_ONLY_EXTPACKS) - Audio/DrvHostDSound.cpp - endif - -- ifeq ($(KBUILD_TARGET),linux) -+ if1of ($(KBUILD_TARGET), freebsd linux) - ifdef VBOX_WITH_OSS - VBoxDD_DEFS += VBOX_WITH_OSS - VBoxDD_SOURCES += \ -@@ -569,17 +569,6 @@ if !defined(VBOX_ONLY_EXTPACKS) - endif - endif - -- ifeq ($(KBUILD_TARGET),freebsd) -- VBoxDD_SOURCES += \ -- Audio/DrvHostOSSAudio.cpp -- ifdef VBOX_WITH_PULSE -- VBoxDD_DEFS += VBOX_WITH_PULSE -- VBoxDD_SOURCES += \ -- Audio/DrvHostPulseAudio.cpp \ -- Audio/pulse_stubs.c -- endif -- endif -- - ifeq ($(KBUILD_TARGET),solaris) - ifdef VBOX_WITH_OSS - VBoxDD_SOURCES += Audio/DrvHostOSSAudio.cpp Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Makefile.kmk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-include-VBox-com-array.h =================================================================== --- head/emulators/virtualbox-ose/files/patch-include-VBox-com-array.h (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-include-VBox-com-array.h (nonexistent) @@ -1,29 +0,0 @@ ---- include/VBox/com/array.h.orig 2015-03-02 10:06:38.000000000 -0500 -+++ include/VBox/com/array.h 2015-03-12 17:52:37.107759000 -0400 -@@ -908,12 +908,12 @@ - */ - const T operator[] (size_t aIdx) const - { -- AssertReturn(m.arr != NULL, *((T *)NULL)); -- AssertReturn(aIdx < size(), *((T *)NULL)); -+ Assert(m.arr != NULL); -+ Assert(aIdx < size()); - #ifdef VBOX_WITH_XPCOM - return m.arr[aIdx]; - #else -- AssertReturn(m.raw != NULL, *((T *)NULL)); -+ Assert(m.raw != NULL); - return m.raw[aIdx]; - #endif - } -@@ -1409,8 +1409,8 @@ - */ - const nsID &operator[] (size_t aIdx) const - { -- AssertReturn(m.arr != NULL, **((const nsID * *)NULL)); -- AssertReturn(aIdx < size(), **((const nsID * *)NULL)); -+ Assert(m.arr != NULL); -+ Assert(aIdx < size()); - return *m.arr[aIdx]; - } - Property changes on: head/emulators/virtualbox-ose/files/patch-include-VBox-com-array.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_VBoxClient_display.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_VBoxClient_display.cpp (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_VBoxClient_display.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/VBox/Additions/x11/VBoxClient/display.cpp.orig 2016-07-18 11:50:46 UTC -+++ src/VBox/Additions/x11/VBoxClient/display.cpp -@@ -75,8 +75,8 @@ static unsigned char *getRootProperty(st - { - Atom actualType = None; - int iFormat = 0; -- ulong cReturned = 0; -- ulong cAfter = 0; -+ unsigned long cReturned = 0; -+ unsigned long cAfter = 0; - unsigned char *pData = 0; - - if (XGetWindowProperty(pState->pDisplay, DefaultRootWindow(pState->pDisplay), Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_VBoxClient_display.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_build_VBoxDD.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_build_VBoxDD.cpp (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_build_VBoxDD.cpp (nonexistent) @@ -1,25 +0,0 @@ ---- src/VBox/Devices/build/VBoxDD.cpp.orig 2016-07-18 11:55:27 UTC -+++ src/VBox/Devices/build/VBoxDD.cpp -@@ -286,7 +286,7 @@ extern "C" DECLEXPORT(int) VBoxDriversRe - if (RT_FAILURE(rc)) - return rc; - #endif --#if defined(RT_OS_LINUX) -+#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) - # ifdef VBOX_WITH_PULSE - rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostPulseAudio); - if (RT_FAILURE(rc)) -@@ -302,12 +302,7 @@ extern "C" DECLEXPORT(int) VBoxDriversRe - if (RT_FAILURE(rc)) - return rc; - # endif --#endif /* RT_OS_LINUX */ --#if defined(RT_OS_FREEBSD) -- rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio); -- if (RT_FAILURE(rc)) -- return rc; --#endif -+#endif /* RT_OS_LINUX || RT_OS_FREEBSD */ - #if defined(RT_OS_DARWIN) - rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostCoreAudio); - if (RT_FAILURE(rc)) Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_build_VBoxDD.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyServiceFreeBSD.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyServiceFreeBSD.cpp (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyServiceFreeBSD.cpp (nonexistent) @@ -1,28 +0,0 @@ ---- src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp.orig 2016-07-18 11:56:36 UTC -+++ src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp -@@ -322,21 +322,21 @@ PUSBDEVICE USBProxyServiceFreeBSD::getDe - - if (UsbDevInfo.udi_vendor[0] != '\0') - { -+ USBLibPurgeEncoding(UsbDevInfo.udi_vendor); - pDevice->pszManufacturer = RTStrDupN(UsbDevInfo.udi_vendor, sizeof(UsbDevInfo.udi_vendor)); -- USBLibPurgeEncoding(pDevice->pszManufacturer); - } - - if (UsbDevInfo.udi_product[0] != '\0') - { -+ USBLibPurgeEncoding(UsbDevInfo.udi_product); - pDevice->pszProduct = RTStrDupN(UsbDevInfo.udi_product, sizeof(UsbDevInfo.udi_product)); -- USBLibPurgeEncoding(pDevice->pszProduct); - } - - if (UsbDevInfo.udi_serial[0] != '\0') - { -+ USBLibPurgeEncoding(UsbDevInfo.udi_serial); - pDevice->pszSerialNumber = RTStrDupN(UsbDevInfo.udi_serial, sizeof(UsbDevInfo.udi_serial)); -- USBLibPurgeEncoding(pDevice->pszSerialNumber); -- pDevice->u64SerialHash = USBLibHashSerial(pDevice->pszSerialNumber); -+ pDevice->u64SerialHash = USBLibHashSerial(UsbDevInfo.udi_serial); - } - rc = ioctl(FileUsb, USB_GET_PLUGTIME, &PlugTime); - if (rc == 0) Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyServiceFreeBSD.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-Config.kmk =================================================================== --- head/emulators/virtualbox-ose/files/patch-Config.kmk (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-Config.kmk (revision 421521) @@ -1,145 +1,173 @@ ---- Config.kmk.orig 2016-07-18 11:50:32 UTC +--- Config.kmk.orig 2016-08-16 19:55:20 UTC +++ Config.kmk -@@ -341,7 +341,7 @@ VBOX_WITH_DOCS = 1 +@@ -348,7 +348,7 @@ VBOX_WITH_DOCS = 1 # Include documentation in the package VBOX_WITH_DOCS_PACKING = 1 # Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM) -ifn1of ($(KBUILD_TARGET), linux) +ifn1of ($(KBUILD_TARGET), freebsd linux) VBOX_WITH_DOCS_CHM = 1 endif # By default only include translations in documentation-only builds -@@ -422,22 +422,22 @@ ifn1of ($(KBUILD_TARGET), win darwin) +@@ -431,11 +431,11 @@ ifn1of ($(KBUILD_TARGET), win darwin) # Enable OSS audio support. - VBOX_WITH_OSS = 1 + VBOX_WITH_AUDIO_OSS = 1 endif -if1of ($(KBUILD_TARGET), linux) +if1of ($(KBUILD_TARGET), freebsd linux) # Enable ALSA audio support. - VBOX_WITH_ALSA = 1 + VBOX_WITH_AUDIO_ALSA = 1 endif -if1of ($(KBUILD_TARGET), linux) +if1of ($(KBUILD_TARGET), freebsd linux) # Enable PulseAudio audio support. - VBOX_WITH_PULSE = 1 + VBOX_WITH_AUDIO_PULSE = 1 endif +@@ -446,11 +446,11 @@ endif # Enable PCI passthrough support. VBOX_WITH_PCI_PASSTHROUGH = 1 # Enable statically linked dbus support. -if1of ($(KBUILD_TARGET), linux solaris) +if1of ($(KBUILD_TARGET), freebsd linux solaris) VBOX_WITH_DBUS = 1 endif # Enable building PAM modules. -if1of ($(KBUILD_TARGET), linux solaris) +if1of ($(KBUILD_TARGET), freebsd linux solaris) VBOX_WITH_PAM = 1 endif - # Disable WINMM support for Windows (not implemented). -@@ -627,7 +627,7 @@ VBOX_WITH_VDITOOL = + # Enable internal networking. +@@ -591,7 +591,7 @@ VBOX_WITH_WEBSERVICES = 1 + VBOX_WITH_WEBSERVICES_SSL = 1 + # The Qt GUI. + VBOX_WITH_QTGUI = 1 +-if1of ($(KBUILD_TARGET), linux win solaris) ++if1of ($(KBUILD_TARGET), freebsd linux win solaris) + VBOX_WITH_QTGUI_V5 = 1 # r=bird: s/VBOX_WITH_QTGUI_V5/VBOX_WITH_QT5/g - our we released version 5.0 of the VirtualBox GUI last year, remember? + else if "$(KBUILD_TARGET)" == "darwin" && $(KBUILD_HOST_VERSION_MAJOR) >= 13 # (OS X 10.9 Mavericks) + VBOX_WITH_QTGUI_V5 = 1 +@@ -651,7 +651,7 @@ VBOX_WITH_VDITOOL = # Enable this to build vbox-img even if VBOX_WITH_TESTCASES is disabled VBOX_WITH_VBOX_IMG = # Enables the VPX module for VM video capturing -if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64) +if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.x86 darwin.amd64 freebsd.x86 freebsd.amd64 linux.x86 linux.amd64 solaris.amd64 win.x86 win.amd64) VBOX_WITH_VPX = 1 endif # Enable shared folders -@@ -935,10 +935,6 @@ ifeq ($(KBUILD_TARGET),darwin) +@@ -961,10 +961,6 @@ ifeq ($(KBUILD_TARGET),darwin) VBOX_WITH_VBOXSDL= endif -ifeq ($(KBUILD_TARGET),freebsd) - VBOX_WITH_DOCS= -endif - ifeq ($(KBUILD_TARGET),haiku) # Don't bother with SDL ttf for now. VBOX_WITH_SECURELABEL= -@@ -1096,7 +1092,7 @@ ifdef VBOX_OSE +@@ -1123,7 +1119,7 @@ ifdef VBOX_OSE VBOX_WITH_KCHMVIEWER= VBOX_WITH_PLUGIN_CRYPT= VBOX_WITH_DRAG_AND_DROP_PROMISES= - ifn1of ($(KBUILD_TARGET), linux) + ifn1of ($(KBUILD_TARGET), freebsd linux) VBOX_WITH_DOCS= VBOX_WITH_DOCS_PACKING= endif -@@ -3912,7 +3908,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = +@@ -2562,7 +2558,7 @@ $(PATH_OUT)/DynamicConfig.kmk: \ + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-delete-non-virtual-dtor ?= $(call VBOX_GCC_CHECK_CXX,-Wno-delete-non-virtual-dtor,)' + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-int-to-pointer-cast ?= $(call VBOX_GCC_CHECK_CC,-Wno-int-to-pointer-cast,)' + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-invalid-offsetof ?= $(call VBOX_GCC_CHECK_CXX,-Wno-invalid-offsetof,)' +-if $(KBUILD_TARGET) != "darwin" || !defined(VBOX_WITH_NEW_XCODE) ## @todo somthing goes entirely sideways with the detection. clang doesn't know the option, but only complains when we use it in webservices/Makefile.kmk! ++if ($(KBUILD_TARGET) != "darwin" || !defined(VBOX_WITH_NEW_XCODE)) && $(KBUILD_TARGET) != "freebsd" ## @todo somthing goes entirely sideways with the detection. clang doesn't know the option, but only complains when we use it in webservices/Makefile.kmk! + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-literal-suffix ?= $(call VBOX_GCC_CHECK_CXX,-Wno-literal-suffix,)' + else + $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-literal-suffix ?=' +@@ -4247,7 +4243,7 @@ TEMPLATE_VBOXR0DRV_CFLAGS = -O2 -ffreestanding -fno-strict-aliasing -fno-common -finline-limit=8000 \ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc -std=c99 -TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 +TEMPLATE_VBOXR0DRV_CFLAGS.x86 = -m32 -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 --param inline-unit-growth=100 --param large-function-growth=1000 \ -fno-omit-frame-pointer -mcmodel=kernel -mno-red-zone -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx \ -mno-3dnow -msoft-float -fno-asynchronous-unwind-tables -Wundef -@@ -4158,12 +4154,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += +@@ -4574,12 +4570,8 @@ TEMPLATE_VBOXR3EXE_LDFLAGS += TEMPLATE_VBOXR3EXE_TOOL = GXX3 TEMPLATE_VBOXR3EXE_LIBS = pthread TEMPLATE_VBOXR3EXE_INCS += \ - /usr/include \ - /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXR3EXE_LIBPATH += \ - /usr/lib \ - /usr/X11R6/lib \ /usr/local/lib - else ifeq ($(KBUILD_TARGET),solaris) - TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN -@@ -4420,7 +4412,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! + else ifeq ($(KBUILD_TARGET),netbsd) + TEMPLATE_VBOXR3EXE_TOOL = GXX3 +@@ -4869,7 +4861,7 @@ ifeq ($(KBUILD_TARGET),win) # No CRT! TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.win.amd64 = $(TEMPLATE_VBOXR3EXE_LDFLAGS.win.amd64) /entry:suplibHardenedWindowsMain TEMPLATE_VBOXR3HARDENEDEXE_LIBS.x86 = $(NOT_SUCH_VARIABLE) TEMPLATE_VBOXR3HARDENEDEXE_LIBS.amd64 = $(NOT_SUCH_VARIABLE) --else ifn1of ($(KBUILD_TARGET), os2) -+else ifn1of ($(KBUILD_TARGET), os2 freebsd) +-else ifn1of ($(KBUILD_TARGET), os2 solaris) ++else ifn1of ($(KBUILD_TARGET), freebsd os2 solaris) + # We want to keep the RPATH on Solaris to be able to find libgcc_1/libstdc++ within $(VBOX_WITH_RUNPATH) TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) - endif -@@ -4898,12 +4890,8 @@ TEMPLATE_VBOXMAINEXE_LIBS +@@ -5362,12 +5354,8 @@ TEMPLATE_VBOXMAINEXE_LIBS TEMPLATE_VBOXMAINEXE_TOOL = GXX3 TEMPLATE_VBOXMAINEXE_LIBS = $(LIB_RUNTIME) TEMPLATE_VBOXMAINEXE_INCS += \ - /usr/include \ - /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXMAINEXE_LIBPATH += \ - /usr/lib \ - /usr/X11R6/lib \ /usr/local/lib - else ifeq ($(KBUILD_TARGET),solaris) - TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN -@@ -5371,12 +5359,8 @@ ifdef VBOX_WITH_QTGUI + else ifeq ($(KBUILD_TARGET),netbsd) + TEMPLATE_VBOXMAINEXE_TOOL = GXX3 +@@ -5716,7 +5704,7 @@ ifdef VBOX_WITH_QTGUI + else + VBOX_PATH_QT ?= $(lastword $(filter %-$(tolower $(VBOX_VCC_TOOL_STEM)),$(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))) + endif +- else if1of ($(KBUILD_TARGET), linux solaris) ++ else if1of ($(KBUILD_TARGET), freebsd linux solaris) + ifndef VBOX_WITH_QTGUI_V5 + VBOX_PATH_QT ?= $(lastword $(sort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*))) + else +@@ -5914,12 +5902,8 @@ ifdef VBOX_WITH_QTGUI $(VBOX_LIBPATH_X11) ifeq ($(KBUILD_TARGET),freebsd) - TEMPLATE_VBOXQT4GUIEXE_INCS += \ + TEMPLATE_VBOXQTGUIEXE_INCS += \ - /usr/include \ - /usr/X11R6/include \ /usr/local/include - TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \ + TEMPLATE_VBOXQTGUIEXE_LIBPATH += \ - /usr/lib \ - /usr/X11R6/lib \ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -5587,12 +5571,8 @@ TEMPLATE_VBoxBldProg_LIBPATH +@@ -6144,12 +6128,8 @@ TEMPLATE_VBoxBldProg_LIBPATH TEMPLATE_VBoxBldProg_TOOL = GXX3 TEMPLATE_VBoxBldProg_LIBS = pthread TEMPLATE_VBoxBldProg_INCS += \ - /usr/include \ - /usr/X11R6/include \ /usr/local/include TEMPLATE_VBoxBldProg_LIBPATH += \ - /usr/lib \ - /usr/X11R6/lib \ /usr/local/lib - else ifeq ($(KBUILD_HOST),solaris) - TEMPLATE_VBoxBldProg_TOOL = GXX3PLAIN -@@ -5954,6 +5934,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darw + else ifeq ($(KBUILD_HOST),netbsd) + TEMPLATE_VBoxBldProg_TOOL = GXX3 +@@ -6543,6 +6523,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darw -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \ -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.linux = -Wl,--no-as-needed +TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.freebsd = -Wl,--no-as-needed TEMPLATE_VBOXCROGLR3HOSTDLL_BLDDIRS = $(VBOX_PATH_CROGL_GENFILES)/ - - # + ifeq ($(KBUILD_TARGET),darwin) + TEMPLATE_VBOXCROGLR3HOSTDLL_CFLAGS = $(TEMPLATE_VBOXR3NP_CFLAGS) -Wno-deprecated-declarations Index: head/emulators/virtualbox-ose/files/patch-configure =================================================================== --- head/emulators/virtualbox-ose/files/patch-configure (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-configure (revision 421521) @@ -1,78 +1,88 @@ ---- configure.orig 2016-07-18 11:50:32 UTC +--- configure.orig 2016-08-16 19:55:20 UTC +++ configure -@@ -137,10 +137,14 @@ CXX_FLAGS="" +@@ -140,10 +140,14 @@ CXX_FLAGS="" if [ "$OS" = "freebsd" ]; then INCCURL="-I/usr/local/include" LIBCURL="-L/usr/local/lib -lcurl" + INCALSA="-I/usr/local/include" + LIBALSA="-L/usr/local/lib" INCPULSE="-I/usr/local/include" LIBPULSE="-L/usr/local/lib" INCPNG="-I/usr/local/include" LIBPNG="-L/usr/local/lib -lpng" + INCVNCSERVER="-I/usr/local/include" + LIBVNCSERVER="-L/usr/local/lib" else INCCURL="" LIBCURL="-lcurl" -@@ -1213,7 +1217,7 @@ extern "C" int main(void) +@@ -441,6 +445,9 @@ check_gcc() + elif [ $cc_maj -eq 4 -a $cc_min -eq 0 -a "$OS" = "darwin" ]; then + log_success "found version $cc_ver" + # gcc-4.0 is allowed for Darwin only ++ elif [ $cc_maj -eq 4 -a $cc_min -eq 2 -a "$OS" = "freebsd" ]; then ++ log_success "found version $cc_ver" ++ # gcc-4.2 is allowed for FreeBSD only + elif [ $cc_maj -lt 4 \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS" = "darwin" \) \ +@@ -1224,7 +1231,7 @@ extern "C" int main(void) #endif } EOF - if test_compile "-lasound" asound asound; then + if test_compile "$INCALSA $LIBALSA -lasound" asound asound; then test_execute fi } -@@ -1945,8 +1949,8 @@ EOF +@@ -2126,8 +2133,8 @@ EOF echo "compiling the following source file:" >> $LOG cat $ODIR.tmp_src.cc >> $LOG echo "using the following command line:" >> $LOG - echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so" >> $LOG - $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so >> $LOG 2>&1 + echo "$CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so -pthread" >> $LOG + $CXX -O -Wall -o $ODIR.tmp_out $ODIR.tmp_src.cc -I$p/include/$d $p/$b/lib$d.so -pthread >> $LOG 2>&1 if [ $? -eq 0 ]; then found=1 break -@@ -2415,7 +2419,7 @@ for option in "$@"; do +@@ -2603,7 +2610,7 @@ for option in "$@"; do --with-openssl-dir=*) OPENSSLDIR=`echo $option | cut -d'=' -f2` INCCRYPTO="-I${OPENSSLDIR}/include" - LIBCRYPTO="${OPENSSLDIR}/lib/libcrypto.a ${OPENSSLDIR}/lib/libssl.a" + LIBCRYPTO="-L${OPENSSLDIR}/lib -lssl -lcrypto" ;; --with-ow-dir=*) WATCOM=`echo $option | cut -d'=' -f2` -@@ -2744,8 +2748,15 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then +@@ -2942,8 +2949,15 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then [ $WITH_PYTHON -eq 1 ] && check_python [ $WITH_JAVA -eq 1 ] && check_java - # PulseAudio - if [ "$OS" = "linux" -o "$OS" = "freebsd" ]; then -+ if [ $WITH_DBUS -eq 0 ]; then -+ cnf_append "VBOX_WITH_DBUS" "" -+ fi + if [ "$OS" = "linux" -o "$OS" = "freebsd" -o "$OS" = "netbsd" ]; then + if [ $WITH_ALSA -eq 1 ]; then + check_alsa + else + cnf_append "VBOX_WITH_ALSA" "" + fi ++ if [ $WITH_DBUS -eq 0 ]; then ++ cnf_append "VBOX_WITH_DBUS" "" ++ fi if [ $WITH_PULSE -eq 1 ]; then check_pulse elif [ $WITH_PULSE -eq 0 ]; then -@@ -2767,14 +2778,6 @@ if [ "$OS" = "linux" ]; then +@@ -2965,14 +2979,6 @@ if [ "$OS" = "linux" ]; then cnf_append "VBOX_WITH_ADDITION_DRIVERS" "" fi if [ $ONLY_ADDITIONS -eq 0 ]; then - if [ $WITH_ALSA -eq 1 ]; then - check_alsa - else - cnf_append "VBOX_WITH_ALSA" "" - fi - if [ $WITH_DBUS -eq 0 ]; then - cnf_append "VBOX_WITH_DBUS" "" - fi if [ $WITH_DEVMAPPER -eq 1 ]; then check_libdevmapper else Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-Makefile (revision 421521) @@ -1,20 +1,28 @@ ---- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2015-04-14 15:38:06.000000000 -0400 -+++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile 2015-04-14 18:25:23.090523000 -0400 -@@ -71,6 +71,7 @@ +--- src/VBox/Additions/common/VBoxGuest/freebsd/Makefile.orig 2016-08-16 19:55:31 UTC ++++ src/VBox/Additions/common/VBoxGuest/freebsd/Makefile +@@ -71,6 +71,7 @@ SRCS += \ handletable.c \ handletablectx.c \ once.c \ + term.c \ thread.c .PATH: ${.CURDIR}/common/string -@@ -149,8 +150,7 @@ +@@ -129,6 +130,7 @@ SRCS += \ + .PATH: ${.CURDIR}/r0drv + SRCS += \ + alloc-r0drv.c \ ++ alloc-ef-r0drv.c \ + initterm-r0drv.c \ + memobj-r0drv.c \ + powernotification-r0drv.c +@@ -149,8 +151,7 @@ SRCS += \ spinlock-r0drv-freebsd.c \ thread-r0drv-freebsd.c \ thread2-r0drv-freebsd.c \ - time-r0drv-freebsd.c \ - timer-r0drv-freebsd.c + time-r0drv-freebsd.c .PATH: ${.CURDIR}/r0drv/generic SRCS += \ Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-common-VBoxGuest-freebsd-files_vboxguest (revision 421521) @@ -1,18 +1,34 @@ ---- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2014-09-09 23:46:56.000000000 +0400 -+++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest 2014-09-18 22:06:32.817093478 +0400 -@@ -102,6 +102,7 @@ +--- src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest.orig 2016-08-16 19:55:31 UTC ++++ src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest +@@ -102,6 +102,7 @@ FILES_VBOXGUEST_NOBIN=" \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletable.h=>common/misc/handletable.h \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/handletablectx.cpp=>common/misc/handletablectx.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/once.cpp=>common/misc/once.c \ + ${PATH_ROOT}/src/VBox/Runtime/common/misc/term.cpp=>common/misc/term.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/thread.cpp=>common/misc/thread.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp=>common/misc/RTAssertMsg1Weak.c \ ${PATH_ROOT}/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp=>common/misc/RTAssertMsg2.c \ -@@ -185,6 +186,7 @@ +@@ -139,6 +140,7 @@ FILES_VBOXGUEST_NOBIN=" \ + ${PATH_ROOT}/src/VBox/Runtime/include/internal/iprt.h=>include/internal/iprt.h \ + ${PATH_ROOT}/src/VBox/Runtime/include/internal/lockvalidator.h=>include/internal/lockvalidator.h \ + ${PATH_ROOT}/src/VBox/Runtime/include/internal/magics.h=>include/internal/magics.h \ ++ ${PATH_ROOT}/src/VBox/Runtime/include/internal/mem.h=>include/internal/mem.h \ + ${PATH_ROOT}/src/VBox/Runtime/include/internal/memobj.h=>include/internal/memobj.h \ + ${PATH_ROOT}/src/VBox/Runtime/include/internal/string.h=>include/internal/string.h \ + ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \ +@@ -161,6 +163,7 @@ FILES_VBOXGUEST_NOBIN=" \ + ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \ + ${PATH_ROOT}/src/VBox/Runtime/generic/timer-generic.cpp=>generic/timer-generic.c \ + ${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \ ++ ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-ef-r0drv.cpp=>r0drv/alloc-ef-r0drv.c \ + ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.cpp=>r0drv/alloc-r0drv.c \ + ${PATH_ROOT}/src/VBox/Runtime/r0drv/alloc-r0drv.h=>r0drv/alloc-r0drv.h \ + ${PATH_ROOT}/src/VBox/Runtime/r0drv/initterm-r0drv.cpp=>r0drv/initterm-r0drv.c \ +@@ -186,6 +189,7 @@ FILES_VBOXGUEST_NOBIN=" \ ${PATH_ROOT}/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h=>r0drv/freebsd/sleepqueue-r0drv-freebsd.h \ ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c=>r0drv/generic/semspinmutex-r0drv-generic.c \ ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp=>r0drv/generic/mpnotification-r0drv-generic.c \ + ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/threadctxhooks-r0drv-generic.cpp=>r0drv/generic/threadctxhooks-r0drv-generic.c \ ${PATH_ROOT}/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp=>r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.c \ ${PATH_ROOT}/src/VBox/Runtime/r0drv/memobj-r0drv.cpp=>r0drv/memobj-r0drv.c \ ${PATH_ROOT}/src/VBox/Runtime/VBox/log-vbox.cpp=>VBox/log-vbox.c \ Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh =================================================================== --- head/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh (revision 421521) @@ -1,64 +1,67 @@ ---- src/VBox/Installer/freebsd/VBox.sh.orig 2015-04-10 22:01:18.704382000 -0700 -+++ src/VBox/Installer/freebsd/VBox.sh 2015-04-10 22:13:19.896371000 -0700 -@@ -0,0 +1,61 @@ +--- src/VBox/Installer/freebsd/VBox.sh.orig 2016-08-27 05:10:34 UTC ++++ src/VBox/Installer/freebsd/VBox.sh +@@ -0,0 +1,64 @@ +#!/bin/sh +# +# Oracle VM VirtualBox startup script, FreeBSD hosts. +# +# Copyright (C) 2006-2012 Oracle Corporation +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# + +PATH="/usr/bin:/bin:/usr/sbin:/sbin" +CONFIG="/usr/local/etc/vbox/vbox.cfg" + +test -r "${CONFIG}" && + . "${CONFIG}" +test -z "${INSTALL_DIR}" && + if test -d /usr/local/lib/virtualbox && + test -f /usr/local/lib/virtualbox/VBoxRT.so; then + INSTALL_DIR=/usr/local/lib/virtualbox + else + echo "Could not find VirtualBox installation. Please reinstall." + exit 1 + fi + +# workaround for the KDE dialog problem +KDE_FORK_SLAVES=1; export KDE_FORK_SLAVES + +APP=`basename $0` +case "$APP" in + VirtualBox|virtualbox) + exec "$INSTALL_DIR/VirtualBox" "$@" + ;; + VBoxManage|vboxmanage) + exec "$INSTALL_DIR/VBoxManage" "$@" + ;; + VBoxSDL|vboxsdl) + exec "$INSTALL_DIR/VBoxSDL" "$@" + ;; + VBoxVRDP|VBoxHeadless|vboxheadless) + exec "$INSTALL_DIR/VBoxHeadless" "$@" + ;; + VBoxAutostart|vboxautostart) + exec "$INSTALL_DIR/VBoxAutostart" "$@" + ;; + VBoxBalloonCtrl|vboxballoonctrl) + exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@" ++ ;; ++ VBoxBugReport|vboxbugreport) ++ exec "$INSTALL_DIR/VBoxBugReport" "$@" + ;; + vboxwebsrv) + exec "$INSTALL_DIR/vboxwebsrv" "$@" + ;; + *) + echo "Unknown application - $APP" + exit 1 + ;; +esac +exit 0 Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp (nonexistent) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp (revision 421521) @@ -0,0 +1,46 @@ +--- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig 2016-08-16 19:57:22 UTC ++++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp +@@ -254,14 +254,14 @@ static int ossStreamClose(int *phFile) + } + + +-static int ossStreamOpen(const char *pszDev, int fOpen, POSSAUDIOSTREAMCFG pReq, POSSAUDIOSTREAMCFG pObt, int *phFile) ++static int ossStreamOpen(const char *pszDev, bool fIn, POSSAUDIOSTREAMCFG pReq, POSSAUDIOSTREAMCFG pObt, int *phFile) + { + int rc; + + int hFile = -1; + do + { +- hFile = open(pszDev, fOpen); ++ hFile = open(pszDev, (fIn ? O_RDONLY : O_WRONLY) | O_NONBLOCK); + if (hFile == -1) + { + LogRel(("OSS: Failed to open %s: %s (%d)\n", pszDev, strerror(errno), errno)); +@@ -312,7 +312,7 @@ static int ossStreamOpen(const char *psz + } + + audio_buf_info abinfo; +- if (ioctl(hFile, (fOpen & O_RDONLY) ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &abinfo)) ++ if (ioctl(hFile, fIn ? SNDCTL_DSP_GETISPACE : SNDCTL_DSP_GETOSPACE, &abinfo)) + { + LogRel(("OSS: Failed to retrieve buffer length: %s (%d)\n", strerror(errno), errno)); + rc = RTErrConvertFromErrno(errno); +@@ -670,7 +670,7 @@ static int ossCreateStreamIn(PPDMAUDIOST + reqStream.cFragments = s_OSSConf.nfrags; + reqStream.cbFragmentSize = s_OSSConf.fragsize; + +- rc = ossStreamOpen(s_OSSConf.devpath_in, O_RDONLY | O_NONBLOCK, &reqStream, &obtStream, &hFile); ++ rc = ossStreamOpen(s_OSSConf.devpath_in, true /* fIn */, &reqStream, &obtStream, &hFile); + if (RT_SUCCESS(rc)) + { + pCfgAcq->enmFormat = obtStream.enmFormat; +@@ -742,7 +742,7 @@ static int ossCreateStreamOut(PPDMAUDIOS + reqStream.cFragments = s_OSSConf.nfrags; + reqStream.cbFragmentSize = s_OSSConf.fragsize; + +- rc = ossStreamOpen(s_OSSConf.devpath_out, O_WRONLY | O_NONBLOCK, &reqStream, &obtStream, &hFile); ++ rc = ossStreamOpen(s_OSSConf.devpath_out, false /* fIn */, &reqStream, &obtStream, &hFile); + if (RT_SUCCESS(rc)) + { + pCfgAcq->enmFormat = obtStream.enmFormat; Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp (revision 421520) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Frontends_VBoxManage_VBoxManageHelp.cpp (revision 421521) @@ -1,34 +1,34 @@ ---- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2016-07-18 11:55:55 UTC +--- src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp.orig 2016-08-16 19:59:52 UTC +++ src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp -@@ -791,7 +791,7 @@ void printUsage(USAGECATEGORY fCategory, +@@ -797,7 +797,7 @@ void printUsage(USAGECATEGORY fCategory, RTStrmPrintf(pStrm, "|dsound"); #endif } - if (fLinux || fSolaris) + if (fLinux || fFreeBSD || fSolaris) { RTStrmPrintf(pStrm, "" - #ifdef VBOX_WITH_OSS -@@ -805,22 +805,6 @@ void printUsage(USAGECATEGORY fCategory, + #ifdef VBOX_WITH_AUDIO_OSS +@@ -811,22 +811,6 @@ void printUsage(USAGECATEGORY fCategory, #endif ); } - if (fFreeBSD) - { --#ifdef VBOX_WITH_OSS +-#ifdef VBOX_WITH_AUDIO_OSS - /* Get the line break sorted when dumping all option variants. */ - if (fDumpOpts) - { - RTStrmPrintf(pStrm, "|\n" - " oss"); - } - else - RTStrmPrintf(pStrm, "|oss"); -#endif --#ifdef VBOX_WITH_PULSE +-#ifdef VBOX_WITH_AUDIO_PULSE - RTStrmPrintf(pStrm, "|pulse"); -#endif - } if (fDarwin) { RTStrmPrintf(pStrm, "|coreaudio"); Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h (nonexistent) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h (revision 421521) @@ -0,0 +1,10 @@ +--- src/VBox/Main/include/USBProxyBackend.h.orig 2016-08-16 20:00:18 UTC ++++ src/VBox/Main/include/USBProxyBackend.h +@@ -365,7 +365,6 @@ protected: + virtual int interruptWait(void); + virtual PUSBDEVICE getDevices(void); + int addDeviceToChain(PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, int rc); +- virtual void deviceAdded(ComObjPtr &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice); + + private: + RTSEMEVENT mNotifyEventSem; Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_include_USBProxyBackend.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyBackendFreeBSD.cpp =================================================================== --- head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyBackendFreeBSD.cpp (nonexistent) +++ head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyBackendFreeBSD.cpp (revision 421521) @@ -0,0 +1,28 @@ +--- src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp.orig 2016-08-16 20:00:20 UTC ++++ src/VBox/Main/src-server/freebsd/USBProxyBackendFreeBSD.cpp +@@ -299,21 +299,21 @@ PUSBDEVICE USBProxyBackendFreeBSD::getDe + + if (UsbDevInfo.udi_vendor[0] != '\0') + { ++ USBLibPurgeEncoding(UsbDevInfo.udi_vendor); + pDevice->pszManufacturer = RTStrDupN(UsbDevInfo.udi_vendor, sizeof(UsbDevInfo.udi_vendor)); +- USBLibPurgeEncoding(pDevice->pszManufacturer); + } + + if (UsbDevInfo.udi_product[0] != '\0') + { ++ USBLibPurgeEncoding(UsbDevInfo.udi_product); + pDevice->pszProduct = RTStrDupN(UsbDevInfo.udi_product, sizeof(UsbDevInfo.udi_product)); +- USBLibPurgeEncoding(pDevice->pszProduct); + } + + if (UsbDevInfo.udi_serial[0] != '\0') + { ++ USBLibPurgeEncoding(UsbDevInfo.udi_serial); + pDevice->pszSerialNumber = RTStrDupN(UsbDevInfo.udi_serial, sizeof(UsbDevInfo.udi_serial)); +- USBLibPurgeEncoding(pDevice->pszSerialNumber); +- pDevice->u64SerialHash = USBLibHashSerial(pDevice->pszSerialNumber); ++ pDevice->u64SerialHash = USBLibHashSerial(UsbDevInfo.udi_serial); + } + rc = ioctl(FileUsb, USB_GET_PLUGTIME, &PlugTime); + if (rc == 0) Property changes on: head/emulators/virtualbox-ose/files/patch-src_VBox_Main_src-server_freebsd_USBProxyBackendFreeBSD.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/virtualbox-ose/pkg-plist =================================================================== --- head/emulators/virtualbox-ose/pkg-plist (revision 421520) +++ head/emulators/virtualbox-ose/pkg-plist (revision 421521) @@ -1,610 +1,613 @@ bin/VBoxAutostart bin/VBoxBalloonCtrl +bin/VBoxBugReport bin/VBoxHeadless bin/VBoxManage %%X11%%bin/VBoxSDL bin/VBoxVRDP -%%QT4%%bin/VirtualBox +%%QT%%bin/VirtualBox bin/vboxautostart bin/vboxballoonctrl +bin/vboxbugreport bin/vboxheadless bin/vboxmanage %%X11%%bin/vboxsdl %%WEBSERVICE%%bin/vboxwebsrv -%%QT4%%bin/virtualbox +%%QT%%bin/virtualbox include/virtualbox/VirtualBox_XPCOM.h include/virtualbox/ipcIClientObserver.h include/virtualbox/ipcIDConnectService.h include/virtualbox/ipcILockService.h include/virtualbox/ipcIMessageObserver.h include/virtualbox/ipcIService.h include/virtualbox/ipcITransactionObserver.h include/virtualbox/ipcITransactionService.h include/virtualbox/nsIArray.h include/virtualbox/nsIAsyncInputStream.h include/virtualbox/nsIAsyncOutputStream.h include/virtualbox/nsIAtom.h include/virtualbox/nsIAtomService.h include/virtualbox/nsIBinaryInputStream.h include/virtualbox/nsIBinaryOutputStream.h include/virtualbox/nsIByteArrayInputStream.h include/virtualbox/nsICategoryManager.h include/virtualbox/nsIClassInfo.h include/virtualbox/nsICollection.h include/virtualbox/nsIComponentLoader.h include/virtualbox/nsIComponentLoaderManager.h include/virtualbox/nsIComponentManager.h include/virtualbox/nsIComponentManagerObsolete.h include/virtualbox/nsIComponentRegistrar.h include/virtualbox/nsIConsoleListener.h include/virtualbox/nsIConsoleMessage.h include/virtualbox/nsIConsoleService.h include/virtualbox/nsIDebug.h include/virtualbox/nsIDirectoryEnumerator.h include/virtualbox/nsIDirectoryService.h include/virtualbox/nsIEnumerator.h include/virtualbox/nsIEnvironment.h include/virtualbox/nsIErrorService.h include/virtualbox/nsIEventQueue.h include/virtualbox/nsIEventQueueService.h include/virtualbox/nsIEventTarget.h include/virtualbox/nsIException.h include/virtualbox/nsIExceptionService.h include/virtualbox/nsIFactory.h include/virtualbox/nsIFastLoadFileControl.h include/virtualbox/nsIFastLoadService.h include/virtualbox/nsIFile.h include/virtualbox/nsIHashable.h include/virtualbox/nsIInputStream.h include/virtualbox/nsIInputStreamTee.h include/virtualbox/nsIInterfaceInfo.h include/virtualbox/nsIInterfaceInfoManager.h include/virtualbox/nsIInterfaceRequestor.h include/virtualbox/nsILineInputStream.h include/virtualbox/nsILocalFile.h include/virtualbox/nsILocalFileMac.h include/virtualbox/nsIMemory.h include/virtualbox/nsIModule.h include/virtualbox/nsIMultiplexInputStream.h include/virtualbox/nsINativeComponentLoader.h include/virtualbox/nsIObjectInputStream.h include/virtualbox/nsIObjectOutputStream.h include/virtualbox/nsIObserver.h include/virtualbox/nsIObserverService.h include/virtualbox/nsIOutputStream.h include/virtualbox/nsIPersistentProperties2.h include/virtualbox/nsIPipe.h include/virtualbox/nsIProcess.h include/virtualbox/nsIProgrammingLanguage.h include/virtualbox/nsIProperties.h include/virtualbox/nsIPropertyBag.h include/virtualbox/nsIProxyObjectManager.h include/virtualbox/nsIRecyclingAllocator.h include/virtualbox/nsIRunnable.h include/virtualbox/nsIScriptableInputStream.h include/virtualbox/nsISeekableStream.h include/virtualbox/nsISerializable.h include/virtualbox/nsIServiceManager.h include/virtualbox/nsISimpleEnumerator.h include/virtualbox/nsIStorageStream.h include/virtualbox/nsIStreamBufferAccess.h include/virtualbox/nsIStringEnumerator.h include/virtualbox/nsIStringStream.h include/virtualbox/nsISupports.h include/virtualbox/nsISupportsArray.h include/virtualbox/nsISupportsIterators.h include/virtualbox/nsISupportsPrimitives.h include/virtualbox/nsIThread.h include/virtualbox/nsITimelineService.h include/virtualbox/nsITimer.h include/virtualbox/nsITimerInternal.h include/virtualbox/nsITimerManager.h include/virtualbox/nsITraceRefcnt.h include/virtualbox/nsIVariant.h include/virtualbox/nsIWeakReference.h include/virtualbox/nsIXPTLoader.h include/virtualbox/nsrootidl.h include/virtualbox/ipcd/ipcCID.h include/virtualbox/ipcd/ipcLockCID.h include/virtualbox/ipcd/ipcMessageReader.h include/virtualbox/ipcd/ipcMessageWriter.h include/virtualbox/ipcd/ipcModule.h include/virtualbox/ipcd/ipcModuleUtil.h include/virtualbox/ipcd/ipcdclient.h include/virtualbox/nsprpub/nspr.h include/virtualbox/nsprpub/plarena.h include/virtualbox/nsprpub/plarenas.h include/virtualbox/nsprpub/plbase64.h include/virtualbox/nsprpub/plerror.h include/virtualbox/nsprpub/plgetopt.h include/virtualbox/nsprpub/plhash.h include/virtualbox/nsprpub/plresolv.h include/virtualbox/nsprpub/plstr.h include/virtualbox/nsprpub/pratom.h include/virtualbox/nsprpub/prbit.h include/virtualbox/nsprpub/prclist.h include/virtualbox/nsprpub/prcmon.h include/virtualbox/nsprpub/prcountr.h include/virtualbox/nsprpub/prcpucfg.h include/virtualbox/nsprpub/prcvar.h include/virtualbox/nsprpub/prdtoa.h include/virtualbox/nsprpub/prenv.h include/virtualbox/nsprpub/prerr.h include/virtualbox/nsprpub/prerror.h include/virtualbox/nsprpub/prinet.h include/virtualbox/nsprpub/prinit.h include/virtualbox/nsprpub/prinrval.h include/virtualbox/nsprpub/prio.h include/virtualbox/nsprpub/pripcsem.h include/virtualbox/nsprpub/prlink.h include/virtualbox/nsprpub/prlock.h include/virtualbox/nsprpub/prlog.h include/virtualbox/nsprpub/prlong.h include/virtualbox/nsprpub/prmem.h include/virtualbox/nsprpub/prmon.h include/virtualbox/nsprpub/prmwait.h include/virtualbox/nsprpub/prnetdb.h include/virtualbox/nsprpub/prolock.h include/virtualbox/nsprpub/prpdce.h include/virtualbox/nsprpub/prprf.h include/virtualbox/nsprpub/prproces.h include/virtualbox/nsprpub/prrng.h include/virtualbox/nsprpub/prrwlock.h include/virtualbox/nsprpub/prshm.h include/virtualbox/nsprpub/prshma.h include/virtualbox/nsprpub/prsystem.h include/virtualbox/nsprpub/prthread.h include/virtualbox/nsprpub/prtime.h include/virtualbox/nsprpub/prtpool.h include/virtualbox/nsprpub/prtrace.h include/virtualbox/nsprpub/prtypes.h include/virtualbox/nsprpub/prvrsion.h include/virtualbox/nsprpub/prwin16.h include/virtualbox/nsprpub/md/_darwin.cfg include/virtualbox/nsprpub/md/_darwin.h include/virtualbox/nsprpub/md/_freebsd.cfg include/virtualbox/nsprpub/md/_freebsd.h include/virtualbox/nsprpub/md/_iprt_atomic.h include/virtualbox/nsprpub/md/_linux.cfg include/virtualbox/nsprpub/md/_linux.h include/virtualbox/nsprpub/md/_macos.h include/virtualbox/nsprpub/md/_netbsd.cfg include/virtualbox/nsprpub/md/_netbsd.h include/virtualbox/nsprpub/md/_openbsd.cfg include/virtualbox/nsprpub/md/_openbsd.h include/virtualbox/nsprpub/md/_os2.cfg include/virtualbox/nsprpub/md/_os2.h include/virtualbox/nsprpub/md/_os2_errors.h include/virtualbox/nsprpub/md/_pcos.h include/virtualbox/nsprpub/md/_pth.h include/virtualbox/nsprpub/md/_solaris.h include/virtualbox/nsprpub/md/_solaris32.cfg include/virtualbox/nsprpub/md/_solaris64.cfg include/virtualbox/nsprpub/md/_unix_errors.h include/virtualbox/nsprpub/md/_unixos.h include/virtualbox/nsprpub/md/prosdep.h include/virtualbox/nsprpub/obsolete/pralarm.h include/virtualbox/nsprpub/obsolete/probslet.h include/virtualbox/nsprpub/obsolete/protypes.h include/virtualbox/nsprpub/obsolete/prsem.h include/virtualbox/nsprpub/private/pprio.h include/virtualbox/nsprpub/private/pprthred.h include/virtualbox/nsprpub/private/prpriv.h include/virtualbox/string/nsAString.h include/virtualbox/string/nsAlgorithm.h include/virtualbox/string/nsCharTraits.h include/virtualbox/string/nsDependentString.h include/virtualbox/string/nsDependentSubstring.h include/virtualbox/string/nsEmbedString.h include/virtualbox/string/nsLiteralString.h include/virtualbox/string/nsObsoleteAString.h include/virtualbox/string/nsPrintfCString.h include/virtualbox/string/nsPromiseFlatString.h include/virtualbox/string/nsReadableUtils.h include/virtualbox/string/nsString.h include/virtualbox/string/nsStringAPI.h include/virtualbox/string/nsStringFwd.h include/virtualbox/string/nsStringIterator.h include/virtualbox/string/nsSubstring.h include/virtualbox/string/nsSubstringTuple.h include/virtualbox/string/nsTAString.h include/virtualbox/string/nsTDependentString.h include/virtualbox/string/nsTDependentSubstring.h include/virtualbox/string/nsTObsoleteAString.h include/virtualbox/string/nsTPromiseFlatString.h include/virtualbox/string/nsTString.h include/virtualbox/string/nsTSubstring.h include/virtualbox/string/nsTSubstringTuple.h include/virtualbox/string/nsUTF8Utils.h include/virtualbox/string/nsXPIDLString.h include/virtualbox/string/string-template-def-char.h include/virtualbox/string/string-template-def-unichar.h include/virtualbox/string/string-template-undef.h include/virtualbox/xpcom/nsAgg.h include/virtualbox/xpcom/nsAppDirectoryServiceDefs.h include/virtualbox/xpcom/nsArray.h include/virtualbox/xpcom/nsArrayEnumerator.h include/virtualbox/xpcom/nsAtomService.h include/virtualbox/xpcom/nsAutoBuffer.h include/virtualbox/xpcom/nsAutoLock.h include/virtualbox/xpcom/nsAutoPtr.h include/virtualbox/xpcom/nsBaseHashtable.h include/virtualbox/xpcom/nsCOMArray.h include/virtualbox/xpcom/nsCOMPtr.h include/virtualbox/xpcom/nsCRT.h include/virtualbox/xpcom/nsCategoryManagerUtils.h include/virtualbox/xpcom/nsCheapSets.h include/virtualbox/xpcom/nsClassHashtable.h include/virtualbox/xpcom/nsCom.h include/virtualbox/xpcom/nsComponentManagerObsolete.h include/virtualbox/xpcom/nsComponentManagerUtils.h include/virtualbox/xpcom/nsCppSharedAllocator.h include/virtualbox/xpcom/nsDataHashtable.h include/virtualbox/xpcom/nsDebug.h include/virtualbox/xpcom/nsDebugImpl.h include/virtualbox/xpcom/nsDeque.h include/virtualbox/xpcom/nsDirectoryService.h include/virtualbox/xpcom/nsDirectoryServiceDefs.h include/virtualbox/xpcom/nsDirectoryServiceUtils.h include/virtualbox/xpcom/nsDoubleHashtable.h include/virtualbox/xpcom/nsEnumeratorUtils.h include/virtualbox/xpcom/nsError.h include/virtualbox/xpcom/nsEscape.h include/virtualbox/xpcom/nsEventQueueUtils.h include/virtualbox/xpcom/nsFastLoadPtr.h include/virtualbox/xpcom/nsFastLoadService.h include/virtualbox/xpcom/nsFixedSizeAllocator.h include/virtualbox/xpcom/nsGenericFactory.h include/virtualbox/xpcom/nsHashKeys.h include/virtualbox/xpcom/nsHashSets.h include/virtualbox/xpcom/nsHashtable.h include/virtualbox/xpcom/nsIAllocator.h include/virtualbox/xpcom/nsIByteBuffer.h include/virtualbox/xpcom/nsID.h include/virtualbox/xpcom/nsIGenericFactory.h include/virtualbox/xpcom/nsIID.h include/virtualbox/xpcom/nsIInterfaceRequestorUtils.h include/virtualbox/xpcom/nsIServiceManagerObsolete.h include/virtualbox/xpcom/nsIServiceManagerUtils.h include/virtualbox/xpcom/nsISupportsBase.h include/virtualbox/xpcom/nsISupportsImpl.h include/virtualbox/xpcom/nsISupportsObsolete.h include/virtualbox/xpcom/nsISupportsUtils.h include/virtualbox/xpcom/nsIUnicharBuffer.h include/virtualbox/xpcom/nsIUnicharInputStream.h include/virtualbox/xpcom/nsIWeakReferenceUtils.h include/virtualbox/xpcom/nsInt64.h include/virtualbox/xpcom/nsInterfaceHashtable.h include/virtualbox/xpcom/nsLinebreakConverter.h include/virtualbox/xpcom/nsLocalFile.h include/virtualbox/xpcom/nsLocalFileOS2.h include/virtualbox/xpcom/nsLocalFileOSX.h include/virtualbox/xpcom/nsLocalFileUnix.h include/virtualbox/xpcom/nsMemory.h include/virtualbox/xpcom/nsModule.h include/virtualbox/xpcom/nsMultiplexInputStream.h include/virtualbox/xpcom/nsNativeCharsetUtils.h include/virtualbox/xpcom/nsNativeComponentLoader.h include/virtualbox/xpcom/nsObserverService.h include/virtualbox/xpcom/nsObsoleteModuleLoading.h include/virtualbox/xpcom/nsProcess.h include/virtualbox/xpcom/nsProxiedService.h include/virtualbox/xpcom/nsProxyEvent.h include/virtualbox/xpcom/nsProxyRelease.h include/virtualbox/xpcom/nsQuickSort.h include/virtualbox/xpcom/nsRecyclingAllocator.h include/virtualbox/xpcom/nsRefPtrHashtable.h include/virtualbox/xpcom/nsScriptableInputStream.h include/virtualbox/xpcom/nsStaticAtom.h include/virtualbox/xpcom/nsStaticComponent.h include/virtualbox/xpcom/nsStaticNameTable.h include/virtualbox/xpcom/nsStorageStream.h include/virtualbox/xpcom/nsStreamUtils.h include/virtualbox/xpcom/nsStringEnumerator.h include/virtualbox/xpcom/nsStringIO.h include/virtualbox/xpcom/nsStringStream.h include/virtualbox/xpcom/nsSupportsArray.h include/virtualbox/xpcom/nsSupportsPrimitives.h include/virtualbox/xpcom/nsTHashtable.h include/virtualbox/xpcom/nsTextFormatter.h include/virtualbox/xpcom/nsTime.h include/virtualbox/xpcom/nsTraceRefcnt.h include/virtualbox/xpcom/nsTraceRefcntImpl.h include/virtualbox/xpcom/nsUnitConversion.h include/virtualbox/xpcom/nsValueArray.h include/virtualbox/xpcom/nsVariant.h include/virtualbox/xpcom/nsVoidArray.h include/virtualbox/xpcom/nsWeakPtr.h include/virtualbox/xpcom/nsWeakReference.h include/virtualbox/xpcom/nsXPCOM.h include/virtualbox/xpcom/nsXPCOMCID.h include/virtualbox/xpcom/nsXPCOMGlue.h include/virtualbox/xpcom/nscore.h include/virtualbox/xpcom/pldhash.h include/virtualbox/xpcom/plevent.h include/virtualbox/xpcom/xcDll.h include/virtualbox/xpcom/xpcom-config.h include/virtualbox/xpcom/xpt_arena.h include/virtualbox/xpcom/xpt_struct.h include/virtualbox/xpcom/xpt_xdr.h include/virtualbox/xpcom/xptcall.h include/virtualbox/xpcom/xptcstubsdecl.inc include/virtualbox/xpcom/xptcstubsdef.inc include/virtualbox/xpcom/xptinfo.h %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi-1.0-py%%PYTHON_VER%%.egg-info %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/components.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/file.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/nsError.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/primitives.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/vboxxpcom.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpcom_consts.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/xpt.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/client/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/__init__.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/enumerator.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/factory.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/loader.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/module.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/xpcom/server/policy.pyc -%%QT4%%lib/virtualbox/DbgPlugInDiggers.so +%%QT%%lib/virtualbox/DbgPlugInDiggers.so lib/virtualbox/VBox.sh lib/virtualbox/VBoxAuth.so lib/virtualbox/VBoxAuthSimple.so lib/virtualbox/VBoxAutostart lib/virtualbox/VBoxBalloonCtrl +lib/virtualbox/VBoxBugReport lib/virtualbox/VBoxDD.so lib/virtualbox/VBoxDD2.so lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDD2RC.rc lib/virtualbox/VBoxDDR0.r0 lib/virtualbox/VBoxDDRC.rc lib/virtualbox/VBoxDDU.so -%%QT4%%lib/virtualbox/VBoxDbg.so -%%QT4%%lib/virtualbox/VBoxDragAndDropSvc.so +%%QT%%lib/virtualbox/VBoxDbg.so +%%QT%%lib/virtualbox/VBoxDragAndDropSvc.so lib/virtualbox/VBoxEFI32.fd lib/virtualbox/VBoxEFI64.fd lib/virtualbox/VBoxExtPackHelperApp lib/virtualbox/VBoxGuestControlSvc.so lib/virtualbox/VBoxGuestPropSvc.so @(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxHeadless lib/virtualbox/VBoxHeadless.so lib/virtualbox/VBoxHostChannel.so %%X11%%lib/virtualbox/VBoxKeyboard.so lib/virtualbox/VBoxManage @(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetAdpCtl @(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetDHCP -@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT lib/virtualbox/VBoxNetDHCP.so +@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetNAT lib/virtualbox/VBoxNetNAT.so %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so %%X11%%lib/virtualbox/VBoxOGLhosterrorspu.so %%X11%%lib/virtualbox/VBoxOGLrenderspu.so %%PYTHON%%lib/virtualbox/VBoxPython.so %%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VBoxREM.so %%I386%%lib/virtualbox/VBoxREM32.so %%I386%%lib/virtualbox/VBoxREM64.so lib/virtualbox/VBoxRT.so %%X11%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxSDL %%X11%%lib/virtualbox/VBoxSDL.so lib/virtualbox/VBoxSVC %%X11%%lib/virtualbox/VBoxSharedClipboard.so %%X11%%lib/virtualbox/VBoxSharedCrOpenGL.so lib/virtualbox/VBoxSharedFolders.so -%%QT4%%lib/virtualbox/VBoxTestOGL +%%QT%%lib/virtualbox/VBoxTestOGL lib/virtualbox/VBoxVMM.so lib/virtualbox/VBoxVMMPreload.so lib/virtualbox/VBoxXPCOM.so lib/virtualbox/VBoxXPCOMC.so lib/virtualbox/VBoxXPCOMIPCD lib/virtualbox/VMMR0.r0 lib/virtualbox/VMMRC.rc -%%QT4%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox -%%QT4%%lib/virtualbox/VirtualBox.so +%%QT%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox +%%QT%%lib/virtualbox/VirtualBox.so lib/virtualbox/sdk %%WEBSERVICE%%lib/virtualbox/vboxwebsrv %%WEBSERVICE%%lib/virtualbox/webtest %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack.xml %%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNC.so %%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNCMain.so %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso lib/virtualbox/components/VBoxC.so lib/virtualbox/components/VBoxSVCM.so lib/virtualbox/components/VBoxXPCOMBase.xpt lib/virtualbox/components/VBoxXPCOMIPCC.so lib/virtualbox/components/VirtualBox_XPCOM.xpt -%%QT4%%share/applications/virtualbox.desktop +%%QT%%share/applications/virtualbox.desktop %%MANUAL%%%%DOCSDIR%%/UserManual.pdf -%%QT4%%share/pixmaps/VBox.png +%%QT%%share/pixmaps/VBox.png %%DATADIR%%/idl/VirtualBox_XPCOM.idl %%DATADIR%%/idl/ipcIClientObserver.idl %%DATADIR%%/idl/ipcIDConnectService.idl %%DATADIR%%/idl/ipcILockService.idl %%DATADIR%%/idl/ipcIMessageObserver.idl %%DATADIR%%/idl/ipcIService.idl %%DATADIR%%/idl/ipcITransactionObserver.idl %%DATADIR%%/idl/ipcITransactionService.idl %%DATADIR%%/idl/nsIArray.idl %%DATADIR%%/idl/nsIAsyncInputStream.idl %%DATADIR%%/idl/nsIAsyncOutputStream.idl %%DATADIR%%/idl/nsIAtom.idl %%DATADIR%%/idl/nsIAtomService.idl %%DATADIR%%/idl/nsIBinaryInputStream.idl %%DATADIR%%/idl/nsIBinaryOutputStream.idl %%DATADIR%%/idl/nsIByteArrayInputStream.idl %%DATADIR%%/idl/nsICategoryManager.idl %%DATADIR%%/idl/nsIClassInfo.idl %%DATADIR%%/idl/nsICollection.idl %%DATADIR%%/idl/nsIComponentLoader.idl %%DATADIR%%/idl/nsIComponentLoaderManager.idl %%DATADIR%%/idl/nsIComponentManager.idl %%DATADIR%%/idl/nsIComponentManagerObsolete.idl %%DATADIR%%/idl/nsIComponentRegistrar.idl %%DATADIR%%/idl/nsIConsoleListener.idl %%DATADIR%%/idl/nsIConsoleMessage.idl %%DATADIR%%/idl/nsIConsoleService.idl %%DATADIR%%/idl/nsIDebug.idl %%DATADIR%%/idl/nsIDirectoryEnumerator.idl %%DATADIR%%/idl/nsIDirectoryService.idl %%DATADIR%%/idl/nsIEnumerator.idl %%DATADIR%%/idl/nsIEnvironment.idl %%DATADIR%%/idl/nsIErrorService.idl %%DATADIR%%/idl/nsIEventQueue.idl %%DATADIR%%/idl/nsIEventQueueService.idl %%DATADIR%%/idl/nsIEventTarget.idl %%DATADIR%%/idl/nsIException.idl %%DATADIR%%/idl/nsIExceptionService.idl %%DATADIR%%/idl/nsIFactory.idl %%DATADIR%%/idl/nsIFastLoadFileControl.idl %%DATADIR%%/idl/nsIFastLoadService.idl %%DATADIR%%/idl/nsIFile.idl %%DATADIR%%/idl/nsIHashable.idl %%DATADIR%%/idl/nsIInputStream.idl %%DATADIR%%/idl/nsIInputStreamTee.idl %%DATADIR%%/idl/nsIInterfaceInfo.idl %%DATADIR%%/idl/nsIInterfaceInfoManager.idl %%DATADIR%%/idl/nsIInterfaceRequestor.idl %%DATADIR%%/idl/nsILineInputStream.idl %%DATADIR%%/idl/nsILocalFile.idl %%DATADIR%%/idl/nsILocalFileMac.idl %%DATADIR%%/idl/nsIMemory.idl %%DATADIR%%/idl/nsIModule.idl %%DATADIR%%/idl/nsIMultiplexInputStream.idl %%DATADIR%%/idl/nsINativeComponentLoader.idl %%DATADIR%%/idl/nsIObjectInputStream.idl %%DATADIR%%/idl/nsIObjectOutputStream.idl %%DATADIR%%/idl/nsIObserver.idl %%DATADIR%%/idl/nsIObserverService.idl %%DATADIR%%/idl/nsIOutputStream.idl %%DATADIR%%/idl/nsIPersistentProperties2.idl %%DATADIR%%/idl/nsIPipe.idl %%DATADIR%%/idl/nsIProcess.idl %%DATADIR%%/idl/nsIProgrammingLanguage.idl %%DATADIR%%/idl/nsIProperties.idl %%DATADIR%%/idl/nsIPropertyBag.idl %%DATADIR%%/idl/nsIProxyObjectManager.idl %%DATADIR%%/idl/nsIRecyclingAllocator.idl %%DATADIR%%/idl/nsIRunnable.idl %%DATADIR%%/idl/nsIScriptableInputStream.idl %%DATADIR%%/idl/nsISeekableStream.idl %%DATADIR%%/idl/nsISerializable.idl %%DATADIR%%/idl/nsIServiceManager.idl %%DATADIR%%/idl/nsISimpleEnumerator.idl %%DATADIR%%/idl/nsIStorageStream.idl %%DATADIR%%/idl/nsIStreamBufferAccess.idl %%DATADIR%%/idl/nsIStringEnumerator.idl %%DATADIR%%/idl/nsIStringStream.idl %%DATADIR%%/idl/nsISupports.idl %%DATADIR%%/idl/nsISupportsArray.idl %%DATADIR%%/idl/nsISupportsIterators.idl %%DATADIR%%/idl/nsISupportsPrimitives.idl %%DATADIR%%/idl/nsIThread.idl %%DATADIR%%/idl/nsITimelineService.idl %%DATADIR%%/idl/nsITimer.idl %%DATADIR%%/idl/nsITimerInternal.idl %%DATADIR%%/idl/nsITimerManager.idl %%DATADIR%%/idl/nsITraceRefcnt.idl %%DATADIR%%/idl/nsIVariant.idl %%DATADIR%%/idl/nsIWeakReference.idl %%DATADIR%%/idl/nsIXPTLoader.idl %%DATADIR%%/idl/nsrootidl.idl %%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_ca_VA.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_da.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_el.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_en.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_fa_IR.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_fr.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_gl_ES.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_he.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_hu.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_id.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_it.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_ja.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_km_KH.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_ko.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_lt.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_nl.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_pl.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_pt.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_pt_BR.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_ro.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_ru.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_sk.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_sl.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_sr.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_sv.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_tr.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_uk.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_zh_CN.qm %%NLS%%%%DATADIR%%/nls/VirtualBox_zh_TW.qm %%NLS%%%%DATADIR%%/nls/qt_bg.qm %%NLS%%%%DATADIR%%/nls/qt_ca.qm %%NLS%%%%DATADIR%%/nls/qt_ca_VA.qm %%NLS%%%%DATADIR%%/nls/qt_cs.qm %%NLS%%%%DATADIR%%/nls/qt_da.qm %%NLS%%%%DATADIR%%/nls/qt_de.qm %%NLS%%%%DATADIR%%/nls/qt_el.qm %%NLS%%%%DATADIR%%/nls/qt_en.qm %%NLS%%%%DATADIR%%/nls/qt_es.qm %%NLS%%%%DATADIR%%/nls/qt_eu.qm %%NLS%%%%DATADIR%%/nls/qt_fa_IR.qm %%NLS%%%%DATADIR%%/nls/qt_fi.qm %%NLS%%%%DATADIR%%/nls/qt_fr.qm %%NLS%%%%DATADIR%%/nls/qt_gl_ES.qm %%NLS%%%%DATADIR%%/nls/qt_he.qm %%NLS%%%%DATADIR%%/nls/qt_hu.qm %%NLS%%%%DATADIR%%/nls/qt_id.qm %%NLS%%%%DATADIR%%/nls/qt_it.qm %%NLS%%%%DATADIR%%/nls/qt_ja.qm %%NLS%%%%DATADIR%%/nls/qt_km_KH.qm %%NLS%%%%DATADIR%%/nls/qt_ko.qm %%NLS%%%%DATADIR%%/nls/qt_lt.qm %%NLS%%%%DATADIR%%/nls/qt_nl.qm %%NLS%%%%DATADIR%%/nls/qt_pl.qm %%NLS%%%%DATADIR%%/nls/qt_pt.qm %%NLS%%%%DATADIR%%/nls/qt_pt_BR.qm %%NLS%%%%DATADIR%%/nls/qt_ro.qm %%NLS%%%%DATADIR%%/nls/qt_ru.qm %%NLS%%%%DATADIR%%/nls/qt_sk.qm %%NLS%%%%DATADIR%%/nls/qt_sl.qm %%NLS%%%%DATADIR%%/nls/qt_sr.qm %%NLS%%%%DATADIR%%/nls/qt_sv.qm %%NLS%%%%DATADIR%%/nls/qt_tr.qm %%NLS%%%%DATADIR%%/nls/qt_uk.qm %%NLS%%%%DATADIR%%/nls/qt_zh_CN.qm %%NLS%%%%DATADIR%%/nls/qt_zh_TW.qm %%DATADIR%%/samples/Makefile %%DATADIR%%/samples/tstVBoxAPIXPCOM.cpp %%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl %%PYTHON%%%%DATADIR%%/sdk/bindings/xpcom/python/xpcom Index: head/emulators/virtualbox-ose-additions/Makefile =================================================================== --- head/emulators/virtualbox-ose-additions/Makefile (revision 421520) +++ head/emulators/virtualbox-ose-additions/Makefile (revision 421521) @@ -1,204 +1,215 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.0.26 +PORTVERSION= 5.1.4 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -additions DISTNAME= VirtualBox-${PORTVERSION} MAINTAINER= vbox@FreeBSD.org COMMENT= VirtualBox additions for FreeBSD guests LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:devel/yasm \ kmk:devel/kBuild CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxguest vboxservice USES= compiler:features cpe iconv kmod python:build tar:bzip2 ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes CONFIGURE_ARGS+= --disable-alsa \ --disable-docs \ --disable-libvpx \ --disable-pulse \ --disable-python \ --disable-sdl-ttf \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-[3-5]* \ virtualbox-ose-additions-devel-[3,4]* \ virtualbox-ose-devel-[3,4]* \ virtualbox-ose-legacy-[3,4]* OPTIONS_DEFINE= DBUS DEBUG OPENGL X11 OPTIONS_DEFAULT= DBUS X11 OPTIONS_SUB= yes DBUS_CONFIGURE_OFF= --disable-dbus DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus OPENGL_CONFIGURE_OFF= --disable-opengl .include .if ${PORT_OPTIONS:MOPENGL} && empty(PORT_OPTIONS:MX11) BROKEN= OPENGL requires X11 support. Run 'make config' again! .endif VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers INPUTDIR= ${PREFIX}/lib/xorg/modules/input VBOX_BIN= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/additions VBOX_SBINS= VBoxControl \ VBoxService BUILD_WRKSRC= ${VBOX_BIN}/src KMK_BUILDTYPE= release KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} KMK_FLAGS= .if ${PORT_OPTIONS:MDEBUG} KMK_FLAGS+= BUILD_TYPE=debug KMK_BUILDTYPE= debug MAKE_ARGS+= DEBUG_FLAGS="-O1 -g" .endif .if ${PORT_OPTIONS:MOPENGL} PKGPOSTINSTALL= ${WRKDIR}/pkg-post-install PKGPREDEINSTALL= ${WRKDIR}/pkg-pre-deinstall SUB_FILES= pkg-post-install pkg-pre-deinstall USE_XORG= xcomposite xdamage xfixes USE_GL= gl VBOX_LIBS= VBoxEGL.so \ VBoxOGL.so \ VBoxOGLarrayspu.so \ VBoxOGLcrutil.so \ VBoxOGLerrorspu.so \ VBoxOGLfeedbackspu.so \ VBoxOGLpackspu.so \ VBoxOGLpassthroughspu.so .endif .if ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/bin/X:x11-servers/xorg-server USE_XORG+= inputproto x11 xcursor xext xmu xorg-server xrandr xt USES+= pkgconfig VBOX_WITH_X11= 1 XORG_DRV_ABI= pkgconf --modversion xorg-server | \ ${SED} -E -e 's/\.[0-9]+$$//' -e 's/\.//' .else VBOX_WITH_X11= .endif .if ${ARCH} == i386 KMK_ARCH= freebsd.x86 .else KMK_ARCH= freebsd.${ARCH} .endif .include .if ${COMPILER_TYPE} == clang EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \ ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h .if ${COMPILER_FEATURES:Mlibc++} EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk .endif .endif pre-everything:: .if ${ARCH} == "amd64" .if !exists(/usr/lib32/libc.so) @${ECHO} 'Requires 32-bit libraries installed under /usr/lib32.' @${ECHO} 'Do: cd /usr/src; make build32 install32; ldconfig -v -m -R /usr/lib32' @${FALSE} .endif .endif post-patch: @${ECHO} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk - @${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> \ + ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_X11}' >> \ + ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \ + ${WRKSRC}/LocalConfig.kmk .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -fno-merge-constants||' \ -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk .if ${COMPILER_FEATURES:Mlibc++} @${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk .endif - @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> ${WRKSRC}/LocalConfig.kmk + @${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> \ + ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/Config.kmk \ - ${WRKSRC}/configure \ - ${WRKSRC}/kBuild/units/qt4.kmk \ - ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ - ${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \ - ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop - @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure + ${WRKSRC}/Config.kmk ${WRKSRC}/configure \ + ${WRKSRC}/kBuild/header.kmk ${WRKSRC}/kBuild/units/qt4.kmk \ + ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \ + ${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \ + ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop + @${REINPLACE_CMD} \ + -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \ + ${WRKSRC}/configure .if empty(ICONV_LIB) - @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \ - ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk + @${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \ + ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \ + ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif pre-build: - cd ${WRKSRC} && \ - ${SH} -c '. env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' + cd ${WRKSRC} && ${SH} -c \ + '. env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' do-install: ${MKDIR} ${STAGEDIR}${KMODDIR} - ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko ${STAGEDIR}${KMODDIR} + ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko \ + ${STAGEDIR}${KMODDIR} .if ${PORT_OPTIONS:MDEBUG} - ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko.symbols ${STAGEDIR}${KMODDIR} + ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko.symbols \ + ${STAGEDIR}${KMODDIR} .endif ${INSTALL_LIB} ${VBOX_BIN}/pam_vbox.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \ ${STAGEDIR}${PREFIX}/sbin/ .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ + ${INSTALL_SCRIPT} \ + ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ ${STAGEDIR}${PREFIX}/bin/VBoxClient-all # X11 autostart ${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart/ - ${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + ${INSTALL_DATA} \ + ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ ${STAGEDIR}${PREFIX}/etc/xdg/autostart/ # KDE autostart ${MKDIR} ${STAGEDIR}${PREFIX}/share/autostart/ - ${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ + ${INSTALL_DATA} \ + ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \ ${STAGEDIR}${PREFIX}/share/autostart/ ${MKDIR} ${STAGEDIR}${VIDEODIR} ${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_$$(${XORG_DRV_ABI}).so \ ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so ${MKDIR} ${STAGEDIR}${INPUTDIR} ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_$$(${XORG_DRV_ABI}).so \ ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so .endif .if ${PORT_OPTIONS:MOPENGL} ${INSTALL_DATA} ${VBOX_LIBS:S|^|${VBOX_BIN}/|} \ ${STAGEDIR}${PREFIX}/lib/ .endif .include Index: head/emulators/virtualbox-ose-additions/distinfo =================================================================== --- head/emulators/virtualbox-ose-additions/distinfo (revision 421520) +++ head/emulators/virtualbox-ose-additions/distinfo (revision 421521) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468866791 -SHA256 (VirtualBox-5.0.26.tar.bz2) = 78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e -SIZE (VirtualBox-5.0.26.tar.bz2) = 111244869 +TIMESTAMP = 1472243715 +SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf +SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581 Index: head/emulators/virtualbox-ose-kmod/Makefile =================================================================== --- head/emulators/virtualbox-ose-kmod/Makefile (revision 421520) +++ head/emulators/virtualbox-ose-kmod/Makefile (revision 421521) @@ -1,104 +1,104 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= virtualbox-ose -PORTVERSION= 5.0.26 -PORTREVISION= 1 +PORTVERSION= 5.1.4 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX= -kmod DISTNAME= VirtualBox-${PORTVERSION} MAINTAINER= vbox@FreeBSD.org COMMENT= VirtualBox kernel module for FreeBSD LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= kmk:devel/kBuild CPE_VENDOR= oracle CPE_PRODUCT= vm_virtualbox USES= cpe kmod tar:bzip2 PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} USE_RC_SUBR= vboxnet ONLY_FOR_ARCHS= i386 amd64 HAS_CONFIGURE= yes CONFIGURE_ARGS+= --build-headless CONFIGURE_ARGS+= --disable-alsa \ --disable-dbus \ --disable-docs \ --disable-libvpx \ --disable-pulse \ --disable-python \ --disable-sdl-ttf \ --disable-xpcom CONFIGURE_ARGS+= --nofatal --with-gcc="${CC}" --with-g++="${CXX}" CONFLICTS_INSTALL= virtualbox-ose-kmod-devel-4* \ virtualbox-ose-kmod-legacy-4* OPTIONS_DEFINE= DEBUG VIMAGE OPTIONS_SUB= yes DEBUG_DESC= Debug symbols, additional logs and assertions VIMAGE_DESC= VIMAGE virtual networking support .include VBOX_BIN= ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/src VBOX_KMODS= vboxdrv \ vboxnetadp \ vboxnetflt BUILD_WRKSRC= ${VBOX_BIN} KMK_BUILDTYPE= release KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys KMK_FLAGS= HostDrivers-scripts vboxdrv-mod VBoxNetFlt-src VBoxNetAdp-src .if ${PORT_OPTIONS:MDEBUG} KMK_FLAGS+= BUILD_TYPE=debug KMK_BUILDTYPE= debug EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \ ${PATCHDIR}/extrapatch-src-VBox-HostDrivers-Support-freebsd-Makefile MAKE_ARGS+= DEBUG_FLAGS="-O1 -g" .endif .if ${ARCH} == i386 KMK_ARCH= freebsd.x86 .else KMK_ARCH= freebsd.${ARCH} .endif .include post-patch: @${ECHO} 'VBOX_WITH_VBOXDRV = 1' > ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETFLT = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_NETADP = 1' >> ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk .if ${PORT_OPTIONS:MVIMAGE} @${ECHO} 'VBOX_WITH_NETFLT_VIMAGE = 1' >> ${WRKSRC}/LocalConfig.kmk .endif @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/Config.kmk \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure + ${WRKSRC}/Config.kmk ${WRKSRC}/configure + @${REINPLACE_CMD} \ + -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \ + ${WRKSRC}/configure pre-build: - cd ${WRKSRC}/src/VBox/HostDrivers && \ - ${SH} -c '. ${WRKSRC}/env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' + cd ${WRKSRC}/src/VBox/HostDrivers && ${SH} -c \ + '. ${WRKSRC}/env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' do-install: ${MKDIR} ${STAGEDIR}${KMODDIR} .for i in ${VBOX_KMODS} ${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko ${STAGEDIR}${KMODDIR} .if ${PORT_OPTIONS:MDEBUG} ${INSTALL_KLD} ${VBOX_BIN}/${i}/${i}.ko.symbols ${STAGEDIR}${KMODDIR} .endif .endfor .include Index: head/emulators/virtualbox-ose-kmod/distinfo =================================================================== --- head/emulators/virtualbox-ose-kmod/distinfo (revision 421520) +++ head/emulators/virtualbox-ose-kmod/distinfo (revision 421521) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468866759 -SHA256 (VirtualBox-5.0.26.tar.bz2) = 78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e -SIZE (VirtualBox-5.0.26.tar.bz2) = 111244869 +TIMESTAMP = 1472243715 +SHA256 (VirtualBox-5.1.4.tar.bz2) = b9a14a7771059c55c44b97f8d4eef9bea84544f3e215e0caa563bc35e2f16aaf +SIZE (VirtualBox-5.1.4.tar.bz2) = 114642581