Use ${SETENV} instead of bare `env'.

7 files changed, 14 insertions, 14 deletions

diff --git a/inputmethod/ibus-mozc/Makefile b/inputmethod/ibus-mozc/Makefile
index 7477b12a9aa..06699899baf 100644
--- a/inputmethod/ibus-mozc/Makefile
+++ b/inputmethod/ibus-mozc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2014/07/19 09:03:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2014/08/07 03:03:32 obache Exp $
 
 PKGNAME=	ibus-${DISTNAME}
 
@@ -11,7 +11,7 @@ DEPENDS+=	mozc-server-[0-9]*:../../inputmethod/mozc-server
 DEPENDS+=	mozc-tool-[0-9]*:../../inputmethod/mozc-tool
 
 do-build:
-	cd ${WRKSRC} && env ${MAKE_ENV} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
 			unix/ibus/ibus.gyp:ibus_mozc
 
diff --git a/inputmethod/mozc-elisp/Makefile b/inputmethod/mozc-elisp/Makefile
index d21d8e35f57..bf8df3689c0 100644
--- a/inputmethod/mozc-elisp/Makefile
+++ b/inputmethod/mozc-elisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/06/17 13:16:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.12 2014/08/07 03:03:32 obache Exp $
 #
 
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/mozc-/mozc-elisp-/}
@@ -11,7 +11,7 @@ EMACS_MODULES=	base leim
 INSTALLATION_DIRS=	${EMACS_LISPPREFIX} bin
 
 do-build:
-	cd ${WRKSRC} && env ${MAKE_ENV} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c Release ${_MAKE_JOBS} \
 			unix/emacs/emacs.gyp:mozc_emacs_helper
 	cd ${WRKSRC}/unix/emacs && \
diff --git a/inputmethod/mozc-renderer/Makefile b/inputmethod/mozc-renderer/Makefile
index a771732809e..05113d0b2dc 100644
--- a/inputmethod/mozc-renderer/Makefile
+++ b/inputmethod/mozc-renderer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/06/15 13:08:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/07 03:03:32 obache Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-renderer-/}
 
@@ -10,7 +10,7 @@ DEPENDS+=	xdg-utils-[0-9]*:../../misc/xdg-utils
 DEPENDS+=	mozc-server-[0-9]*:../../inputmethod/mozc-server
 
 do-build:
-	cd ${WRKSRC} && env ${MAKE_ENV} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
 			renderer/renderer.gyp:mozc_renderer
 
diff --git a/inputmethod/mozc-server/Makefile b/inputmethod/mozc-server/Makefile
index 82e9fd3f760..1191ad0c670 100644
--- a/inputmethod/mozc-server/Makefile
+++ b/inputmethod/mozc-server/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.20 2014/07/19 09:03:04 ryoon Exp $
+# $NetBSD: Makefile,v 1.21 2014/08/07 03:03:32 obache Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-server-/}
 
 INSTALLATION_DIRS+=	libexec
 
 do-build:
-	cd ${WRKSRC} && env ${MAKE_ENV} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} \
 		${_MAKE_JOBS} \
 			server/server.gyp:mozc_server
diff --git a/inputmethod/mozc-server/Makefile.common b/inputmethod/mozc-server/Makefile.common
index 18e26aa3c50..b0d8eb56db9 100644
--- a/inputmethod/mozc-server/Makefile.common
+++ b/inputmethod/mozc-server/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2014/07/19 09:03:04 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.12 2014/08/07 03:03:32 obache Exp $
 # used by inputmethod/ibus-mozc/Makefile
 # used by inputmethod/mozc-elisp/Makefile
 # used by inputmethod/mozc-server/Makefile
@@ -67,7 +67,7 @@ OSDEST=		linux
 MOZC_BUILD_MODE=	Release # or Debug
 
 do-configure:
-	cd ${WRKSRC} && env ${MAKE_ENV} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		GYP_DEFINES="use_libprotobuf=1" \
 		${PYTHONBIN} build_mozc.py \
 		gyp \
diff --git a/inputmethod/mozc-tool/Makefile b/inputmethod/mozc-tool/Makefile
index d3472305893..e0008a13e11 100644
--- a/inputmethod/mozc-tool/Makefile
+++ b/inputmethod/mozc-tool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/06/15 13:08:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2014/08/07 03:03:32 obache Exp $
 
 PKGNAME=	${DISTNAME:S/mozc-/mozc-tool-/}
 
@@ -7,7 +7,7 @@ INSTALLATION_DIRS+=	libexec
 ALL_ENV+=	qt_dir=${QTDIR}
 
 do-build:
-	cd ${WRKSRC} && env ${MAKE_ENV} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
 			gui/gui.gyp:mozc_tool
 
diff --git a/inputmethod/uim-mozc/Makefile b/inputmethod/uim-mozc/Makefile
index c3db3f96423..cbb5394af92 100644
--- a/inputmethod/uim-mozc/Makefile
+++ b/inputmethod/uim-mozc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/06/15 13:08:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2014/08/07 03:03:32 obache Exp $
 
 PKGNAME=	uim-${DISTNAME}
 
@@ -25,7 +25,7 @@ post-extract:
 	mv ${WRKDIR}/uim-mozc-334/scm ${WRKSRC}
 
 do-build:
-	cd ${WRKSRC} && env ${MAKE_ENV} \
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${PYTHONBIN} build_mozc.py build -c ${MOZC_BUILD_MODE} ${_MAKE_JOBS} \
 			unix/uim/uim.gyp:uim-mozc \
 			renderer/renderer.gyp:mozc_renderer