From owner-svn-ports-all@FreeBSD.ORG Fri May 23 23:45:24 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AA97E6D; Fri, 23 May 2014 23:45:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B2D9225B; Fri, 23 May 2014 23:45:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4NNjNTQ024955; Fri, 23 May 2014 23:45:23 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4NNjNYr024951; Fri, 23 May 2014 23:45:23 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201405232345.s4NNjNYr024951@svn.freebsd.org> From: Jung-uk Kim Date: Fri, 23 May 2014 23:45:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354967 - head/emulators/virtualbox-ose X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2014 23:45:24 -0000 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 +@dirrmtry %%DATADIR%%/sdk/bindings +@dirrmtry %%DATADIR%%/sdk @dirrm %%DATADIR%%/samples %%NLS%%@dirrm %%DATADIR%%/nls @dirrm %%DATADIR%%/idl