Index: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
===================================================================
--- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h	(revision 379328)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h	(nonexistent)
@@ -1,51 +0,0 @@
---- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig	2015-02-12 11:08:51.000000000 -0500
-+++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h	2015-02-18 17:44:16.919457000 -0500
-@@ -972,26 +972,26 @@
- static __inline__ void
- outb(unsigned short port, unsigned char val)
- {
--    __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
-+    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
- }
- 
- static __inline__ void
- outw(unsigned short port, unsigned short val)
- {
--    __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
-+    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
- }
- 
- static __inline__ void
- outl(unsigned short port, unsigned int val)
- {
--    __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
-+    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
- }
- 
- static __inline__ unsigned int
- inb(unsigned short port)
- {
-     unsigned char ret;
--    __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
-+    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
- 
-     return ret;
- }
-@@ -1000,7 +1000,7 @@
- inw(unsigned short port)
- {
-     unsigned short ret;
--    __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
-+    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
- 
-     return ret;
- }
-@@ -1009,7 +1009,7 @@
- inl(unsigned short port)
- {
-     unsigned int ret;
--    __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
-+    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
- 
-     return ret;
- }

Property changes on: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
===================================================================
--- head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h	(nonexistent)
+++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h	(revision 379329)
@@ -0,0 +1,51 @@
+--- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig	2015-02-12 11:08:51.000000000 -0500
++++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h	2015-02-18 17:44:16.919457000 -0500
+@@ -972,26 +972,26 @@
+ static __inline__ void
+ outb(unsigned short port, unsigned char val)
+ {
+-    __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ void
+ outw(unsigned short port, unsigned short val)
+ {
+-    __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ void
+ outl(unsigned short port, unsigned int val)
+ {
+-    __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ unsigned int
+ inb(unsigned short port)
+ {
+     unsigned char ret;
+-    __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }
+@@ -1000,7 +1000,7 @@
+ inw(unsigned short port)
+ {
+     unsigned short ret;
+-    __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }
+@@ -1009,7 +1009,7 @@
+ inl(unsigned short port)
+ {
+     unsigned int ret;
+-    __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }

Property changes on: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/emulators/virtualbox-ose-additions/Makefile
===================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	(revision 379328)
+++ head/emulators/virtualbox-ose-additions/Makefile	(revision 379329)
@@ -1,206 +1,207 @@
 # Created by: Bernhard Froehlich <decke@bluelife.at>
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.3.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
 		http://disasterarea.chruetertee.ch/
 PKGNAMESUFFIX=	-additions
 DISTNAME=	VirtualBox-${DISTVERSION}
 
 MAINTAINER=	vbox@FreeBSD.org
 COMMENT=	VirtualBox additions for FreeBSD guests
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		kmk:${PORTSDIR}/devel/kBuild
 
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	vm_virtualbox
 
 UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 PATCHDIR=	${.CURDIR}/../${PORTNAME}/files
 WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
 USE_RC_SUBR=	vboxguest vboxservice
 USES=		compiler:features cpe iconv kmod python:build tar:bzip2
 ONLY_FOR_ARCHS=	i386 amd64
 MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-alsa \
 			--disable-dbus \
 			--disable-docs \
 			--disable-libvpx \
 			--disable-pulse \
 			--disable-python \
 			--disable-sdl-ttf \
 			--disable-xpcom
 CONFIGURE_ARGS+=	--nofatal --with-gcc="${CC}" --with-g++="${CXX}"
 
 CONFLICTS_INSTALL=	virtualbox-ose-[3,4]* \
 			virtualbox-ose-additions-devel-[3,4]* \
 			virtualbox-ose-devel-[3,4]* \
 			virtualbox-ose-legacy-[3,4]*
 
 OPTIONS_DEFINE=	DEBUG OPENGL X11
 OPTIONS_DEFAULT=	X11
 OPTIONS_SUB=	yes
 
 OPENGL_CONFIGURE_OFF=	--disable-opengl
 
 .include <bsd.port.options.mk>
 
 VIDEODIR=	${PREFIX}/lib/xorg/modules/drivers
 INPUTDIR=	${PREFIX}/lib/xorg/modules/input
 
 VBOX_BIN=	${WRKSRC}/out/${KMK_ARCH}/${KMK_BUILDTYPE}/bin/additions
 VBOX_SBINS=	VBoxControl \
 		VBoxService
 
 BUILD_WRKSRC=	${VBOX_BIN}/src
 
 KMK_BUILDTYPE=	release
 KMK_CONFIG=	VBOX_LIBPATH_X11=${LOCALBASE}
 KMK_FLAGS=
 
 .if ${PORT_OPTIONS:MDEBUG}
 KMK_FLAGS+=	BUILD_TYPE=debug
 KMK_BUILDTYPE=	debug
 MAKE_ARGS+=	DEBUG_FLAGS="-O1 -g"
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
 USE_XORG+=	xcomposite xdamage xext xfixes
 USE_GL=		gl
 VBOX_LIBS=	VBoxOGL.so \
 		VBoxOGLarrayspu.so \
 		VBoxOGLcrutil.so \
 		VBoxOGLerrorspu.so \
 		VBoxOGLfeedbackspu.so \
 		VBoxOGLpackspu.so \
 		VBoxOGLpassthroughspu.so
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/X:${PORTSDIR}/x11-servers/xorg-server
 USE_XORG=	xcursor xmu inputproto xorg-server xrandr
 USES+=		pkgconfig
 VBOX_WITH_X11=	1
 XORG_DRV_ABI=	pkgconf --modversion xorg-server | \
 		${SED} -E -e 's/\.[0-9]+$$//' -e 's/\.//'
 .else
 VBOX_WITH_X11=
 .endif
 
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 .else
 KMK_ARCH=	freebsd.${ARCH}
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-Config.kmk \
-		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \
+		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
 .if ${COMPILER_FEATURES:Mlibc++}
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
 .endif
 .endif
 
 SUB_LIST+=	KMODDIR=${KMODDIR}
 
 pre-everything::
 .if ${ARCH} == "amd64"
 .if !exists(/usr/lib32/libc.so)
 	@${ECHO} 'Requires 32-bit libraries installed under /usr/lib32.'
 	@${ECHO} 'Do: cd /usr/src; make build32 install32; ldconfig -v -m -R /usr/lib32'
 	@${FALSE}
 .endif
 .endif
 
 post-patch:
 	@${ECHO} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's| -finline-limit=8000||' \
 	    -e 's| -fno-merge-constants||' \
 	    -e 's| -mpreferred-stack-boundary=2||' ${WRKSRC}/Config.kmk
 	@${ECHO} 'VBOX_GCC_Wno-unused-parameter = -Wno-unused-parameter' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/Config.kmk \
 		${WRKSRC}/configure \
 		${WRKSRC}/kBuild/units/qt4.kmk \
 		${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
 		${WRKSRC}/src/VBox/Additions/common/crOpenGL/fakedri_drv.c \
 		${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 		${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop
 	@${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure
 .if empty(ICONV_LIB)
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk \
 		${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
 	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 
 pre-build:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
 		${WRKSRC}/env.sh \
 		${WRKSRC}/src/VBox/Additions/freebsd/Installer/vboxguest.sh
 	cd ${WRKSRC} && ${SH} env.sh && \
 	    ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${KMODDIR}
 	${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko ${STAGEDIR}${KMODDIR}
 .if ${PORT_OPTIONS:MDEBUG}
 	${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko.symbols ${STAGEDIR}${KMODDIR}
 .endif
 .if ${PORT_OPTIONS:MOPENGL}
 	${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko ${STAGEDIR}${KMODDIR}
 .if ${PORT_OPTIONS:MDEBUG}
 	${INSTALL_KLD} ${VBOX_BIN}/vboxvideo.ko.symbols ${STAGEDIR}${KMODDIR}
 .endif
 .endif
 
 	${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \
 	    ${STAGEDIR}${PREFIX}/sbin/
 
 .if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
 	    ${STAGEDIR}${PREFIX}/bin/VBoxClient-all
 
 	# X11 autostart
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/xdg/autostart/
 	${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${STAGEDIR}${PREFIX}/etc/xdg/autostart/
 
 	# KDE autostart
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/autostart/
 	${INSTALL_DATA} ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
 	    ${STAGEDIR}${PREFIX}/share/autostart/
 
 	${MKDIR} ${STAGEDIR}${VIDEODIR}
 	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_$$(${XORG_DRV_ABI}).so \
 	    ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
 
 	${MKDIR} ${STAGEDIR}${INPUTDIR}
 	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_$$(${XORG_DRV_ABI}).so \
 	    ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
 	${INSTALL_DATA} ${VBOX_LIBS:S|^|${VBOX_BIN}/|} \
 	    ${STAGEDIR}${PREFIX}/lib/
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/dri
 	${LN} -sf ${PREFIX}/lib/VBoxOGL.so \
 	    ${STAGEDIR}${PREFIX}/lib/dri/vboxvideo_dri.so
 .endif
 
 .include <bsd.port.post.mk>