diff options
35 files changed, 500 insertions, 775 deletions
diff --git a/emulators/virtualbox-ose-kmod-legacy/Makefile b/emulators/virtualbox-ose-kmod-legacy/Makefile index 47087d293298..3538d0054d94 100644 --- a/emulators/virtualbox-ose-kmod-legacy/Makefile +++ b/emulators/virtualbox-ose-kmod-legacy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= virtualbox -DISTVERSION= 3.0.51r22683 +DISTVERSION= 3.0.51r22902 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -176,7 +176,9 @@ do-build: do-install: ${MKDIR} ${KMODDIR} - ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR} +.for f in vboxdrv.ko vboxnetadp.ko vboxnetflt.ko + ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${KMODDIR} +.endfor ${MKDIR} ${DATADIR} (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR}) @@ -188,17 +190,17 @@ do-install: (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox) .if !defined(WITHOUT_NLS) - ${MKDIR} ${PREFIX}/lib/virtualbox/nls - (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls) + ${MKDIR} ${DATADIR}/nls + (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls) .endif ${MKDIR} ${PREFIX}/bin -.for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} - ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/ +.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${PREFIX}/lib/virtualbox/ ${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${PREFIX}/bin/ .endfor -.for f in VBoxNetDHCP ${VBOX_FRONTENDS} +.for f in VBoxNetAdpCtl VBoxNetDHCP ${VBOX_FRONTENDS} ${CHMOD} 4511 ${PREFIX}/lib/virtualbox/${f} .endfor @@ -207,8 +209,9 @@ do-install: .endfor .if defined(WITH_GUESTADDITIONS) - ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/ - ${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso + ${MKDIR} ${PREFIX}/lib/virtualbox/additions + ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/ + ${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso .endif cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \ @@ -225,6 +228,10 @@ post-install: ${CHOWN} root:${VBOXGROUP} ${PREFIX}/lib/virtualbox/${f} .endfor + @${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + .if !defined(WITHOUT_QT4) ${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps/ ${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/icons/hicolor/48x48/apps/VBox.png diff --git a/emulators/virtualbox-ose-kmod-legacy/distinfo b/emulators/virtualbox-ose-kmod-legacy/distinfo index 882273f7defb..492de57d1c4a 100644 --- a/emulators/virtualbox-ose-kmod-legacy/distinfo +++ b/emulators/virtualbox-ose-kmod-legacy/distinfo @@ -1,6 +1,6 @@ -MD5 (virtualbox-3.0.51r22683.tar.bz2) = d3bc041395ef61f239e2b24ce35029d5 -SHA256 (virtualbox-3.0.51r22683.tar.bz2) = 94ed1c92d9b3a635b759ee86311c4d4bca77b4409d209c14e158493ace2bc4a4 -SIZE (virtualbox-3.0.51r22683.tar.bz2) = 52073583 +MD5 (virtualbox-3.0.51r22902.tar.bz2) = c2fbfd0eca2d2c9e6ad5f029cf75def0 +SHA256 (virtualbox-3.0.51r22902.tar.bz2) = ccbc88276f9e1944005d1c2f3661ec6d7113b22801ecbbb72d422aa0ab2b0a2a +SIZE (virtualbox-3.0.51r22902.tar.bz2) = 51742256 MD5 (VBoxGuestAdditions_3.0.6.iso) = 8d033b4f66db1a3e5b914da1717e9c21 SHA256 (VBoxGuestAdditions_3.0.6.iso) = d6a8b61ef1004637c8be3a70612bb0e101f552d7eb0a9a376ff1ad264baf6a3c SIZE (VBoxGuestAdditions_3.0.6.iso) = 32786432 diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c deleted file mode 100644 index f5db6a393cf7..000000000000 --- a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c -@@ -215,15 +215,23 @@ static int rtSemEventMultiWait(RTSEMEVEN - - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventMultiInt, 0); - else - rc = sleepq_timedwait(pEventMultiInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventMultiInt); -+ else -+ rc = sleepq_timedwait(pEventMultiInt); -+#endif - } - else - { - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventMultiInt, 0); - else -@@ -231,6 +239,15 @@ static int rtSemEventMultiWait(RTSEMEVEN - rc = 0; - sleepq_wait(pEventMultiInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventMultiInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventMultiInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventMultiInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h new file mode 100644 index 000000000000..4332049487c3 --- /dev/null +++ b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2009-09-11 14:48:47.000000000 +0200 ++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2009-09-11 14:48:54.000000000 +0200 +@@ -76,7 +76,7 @@ + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0) + # define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0) +-#elif ++#else + # define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt) + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt) diff --git a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c deleted file mode 100644 index c2cdf7963fd7..000000000000 --- a/emulators/virtualbox-ose-kmod-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c -@@ -205,15 +205,23 @@ static int rtSemEventWait(RTSEMEVENT Eve - - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventInt, 0); - else - rc = sleepq_timedwait(pEventInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventInt); -+ else -+ rc = sleepq_timedwait(pEventInt); -+#endif - } - else - { - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventInt, 0); - else -@@ -221,6 +229,15 @@ static int rtSemEventWait(RTSEMEVENT Eve - rc = 0; - sleepq_wait(pEventInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose-kmod-legacy/pkg-message b/emulators/virtualbox-ose-kmod-legacy/pkg-message index 8de6ce2ffe0c..91b8b16427cd 100644 --- a/emulators/virtualbox-ose-kmod-legacy/pkg-message +++ b/emulators/virtualbox-ose-kmod-legacy/pkg-message @@ -7,6 +7,10 @@ You need to load the vboxdrv kernel module and a mounted /proc filesystem. % mount -t procfs proc /proc % kldload vboxdrv +For bridged networking you also need to load the vboxnetflt kernel module. + +% kldload vboxnetflt + You also have to add all users to your vboxusers group in order to use vbox. % pw groupmod vboxusers -m jerry diff --git a/emulators/virtualbox-ose-kmod-legacy/pkg-plist b/emulators/virtualbox-ose-kmod-legacy/pkg-plist index 00012310ba7c..701bcf61f230 100644 --- a/emulators/virtualbox-ose-kmod-legacy/pkg-plist +++ b/emulators/virtualbox-ose-kmod-legacy/pkg-plist @@ -1,6 +1,7 @@ %%X11%%bin/VBoxBFE bin/VBoxHeadless bin/VBoxManage +bin/VBoxNetAdpCtl bin/VBoxNetDHCP %%X11%%bin/VBoxSDL bin/VBoxSVC @@ -17,6 +18,7 @@ lib/virtualbox/VBoxHeadless lib/virtualbox/VBoxHeadless.so %%QT4%%lib/virtualbox/VBoxKeyboard.so lib/virtualbox/VBoxManage +lib/virtualbox/VBoxNetAdpCtl lib/virtualbox/VBoxNetDHCP lib/virtualbox/VBoxNetDHCP.so %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so @@ -46,8 +48,8 @@ lib/virtualbox/VMMGC.gc lib/virtualbox/tstMicroGC.gc lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDDR0.r0 -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_%%GUEST_VER%%.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VMMR0.r0 lib/virtualbox/components/VirtualBox_XPCOM.xpt @@ -55,64 +57,64 @@ lib/virtualbox/components/VBoxXPCOMIPCC.so lib/virtualbox/components/VBoxSVCM.so lib/virtualbox/components/VBoxC.so lib/virtualbox/components/VBoxXPCOMBase.xpt -%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm -%%NLS%%lib/virtualbox/nls/qt_ar.qm -%%NLS%%lib/virtualbox/nls/qt_bg.qm -%%NLS%%lib/virtualbox/nls/qt_ca.qm -%%NLS%%lib/virtualbox/nls/qt_cs.qm -%%NLS%%lib/virtualbox/nls/qt_de.qm -%%NLS%%lib/virtualbox/nls/qt_el.qm -%%NLS%%lib/virtualbox/nls/qt_es.qm -%%NLS%%lib/virtualbox/nls/qt_eu.qm -%%NLS%%lib/virtualbox/nls/qt_fi.qm -%%NLS%%lib/virtualbox/nls/qt_fr.qm -%%NLS%%lib/virtualbox/nls/qt_hu.qm -%%NLS%%lib/virtualbox/nls/qt_id.qm -%%NLS%%lib/virtualbox/nls/qt_it.qm -%%NLS%%lib/virtualbox/nls/qt_ja.qm -%%NLS%%lib/virtualbox/nls/qt_km_KH.qm -%%NLS%%lib/virtualbox/nls/qt_ko.qm -%%NLS%%lib/virtualbox/nls/qt_nl.qm -%%NLS%%lib/virtualbox/nls/qt_pl.qm -%%NLS%%lib/virtualbox/nls/qt_pt.qm -%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm -%%NLS%%lib/virtualbox/nls/qt_ro.qm -%%NLS%%lib/virtualbox/nls/qt_ru.qm -%%NLS%%lib/virtualbox/nls/qt_sk.qm -%%NLS%%lib/virtualbox/nls/qt_sr.qm -%%NLS%%lib/virtualbox/nls/qt_sv.qm -%%NLS%%lib/virtualbox/nls/qt_tr.qm -%%NLS%%lib/virtualbox/nls/qt_uk.qm -%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm -%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ar.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_el.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fr.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_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_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_ar.qm +%%NLS%%%%DATADIR%%/nls/qt_bg.qm +%%NLS%%%%DATADIR%%/nls/qt_ca.qm +%%NLS%%%%DATADIR%%/nls/qt_cs.qm +%%NLS%%%%DATADIR%%/nls/qt_de.qm +%%NLS%%%%DATADIR%%/nls/qt_el.qm +%%NLS%%%%DATADIR%%/nls/qt_es.qm +%%NLS%%%%DATADIR%%/nls/qt_eu.qm +%%NLS%%%%DATADIR%%/nls/qt_fi.qm +%%NLS%%%%DATADIR%%/nls/qt_fr.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_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_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 %%QT4%%share/applications/virtualbox.desktop %%QT4%%share/icons/hicolor/48x48/apps/VBox.png %%DATADIR%%/idl/nsIDebug.idl @@ -580,6 +582,7 @@ include/virtualbox/xpcom/xpcom-config.h @dirrm include/virtualbox/nsprpub @dirrm include/virtualbox/ipcd @dirrm include/virtualbox +%%NLS%%@dirrm %%DATADIR%%/nls @dirrm %%DATADIR%%/samples @dirrm %%DATADIR%%/idl @dirrm %%DATADIR%% @@ -588,8 +591,10 @@ include/virtualbox/xpcom/xpcom-config.h %%QT4%%@dirrmtry share/icons/hicolor %%QT4%%@dirrmtry share/icons %%QT4%%@dirrmtry share/applications -%%NLS%%@dirrm lib/virtualbox/nls @dirrm lib/virtualbox/components +@dirrm lib/virtualbox/additions @dirrm lib/virtualbox @cwd / %%KMODDIR%%/vboxdrv.ko +%%KMODDIR%%/vboxnetadp.ko +%%KMODDIR%%/vboxnetflt.ko diff --git a/emulators/virtualbox-ose-kmod/Makefile b/emulators/virtualbox-ose-kmod/Makefile index 47087d293298..3538d0054d94 100644 --- a/emulators/virtualbox-ose-kmod/Makefile +++ b/emulators/virtualbox-ose-kmod/Makefile @@ -6,7 +6,7 @@ # PORTNAME= virtualbox -DISTVERSION= 3.0.51r22683 +DISTVERSION= 3.0.51r22902 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -176,7 +176,9 @@ do-build: do-install: ${MKDIR} ${KMODDIR} - ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR} +.for f in vboxdrv.ko vboxnetadp.ko vboxnetflt.ko + ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${KMODDIR} +.endfor ${MKDIR} ${DATADIR} (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR}) @@ -188,17 +190,17 @@ do-install: (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox) .if !defined(WITHOUT_NLS) - ${MKDIR} ${PREFIX}/lib/virtualbox/nls - (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls) + ${MKDIR} ${DATADIR}/nls + (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls) .endif ${MKDIR} ${PREFIX}/bin -.for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} - ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/ +.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${PREFIX}/lib/virtualbox/ ${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${PREFIX}/bin/ .endfor -.for f in VBoxNetDHCP ${VBOX_FRONTENDS} +.for f in VBoxNetAdpCtl VBoxNetDHCP ${VBOX_FRONTENDS} ${CHMOD} 4511 ${PREFIX}/lib/virtualbox/${f} .endfor @@ -207,8 +209,9 @@ do-install: .endfor .if defined(WITH_GUESTADDITIONS) - ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/ - ${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso + ${MKDIR} ${PREFIX}/lib/virtualbox/additions + ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/ + ${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso .endif cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \ @@ -225,6 +228,10 @@ post-install: ${CHOWN} root:${VBOXGROUP} ${PREFIX}/lib/virtualbox/${f} .endfor + @${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + .if !defined(WITHOUT_QT4) ${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps/ ${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/icons/hicolor/48x48/apps/VBox.png diff --git a/emulators/virtualbox-ose-kmod/distinfo b/emulators/virtualbox-ose-kmod/distinfo index 882273f7defb..492de57d1c4a 100644 --- a/emulators/virtualbox-ose-kmod/distinfo +++ b/emulators/virtualbox-ose-kmod/distinfo @@ -1,6 +1,6 @@ -MD5 (virtualbox-3.0.51r22683.tar.bz2) = d3bc041395ef61f239e2b24ce35029d5 -SHA256 (virtualbox-3.0.51r22683.tar.bz2) = 94ed1c92d9b3a635b759ee86311c4d4bca77b4409d209c14e158493ace2bc4a4 -SIZE (virtualbox-3.0.51r22683.tar.bz2) = 52073583 +MD5 (virtualbox-3.0.51r22902.tar.bz2) = c2fbfd0eca2d2c9e6ad5f029cf75def0 +SHA256 (virtualbox-3.0.51r22902.tar.bz2) = ccbc88276f9e1944005d1c2f3661ec6d7113b22801ecbbb72d422aa0ab2b0a2a +SIZE (virtualbox-3.0.51r22902.tar.bz2) = 51742256 MD5 (VBoxGuestAdditions_3.0.6.iso) = 8d033b4f66db1a3e5b914da1717e9c21 SHA256 (VBoxGuestAdditions_3.0.6.iso) = d6a8b61ef1004637c8be3a70612bb0e101f552d7eb0a9a376ff1ad264baf6a3c SIZE (VBoxGuestAdditions_3.0.6.iso) = 32786432 diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c deleted file mode 100644 index f5db6a393cf7..000000000000 --- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c -@@ -215,15 +215,23 @@ static int rtSemEventMultiWait(RTSEMEVEN - - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventMultiInt, 0); - else - rc = sleepq_timedwait(pEventMultiInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventMultiInt); -+ else -+ rc = sleepq_timedwait(pEventMultiInt); -+#endif - } - else - { - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventMultiInt, 0); - else -@@ -231,6 +239,15 @@ static int rtSemEventMultiWait(RTSEMEVEN - rc = 0; - sleepq_wait(pEventMultiInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventMultiInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventMultiInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventMultiInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h new file mode 100644 index 000000000000..4332049487c3 --- /dev/null +++ b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2009-09-11 14:48:47.000000000 +0200 ++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2009-09-11 14:48:54.000000000 +0200 +@@ -76,7 +76,7 @@ + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0) + # define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0) +-#elif ++#else + # define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt) + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt) diff --git a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c b/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c deleted file mode 100644 index c2cdf7963fd7..000000000000 --- a/emulators/virtualbox-ose-kmod/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c -@@ -205,15 +205,23 @@ static int rtSemEventWait(RTSEMEVENT Eve - - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventInt, 0); - else - rc = sleepq_timedwait(pEventInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventInt); -+ else -+ rc = sleepq_timedwait(pEventInt); -+#endif - } - else - { - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventInt, 0); - else -@@ -221,6 +229,15 @@ static int rtSemEventWait(RTSEMEVENT Eve - rc = 0; - sleepq_wait(pEventInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose-kmod/pkg-message b/emulators/virtualbox-ose-kmod/pkg-message index 8de6ce2ffe0c..91b8b16427cd 100644 --- a/emulators/virtualbox-ose-kmod/pkg-message +++ b/emulators/virtualbox-ose-kmod/pkg-message @@ -7,6 +7,10 @@ You need to load the vboxdrv kernel module and a mounted /proc filesystem. % mount -t procfs proc /proc % kldload vboxdrv +For bridged networking you also need to load the vboxnetflt kernel module. + +% kldload vboxnetflt + You also have to add all users to your vboxusers group in order to use vbox. % pw groupmod vboxusers -m jerry diff --git a/emulators/virtualbox-ose-kmod/pkg-plist b/emulators/virtualbox-ose-kmod/pkg-plist index 00012310ba7c..701bcf61f230 100644 --- a/emulators/virtualbox-ose-kmod/pkg-plist +++ b/emulators/virtualbox-ose-kmod/pkg-plist @@ -1,6 +1,7 @@ %%X11%%bin/VBoxBFE bin/VBoxHeadless bin/VBoxManage +bin/VBoxNetAdpCtl bin/VBoxNetDHCP %%X11%%bin/VBoxSDL bin/VBoxSVC @@ -17,6 +18,7 @@ lib/virtualbox/VBoxHeadless lib/virtualbox/VBoxHeadless.so %%QT4%%lib/virtualbox/VBoxKeyboard.so lib/virtualbox/VBoxManage +lib/virtualbox/VBoxNetAdpCtl lib/virtualbox/VBoxNetDHCP lib/virtualbox/VBoxNetDHCP.so %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so @@ -46,8 +48,8 @@ lib/virtualbox/VMMGC.gc lib/virtualbox/tstMicroGC.gc lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDDR0.r0 -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_%%GUEST_VER%%.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VMMR0.r0 lib/virtualbox/components/VirtualBox_XPCOM.xpt @@ -55,64 +57,64 @@ lib/virtualbox/components/VBoxXPCOMIPCC.so lib/virtualbox/components/VBoxSVCM.so lib/virtualbox/components/VBoxC.so lib/virtualbox/components/VBoxXPCOMBase.xpt -%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm -%%NLS%%lib/virtualbox/nls/qt_ar.qm -%%NLS%%lib/virtualbox/nls/qt_bg.qm -%%NLS%%lib/virtualbox/nls/qt_ca.qm -%%NLS%%lib/virtualbox/nls/qt_cs.qm -%%NLS%%lib/virtualbox/nls/qt_de.qm -%%NLS%%lib/virtualbox/nls/qt_el.qm -%%NLS%%lib/virtualbox/nls/qt_es.qm -%%NLS%%lib/virtualbox/nls/qt_eu.qm -%%NLS%%lib/virtualbox/nls/qt_fi.qm -%%NLS%%lib/virtualbox/nls/qt_fr.qm -%%NLS%%lib/virtualbox/nls/qt_hu.qm -%%NLS%%lib/virtualbox/nls/qt_id.qm -%%NLS%%lib/virtualbox/nls/qt_it.qm -%%NLS%%lib/virtualbox/nls/qt_ja.qm -%%NLS%%lib/virtualbox/nls/qt_km_KH.qm -%%NLS%%lib/virtualbox/nls/qt_ko.qm -%%NLS%%lib/virtualbox/nls/qt_nl.qm -%%NLS%%lib/virtualbox/nls/qt_pl.qm -%%NLS%%lib/virtualbox/nls/qt_pt.qm -%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm -%%NLS%%lib/virtualbox/nls/qt_ro.qm -%%NLS%%lib/virtualbox/nls/qt_ru.qm -%%NLS%%lib/virtualbox/nls/qt_sk.qm -%%NLS%%lib/virtualbox/nls/qt_sr.qm -%%NLS%%lib/virtualbox/nls/qt_sv.qm -%%NLS%%lib/virtualbox/nls/qt_tr.qm -%%NLS%%lib/virtualbox/nls/qt_uk.qm -%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm -%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ar.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_el.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fr.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_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_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_ar.qm +%%NLS%%%%DATADIR%%/nls/qt_bg.qm +%%NLS%%%%DATADIR%%/nls/qt_ca.qm +%%NLS%%%%DATADIR%%/nls/qt_cs.qm +%%NLS%%%%DATADIR%%/nls/qt_de.qm +%%NLS%%%%DATADIR%%/nls/qt_el.qm +%%NLS%%%%DATADIR%%/nls/qt_es.qm +%%NLS%%%%DATADIR%%/nls/qt_eu.qm +%%NLS%%%%DATADIR%%/nls/qt_fi.qm +%%NLS%%%%DATADIR%%/nls/qt_fr.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_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_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 %%QT4%%share/applications/virtualbox.desktop %%QT4%%share/icons/hicolor/48x48/apps/VBox.png %%DATADIR%%/idl/nsIDebug.idl @@ -580,6 +582,7 @@ include/virtualbox/xpcom/xpcom-config.h @dirrm include/virtualbox/nsprpub @dirrm include/virtualbox/ipcd @dirrm include/virtualbox +%%NLS%%@dirrm %%DATADIR%%/nls @dirrm %%DATADIR%%/samples @dirrm %%DATADIR%%/idl @dirrm %%DATADIR%% @@ -588,8 +591,10 @@ include/virtualbox/xpcom/xpcom-config.h %%QT4%%@dirrmtry share/icons/hicolor %%QT4%%@dirrmtry share/icons %%QT4%%@dirrmtry share/applications -%%NLS%%@dirrm lib/virtualbox/nls @dirrm lib/virtualbox/components +@dirrm lib/virtualbox/additions @dirrm lib/virtualbox @cwd / %%KMODDIR%%/vboxdrv.ko +%%KMODDIR%%/vboxnetadp.ko +%%KMODDIR%%/vboxnetflt.ko diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile index 47087d293298..3538d0054d94 100644 --- a/emulators/virtualbox-ose-legacy/Makefile +++ b/emulators/virtualbox-ose-legacy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= virtualbox -DISTVERSION= 3.0.51r22683 +DISTVERSION= 3.0.51r22902 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -176,7 +176,9 @@ do-build: do-install: ${MKDIR} ${KMODDIR} - ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR} +.for f in vboxdrv.ko vboxnetadp.ko vboxnetflt.ko + ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${KMODDIR} +.endfor ${MKDIR} ${DATADIR} (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR}) @@ -188,17 +190,17 @@ do-install: (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox) .if !defined(WITHOUT_NLS) - ${MKDIR} ${PREFIX}/lib/virtualbox/nls - (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls) + ${MKDIR} ${DATADIR}/nls + (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls) .endif ${MKDIR} ${PREFIX}/bin -.for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} - ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/ +.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${PREFIX}/lib/virtualbox/ ${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${PREFIX}/bin/ .endfor -.for f in VBoxNetDHCP ${VBOX_FRONTENDS} +.for f in VBoxNetAdpCtl VBoxNetDHCP ${VBOX_FRONTENDS} ${CHMOD} 4511 ${PREFIX}/lib/virtualbox/${f} .endfor @@ -207,8 +209,9 @@ do-install: .endfor .if defined(WITH_GUESTADDITIONS) - ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/ - ${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso + ${MKDIR} ${PREFIX}/lib/virtualbox/additions + ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/ + ${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso .endif cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \ @@ -225,6 +228,10 @@ post-install: ${CHOWN} root:${VBOXGROUP} ${PREFIX}/lib/virtualbox/${f} .endfor + @${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + .if !defined(WITHOUT_QT4) ${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps/ ${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/icons/hicolor/48x48/apps/VBox.png diff --git a/emulators/virtualbox-ose-legacy/distinfo b/emulators/virtualbox-ose-legacy/distinfo index 882273f7defb..492de57d1c4a 100644 --- a/emulators/virtualbox-ose-legacy/distinfo +++ b/emulators/virtualbox-ose-legacy/distinfo @@ -1,6 +1,6 @@ -MD5 (virtualbox-3.0.51r22683.tar.bz2) = d3bc041395ef61f239e2b24ce35029d5 -SHA256 (virtualbox-3.0.51r22683.tar.bz2) = 94ed1c92d9b3a635b759ee86311c4d4bca77b4409d209c14e158493ace2bc4a4 -SIZE (virtualbox-3.0.51r22683.tar.bz2) = 52073583 +MD5 (virtualbox-3.0.51r22902.tar.bz2) = c2fbfd0eca2d2c9e6ad5f029cf75def0 +SHA256 (virtualbox-3.0.51r22902.tar.bz2) = ccbc88276f9e1944005d1c2f3661ec6d7113b22801ecbbb72d422aa0ab2b0a2a +SIZE (virtualbox-3.0.51r22902.tar.bz2) = 51742256 MD5 (VBoxGuestAdditions_3.0.6.iso) = 8d033b4f66db1a3e5b914da1717e9c21 SHA256 (VBoxGuestAdditions_3.0.6.iso) = d6a8b61ef1004637c8be3a70612bb0e101f552d7eb0a9a376ff1ad264baf6a3c SIZE (VBoxGuestAdditions_3.0.6.iso) = 32786432 diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c deleted file mode 100644 index f5db6a393cf7..000000000000 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c -@@ -215,15 +215,23 @@ static int rtSemEventMultiWait(RTSEMEVEN - - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventMultiInt, 0); - else - rc = sleepq_timedwait(pEventMultiInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventMultiInt); -+ else -+ rc = sleepq_timedwait(pEventMultiInt); -+#endif - } - else - { - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventMultiInt, 0); - else -@@ -231,6 +239,15 @@ static int rtSemEventMultiWait(RTSEMEVEN - rc = 0; - sleepq_wait(pEventMultiInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventMultiInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventMultiInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventMultiInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h new file mode 100644 index 000000000000..4332049487c3 --- /dev/null +++ b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2009-09-11 14:48:47.000000000 +0200 ++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2009-09-11 14:48:54.000000000 +0200 +@@ -76,7 +76,7 @@ + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0) + # define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0) +-#elif ++#else + # define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt) + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt) diff --git a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c b/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c deleted file mode 100644 index c2cdf7963fd7..000000000000 --- a/emulators/virtualbox-ose-legacy/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c -@@ -205,15 +205,23 @@ static int rtSemEventWait(RTSEMEVENT Eve - - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventInt, 0); - else - rc = sleepq_timedwait(pEventInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventInt); -+ else -+ rc = sleepq_timedwait(pEventInt); -+#endif - } - else - { - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventInt, 0); - else -@@ -221,6 +229,15 @@ static int rtSemEventWait(RTSEMEVENT Eve - rc = 0; - sleepq_wait(pEventInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose-legacy/pkg-message b/emulators/virtualbox-ose-legacy/pkg-message index 8de6ce2ffe0c..91b8b16427cd 100644 --- a/emulators/virtualbox-ose-legacy/pkg-message +++ b/emulators/virtualbox-ose-legacy/pkg-message @@ -7,6 +7,10 @@ You need to load the vboxdrv kernel module and a mounted /proc filesystem. % mount -t procfs proc /proc % kldload vboxdrv +For bridged networking you also need to load the vboxnetflt kernel module. + +% kldload vboxnetflt + You also have to add all users to your vboxusers group in order to use vbox. % pw groupmod vboxusers -m jerry diff --git a/emulators/virtualbox-ose-legacy/pkg-plist b/emulators/virtualbox-ose-legacy/pkg-plist index 00012310ba7c..701bcf61f230 100644 --- a/emulators/virtualbox-ose-legacy/pkg-plist +++ b/emulators/virtualbox-ose-legacy/pkg-plist @@ -1,6 +1,7 @@ %%X11%%bin/VBoxBFE bin/VBoxHeadless bin/VBoxManage +bin/VBoxNetAdpCtl bin/VBoxNetDHCP %%X11%%bin/VBoxSDL bin/VBoxSVC @@ -17,6 +18,7 @@ lib/virtualbox/VBoxHeadless lib/virtualbox/VBoxHeadless.so %%QT4%%lib/virtualbox/VBoxKeyboard.so lib/virtualbox/VBoxManage +lib/virtualbox/VBoxNetAdpCtl lib/virtualbox/VBoxNetDHCP lib/virtualbox/VBoxNetDHCP.so %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so @@ -46,8 +48,8 @@ lib/virtualbox/VMMGC.gc lib/virtualbox/tstMicroGC.gc lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDDR0.r0 -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_%%GUEST_VER%%.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VMMR0.r0 lib/virtualbox/components/VirtualBox_XPCOM.xpt @@ -55,64 +57,64 @@ lib/virtualbox/components/VBoxXPCOMIPCC.so lib/virtualbox/components/VBoxSVCM.so lib/virtualbox/components/VBoxC.so lib/virtualbox/components/VBoxXPCOMBase.xpt -%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm -%%NLS%%lib/virtualbox/nls/qt_ar.qm -%%NLS%%lib/virtualbox/nls/qt_bg.qm -%%NLS%%lib/virtualbox/nls/qt_ca.qm -%%NLS%%lib/virtualbox/nls/qt_cs.qm -%%NLS%%lib/virtualbox/nls/qt_de.qm -%%NLS%%lib/virtualbox/nls/qt_el.qm -%%NLS%%lib/virtualbox/nls/qt_es.qm -%%NLS%%lib/virtualbox/nls/qt_eu.qm -%%NLS%%lib/virtualbox/nls/qt_fi.qm -%%NLS%%lib/virtualbox/nls/qt_fr.qm -%%NLS%%lib/virtualbox/nls/qt_hu.qm -%%NLS%%lib/virtualbox/nls/qt_id.qm -%%NLS%%lib/virtualbox/nls/qt_it.qm -%%NLS%%lib/virtualbox/nls/qt_ja.qm -%%NLS%%lib/virtualbox/nls/qt_km_KH.qm -%%NLS%%lib/virtualbox/nls/qt_ko.qm -%%NLS%%lib/virtualbox/nls/qt_nl.qm -%%NLS%%lib/virtualbox/nls/qt_pl.qm -%%NLS%%lib/virtualbox/nls/qt_pt.qm -%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm -%%NLS%%lib/virtualbox/nls/qt_ro.qm -%%NLS%%lib/virtualbox/nls/qt_ru.qm -%%NLS%%lib/virtualbox/nls/qt_sk.qm -%%NLS%%lib/virtualbox/nls/qt_sr.qm -%%NLS%%lib/virtualbox/nls/qt_sv.qm -%%NLS%%lib/virtualbox/nls/qt_tr.qm -%%NLS%%lib/virtualbox/nls/qt_uk.qm -%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm -%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ar.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_el.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fr.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_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_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_ar.qm +%%NLS%%%%DATADIR%%/nls/qt_bg.qm +%%NLS%%%%DATADIR%%/nls/qt_ca.qm +%%NLS%%%%DATADIR%%/nls/qt_cs.qm +%%NLS%%%%DATADIR%%/nls/qt_de.qm +%%NLS%%%%DATADIR%%/nls/qt_el.qm +%%NLS%%%%DATADIR%%/nls/qt_es.qm +%%NLS%%%%DATADIR%%/nls/qt_eu.qm +%%NLS%%%%DATADIR%%/nls/qt_fi.qm +%%NLS%%%%DATADIR%%/nls/qt_fr.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_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_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 %%QT4%%share/applications/virtualbox.desktop %%QT4%%share/icons/hicolor/48x48/apps/VBox.png %%DATADIR%%/idl/nsIDebug.idl @@ -580,6 +582,7 @@ include/virtualbox/xpcom/xpcom-config.h @dirrm include/virtualbox/nsprpub @dirrm include/virtualbox/ipcd @dirrm include/virtualbox +%%NLS%%@dirrm %%DATADIR%%/nls @dirrm %%DATADIR%%/samples @dirrm %%DATADIR%%/idl @dirrm %%DATADIR%% @@ -588,8 +591,10 @@ include/virtualbox/xpcom/xpcom-config.h %%QT4%%@dirrmtry share/icons/hicolor %%QT4%%@dirrmtry share/icons %%QT4%%@dirrmtry share/applications -%%NLS%%@dirrm lib/virtualbox/nls @dirrm lib/virtualbox/components +@dirrm lib/virtualbox/additions @dirrm lib/virtualbox @cwd / %%KMODDIR%%/vboxdrv.ko +%%KMODDIR%%/vboxnetadp.ko +%%KMODDIR%%/vboxnetflt.ko diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 47087d293298..3538d0054d94 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -6,7 +6,7 @@ # PORTNAME= virtualbox -DISTVERSION= 3.0.51r22683 +DISTVERSION= 3.0.51r22902 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -176,7 +176,9 @@ do-build: do-install: ${MKDIR} ${KMODDIR} - ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR} +.for f in vboxdrv.ko vboxnetadp.ko vboxnetflt.ko + ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${KMODDIR} +.endfor ${MKDIR} ${DATADIR} (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR}) @@ -188,17 +190,17 @@ do-install: (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox) .if !defined(WITHOUT_NLS) - ${MKDIR} ${PREFIX}/lib/virtualbox/nls - (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls) + ${MKDIR} ${DATADIR}/nls + (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls) .endif ${MKDIR} ${PREFIX}/bin -.for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} - ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/ +.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${PREFIX}/lib/virtualbox/ ${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${PREFIX}/bin/ .endfor -.for f in VBoxNetDHCP ${VBOX_FRONTENDS} +.for f in VBoxNetAdpCtl VBoxNetDHCP ${VBOX_FRONTENDS} ${CHMOD} 4511 ${PREFIX}/lib/virtualbox/${f} .endfor @@ -207,8 +209,9 @@ do-install: .endfor .if defined(WITH_GUESTADDITIONS) - ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/ - ${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso + ${MKDIR} ${PREFIX}/lib/virtualbox/additions + ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/ + ${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso .endif cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \ @@ -225,6 +228,10 @@ post-install: ${CHOWN} root:${VBOXGROUP} ${PREFIX}/lib/virtualbox/${f} .endfor + @${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + .if !defined(WITHOUT_QT4) ${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps/ ${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/icons/hicolor/48x48/apps/VBox.png diff --git a/emulators/virtualbox-ose/distinfo b/emulators/virtualbox-ose/distinfo index 882273f7defb..492de57d1c4a 100644 --- a/emulators/virtualbox-ose/distinfo +++ b/emulators/virtualbox-ose/distinfo @@ -1,6 +1,6 @@ -MD5 (virtualbox-3.0.51r22683.tar.bz2) = d3bc041395ef61f239e2b24ce35029d5 -SHA256 (virtualbox-3.0.51r22683.tar.bz2) = 94ed1c92d9b3a635b759ee86311c4d4bca77b4409d209c14e158493ace2bc4a4 -SIZE (virtualbox-3.0.51r22683.tar.bz2) = 52073583 +MD5 (virtualbox-3.0.51r22902.tar.bz2) = c2fbfd0eca2d2c9e6ad5f029cf75def0 +SHA256 (virtualbox-3.0.51r22902.tar.bz2) = ccbc88276f9e1944005d1c2f3661ec6d7113b22801ecbbb72d422aa0ab2b0a2a +SIZE (virtualbox-3.0.51r22902.tar.bz2) = 51742256 MD5 (VBoxGuestAdditions_3.0.6.iso) = 8d033b4f66db1a3e5b914da1717e9c21 SHA256 (VBoxGuestAdditions_3.0.6.iso) = d6a8b61ef1004637c8be3a70612bb0e101f552d7eb0a9a376ff1ad264baf6a3c SIZE (VBoxGuestAdditions_3.0.6.iso) = 32786432 diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c deleted file mode 100644 index f5db6a393cf7..000000000000 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c -@@ -215,15 +215,23 @@ static int rtSemEventMultiWait(RTSEMEVEN - - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventMultiInt, 0); - else - rc = sleepq_timedwait(pEventMultiInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventMultiInt); -+ else -+ rc = sleepq_timedwait(pEventMultiInt); -+#endif - } - else - { - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventMultiInt, 0); - else -@@ -231,6 +239,15 @@ static int rtSemEventMultiWait(RTSEMEVEN - rc = 0; - sleepq_wait(pEventMultiInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventMultiInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventMultiInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventMultiInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h new file mode 100644 index 000000000000..4332049487c3 --- /dev/null +++ b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2009-09-11 14:48:47.000000000 +0200 ++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2009-09-11 14:48:54.000000000 +0200 +@@ -76,7 +76,7 @@ + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0) + # define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0) +-#elif ++#else + # define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt) + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt) diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c b/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c deleted file mode 100644 index c2cdf7963fd7..000000000000 --- a/emulators/virtualbox-ose/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c -@@ -205,15 +205,23 @@ static int rtSemEventWait(RTSEMEVENT Eve - - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventInt, 0); - else - rc = sleepq_timedwait(pEventInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventInt); -+ else -+ rc = sleepq_timedwait(pEventInt); -+#endif - } - else - { - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventInt, 0); - else -@@ -221,6 +229,15 @@ static int rtSemEventWait(RTSEMEVENT Eve - rc = 0; - sleepq_wait(pEventInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox-ose/pkg-message b/emulators/virtualbox-ose/pkg-message index 8de6ce2ffe0c..91b8b16427cd 100644 --- a/emulators/virtualbox-ose/pkg-message +++ b/emulators/virtualbox-ose/pkg-message @@ -7,6 +7,10 @@ You need to load the vboxdrv kernel module and a mounted /proc filesystem. % mount -t procfs proc /proc % kldload vboxdrv +For bridged networking you also need to load the vboxnetflt kernel module. + +% kldload vboxnetflt + You also have to add all users to your vboxusers group in order to use vbox. % pw groupmod vboxusers -m jerry diff --git a/emulators/virtualbox-ose/pkg-plist b/emulators/virtualbox-ose/pkg-plist index 00012310ba7c..701bcf61f230 100644 --- a/emulators/virtualbox-ose/pkg-plist +++ b/emulators/virtualbox-ose/pkg-plist @@ -1,6 +1,7 @@ %%X11%%bin/VBoxBFE bin/VBoxHeadless bin/VBoxManage +bin/VBoxNetAdpCtl bin/VBoxNetDHCP %%X11%%bin/VBoxSDL bin/VBoxSVC @@ -17,6 +18,7 @@ lib/virtualbox/VBoxHeadless lib/virtualbox/VBoxHeadless.so %%QT4%%lib/virtualbox/VBoxKeyboard.so lib/virtualbox/VBoxManage +lib/virtualbox/VBoxNetAdpCtl lib/virtualbox/VBoxNetDHCP lib/virtualbox/VBoxNetDHCP.so %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so @@ -46,8 +48,8 @@ lib/virtualbox/VMMGC.gc lib/virtualbox/tstMicroGC.gc lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDDR0.r0 -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_%%GUEST_VER%%.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VMMR0.r0 lib/virtualbox/components/VirtualBox_XPCOM.xpt @@ -55,64 +57,64 @@ lib/virtualbox/components/VBoxXPCOMIPCC.so lib/virtualbox/components/VBoxSVCM.so lib/virtualbox/components/VBoxC.so lib/virtualbox/components/VBoxXPCOMBase.xpt -%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm -%%NLS%%lib/virtualbox/nls/qt_ar.qm -%%NLS%%lib/virtualbox/nls/qt_bg.qm -%%NLS%%lib/virtualbox/nls/qt_ca.qm -%%NLS%%lib/virtualbox/nls/qt_cs.qm -%%NLS%%lib/virtualbox/nls/qt_de.qm -%%NLS%%lib/virtualbox/nls/qt_el.qm -%%NLS%%lib/virtualbox/nls/qt_es.qm -%%NLS%%lib/virtualbox/nls/qt_eu.qm -%%NLS%%lib/virtualbox/nls/qt_fi.qm -%%NLS%%lib/virtualbox/nls/qt_fr.qm -%%NLS%%lib/virtualbox/nls/qt_hu.qm -%%NLS%%lib/virtualbox/nls/qt_id.qm -%%NLS%%lib/virtualbox/nls/qt_it.qm -%%NLS%%lib/virtualbox/nls/qt_ja.qm -%%NLS%%lib/virtualbox/nls/qt_km_KH.qm -%%NLS%%lib/virtualbox/nls/qt_ko.qm -%%NLS%%lib/virtualbox/nls/qt_nl.qm -%%NLS%%lib/virtualbox/nls/qt_pl.qm -%%NLS%%lib/virtualbox/nls/qt_pt.qm -%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm -%%NLS%%lib/virtualbox/nls/qt_ro.qm -%%NLS%%lib/virtualbox/nls/qt_ru.qm -%%NLS%%lib/virtualbox/nls/qt_sk.qm -%%NLS%%lib/virtualbox/nls/qt_sr.qm -%%NLS%%lib/virtualbox/nls/qt_sv.qm -%%NLS%%lib/virtualbox/nls/qt_tr.qm -%%NLS%%lib/virtualbox/nls/qt_uk.qm -%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm -%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ar.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_el.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fr.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_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_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_ar.qm +%%NLS%%%%DATADIR%%/nls/qt_bg.qm +%%NLS%%%%DATADIR%%/nls/qt_ca.qm +%%NLS%%%%DATADIR%%/nls/qt_cs.qm +%%NLS%%%%DATADIR%%/nls/qt_de.qm +%%NLS%%%%DATADIR%%/nls/qt_el.qm +%%NLS%%%%DATADIR%%/nls/qt_es.qm +%%NLS%%%%DATADIR%%/nls/qt_eu.qm +%%NLS%%%%DATADIR%%/nls/qt_fi.qm +%%NLS%%%%DATADIR%%/nls/qt_fr.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_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_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 %%QT4%%share/applications/virtualbox.desktop %%QT4%%share/icons/hicolor/48x48/apps/VBox.png %%DATADIR%%/idl/nsIDebug.idl @@ -580,6 +582,7 @@ include/virtualbox/xpcom/xpcom-config.h @dirrm include/virtualbox/nsprpub @dirrm include/virtualbox/ipcd @dirrm include/virtualbox +%%NLS%%@dirrm %%DATADIR%%/nls @dirrm %%DATADIR%%/samples @dirrm %%DATADIR%%/idl @dirrm %%DATADIR%% @@ -588,8 +591,10 @@ include/virtualbox/xpcom/xpcom-config.h %%QT4%%@dirrmtry share/icons/hicolor %%QT4%%@dirrmtry share/icons %%QT4%%@dirrmtry share/applications -%%NLS%%@dirrm lib/virtualbox/nls @dirrm lib/virtualbox/components +@dirrm lib/virtualbox/additions @dirrm lib/virtualbox @cwd / %%KMODDIR%%/vboxdrv.ko +%%KMODDIR%%/vboxnetadp.ko +%%KMODDIR%%/vboxnetflt.ko diff --git a/emulators/virtualbox/Makefile b/emulators/virtualbox/Makefile index 47087d293298..3538d0054d94 100644 --- a/emulators/virtualbox/Makefile +++ b/emulators/virtualbox/Makefile @@ -6,7 +6,7 @@ # PORTNAME= virtualbox -DISTVERSION= 3.0.51r22683 +DISTVERSION= 3.0.51r22902 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -176,7 +176,9 @@ do-build: do-install: ${MKDIR} ${KMODDIR} - ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/vboxdrv.ko ${KMODDIR} +.for f in vboxdrv.ko vboxnetadp.ko vboxnetflt.ko + ${INSTALL_KLD} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${KMODDIR} +.endfor ${MKDIR} ${DATADIR} (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/bindings/xpcom && ${COPYTREE_SHARE} "idl samples" ${DATADIR}) @@ -188,17 +190,17 @@ do-install: (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 components" ${PREFIX}/lib/virtualbox) .if !defined(WITHOUT_NLS) - ${MKDIR} ${PREFIX}/lib/virtualbox/nls - (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${PREFIX}/lib/virtualbox/nls) + ${MKDIR} ${DATADIR}/nls + (cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${DATADIR}/nls) .endif ${MKDIR} ${PREFIX}/bin -.for f in VBoxManage VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} - ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/$f ${PREFIX}/lib/virtualbox/ +.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD ${VBOX_FRONTENDS} + ${INSTALL_PROGRAM} ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/${f} ${PREFIX}/lib/virtualbox/ ${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${PREFIX}/bin/ .endfor -.for f in VBoxNetDHCP ${VBOX_FRONTENDS} +.for f in VBoxNetAdpCtl VBoxNetDHCP ${VBOX_FRONTENDS} ${CHMOD} 4511 ${PREFIX}/lib/virtualbox/${f} .endfor @@ -207,8 +209,9 @@ do-install: .endfor .if defined(WITH_GUESTADDITIONS) - ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/ - ${LN} -sf ${PREFIX}/lib/virtualbox/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/VBoxGuestAdditions.iso + ${MKDIR} ${PREFIX}/lib/virtualbox/additions + ${INSTALL_DATA} ${DISTDIR}/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/ + ${LN} -sf ${PREFIX}/lib/virtualbox/additions/${GUESTADDITIONS} ${PREFIX}/lib/virtualbox/additions/VBoxGuestAdditions.iso .endif cd ${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/sdk/installer && \ @@ -225,6 +228,10 @@ post-install: ${CHOWN} root:${VBOXGROUP} ${PREFIX}/lib/virtualbox/${f} .endfor + @${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/include/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${PREFIX}/lib/virtualbox -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + .if !defined(WITHOUT_QT4) ${MKDIR} ${PREFIX}/share/icons/hicolor/48x48/apps/ ${INSTALL_DATA} ${WRKSRC}/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_48px.png ${PREFIX}/share/icons/hicolor/48x48/apps/VBox.png diff --git a/emulators/virtualbox/distinfo b/emulators/virtualbox/distinfo index 882273f7defb..492de57d1c4a 100644 --- a/emulators/virtualbox/distinfo +++ b/emulators/virtualbox/distinfo @@ -1,6 +1,6 @@ -MD5 (virtualbox-3.0.51r22683.tar.bz2) = d3bc041395ef61f239e2b24ce35029d5 -SHA256 (virtualbox-3.0.51r22683.tar.bz2) = 94ed1c92d9b3a635b759ee86311c4d4bca77b4409d209c14e158493ace2bc4a4 -SIZE (virtualbox-3.0.51r22683.tar.bz2) = 52073583 +MD5 (virtualbox-3.0.51r22902.tar.bz2) = c2fbfd0eca2d2c9e6ad5f029cf75def0 +SHA256 (virtualbox-3.0.51r22902.tar.bz2) = ccbc88276f9e1944005d1c2f3661ec6d7113b22801ecbbb72d422aa0ab2b0a2a +SIZE (virtualbox-3.0.51r22902.tar.bz2) = 51742256 MD5 (VBoxGuestAdditions_3.0.6.iso) = 8d033b4f66db1a3e5b914da1717e9c21 SHA256 (VBoxGuestAdditions_3.0.6.iso) = d6a8b61ef1004637c8be3a70612bb0e101f552d7eb0a9a376ff1ad264baf6a3c SIZE (VBoxGuestAdditions_3.0.6.iso) = 32786432 diff --git a/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c b/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c deleted file mode 100644 index f5db6a393cf7..000000000000 --- a/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd-semeventmulti-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c -@@ -215,15 +215,23 @@ static int rtSemEventMultiWait(RTSEMEVEN - - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventMultiInt, 0); - else - rc = sleepq_timedwait(pEventMultiInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventMultiInt); -+ else -+ rc = sleepq_timedwait(pEventMultiInt); -+#endif - } - else - { - RTSpinlockRelease(pEventMultiInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventMultiInt, 0); - else -@@ -231,6 +239,15 @@ static int rtSemEventMultiWait(RTSEMEVEN - rc = 0; - sleepq_wait(pEventMultiInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventMultiInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventMultiInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventMultiInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h b/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h new file mode 100644 index 000000000000..4332049487c3 --- /dev/null +++ b/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd-the-freebsd-kernel.h @@ -0,0 +1,11 @@ +--- src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h.orig 2009-09-11 14:48:47.000000000 +0200 ++++ src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h 2009-09-11 14:48:54.000000000 +0200 +@@ -76,7 +76,7 @@ + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0) + # define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0) +-#elif ++#else + # define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt) + # define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt) + # define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt) diff --git a/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c b/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c deleted file mode 100644 index c2cdf7963fd7..000000000000 --- a/emulators/virtualbox/files/patch-src-VBox-Runtime-r0drv-freebsd.semevent-r0drv-freebsd.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c -@@ -205,15 +205,23 @@ static int rtSemEventWait(RTSEMEVENT Eve - - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_timedwait_sig(pEventInt, 0); - else - rc = sleepq_timedwait(pEventInt, 0); -+#else -+ if (fInterruptible) -+ rc = sleepq_timedwait_sig(pEventInt); -+ else -+ rc = sleepq_timedwait(pEventInt); -+#endif - } - else - { - RTSpinlockRelease(pEventInt->hSpinLock, &Tmp); - -+#if __FreeBSD_version >=800026 - if (fInterruptible) - rc = sleepq_wait_sig(pEventInt, 0); - else -@@ -221,6 +229,15 @@ static int rtSemEventWait(RTSEMEVENT Eve - rc = 0; - sleepq_wait(pEventInt, 0); - } -+#else -+ if (fInterruptible) -+ rc = sleepq_wait_sig(pEventInt); -+ else -+ { -+ rc = 0; -+ sleepq_wait(pEventInt); -+ } -+#endif - } - - RTSpinlockAcquire(pEventInt->hSpinLock, &Tmp); diff --git a/emulators/virtualbox/pkg-message b/emulators/virtualbox/pkg-message index 8de6ce2ffe0c..91b8b16427cd 100644 --- a/emulators/virtualbox/pkg-message +++ b/emulators/virtualbox/pkg-message @@ -7,6 +7,10 @@ You need to load the vboxdrv kernel module and a mounted /proc filesystem. % mount -t procfs proc /proc % kldload vboxdrv +For bridged networking you also need to load the vboxnetflt kernel module. + +% kldload vboxnetflt + You also have to add all users to your vboxusers group in order to use vbox. % pw groupmod vboxusers -m jerry diff --git a/emulators/virtualbox/pkg-plist b/emulators/virtualbox/pkg-plist index 00012310ba7c..701bcf61f230 100644 --- a/emulators/virtualbox/pkg-plist +++ b/emulators/virtualbox/pkg-plist @@ -1,6 +1,7 @@ %%X11%%bin/VBoxBFE bin/VBoxHeadless bin/VBoxManage +bin/VBoxNetAdpCtl bin/VBoxNetDHCP %%X11%%bin/VBoxSDL bin/VBoxSVC @@ -17,6 +18,7 @@ lib/virtualbox/VBoxHeadless lib/virtualbox/VBoxHeadless.so %%QT4%%lib/virtualbox/VBoxKeyboard.so lib/virtualbox/VBoxManage +lib/virtualbox/VBoxNetAdpCtl lib/virtualbox/VBoxNetDHCP lib/virtualbox/VBoxNetDHCP.so %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so @@ -46,8 +48,8 @@ lib/virtualbox/VMMGC.gc lib/virtualbox/tstMicroGC.gc lib/virtualbox/VBoxDD2R0.r0 lib/virtualbox/VBoxDDR0.r0 -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions.iso -%%GUESTADDITIONS%%lib/virtualbox/VBoxGuestAdditions_%%GUEST_VER%%.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso +%%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so lib/virtualbox/VMMR0.r0 lib/virtualbox/components/VirtualBox_XPCOM.xpt @@ -55,64 +57,64 @@ lib/virtualbox/components/VBoxXPCOMIPCC.so lib/virtualbox/components/VBoxSVCM.so lib/virtualbox/components/VBoxC.so lib/virtualbox/components/VBoxXPCOMBase.xpt -%%NLS%%lib/virtualbox/nls/VirtualBox_ar.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_bg.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ca.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_cs.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_de.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_el.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_es.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_eu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fi.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_fr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_hu.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_id.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_it.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ja.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_km_KH.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ko.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_nl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pl.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_pt_BR.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ro.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_ru.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_sv.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_tr.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_uk.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_CN.qm -%%NLS%%lib/virtualbox/nls/VirtualBox_zh_TW.qm -%%NLS%%lib/virtualbox/nls/qt_ar.qm -%%NLS%%lib/virtualbox/nls/qt_bg.qm -%%NLS%%lib/virtualbox/nls/qt_ca.qm -%%NLS%%lib/virtualbox/nls/qt_cs.qm -%%NLS%%lib/virtualbox/nls/qt_de.qm -%%NLS%%lib/virtualbox/nls/qt_el.qm -%%NLS%%lib/virtualbox/nls/qt_es.qm -%%NLS%%lib/virtualbox/nls/qt_eu.qm -%%NLS%%lib/virtualbox/nls/qt_fi.qm -%%NLS%%lib/virtualbox/nls/qt_fr.qm -%%NLS%%lib/virtualbox/nls/qt_hu.qm -%%NLS%%lib/virtualbox/nls/qt_id.qm -%%NLS%%lib/virtualbox/nls/qt_it.qm -%%NLS%%lib/virtualbox/nls/qt_ja.qm -%%NLS%%lib/virtualbox/nls/qt_km_KH.qm -%%NLS%%lib/virtualbox/nls/qt_ko.qm -%%NLS%%lib/virtualbox/nls/qt_nl.qm -%%NLS%%lib/virtualbox/nls/qt_pl.qm -%%NLS%%lib/virtualbox/nls/qt_pt.qm -%%NLS%%lib/virtualbox/nls/qt_pt_BR.qm -%%NLS%%lib/virtualbox/nls/qt_ro.qm -%%NLS%%lib/virtualbox/nls/qt_ru.qm -%%NLS%%lib/virtualbox/nls/qt_sk.qm -%%NLS%%lib/virtualbox/nls/qt_sr.qm -%%NLS%%lib/virtualbox/nls/qt_sv.qm -%%NLS%%lib/virtualbox/nls/qt_tr.qm -%%NLS%%lib/virtualbox/nls/qt_uk.qm -%%NLS%%lib/virtualbox/nls/qt_zh_CN.qm -%%NLS%%lib/virtualbox/nls/qt_zh_TW.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ar.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_bg.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_ca.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_cs.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_de.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_el.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_es.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_eu.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fi.qm +%%NLS%%%%DATADIR%%/nls/VirtualBox_fr.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_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_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_ar.qm +%%NLS%%%%DATADIR%%/nls/qt_bg.qm +%%NLS%%%%DATADIR%%/nls/qt_ca.qm +%%NLS%%%%DATADIR%%/nls/qt_cs.qm +%%NLS%%%%DATADIR%%/nls/qt_de.qm +%%NLS%%%%DATADIR%%/nls/qt_el.qm +%%NLS%%%%DATADIR%%/nls/qt_es.qm +%%NLS%%%%DATADIR%%/nls/qt_eu.qm +%%NLS%%%%DATADIR%%/nls/qt_fi.qm +%%NLS%%%%DATADIR%%/nls/qt_fr.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_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_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 %%QT4%%share/applications/virtualbox.desktop %%QT4%%share/icons/hicolor/48x48/apps/VBox.png %%DATADIR%%/idl/nsIDebug.idl @@ -580,6 +582,7 @@ include/virtualbox/xpcom/xpcom-config.h @dirrm include/virtualbox/nsprpub @dirrm include/virtualbox/ipcd @dirrm include/virtualbox +%%NLS%%@dirrm %%DATADIR%%/nls @dirrm %%DATADIR%%/samples @dirrm %%DATADIR%%/idl @dirrm %%DATADIR%% @@ -588,8 +591,10 @@ include/virtualbox/xpcom/xpcom-config.h %%QT4%%@dirrmtry share/icons/hicolor %%QT4%%@dirrmtry share/icons %%QT4%%@dirrmtry share/applications -%%NLS%%@dirrm lib/virtualbox/nls @dirrm lib/virtualbox/components +@dirrm lib/virtualbox/additions @dirrm lib/virtualbox @cwd / %%KMODDIR%%/vboxdrv.ko +%%KMODDIR%%/vboxnetadp.ko +%%KMODDIR%%/vboxnetflt.ko |