Attachment #159694 for bug #200764





PORTNAME=	virtualbox-ose
DISTVERSION=	4.3.30
PORTREVISION=	1
CATEGORIES=	emulators
MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
		http://tmp.chruetertee.ch/ \

		xsltproc:${PORTSDIR}/textproc/libxslt \
		kmk:${PORTSDIR}/devel/kBuild \
		gtar:${PORTSDIR}/archivers/gtar \
		cdrecord:${PORTSDIR}/sysutils/cdrtools \
		libIDL-config-2:${PORTSDIR}/devel/libIDL
LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
		libxml2.so:${PORTSDIR}/textproc/libxml2 \
		libcurl.so:${PORTSDIR}/ftp/curl
RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/vboxnet:${PORTSDIR}/emulators/virtualbox-ose-kmod \
		cdrecord:${PORTSDIR}/sysutils/cdrtools

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



VDE_RUN_DEPENDS=	vde_switch:${PORTSDIR}/net/vde2

MANUAL_USE=		TEX=dvipsk:build,formats:build
PYTHON_USES=		python:2
PYTHON_USE=		PYTHON=distutils,noegginfo
PYTHON_USES_OFF=	python:build
QT4_USE=		QT4=linguisttools_build,moc_build,rcc_build,uic_build
QT4_USE+=		QT4=gui,network,opengl
X11_USE=		GL=gl SDL=sdl XORG=x11,xcursor,xmu,inputproto,xinerama

DBUS_CONFIGURE_OFF=	--disable-dbus
DEBUG_CONFIGURE_ON=	--build-debug
MANUAL_CONFIGURE_OFF=	--disable-docs

RESTRICTED_FILES=	${GUESTADDITIONS}
.endif

.if ${PORT_OPTIONS:MMANUAL}
USE_TEX=	dvipsk:build formats:build
.endif

.if ${PORT_OPTIONS:MPYTHON}
USES+=		python:2
USE_PYTHON=	distutils noegginfo
PYDISTUTILS_PKGNAME=	vboxapi
PYDISTUTILS_PKGVERSION=	1.0
.else
USES+=		python:build
.endif

.if ${PORT_OPTIONS:MQT4}
QT_NONSTANDARD=	yes
USE_QT4=	linguist_build moc_build rcc_build uic_build
USE_QT4+=	gui network opengl
INSTALLS_ICONS=	yes
VBOX_PROGS+=	VirtualBox
VBOX_UTILS+=	VBoxTestOGL

.endif

.if ${PORT_OPTIONS:MX11}
USE_SDL=	sdl
USE_XORG=	xcursor xmu inputproto xinerama
VBOX_PROGS+=	VBoxSDL
.endif


		${WRKSRC}/kBuild/units/qt3.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
		${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
		${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
	@${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
			  -e 's|\[ $$WITH_X11    -eq 1 \] && check_xrandr||' \
			  -e 's|#include <GL/glu.h>||' \
		${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|#include <GL/glu.h>||' \
		${WRKSRC}/src/VBox/GuestHost/OpenGL/include/chromium.h
.if empty(ICONV_LIB)
	@${REINPLACE_CMD} -e 's|iconv||' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk

	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox

	${MKDIR} ${STAGEDIR}${VBOX_DIR}
	cd ${KMK_BUILDDIR}/bin && ${FIND} . -type f -name "*.so" \
	    -exec ${STRIP_CMD} {} \; && ${COPYTREE_SHARE} \
	    "*.so *.gc *.r0 *.fd components" ${STAGEDIR}${VBOX_DIR}
.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
	${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
.endif

	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
	    ${STAGEDIR}${VBOX_DIR}

Lines 1-6 Link Here

(-)emulators/virtualbox-ose/files/patch-configure (-5 / +15 lines)
1	--- configure.orig 2015-05-13 11:08:57.000000000 -0400	1	--- configure.orig 2015-08-07 14:52:22 UTC
2	+++ configure 2015-05-15 14:16:05.988372000 -0400	2	+++ configure
3	@@ -140,6 +140,8 @@	3	@@ -140,6 +140,8 @@ if [ "$OS" = "freebsd" ]; then
4	LIBPULSE="-L/usr/local/lib"	4	LIBPULSE="-L/usr/local/lib"
5	INCPNG="-I/usr/local/include"	5	INCPNG="-I/usr/local/include"
6	LIBPNG="-L/usr/local/lib -lpng"	6	LIBPNG="-L/usr/local/lib -lpng"
Lines 9-15 Link Here
9	else	9	else
10	INCCURL=""	10	INCCURL=""
11	LIBCURL="-lcurl"	11	LIBCURL="-lcurl"
12	@@ -1947,8 +1949,8 @@	12	@@ -1114,6 +1116,9 @@ extern "C" int main(int argc, char** arg
		13	printf("found version %d.%d.%d",
		14	SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL);
		15	#if SDL_VERSION_ATLEAST(1,2,7)
		16	+#if !defined(SDL_VIDEO_DRIVER_X11)
		17	+#error SDL must be compiled with X11 support
		18	+#endif
		19	printf(", OK.\n");
		20	return 0;
		21	#else
		22	@@ -1948,8 +1953,8 @@ EOF
13	echo "compiling the following source file:" >> $LOG	23	echo "compiling the following source file:" >> $LOG
14	cat $ODIR.tmp_src.cc >> $LOG	24	cat $ODIR.tmp_src.cc >> $LOG
15	echo "using the following command line:" >> $LOG	25	echo "using the following command line:" >> $LOG
Lines 20-26 Link Here
20	if [ $? -eq 0 ]; then	30	if [ $? -eq 0 ]; then
21	found=1	31	found=1
22	break	32	break
23	@@ -2357,7 +2359,7 @@	33	@@ -2358,7 +2363,7 @@ for option in $*; do
24	--with-openssl-dir=*)	34	--with-openssl-dir=*)
25	OPENSSLDIR=`echo $option \| cut -d'=' -f2`	35	OPENSSLDIR=`echo $option \| cut -d'=' -f2`
26	INCCRYPTO="-I${OPENSSLDIR}/include"	36	INCCRYPTO="-I${OPENSSLDIR}/include"




--- src/VBox/Devices/Graphics/DevVGA.h.orig	2015-08-07 16:14:28 UTC
+++ src/VBox/Devices/Graphics/DevVGA.h
@@ -405,6 +405,10 @@ typedef struct VGAState {
 # if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI))
     /** LUN\#0: VBVA callbacks interface */
     PDMIDISPLAYVBVACALLBACKS    IVBVACallbacks;
+# else
+#  if HC_ARCH_BITS == 32
+    bool			_PaddingIVBVACallbacks[4];
+#  endif
 # endif
     /** Pointer to base interface of the driver. */
     R3PTRTYPE(PPDMIBASE)        pDrvBase;

Lines 390-396 Link Here

(-)emulators/virtualbox-ose/pkg-plist (-1 / +1 lines)
390	lib/virtualbox/VBoxXPCOMIPCD	390	lib/virtualbox/VBoxXPCOMIPCD
391	%%QT4%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox	391	%%QT4%%@(root,%%VBOXGROUP%%,4510) lib/virtualbox/VirtualBox
392	%%QT4%%lib/virtualbox/VirtualBox.so	392	%%QT4%%lib/virtualbox/VirtualBox.so
393	lib/virtualbox/sdk	393	%%SDK%%lib/virtualbox/sdk
394	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html	394	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html
395	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf	395	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf
396	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt	396	%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt

Return to bug 200764

Lines 3-8 Link Here

(-)emulators/virtualbox-ose/Makefile (-17 / +22 lines)
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	DISTVERSION= 4.3.30	5	DISTVERSION= 4.3.30
		6	PORTREVISION= 1
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7	MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \	8	MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
8	http://tmp.chruetertee.ch/ \	9	http://tmp.chruetertee.ch/ \
Lines 21-29 Link Here
21	xsltproc:${PORTSDIR}/textproc/libxslt \	22	xsltproc:${PORTSDIR}/textproc/libxslt \
22	kmk:${PORTSDIR}/devel/kBuild \	23	kmk:${PORTSDIR}/devel/kBuild \
23	gtar:${PORTSDIR}/archivers/gtar \	24	gtar:${PORTSDIR}/archivers/gtar \
24	cdrecord:${PORTSDIR}/sysutils/cdrtools	25	cdrecord:${PORTSDIR}/sysutils/cdrtools \
		26	libIDL-config-2:${PORTSDIR}/devel/libIDL
25	LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \	27	LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
26	libxslt.so:${PORTSDIR}/textproc/libxslt \	28	libxml2.so:${PORTSDIR}/textproc/libxml2 \
27	libcurl.so:${PORTSDIR}/ftp/curl	29	libcurl.so:${PORTSDIR}/ftp/curl
28	RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:${PORTSDIR}/emulators/virtualbox-ose-kmod \	30	RUN_DEPENDS= ${LOCALBASE}/etc/rc.d/vboxnet:${PORTSDIR}/emulators/virtualbox-ose-kmod \
29	cdrecord:${PORTSDIR}/sysutils/cdrtools	31	cdrecord:${PORTSDIR}/sysutils/cdrtools
Lines 34-40 Link Here
34	WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}	36	WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION}
35	ONLY_FOR_ARCHS= i386 amd64	37	ONLY_FOR_ARCHS= i386 amd64
36	USES= compiler cpe iconv pkgconfig tar:bzip2	38	USES= compiler cpe iconv pkgconfig tar:bzip2
37	USE_GNOME= libidl
38	USE_LDCONFIG= ${VBOX_DIR}	39	USE_LDCONFIG= ${VBOX_DIR}
39	USE_OPENSSL= yes	40	USE_OPENSSL= yes
40		41
Lines 82-87 Link Here
82		83
83	VDE_RUN_DEPENDS= vde_switch:${PORTSDIR}/net/vde2	84	VDE_RUN_DEPENDS= vde_switch:${PORTSDIR}/net/vde2
84		85
		86	MANUAL_USE= TEX=dvipsk:build,formats:build
		87	PYTHON_USES= python:2
		88	PYTHON_USE= PYTHON=distutils,noegginfo
		89	PYTHON_USES_OFF= python:build
		90	QT4_USE= QT4=linguisttools_build,moc_build,rcc_build,uic_build
		91	QT4_USE+= QT4=gui,network,opengl
		92	X11_USE= GL=gl SDL=sdl XORG=x11,xcursor,xmu,inputproto,xinerama
		93
85	DBUS_CONFIGURE_OFF= --disable-dbus	94	DBUS_CONFIGURE_OFF= --disable-dbus
86	DEBUG_CONFIGURE_ON= --build-debug	95	DEBUG_CONFIGURE_ON= --build-debug
87	MANUAL_CONFIGURE_OFF= --disable-docs	96	MANUAL_CONFIGURE_OFF= --disable-docs
Lines 135-157 Link Here
135	RESTRICTED_FILES= ${GUESTADDITIONS}	144	RESTRICTED_FILES= ${GUESTADDITIONS}
136	.endif	145	.endif
137		146
138	.if ${PORT_OPTIONS:MMANUAL}
139	USE_TEX= dvipsk:build formats:build
140	.endif
141
142	.if ${PORT_OPTIONS:MPYTHON}	147	.if ${PORT_OPTIONS:MPYTHON}
143	USES+= python:2
144	USE_PYTHON= distutils noegginfo
145	PYDISTUTILS_PKGNAME= vboxapi	148	PYDISTUTILS_PKGNAME= vboxapi
146	PYDISTUTILS_PKGVERSION= 1.0	149	PYDISTUTILS_PKGVERSION= 1.0
147	.else
148	USES+= python:build
149	.endif	150	.endif
150		151
151	.if ${PORT_OPTIONS:MQT4}	152	.if ${PORT_OPTIONS:MQT4}
152	QT_NONSTANDARD= yes	153	QT_NONSTANDARD= yes
153	USE_QT4= linguist_build moc_build rcc_build uic_build
154	USE_QT4+= gui network opengl
155	INSTALLS_ICONS= yes	154	INSTALLS_ICONS= yes
156	VBOX_PROGS+= VirtualBox	155	VBOX_PROGS+= VirtualBox
157	VBOX_UTILS+= VBoxTestOGL	156	VBOX_UTILS+= VBoxTestOGL
Lines 168-175 Link Here
168	.endif	167	.endif
169		168
170	.if ${PORT_OPTIONS:MX11}	169	.if ${PORT_OPTIONS:MX11}
171	USE_SDL= sdl
172	USE_XORG= xcursor xmu inputproto xinerama
173	VBOX_PROGS+= VBoxSDL	170	VBOX_PROGS+= VBoxSDL
174	.endif	171	.endif
175		172
Lines 258-264 Link Here
258	${WRKSRC}/kBuild/units/qt3.kmk ${WRKSRC}/kBuild/units/qt4.kmk \	255	${WRKSRC}/kBuild/units/qt3.kmk ${WRKSRC}/kBuild/units/qt4.kmk \
259	${WRKSRC}/kBuild/sdks/LIBSDL.kmk \	256	${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
260	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py	257	${WRKSRC}/src/libs/xpcom18a4/python/gen_python_deps.py
261	@${REINPLACE_CMD} -e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' ${WRKSRC}/configure	258	@${REINPLACE_CMD} -e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' \
		259	-e 's\|\[ $$WITH_X11 -eq 1 \] && check_xrandr\|\|' \
		260	-e 's\|#include <GL/glu.h>\|\|' \
		261	${WRKSRC}/configure
		262	@${REINPLACE_CMD} -e 's\|#include <GL/glu.h>\|\|' \
		263	${WRKSRC}/src/VBox/GuestHost/OpenGL/include/chromium.h
262	.if empty(ICONV_LIB)	264	.if empty(ICONV_LIB)
263	@${REINPLACE_CMD} -e 's\|iconv\|\|' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk	265	@${REINPLACE_CMD} -e 's\|iconv\|\|' ${WRKSRC}/Config.kmk ${WRKSRC}/src/VBox/Runtime/Makefile.kmk
264	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk	266	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
Lines 282-290 Link Here
282	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox	284	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/include && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PREFIX}/include/virtualbox
283		285
284	${MKDIR} ${STAGEDIR}${VBOX_DIR}	286	${MKDIR} ${STAGEDIR}${VBOX_DIR}
285	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} \	287	cd ${KMK_BUILDDIR}/bin && ${FIND} . -type f -name "*.so" \
		288	-exec ${STRIP_CMD} {} \; && ${COPYTREE_SHARE} \
286	".so .gc .r0 .fd components" ${STAGEDIR}${VBOX_DIR}	289	".so .gc .r0 .fd components" ${STAGEDIR}${VBOX_DIR}
		290	.if ${PORT_OPTIONS:MPYTHON} \|\| ${PORT_OPTIONS:MWEBSERVICE}
287	${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}	291	${LN} -sf ${DATADIR}/sdk ${STAGEDIR}${VBOX_DIR}
		292	.endif
288		293
289	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \	294	${INSTALL_SCRIPT} ${WRKSRC}/src/VBox/Installer/freebsd/VBox.sh \
290	${STAGEDIR}${VBOX_DIR}	295	${STAGEDIR}${VBOX_DIR}

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Devices-Graphics-DevVGA.h (+13 lines)
	1	--- src/VBox/Devices/Graphics/DevVGA.h.orig 2015-08-07 16:14:28 UTC
	2	+++ src/VBox/Devices/Graphics/DevVGA.h
	3	@@ -405,6 +405,10 @@ typedef struct VGAState {
	4	# if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) \|\| defined(VBOX_WITH_CRHGSMI))
	5	/** LUN\#0: VBVA callbacks interface */
	6	PDMIDISPLAYVBVACALLBACKS IVBVACallbacks;
	7	+# else
	8	+# if HC_ARCH_BITS == 32
	9	+ bool _PaddingIVBVACallbacks[4];
	10	+# endif
	11	# endif
	12	/** Pointer to base interface of the driver. */
	13	R3PTRTYPE(PPDMIBASE) pDrvBase;