Update to 5.0.26.

1 files changed, 58 insertions, 47 deletions

diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index efad4cbc6c18..f7173bc07033 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -2,15 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	virtualbox-ose
-DISTVERSION=	4.3.38
-PORTREVISION=	1
+PORTVERSION=	5.0.26
 CATEGORIES=	emulators
-MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
-		http://tmp.chruetertee.ch/ \
-		http://disasterarea.chruetertee.ch/ \
-		http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VER}/:guestadditions
-DISTFILES=	VirtualBox-${DISTVERSION}${EXTRACT_SUFX} ${GADISTFILES}
-EXTRACT_ONLY=	VirtualBox-${DISTVERSION}${EXTRACT_SUFX}
+MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
+DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
+EXTRACT_ONLY=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER?=	vbox@FreeBSD.org
 COMMENT=	General-purpose full virtualizer for x86 hardware
@@ -34,26 +30,28 @@ CPE_PRODUCT=	vm_virtualbox
 
 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
+USES=		compiler cpe iconv pkgconfig ssl tar:bzip2
+USE_GNOME=	libidl libxml2
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-java --passive-mesa
+CONFIGURE_ARGS=	--disable-java --passive-mesa
 CONFIGURE_ARGS+=	--with-gcc="${CC}" --with-g++="${CXX}"
 
-CONFLICTS_INSTALL=	virtualbox-ose-additions-4* \
+CONFLICTS_INSTALL=	virtualbox-ose-additions-[4,5]* \
 			virtualbox-ose-additions-devel-4* \
 			virtualbox-ose-devel-4* \
 			virtualbox-ose-legacy-4*
 
 .if defined(LITE)
-PKGNAMESUFFIX+=		-lite
-CONFLICTS_INSTALL+=      ${PORTNAME}-[0-9]*
-WITHOUT+=      		NLS
+CONFIGURE_ARGS+=	--disable-alsa --disable-dbus --disable-docs \
+			--disable-pulse --disable-qt4 --disable-libvpx \
+			--build-headless
+CONFLICTS_INSTALL+=	${PORTNAME}-[4,5]*
+PKGNAMESUFFIX=		-lite
+PLIST_SUB=		GUESTADDITIONS="@comment " MANUAL="@comment " \
+			NLS="@comment " QT4="@comment " X11="@comment "
 .else
-CONFLICTS_INSTALL+=      ${PORTNAME}-lite-[0-9]*
+CONFLICTS_INSTALL+=	${PORTNAME}-lite-[4,5]*
 .endif
 
 VBOXUSER?=	vboxusers
@@ -67,14 +65,12 @@ VBOX_PROGS=	VBoxAutostart VBoxBalloonCtrl VBoxHeadless VBoxManage
 VBOX_UTILS=	VBoxExtPackHelperApp VBoxNetAdpCtl VBoxNetDHCP VBoxNetNAT \
 		VBoxSVC VBoxXPCOMIPCD
 
-VBOX_GUEST_VER=	${PORTVERSION}
-
-OPTIONS_DEFINE=	DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO PYTHON \
-		QT4 R0LOGGING UDPTUNNEL VDE VNC VPX WEBSERVICE X11
-.if defined(LITE)
+OPTIONS_DEFINE=		PYTHON R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE
 OPTIONS_DEFAULT=	UDPTUNNEL VNC
-.else
-OPTIONS_DEFAULT=	DBUS PYTHON QT4 UDPTUNNEL VNC WEBSERVICE X11
+.if !defined(LITE)
+OPTIONS_DEFINE+=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO
+OPTIONS_DEFINE+=	QT4 VPX X11
+OPTIONS_DEFAULT+=	DBUS PYTHON QT4 WEBSERVICE X11
 .endif
 OPTIONS_SUB=	yes
 
@@ -89,24 +85,28 @@ VNC_DESC=	Build with VNC support
 VPX_DESC=	Use vpx for video capturing
 WEBSERVICE_DESC=	Build Webservice
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
-PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
-VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
-
+MANUAL_BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.4/docbookx.dtd:textproc/docbook-xml
+PYTHON_CONFIGURE_OFF=	--disable-python
+UDPTUNNEL_CONFIGURE_OFF=	--disable-udptunnel
+VDE_CONFIGURE_ON=	--enable-vde
 VDE_RUN_DEPENDS=	vde_switch:net/vde2
+VNC_CONFIGURE_ON=	--enable-vnc
+VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
 
+.if !defined(LITE)
+ALSA_CONFIGURE_OFF=	--disable-alsa
+ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 DBUS_CONFIGURE_OFF=	--disable-dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DEBUG_CONFIGURE_ON=	--build-debug
 MANUAL_CONFIGURE_OFF=	--disable-docs
 PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
-PYTHON_CONFIGURE_OFF=	--disable-python
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 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
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 X11_CONFIGURE_OFF=	--build-headless
+.endif
 
 # bmake doesn't know about unsetenv=true
 .if defined(.PARSEDIR)
@@ -116,7 +116,7 @@ ENV=
 .SHELL:		path="/bin/sh" unsetenv=true
 .endif
 
-PLIST_SUB+=	GUEST_VER=${VBOX_GUEST_VER} \
+PLIST_SUB+=	GUEST_VER=${PORTVERSION} \
 		PYTHON_VER=${PYTHON_VER} \
 		PYTHON_VERU=${PYTHON_VER:S/./_/} \
 		VBOXGROUP=${VBOXGROUP}
@@ -128,11 +128,11 @@ USE_RC_SUBR+=	vboxheadless vboxwatchdog
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MQT4) && !empty(PORT_OPTIONS:MNLS)
+.if ${PORT_OPTIONS:MNLS} && empty(PORT_OPTIONS:MQT4) && !defined(LITE)
 BROKEN=		NLS support requires QT4 frontend. Run 'make config' again!
 .endif
 
-.if empty(PORT_OPTIONS:MX11) && !empty(PORT_OPTIONS:MQT4)
+.if ${PORT_OPTIONS:MQT4} && empty(PORT_OPTIONS:MX11)
 BROKEN=		QT4 frontend requires X11 support. Run 'make config' again!
 .endif
 
@@ -148,13 +148,14 @@ BROKEN=		R0 logging requires debug build
 .endif
 
 .if ${PORT_OPTIONS:MGUESTADDITIONS}
-GUESTADDITIONS=	VBoxGuestAdditions_${VBOX_GUEST_VER}.iso
-GADISTFILES=	${GUESTADDITIONS}:guestadditions
+GUESTADDITIONS=	VBoxGuestAdditions_${PORTVERSION}.iso
 RESTRICTED=	for personal use only
 RESTRICTED_FILES=	${GUESTADDITIONS}
 .endif
 
 .if ${PORT_OPTIONS:MMANUAL}
+DBKXMLDIR=	${LOCALBASE}/share/xml/docbook/4.4
+DBKXSLDIR=	${LOCALBASE}/share/xsl/docbook
 USE_TEX=	dvipsk:build formats:build
 .endif
 
@@ -169,8 +170,9 @@ USES+=		python:build
 
 .if ${PORT_OPTIONS:MQT4}
 QT_NONSTANDARD=	yes
-USE_QT4=	linguist_build moc_build rcc_build uic_build
-USE_QT4+=	gui network opengl
+USE_GL=		gl
+USE_QT4=	corelib gui linguist_build moc_build network
+USE_QT4+=	opengl rcc_build uic_build
 INSTALLS_ICONS=	yes
 VBOX_PROGS+=	VirtualBox
 VBOX_UTILS+=	VBoxTestOGL
@@ -188,7 +190,7 @@ VBOX_UTILS+=	vboxwebsrv webtest
 
 .if ${PORT_OPTIONS:MX11}
 USE_SDL=	sdl
-USE_XORG=	xcursor xmu inputproto xinerama
+USE_XORG=	inputproto x11 xcursor xext xinerama xmu xt
 VBOX_PROGS+=	VBoxSDL
 .endif
 
@@ -235,7 +237,12 @@ pre-everything::
 .endif
 
 post-patch:
-	@${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' > \
+	@${ECHO} 'TOOL_QT4_BIN_SUFF = -qt4' > ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_APP_PRIVATE_ARCH = ${VBOX_DIR}' >> \
+	    ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_DOCBOOK = ${DBKXSLDIR}' >> \
+	    ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_PATH_DOCBOOK_DTD = ${DBKXMLDIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_SHARED_LIBS = ${VBOX_DIR}' >> \
 	    ${WRKSRC}/LocalConfig.kmk
@@ -243,6 +250,7 @@ post-patch:
 	    ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_APP_PRIVATE = ${DATADIR}' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_APP_DOCS = ${DOCSDIR}' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_WITH_EXTPACK_VBOXDTRACE =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_INSTALLER = 1' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_VBOXDRV =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_TESTCASES =' >> ${WRKSRC}/LocalConfig.kmk
@@ -250,6 +258,8 @@ post-patch:
 	@${ECHO} 'SDK_VBOX_LIBPNG_LIBS = png' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP = ${VBOX_WITH_QT4}' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_WITH_DRAG_AND_DROP_GH = ${VBOX_WITH_QT4}' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_WITH_VALIDATIONKIT =' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_WITH_X11_ADDITIONS =' >> ${WRKSRC}/LocalConfig.kmk
 .if ${PORT_OPTIONS:MWEBSERVICE}
 	@${ECHO} 'VBOX_WITH_WEBSERVICES = 1' >> ${WRKSRC}/LocalConfig.kmk
@@ -277,7 +287,8 @@ post-patch:
 		${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
 	@${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
+	@${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/lib/virtualbox|${VBOX_DIR}|' \
@@ -286,7 +297,7 @@ post-patch:
 
 do-build:
 	cd ${WRKSRC} && \
-	    ${SH} -c '. env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
+	    ${SH} -c '. ${WRKSRC}/env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 .if ${PORT_OPTIONS:MPYTHON}
 	${PYTHON_CMD} -mcompileall ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom
 .endif
@@ -300,7 +311,7 @@ do-install:
 
 	${MKDIR} ${STAGEDIR}${VBOX_DIR}
 	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
-	    "*.so *.gc *.r0 *.fd components" ${STAGEDIR}${VBOX_DIR}
+	    "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR}
 	${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
 
 	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
@@ -328,7 +339,7 @@ do-install:
 	${INSTALL_DATA} ${KMK_BUILDDIR}/bin/UserManual*.pdf ${STAGEDIR}${DOCSDIR}
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
+.if ${PORT_OPTIONS:MNLS} && !defined(LITE)
 	cd ${KMK_BUILDDIR}/obj/VirtualBox/qtnls && ${COPYTREE_SHARE} "*.qm" ${STAGEDIR}${DATADIR}/nls
 .endif