svn commit: r378904 - in head/emulators: virtualbox-ose virtualbox-ose-additions virtualbox-ose-kmod virtualbox-ose/files

Jung-uk Kim jkim at FreeBSD.org
Fri Feb 13 00:33:16 UTC 2015 

Author: jkim
Date: Fri Feb 13 00:33:12 2015
New Revision: 378904
URL: https://svnweb.freebsd.org/changeset/ports/378904
QAT: https://qat.redports.org/buildarchive/r378904/

Log:
  - Update to 4.3.22.
  - Install a wrapper for executables as Linux and Solaris installers do.

Added:
  head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c   (contents, props changed)
  head/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh   (contents, props changed)
Modified:
  head/emulators/virtualbox-ose-additions/Makefile
  head/emulators/virtualbox-ose-additions/distinfo
  head/emulators/virtualbox-ose-kmod/Makefile
  head/emulators/virtualbox-ose-kmod/distinfo
  head/emulators/virtualbox-ose/Makefile
  head/emulators/virtualbox-ose/distinfo
  head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
  head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
  head/emulators/virtualbox-ose/files/vboxwebsrv.in
  head/emulators/virtualbox-ose/pkg-plist

Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose-additions/Makefile	Fri Feb 13 00:33:12 2015	(r378904)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.20
-PORTREVISION=	3
+DISTVERSION=	4.3.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \

Modified: head/emulators/virtualbox-ose-additions/distinfo
==============================================================================
--- head/emulators/virtualbox-ose-additions/distinfo	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose-additions/distinfo	Fri Feb 13 00:33:12 2015	(r378904)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.20.tar.bz2) = 1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
-SIZE (VirtualBox-4.3.20.tar.bz2) = 100184338
+SHA256 (VirtualBox-4.3.22.tar.bz2) = 0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba
+SIZE (VirtualBox-4.3.22.tar.bz2) = 102659290

Modified: head/emulators/virtualbox-ose-kmod/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-kmod/Makefile	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose-kmod/Makefile	Fri Feb 13 00:33:12 2015	(r378904)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.20
-PORTREVISION=	1
+DISTVERSION=	4.3.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \

Modified: head/emulators/virtualbox-ose-kmod/distinfo
==============================================================================
--- head/emulators/virtualbox-ose-kmod/distinfo	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose-kmod/distinfo	Fri Feb 13 00:33:12 2015	(r378904)
@@ -1,2 +1,2 @@
-SHA256 (VirtualBox-4.3.20.tar.bz2) = 1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
-SIZE (VirtualBox-4.3.20.tar.bz2) = 100184338
+SHA256 (VirtualBox-4.3.22.tar.bz2) = 0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba
+SIZE (VirtualBox-4.3.22.tar.bz2) = 102659290

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose/Makefile	Fri Feb 13 00:33:12 2015	(r378904)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.20
-PORTREVISION=	4
+DISTVERSION=	4.3.22
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -52,7 +51,11 @@ VBOXWSUSER?=	vboxusers
 VBOXGROUP?=	vboxusers
 USERS=		${VBOXUSER}
 GROUPS=		${VBOXGROUP}
-VBOX_FRONTENDS=	VBoxAutostart VBoxHeadless
+VBOX_LINKS=	VBoxVRDP
+VBOX_PROGS=	VBoxAutostart VBoxBalloonCtrl VBoxHeadless VBoxManage
+VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxSVC \
+		VBoxXPCOMIPCD
+
 VBOX_GUEST_VER=	${PORTVERSION}
 
 OPTIONS_DEFINE=	DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO PYTHON \
@@ -100,8 +103,8 @@ PLIST_SUB+=	GUEST_VER=${VBOX_GUEST_VER} 
 		PYTHON_VER=${PYTHON_VER} \
 		PYTHON_VERU=${PYTHON_VER:S/./_/} \
 		VBOXGROUP=${VBOXGROUP}
-
-SUB_LIST+=	VBOXUSER=${VBOXUSER} \
+SUB_LIST+=	VBOXGROUP=${VBOXGROUP} \
+		VBOXUSER=${VBOXUSER} \
 		VBOXWSUSER=${VBOXWSUSER}
 USE_RC_SUBR+=	vboxheadless vboxwatchdog
 
@@ -146,19 +149,21 @@ QT_NONSTANDARD=	yes
 USE_QT4=	linguist_build moc_build rcc_build uic_build
 USE_QT4+=	gui network opengl
 INSTALLS_ICONS=	yes
-VBOX_FRONTENDS+=VirtualBox VBoxTestOGL
+VBOX_PROGS+=	VirtualBox
+VBOX_UTILS+=	VBoxTestOGL
 .endif
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 BUILD_DEPENDS+=	soapcpp2:${PORTSDIR}/devel/gsoap
-VBOX_WEB=	vboxwebsrv webtest
 USE_RC_SUBR+=	vboxwebsrv
+VBOX_LINKS+=	vboxwebsrv
+VBOX_UTILS+=	vboxwebsrv webtest
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 USE_SDL=	sdl
 USE_XORG=	xcursor xmu inputproto xinerama
-VBOX_FRONTENDS+=VBoxSDL
+VBOX_PROGS+=	VBoxSDL
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
@@ -249,6 +254,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
 	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
+	    ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh
 
 do-build:
 	cd ${WRKSRC} && \
@@ -265,12 +272,22 @@ do-install:
 	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/virtualbox
-	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${STAGEDIR}${PREFIX}/lib/virtualbox
+	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components" ${STAGEDIR}${PREFIX}/lib/virtualbox
 	${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${PREFIX}/lib/virtualbox
 
-.for f in VBoxManage VBoxNetAdpCtl VBoxNetDHCP VBoxSVC VBoxXPCOMIPCD VBoxBalloonCtrl ${VBOX_FRONTENDS} ${VBOX_WEB}
-	${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} ${STAGEDIR}${PREFIX}/lib/virtualbox/
-	${LN} -sf ${PREFIX}/lib/virtualbox/${f} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
+	    ${STAGEDIR}${PREFIX}/lib/virtualbox
+.for f in ${VBOX_PROGS} ${VBOX_UTILS}
+	${INSTALL_PROGRAM} ${KMK_BUILDDIR}/bin/${f} \
+	    ${STAGEDIR}${PREFIX}/lib/virtualbox
+.endfor
+.for f in ${VBOX_PROGS} ${VBOX_LINKS}
+	${LN} -sf ${PREFIX}/lib/virtualbox/VBox.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${f}
+.endfor
+.for f in ${VBOX_PROGS}
+	${LN} -sf ${PREFIX}/lib/virtualbox/VBox.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${f:tl}
 .endfor
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
@@ -314,9 +331,8 @@ do-install:
 
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice
-.for f in vboxweb.wsdl
-	${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/${f} ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
-.endfor
+	${INSTALL_DATA} ${KMK_BUILDDIR}/obj/webservice/vboxweb.wsdl \
+	    ${STAGEDIR}${DATADIR}/sdk/bindings/webservice/
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/emulators/virtualbox-ose/distinfo
==============================================================================
--- head/emulators/virtualbox-ose/distinfo	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose/distinfo	Fri Feb 13 00:33:12 2015	(r378904)
@@ -1,4 +1,4 @@
-SHA256 (VirtualBox-4.3.20.tar.bz2) = 1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965
-SIZE (VirtualBox-4.3.20.tar.bz2) = 100184338
-SHA256 (VBoxGuestAdditions_4.3.20.iso) = 9ab48f44ac26a6deb374cb5fe6bad103bbf4fdf5186140e2d40ebe48bd01f3ea
-SIZE (VBoxGuestAdditions_4.3.20.iso) = 58343424
+SHA256 (VirtualBox-4.3.22.tar.bz2) = 0d41e044589d3371f765a98ddc071d9cf9788289f72b7efbb5db64f5488c8eba
+SIZE (VirtualBox-4.3.22.tar.bz2) = 102659290
+SHA256 (VBoxGuestAdditions_4.3.22.iso) = d415bdf5c1a37281e77243241acbb9576307379c66d368d7d0aba233fdb1435e
+SIZE (VBoxGuestAdditions_4.3.22.iso) = 58116096

Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-Installer-98vboxadd-xclient	Fri Feb 13 00:33:12 2015	(r378904)
@@ -1,9 +1,9 @@
---- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2014-09-09 23:47:06.000000000 +0400
-+++ src/VBox/Additions/x11/Installer/98vboxadd-xclient	2014-09-10 23:59:10.884611643 +0400
+--- src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig	2015-02-12 11:08:13.000000000 -0500
++++ src/VBox/Additions/x11/Installer/98vboxadd-xclient	2015-02-12 14:38:40.689104000 -0500
 @@ -28,9 +28,9 @@
- # we had in mind, so we do not start VBoxClient in that case.  We do not use
- # "exit" here as this script is "source"d, not executed.
- if test -z "${SSH_CONNECTION}"; then
+    # This script can also be triggered by a connection over SSH, which is not
+    # what we had in mind, so we do not start VBoxClient in that case.  We do
+    # not use "exit" here as this script is "source"d, not executed.
 -  /usr/bin/VBoxClient --clipboard
 -  /usr/bin/VBoxClient --checkhostversion
 -  /usr/bin/VBoxClient --display

Modified: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
==============================================================================
--- head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk	Fri Feb 13 00:33:12 2015	(r378904)
@@ -1,15 +1,15 @@
---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2014-11-26 01:38:10.000000000 -0500
-+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2014-11-26 01:45:20.000000000 -0500
-@@ -36,7 +36,7 @@
+--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2015-02-12 11:08:13.000000000 -0500
++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2015-02-12 14:44:47.575613000 -0500
+@@ -26,7 +26,7 @@
  vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
  vboxvideo_15_DEFS := \
- 	$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
+ 	$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
 -if1of ($(KBUILD_TARGET), linux solaris)
 +if1of ($(KBUILD_TARGET), freebsd linux solaris)
   vboxvideo_15_DEFS += \
   	VBOX_DRI
  endif
-@@ -201,7 +201,7 @@
+@@ -190,7 +190,7 @@
  vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
@@ -18,7 +18,7 @@
   vboxvideo_drv_15_DEFS += \
   	VBOX_DRI_OLD
  endif
-@@ -210,7 +210,7 @@
+@@ -199,7 +199,7 @@
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.5.3
  vboxvideo_drv_15_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
  vboxvideo_drv_15_SOURCES  = $(vboxvideo_drv_13_SOURCES)
@@ -27,7 +27,7 @@
   vboxvideo_drv_15_SOURCES += \
   	vboxvideo_dri.c
  endif
-@@ -223,7 +223,7 @@
+@@ -212,7 +212,7 @@
  vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
@@ -36,7 +36,7 @@
   vboxvideo_drv_16_DEFS += \
   	VBOX_DRI_OLD
  endif
-@@ -241,11 +241,19 @@
+@@ -230,11 +230,19 @@
  vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
@@ -56,7 +56,7 @@
  if1of ($(KBUILD_TARGET), linux solaris)
   vboxvideo_drv_17_SOURCES += \
   	vboxvideo_dri2.c
-@@ -259,6 +267,10 @@
+@@ -248,6 +256,10 @@
  vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
@@ -67,7 +67,7 @@
  vboxvideo_drv_18_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.8.0
-@@ -273,6 +285,10 @@
+@@ -262,6 +274,10 @@
  vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
@@ -78,7 +78,7 @@
  vboxvideo_drv_19_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.9.0
-@@ -287,6 +303,10 @@
+@@ -276,6 +292,10 @@
  vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
@@ -89,7 +89,7 @@
  vboxvideo_drv_110_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.10.0
-@@ -301,6 +321,10 @@
+@@ -290,6 +310,10 @@
  vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
@@ -100,7 +100,7 @@
  vboxvideo_drv_111_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0
-@@ -315,6 +339,10 @@
+@@ -304,6 +328,10 @@
  vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
@@ -111,7 +111,7 @@
  vboxvideo_drv_112_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0
-@@ -329,6 +357,10 @@
+@@ -318,6 +346,10 @@
  vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
@@ -122,7 +122,7 @@
  vboxvideo_drv_113_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0
-@@ -343,6 +375,10 @@
+@@ -332,6 +364,10 @@
  vboxvideo_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_114_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_114_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101400000
@@ -133,7 +133,7 @@
  vboxvideo_drv_114_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0
-@@ -357,6 +393,10 @@
+@@ -346,6 +382,10 @@
  vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000
@@ -144,7 +144,7 @@
  vboxvideo_drv_115_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0
-@@ -371,6 +411,10 @@
+@@ -360,6 +400,10 @@
  vboxvideo_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
  vboxvideo_drv_116_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
  vboxvideo_drv_116_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101600000
@@ -155,3 +155,14 @@
  vboxvideo_drv_116_INCS = \
  	$(vboxvideo_xorg_INCS) \
  	$(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0
+@@ -374,6 +418,10 @@
+ vboxvideo_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_117_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_117_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101700000
++if1of ($(KBUILD_TARGET), freebsd)
++ vboxvideo_drv_117_DEFS += \
++ 	VBOX_DRI_OLD
++endif
+ vboxvideo_drv_117_INCS = \
+ 	$(vboxvideo_xorg_INCS) \
+ 	$(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1

Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxvideo-vboxvideo_dri.c	Fri Feb 13 00:33:12 2015	(r378904)
@@ -0,0 +1,14 @@
+--- src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c.orig	2015-02-12 15:25:55.061952000 -0500
++++ src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c	2015-02-12 15:26:57.245403000 -0500
+@@ -238,9 +238,11 @@
+         pDRIInfo->TransitionTo2d = VBOXDRITransitionTo2d;
+         pDRIInfo->TransitionTo3d = VBOXDRITransitionTo3d;
+ 
++#if defined(XORG_VERSION_CURRENT) && XORG_VERSION_CURRENT < 101700000
+         /* These two are set in DRICreateInfoRec(). */
+         pDRIInfo->wrap.ValidateTree = NULL;
+         pDRIInfo->wrap.PostValidateTree = NULL;
++#endif
+ 
+         pDRIInfo->drmDriverName = VBOX_DRM_DRIVER_NAME;
+         pDRIInfo->clientDriverName = VBOX_DRI_DRIVER_NAME;

Added: head/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/patch-src-VBox-Installer-freebsd-VBox.sh	Fri Feb 13 00:33:12 2015	(r378904)
@@ -0,0 +1,61 @@
+--- src/VBox/Installer/freebsd/VBox.sh.orig	2015-02-04 18:09:31.733441170 -0500
++++ src/VBox/Installer/freebsd/VBox.sh	2015-02-04 18:09:31.733441170 -0500
+@@ -0,0 +1,58 @@
++#!/bin/sh
++#
++# Oracle VM VirtualBox startup script, FreeBSD hosts.
++#
++# Copyright (C) 2006-2012 Oracle Corporation
++#
++# This file is part of VirtualBox Open Source Edition (OSE), as
++# available from http://www.virtualbox.org. This file is free software;
++# you can redistribute it and/or modify it under the terms of the GNU
++# General Public License (GPL) as published by the Free Software
++# Foundation, in version 2 as it comes in the "COPYING" file of the
++# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
++# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
++#
++
++PATH="/usr/bin:/bin:/usr/sbin:/sbin"
++CONFIG="/usr/local/etc/vbox/vbox.cfg"
++
++test -r "${CONFIG}" &&
++    . "${CONFIG}"
++test -z "${INSTALL_DIR}" &&
++    if test -f /usr/local/lib/virtualbox/VirtualBox &&
++        test -x /usr/local/lib/virtualbox/VirtualBox; then
++        INSTALL_DIR=/usr/local/lib/virtualbox
++    else
++        echo "Could not find VirtualBox installation. Please reinstall."
++        exit 1
++    fi
++
++APP=`basename $0`
++case "$APP" in
++    VirtualBox|virtualbox)
++        exec "$INSTALL_DIR/VirtualBox" "$@"
++        ;;
++    VBoxManage|vboxmanage)
++        exec "$INSTALL_DIR/VBoxManage" "$@"
++        ;;
++    VBoxSDL|vboxsdl)
++        exec "$INSTALL_DIR/VBoxSDL" "$@"
++        ;;
++    VBoxVRDP|VBoxHeadless|vboxheadless)
++        exec "$INSTALL_DIR/VBoxHeadless" "$@"
++        ;;
++    VBoxAutostart|vboxautostart)
++        exec "$INSTALL_DIR/VBoxAutostart" "$@"
++        ;;
++    VBoxBalloonCtrl|vboxballoonctrl)
++        exec "$INSTALL_DIR/VBoxBalloonCtrl" "$@"
++        ;;
++    vboxwebsrv)
++        exec "$INSTALL_DIR/vboxwebsrv" "$@"
++        ;;
++    *)
++        echo "Unknown application - $APP"
++        exit 1
++        ;;
++esac
++exit 0

Modified: head/emulators/virtualbox-ose/files/vboxwebsrv.in
==============================================================================
--- head/emulators/virtualbox-ose/files/vboxwebsrv.in	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose/files/vboxwebsrv.in	Fri Feb 13 00:33:12 2015	(r378904)
@@ -36,7 +36,7 @@ vboxwebsrv_start()
 	fi
 
 	echo -n "Starting ${name}"
-	/usr/bin/install -o ${vboxwebsrv_user} -g wheel -m 644 /dev/null ${pidfile}
+	/usr/bin/install -o ${vboxwebsrv_user} -g %%VBOXGROUP%% -m 644 /dev/null ${pidfile}
 	/usr/sbin/daemon -f -p ${pidfile} -u ${vboxwebsrv_user} ${command} ${vboxwebsrv_flags}
 	echo '.'
 }

Modified: head/emulators/virtualbox-ose/pkg-plist
==============================================================================
--- head/emulators/virtualbox-ose/pkg-plist	Thu Feb 12 23:37:29 2015	(r378903)
+++ head/emulators/virtualbox-ose/pkg-plist	Fri Feb 13 00:33:12 2015	(r378904)
@@ -2,15 +2,16 @@ bin/VBoxAutostart
 bin/VBoxBalloonCtrl
 bin/VBoxHeadless
 bin/VBoxManage
-bin/VBoxNetAdpCtl
-bin/VBoxNetDHCP
 %%X11%%bin/VBoxSDL
-bin/VBoxSVC
-%%QT4%%bin/VBoxTestOGL
-bin/VBoxXPCOMIPCD
+bin/VBoxVRDP
 %%QT4%%bin/VirtualBox
+bin/vboxautostart
+bin/vboxballoonctrl
+bin/vboxheadless
+bin/vboxmanage
+%%X11%%bin/vboxsdl
 %%WEBSERVICE%%bin/vboxwebsrv
-%%WEBSERVICE%%bin/webtest
+%%QT4%%bin/virtualbox
 include/virtualbox/VBoxCAPI_v2_2.h
 include/virtualbox/VBoxCAPI_v3_0.h
 include/virtualbox/VBoxCAPI_v3_1.h
@@ -339,18 +340,11 @@ include/virtualbox/xpcom/xptcstubsdecl.i
 include/virtualbox/xpcom/xptcstubsdef.inc
 include/virtualbox/xpcom/xptinfo.h
 lib/virtualbox/DBGCPlugInDiggers.so
+lib/virtualbox/VBox.sh
 lib/virtualbox/VBoxAuth.so
 lib/virtualbox/VBoxAuthSimple.so
- at group %%VBOXGROUP%%
- at mode 4511
 lib/virtualbox/VBoxAutostart
- at group
- at mode
- at group %%VBOXGROUP%%
- at mode 0711
 lib/virtualbox/VBoxBalloonCtrl
- at group
- at mode
 lib/virtualbox/VBoxDD.so
 lib/virtualbox/VBoxDD2.so
 lib/virtualbox/VBoxDD2GC.gc
@@ -361,32 +355,16 @@ lib/virtualbox/VBoxDDU.so
 %%QT4%%lib/virtualbox/VBoxDbg.so
 lib/virtualbox/VBoxEFI32.fd
 lib/virtualbox/VBoxEFI64.fd
- at group %%VBOXGROUP%%
- at mode 0711
 lib/virtualbox/VBoxExtPackHelperApp
- at group
- at mode
 lib/virtualbox/VBoxGuestControlSvc.so
 lib/virtualbox/VBoxGuestPropSvc.so
- at group %%VBOXGROUP%%
- at mode 4511
-lib/virtualbox/VBoxHeadless
- at group
- at mode
+@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxHeadless
 lib/virtualbox/VBoxHeadless.so
 lib/virtualbox/VBoxHostChannel.so
 %%X11%%lib/virtualbox/VBoxKeyboard.so
- at group %%VBOXGROUP%%
- at mode 0711
 lib/virtualbox/VBoxManage
- at group
- at mode
- at mode 4511
-lib/virtualbox/VBoxNetAdpCtl
- at group %%VBOXGROUP%%
-lib/virtualbox/VBoxNetDHCP
- at group
- at mode
+@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetAdpCtl
+@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VBoxNetDHCP
 lib/virtualbox/VBoxNetDHCP.so
 lib/virtualbox/VBoxNetNAT.so
 %%X11%%lib/virtualbox/VBoxOGLhostcrutil.so
@@ -397,39 +375,19 @@ lib/virtualbox/VBoxREM.so
 %%I386%%lib/virtualbox/VBoxREM32.so
 %%I386%%lib/virtualbox/VBoxREM64.so
 lib/virtualbox/VBoxRT.so
- at group %%VBOXGROUP%%
- at mode 4511
-%%X11%%lib/virtualbox/VBoxSDL
- at group
- at mode
+@(root,%%VBOXGROUP%%,4510) %%X11%%lib/virtualbox/VBoxSDL
 %%X11%%lib/virtualbox/VBoxSDL.so
- at group %%VBOXGROUP%%
- at mode 0711
 lib/virtualbox/VBoxSVC
- at group
- at mode
 lib/virtualbox/VBoxSharedClipboard.so
 %%X11%%lib/virtualbox/VBoxSharedCrOpenGL.so
 lib/virtualbox/VBoxSharedFolders.so
- at group %%VBOXGROUP%%
- at mode 4511
 %%QT4%%lib/virtualbox/VBoxTestOGL
- at group
- at mode
 lib/virtualbox/VBoxVMM.so
 lib/virtualbox/VBoxVMMPreload.so
 lib/virtualbox/VBoxXPCOM.so
 lib/virtualbox/VBoxXPCOMC.so
- at group %%VBOXGROUP%%
- at mode 0711
 lib/virtualbox/VBoxXPCOMIPCD
- at group
- at mode
- at group %%VBOXGROUP%%
- at mode 4511
-%%QT4%%lib/virtualbox/VirtualBox
- at group
- at mode
+@(root,%%VBOXGROUP%%,4510) %%QT4%%lib/virtualbox/VirtualBox
 %%QT4%%lib/virtualbox/VirtualBox.so
 lib/virtualbox/sdk
 %%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html

More information about the svn-ports-all mailing list