Index: mk/bsd.pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1952
diff -u -r1.1952 bsd.pkg.mk
--- mk/bsd.pkg.mk	22 Sep 2008 14:52:07 -0000	1.1952
+++ mk/bsd.pkg.mk	8 Dec 2008 12:38:20 -0000
@@ -51,10 +51,6 @@
 ############################################################################
 # Allow various phases to define the default variables
 ############################################################################
-.if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
-.  include "emulator/emulator.mk"
-.endif
-
 .include "features/features.mk"
 
 .include "flavor/bsd.flavor-vars.mk"
@@ -419,6 +415,11 @@
 # Tools
 .include "tools/bsd.tools.mk"
 
+# XXXUEBAYASI emulator/emulator.mk uses "file" command, so after tools
+.if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
+.  include "emulator/emulator.mk"
+.endif
+
 # Barrier
 .include "bsd.pkg.barrier.mk"
 
@@ -465,6 +466,7 @@
 _PATH_ORIG:=		${PATH}
 MAKEFLAGS+=		_PATH_ORIG=${_PATH_ORIG:Q}
 .endif
+_PATH_ORIG:=		# XXXUEBAYASI force empty
 
 .if !empty(PREPEND_PATH:M*)
 # This is very Special.  Because PREPEND_PATH is set with += in reverse order,
Index: mk/compiler/gcc.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/compiler/gcc.mk,v
retrieving revision 1.94
diff -u -r1.94 gcc.mk
--- mk/compiler/gcc.mk	16 Sep 2008 15:02:55 -0000	1.94
+++ mk/compiler/gcc.mk	8 Dec 2008 12:38:35 -0000
@@ -468,7 +468,7 @@
 .    else
 	${RUN}					\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
-	 ${ECHO} 'exec ${_GCCBINDIR}/${.TARGET:T} "$$@"';		\
+	 ${ECHO} 'exec ${TOOLS_SETENV} PATH=${_GCCBINDIR} ${_GCCBINDIR}/${.TARGET:T} "$$@"'; \
 	) > ${.TARGET}
 	${RUN}${CHMOD} +x ${.TARGET}
 .    endif
Index: mk/emulator/netbsd-compat.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/emulator/netbsd-compat.mk,v
retrieving revision 1.3
diff -u -r1.3 netbsd-compat.mk
--- mk/emulator/netbsd-compat.mk	31 Dec 2007 20:06:41 -0000	1.3
+++ mk/emulator/netbsd-compat.mk	8 Dec 2008 12:38:40 -0000
@@ -12,7 +12,7 @@
 #
 
 NATIVE_EXEC_FMT=	${_NATIVE_EXEC_FMT_cmd:sh}
-_NATIVE_EXEC_FMT_cmd=	sh ${.CURDIR}/../../mk/scripts/shlib-type	\
+_NATIVE_EXEC_FMT_cmd=	${SH} FILE_CMD=${TOOLS_FILE} ${.CURDIR}/../../mk/scripts/shlib-type	\
 				${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q}
 
 # Most NetBSD (i386) software need netbsd>=1.6
Index: mk/pkginstall/bsd.pkginstall.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/pkginstall/bsd.pkginstall.mk,v
retrieving revision 1.46
diff -u -r1.46 bsd.pkginstall.mk
--- mk/pkginstall/bsd.pkginstall.mk	4 Mar 2008 06:51:41 -0000	1.46
+++ mk/pkginstall/bsd.pkginstall.mk	8 Dec 2008 12:38:54 -0000
@@ -798,7 +798,7 @@
 #
 SHLIB_TYPE=		${_SHLIB_TYPE_cmd:sh}
 _SHLIB_TYPE_cmd=							\
-	sh ${.CURDIR}/../../mk/scripts/shlib-type			\
+	${SH} ${.CURDIR}/../../mk/scripts/shlib-type			\
 		${_OPSYS_SHLIB_TYPE:Q} ${PKG_INFO_CMD:Q}
 
 LDCONFIG_ADD_CMD?=		${_LDCONFIG_ADD_CMD.${OPSYS}}
Index: mk/scripts/shlib-type
===================================================================
RCS file: /cvsroot/pkgsrc/mk/scripts/shlib-type,v
retrieving revision 1.3
diff -u -r1.3 shlib-type
--- mk/scripts/shlib-type	2 Aug 2007 16:00:33 -0000	1.3
+++ mk/scripts/shlib-type	8 Dec 2008 12:39:00 -0000
@@ -10,10 +10,6 @@
 # path to determine the correct object format (either ELF or a.out).
 #
 
-if [ -z "${FILE_CMD}" ]; then
-	FILE_CMD=file
-fi
-
 if [ $# -lt 2 ]; then
 	echo 1>&2 "usage: shlib-type libformat binpath"
 	exit 1
Index: mk/tools/tools.NetBSD.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/tools.NetBSD.mk,v
retrieving revision 1.41
diff -u -r1.41 tools.NetBSD.mk
--- mk/tools/tools.NetBSD.mk	22 May 2008 20:11:55 -0000	1.41
+++ mk/tools/tools.NetBSD.mk	8 Dec 2008 12:39:02 -0000
@@ -111,7 +111,7 @@
 TOOLS_PLATFORM.test?=		test			# shell builtin
 TOOLS_PLATFORM.touch?=		/usr/bin/touch
 TOOLS_PLATFORM.tr?=		/usr/bin/tr
-TOOLS_PLATFORM.true?=		true			# shell builtin
+TOOLS_PLATFORM.true?=		:			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
Index: mk/wrapper/bsd.wrapper.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/wrapper/bsd.wrapper.mk,v
retrieving revision 1.76
diff -u -r1.76 bsd.wrapper.mk
--- mk/wrapper/bsd.wrapper.mk	19 Feb 2008 17:36:51 -0000	1.76
+++ mk/wrapper/bsd.wrapper.mk	8 Dec 2008 12:39:04 -0000
@@ -116,6 +116,7 @@
 .if !defined(_WRAP_PATH)
 _WRAP_PATH=	${PATH:S/${WRAPPER_BINDIR}://:S/:${WRAPPER_BINDIR}//}
 .endif
+_WRAP_PATH=	# XXXUEBAYASI force empty
 MAKEVARS+=	_WRAP_PATH
 
 # Generate wrapper scripts for the compiler tools.  These wrapper