--- emulators/virtualbox-ose/Makefile	(revision 393667)
+++ emulators/virtualbox-ose/Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.3.30
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -21,9 +22,10 @@ 
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild \
 		gtar:${PORTSDIR}/archivers/gtar \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
+		cdrecord:${PORTSDIR}/sysutils/cdrtools \
+		libIDL-config-2:${PORTSDIR}/devel/libIDL
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libxslt.so:${PORTSDIR}/textproc/libxslt \
+		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libcurl.so:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:${PORTSDIR}/emulators/virtualbox-ose-kmod \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
@@ -34,7 +36,6 @@ 
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 ONLY_FOR_ARCHS=	i386 amd64
 USES=		compiler cpe iconv pkgconfig tar:bzip2
-USE_GNOME=	libidl
 USE_LDCONFIG=	${VBOX_DIR}
 USE_OPENSSL=	yes
 
@@ -82,6 +83,14 @@ 
 
 VDE_RUN_DEPENDS=	vde_switch:${PORTSDIR}/net/vde2
 
+MANUAL_USE=		TEX=dvipsk:build,formats:build
+PYTHON_USES=		python:2
+PYTHON_USE=		PYTHON=distutils,noegginfo
+PYTHON_USES_OFF=	python:build
+QT4_USE=		QT4=linguisttools_build,moc_build,rcc_build,uic_build
+QT4_USE+=		QT4=gui,network,opengl
+X11_USE=		GL=gl SDL=sdl XORG=x11,xcursor,xmu,inputproto,xinerama
+
 DBUS_CONFIGURE_OFF=	--disable-dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 MANUAL_CONFIGURE_OFF=	--disable-docs
@@ -135,23 +144,13 @@ 
 RESTRICTED_FILES=	${GUESTADDITIONS}
 .endif
 
-.if ${PORT_OPTIONS:MMANUAL}
-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}
 QT_NONSTANDARD=	yes
-USE_QT4=	linguist_build moc_build rcc_build uic_build
-USE_QT4+=	gui network opengl
 INSTALLS_ICONS=	yes
 VBOX_PROGS+=	VirtualBox
 VBOX_UTILS+=	VBoxTestOGL
@@ -168,8 +167,6 @@ 
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-USE_SDL=	sdl
-USE_XORG=	xcursor xmu inputproto xinerama
 VBOX_PROGS+=	VBoxSDL
 .endif
 
@@ -258,7 +255,12 @@ 
 		${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
+	@${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
+			  -e 's|\[ $$WITH_X11    -eq 1 \] && check_xrandr||' \
+			  -e 's|#include <GL/glu.h>||' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|#include <GL/glu.h>||' \
+		${WRKSRC}/src/VBox/GuestHost/OpenGL/include/chromium.h
 .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
@@ -284,7 +286,11 @@ 
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}
 	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
 	    "*.so *.gc *.r0 *.fd components" ${STAGEDIR}${VBOX_DIR}
+	${FIND} ${STAGEDIR}${VBOX_DIR} -type f -name "*.so" \
+	    -exec ${STRIP_CMD} {} \;
+.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
 	${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
+.endif
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
 	    ${STAGEDIR}${VBOX_DIR}
--- emulators/virtualbox-ose/files/patch-configure	(revision 393667)
+++ emulators/virtualbox-ose/files/patch-configure	(working copy)
@@ -1,6 +1,6 @@ 
---- configure.orig	2015-05-13 11:08:57.000000000 -0400
-+++ configure	2015-05-15 14:16:05.988372000 -0400
-@@ -140,6 +140,8 @@
+--- configure.orig	2015-08-07 14:52:22 UTC
++++ configure
+@@ -140,6 +140,8 @@ if [ "$OS" = "freebsd" ]; then
    LIBPULSE="-L/usr/local/lib"
    INCPNG="-I/usr/local/include"
    LIBPNG="-L/usr/local/lib -lpng"
@@ -9,7 +9,17 @@ 
  else
    INCCURL=""
    LIBCURL="-lcurl"
-@@ -1947,8 +1949,8 @@
+@@ -1114,6 +1116,9 @@ extern "C" int main(int argc, char** arg
+   printf("found version %d.%d.%d",
+          SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
+ #if SDL_VERSION_ATLEAST(1,2,7)
++#if !defined(SDL_VIDEO_DRIVER_X11)
++#error SDL must be compiled with X11 support
++#endif
+   printf(", OK.\n");
+   return 0;
+ #else
+@@ -1948,8 +1953,8 @@ EOF
          echo "compiling the following source file:" >> $LOG
          cat $ODIR.tmp_src.cc >> $LOG
          echo "using the following command line:" >> $LOG
@@ -20,7 +30,7 @@ 
          if [ $? -eq 0 ]; then
            found=1
            break
-@@ -2357,7 +2359,7 @@
+@@ -2358,7 +2363,7 @@ for option in $*; do
      --with-openssl-dir=*)
        OPENSSLDIR=`echo $option | cut -d'=' -f2`
        INCCRYPTO="-I${OPENSSLDIR}/include"
--- emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.h	(revision 0)
+++ emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.h	(working copy)
@@ -0,0 +1,13 @@ 
+--- src/VBox/Devices/Graphics/DevVGA.h.orig	2015-08-07 16:14:28 UTC
++++ src/VBox/Devices/Graphics/DevVGA.h
+@@ -405,6 +405,10 @@ typedef struct VGAState {
+ # if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI))
+     /** LUN\#0: VBVA callbacks interface */
+     PDMIDISPLAYVBVACALLBACKS    IVBVACallbacks;
++# else
++#  if HC_ARCH_BITS == 32
++    bool			_PaddingIVBVACallbacks[4];
++#  endif
+ # endif
+     /** Pointer to base interface of the driver. */
+     R3PTRTYPE(PPDMIBASE)        pDrvBase;
--- emulators/virtualbox-ose/pkg-plist	(revision 393667)
+++ emulators/virtualbox-ose/pkg-plist	(working copy)
@@ -390,7 +390,7 @@ 
 lib/virtualbox/VBoxXPCOMIPCD
 %%QT4%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox
 %%QT4%%lib/virtualbox/VirtualBox.so
-lib/virtualbox/sdk
+%%SDK%%lib/virtualbox/sdk
 %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html
 %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf
 %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt