svn commit: r354967 - head/emulators/virtualbox-ose

[Jung-uk Kim]

Author: jkim
Date: Fri May 23 23:45:23 2014
New Revision: 354967
URL: http://svnweb.freebsd.org/changeset/ports/354967
QAT: https://qat.redports.org/buildarchive/r354967/

Log:
  - Compile Python sources before installation. This fixes stage-qa. [1]
  - Create symbolic links to SDK directory.
  
  Reported by:	bar, nox [1]

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

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Fri May 23 23:24:11 2014	(r354966)
+++ head/emulators/virtualbox-ose/Makefile	Fri May 23 23:45:23 2014	(r354967)
@@ -3,6 +3,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.3.12
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \
 		http://tmp.chruetertee.ch/ \
@@ -246,6 +247,9 @@ pre-build:
 do-build:
 	cd ${WRKSRC} && ${SH} 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
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
@@ -256,6 +260,7 @@ do-install:
 
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/virtualbox
 	cd ${KMK_BUILDDIR}/bin && ${COPYTREE_SHARE} "*.so *.gc *.r0 *.fd components VBoxExtPackHelperApp" ${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/
@@ -279,12 +284,15 @@ do-install:
 
 .if ${PORT_OPTIONS:MPYTHON}
 	cd ${KMK_BUILDDIR}/bin/sdk/installer && \
-	    ${SETENV} VBOX_INSTALL_PATH="${PREFIX}/lib/virtualbox" \
+	    ${SETENV} VBOX_INSTALL_PATH="${PREFIX}/lib/virtualbox" VBOX_SDK_PATH="${DATADIR}/sdk" \
 	    ${PYTHON_CMD} vboxapisetup.py install --root=${STAGEDIR}
 
-	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python && ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}
-	${PYTHON_CMD} -mcompileall ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom/
+	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
+	cd ${KMK_BUILDDIR}/bin/sdk/bindings/xpcom/python/xpcom && \
+	    ${COPYTREE_SHARE} "*" ${STAGEDIR}${PYTHON_SITELIBDIR}/xpcom
+	@${MKDIR} ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
+	${LN} -sf ${PYTHON_SITELIBDIR}/xpcom \
+	    ${STAGEDIR}${DATADIR}/sdk/bindings/xpcom/python
 .endif
 
 .if ${PORT_OPTIONS:MQT4}

Modified: head/emulators/virtualbox-ose/pkg-plist
==============================================================================
--- head/emulators/virtualbox-ose/pkg-plist	Fri May 23 23:24:11 2014	(r354966)
+++ head/emulators/virtualbox-ose/pkg-plist	Fri May 23 23:45:23 2014	(r354967)
@@ -431,6 +431,13 @@ lib/virtualbox/VBoxXPCOMIPCD
 @group
 @mode
 %%QT4%%lib/virtualbox/VirtualBox.so
+lib/virtualbox/sdk
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack.xml
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNC.so
+%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNCMain.so
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions.iso
 %%GUESTADDITIONS%%lib/virtualbox/additions/VBoxGuestAdditions_%%GUEST_VER%%.iso
 %%PYTHON%%lib/virtualbox/VBoxPython%%PYTHON_VERU%%.so
@@ -443,12 +450,6 @@ lib/virtualbox/components/VBoxSVCM.so
 lib/virtualbox/components/VBoxXPCOMBase.xpt
 lib/virtualbox/components/VBoxXPCOMIPCC.so
 lib/virtualbox/components/VirtualBox_XPCOM.xpt
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.html
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.rtf
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack-license.txt
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/ExtPack.xml
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNC.so
-%%VNC%%lib/virtualbox/ExtensionPacks/VNC/%%ARCH%%/VBoxVNCMain.so
 %%QT4%%share/applications/virtualbox.desktop
 %%MANUAL%%%%DOCSDIR%%/UserManual.pdf
 %%MANUAL%%%%DOCSDIR%%/UserManual_fr_FR.pdf
@@ -614,6 +615,7 @@ lib/virtualbox/components/VirtualBox_XPC
 %%DATADIR%%/samples/Makefile
 %%DATADIR%%/samples/tstVBoxAPIXPCOM.cpp
 %%WEBSERVICE%%%%DATADIR%%/sdk/bindings/webservice/vboxweb.wsdl
+%%PYTHON%%%%DATADIR%%/sdk/bindings/xpcom/python/xpcom
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vboxapi/VirtualBox_constants.py
@@ -653,9 +655,11 @@ lib/virtualbox/components/VirtualBox_XPC
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom/client
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/xpcom
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vboxapi
+%%PYTHON%%@dirrm %%DATADIR%%/sdk/bindings/xpcom/python
+%%PYTHON%%@dirrm %%DATADIR%%/sdk/bindings/xpcom
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings/webservice
-%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings
-%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk
+ at dirrmtry %%DATADIR%%/sdk/bindings
+ at dirrmtry %%DATADIR%%/sdk
 @dirrm %%DATADIR%%/samples
 %%NLS%%@dirrm %%DATADIR%%/nls
 @dirrm %%DATADIR%%/idl