10 files changed, 67 insertions, 42 deletions

diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile
index 93c84d7e6210..11bb7fa19833 100644
--- a/emulators/virtualbox-ose-additions/Makefile
+++ b/emulators/virtualbox-ose-additions/Makefile
@@ -6,15 +6,13 @@
 #
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	3.2.12
-PORTREVISION=	1
+DISTVERSION=	4.0.8
 CATEGORIES=	emulators kld
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
-		http://disasterarea.chruetertee.ch/ \
-		http://mirror.4bit.ws/
+		http://disasterarea.chruetertee.ch/
 PKGNAMESUFFIX=	-additions
-DISTNAME=	VirtualBox-${DISTVERSION}-OSE
+DISTNAME=	VirtualBox-${DISTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	VirtualBox additions for FreeBSD guests
@@ -39,7 +37,8 @@ CONFIGURE_ARGS+=--with-gcc="${CC}" --with-g++="${CXX}" --nofatal \
 		--disable-alsa --disable-dbus --disable-python \
 		--build-headless
 
-CONFLICTS=	bcc-[0-9]* virtualbox-ose-3.*
+CONFLICTS=	bcc-[0-9]*
+CONFLICTS_INSTALL=	virtualbox-ose-additions-devel-[3,4]* virtualbox-ose-[3,4]* virtualbox-ose-devel-[3,4]* virtualbox-ose-legacy-[3,4]*
 
 OPTIONS=	DEBUG "Build with debugging symbols" off \
 		X11 "Build with X11 support" on \
@@ -177,4 +176,7 @@ do-install:
 		${PREFIX}/share/hal/fdi/policy/10osvendor/
 .endif
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/emulators/virtualbox-ose-additions/distinfo b/emulators/virtualbox-ose-additions/distinfo
index 8a9c1e15c918..38dcc883d133 100644
--- a/emulators/virtualbox-ose-additions/distinfo
+++ b/emulators/virtualbox-ose-additions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-3.2.12-OSE.tar.bz2) = 064eb382e5b752a3f9189c930734393765125e70b5f99679a63ff4eb6186e261
-SIZE (VirtualBox-3.2.12-OSE.tar.bz2) = 58239733
+SHA256 (VirtualBox-4.0.8.tar.bz2) = 48961f0d6fe70c3887cbca5ea987767ac1bafd4b64dd3c4d25445682351e118e
+SIZE (VirtualBox-4.0.8.tar.bz2) = 69593014
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
new file mode 100644
index 000000000000..8f517ac31ebb
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuest-VBoxGuest-freebsd.c
@@ -0,0 +1,11 @@
+--- src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c.orig	2011-04-21 10:29:52.000000000 +0000
++++ src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c	2011-04-27 20:52:04.000000000 +0000
+@@ -177,7 +177,7 @@
+                           iUnit,
+                           UID_ROOT,
+                           GID_WHEEL,
+-                          0644,
++                          0664,
+                           "vboxguest%d", iUnit);
+         if (*ppDev)
+         {
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk
index e7c139a307ac..71e85c9b2012 100644
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxGuestLib-Makefile.kmk
@@ -1,14 +1,14 @@
---- src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig	2010-07-01 14:25:19.000000000 +0200
-+++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2010-07-01 14:26:07.000000000 +0200
-@@ -136,6 +136,7 @@
+--- src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.orig	2010-10-07 11:37:10.000000000 +0200
++++ src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2010-10-07 11:36:16.000000000 +0200
+@@ -140,6 +140,7 @@
+ # the X server runtime instead of IPRT, for use with old servers where the
  # C library is not available.
  #
- ## @todo We're quite probably using the wrong template here.
 +ifdef VBOX_WITH_X11_ADDITIONS
- VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3LIB
+ VBoxGuestR3LibXFree86_TEMPLATE = VBOXGUESTR3XF86LIB
  VBoxGuestR3LibXFree86_DEFS     = \
  	VBOX_WITH_HGCM \
-@@ -159,6 +160,7 @@
+@@ -163,6 +164,7 @@
          $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
  
  VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
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
deleted file mode 100644
index 15d354bd872b..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-common-VBoxService-VBoxService.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-x11-x11include-1.3-xorg-xf86_ansic.h b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-1.3-xorg-xf86_ansic.h
new file mode 100644
index 000000000000..b1dd2925cafa
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-1.3-xorg-xf86_ansic.h
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/x11/x11include/1.3/xorg/xf86_ansic.h.orig	2011-01-25 20:19:04.000000000 +0100
++++ src/VBox/Additions/x11/x11include/1.3/xorg/xf86_ansic.h	2011-01-25 20:19:16.000000000 +0100
+@@ -259,7 +259,6 @@
+ extern int xf86open(const char*, int,...);
+ extern int xf86close(int);
+ extern long xf86lseek(int, long, int);
+-extern int xf86ioctl(int, unsigned long, pointer);
+ extern xf86ssize_t xf86read(int, void *, xf86size_t);
+ extern xf86ssize_t xf86write(int, const void *, xf86size_t);
+ extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-1.4-xorg-xf86_ansic.h b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-1.4-xorg-xf86_ansic.h
new file mode 100644
index 000000000000..1e4fcf6a5a09
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-1.4-xorg-xf86_ansic.h
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/x11/x11include/1.4/xorg/xf86_ansic.h.orig	2011-01-25 20:28:21.000000000 +0100
++++ src/VBox/Additions/x11/x11include/1.4/xorg/xf86_ansic.h	2011-01-25 20:28:43.000000000 +0100
+@@ -243,7 +243,6 @@
+ extern int xf86open(const char*, int,...);
+ extern int xf86close(int);
+ extern long xf86lseek(int, long, int);
+-extern int xf86ioctl(int, unsigned long, pointer);
+ extern xf86ssize_t xf86read(int, void *, xf86size_t);
+ extern xf86ssize_t xf86write(int, const void *, xf86size_t);
+ extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-7.0-xorg-xf86_ansic.h b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-7.0-xorg-xf86_ansic.h
new file mode 100644
index 000000000000..52f98249067b
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-7.0-xorg-xf86_ansic.h
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/x11/x11include/7.0/xorg/xf86_ansic.h.orig	2011-01-18 22:29:29.000000000 +0100
++++ src/VBox/Additions/x11/x11include/7.0/xorg/xf86_ansic.h	2011-01-18 22:32:34.000000000 +0100
+@@ -268,7 +268,6 @@
+ extern int xf86open(const char*, int,...);
+ extern int xf86close(int);
+ extern long xf86lseek(int, long, int);
+-extern int xf86ioctl(int, unsigned long, pointer);
+ extern xf86ssize_t xf86read(int, void *, xf86size_t);
+ extern xf86ssize_t xf86write(int, const void *, xf86size_t);
+ extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-7.1-xorg-xf86_ansic.h b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-7.1-xorg-xf86_ansic.h
new file mode 100644
index 000000000000..df00ce88d3e6
--- /dev/null
+++ b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Additions-x11-x11include-7.1-xorg-xf86_ansic.h
@@ -0,0 +1,10 @@
+--- src/VBox/Additions/x11/x11include/7.1/xorg/xf86_ansic.h.orig	2011-01-25 20:04:06.000000000 +0100
++++ src/VBox/Additions/x11/x11include/7.1/xorg/xf86_ansic.h	2011-01-25 20:04:15.000000000 +0100
+@@ -269,7 +269,6 @@
+ extern int xf86open(const char*, int,...);
+ extern int xf86close(int);
+ extern long xf86lseek(int, long, int);
+-extern int xf86ioctl(int, unsigned long, pointer);
+ extern xf86ssize_t xf86read(int, void *, xf86size_t);
+ extern xf86ssize_t xf86write(int, const void *, xf86size_t);
+ extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
diff --git a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-thread-r0drv-freebsd.c b/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-thread-r0drv-freebsd.c
deleted file mode 100644
index e379ac172b4a..000000000000
--- a/emulators/virtualbox-ose-additions/files/patch-src-VBox-Runtime-r0drv-freebsd-thread-r0drv-freebsd.c
+++ /dev/null
@@ -1,16 +0,0 @@
-*** ./src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c~	Wed Dec  1 12:09:43 2010
---- ./src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c	Wed Feb  9 13:44:28 2011
-***************
-*** 101,107 ****
---- 101,111 ----
-  
-  RTDECL(bool) RTThreadYield(void)
-  {
-+ #if (__FreeBSD_version >= 900032)
-+     kern_yield(curthread->td_user_pri);
-+ #else
-      uio_yield();
-+ #endif
-      return false; /** @todo figure this one ... */
-  }
-