sync [all but bsd.pkg.mk] with HEAD

13 files changed, 183 insertions, 159 deletions

diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index ebd8072c45f..2bbcde28a25 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,7 +1,22 @@
-# $NetBSD: AIX.mk,v 1.4.2.5 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: AIX.mk,v 1.4.2.6 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
+CPP?=		${LOCALBASE}/bin/cpp
+ECHO_N?=	${ECHO} -n
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# and remove this comment.
+RSH?=		/usr/bin/rsh
+# AIX strip fails too easily.  Use a wrapper script instead
+.if exists(${LOCALBASE}/bin/strip)
+STRIP?=     ${LOCALBASE}/bin/strip
+.endif
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
 CAT?=		/bin/cat
@@ -10,12 +25,10 @@ CHOWN?=		/usr/bin/chown
 CHGRP?=		/usr/bin/chgrp
 CMP?=		/usr/bin/cmp
 CP?=		/bin/cp
-CPP?=		${LOCALBASE}/bin/cpp
 CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 .if exists(${LOCALBASE}/bin/gegrep)
 EGREP?=		${LOCALBASE}/bin/gegrep
 .else
@@ -48,7 +61,6 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
 GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP?=		-9
 GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
@@ -76,14 +88,9 @@ PERL5?=		${LOCALBASE}/bin/perl
 .else
 PERL5?=		/usr/bin/perl
 .endif
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
 .if exists(${LOCALBASE}/bin/nbsed)
 SED?=		${LOCALBASE}/bin/nbsed
 .else
@@ -93,11 +100,6 @@ SETENV?=	/usr/bin/env
 SH?=		/bin/sh
 SHLOCK=		/usr/bin/shlock
 SORT?=		/usr/bin/sort
-# AIX strip fails too easily.  Use a wrapper script instead
-.if exists(${LOCALBASE}/bin/strip)
-STRIP?=     ${LOCALBASE}/bin/strip
-.endif
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 .if exists(${LOCALBASE}/bin/tar)
 TAR?=		${LOCALBASE}/bin/tar
@@ -110,9 +112,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
@@ -138,8 +140,7 @@ IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
 IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
 IMAKE_MANNEWSUFFIX=	0
 
-_DO_SHLIB_CHECKS=	no	# fixup PLIST for shared libs/run ldconfig
-                 	  	# doesn't work on AIX b/c no ldd.
+_DO_SHLIB_CHECKS=	yes
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 .if exists(/usr/include/netinet6)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index e3ef654bca8..750d9d95238 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,7 +1,23 @@
-# $NetBSD: BSDOS.mk,v 1.4.2.3 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.4.2.4 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
+#CPP=		/usr/bin/cpp
+# BSD/OS doesn't have c++ command
+.if !exists(${CXX})
+CXX=		/usr/bin/g++
+.endif
+ECHO_N?=	${ECHO} -n
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# and remove this comment.
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+# sh doesn't have built-in type
+TYPE?=		which
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
 CAT?=		/bin/cat
@@ -10,16 +26,10 @@ CHOWN?=		/usr/sbin/chown
 CHGRP?=		/usr/bin/chgrp
 CMP?=		/usr/bin/cmp
 CP?=		/bin/cp
-#CPP=		/usr/bin/cpp
-# BSD/OS doesn't have c++ command
-.if !exists(${CXX})
-CXX=		/usr/bin/g++
-.endif
 CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 EGREP?=		/bin/egrep
 EXPR?=		/bin/expr
 FALSE?=		false				# Shell builtin
@@ -39,7 +49,6 @@ GTAR?=		/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/contrib/bin/gunzip -f
 GZCAT?=		/usr/contrib/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/contrib/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
@@ -61,14 +70,9 @@ PATCH?=		/usr/contrib/bin/patch
 # native /bin/pax doesn't support -O
 PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
 SED?=		/usr/bin/sed
 SETENV?=	/usr/bin/env
 # native sh and ksh both have problems under BSD/OS 4.3.1
@@ -76,7 +80,6 @@ SETENV?=	/usr/bin/env
 SH?=		/bin/bash
 SHLOCK=		${LOCALBASE}/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 .if exists(/bin/tar)
 TAR?=		/bin/tar
@@ -89,10 +92,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/usr/bin/tsort
-# sh doesn't have built-in type
-TYPE?=		which
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index a381b3092bc..793c40b4d12 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,7 +1,22 @@
-# $NetBSD: Darwin.mk,v 1.4.2.3 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: Darwin.mk,v 1.4.2.4 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
+.if !defined(CPP) || ${CPP} == "cpp"
+CPP=		${CC} -E ${CPP_PRECOMP_FLAGS}
+.endif
+ECHO_N?=	${ECHO} -n
+LDD?=		/usr/bin/otool -L
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# and remove this comment.
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+IMAKEOPTS+=	-DBuildHtmlManPages=NO
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
 CAT?=		/bin/cat
@@ -10,14 +25,10 @@ CHOWN?=		/usr/sbin/chown
 CHGRP?=		/usr/bin/chgrp
 CMP?=		/usr/bin/cmp
 CP?=		/bin/cp
-.if !defined(CPP) || ${CPP} == "cpp"
-CPP=		${CC} -E ${CPP_PRECOMP_FLAGS}
-.endif
 CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/bin/egrep
 EXPR?=		/bin/expr
 FALSE?=		false				# Shell builtin
@@ -29,15 +40,12 @@ GREP?=		/usr/bin/grep
 GTAR?=		/usr/bin/gnutar	
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
 ID?=		/usr/bin/id
 IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+=	-DBuildHtmlManPages=NO
 LDCONFIG?=	/sbin/ldconfig
-LDD?=		/usr/bin/otool -L
 LN?=		/bin/ln
 LS?=		/bin/ls
 M4?=		/usr/bin/m4 
@@ -53,20 +61,14 @@ PAX?=		${LOCALBASE}/bin/pax
 PAX?=		/bin/pax
 .endif
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
 SED?=		/usr/bin/sed
 SETENV?=	/usr/bin/env
 SH?=		/bin/sh
 SHLOCK=		/usr/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 .if exists(${LOCALBASE}/bin/tar)
 TAR?=		${LOCALBASE}/bin/tar
@@ -79,9 +81,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 .if !defined(PKGSRC_COMPILER) || !empty(PKGSRC_COMPILER:Mgcc)
 CPP_PRECOMP_FLAGS?=	-no-cpp-precomp	# use the GNU cpp, not the OS X cpp
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 2469f270765..8187a79970c 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,10 +1,19 @@
-# $NetBSD: DragonFly.mk,v 1.4.2.4 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: DragonFly.mk,v 1.4.2.5 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
+BRANDELF?=	/usr/bin/brandelf		# used by linux compat layer
+ECHO_N?=	${ECHO} -n
+IMAKEOPTS+=	-DBuildHtmlManPages=NO
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
-BRANDELF?=	/usr/bin/brandelf		# used by linux compat layer
 CAT?=		/bin/cat
 CHMOD?=		/bin/chmod
 CHOWN?=		/usr/sbin/chown
@@ -15,7 +24,6 @@ CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/bin/egrep
 EXPR?=		/bin/expr
 FALSE?=		/usr/bin/false
@@ -31,13 +39,11 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
 ID?=		/usr/bin/id
 IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+=	-DBuildHtmlManPages=NO
 LDCONFIG?=	/sbin/ldconfig
 LN?=		/bin/ln
 LS?=		/bin/ls
@@ -58,18 +64,14 @@ PAX?=		${LOCALBASE}/bin/pax
 PAX?=		/bin/pax
 .endif
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-RSH?=		/usr/bin/rsh
 SED?=		/usr/bin/sed
 SETENV?=	/usr/bin/env
 SH?=		/bin/sh
 SHLOCK=		/usr/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 .if exists(${LOCALBASE}/bin/tar)
 TAR?=		${LOCALBASE}/bin/tar
@@ -82,9 +84,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		/usr/bin/true
 TSORT?=		/usr/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
@@ -128,7 +130,6 @@ _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
-_OPSYS_LIBTOOL_REQD=	1.5.10nb9
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	no	# native patch(1) can make backups
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index d894cc62043..d1d2ff7be50 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,7 +1,16 @@
-# $NetBSD: FreeBSD.mk,v 1.4.2.3 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: FreeBSD.mk,v 1.4.2.4 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
+ECHO_N?=	${ECHO} -n
+IMAKEOPTS+=	-DBuildHtmlManPages=NO
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
 BRANDELF?=	/usr/bin/brandelf		# used by linux compat layer
@@ -15,7 +24,6 @@ CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/bin/egrep
 EXPR?=		/bin/expr
 FALSE?=		false				# Shell builtin
@@ -31,13 +39,11 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
 ID?=		/usr/bin/id
 IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+=	-DBuildHtmlManPages=NO
 LDCONFIG?=	/sbin/ldconfig
 LN?=		/bin/ln
 LS?=		/bin/ls
@@ -58,18 +64,14 @@ PAX?=		${LOCALBASE}/bin/pax
 PAX?=		/bin/pax
 .endif
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-RSH?=		/usr/bin/rsh
 SED?=		/usr/bin/sed
 SETENV?=	/usr/bin/env
 SH?=		/bin/sh
 SHLOCK=		/usr/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 .if exists(${LOCALBASE}/bin/tar)
 TAR?=		${LOCALBASE}/bin/tar
@@ -82,9 +84,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		0022
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index 20d0b47851e..3977517a8d7 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,7 +1,17 @@
-# $NetBSD: IRIX.mk,v 1.6.2.3 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: IRIX.mk,v 1.6.2.4 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
+ECHO_N?=	${ECHO} -n
+IMAKEOPTS+=	-DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
+IMAKEOPTS+=	-DManUsr=${PREFIX}
+PKGLOCALEDIR?=	share
+PS?=		/sbin/ps
+RSH?=		/usr/bsd/rsh
+SU?=		/sbin/su
+TYPE?=		/sbin/type
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/nawk
 BASENAME?=	/sbin/basename
 CAT?=		/sbin/cat
@@ -14,7 +24,6 @@ CUT?=		/usr/bin/cut
 DATE?=		/sbin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo			# Shell builtin
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/bin/egrep
 EXPR?=		/bin/expr
 FALSE?=		false			# Shell builtin
@@ -36,14 +45,11 @@ GZCAT?=		/usr/sbin/gzcat
 .else
 GZCAT?=		/usr/bsd/zcat
 .endif
-GZIP?=		-9
 GZIP_CMD?=	/usr/sbin/gzip -nf ${GZIP}
 HEAD?=		/usr/bsd/head
 HOSTNAME_CMD?=	/usr/bsd/hostname
 ID?=		/usr/bin/id
 IMAKE?=		/usr/bin/X11/imake ${IMAKEOPTS}
-IMAKEOPTS+=	-DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
-IMAKEOPTS+=	-DManUsr=${PREFIX}
 LDCONFIG?=	/usr/bin/true
 LN?=		/sbin/ln
 LS?=		/sbin/ls
@@ -67,18 +73,14 @@ PATCH?=		/usr/sbin/patch -b
 .endif
 PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/sbin/ps
 PWD_CMD?=	/sbin/pwd		# needs to print physical path
 RM?=		/sbin/rm
 RMDIR?=		/usr/bin/rmdir
-RSH?=		/usr/bsd/rsh
 SED?=		/sbin/sed
 SETENV?=	/sbin/env
 SH?=		/bin/ksh
 SHLOCK=		${LOCALBASE}/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/sbin/su
 TAIL?=		/usr/bin/tail
 TAR?=		${LOCALBASE}/bin/tar
 TEE?=		/usr/bin/tee
@@ -87,9 +89,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true			# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		/sbin/type
 WC?=		/sbin/wc
 XARGS?=		/sbin/xargs
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
@@ -160,7 +162,7 @@ PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 CONFIGURE_ENV+=		ABI=${ABI}
 MAKE_ENV+=		ABI=${ABI}
 
-LIBABISUFFIX=		${ABI}
+LIBABISUFFIX?=		${ABI}
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index 470d0634a04..114c0867a94 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.13.2.3 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: Interix.mk,v 1.13.2.4 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -33,12 +33,23 @@
 #   (main lib)	0x48000000
 # zsh		*
 
+BULK_PREREQ+=	converters/libiconv devel/gettext-lib pkgtools/pkg_install-info
 BULK_PREREQ+=	lang/gawk sysutils/coreutils
 
 # "catinstall" not yet supported as there's no shipped [gn]roff
 MANINSTALL=	maninstall
 MAKE_FLAGS+=	MKCATPAGES=no NOLINT=1
 
+ECHO_N?=	/bin/printf %s			# does not support "echo -n"
+IMAKEOPTS+=	-DBuildHtmlManPages=NO
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+RSH?=		/usr/bin/rsh
+SU?=		/bin/su
+TYPE?=		type				# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+
 # Use some pkgsrc versions as "better" replacements, if installed
 .if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk)
 AWK?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
@@ -46,9 +57,6 @@ AWK?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
 .if exists(${LOCALBASE}/bin/gtar)
 GTAR?=		${LOCALBASE}/bin/gtar
 .endif
-.if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort)
-SORT?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort
-.endif
 
 AWK?=		/usr/contrib/bin/gawk
 BASENAME?=	/bin/basename
@@ -62,7 +70,6 @@ CUT?=		/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	/bin/printf %s			# does not support "echo -n"
 EGREP?=		/bin/egrep
 EXPR?=		/bin/expr
 FALSE?=		false				# Shell builtin
@@ -74,13 +81,11 @@ GREP?=		/bin/grep
 GTAR?=		${LOCALBASE}/bin/tar
 GUNZIP_CMD?=	/usr/contrib/bin/gunzip -f
 GZCAT?=		/usr/contrib/bin/gunzip -c
-GZIP?=		-9
 GZIP_CMD?=	/usr/contrib/bin/gzip -nf ${GZIP}
 HEAD?=		/bin/head
 HOSTNAME_CMD?=	/bin/hostname
 ID?=		/bin/id
 IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+=	-DBuildHtmlManPages=NO
 LDCONFIG?=	/bin/true
 LN?=		/bin/ln
 LS?=		/bin/ls
@@ -93,18 +98,14 @@ NICE?=		/bin/nice
 PATCH?=		${LOCALBASE}/bin/gpatch
 PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-RSH?=		/usr/bin/rsh
 SED?=		${LOCALBASE}/bin/nbsed
 SETENV?=	/bin/env
 SH?=		/bin/sh
 SHLOCK=		${LOCALBASE}/bin/shlock
 SORT?=		/bin/sort
-SU?=		/bin/su
 TAIL?=		/bin/tail
 TAR?=		${LOCALBASE}/bin/tar
 TEE?=		/bin/tee
@@ -113,9 +114,9 @@ TOUCH?=		/bin/touch
 TR?=		/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/bin/wc
 XARGS?=		/bin/xargs
+.endif
 
 USERADD?=		${LOCALBASE}/sbin/useradd
 GROUPADD?=		${LOCALBASE}/sbin/groupadd
@@ -138,7 +139,7 @@ ROOT_GROUP?=		131616 # +Administrators or native language equivalent
 TOUCH_FLAGS?=
 ULIMIT_CMD_datasize?=	ulimit -d `ulimit -H -d`
 ULIMIT_CMD_stacksize?=	ulimit -s `ulimit -H -s`
-ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
+ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 
 # imake installs manpages in weird places
 IMAKE_MAN_SOURCE_PATH=	man/man
@@ -164,7 +165,6 @@ _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
-_OPSYS_LIBTOOL_REQD=	1.5.10nb4
 _OPSYS_PERL_REQD=	5.8.3nb1 # base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type - not exactly true, but near enough
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index d371f534c89..4a84ff6e9f9 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,7 +1,18 @@
-# $NetBSD: Linux.mk,v 1.5.2.4 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: Linux.mk,v 1.5.2.5 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
+ECHO_N?=	${ECHO} -n
+IMAKEOPTS+=	-DBuildHtmlManPages=NO
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# and remove this comment.
+RSH?=		/usr/bin/rsh
+SU?=		/bin/su
+TYPE?=		type			# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 .if exists(/bin/basename)
 BASENAME?=	/bin/basename
@@ -22,7 +33,6 @@ CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 .if exists(/bin/egrep)
 EGREP?=		/bin/egrep
 .elif exists(/usr/bin/egrep)
@@ -60,7 +70,6 @@ GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 GZIP_CMD?=	/bin/gzip -nf ${GZIP}
 .endif
 GZCAT?=		/bin/zcat
-GZIP?=		-9
 .if exists(/bin/head)
 HEAD?=		/bin/head
 .else
@@ -73,7 +82,6 @@ ID?=		/bin/id
 ID?=		/usr/bin/id
 .endif
 IMAKE?=		${X11BASE}/bin/imake ${IMAKEOPTS}
-IMAKEOPTS+=	-DBuildHtmlManPages=NO
 LDCONFIG?=	/sbin/ldconfig
 LN?=		/bin/ln
 LS?=		/bin/ls
@@ -94,14 +102,9 @@ NICE?=		/usr/bin/nice
 PATCH?=		/usr/bin/patch
 PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
 .if exists(/bin/sed)
 SED?=		/bin/sed
 .elif exists(/usr/bin/sed)
@@ -115,7 +118,6 @@ SORT?=		/bin/sort
 .else
 SORT?=		/usr/bin/sort
 .endif
-SU?=		/bin/su
 TAIL?=		/usr/bin/tail
 TAR?=		${LOCALBASE}/bin/tar
 TEE?=		/usr/bin/tee
@@ -128,9 +130,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true			# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		type			# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs -r
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
@@ -165,6 +167,7 @@ IMAKE_MISCMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}7
 IMAKE_MANNEWSUFFIX=	${IMAKE_MAN_SUFFIX}
 
 _DO_SHLIB_CHECKS=	no	# on installation, fixup PLIST for shared libs
+_IMAKE_TOOLS=		gmake	# extra tools required when we use imake
 _IMAKE_MAKE=		${GMAKE}	# program which gets invoked by imake
 .if exists(/usr/include/netinet6) || exists(/usr/include/linux/in6.h)
 _OPSYS_HAS_INET6=	yes	# IPv6 is standard
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index ce26a625ce8..d6eac49cab8 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,7 +1,19 @@
-# $NetBSD: NetBSD.mk,v 1.5.2.2 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: NetBSD.mk,v 1.5.2.3 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
+# Needed for 1.6.1 and earlier due to rpcgen bugs and paths
+.if defined(CPP) && ${CPP} == "cpp"
+CPP=		/usr/bin/cpp
+.endif
+ECHO_N?=	${ECHO} -n
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
 CAT?=		/bin/cat
@@ -10,15 +22,10 @@ CHOWN?=		/usr/sbin/chown
 CHGRP?=		/usr/bin/chgrp
 CMP?=		/usr/bin/cmp
 CP?=		/bin/cp
-# Needed for 1.6.1 and earlier due to rpcgen bugs and paths
-.if defined(CPP) && ${CPP} == "cpp"
-CPP=		/usr/bin/cpp
-.endif
 CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/bin/egrep
 EXPR?=		/bin/expr
 FALSE?=		false				# Shell builtin
@@ -34,12 +41,15 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
 ID?=		/usr/bin/id
+.if exists(/sbin/ldconfig)
 LDCONFIG?=	/sbin/ldconfig
+.else
+LDCONFIG?=	true
+.endif
 LN?=		/bin/ln
 LS?=		/bin/ls
 M4?=		/usr/bin/m4
@@ -51,18 +61,14 @@ NICE?=		/usr/bin/nice
 PATCH?=		/usr/bin/patch
 PAX?=		/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-RSH?=		/usr/bin/rsh
 SED?=		/usr/bin/sed
 SETENV?=	/usr/bin/env
 SH?=		/bin/sh
 SHLOCK=		/usr/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 .if exists(/bin/tar)
 TAR?=		/bin/tar
@@ -75,9 +81,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 .if exists(/usr/sbin/user)
 USERADD?=	/usr/sbin/useradd
@@ -134,7 +140,6 @@ _OPSYS_HAS_INET6=	no	# IPv6 is not standard
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
-_OPSYS_LIBTOOL_REQD=	1.5.10nb6
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
diff --git a/mk/platform/OSF1.mk b/mk/platform/OSF1.mk
index e4ff9844133..6766857658a 100644
--- a/mk/platform/OSF1.mk
+++ b/mk/platform/OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.mk,v 1.1.2.2 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: OSF1.mk,v 1.1.2.3 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the OSF1 operating system.
 
@@ -9,6 +9,16 @@
 #	echo="set -v" quiet="set +v" filter="set +v" \
 #	echoFlag=v errFlag=e
 
+CPP?=		/usr/bin/cpp
+ECHO_N?=	${SETENV} CMD_ENV=bsd /usr/bin/echo -n
+FETCH_CMD?= ${LOCALBASE}/bin/ftp
+PKGLOCALEDIR=	share
+PS?=		/bin/ps
+STRIP?=		/usr/bin/strip
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
 CAT?=		/bin/cat
@@ -17,16 +27,13 @@ CHOWN?=		/bin/chown
 CHGRP?=		/usr/bin/chgrp
 CMP?=		/usr/bin/cmp
 CP?=		/bin/cp
-CPP?=		/usr/bin/cpp
 CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		/usr/bin/echo				
-ECHO_N?=	${SETENV} CMD_ENV=bsd /usr/bin/echo -n
 EGREP?=		/usr/bin/grep -E
 EXPR?=		/bin/expr
 FALSE?=		false				# Shell builtin
-FETCH_CMD?= ${LOCALBASE}/bin/ftp
 FGREP?=		/usr/bin/grep -F
 FILE_CMD?=	/usr/bin/file
 FIND?=		/usr/bin/find
@@ -39,7 +46,6 @@ GTAR?=/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
@@ -61,8 +67,6 @@ PERL5?=		${LOCALBASE}/bin/perl
 .else
 PERL5?=		/usr/bin/perl
 .endif
-PKGLOCALEDIR=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
@@ -71,8 +75,6 @@ SETENV?=	/usr/bin/env
 SH?=		/bin/ksh			# recommendend on Tru64
 #SHLOCK=	${LOCALBASE}/bin/shlock		# need to make this work
 SORT?=		/usr/bin/sort
-STRIP?=		/usr/bin/strip
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 TAR?=		/usr/bin/tar
 TEE?=		/usr/bin/tee
@@ -81,9 +83,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 USERADD?=	/usr/sbin/useradd
 GROUPADD?=	/usr/sbin/groupadd
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 67c1ac235b7..3d6cbc6b036 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,7 +1,17 @@
-# $NetBSD: OpenBSD.mk,v 1.7.2.3 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: OpenBSD.mk,v 1.7.2.4 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
+ECHO_N?=	${ECHO} -n
+PKGLOCALEDIR?=	share
+PS?=		/bin/ps
+# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# and remove this comment.
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+TYPE?=		type				# Shell builtin
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/awk
 BASENAME?=	/usr/bin/basename
 CAT?=		/bin/cat
@@ -14,7 +24,6 @@ CUT?=		/usr/bin/cut
 DATE?=		/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		echo				# Shell builtin
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/bin/egrep
 EXPR?=		/bin/expr
 FGREP?=		/usr/bin/fgrep
@@ -30,7 +39,6 @@ GTAR?=		/usr/bin/tar
 .endif
 GUNZIP_CMD?=	/usr/bin/gunzip -f
 GZCAT?=		/usr/bin/gzcat
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 HEAD?=		/usr/bin/head
 HOSTNAME_CMD?=	/bin/hostname
@@ -47,20 +55,14 @@ NICE?=		/usr/bin/nice
 PATCH?=		/usr/bin/patch
 PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	share
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/bin/rm
 RMDIR?=		/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
 SED?=		/usr/bin/sed
 SETENV?=	/usr/bin/env
 SH?=		/bin/sh
 SHLOCK=		${LOCALBASE}/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 .if exists(/bin/tar)
 TAR?=		/bin/tar
@@ -73,9 +75,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		true				# Shell builtin
 TSORT?=		/usr/bin/tsort
-TYPE?=		type				# Shell builtin
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 .if exists(/usr/sbin/user)
 USERADD?=	/usr/sbin/useradd
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 220daeb0535..16afffac362 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,7 +1,17 @@
-# $NetBSD: SunOS.mk,v 1.7.2.2 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: SunOS.mk,v 1.7.2.3 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
+ECHO_N?=	${ECHO} -n
+PKGLOCALEDIR?=	lib
+PS?=		/bin/ps
+# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# and remove this comment.
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+TYPE?=		/usr/bin/type
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/nawk
 BASENAME?=	/usr/bin/basename
 CAT?=		/usr/bin/cat
@@ -14,7 +24,6 @@ CUT?=		/usr/bin/cut
 DATE?=		/usr/xpg4/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		/usr/ucb/echo
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/xpg4/bin/grep -E
 EXPR?=		/usr/xpg4/bin/expr
 FALSE?=		/usr/bin/false
@@ -31,12 +40,10 @@ GTAR?=		${LOCALBASE}/bin/tar
 .if exists(${LOCALBASE}/bin/gzip)
 GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
 GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP?=		-9
 GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
 .elif exists(/usr/bin/gzip)
 GUNZIP_CMD?=	/usr/bin/gzip -df
 GZCAT?=		/usr/bin/gzip -cd
-GZIP?=		-9
 GZIP_CMD?=	/usr/bin/gzip -nf ${GZIP}
 .endif
 HEAD?=		/usr/bin/head
@@ -59,14 +66,9 @@ PATCH?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
 .endif
 PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	lib
-PS?=		/bin/ps
 PWD_CMD?=	/bin/pwd	# needs to print physical path
 RM?=		/usr/bin/rm
 RMDIR?=		/usr/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
 .if exists(${LOCALBASE}/bin/nbsed)
 SED?=		${LOCALBASE}/bin/nbsed
 .else
@@ -76,7 +78,6 @@ SETENV?=	/usr/bin/env
 SH?=		/bin/ksh
 SHLOCK=		${LOCALBASE}/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/xpg4/bin/tail
 TAR?=		${LOCALBASE}/bin/tar
 TEE?=		/usr/bin/tee
@@ -85,9 +86,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		/usr/bin/true
 TSORT?=		/usr/ccs/bin/tsort
-TYPE?=		/usr/bin/type
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index 377b4b92592..1964ec9ddc8 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,7 +1,17 @@
-# $NetBSD: UnixWare.mk,v 1.4.2.3 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: UnixWare.mk,v 1.4.2.4 2005/05/17 18:29:46 tv Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
+ECHO_N?=	${ECHO} -n
+PKGLOCALEDIR?=	lib
+PS?=		/usr/bin/ps
+# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
+# and remove this comment.
+RSH?=		/usr/bin/rsh
+SU?=		/usr/bin/su
+TYPE?=		/usr/bin/type
+
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AWK?=		/usr/bin/nawk
 BASENAME?=	/usr/bin/basename
 CAT?=		/usr/bin/cat
@@ -14,7 +24,6 @@ CUT?=		/usr/bin/cut
 DATE?=		/usr/bin/date
 DIRNAME?=	/usr/bin/dirname
 ECHO?=		/usr/ucb/echo
-ECHO_N?=	${ECHO} -n
 EGREP?=		/usr/bin/grep -E
 EXPR?=		/usr/bin/expr
 FALSE?=		/usr/bin/false
@@ -31,12 +40,10 @@ GTAR?=		${LOCALBASE}/bin/tar
 .if exists(${LOCALBASE}/bin/gzip)
 GUNZIP_CMD?=	${LOCALBASE}/bin/gunzip -f
 GZCAT?=		${LOCALBASE}/bin/zcat
-GZIP?=		-9
 GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
 .elif exists(/usr/local/bin/gzip)
 GUNZIP_CMD?=	/usr/local/bin/gzip -df
 GZCAT?=		/usr/local/bin/gzip -cd
-GZIP?=		-9
 GZIP_CMD?=	/usr/local/bin/gzip -nf ${GZIP}
 .endif
 HEAD?=		/usr/bin/head
@@ -55,14 +62,9 @@ NICE?=		/usr/bin/nice
 PATCH?=		${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}patch
 PAX?=		${LOCALBASE}/bin/pax
 PERL5?=		${LOCALBASE}/bin/perl
-PKGLOCALEDIR?=	lib
-PS?=		/usr/bin/ps
 PWD_CMD?=	/usr/bin/pwd	# needs to print physical path
 RM?=		/usr/bin/rm
 RMDIR?=		/usr/bin/rmdir
-# XXX: default from bsd.pkg.defaults.mk.  Verify/corerct for this platform
-# and remove this comment.
-RSH?=		/usr/bin/rsh
 .if exists(${LOCALBASE}/bin/nbsed)
 SED?=		${LOCALBASE}/bin/nbsed
 .else
@@ -72,7 +74,6 @@ SETENV?=	/usr/bin/env
 SH?=		/usr/bin/ksh
 SHLOCK=		${LOCALBASE}/bin/shlock
 SORT?=		/usr/bin/sort
-SU?=		/usr/bin/su
 TAIL?=		/usr/bin/tail
 TAR?=		${LOCALBASE}/bin/tar
 TEE?=		/usr/bin/tee
@@ -81,9 +82,9 @@ TOUCH?=		/usr/bin/touch
 TR?=		/usr/bin/tr
 TRUE?=		/usr/bin/true
 TSORT?=		/usr/ccs/bin/tsort
-TYPE?=		/usr/bin/type
 WC?=		/usr/bin/wc
 XARGS?=		/usr/bin/xargs
+.endif
 
 CPP_PRECOMP_FLAGS?=	# unset
 DEF_UMASK?=		022