Correctly sanitize environment.

5 files changed, 12 insertions, 13 deletions

diff --git a/devel/ninja-build/Makefile b/devel/ninja-build/Makefile
index 698cb29f513..b7996d0bfb6 100644
--- a/devel/ninja-build/Makefile
+++ b/devel/ninja-build/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/09/08 09:41:08 obache Exp $
+# $NetBSD: Makefile,v 1.3 2014/11/27 13:38:15 joerg Exp $
 
 NINJAVER=	1.5.1
 DISTNAME=	ninja-${NINJAVER}
@@ -22,7 +22,7 @@ SUBST_VARS.prefix=	PREFIX
 INSTALLATION_DIRS=	bin share/doc/ninja share/ninja
 
 do-build:
-	cd ${WRKSRC} && ${PYTHONBIN} ./bootstrap.py --verbose
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} ./bootstrap.py --verbose
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ninja \
diff --git a/devel/ocaml-cmdliner/Makefile b/devel/ocaml-cmdliner/Makefile
index 305dabb7451..efa1ef7dbb4 100644
--- a/devel/ocaml-cmdliner/Makefile
+++ b/devel/ocaml-cmdliner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/10/09 20:07:36 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2014/11/27 13:38:15 joerg Exp $
 
 PKGNAME=	ocaml-${DISTNAME}
 DISTNAME=	cmdliner-0.9.4
@@ -23,7 +23,7 @@ PLIST.opt=	yes
 .endif
 
 do-build:
-	cd ${WRKSRC} && ./pkg/build ${OPTARG}
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./pkg/build ${OPTARG}
 
 do-install:
 	for i in `cat ${WRKSRC}/cmdliner.program`; do \
diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile
index 34b9d98b5a2..389d29d4b9c 100644
--- a/devel/ocaml-react/Makefile
+++ b/devel/ocaml-react/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/10/09 21:38:49 jaapb Exp $
+# $NetBSD: Makefile,v 1.7 2014/11/27 13:38:15 joerg Exp $
 
 DISTNAME=	react-1.2.0
 CATEGORIES=	devel
@@ -23,9 +23,9 @@ INSTALLATION_DIRS+=	${OCAML_SITELIBDIR}/react
 
 do-build:
 .if ${OCAML_USE_OPT_COMPILER} == yes
-	cd ${WRKSRC} && ocaml pkg/build.ml native=true native-dynlink=true
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ocaml pkg/build.ml native=true native-dynlink=true
 .else
-	cd ${WRKSRC} && ocaml pkg/build.ml
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ocaml pkg/build.ml
 .endif
 
 do-install:
diff --git a/shells/mksh/Makefile b/shells/mksh/Makefile
index d980a3e0028..14e083ef61d 100644
--- a/shells/mksh/Makefile
+++ b/shells/mksh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/10/09 14:06:56 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2014/11/27 13:38:15 joerg Exp $
 
 DISTNAME=			mksh-R50d
 PKGNAME=			${DISTNAME:S/-R/-/}
@@ -24,8 +24,7 @@ LIBS.Interix+=			-lcrypt
 INSTALLATION_DIRS=		bin ${PKGMANDIR}/man1 share/examples/mksh
 
 do-build:
-	cd ${WRKBUILD} && LIBS=${LIBS:Q} CC=${CC:Q} CFLAGS=${CFLAGS:Q} \
-	    CPPFLAGS=${CPPFLAGS:Q} LDFLAGS=${LDFLAGS:Q} \
+	cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} LIBS=${LIBS:Q} \
 	    ${TOOLS_SHELL} ${WRKSRC}/Build.sh -r
 
 do-install:
diff --git a/textproc/ocaml-uutf/Makefile b/textproc/ocaml-uutf/Makefile
index 8df08586fa4..aefbf09f55e 100644
--- a/textproc/ocaml-uutf/Makefile
+++ b/textproc/ocaml-uutf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/11/06 14:47:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2014/11/27 13:38:15 joerg Exp $
 
 DISTNAME=	uutf-0.9.3
 CATEGORIES=	textproc
@@ -17,9 +17,9 @@ OCAML_USE_FINDLIB=	yes
 
 do-build:
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
-	cd ${WRKSRC} && ./pkg/build true
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./pkg/build true
 .else
-	cd ${WRKSRC} && ./pkg/build false
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./pkg/build false
 .endif
 
 do-install: