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

[Jung-uk Kim]

Author: jkim
Date: Thu May 29 19:18:03 2014
New Revision: 355732
URL: http://svnweb.freebsd.org/changeset/ports/355732
QAT: https://qat.redports.org/buildarchive/r355732/

Log:
  - Fix plist when both PYTHON and WEBSERVICE options are disabled. [1]
  - Build and install correctly when DEBUG option is enabled. [2]
  
  Reported by:	Mike Jakubik <mike.jakubik at intertainservices.com> [1]
  PR:		ports/190227 [1]
  Reported by:	Ron Thomas <ron at vopenhouse.ca> [2]
  Tested by:	Ron Thomas <ron at vopenhouse.ca> [2]

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

Modified: head/emulators/virtualbox-ose/Makefile
==============================================================================
--- head/emulators/virtualbox-ose/Makefile	Thu May 29 19:03:19 2014	(r355731)
+++ head/emulators/virtualbox-ose/Makefile	Thu May 29 19:18:03 2014	(r355732)
@@ -158,6 +158,12 @@ USE_XORG=	xcursor xmu inputproto xineram
 VBOX_FRONTENDS+=VBoxSDL
 .endif
 
+.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MWEBSERVICE}
+PLIST_SUB+=	SDK=""
+.else
+PLIST_SUB+=	SDK="@comment "
+.endif
+
 .if ${ARCH} == i386
 KMK_ARCH=	freebsd.x86
 PLIST_SUB+=	I386=""
@@ -241,12 +247,9 @@ post-patch:
 	@${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 
-pre-build:
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/env.sh
-
 do-build:
-	cd ${WRKSRC} && ${SH} env.sh && \
-	    ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}
+	cd ${WRKSRC} && \
+	    ${SH} -c '. 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

Modified: head/emulators/virtualbox-ose/pkg-plist
==============================================================================
--- head/emulators/virtualbox-ose/pkg-plist	Thu May 29 19:03:19 2014	(r355731)
+++ head/emulators/virtualbox-ose/pkg-plist	Thu May 29 19:18:03 2014	(r355732)
@@ -658,8 +658,8 @@ lib/virtualbox/components/VirtualBox_XPC
 %%PYTHON%%@dirrm %%DATADIR%%/sdk/bindings/xpcom/python
 %%PYTHON%%@dirrm %%DATADIR%%/sdk/bindings/xpcom
 %%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings/webservice
- at dirrmtry %%DATADIR%%/sdk/bindings
- at dirrmtry %%DATADIR%%/sdk
+%%SDK%%@dirrm %%DATADIR%%/sdk/bindings
+%%SDK%%@dirrm %%DATADIR%%/sdk
 @dirrm %%DATADIR%%/samples
 %%NLS%%@dirrm %%DATADIR%%/nls
 @dirrm %%DATADIR%%/idl