mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

- Fix plist when both PYTHON and WEBSERVICE options are disabled. [1]

Browse Source 
- Build and install correctly when DEBUG option is enabled. [2]

Reported by:	Mike Jakubik <mike.jakubik@intertainservices.com> [1]
PR:		ports/190227 [1]
Reported by:	Ron Thomas <ron@vopenhouse.ca> [2]
Tested by:	Ron Thomas <ron@vopenhouse.ca> [2]
This commit is contained in:
Jung-uk Kim 2014-05-29 19:18:03 +00:00
parent ab3c047ab5
commit 9b415edf29
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=355732
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
emulators/virtualbox-ose/Makefile
View File

@ -158,6 +158,12 @@ USE_XORG= xcursor xmu inputproto xinerama
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

4
emulators/virtualbox-ose/pkg-plist
View File

@ -658,8 +658,8 @@ lib/virtualbox/components/VirtualBox_XPCOM.xpt
%%PYTHON%%@dirrm %%DATADIR%%/sdk/bindings/xpcom/python
%%PYTHON%%@dirrm %%DATADIR%%/sdk/bindings/xpcom
%%WEBSERVICE%%@dirrm %%DATADIR%%/sdk/bindings/webservice
@dirrmtry %%DATADIR%%/sdk/bindings
@dirrmtry %%DATADIR%%/sdk
%%SDK%%@dirrm %%DATADIR%%/sdk/bindings
%%SDK%%@dirrm %%DATADIR%%/sdk
@dirrm %%DATADIR%%/samples
%%NLS%%@dirrm %%DATADIR%%/nls
@dirrm %%DATADIR%%/idl