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	9 Dec 2008 03:24:11 -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"
@@ -397,10 +393,10 @@
 # phases of a pkgsrc build.
 #
 USE_TOOLS+=								\
-	[ awk basename cat chgrp chmod chown cmp cp cut dirname echo	\
-	egrep env false file find grep head hostname id install ln ls	\
-	mkdir mv printf pwd rm rmdir sed sh sort			\
-	tail test touch tr true	wc xargs
+	[ ar awk basename cat chgrp chmod chown cmp cp cut dirname echo	\
+	egrep env false file find grep head hostname id install ldd ln ls	\
+	mkdir mv printf pwd ranlib rm rmdir sed sh sort			\
+	tail test touch tr true	uname uniq wc xargs
 
 # bsd.wrapper.mk
 USE_TOOLS+=	expr
@@ -419,6 +415,11 @@
 # Tools
 .include "tools/bsd.tools.mk"
 
+# XXXUEBAYASI emulator/emulator.mk uses "file" command, so put 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.95
diff -u -r1.95 gcc.mk
--- mk/compiler/gcc.mk	16 Nov 2008 17:01:53 -0000	1.95
+++ mk/compiler/gcc.mk	9 Dec 2008 03:24:11 -0000
@@ -413,6 +413,13 @@
 F77PATH=	${_GCCBINDIR}/${_GCC_BIN_PREFIX}g77
 PKG_FC:=	${_GCC_FC}
 .endif
+.if exists(${_GCCBINDIR}/${_GCC_BIN_PREFIX}ld)
+_GCC_VARS+=	LD
+_GCC_LD=	${_GCC_DIR}/bin/${_GCC_BIN_PREFIX}ld
+_ALIASES.LD=	ld
+LDPATH=		${_GCCBINDIR}/${_GCC_BIN_PREFIX}ld
+PKG_LD:=	${_GCC_LD}
+.endif
 _COMPILER_STRIP_VARS+=	${_GCC_VARS}
 
 # Pass the required flags to imake to tell it we're using gcc on Solaris.
@@ -457,6 +464,8 @@
 
 # Create compiler driver scripts in ${WRKDIR}.
 GCC_USE_SYMLINKS?=	no
+# XXXUEBAYASI set PATH because gcc calls ${_GCCBINDIR}/as
+_GCC_CMD=	${TOOLS_SETENV} PATH=${_GCCBINDIR} ${_GCCBINDIR}/${.TARGET:T} "$$@"
 .for _var_ in ${_GCC_VARS}
 .  if !target(${_GCC_${_var_}})
 override-tools: ${_GCC_${_var_}}
@@ -466,14 +475,14 @@
 	${RUN}${RM} -f ${.TARGET}
 	${RUN}${LN} -s ${_GCCBINDIR}/${.TARGET:T} ${.TARGET}
 .    else
-	${RUN}					\
+	${RUN}								\
 	(${ECHO} '#!${TOOLS_SHELL}';					\
-	 ${ECHO} 'exec ${_GCCBINDIR}/${.TARGET:T} "$$@"';		\
+	 ${ECHO} 'exec ${_GCC_CMD}';					\
 	) > ${.TARGET}
 	${RUN}${CHMOD} +x ${.TARGET}
 .    endif
 .    for _alias_ in ${_ALIASES.${_var_}:S/^/${.TARGET:H}\//}
-	${RUN}					\
+	${RUN}								\
 	if [ ! -x "${_alias_}" ]; then					\
 		${LN} -f -s ${.TARGET:T} ${_alias_};			\
 	fi
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	9 Dec 2008 03:24:12 -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} ${.CURDIR}/../../mk/scripts/shlib-type	\
 				${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q}
 
 # Most NetBSD (i386) software need netbsd>=1.6
Index: mk/flavor/pkg/metadata.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/flavor/pkg/metadata.mk,v
retrieving revision 1.30
diff -u -r1.30 metadata.mk
--- mk/flavor/pkg/metadata.mk	21 May 2008 20:39:52 -0000	1.30
+++ mk/flavor/pkg/metadata.mk	9 Dec 2008 03:24:12 -0000
@@ -51,16 +51,12 @@
 	${RUN}${ECHO} "BUILD_HOST=${_BUILD_HOST_cmd:sh}" >> ${.TARGET}.tmp
 .if !empty(CHECK_SHLIBS_SUPPORTED:M[yY][eE][sS])
 	${RUN}								\
-	case ${LDD:Q}"" in						\
-	"")	ldd=`${TYPE} ldd 2>/dev/null | ${AWK} '{ print $$NF }'` ;; \
-	*)	ldd=${LDD:Q} ;;						\
-	esac;								\
 	bins=`${AWK} '/(^|\/)(bin|sbin|libexec)\// { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
 	case ${OBJECT_FMT:Q}"" in					\
 	ELF)								\
 		libs=`${AWK} '/(^|\/)lib\/lib.*\.so\.[0-9]+$$/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
 		if ${TEST} -n "$$bins" -o -n "$$libs"; then		\
-			requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \
+			requires=`(${TOOLS_LDD} $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '$$2 == "=>" && $$3 ~ "/" { print $$3 }' | ${SORT} -u`; \
 		fi;							\
 		linklibs=`${AWK} '/.*\.so\.[0-9\.]+$$/ { print "${DESTDIR}${PREFIX}/" $$0 }' ${_PLIST_NOKEYWORDS}`; \
 		for i in $$linklibs; do					\
@@ -74,7 +70,7 @@
 	Mach-O)								\
 		libs=`${AWK} '/(^|\/)lib\/lib.*\.dylib/ { print "${DESTDIR}${PREFIX}/" $$0 } END { exit 0 }' ${_PLIST_NOKEYWORDS}`; \
 		if ${TEST} "$$bins" != "" -o "$$libs" != ""; then	\
-			requires=`($$ldd $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '/compatibility version/ { print $$1 }' | ${SORT} -u`; \
+			requires=`(${TOOLS_LDD} $$bins $$libs 2>/dev/null || ${TRUE}) | ${AWK} '/compatibility version/ { print $$1 }' | ${SORT} -u`; \
 		fi;							\
 		;;							\
 	esac;								\
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	9 Dec 2008 03:24:13 -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	9 Dec 2008 03:24:13 -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/defaults.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/tools/defaults.mk,v
retrieving revision 1.55
diff -u -r1.55 defaults.mk
--- mk/tools/defaults.mk	15 Nov 2008 20:20:44 -0000	1.55
+++ mk/tools/defaults.mk	9 Dec 2008 03:24:14 -0000
@@ -52,6 +52,7 @@
 
 # "TOOL" variable names associated with each of the tools
 
+_TOOLS_VARNAME.ar=		AR
 _TOOLS_VARNAME.awk=		AWK
 _TOOLS_VARNAME.basename=	BASENAME
 _TOOLS_VARNAME.bash=		BASH
@@ -99,6 +100,7 @@
 _TOOLS_VARNAME.imake=		IMAKE
 _TOOLS_VARNAME.install=		INSTALL
 _TOOLS_VARNAME.install-info=	INSTALL_INFO
+_TOOLS_VARNAME.ldd=		LDD
 _TOOLS_VARNAME.lex=		LEX
 _TOOLS_VARNAME.lha=		LHA
 _TOOLS_VARNAME.ln=		LN
@@ -120,6 +122,7 @@
 _TOOLS_VARNAME.pod2man=		POD2MAN
 _TOOLS_VARNAME.printf=		PRINTF
 _TOOLS_VARNAME.pwd=		PWD_CMD
+_TOOLS_VARNAME.ranlib=		RANLIB
 _TOOLS_VARNAME.rm=		RM
 _TOOLS_VARNAME.rmdir=		RMDIR
 _TOOLS_VARNAME.rpm2pkg=		RPM2PKG
@@ -139,6 +142,8 @@
 _TOOLS_VARNAME.tr=		TR
 _TOOLS_VARNAME.true=		TRUE
 _TOOLS_VARNAME.tsort=		TSORT
+_TOOLS_VARNAME.uname=		UNAME
+_TOOLS_VARNAME.uniq=		UNIQ
 _TOOLS_VARNAME.unrar=		UNRAR
 _TOOLS_VARNAME.unzip=		UNZIP_CMD
 _TOOLS_VARNAME.unzoo=		UNZOO
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	9 Dec 2008 03:24:14 -0000
@@ -3,6 +3,7 @@
 # System-supplied tools for the NetBSD operating system.
 
 TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.ar?=		/usr/bin/ar
 TOOLS_PLATFORM.awk?=		/usr/bin/awk
 TOOLS_PLATFORM.basename?=	/usr/bin/basename
 TOOLS_PLATFORM.byacc?=		/usr/bin/yacc
@@ -58,6 +59,7 @@
 TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 .endif
 TOOLS_PLATFORM.ksh?=		/bin/ksh
+TOOLS_PLATFORM.ldd?=		/usr/bin/ldd
 TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
@@ -80,6 +82,7 @@
 TOOLS_PLATFORM.pax?=		/bin/pax
 TOOLS_PLATFORM.printf?=		/usr/bin/printf
 TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.ranlib?=		/usr/bin/ranlib
 .if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 TOOLS_PLATFORM.readelf?=	/usr/bin/readelf
 .else
@@ -111,8 +114,10 @@
 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.uname?=		/usr/bin/uname
+TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
 .if exists(/usr/bin/xgettext)
Index: mk/wrapper/bsd.wrapper.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/wrapper/bsd.wrapper.mk,v
retrieving revision 1.80
diff -u -r1.80 bsd.wrapper.mk
--- mk/wrapper/bsd.wrapper.mk	27 Nov 2008 18:00:06 -0000	1.80
+++ mk/wrapper/bsd.wrapper.mk	9 Dec 2008 03:24:14 -0000
@@ -116,6 +116,8 @@
 .if !defined(_WRAP_PATH)
 _WRAP_PATH=	${PATH:S/${WRAPPER_BINDIR}://:S/:${WRAPPER_BINDIR}//}
 .endif
+_WRAP_PATH=				# XXXUEBAYASI force empty
+_WRAP_PATH=	${TOOLS_DIR}/bin	# XXXUEBAYASI
 MAKEVARS+=	_WRAP_PATH
 
 # Generate wrapper scripts for the compiler tools.  These wrapper