svn commit: r391963 - in head/emulators: virtualbox-ose-additions virtualbox-ose-kmod

[Jung-uk Kim]

Author: jkim
Date: Mon Jul 13 21:15:50 2015
New Revision: 391963
URL: https://svnweb.freebsd.org/changeset/ports/391963

Log:
  Fix pre-build target to properly set environment variables.  Note there is
  no functional change but it is done for correctness.  Also, note the change
  is merged from emulators/virtualbox-ose (r355732).

Modified:
  head/emulators/virtualbox-ose-additions/Makefile
  head/emulators/virtualbox-ose-kmod/Makefile

Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	Mon Jul 13 21:09:51 2015	(r391962)
+++ head/emulators/virtualbox-ose-additions/Makefile	Mon Jul 13 21:15:50 2015	(r391963)
@@ -158,11 +158,8 @@ post-patch:
 .endif
 
 pre-build:
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
-		${WRKSRC}/env.sh \
-		${WRKSRC}/src/VBox/Additions/freebsd/Installer/vboxguest.sh
-	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}'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${KMODDIR}

Modified: head/emulators/virtualbox-ose-kmod/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-kmod/Makefile	Mon Jul 13 21:09:51 2015	(r391962)
+++ head/emulators/virtualbox-ose-kmod/Makefile	Mon Jul 13 21:15:50 2015	(r391963)
@@ -91,10 +91,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' ${WRKSRC}/configure
 
 pre-build:
-	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
-		${WRKSRC}/env.sh
-	cd ${WRKSRC} && ${SH} env.sh && cd ${WRKSRC}/src/VBox/HostDrivers && \
-	    ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}
+	cd ${WRKSRC}/src/VBox/HostDrivers && \
+	    ${SH} -c '. ${WRKSRC}/env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}'
 
 do-install:
 	${MKDIR} ${STAGEDIR}${KMODDIR}