View | Details | Raw Unified | Return to bug 200764 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-19 / +27 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	virtualbox-ose
4
PORTNAME=	virtualbox-ose
5
PORTVERSION=	5.2.4
5
PORTVERSION=	5.2.4
6
PORTREVISION=	1
6
CATEGORIES=	emulators
7
CATEGORIES=	emulators
7
MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
8
MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
8
DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
9
DISTFILES=	VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS}
Lines 18-26 Link Here
18
		xsltproc:textproc/libxslt \
19
		xsltproc:textproc/libxslt \
19
		kmk:devel/kBuild \
20
		kmk:devel/kBuild \
20
		gtar:archivers/gtar \
21
		gtar:archivers/gtar \
21
		cdrecord:sysutils/cdrtools
22
		cdrecord:sysutils/cdrtools \
23
		libIDL-config-2:devel/libIDL
22
LIB_DEPENDS=	libpng.so:graphics/png \
24
LIB_DEPENDS=	libpng.so:graphics/png \
23
		libxslt.so:textproc/libxslt \
24
		libcurl.so:ftp/curl
25
		libcurl.so:ftp/curl
25
RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod \
26
RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:emulators/virtualbox-ose-kmod \
26
		cdrecord:sysutils/cdrtools
27
		cdrecord:sysutils/cdrtools
Lines 29-37 Link Here
29
CPE_PRODUCT=	vm_virtualbox
30
CPE_PRODUCT=	vm_virtualbox
30
31
31
WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
32
WRKSRC=		${WRKDIR}/VirtualBox-${PORTVERSION}
32
ONLY_FOR_ARCHS=	i386 amd64
33
ONLY_FOR_ARCHS=	amd64 i386
33
USES=		compiler:c++14-lang cpe iconv pkgconfig ssl tar:bzip2
34
USES=		compiler:c++14-lang cpe iconv pkgconfig ssl tar:bzip2
34
USE_GNOME=	libidl libxml2
35
USE_GNOME=	libxml2
35
36
36
HAS_CONFIGURE=	yes
37
HAS_CONFIGURE=	yes
37
CONFIGURE_ARGS=	--disable-java --passive-mesa
38
CONFIGURE_ARGS=	--disable-java --passive-mesa
Lines 58-64 Link Here
58
OPTIONS_DEFINE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \
59
OPTIONS_DEFINE=	ALSA DBUS DEBUG GUESTADDITIONS MANUAL NLS PULSEAUDIO \
59
		PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
60
		PYTHON QT5 R0LOGGING UDPTUNNEL VDE VNC WEBSERVICE VPX X11
60
OPTIONS_DEFAULT=	DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
61
OPTIONS_DEFAULT=	DBUS QT5 UDPTUNNEL VNC WEBSERVICE X11
61
OPTIONS_SUB=	yes
62
62
63
DEBUG_DESC=	Debug symbols, additional logs and assertions
63
DEBUG_DESC=	Debug symbols, additional logs and assertions
64
GUESTADDITIONS_DESC=	Build with Guest Additions
64
GUESTADDITIONS_DESC=	Build with Guest Additions
Lines 71-76 Link Here
71
VPX_DESC=	Use vpx for video capturing
71
VPX_DESC=	Use vpx for video capturing
72
WEBSERVICE_DESC=	Build Webservice
72
WEBSERVICE_DESC=	Build Webservice
73
73
74
MANUAL_USE=		TEX=dvipsk:build,formats:build
75
PYTHON_USES=		python:2.7
76
PYTHON_USE=		PYTHON=distutils,noegginfo,noflavors
77
PYTHON_USES_OFF=	python:build
78
QT5_USE=		QT5=buildtools_build,core,dbus,gui,linguisttools_build
79
QT5_USE+=		QT5=opengl,printsupport,widgets,x11extras XORG=xcb
80
X11_USE=		GL=gl SDL=sdl
81
X11_USE+=		XORG=inputproto,x11,xext,xcursor,xinerama,xt,xmu
82
74
ALSA_CONFIGURE_OFF=	--disable-alsa
83
ALSA_CONFIGURE_OFF=	--disable-alsa
75
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
84
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
76
DBUS_CONFIGURE_OFF=	--disable-dbus
85
DBUS_CONFIGURE_OFF=	--disable-dbus
Lines 88-98 Link Here
88
VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
97
VNC_LIB_DEPENDS=	libvncserver.so:net/libvncserver
89
VPX_CONFIGURE_OFF=	--disable-libvpx
98
VPX_CONFIGURE_OFF=	--disable-libvpx
90
VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
99
VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
100
QT5_CONFIGURE_ON=	--enable-qt5
101
QT5_CONFIGURE_OFF=	--disable-qt
91
X11_CONFIGURE_OFF=	--build-headless
102
X11_CONFIGURE_OFF=	--build-headless
92
103
93
ENV=
104
ENV=
94
.export ENV
105
.export ENV
95
106
107
OPTIONS_SUB=	yes
96
PLIST_SUB=	GUEST_VER=${PORTVERSION} \
108
PLIST_SUB=	GUEST_VER=${PORTVERSION} \
97
		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
109
		PYTHON_VERU=${PYTHON_VER:S/./_/}${PYTHON_ABIVER} \
98
		VBOXGROUP=${VBOXGROUP}
110
		VBOXGROUP=${VBOXGROUP}
Lines 143-174 Link Here
143
.if ${PORT_OPTIONS:MMANUAL}
155
.if ${PORT_OPTIONS:MMANUAL}
144
DBKXMLDIR=	${LOCALBASE}/share/xml/docbook/4.4
156
DBKXMLDIR=	${LOCALBASE}/share/xml/docbook/4.4
145
DBKXSLDIR=	${LOCALBASE}/share/xsl/docbook
157
DBKXSLDIR=	${LOCALBASE}/share/xsl/docbook
146
USE_TEX=	dvipsk:build formats:build
147
.endif
158
.endif
148
159
149
.if ${PORT_OPTIONS:MPYTHON}
160
.if ${PORT_OPTIONS:MPYTHON}
150
USES+=		python
151
USE_PYTHON=	distutils noegginfo noflavors
152
PYDISTUTILS_PKGNAME=	vboxapi
161
PYDISTUTILS_PKGNAME=	vboxapi
153
PYDISTUTILS_PKGVERSION=	1.0
162
PYDISTUTILS_PKGVERSION=	1.0
154
.else
155
USES+=		python:build
156
.endif
163
.endif
157
164
158
.if ${PORT_OPTIONS:MQT5}
165
.if ${PORT_OPTIONS:MQT5}
159
CONFIGURE_ARGS+=	--enable-qt5
160
PLIST_SUB+=	QT=""
166
PLIST_SUB+=	QT=""
161
QT_NONSTANDARD=	yes
167
QT_NONSTANDARD=	yes
162
USE_GL=		gl
163
USE_QT5=	buildtools_build core dbus gui linguisttools_build opengl
164
USE_QT5+=	printsupport widgets x11extras
165
USE_XORG=	xcb
166
INSTALLS_ICONS=	yes
168
INSTALLS_ICONS=	yes
167
VBOX_PROGS+=	VirtualBox
169
VBOX_PROGS+=	VirtualBox
168
VBOX_UTILS+=	VBoxTestOGL
170
VBOX_UTILS+=	VBoxTestOGL
169
VBOX_WITH_QT=	1
171
VBOX_WITH_QT=	1
170
.else
172
.else
171
CONFIGURE_ARGS+=	--disable-qt
172
PLIST_SUB+=	QT="@comment "
173
PLIST_SUB+=	QT="@comment "
173
.endif
174
.endif
174
175
Lines 180-187 Link Here
180
.endif
181
.endif
181
182
182
.if ${PORT_OPTIONS:MX11}
183
.if ${PORT_OPTIONS:MX11}
183
USE_SDL=	sdl
184
USE_XORG+=	inputproto x11 xcursor xext xinerama xmu xt
185
VBOX_PROGS+=	VBoxSDL
184
VBOX_PROGS+=	VBoxSDL
186
.endif
185
.endif
187
186
Lines 303-309 Link Here
303
	@${REINPLACE_CMD} \
302
	@${REINPLACE_CMD} \
304
	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
303
	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
305
	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \
304
	    -e 's|SUPPYTHONLIBS=.*|SUPPYTHONLIBS="${PYTHON_VERSION}${PYTHON_ABIVER}"|' \
305
	    -e 's|\[ $$WITH_X11    -eq 1 \] && check_xrandr||' \
306
	    -e 's|#include <GL/glu.h>||' \
306
	    ${WRKSRC}/configure
307
	    ${WRKSRC}/configure
308
	@${REINPLACE_CMD} -e 's|#include <GL/glu.h>||' \
309
	    ${WRKSRC}/src/VBox/GuestHost/OpenGL/include/chromium.h
307
.if empty(ICONV_LIB)
310
.if empty(ICONV_LIB)
308
	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
311
	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk \
309
	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
312
	    ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
Lines 325-331 Link Here
325
.endif
328
.endif
326
329
327
do-install:
330
do-install:
331
.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
328
	${MKDIR} ${STAGEDIR}${DATADIR}/sdk
332
	${MKDIR} ${STAGEDIR}${DATADIR}/sdk
333
.endif
329
	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \
334
	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom && \
330
	    ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
335
	    ${COPYTREE_SHARE} "idl samples" ${STAGEDIR}${DATADIR}
331
336
Lines 334-342 Link Here
334
	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
339
	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
335
340
336
	${MKDIR} ${STAGEDIR}${VBOX_DIR}
341
	${MKDIR} ${STAGEDIR}${VBOX_DIR}
337
	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \
342
	cd ${KMK_BUILDDIR}/bin && ${FIND} . -type f -name "*.so" \
343
	    -exec ${STRIP_CMD} {} \; && ${COPYTREE_SHARE} \
338
	    "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR}
344
	    "*.fd *.r0 *.rc *.so components" ${STAGEDIR}${VBOX_DIR}
345
.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
339
	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
346
	${RLN} ${STAGEDIR}${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
347
.endif
340
348
341
	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
349
	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
342
	    ${STAGEDIR}${VBOX_DIR}
350
	    ${STAGEDIR}${VBOX_DIR}
(-)files/patch-configure (+10 lines)
Lines 25-30 Link Here
25
       elif [ $cc_maj -lt 4 \
25
       elif [ $cc_maj -lt 4 \
26
              -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
26
              -o \( $cc_maj -eq 4 -a $cc_min -lt 4 -a "$OS" != "darwin" \) \
27
              -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" \) \
27
              -o \( $cc_maj -eq 4 -a $cc_min -lt 2 -a "$OS"  = "darwin" \) \
28
@@ -1114,6 +1116,9 @@ extern "C" int main(int argc, char** arg
29
   printf("found version %d.%d.%d",
30
          SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
31
 #if SDL_VERSION_ATLEAST(1,2,7)
32
+#if !defined(SDL_VIDEO_DRIVER_X11)
33
+#error SDL must be compiled with X11 support
34
+#endif
35
   printf(", OK.\n");
36
   return 0;
37
 #else
28
@@ -1233,7 +1240,7 @@ extern "C" int main(void)
38
@@ -1233,7 +1240,7 @@ extern "C" int main(void)
29
 #endif
39
 #endif
30
 }
40
 }
(-)pkg-plist (-1 / +1 lines)
Lines 424-430 Link Here
424
lib/virtualbox/VMMRC.rc
424
lib/virtualbox/VMMRC.rc
425
%%QT%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox
425
%%QT%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox
426
%%QT%%lib/virtualbox/VirtualBox.so
426
%%QT%%lib/virtualbox/VirtualBox.so
427
lib/virtualbox/sdk
427
%%SDK%%lib/virtualbox/sdk
428
%%WEBSERVICE%%lib/virtualbox/vboxwebsrv
428
%%WEBSERVICE%%lib/virtualbox/vboxwebsrv
429
%%WEBSERVICE%%lib/virtualbox/webtest
429
%%WEBSERVICE%%lib/virtualbox/webtest
430
%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html
430
%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html

Return to bug 200764