svn commit: r381061 - in head/emulators: virtualbox-ose virtualbox-ose-additions

[Jung-uk Kim]

Author: jkim
Date: Thu Mar 12 06:52:25 2015
New Revision: 381061
URL: https://svnweb.freebsd.org/changeset/ports/381061
QAT: https://qat.redports.org/buildarchive/r381061/

Log:
  - Enable drag and drop from host to guest.
  - Make UDPTUNNEL option actually work.

Modified:
  head/emulators/virtualbox-ose-additions/Makefile
  head/emulators/virtualbox-ose/Makefile
  head/emulators/virtualbox-ose/pkg-plist

Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	Thu Mar 12 05:22:58 2015	(r381060)
+++ head/emulators/virtualbox-ose-additions/Makefile	Thu Mar 12 06:52:25 2015	(r381061)
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.3.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -127,6 +127,7 @@ pre-everything::
 
 post-patch:
 	@${ECHO} 'VBOX_ONLY_ADDITIONS = 1' > ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> ${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||' \

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Thu Mar 12 05:22:58 2015	(r381060)
+++ head/emulators/virtualbox-ose/Makefile	Thu Mar 12 06:52:25 2015	(r381061)
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.3.24
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -87,6 +88,7 @@ MANUAL_CONFIGURE_OFF=	--disable-docs
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 PYTHON_CONFIGURE_OFF=	--disable-python
 QT4_CONFIGURE_OFF=	--disable-qt4
+UDPTUNNEL_CONFIGURE_OFF=	--disable-udptunnel
 VDE_CONFIGURE_ON=	--enable-vde
 VNC_CONFIGURE_ON=	--enable-vnc
 VPX_CONFIGURE_OFF=	--disable-libvpx
@@ -166,6 +168,9 @@ VBOX_UTILS+=	vboxwebsrv webtest
 USE_SDL=	sdl
 USE_XORG=	xcursor xmu inputproto xinerama
 VBOX_PROGS+=	VBoxSDL
+VBOX_WITH_X11=	1
+.else
+VBOX_WITH_X11=
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
@@ -226,13 +231,8 @@ post-patch:
 	@${ECHO} 'SDK_VBOX_LIBPNG_INCS = ${PREFIX}/include/libpng' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_X11}' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
-.if ${PORT_OPTIONS:MUDPTUNNEL}
-	@${ECHO} 'VBOX_WITH_UDPTUNNEL = 1' >> ${WRKSRC}/LocalConfig.kmk
-.endif
-.if ${PORT_OPTIONS:MVNC}
-	@${ECHO} 'VBOX_WITH_EXTPACK_VNC = 1' >> ${WRKSRC}/LocalConfig.kmk
-.endif
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_GSOAP_INSTALLED = 1' >> ${WRKSRC}/LocalConfig.kmk

Modified: head/emulators/virtualbox-ose/pkg-plist
==============================================================================
--- head/emulators/virtualbox-ose/pkg-plist	Thu Mar 12 05:22:58 2015	(r381060)
+++ head/emulators/virtualbox-ose/pkg-plist	Thu Mar 12 06:52:25 2015	(r381061)
@@ -353,6 +353,7 @@ lib/virtualbox/VBoxDDGC.gc
 lib/virtualbox/VBoxDDR0.r0
 lib/virtualbox/VBoxDDU.so
 %%QT4%%lib/virtualbox/VBoxDbg.so
+%%X11%%lib/virtualbox/VBoxDragAndDropSvc.so
 lib/virtualbox/VBoxEFI32.fd
 lib/virtualbox/VBoxEFI64.fd
 lib/virtualbox/VBoxExtPackHelperApp