diff options
| author | beat <beat@FreeBSD.org> | 2010-06-08 00:32:55 +0800 |
|---|---|---|
| committer | beat <beat@FreeBSD.org> | 2010-06-08 00:32:55 +0800 |
| commit | 7f7f37a6c1474e57d97b108c4d5495c4871980b3 (patch) | |
| tree | 87a2b5a57bea008772f01ac6e82f1f444a4f670b /emulators | |
| parent | 8d9a559df1406b34dd1bc85c11abfbc6ad4a4113 (diff) | |
| download | freebsd-ports-gnome-7f7f37a6c1474e57d97b108c4d5495c4871980b3.tar.gz freebsd-ports-gnome-7f7f37a6c1474e57d97b108c4d5495c4871980b3.tar.zst freebsd-ports-gnome-7f7f37a6c1474e57d97b108c4d5495c4871980b3.zip | |
- Update to 3.2.2
- Execute kldxref in do-install target. [1]
- Set SYSDIR to SRC_BASE to fix build if the FreeBSD sources are not
installed in /usr/src. [2]
- Set SRC_BASE to /usr/src if SRC_BASE is not set and not rely on the
/sys symlink. [2]
Reported by: scf@ [1]
Submitted by: imp@ [2]
Many thanks to the VirtualBox developers (especially Alexander Eichner
for all his work and help), all tester and patch submitter and the whole
vbox@ team especially decke@.
Diffstat (limited to 'emulators')
5 files changed, 20 insertions, 28 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index bcdc75189acd..5a8c48b98eea 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -6,8 +6,7 @@ # PORTNAME= virtualbox-ose -DISTVERSION= 3.1.51r25618 -PORTREVISION= 3 +DISTVERSION= 3.2.2 CATEGORIES= emulators kld MASTER_SITES= http://tmp.chruetertee.ch/ \ http://freebsd.unixfreunde.de/sources/ \ @@ -47,6 +46,7 @@ OPTIONS= DEBUG "Build with debugging symbols" off \ PLIST_SUB+= KMODDIR=${KMODDIR:C,^/,,} KMODDIR= /boot/modules +SRC_BASE?= /usr/src VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers INPUTDIR= ${PREFIX}/lib/xorg/modules/input @@ -63,7 +63,7 @@ KMK_BUILDTYPE= debug .if !defined(WITHOUT_X11) VBOX_WITH_X11= 1 -USE_XORG= xcursor xmu inputproto +USE_XORG= xcursor xmu inputproto xrandr PLIST_SUB+= X11="" .else .if !defined(WITHOUT_HAL) @@ -128,11 +128,12 @@ pre-build: do-build: cd ${WRKSRC} && ${SH} env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS} - cd ${VBOX_BIN}/src && make + cd ${VBOX_BIN}/src && make SYSDIR=${SRC_BASE}/sys do-install: ${MKDIR} ${KMODDIR} ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko ${KMODDIR} + @/usr/sbin/kldxref ${KMODDIR} ${MKDIR} ${PREFIX}/etc/rc.d/ diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo index 74be796272b1..5fee450bdb28 100644 --- a/emulators/virtualbox-ose-additions/distinfo +++ b/emulators/virtualbox-ose-additions/distinfo @@ -1,3 +1,3 @@ -MD5 (VirtualBox-3.1.51r25618-OSE.tar.bz2) = 45663a81fc71cda1f116837d20af02bf -SHA256 (VirtualBox-3.1.51r25618-OSE.tar.bz2) = 1c59d40c24497f13e4c22984d54bbbbe68f1f6400a50004d14c02245a3eaf19f -SIZE (VirtualBox-3.1.51r25618-OSE.tar.bz2) = 55665982 +MD5 (VirtualBox-3.2.2-OSE.tar.bz2) = a00884da2f5dd8dc2fad5e27940446c6 +SHA256 (VirtualBox-3.2.2-OSE.tar.bz2) = e3d26ce4cffef5aa26aef7d387015f6636d03cd8f9d38f6ac1a55e40210c9df2 +SIZE (VirtualBox-3.2.2-OSE.tar.bz2) = 57639895 diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp new file mode 100644 index 000000000000..15d354bd872b --- /dev/null +++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp @@ -0,0 +1,12 @@ +--- src/VBox/Additions/common/VBoxService/VBoxService.cpp.orig 2010-05-18 20:10:47.000000000 +0200 ++++ src/VBox/Additions/common/VBoxService/VBoxService.cpp 2010-05-19 21:47:17.000000000 +0200 +@@ -28,6 +28,9 @@ + #ifndef RT_OS_WINDOWS + # include <signal.h> + #endif ++#ifdef RT_OS_FREEBSD ++# include <pthread.h> ++#endif + + #include "product-generated.h" + #include <iprt/asm.h> diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp deleted file mode 100644 index 408d858c1f13..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxService-VBoxServiceVMInfo.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp.orig 2010-01-18 10:53:11.000000000 +0100 -+++ src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp 2010-01-18 10:53:18.000000000 +0100 -@@ -38,7 +38,6 @@ - # include <sys/socket.h> - # include <net/if.h> - # include <unistd.h> --# include <utmp.h> - # ifdef RT_OS_SOLARIS - # include <sys/sockio.h> - # endif diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-freebsd-Makefile.kmk b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-freebsd-Makefile.kmk deleted file mode 100644 index 529ccf8e6852..000000000000 --- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-freebsd-Makefile.kmk +++ /dev/null @@ -1,11 +0,0 @@ ---- src/VBox/Additions/freebsd/Makefile.kmk.orig 2010-01-04 09:55:35.000000000 +0100 -+++ src/VBox/Additions/freebsd/Makefile.kmk 2010-01-04 09:55:42.000000000 +0100 -@@ -28,7 +28,7 @@ - - # Include sub-makefiles. - #include $(PATH_SUB_CURRENT)/vboxvfs/Makefile.kmk --include $(PATH_SUB_CURRENT)/drm/Makefile.kmk -+#include $(PATH_SUB_CURRENT)/drm/Makefile.kmk - - # - # Globals |