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

105 files changed, 4676 insertions, 854 deletions

diff --git a/mk/AIX.pkg.dist b/mk/AIX.pkg.dist
index f8c42d5adc5..dafd3414416 100644
--- a/mk/AIX.pkg.dist
+++ b/mk/AIX.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: AIX.pkg.dist,v 1.25.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: AIX.pkg.dist,v 1.25.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -584,6 +584,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -692,6 +696,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -990,8 +998,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/BSDOS.pkg.dist b/mk/BSDOS.pkg.dist
index 3180fa032af..5734049c881 100644
--- a/mk/BSDOS.pkg.dist
+++ b/mk/BSDOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: BSDOS.pkg.dist,v 1.25.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: BSDOS.pkg.dist,v 1.25.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -584,6 +584,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -692,6 +696,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -990,8 +998,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/Darwin.pkg.dist b/mk/Darwin.pkg.dist
index 832958056f3..602ebabf44c 100644
--- a/mk/Darwin.pkg.dist
+++ b/mk/Darwin.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Darwin.pkg.dist,v 1.60.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: Darwin.pkg.dist,v 1.60.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -630,6 +630,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -742,6 +746,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1038,8 +1046,6 @@
             ..
 	    sv_SE.ISO_8859-1
             ..
-	    uk_UA.ISO_8859-1
-	    ..
 	    uk_UA.KOI8-U
 	    ..
         ..
diff --git a/mk/DragonFly.pkg.dist b/mk/DragonFly.pkg.dist
index fd47ba3c82d..e53c26f2735 100644
--- a/mk/DragonFly.pkg.dist
+++ b/mk/DragonFly.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: DragonFly.pkg.dist,v 1.1.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: DragonFly.pkg.dist,v 1.1.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -629,6 +629,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -741,6 +745,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1039,8 +1047,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/FreeBSD.pkg.dist b/mk/FreeBSD.pkg.dist
index fd3d1680713..64a39ef2e51 100644
--- a/mk/FreeBSD.pkg.dist
+++ b/mk/FreeBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: FreeBSD.pkg.dist,v 1.51.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: FreeBSD.pkg.dist,v 1.51.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -629,6 +629,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -741,6 +745,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1039,8 +1047,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/IRIX.pkg.dist b/mk/IRIX.pkg.dist
index 067c7bfffe9..6cbaf25deef 100644
--- a/mk/IRIX.pkg.dist
+++ b/mk/IRIX.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.pkg.dist,v 1.50.2.4 2005/02/11 15:27:56 tv Exp $
+# $NetBSD: IRIX.pkg.dist,v 1.50.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -629,6 +629,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -741,6 +745,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1039,8 +1047,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/Interix.pkg.dist b/mk/Interix.pkg.dist
index 30e6cd0ec8b..66149a6eedc 100644
--- a/mk/Interix.pkg.dist
+++ b/mk/Interix.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Interix.pkg.dist,v 1.15.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: Interix.pkg.dist,v 1.15.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uid=197108 gid=131616 mode=0775
@@ -630,6 +630,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -738,6 +742,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1036,8 +1044,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/Linux.pkg.dist b/mk/Linux.pkg.dist
index 59b465f0df9..165542ef3e8 100644
--- a/mk/Linux.pkg.dist
+++ b/mk/Linux.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Linux.pkg.dist,v 1.67.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: Linux.pkg.dist,v 1.67.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -630,6 +630,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -742,6 +746,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1038,8 +1046,6 @@
             ..
 	    sv_SE.ISO_8859-1
             ..
-	    uk_UA.ISO_8859-1
-	    ..
 	    uk_UA.KOI8-U
 	    ..
         ..
diff --git a/mk/NetBSD.pkg.dist b/mk/NetBSD.pkg.dist
index 476c08baf6d..3888253a77b 100644
--- a/mk/NetBSD.pkg.dist
+++ b/mk/NetBSD.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: NetBSD.pkg.dist,v 1.78.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: NetBSD.pkg.dist,v 1.78.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -630,6 +630,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -738,6 +742,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1036,8 +1044,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/OSF1.pkg.dist b/mk/OSF1.pkg.dist
index 2789687ae83..fbf689fe5a9 100644
--- a/mk/OSF1.pkg.dist
+++ b/mk/OSF1.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.pkg.dist,v 1.1.2.4 2005/02/11 15:27:56 tv Exp $
+# $NetBSD: OSF1.pkg.dist,v 1.1.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
@@ -629,6 +629,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -741,6 +745,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1039,8 +1047,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/OpenBSD.pkg.dist b/mk/OpenBSD.pkg.dist
index dfbcf667d80..13e95886dd8 100644
--- a/mk/OpenBSD.pkg.dist
+++ b/mk/OpenBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: OpenBSD.pkg.dist,v 1.50.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: OpenBSD.pkg.dist,v 1.50.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
@@ -629,6 +629,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -741,6 +745,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1039,8 +1047,6 @@
             ..
 	    uk_UA.KOI8-U
 	    ..
-	    uk_UA.ISO_8859-1
-	    ..
         ..
         skel
         ..
diff --git a/mk/SunOS.pkg.dist b/mk/SunOS.pkg.dist
index 09c8dbf5c72..e57345e49c7 100644
--- a/mk/SunOS.pkg.dist
+++ b/mk/SunOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: SunOS.pkg.dist,v 1.72.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: SunOS.pkg.dist,v 1.72.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -190,6 +190,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -302,6 +306,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1042,8 +1050,6 @@
             ..
 	    sv_SE.ISO_8859-1
             ..
-	    uk_UA.ISO_8859-1
-	    ..
 	    uk_UA.KOI8-U
 	    ..
         ..
diff --git a/mk/UnixWare.pkg.dist b/mk/UnixWare.pkg.dist
index ea646090cce..a480fe1e78f 100644
--- a/mk/UnixWare.pkg.dist
+++ b/mk/UnixWare.pkg.dist
@@ -1,6 +1,6 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
 #	NetBSD: SunOS.pkg.dist,v 1.64 2004/04/01 12:19:09 jmmv Exp
-#	$NetBSD: UnixWare.pkg.dist,v 1.9.2.4 2005/02/11 15:27:56 tv Exp $
+#	$NetBSD: UnixWare.pkg.dist,v 1.9.2.5 2005/05/17 18:29:44 tv Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
@@ -191,6 +191,10 @@
                 LC_MESSAGES
                 ..
             ..
+            fy
+                LC_MESSAGES
+                ..
+            ..
             ga
                 LC_MESSAGES
                 ..
@@ -303,6 +307,10 @@
                 LC_MESSAGES
                 ..
             ..
+            mt
+                LC_MESSAGES
+                ..
+            ..
             my_MM
                 LC_MESSAGES
                 ..
@@ -1043,8 +1051,6 @@
             ..
 	    sv_SE.ISO_8859-1
             ..
-	    uk_UA.ISO_8859-1
-	    ..
 	    uk_UA.KOI8-U
 	    ..
         ..
diff --git a/mk/apache.mk b/mk/apache.mk
index 89014807a22..e44c4040517 100644
--- a/mk/apache.mk
+++ b/mk/apache.mk
@@ -1,10 +1,10 @@
-# $NetBSD: apache.mk,v 1.6.4.1 2005/01/10 16:15:25 tv Exp $
+# $NetBSD: apache.mk,v 1.6.4.2 2005/05/17 18:29:44 tv Exp $
 #
 # This Makefile fragment handles Apache dependencies and make variables,
 # and is meant to be included by packages that require Apache either at
 # build-time or at run-time.  apache.mk will:
 #
-#	* set PKG_APACHE to the name of the apache web serverused
+#	* set PKG_APACHE to the name of the apache web server used
 #
 #	* add a full dependency on the apache server
 #
@@ -120,36 +120,20 @@ _APACHE_BL_SRCDIR=	${_APACHE_PKGSRCDIR}
 
 _APACHE_BL_SRCDIR?=	../../www/apache
 
-_APACHE_DEPENDENCY?=	${BUILDLINK_DEPENDS.${_PKG_APACHE}}:${_APACHE_PKGSRCDIR}
-
 # Add a runtime dependency on the apache server.
 # This may or may not create an actual dependency depending on
 # what the apache buildlink[23].mk file does.
 #
 .if defined(_APACHE_PKGSRCDIR)
-.  if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
-.    include "${_APACHE_BL_SRCDIR}/buildlink3.mk"
-.  else
-DEPENDS+=		${_APACHE_DEPENDENCY}
-.  endif
+.  include "${_APACHE_BL_SRCDIR}/buildlink3.mk"
 .endif
 
 # If we are building apache modules, then we might need a build-time
 # dependency on apr, and the apache sources?
 #
-.if defined(_APACHE_PKGSRCDIR)
-.  if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
-.    include "${_APACHE_BL_SRCDIR}/buildlink3.mk"
-.  else
-BUILD_DEPENDS+=		${_APACHE_DEPENDENCY}
-.  endif
-.endif
-
 .if ${_PKG_APACHE} == "apache2"
 .  if defined(USE_APR) && !empty(USE_APR:M[yY][eE][sS])
-.    if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
-.      include "../../devel/apr/buildlink3.mk"
-.    endif
+.    include "../../devel/apr/buildlink3.mk"
 .  endif
 .endif
 
diff --git a/mk/autoconf.mk b/mk/autoconf.mk
index 17875fbdca0..3f09cd6a498 100644
--- a/mk/autoconf.mk
+++ b/mk/autoconf.mk
@@ -1,4 +1,4 @@
-# $NetBSD: autoconf.mk,v 1.6 2004/10/29 12:30:20 darcy Exp $
+# $NetBSD: autoconf.mk,v 1.6.2.1 2005/05/17 18:29:44 tv Exp $
 #
 # makefile fragment for packages that use autoconf
 # AUTOCONF_REQD can be set to the minimum version required.
@@ -15,21 +15,32 @@ AUTOCONF_MK=	# defined
 # minimal required version
 AUTOCONF_REQD?= 2.50
 
+.include "../../mk/bsd.prefs.mk"
+
 .if empty(AUTOCONF_REQD:M2.1[0-9]*)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=		autoconf
+.  else
 BUILD_DEPENDS+=		autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
 AUTOCONF=		${LOCALBASE}/bin/autoconf
 AUTORECONF=		${LOCALBASE}/bin/autoreconf
 AUTOHEADER=		${LOCALBASE}/bin/autoheader
+.  endif
 .else
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=		autoconf213
+.  else
 BUILD_DEPENDS+=		autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
 AUTOCONF=		${LOCALBASE}/bin/autoconf-2.13
 AUTORECONF=		${LOCALBASE}/bin/autoreconf-2.13
 AUTOHEADER=		${LOCALBASE}/bin/autoheader-2.13
-.  if defined(USE_LIBTOOL)
+.    if defined(USE_LIBTOOL)
 pre-configure: do-libtool-m4-override
+.    endif
 .  endif
 .endif
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 # LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
 # will be created.  The libtool.m4 is only created if a GNU configure
 # script exists at that location.
@@ -56,5 +67,6 @@ do-libtool-m4-override:
 		fi;							\
 	done
 .endfor
+.endif
 
 .endif # AUTOCONF_MK
diff --git a/mk/automake.mk b/mk/automake.mk
index 9de113c080c..a73ca1ddedd 100644
--- a/mk/automake.mk
+++ b/mk/automake.mk
@@ -1,4 +1,4 @@
-# $NetBSD: automake.mk,v 1.8 2004/08/13 14:19:24 wiz Exp $
+# $NetBSD: automake.mk,v 1.8.4.1 2005/05/17 18:29:44 tv Exp $
 #
 # makefile fragment for packages that use automake
 # AUTOMAKE_REQD can be set to the minimum version required.
@@ -16,16 +16,27 @@ AUTOMAKE_MK=	# defined
 # minimal required version
 AUTOMAKE_REQD?= 1.9
 
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(AUTOMAKE_REQD:M1.4*)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=		automake14
+.  else
 BUILD_DEPENDS+=		automake14>=${AUTOMAKE_REQD}:../../devel/automake14
 _AUTOMAKE_API_VERSION=	1.4
 AUTOCONF_REQD?=		2.13
+.  endif
 .else
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_TOOLS+=		automake
+.  else
 BUILD_DEPENDS+=		automake>=${AUTOMAKE_REQD}:../../devel/automake
 _AUTOMAKE_API_VERSION=	1.9
 AUTOCONF_REQD?=		2.58
+.  endif
 .endif
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 AUTOMAKE=		${LOCALBASE}/bin/automake-${_AUTOMAKE_API_VERSION}
 ACLOCAL=		${LOCALBASE}/bin/aclocal-${_AUTOMAKE_API_VERSION}
 
@@ -34,4 +45,5 @@ BUILD_DEPENDS+=		{gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
 .endif
 
 .include "../mk/autoconf.mk"
+.endif
 .endif # AUTOMAKE_MK
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk
index b9deb2c4ed7..830c1667c25 100644
--- a/mk/bsd.options.mk
+++ b/mk/bsd.options.mk
@@ -1,54 +1,42 @@
-# $NetBSD: bsd.options.mk,v 1.9.4.4 2005/01/24 18:03:01 tv Exp $
+# $NetBSD: bsd.options.mk,v 1.9.4.5 2005/05/17 18:29:44 tv Exp $
 #
 # This Makefile fragment provides boilerplate code for standard naming
 # conventions for handling per-package build options.
 #
-# Before including this file, the following variables should be defined:
+# Before including this file, the following variables can be defined:
 #
-#	PKG_OPTIONS_VAR
-#		This is a list of the name of the make(1) variables that
-#		contain the options the user wishes to select.  This
-#		variable should be set in a package Makefile.  E.g.,
-#
-#			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
-#		or
-#			PKG_OPTIONS_VAR=	FOO_OPTIONS BAR_OPTIONS
-#
-#	PKG_SUPPORTED_OPTIONS
+#	PKG_SUPPORTED_OPTIONS (must be defined)
 #		This is a list of build options supported by the package.
 #		This variable should be set in a package Makefile.  E.g.,
 #
 #			PKG_SUPPORTED_OPTIONS=	kerberos ldap ssl
 #
-# Optionally, the following variables may also be defined:
+#	PKG_OPTION_VAR (must be defined)
+#               The variable the user can set to enable or disable
+#		options specifically for this package.
+#
+#	PKG_SUGGESTED_OPTIONS (defaults to empty)
+#		This is a list of build options which are enabled by default.
+#
+#	PKG_OPTION_LEGACY_VARS
+#               This is a list of USE_VARIABLE:option pairs that
+#		map legacy /etc/mk.conf variables to their option
+#		counterparts.
+#		
+#
+# Optionally, the user may define the following variables in /etc/mk.conf:
 #
 #	PKG_DEFAULT_OPTIONS
-#		This is a list the options that should be built into
-#		every package, if that option is supported.  This
-#		variable should be set in /etc/mk.conf.
-#
-#	${PKG_OPTIONS_VAR} (the variables named in PKG_OPTIONS_VAR)
-#		These variables list the selected build options and
-#		override any default options given in PKG_DEFAULT_OPTIONS.
-#		If any of the options begin with a '-', then that option
-#		is always removed from the selected build options, e.g.
-#
-#			PKG_DEFAULT_OPTIONS=	kerberos ldap sasl
-#			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
-#			WIBBLE_OPTIONS=		${PKG_DEFAULT_OPTIONS} -sasl
-#			# implies PKG_OPTIONS == "kerberos ldap"
-#		or
-#			PKG_OPTIONS_VAR=	WIBBLE_OPTIONS
-#			WIBBLE_OPTIONS=		kerberos -ldap ldap
-#			# implies PKG_OPTIONS == "kerberos"
-#
-#		This variable should be set in /etc/mk.conf.
-#
-#	PKG_FAIL_UNSUPPORTED_OPTIONS
-#		If this is set to "yes", then the presence of unsupported
-#		options in PKG_OPTIONS.<pkg> (see below) causes the build
-#		to fail.  Set this to "no" to silently ignore unsupported
-#		options.  Default: "no".
+#               This variable can be used to override default
+#		options for every package.  Options listed in this
+#		variable will be enabled in every package that
+#		supports them.  If you prefix an option with `-',
+#		it will be disabled in every package.
+#
+#	${PKG_OPTIONS_VAR}
+#		This variable can be used to override default
+#		options and options listed in PKG_DEFAULT_OPTIONS.
+#		The syntax is the same as PKG_DEFAULT_OPTIONS.
 #
 # After including this file, the following variables are defined:
 #
@@ -59,27 +47,23 @@
 # Example usage:
 #
 # -------------8<-------------8<-------------8<-------------8<-------------
-# # Global and legacy options
-# .if defined(WIBBLE_USE_OPENLDAP) && !empty(WIBBLE_USE_OPENLDAP:M[yY][eE][sS])
-# PKG_DEFAULT_OPTIONS+=	ldap
-# .endif
-# .if defined(WIBBLE_USE_SASL2) && !empty(WIBBLE_USE_SASL2:M[yY][eE][sS])
-# PKG_DEFAULT_OPTIONS+=	sasl
-# .endif
+# PKG_SUPPORTED_OPTIONS=	foo ldap sasl
+# PKG_SUGGESTED_OPTIONS=		foo
+# PKG_OPTIONS_LEGACY_VARS+=	WIBBLE_USE_OPENLDAP:ldap
+# PKG_OPTIONS_LEGACY_VARS+=	WIBBLE_USE_SASL2:sasl
 #
-# PKG_OPTIONS_VAR=		PKG_OPTIONS.wibble
-# PKG_SUPPORTED_OPTIONS=	ldap sasl
-# #
-# # Default options for ``wibble'' package.
-# #
-# .if !defined(PKG_OPTIONS.wibble)
-# PKG_DEFAULT_OPTIONS+=		sasl
-# .endif
 # .include "../../mk/bsd.options.mk"
 #
 # # Package-specific option-handling
 #
 # ###
+# ### FOO support
+# ###
+# .if !empty(PKG_OPTIONS:Mfoo)
+# CONFIGURE_ARGS+=	--enable-foo
+# .endif
+
+# ###
 # ### LDAP support
 # ###
 # .if !empty(PKG_OPTIONS:Mldap)
@@ -98,67 +82,44 @@
 
 .include "../../mk/bsd.prefs.mk"
 
+# Define PKG_OPTIONS, no matter if we have an error or not, to suppress
+# further make(1) warnings.
+PKG_OPTIONS=		# empty
+
 # Check for variable definitions required before including this file.
 .if !defined(PKG_SUPPORTED_OPTIONS)
 PKG_FAIL_REASON+=	"bsd.options.mk: PKG_SUPPORTED_OPTIONS is not defined."
-.endif
-.if !defined(PKG_OPTIONS_VAR)
+.elif !defined(PKG_OPTIONS_VAR)
 PKG_FAIL_REASON+=	"bsd.options.mk: PKG_OPTIONS_VAR is not defined."
-.endif
-
-# If none of the variables listed in PKG_OPTIONS_VAR is defined, then use
-# the global options provided in ${PKG_DEFAULT_OPTIONS}.
-#
-_PKG_DEFAULT_OPTIONS=	# empty
-.for _opt_ in ${PKG_DEFAULT_OPTIONS}
-.  if !empty(PKG_SUPPORTED_OPTIONS:M${_opt_})
-_PKG_DEFAULT_OPTIONS+=	${_opt_}
-.  endif
-.endfor
-.undef _opt_
-_PKG_OPTIONS_VAR=	# empty
-.for _var_ in ${PKG_OPTIONS_VAR}
-.  if defined(${_var_})
-_PKG_OPTIONS_VAR+=	${_var_}
-.  endif
-.endfor
-.undef _var_
-.if empty(_PKG_OPTIONS_VAR)
-_PKG_OPTIONS_VAR=	_PKG_DEFAULT_OPTIONS
-.endif
+.else # process the rest of the file
 
-# If this is set to "yes", then the presence of unsupported options in
-# the variable named by ${PKG_OPTIONS_VAR} causes the build to fail.  Set
-# this to "no" to silently ignore unsupported options.
-#
-PKG_FAIL_UNSUPPORTED_OPTIONS?=	no
+# include deprecated variable to options mapping
+.include "${.CURDIR}/../../mk/defaults/obsolete.mk"
 
-# Separate out the selected options into "positive" and "negative" lists.
-_PKG_YES_OPTIONS=	# contains the "positive" options
-.for _var_ in ${_PKG_OPTIONS_VAR}
-_PKG_YES_OPTIONS+=	${${_var_}:N-*}
-.endfor
-_PKG_NO_OPTIONS=	# contains the "negative" options
-.for _var_ in ${_PKG_OPTIONS_VAR}
-_PKG_NO_OPTIONS+=	${${_var_}:M-*:S/^-//}
+.for _m_ in ${PKG_OPTIONS_LEGACY_VARS}
+.if !empty(PKG_SUPPORTED_OPTIONS:M${_m_:C/.*://}) && defined(${_m_:C/:.*//}) && !empty(${_m_:C/:.*//}:M[yY][eE][sS])
+_PKG_LEGACY_OPTIONS+=${_m_:C/.*://}
+_DEPRECATED_WARNING+="Deprecated variable "${_m_:C/:.*//:Q}" used, use PKG_DEFAULT_OPTIONS+="${_m_:C/.*://:Q}" instead."
+.endif
 .endfor
-.undef _var_
 
-# Filter out unsupported and duplicate build options and store the result
-# in PKG_OPTIONS.  We keep all of the "positive" options first, then remove
-# all of the "negative" options last, so "negative" options always have
-# the strongest effect.
 #
-PKG_OPTIONS=		# empty
-.for _opt_ in ${_PKG_YES_OPTIONS}
-.  if empty(_PKG_NO_OPTIONS:M${_opt_}) && empty(PKG_OPTIONS:M${_opt_})
-.    if !empty(PKG_SUPPORTED_OPTIONS:M${_opt_})
-PKG_OPTIONS+=		${_opt_}
-.    elif !empty(PKG_FAIL_UNSUPPORTED_OPTIONS:M[yY][eE][sS])
-PKG_FAIL_REASON+=	"\"${_opt_}\" is not a supported build option."
-.    endif
+# process options from generic to specific
+#
+PKG_OPTIONS:=	# empty
+.for _o_ in ${PKG_SUGGESTED_OPTIONS} ${_PKG_LEGACY_OPTIONS} \
+	${PKG_DEFAULT_OPTIONS} ${${PKG_OPTIONS_VAR}}
+_opt_:=		${_o_}
+#  ,--- this variable is a work around for a bug documented in the
+#  |    regress/make-quoting package, testcase bug1.
+_popt_:=	${_o_:C/^-//}	# popt == plain option
+.  if !empty(_opt_:M-*)
+PKG_OPTIONS:=	${PKG_OPTIONS:N${_popt_}}
+.  elif !empty(PKG_SUPPORTED_OPTIONS:M${_popt_})
+PKG_OPTIONS:=	${PKG_OPTIONS} ${_popt_}
 .  endif
 .endfor
+PKG_OPTIONS:=	${PKG_OPTIONS:O:u}
 
 _PKG_OPTIONS_WORDWRAP_FILTER=						\
 	${AWK} '							\
@@ -176,21 +137,21 @@ _PKG_OPTIONS_WORDWRAP_FILTER=						\
 		END { if (length(line) > 0) print "	"line }		\
 	'
 
-.if !defined(_PKG_OPTIONS_AVAILABLE) && defined(PKG_SUPPORTED_OPTIONS) && !empty(PKG_SUPPORTED_OPTIONS)
-_PKG_OPTIONS_AVAILABLE!=	${ECHO} ${PKG_SUPPORTED_OPTIONS} | ${XARGS} -n 1 | ${SORT}
-.endif
-.if !defined(_PKG_OPTIONS_DEFAULT) && defined(PKG_DEFAULT_OPTIONS) && !empty(PKG_DEFAULT_OPTIONS)
-_PKG_OPTIONS_DEFAULT!=		${ECHO} ${PKG_DEFAULT_OPTIONS} | ${XARGS} -n 1 | ${SORT}
-.endif
-.if !defined(_PKG_OPTIONS_ENABLED) && defined(PKG_OPTIONS) && !empty(PKG_OPTIONS)
-_PKG_OPTIONS_ENABLED!=		${ECHO} ${PKG_OPTIONS} | ${XARGS} -n 1 | ${SORT}
-.endif
+.PHONY: describe-options
+describe-options:
+	@${ECHO} The following options are supported by this package:
+.for _opt_ in ${PKG_SUPPORTED_OPTIONS:O}
+	@${ECHO} "	"${_opt_:Q}"	"`${SED} -n "s/^"${_opt_:Q}"	//p" ../../mk/defaults/options.description`
+.endfor
+	@${ECHO}
+	@${ECHO} "These options are enabled by default: "${PKG_SUGGESTED_OPTIONS:O:Q}
+	@${ECHO} "These options are currently enabled: "${PKG_OPTIONS:O:Q}
 
 .PHONY: show-options
 show-options:
-	@${ECHO} "available: ${_PKG_OPTIONS_AVAILABLE}"
-	@${ECHO} "default: ${_PKG_OPTIONS_DEFAULT}"
-	@${ECHO} "enabled: ${_PKG_OPTIONS_ENABLED}"
+	@${ECHO} "available: "${PKG_SUPPORTED_OPTIONS:O:Q}
+	@${ECHO} "default: "${PKG_SUGGESTED_OPTIONS:O:Q}
+	@${ECHO} "enabled: "${PKG_OPTIONS:O:Q}
 
 .if defined(PKG_SUPPORTED_OPTIONS)
 .PHONY: supported-options-message
@@ -200,28 +161,32 @@ supported-options-message:
 	@${ECHO} "=========================================================================="
 	@${ECHO} "The supported build options for this package are:"
 	@${ECHO} ""
-	@${ECHO} "${PKG_SUPPORTED_OPTIONS}" | ${XARGS} -n 1 | ${SORT} |	\
-		${_PKG_OPTIONS_WORDWRAP_FILTER}
+	@${ECHO} ${PKG_SUPPORTED_OPTIONS:O:Q} | ${XARGS} -n 1 | ${_PKG_OPTIONS_WORDWRAP_FILTER}
 .    if !empty(PKG_OPTIONS)
 	@${ECHO} ""
 	@${ECHO} "The currently selected options are:"
 	@${ECHO} ""
-	@${ECHO} "${PKG_OPTIONS}" | ${XARGS} -n 1 | ${SORT} |		\
-		${_PKG_OPTIONS_WORDWRAP_FILTER}
+	@${ECHO} ${PKG_OPTIONS:O:Q} | ${XARGS} -n 1 | ${_PKG_OPTIONS_WORDWRAP_FILTER}
 .    endif
 	@${ECHO} ""
-	@${ECHO} "You can select which build options to use by setting the following"
-	@${ECHO} "variables.  Their current value is shown:"
+	@${ECHO} "You can select which build options to use by setting PKG_DEFAULT_OPTIONS"
+	@${ECHO} "or the following variable.  Its current value is shown:"
 	@${ECHO} ""
-.    for _var_ in ${PKG_OPTIONS_VAR}
-.      if !defined(${_var_})
-	@${ECHO} "	${_var_} (not defined)"
-.      else
-	@${ECHO} "	${_var_} = ${${_var_}}"
-.      endif
-.    endfor
-.    undef _var_
+.    if !defined(${PKG_OPTIONS_VAR})
+	@${ECHO} "	${PKG_OPTIONS_VAR} (not defined)"
+.    else
+	@${ECHO} "	${PKG_OPTIONS_VAR} = ${${PKG_OPTIONS_VAR}}"
+.    endif
+.    if defined(_DEPRECATED_WARNING)
+	@${ECHO}
+	@for l in ${_DEPRECATED_WARNING}; \
+	do \
+		${ECHO} "$$l"; \
+	done
+.    endif
 	@${ECHO} ""
 	@${ECHO} "=========================================================================="
 .  endif
 .endif
+
+.endif # defined(PKG_OPTIONS_VAR) && defined(PKG_SUPPORTED_OPTIONS)
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk
new file mode 100644
index 00000000000..e095db1cba4
--- /dev/null
+++ b/mk/bsd.pkg.extract.mk
@@ -0,0 +1,209 @@
+# $NetBSD: bsd.pkg.extract.mk,v 1.6.2.2 2005/05/17 18:29:44 tv Exp $
+#
+# This Makefile fragment is included to bsd.pkg.mk and defines the
+# relevant variables and targets for the "extract" phase.
+#
+# The following variables may be set by the package Makefile and
+# specify how extraction happens:
+#
+#    EXTRACT_ONLY is a list of distfiles relative to ${_DISTDIR} to
+#	extract and defaults to ${DISTFILES}.
+#
+#    EXTRACT_SUFX is the suffix for the default distfile to be
+#	extracted.  The default suffix is ".tar.gz".
+#
+#    EXTRACT_CMD is a shell command list that extracts the contents of
+#	an archive named by the shell variable "extract_file" based on
+#	the extension of the archive.  The extensions understood by
+#	EXTRACT_CMD are listed in _EXTRACT_SUFFIXES.
+#
+#    EXTRACT_CMD.<sufx> is a shell command list that extracts the
+#	contents of an archive named by the shell variable "extract_file"
+#	that ends in <sufx>.
+#
+#    EXTRACT_USING specifies the tool used to extract tar/ustar-format
+#	archives.  The possible values are "gtar", "nbtar", and "pax".
+#	By default, we use the "nbtar" tool (NetBSD's pax-as-tar).
+#
+#    EXTRACT_ELEMENTS is a list of files within the distfile to extract.
+#	This variable only takes effect for distfiles that are tarballs.
+#	By default, this is empty, which causes all files within the
+#	tarball to be extracted.
+#
+# The following targets are defined by bsd.pkg.extract.mk:
+#
+#    do-extract is the target that causes the actual extraction of
+#	the distfiles to occur during the "extract" phase.
+#
+
+EXTRACT_ONLY?=		${DISTFILES}
+EXTRACT_SUFX?=		.tar.gz
+EXTRACT_USING?=		nbtar
+
+_EXTRACT_SUFFIXES=	.tar.gz .tgz .tar.bz2 .tbz .tar.Z .tar _tar.gz
+_EXTRACT_SUFFIXES+=	.shar.gz .shar.bz2 .shar.Z .shar
+_EXTRACT_SUFFIXES+=	.zip
+_EXTRACT_SUFFIXES+=	.lha .lzh
+_EXTRACT_SUFFIXES+=	.Z .bz2 .gz
+_EXTRACT_SUFFIXES+=	.zoo
+_EXTRACT_SUFFIXES+=	.bin
+_EXTRACT_SUFFIXES+=	.rar
+
+.if !empty(EXTRACT_ONLY:M*.tar) || !empty(EXTRACT_ONLY:M*.tar.*) || \
+    !empty(EXTRACT_SUFX:M*.tar) || !empty(EXTRACT_SUFX:M*.tar.*) || \
+    !empty(EXTRACT_ONLY:M*.tbz) || !empty(EXTRACT_ONLY:M*.tgz) || \
+    !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz)
+.  if !empty(EXTRACT_USING:Mgtar)
+PKGSRC_USE_TOOLS+=	gtar
+.  elif !empty(EXTRACT_USING:Mnbtar)
+PKGSRC_USE_TOOLS+=	tar
+.  else
+PKGSRC_USE_TOOLS+=	pax
+.  endif
+.endif
+.if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \
+    !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+PKGSRC_USE_TOOLS+=	bzcat
+.  elif exists(/usr/bin/bzcat)
+BZCAT=			/usr/bin/bzcat <
+.  else
+BUILD_DEPENDS+=		bzip2>=0.9.0b:../../archivers/bzip2
+BZCAT=			${LOCALBASE}/bin/bzcat
+.  endif
+.endif
+.if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+PKGSRC_USE_TOOLS+=	unzip
+.  else
+BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
+UNZIP=			${LOCALBASE}/bin/unzip
+.  endif
+.endif
+.if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \
+    !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+PKGSRC_USE_TOOLS+=	lha
+.  else
+BUILD_DEPENDS+=		lha>=114.9:../../archivers/lha
+LHA=			${LOCALBASE}/bin/lha
+.  endif
+.endif
+.if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \
+    !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) || \
+    !empty(EXTRACT_ONLY:M*.Z) || !empty(EXTRACT_SUFX:M*.Z)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+PKGSRC_USE_TOOLS+=	gzcat
+.  elif !defined(GZCAT)
+BUILD_DEPENDS+=         gzip-base>=1.2.4b:../../archivers/gzip-base
+GZCAT=                  ${LOCALBASE}/bin/zcat
+.  endif
+.endif
+.if !empty(EXTRACT_ONLY:M*.zoo) || !empty(EXTRACT_SUFX:M*.zoo)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+PKGSRC_USE_TOOLS+=	unzoo
+.  else
+BUILD_DEPENDS+=		unzoo-[0-9]*:../../archivers/unzoo
+UNZOO=			${LOCALBASE}/bin/unzoo
+.  endif
+.endif
+.if !empty(EXTRACT_ONLY:M*.rar) || !empty(EXTRACT_SUFX:M*.rar)
+.  if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+PKGSRC_USE_TOOLS+=	unrar
+.  else
+BUILD_DEPENDS+=		unrar>=3.3.4:../../archivers/unrar
+UNRAR=			${LOCALBASE}/bin/unrar
+.  endif
+.endif
+
+DECOMPRESS_CMD.tar.gz?=		${GZCAT}
+DECOMPRESS_CMD.tgz?=		${DECOMPRESS_CMD.tar.gz}
+DECOMPRESS_CMD.tar.bz2?=	${BZCAT}
+DECOMPRESS_CMD.tbz?=		${DECOMPRESS_CMD.tar.bz2}
+DECOMPRESS_CMD.tar.Z?=		${GZCAT}
+DECOMPRESS_CMD.tar?=		${CAT}
+
+DECOMPRESS_CMD.shar.gz?=	${GZCAT}
+DECOMPRESS_CMD.shar.bz2?=	${BZCAT}
+DECOMPRESS_CMD.shar.Z?=		${GZCAT}
+DECOMPRESS_CMD.shar?=		${CAT}
+
+DECOMPRESS_CMD.Z?=		${GZCAT}
+DECOMPRESS_CMD.bz2?=		${BZCAT}
+DECOMPRESS_CMD.gz?=		${GZCAT}
+
+DECOMPRESS_CMD?=		${GZCAT}
+.for __suffix__ in ${_EXTRACT_SUFFIXES}
+.  if !defined(DECOMPRESS_CMD${__suffix__})
+DECOMPRESS_CMD${__suffix__}?=	${DECOMPRESS_CMD}
+.  endif
+.endfor
+
+# If this is empty, then everything gets extracted.
+EXTRACT_ELEMENTS?=	# empty
+
+DOWNLOADED_DISTFILE=	$${extract_file}
+
+EXTRACT_CMD.zip?=	${UNZIP} ${EXTRACT_CMD_OPTS.zip} $${extract_file}
+EXTRACT_CMD_OPTS.zip?=	-Laqo
+EXTRACT_CMD.lha?=	${LHA} ${EXTRACT_CMD_OPTS.lha} $${extract_file}
+EXTRACT_CMD_OPTS.lha?=	xq
+EXTRACT_CMD.lzh?=	${EXTRACT_CMD.lha}
+EXTRACT_CMD_OPTS.lzh?=	${EXTRACT_CMD_OPTS.lha}
+EXTRACT_CMD.zoo?=	${UNZOO} ${EXTRACT_CMD_OPTS.zoo} $${extract_file}
+EXTRACT_CMD_OPTS.zoo?=	-x
+EXTRACT_CMD.rar?=	${UNRAR} ${EXTRACT_CMD_OPTS.rar} $${extract_file}
+EXTRACT_CMD_OPTS.rar?=	x -inul
+EXTRACT_ENV.bin?=	# empty
+EXTRACT_CMD.bin?=	${ECHO} yes | ${SETENV} ${EXTRACT_ENV.bin} $${extract_file} ${EXTRACT_CMD_OPTS.bin} >/dev/null
+
+.for __suffix__ in .gz .bz2 .Z
+EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} > `${BASENAME} $${extract_file} ${__suffix__}`
+.endfor
+
+.for __suffix__ in .shar.gz .shar.bz2 .shar.Z .shar
+EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${SH}
+.endfor
+
+.if !empty(EXTRACT_USING:Mgtar)
+_DFLT_EXTRACT_CMD?=	${DECOMPRESS_CMD} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
+.elif !empty(EXTRACT_USING:Mnbtar)
+_DFLT_EXTRACT_CMD?=	${DECOMPRESS_CMD} $${extract_file} | ${TAR} -xf - ${EXTRACT_ELEMENTS}
+.else
+_DFLT_EXTRACT_CMD?=	${DECOMPRESS_CMD} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS}
+.endif
+
+.for __suffix__ in ${_EXTRACT_SUFFIXES}
+.  if !defined(EXTRACT_CMD${__suffix__})
+.    if !empty(EXTRACT_USING:Mgtar)
+EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS}
+.    elif !empty(EXTRACT_USING:Mnbtar)
+EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${TAR} -xf - ${EXTRACT_ELEMENTS}
+.    else
+EXTRACT_CMD${__suffix__}?=	${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS}
+.    endif
+.  endif
+.endfor
+
+# _SHELL_EXTRACT is a "subroutine" for extracting an archive.  It extracts
+# the contents of archive named by the shell variable "extract_file" based
+# on the file extension of the archive.
+#
+_SHELL_EXTRACT=		case $${extract_file} in
+.for __suffix__ in ${_EXTRACT_SUFFIXES}
+_SHELL_EXTRACT+=	*${__suffix__})	${EXTRACT_CMD${__suffix__}} ;;
+.endfor
+_SHELL_EXTRACT+=	*)		${_DFLT_EXTRACT_CMD} ;;
+_SHELL_EXTRACT+=	esac
+
+EXTRACT_CMD?=		${_SHELL_EXTRACT}
+
+.PHONY: do-extract
+.if !target(do-extract)
+do-extract: ${WRKDIR}
+.  for __file__ in ${EXTRACT_ONLY}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	extract_file="${_DISTDIR}/${__file__}";	export extract_file;	\
+	cd ${WRKDIR}; ${EXTRACT_CMD}
+.  endfor
+.endif
diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk
new file mode 100644
index 00000000000..cbb7b4a62b3
--- /dev/null
+++ b/mk/bsd.pkg.patch.mk
@@ -0,0 +1,271 @@
+# $NetBSD: bsd.pkg.patch.mk,v 1.7.2.2 2005/05/17 18:29:44 tv Exp $
+#
+# This Makefile fragment is included by bsd.pkg.mk and defines the
+# relevant variables and targets for the "patch" phase.
+#
+# The following variables may be set in a package Makefile and control
+# how pkgsrc patches are applied.
+#
+#    PATCH_STRIP is a patch(1) argument that sets the pathname strip
+#	count to help find the correct files to patch.  See the patch(1)
+#	man page for more details.  Defaults to "-p0".
+#
+#    PATCH_ARGS is the base set of arguments passed to patch(1).
+#	The default set of arguments will apply the patches to the
+#	files in ${WRKSRC} with any ${PATCH_STRIP} arguments set.
+#
+# The following variables may be set in a package Makefile and control
+# how "distribution" patches are applied.
+#
+#    PATCHFILES is a list of distribution patches relative to
+#	${_DISTDIR} that are applied first to the package.
+#
+#    PATCH_DIST_STRIP is a patch(1) argument that sets the pathname
+#	strip count to help find the correct files to patch.  See the
+#	patch(1) man page for more details.  Defaults to "-p0".
+#
+#    PATCH_DIST_ARGS is the base set of arguments passed to patch(1).
+#	The default set of arguments will apply the patches to the
+#	files in ${WRKSRC} with any ${PATCH_DIST_STRIP} arguments set.
+#
+#    PATCH_DIST_CAT is the command that outputs the contents of the
+#	"$patchfile" to stdout.  The default value is a command that
+#	can output gzipped, bzipped, or plain patches to stdout.
+#
+#    PATCH_DIST_STRIP.<patchfile>
+#    PATCH_DIST_ARGS.<patchfile>
+#    PATCH_DIST_CAT.<patchfile>
+#	These are versions of the previous three variables which allow
+#	for customization of their values for specific patchfiles.
+#
+# The following variables may be set by the user and affect how patching
+# occurs:
+#
+#    PATCH_DEBUG, if defined, causes the the patch process to be more
+#	verbose.
+#
+#    PATCH_FUZZ_FACTOR is a patch(1) argument that specifies how much
+#	fuzz to accept when applying pkgsrc patches.  See the patch(1)
+#	man page for more details.  Defaults to "-F0" for zero fuzz.
+#
+#    LOCALPATCHES is the location of local patches that are maintained
+#	in a directory tree reflecting the same hierarchy as the pkgsrc
+#	tree, e.g., local patches for www/apache would be found in
+#	${LOCALPATCHES}/www/apache.  These patches are applied after
+#	the patches in ${PATCHDIR}.
+#
+# The following targets are defined by bsd.pkg.patch.mk:
+#
+#    do-patch is the target that causes the actual patching of the
+#	extracted sources to occur during the "patch" phase.
+#
+
+.if (defined(PATCHFILES) && !empty(PATCHFILES)) || \
+    (defined(PATCHDIR) && exists(${PATCHDIR})) || \
+    (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH}))
+.  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+USE_GNU_TOOLS+=		patch
+.  else
+PKGSRC_USE_TOOLS+=	patch
+.  endif
+.endif
+
+# These tools are used to output the contents of the distribution patches
+# to stdout.
+#
+.if defined(PATCHFILES)
+PKGSRC_USE_TOOLS+=	cat
+.  if !empty(PATCHFILES:M*.Z) || !empty(PATCHFILES:M*.gz)
+PKGSRC_USE_TOOLS+=	gzcat
+.  endif
+.  if !empty(PATCHFILES:M*.bz2)
+.    if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+PKGSRC_USE_TOOLS+=	bzcat
+.    elif exists(/usr/bin/bzcat)
+BZCAT=			/usr/bin/bzcat
+.    else
+BZCAT=			${LOCALBASE}/bin/bzcat
+BUILD_DEPENDS+=		bzip2>=0.9.0b:../../archivers/bzip2
+.    endif
+.  endif
+.endif
+
+.if defined(PATCH_DEBUG) || defined(PKG_VERBOSE)
+_PATCH_DEBUG=		yes
+ECHO_PATCH_MSG?=	${ECHO_MSG}
+.else
+_PATCH_DEBUG=		no
+ECHO_PATCH_MSG?=	${TRUE}
+.endif
+
+PATCH_STRIP?=		-p0
+.if !empty(_PATCH_DEBUG:M[yY][eE][sS])
+PATCH_ARGS?=		-d ${WRKSRC} -E ${PATCH_STRIP}
+.else
+PATCH_ARGS?=		-d ${WRKSRC} --forward --quiet -E ${PATCH_STRIP}
+.endif
+.if defined(BATCH)
+PATCH_ARGS+=		--batch
+.endif
+.if defined(_PATCH_CAN_BACKUP) && (${_PATCH_CAN_BACKUP} == "yes")
+PATCH_ARGS+=		${_PATCH_BACKUP_ARG} .orig
+.endif
+PATCH_FUZZ_FACTOR?=	-F0	# Default to zero fuzz
+
+# The following variables control how "distribution" patches are extracted
+# and applied to the package sources.
+#
+# PATCH_DIST_STRIP is a patch option that sets the pathname strip count.
+# PATCH_DIST_ARGS is the list of arguments to pass to the patch command.
+# PATCH_DIST_CAT is the command that outputs the patch to stdout.
+#
+# For each of these variables, there is a patch-specific variant that
+# may be set, i.e. PATCH_DIST_STRIP.<patch>, PATCH_DIST_ARGS.<patch>,
+# PATCH_DIST_CAT.<patch>.
+#
+PATCH_DIST_STRIP?=		-p0
+.for i in ${PATCHFILES}
+PATCH_DIST_STRIP.${i:S/=/--/}?=	${PATCH_DIST_STRIP}
+.  if defined(PATCH_DIST_ARGS)
+PATCH_DIST_ARGS.${i:S/=/--/}?=	${PATCH_DIST_ARGS}
+.  elif !empty(_PATCH_DEBUG:M[yY][eE][sS])
+PATCH_DIST_ARGS.${i:S/=/--/}?=	-d ${WRKSRC} -E ${PATCH_DIST_STRIP.${i:S/=/--/}}
+.  else
+PATCH_DIST_ARGS.${i:S/=/--/}?=	-d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP.${i:S/=/--/}}
+.  endif
+.endfor
+.if defined(BATCH)
+PATCH_DIST_ARGS+=		--batch
+.  for i in ${PATCHFILES}
+PATCH_DIST_ARGS.${i:S/=/--/}+=	--batch
+.  endfor
+.endif
+.if defined(_PATCH_CAN_BACKUP) && (${_PATCH_CAN_BACKUP} == "yes")
+PATCH_DIST_ARGS+=		${_PATCH_BACKUP_ARG} .orig_dist
+.  for i in ${PATCHFILES}
+PATCH_DIST_ARGS.${i:S/=/--/}+=	${_PATCH_BACKUP_ARG} .orig_dist
+.  endfor
+.endif
+PATCH_DIST_CAT?=	{ case $$patchfile in				\
+			  *.Z|*.gz) ${GZCAT} $$patchfile ;;		\
+			  *.bz2)    ${BZCAT} $$patchfile ;;		\
+			  *)	    ${CAT} $$patchfile ;;		\
+			  esac; }
+.for i in ${PATCHFILES}
+PATCH_DIST_CAT.${i:S/=/--/}?=	{ patchfile=${i}; ${PATCH_DIST_CAT}; }
+.endfor
+
+_PKGSRC_PATCH_TARGETS=	uptodate-digest
+.if defined(PATCHFILES)
+_PKGSRC_PATCH_TARGETS+=	apply-distribution-patches
+.endif
+.if (defined(PATCHDIR) && exists(${PATCHDIR})) || \
+    (defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH}))
+_PKGSRC_PATCH_TARGETS+=	apply-pkgsrc-patches
+.endif
+
+.PHONY: do-patch
+.if !target(do-patch)
+.ORDER: ${_PKGSRC_PATCH_TARGETS}
+do-patch: ${_PKGSRC_PATCH_TARGETS}
+.endif
+
+_PKGSRC_PATCH_FAIL=							\
+if ${TEST} -n ${PKG_OPTIONS:Q}"" ||					\
+   ${TEST} -n ${LOCALPATCHES:Q}"" -a -d ${LOCALPATCHES:Q}/${PKGPATH:Q}; then \
+	${ECHO} "=========================================================================="; \
+	${ECHO};							\
+	${ECHO} "Some of the selected build options and/or local patches may be incompatible."; \
+	${ECHO} "Please try building with fewer options or patches.";	\
+	${ECHO};							\
+	${ECHO} "=========================================================================="; \
+fi; exit 1
+
+_PATCH_COOKIE_TMP=	${PATCH_COOKIE}.tmp
+_GENERATE_PATCH_COOKIE=	\
+	if ${TEST} -f ${_PATCH_COOKIE_TMP:Q}; then			\
+		${CAT} ${_PATCH_COOKIE_TMP:Q} >> ${PATCH_COOKIE:Q};	\
+		${RM} -f ${_PATCH_COOKIE_TMP:Q};			\
+	else								\
+		${TOUCH} ${TOUCH_FLAGS} ${PATCH_COOKIE:Q};		\
+	fi
+
+apply-distribution-patches:
+	@${ECHO_MSG} "${_PKGSRC_IN}> Applying distribution patches for ${PKGNAME}"
+.for i in ${PATCHFILES}
+	@${ECHO_PATCH_MSG} "${_PKGSRC_IN}> Applying distribution patch ${i}"
+	${_PKG_SILENT}${_PKG_DEBUG}cd ${_DISTDIR};			\
+	${PATCH_DIST_CAT.${i:S/=/--/}} |				\
+	${PATCH} ${PATCH_DIST_ARGS.${i:S/=/--/}}			\
+		|| { ${ECHO} "Patch ${i} failed"; ${_PKGSRC_PATCH_FAIL}; }
+	${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${i:Q} >> ${_PATCH_COOKIE_TMP:Q}
+.endfor
+
+_PKGSRC_PATCHES=	# empty
+.if defined(PATCHDIR) && exists(${PATCHDIR})
+_PKGSRC_PATCHES+=	${PATCHDIR}/patch-*
+.endif
+.if defined(LOCALPATCHES) && exists(${LOCALPATCHES}/${PKGPATH})
+_PKGSRC_PATCHES+=	${LOCALPATCHES}/${PKGPATH}/patch-*
+.endif
+
+apply-pkgsrc-patches:
+	@${ECHO_MSG} "${_PKGSRC_IN}> Applying pkgsrc patches for ${PKGNAME}"
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	set -- `${ECHO} ${_PKGSRC_PATCHES:Q}`;				\
+	fail=;								\
+	while ${TEST} $$# -gt 0; do					\
+		i="$$1"; shift;						\
+		${TEST} -f "$$i" || continue;				\
+		case "$$i" in						\
+		*.orig|*.rej|*~)					\
+			${ECHO_MSG} "${_PKGSRC_IN}> Ignoring patchfile $$i"; \
+			continue;					\
+			;;						\
+		${PATCHDIR}/patch-local-*) 				\
+			;;						\
+		${PATCHDIR}/patch-*) 					\
+			if ${TEST} ! -f ${DISTINFO_FILE:Q}; then	\
+				${ECHO_MSG} "**************************************"; \
+				${ECHO_MSG} "Ignoring unknown patch file: $$i";	\
+				${ECHO_MSG} "**************************************"; \
+				continue;				\
+			fi;						\
+			filename=`${BASENAME} $$i`;			\
+			algsum=`${AWK} '(NF == 4) && ($$2 == "('$$filename')") && ($$3 == "=") {print $$1 " " $$4}' ${DISTINFO_FILE} || ${TRUE}`; \
+			if ${TEST} -z "$$algsum"; then			\
+				${ECHO_MSG} "**************************************"; \
+				${ECHO_MSG} "Ignoring unknown patch file: $$i"; \
+				${ECHO_MSG} "**************************************"; \
+				continue;				\
+			fi;						\
+			${ECHO} "$$algsum" |				\
+			{ read alg recorded;				\
+			  calcsum=`${SED} -e '/\$$NetBSD.*/d' $$i | ${DIGEST} $$alg`; \
+			  ${ECHO_PATCH_MSG} "=> Verifying $$filename (using digest algorithm $$alg)"; \
+			  if ${TEST} -z "$$recorded"; then		\
+				${ECHO_MSG} "**************************************"; \
+				${ECHO_MSG} "Ignoring unknown patch file: $$i"; \
+				${ECHO_MSG} "**************************************"; \
+				continue;				\
+			  fi;						\
+			  if ${TEST} "$$calcsum" != "$$recorded"; then	\
+				${ECHO_MSG} "**************************************"; \
+				${ECHO_MSG} "Patch file $$i has been modified"; \
+				${ECHO_MSG} "**************************************"; \
+				fail="$$fail $$filename";		\
+				continue;				\
+			  fi; };					\
+			;;						\
+		esac;							\
+		${ECHO_PATCH_MSG} "${_PKGSRC_IN}> Applying pkgsrc patch $$i"; \
+		fuzz=;							\
+		${PATCH} -v >/dev/null 2>&1 && fuzz=${PATCH_FUZZ_FACTOR:Q}; \
+		${PATCH} $$fuzz ${PATCH_ARGS} < $$i ||			\
+			${ECHO_MSG} "Patch $$i failed";			\
+		${ECHO} "$$i" >> ${_PATCH_COOKIE_TMP:Q};		\
+	done;								\
+	if ${TEST} -n "$$fail"; then					\
+		${ECHO_MSG} "Patching failed due to modified patch file(s): $$fail"; \
+		${_PKGSRC_PATCH_FAIL};					\
+	fi
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index 32816502445..b08c7aa9534 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.9 2005/02/25 14:46:51 tv Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.1.2.10 2005/05/17 18:29:44 tv Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -22,9 +22,7 @@ PLIST_SUBST+=		IMAKE_KERNMAN_SUFFIX=${IMAKE_KERNMAN_SUFFIX}
 PLIST_SUBST+=		IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX}
 PLIST_SUBST+=		IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX}
 PLIST_SUBST+=		IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
-.  if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-MAKE_FLAGS+=		CC="${CC}" CXX="${CXX}"
-.  endif
+MAKE_FLAGS+=		CC=${CC:Q} CXX=${CXX:Q}
 .endif
 
 .if defined(USE_X11BASE)
@@ -93,10 +91,7 @@ _SHLIBTOOL?=		${PKG_SHLIBTOOL}
 LIBTOOL?=		${PKG_LIBTOOL}
 SHLIBTOOL?=		${PKG_SHLIBTOOL}
 .if defined(USE_LIBTOOL)
-.  if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran)
-LIBTOOL_REQD?=		1.5.10nb7
-.  endif
-LIBTOOL_REQD?=		1.5.10nb1
+LIBTOOL_REQD?=		1.5.14
 BUILD_DEPENDS+=		libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base
 CONFIGURE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
 MAKE_ENV+=		LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
@@ -160,18 +155,16 @@ ${_PERL5_DEPMETHOD}+=	${_PERL5_DEPENDS}:${PERL5_PKGSRCDIR}
 .  endif
 .endif
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 .if defined(USE_PERL5) && (${USE_PERL5} == "run")
 CONFIGURE_ENV+=		PERL=${PERL5:Q}
 .  include "../../lang/perl5/vars.mk"
 .endif       # USE_PERL5 == run
+.endif
 
-.if defined(PERL5_SUB_INSTALLSITELIB)
+.if defined(USE_PERL5)
 PLIST_SUBST+=	PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
-.endif
-.if defined(PERL5_SUB_INSTALLSITEARCH)
 PLIST_SUBST+=	PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH}
-.endif
-.if defined(PERL5_SUB_INSTALLARCHLIB)
 PLIST_SUBST+=	PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB}
 .endif
 
@@ -192,9 +185,6 @@ RMAN?=			${X11BASE}/bin/rman
 .if defined(USE_X11)
 X11_LDFLAGS+=		${COMPILER_RPATH_FLAG}${X11BASE}/lib${LIBABISUFFIX}
 X11_LDFLAGS+=		-L${X11BASE}/lib${LIBABISUFFIX}
-.  if !empty(USE_BUILDLINK3:M[nN][oO])
-LDFLAGS+=		${X11_LDFLAGS}
-.  endif
 .endif
 
 ### USE_XPKGWEDGE
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index f4d2ec6be13..cffd56dcc90 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.177.2.6 2005/02/25 14:46:51 tv Exp $
+# $NetBSD: bsd.prefs.mk,v 1.177.2.7 2005/05/17 18:29:44 tv Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -7,7 +7,7 @@
 # the system defaults (sys.mk and bsd.own.mk) are used.
 
 # Do not recursively include mk.conf, redefine OPSYS, include bsd.own.mk, etc.
-.ifndef BSD_PKG_MK
+.if !defined(BSD_PKG_MK)
 
 # Let mk.conf know that this is pkgsrc.
 BSD_PKG_MK=1
@@ -45,14 +45,14 @@ CUT=/bin/cut
 CUT=echo Unknown
 .endif
 
-.ifndef OPSYS
+.if !defined(OPSYS)
 OPSYS!=			${UNAME} -s | tr -d /
 .endif
 MAKEFLAGS+=		OPSYS=${OPSYS}
-.ifndef OS_VERSION
+.if !defined(OS_VERSION)
 OS_VERSION!=		${UNAME} -r
 .endif
-.ifndef LOWER_OS_VERSION
+.if !defined(LOWER_OS_VERSION)
 LOWER_OS_VERSION!=	echo ${OS_VERSION} | tr 'A-Z' 'a-z'
 .endif
 MAKEFLAGS+=		OS_VERSION=${OS_VERSION}
@@ -267,6 +267,22 @@ _PKGSRC_TOPDIR=	${.CURDIR}/../..
 .  include "${_PKGSRC_TOPDIR}/mk/defaults/mk.conf"
 .endif
 
+PKGSRC_USE_TOOLS?=	# empty
+USE_TOOLS?=		# empty
+
+# Provide default values for TOOLs used by the top-level make.
+PKGSRC_USE_TOOLS+=	[ awk dirname echo grep pwd sed test true
+
+# These tools are used by the top-level make only in certain packages and
+# should eventually be moved into those particular package Makefiles.
+#
+PKGSRC_USE_TOOLS+=	date tr
+
+_USE_NEW_TOOLS?=	yes
+.if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+.include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
+.endif
+
 .if ${OPSYS} == "NetBSD"
 .  if ${OBJECT_FMT} == "ELF" && \
    (${MACHINE_GNU_ARCH} == "arm" || \
@@ -399,14 +415,20 @@ _XPKGWEDGE_REQD=	1.9
 # The check for the existence of ${X11BASE}/lib/X11/config/xpkgwedge.def
 # is to catch users of xpkgwedge<1.0.
 #
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 XMKMF?=			${XMKMF_CMD} ${XMKMF_FLAGS} -a
 XMKMF_FLAGS?=		# empty
+.endif
 .if !empty(USE_XPKGWEDGE:M[Yy][Ee][Ss]) 
 X11PREFIX=		${LOCALBASE}
+.  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 XMKMF_CMD?=		${X11PREFIX}/bin/pkgxmkmf
+.  endif
 .else
 X11PREFIX=		${X11BASE}
+.  if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 XMKMF_CMD?=		${X11PREFIX}/bin/xmkmf
+.  endif
 .endif
 
 DEPOT_SUBDIR?=		packages
@@ -435,7 +457,7 @@ COMPILER_RPATH_FLAG?=	${_COMPILER_RPATH_FLAG}
 WHOLE_ARCHIVE_FLAG?=	${_OPSYS_WHOLE_ARCHIVE_FLAG}
 NO_WHOLE_ARCHIVE_FLAG?=	${_OPSYS_NO_WHOLE_ARCHIVE_FLAG}
 
-.ifndef DIGEST
+.if !defined(DIGEST)
 DIGEST:=		${LOCALBASE}/bin/digest
 MAKEFLAGS+=		DIGEST=${DIGEST}
 .endif
@@ -509,11 +531,6 @@ LINKFARM?=		${LINKFARM_CMD}
 #
 PKG_BEST_EXISTS?=	${PKG_ADMIN} -b -d ${_PKG_DBDIR} -S lsbest
 
-USE_BUILDLINK3?=	no	# default to not using buildlink3
-.if ${PKG_INSTALLATION_TYPE} == "pkgviews"
-USE_BUILDLINK3=		yes	# pkgviews requires buildlink3
-.endif
-
 .if exists(${LOCALBASE}/bsd/share/mk/zoularis.mk)
 PKG_FAIL_REASON+=	'You appear to have a deprecated Zoularis installation.'
 PKG_FAIL_REASON+=	'Please update your system to bootstrap-pkgsrc and remove the'
@@ -575,7 +592,7 @@ PKG_DEFAULT_OPTIONS?=	# empty
 PKG_OPTIONS?=		# empty
 
 # we want this *before* compiler.mk, so that compiler.mk paths override them
-PREPEND_PATH+=		${LOCALBASE}/bin ${USE_IMAKE:D${X11BASE}/bin}
+PREPEND_PATH+=		${USE_X11:D${X11BASE}/bin} ${LOCALBASE}/bin
 
 # Wrapper framework definitions
 .include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
diff --git a/mk/bsd.sites.mk b/mk/bsd.sites.mk
index 66baea95db6..f18860b48f2 100644
--- a/mk/bsd.sites.mk
+++ b/mk/bsd.sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sites.mk,v 1.20.2.7 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: bsd.sites.mk,v 1.20.2.8 2005/05/17 18:29:44 tv Exp $
 #
 # Default MASTER_SITES
 
@@ -92,12 +92,9 @@ MASTER_SITE_GNOME+=     \
 	ftp://ftp.mirror.ac.uk/sites/ftp.gnome.org/pub/
 
 MASTER_SITE_SOURCEFORGE+=	\
-	http://belnet.dl.sourceforge.net/sourceforge/ \
-	http://citkit.dl.sourceforge.net/sourceforge/ \
 	http://cogent.dl.sourceforge.net/sourceforge/ \
 	http://easynews.dl.sourceforge.net/sourceforge/ \
 	http://heanet.dl.sourceforge.net/sourceforge/ \
-	http://internap.dl.sourceforge.net/sourceforge/ \
 	http://jaist.dl.sourceforge.net/sourceforge/ \
 	http://kent.dl.sourceforge.net/sourceforge/ \
 	http://mesh.dl.sourceforge.net/sourceforge/ \
@@ -105,10 +102,8 @@ MASTER_SITE_SOURCEFORGE+=	\
 	http://optusnet.dl.sourceforge.net/sourceforge/ \
 	http://ovh.dl.sourceforge.net/sourceforge/ \
 	http://puzzle.dl.sourceforge.net/sourceforge/ \
-	http://switch.dl.sourceforge.net/sourceforge/ \
-	http://unc.dl.sourceforge.net/sourceforge/ \
-	http://voxel.dl.sourceforge.net/sourceforge/ \
-	ftp://ftp2.sourceforge.net/pub/sourceforge/
+	http://switch.dl.sourceforge.net/sourceforge/
+#	ftp://ftp2.sourceforge.net/pub/sourceforge/
 #	ftp://ftp.tuwien.ac.at/linux/sourceforge/
 #	http://sf.gds.tuwien.ac.at/
 
@@ -144,8 +139,7 @@ MASTER_SITE_XEMACS+=    \
 	http://public.planetmirror.com.au/pub/xemacs/ \
 	ftp://mirror.aarnet.edu.au/pub/xemacs/ \
 	ftp://mirror.cict.fr/xemacs/ \
-	ftp://ring.aist.go.jp/pub/text/xemacs/ \
-	ftp://ring.asahi-net.or.jp/pub/text/xemacs/
+	ftp://ftp.t.ring.gr.jp/pub/text/xemacs/
 
 MASTER_SITE_APACHE+=    \
 	http://www.apache.org/dist/ \
@@ -252,7 +246,7 @@ MASTER_SITE_OPENOFFICE+=	\
 	http://public.planetmirror.com.au/pub/openoffice/ \
 	http://komo.vlsm.org/openoffice/ \
 	ftp://ftp.kddlabs.co.jp/office/openoffice/ \
-	ftp://ftp.ring.gr.jp/pub/misc/openoffice/ \
+	ftp://ftp.t.ring.gr.jp/pub/misc/openoffice/ \
 	http://mymirror.asiaosc.org/openoffice/ \
 	ftp://ftp.kr.freebsd.org/pub/openoffice/ \
 	http://www.fs.tum.de/~mrauch/OpenOffice/download/
@@ -261,7 +255,7 @@ MASTER_SITE_CYGWIN+= \
 	http://mirrors.kernel.org/sources.redhat.com/cygwin/ \
 	http://mirrors.rcn.net/pub/sourceware/cygwin/ \
 	http://mirrors.xmission.com/cygwin/ \
-	ftp://ftp.ring.gr.jp/archives/pc/gnu-win32/ \
+	ftp://ftp.t.ring.gr.jp/archives/pc/gnu-win32/ \
 	ftp://ftp.funet.fi/pub/mirrors/cygwin.com/pub/cygwin/
 
 MASTER_SITE_IFARCHIVE+= \
@@ -270,6 +264,14 @@ MASTER_SITE_IFARCHIVE+= \
 	http://ifarchive.heanet.ie/if-archive/ \
 	http://ifarchive.giga.or.at/if-archive/
  
+MASTER_SITE_FREEBSD+= \
+	ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/ \
+	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/distfiles/
+
+MASTER_SITE_FREEBSD_LOCAL+= \
+	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/ \
+	ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/
+
 # The primary backup site. 
 MASTER_SITE_BACKUP?=	\
 	http://ftp.fi.NetBSD.org/pub/NetBSD/packages/distfiles/ \
diff --git a/mk/buildlink3/BUILDLINK3_DG b/mk/buildlink3/BUILDLINK3_DG
index fcb59d6fa38..2a5945cf65d 100644
--- a/mk/buildlink3/BUILDLINK3_DG
+++ b/mk/buildlink3/BUILDLINK3_DG
@@ -1,4 +1,4 @@
-$NetBSD: BUILDLINK3_DG,v 1.6.2.1 2004/11/22 22:48:05 tv Exp $
+$NetBSD: BUILDLINK3_DG,v 1.6.2.2 2005/05/17 18:29:44 tv Exp $
 
  0 Developer's guide to buildlink3
  =================================
@@ -59,26 +59,10 @@ to build against the viewed instance of a depoted package.
  2 Troubleshooting
  =================
 
-Q1: I'm trying to bl3ify a package but I get an error that looks like:
-
-	make: don't know how to make _BUILDLINK_USE. Stop
-
-A1: You forgot to change a reference to a buildlink2.mk file into a
-    buildlink3.mk file.
-
-
-Q2: Dependencies are added for every single buildlink3.mk file I
-    include, including for when it's supposed to use the base system
-    software.  What's going on?
-
-A2: You forgot to change USE_BUILDLINK2 to USE_BUILDLINK3 in the
-    package Makefile.
-
-
-Q3: Where can I see the actual command executed by the wrapper
+Q1: Where can I see the actual command executed by the wrapper
     scripts?
 
-A3: You should examine the contents of the ${WRKDIR}/.work.log file.
+A1: You should examine the contents of the ${WRKDIR}/.work.log file.
     The lines preceded with [*] are the commands that are intercepted
     by the wrapper scripts, and the lines preceded with <.> are the
     commands that are executed by the wrapper scripts.
diff --git a/mk/buildlink3/README b/mk/buildlink3/README
index 77e68b29d7f..adab24e9d5f 100644
--- a/mk/buildlink3/README
+++ b/mk/buildlink3/README
@@ -1,4 +1,4 @@
-$NetBSD: README,v 1.4.10.1 2004/12/03 19:15:00 tv Exp $
+$NetBSD: README,v 1.4.10.2 2005/05/17 18:29:44 tv Exp $
 
  0 Package Views
  ===============
@@ -115,36 +115,8 @@ implementation currently allows "overwrite" to depend on either
 "overwrite" or pkgviews packages, but pkgviews packages are restricted
 to only being able to depend on other pkgviews packages.
 
-Packages that have been converted to use buildlink3 should add the
-following line to their Makefiles:
-
-	USE_BUILDLINK3=	YES
-
-A package must be converted to use the buildlink3 framework before it
-can support the pkgviews installation style.
-
-
- 0.5 Package conversion issues
- =============================
-
-The conversion process for a package to use buildlink3 and pkgviews
-essentially consists of changing USE_BUILDLINK2 to USE_BUILDLINK3,
-including buildlink3.mk files instead of buildlink2.mk files, and
-adding the PKG_INSTALLATION_TYPES line to the package Makefile.  It's
-extremely easy and painless.
-
-Since the idea is that the user can choose to install a package using
-either installation style, the package Makefiles have to explicitly
-support this.  This means that "hard" packages just got harder to
-maintain, but easy packages stay about the same.  In this case, "hard"
-packages are the ones that have module packages, e.g. PHP4, perl5,
-Apache, Cyrus-SASL, etc.  A package of this type must support finding
-shared modules or configuration files in directories shared with all
-of its module packages, thus requiring some hard-coding of paths
-across different packages.
-
 
- 0.6 Future Work
+ 0.5 Future Work
  ===============
 
 There may be some way around the problem of pkgviews packages not
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 401b88ac1b9..9546e7e02d8 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.163.2.5 2005/02/15 16:25:23 tv Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.163.2.6 2005/05/17 18:29:44 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -309,9 +309,9 @@ _BLNK_PKG_DBDIR.${_pkg_}!=	\
 	${ECHO} $$dir
 .      endif
 .    endfor
-.    if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
-WRAPPER_VARS+=	_BLNK_PKG_DBDIR.${_pkg_}
-.    endif
+.  endif
+.  if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
+MAKEVARS+=	_BLNK_PKG_DBDIR.${_pkg_}
 .  endif
 
 .  if empty(_BLNK_PKG_DBDIR.${_pkg_}:M*not_found)
@@ -340,9 +340,9 @@ BUILDLINK_PREFIX.${_pkg_}!=	\
 BUILDLINK_PREFIX.${_pkg_}=	BUILDLINK_PREFIX.${_pkg_}_not_found
 .      endif
 .    endif
-.    if empty(BUILDLINK_PREFIX.${_pkg_}:M*not_found)
-WRAPPER_VARS+=	BUILDLINK_PREFIX.${_pkg_}
-.    endif
+.  endif
+.  if empty(BUILDLINK_PREFIX.${_pkg_}:M*not_found)
+MAKEVARS+=	BUILDLINK_PREFIX.${_pkg_}
 .  endif
 
 BUILDLINK_AUTO_VARS.${_pkg_}?=	yes
@@ -861,8 +861,8 @@ _BLNK_PHYSICAL_PATH.${_var_}!=						\
 	else								\
 		${ECHO} ${${_var_}};					\
 	fi
-WRAPPER_VARS+=	_BLNK_PHYSICAL_PATH.${_var_}
 .  endif
+MAKEVARS+=	_BLNK_PHYSICAL_PATH.${_var_}
 .endfor
 
 # Transform all references to the physical paths to some important
diff --git a/mk/bulk/TODO b/mk/bulk/TODO
index 6721987cfe9..db2875b26f6 100644
--- a/mk/bulk/TODO
+++ b/mk/bulk/TODO
@@ -1 +1,2 @@
  * allow using non-/etc mk.conf
+ * integrate libkver
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 219d7243562..7c5bea35fc2 100644
--- a/mk/bulk/bsd.bulk-pkg.mk
+++ b/mk/bulk/bsd.bulk-pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.bulk-pkg.mk,v 1.65.2.5 2005/03/21 15:43:00 tv Exp $
+#	$NetBSD: bsd.bulk-pkg.mk,v 1.65.2.6 2005/05/17 18:29:44 tv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -44,6 +44,14 @@
 
 LS?=	ls
 WC?=	wc
+TO_HTML?=	${SED} -e 's,&,\&amp;,g' -e 's,<,\&lt;,g' -e 's,>,\&gt;,g'
+
+# A sort(1) capable of very long lines is needed for full builds in "tflat".
+# Some platforms (namely, Interix) may not provide one, so override here.
+.if ${OPSYS} == "Interix"
+_SORT=			${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort
+.endif
+_SORT?=			${SORT}
 
 # This variable is set to 'yes' by the pkgsrc/mk/bulk/build script.  It enables
 # the use of several cache files (DEPENDSTREEFILE, DEPENDSFILE, SUPPORTSFILE,
@@ -184,15 +192,15 @@ bulk-cache:
 		}} END{ \
 		for(pkg in pkgs) {if( pkg in listed ) {} else{ print pkg " " pkg;}} \
 		}' \
-		${BULK_DBFILE} | ${SORT} -u > ${DEPENDSTREEFILE}
+		${BULK_DBFILE} | ${_SORT} -u > ${DEPENDSTREEFILE}
 	@${ECHO_MSG} "BULK> Extracting package name <=> package directory cross reference file"
 	${AWK} '/^index/ {print $$2 " " $$3 " "}' ${BULK_DBFILE} > ${INDEXFILE}
 .endif
 	@${ECHO_MSG} "BULK> Sorting build order."
 	${TSORT} ${DEPENDSTREEFILE} > ${ORDERFILE}
 	@${ECHO_MSG} "BULK> Generating up and down dependency files."
-	${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
-	${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE}
+	${SETENV} SORT=${_SORT:Q} ${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE}
+	${SETENV} SORT=${_SORT:Q} ${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE}
 
 # remove the bulk cache files
 clean-bulk-cache:
@@ -301,7 +309,7 @@ bulk-package:
 			done ;\
 		fi; \
 		${ECHO_MSG} "BULK> Full rebuild in progress..." ; \
-		${ECHO_MSG} "BULK> Cleaning package and its depends" ;\
+		${ECHO_MSG} "BULK> Cleaning package ${PKGNAME} and pre-requisite packages" ;\
 		if [ "${USE_BULK_CACHE}" = "yes" ]; then \
 			for pkgdir in ${PKGPATH} `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}`; do \
 				${DO}       (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
@@ -384,7 +392,7 @@ bulk-package:
 			if [ -f "${WRKLOG}" ]; then \
 				(${ECHO_MSG} "<pre>"; \
 				${ECHO_MSG} ""; \
-				${CAT} ${WRKLOG}; \
+				${TO_HTML} ${WRKLOG}; \
 				${ECHO_MSG} "</pre>"; \
 				) >> ${BROKENWRKLOG}; \
 			fi; \
@@ -443,7 +451,7 @@ bulk-package:
 		fi ; \
 		case ${_PRESERVE_WRKDIR} in				\
 		yes|YES)	;;					\
-		*)	${ECHO_MSG} "BULK> Cleaning packages and its depends"; \
+		*)	${ECHO_MSG} "BULK> Cleaning package ${PKGNAME} and pre-requisite packages"; \
 		 	if [ "${USE_BULK_CACHE}" = "yes" ]; then	\
 				for pkgdir in ${PKGPATH} `${SED} -n -e "/^${_ESCPKGPATH} / s;^[^:]*:;;p" ${DEPENDSFILE}`; do \
 					${DO}       (cd ${PKGSRCDIR}/$$pkgdir && ${MAKE} clean) ; \
diff --git a/mk/bulk/build b/mk/bulk/build
index be9fa6f819f..fe376f6ee6e 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.45.2.3 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: build,v 1.45.2.4 2005/05/17 18:29:45 tv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -200,10 +200,10 @@ if [ -d pkgtools/pkglint ]; then
 	BROKENWRKLOG=`${BMAKE} show-var VARNAME=BROKENWRKLOG ` || fail=yes
 	BUILDLOG=`${BMAKE} show-var VARNAME=BUILDLOG` || fail=yes
 	STARTFILE=`${BMAKE} show-var VARNAME=STARTFILE` || fail=yes
-	AWK=`${BMAKE} show-var VARNAME=AWK` || fail=yes
-	GREP=`${BMAKE} show-var VARNAME=GREP` || fail=yes
-	SED=`${BMAKE} show-var VARNAME=SED` || fail=yes
-	MAIL_CMD=`${BMAKE} show-var VARNAME=MAIL_CMD` || fail=yes
+	AWK=`${BMAKE} show-var VARNAME=AWK USE_TOOLS=awk` || fail=yes
+	GREP=`${BMAKE} show-var VARNAME=GREP USE_TOOLS=grep` || fail=yes
+	SED=`${BMAKE} show-var VARNAME=SED USE_TOOLS=sed` || fail=yes
+	MAIL_CMD=`${BMAKE} show-var VARNAME=MAIL_CMD USE_TOOLS=mail` || fail=yes
 	MACHINE_ARCH=`${BMAKE} show-var VARNAME=MACHINE_ARCH` || fail=yes
 	OPSYS=`${BMAKE} show-var VARNAME=OPSYS` || fail=yes
 	OS_VERSION=`${BMAKE} show-var VARNAME=OS_VERSION` || fail=yes
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example
index 3dd48ed3179..54abda7295d 100644
--- a/mk/bulk/build.conf-example
+++ b/mk/bulk/build.conf-example
@@ -1,5 +1,5 @@
 # build.conf
-# $NetBSD: build.conf-example,v 1.22.4.2 2005/03/02 19:38:26 tv Exp $
+# $NetBSD: build.conf-example,v 1.22.4.3 2005/05/17 18:29:45 tv Exp $
 #
 # config file in /bin/sh syntax for {,pre,post}-build
 #
@@ -33,7 +33,7 @@ USR_PKGSRC="/usr/pkgsrc"
 CVS_USER="yourlogin"
 
 # Flags to pass to 'cvs update', e.g. to get a certain branch
-#CVS_FLAGS="-rnetbsd-2004Q1"
+#CVS_FLAGS="-rnetbsd-2005Q1"
 #CVS_FLAGS="-A"				# pkgsrc-current
 
 # prune distfiles to remove those which are out of date
diff --git a/mk/bulk/do-sandbox-build b/mk/bulk/do-sandbox-build
index d0749481e4c..58d2ab2d6a2 100644
--- a/mk/bulk/do-sandbox-build
+++ b/mk/bulk/do-sandbox-build
@@ -1,10 +1,10 @@
 #!/bin/sh
-#	$NetBSD: do-sandbox-build,v 1.7.8.2 2005/02/11 15:27:57 tv Exp $
+#	$NetBSD: do-sandbox-build,v 1.7.8.3 2005/05/17 18:29:45 tv Exp $
 
 #
 # Script to start a sandbox build
 #
-# See pkgsrc/Packages.txt for documentation!
+# See pkgsrc/doc/pkgsrc.txt for documentation!
 #
 
 sh=`which sh`
diff --git a/mk/bulk/do-sandbox-upload b/mk/bulk/do-sandbox-upload
index e5e6c87105b..1aac9f0a455 100644
--- a/mk/bulk/do-sandbox-upload
+++ b/mk/bulk/do-sandbox-upload
@@ -1,10 +1,10 @@
 #!/bin/sh
-#	$NetBSD: do-sandbox-upload,v 1.2.2.2 2005/01/13 20:11:55 tv Exp $
+#	$NetBSD: do-sandbox-upload,v 1.2.2.3 2005/05/17 18:29:45 tv Exp $
 
 #
 # Script to start a sandbox build
 #
-# See pkgsrc/Packages.txt for documentation!
+# See pkgsrc/doc/pkgsrc.txt for documentation!
 #
 
 sh=`which sh`
diff --git a/mk/bulk/mksandbox b/mk/bulk/mksandbox
index 0586f955867..2ad6696bcf0 100755
--- a/mk/bulk/mksandbox
+++ b/mk/bulk/mksandbox
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: mksandbox,v 1.38.2.1 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: mksandbox,v 1.38.2.2 2005/05/17 18:29:45 tv Exp $
 #
 #
 # Copyright (c) 2002 Alistair G. Crooks.  All rights reserved.
@@ -60,6 +60,10 @@ err()
 	exit 1
 }
 
+# by default, don't require src and xsrc to be available
+need_src=no
+need_xsrc=no
+
 opsys=`uname -s`
 case "$opsys" in
 Darwin)
@@ -102,6 +106,8 @@ NetBSD)
 	mountprog=/sbin/mount
 	paxprog=/bin/pax
 	sedprog=/usr/bin/sed
+	need_src=yes
+	need_xsrc=yes
 	;;
 SunOS)
 	bmakeprog=bmake
@@ -158,11 +164,11 @@ if [ ! -d $pkgsrc ]; then
 	err "pkgsrc directory $pkgsrc does not exist."
 fi
 
-if [ ! -d $src ]; then
+if [ ! -d $src -a "$need_src" = "yes" ]; then
 	err "source directory $src does not exist."
 fi
 
-if [ ! -d $xsrc ]; then
+if [ ! -d $xsrc -a "$need_xsrc" = "yes" ]; then
 	err "xsrc directory $xsrc does not exist."
 fi
 
@@ -268,20 +274,24 @@ for f in $sandboxEmptyFiles; do
 	$cpprog /dev/null $sandbox$f
 done
 
-echo "Mount $src from $sandbox"
-$mkdirprog $sandbox/usr/src
-$mountprog $mountflags -r $src $sandbox/usr/src
-echo "$src /usr/src ro \\" >> $sandbox_script
+if [ "$need_src" = "yes" ]; then
+	echo "Mount $src from $sandbox"
+	$mkdirprog $sandbox/usr/src
+	$mountprog $mountflags -r $src $sandbox/usr/src
+	echo "$src /usr/src ro \\" >> $sandbox_script
+fi
 
 echo "Mount $pkgsrc from $sandbox"
 $mkdirprog $sandbox/usr/pkgsrc
 $mountprog $mountflags $pkgsrc $sandbox/usr/pkgsrc
 echo "$pkgsrc /usr/pkgsrc rw \\" >> $sandbox_script
 
-echo "Mount $xsrc from $sandbox"
-$mkdirprog $sandbox/usr/xsrc
-$mountprog $mountflags -r $xsrc $sandbox/usr/xsrc
-echo "$xsrc /usr/xsrc ro \\" >> $sandbox_script
+if [ "$need_xsrc" = "yes" ]; then
+	echo "Mount $xsrc from $sandbox"
+	$mkdirprog $sandbox/usr/xsrc
+	$mountprog $mountflags -r $xsrc $sandbox/usr/xsrc
+	echo "$xsrc /usr/xsrc ro \\" >> $sandbox_script
+fi
 
 echo "Mounting $packages and $distfiles from $sandbox"
 $mkdirprog $sandbox/$packages $sandbox/$distfiles
diff --git a/mk/bulk/post-build b/mk/bulk/post-build
index 41b79f5ee16..c01e9105817 100644
--- a/mk/bulk/post-build
+++ b/mk/bulk/post-build
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: post-build,v 1.47.2.3 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: post-build,v 1.47.2.4 2005/05/17 18:29:45 tv Exp $
 #
 # Collect stuff after a pkg bulk build
 #
@@ -241,7 +241,7 @@ sub pkgResult ($$) {
 		'<td align="right" class="pkg-'.$state_style.'">'.$nbrokenby.'</td>'
 		if $nbrokenby > 0;
 
-	if ($pinfo->{nerrors} != 0 && $verbose && $state eq "broken") {
+	if ($pinfo->{nerrors} != 0 && $verbose && ($state eq "broken" || $state eq "topten")) {
 		print swrite($report_form, $pkg, $nbrokenby > 0 ? $nbrokenby : "", $maintainer);
 	}
 
@@ -450,6 +450,7 @@ tt.filename {
 <p>
   Jump to:<br/>
   <ul>
+    <li><a href="#topten">Top Ten Offenders</a></li>
     <li><a href="#broken">Broken packages</a></li>
     <li><a href="#broken depends">Broken dependencies</a></li>
     <li><a href="#not packaged">Not packaged</a></li>
@@ -459,19 +460,20 @@ tt.filename {
 EOHTML
 
 	my %state_head = (
+		"topten" => "Top Ten Offenders",
 		"broken" => "Broken packages",
 		"broken depends" => "Broken dependencies",
 		"not packaged" => "Not packaged"
 	);
 
-	# only include broken packages in the email, see also pkgResult().
-	if ($verbose && scalar(@{$broken->{"broken"}})) {
-		print "\n\n$state_head{broken}\n\n";
+	foreach my $state ("topten", "broken", "broken depends", "not packaged") {
+		next unless scalar(@{$broken->{$state}});
+		
+		if ($verbose && ($state eq "topten" || $state eq "broken")) {
+			print "\n\n$state_head{$state}\n\n";
 		print $report_head;
 	}
 
-	foreach my $state ("broken", "broken depends", "not packaged") {
-		next unless scalar(@{$broken->{$state}});
 
 		print HTML <<EOHTML;
 
@@ -571,6 +573,12 @@ sub getBroken {
 		$res->{$state} = [ sort { $a->{pkg} cmp $b->{pkg} } @{$res->{$state}} ];
 	}
 
+	$res->{"topten"} = [ sort { $b->{nbrokenby} <=> $a->{nbrokenby} } @{$res->{"broken"}} ];
+
+	for (my $count = $#{$res->{"topten"}}; $count >= 10; $count--) {
+		pop(@{$res->{"topten"}});
+	}
+
 	return $res;
 }
 
diff --git a/mk/bulk/pre-build b/mk/bulk/pre-build
index bf74926ef5a..37534dc7044 100644
--- a/mk/bulk/pre-build
+++ b/mk/bulk/pre-build
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: pre-build,v 1.40.2.2 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: pre-build,v 1.40.2.3 2005/05/17 18:29:45 tv Exp $
 #
 # Clean up system to be ready for bulk pkg build
 #
@@ -53,6 +53,18 @@ fi
 
 LOCALBASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=LOCALBASE )`;
 X11BASE=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=X11BASE )`;
+DISTDIR=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=DISTDIR )`;
+
+# Make sure the pkg-vulnerabilities file is up to date
+echo "Making sure vulnerability-list is upto date:"
+if [ -z "$UPDATE_VULNERABILITY_LIST" -o "$UPDATE_VULNERABILITY_LIST" = yes ]; then
+       ( cd ${USR_PKGSRC}/security/audit-packages                       \
+         && ${BMAKE} bulk-install                                       \
+         && env PKGVULNDIR=${DISTDIR} download-vulnerability-list )
+       echo 'done.'
+else
+       echo '(skipped)'
+fi
 
 # On non-NetBSD platforms we need to keep the bootstrap-files!
 if [ x"$BMAKE" = x"bmake" ]; then
@@ -173,7 +185,6 @@ fi
 #
 # Remove old/broken distfiles and binary packages
 #
-DISTDIR=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=DISTDIR )`;
 PACKAGES=`( cd ${PKGLINT_PKG_DIR} ; ${BMAKE} show-var VARNAME=PACKAGES )`;
 
 case "$LINTPKGSRC_CACHE$PRUNEDISTFILES$PRUNEPACKAGES" in
@@ -235,6 +246,24 @@ yes|YES)
 	;;
 esac
 
+# Clean out the packages added above so that the real bulk build
+# is started in a consistent state.
+for dbdir in ${PKG_DBDIR} ${DEPOTBASE}; do
+	echo Removing all installed packages in $dbdir
+	if [ -d $dbdir ]; then
+		cd $dbdir
+		for pkg in *
+		do
+			if `pkg_info -K $dbdir -qe $pkg`; then
+				echo pkg_delete -r $pkg
+				pkg_delete -K $dbdir -r $pkg
+			fi
+		done
+	fi
+done
+
+cd ${USR_PKGSRC}
+
 # on non-NetBSD, we don't want these to build as they overwrite
 # bootstrap-pkgsrc generated files and thus would break the following builds.
 
diff --git a/mk/bulk/printdepends b/mk/bulk/printdepends
index 2316e4f2b08..4a650b09afe 100644
--- a/mk/bulk/printdepends
+++ b/mk/bulk/printdepends
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: printdepends,v 1.15 2004/02/25 09:20:59 grant Exp $
+# $NetBSD: printdepends,v 1.15.8.1 2005/05/17 18:29:45 tv Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -64,15 +64,15 @@ cwd=$PWD
 
 # get some initial variables
 cd $cwd/pkgtools/pkglint
-GREP=`${BMAKE} show-var VARNAME=GREP`
-SED=`${BMAKE} show-var VARNAME=SED`
+GREP=`${BMAKE} show-var VARNAME=GREP USE_TOOLS=grep`
+SED=`${BMAKE} show-var VARNAME=SED USE_TOOLS=sed`
 cd $cwd
 
 if [ -n "${PKGLIST}" ]; then
 	list="${PKGLIST}"
 else
 	# List of all pkgs, from pkgsrc/*/Makefile
-	list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${SED} 's,/Makefile.*=[[:space:]]*,/,'`
+	list=`${GREP} '^[[:space:]]*'SUBDIR */Makefile | ${GREP} -v regress/ | ${SED} 's,/Makefile.*=[[:space:]]*,/,'`
 fi
 
 # cache the package list for printindex
diff --git a/mk/bulk/printindex b/mk/bulk/printindex
index 81ba9a711a3..909c08f2064 100644
--- a/mk/bulk/printindex
+++ b/mk/bulk/printindex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: printindex,v 1.15 2004/04/09 18:43:14 jschauma Exp $
+# $NetBSD: printindex,v 1.15.6.1 2005/05/17 18:29:45 tv Exp $
 #
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -59,8 +59,8 @@ cwd=$PWD
 
 # get some initial variables
 cd $cwd/pkgtools/pkglint
-GREP=`${BMAKE} show-var VARNAME=GREP`
-SED=`${BMAKE} show-var VARNAME=SED`
+GREP=`${BMAKE} show-var VARNAME=GREP USE_TOOLS=grep`
+SED=`${BMAKE} show-var VARNAME=SED USE_TOOLS=sed`
 cd $cwd
 
 if [ -r ${cwd}/.pkglist ]; then
diff --git a/mk/bulk/tflat b/mk/bulk/tflat
index 8764b05d63c..2ed94a0e58e 100755
--- a/mk/bulk/tflat
+++ b/mk/bulk/tflat
@@ -1,4 +1,4 @@
-# $NetBSD: tflat,v 1.13 2004/04/09 18:43:14 jschauma Exp $
+# $NetBSD: tflat,v 1.13.6.1 2005/05/17 18:29:45 tv Exp $
 #
 # Copyright (c) 2001 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -99,7 +99,7 @@ BEGIN {
 	}
 
 	for (x in alldepends){
-		print x depstr alldepends[x] | "sort";
+		print x depstr alldepends[x] | "${SORT-sort}";
 	}
 
 	printf("\n");
diff --git a/mk/bulk/upload b/mk/bulk/upload
index e7d88f4cada..fc8c56d20cc 100644
--- a/mk/bulk/upload
+++ b/mk/bulk/upload
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.18.6.1 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: upload,v 1.18.6.2 2005/05/17 18:29:45 tv Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -16,9 +16,9 @@ NetBSD)	BMAKE=make;
 	SYSVSUM="sum -o 2";
 	;;
 IRIX*)  BMAKE=bmake;
-#	BSDSUM="sum -r";
-#	CKSUM="cksum";
-#	SYSVSUM="sum";
+	BSDSUM="sum -r";
+	CKSUM="cksum";
+	SYSVSUM="sum";
 	;;
 *)	BMAKE=bmake ;;
 esac
@@ -39,35 +39,30 @@ fi
 
 cd $USR_PKGSRC
 
-if [ "$RSYNC_DST_SPECIFIC" != "" -o "$RSYNC_DST_OTHER" != "" ]; then
-	echo Use of RSYNC_DST_SPECIFIC and RSYNC_DST_OTHER is deprecated.
-	echo Please just set RSYNC_DST in build.conf.
-	exit 1
-fi
-
 if [ -z "$RSYNC_DST" ]; then
 	echo "You must set the variable RSYNC_DST, see build.conf-example."
 	exit 1
 fi
 
-# Paths for both OS-version-specific and general pkgs:
-RSYNC_DST_SPECIFIC=${RSYNC_DST}
-RSYNC_DST_OTHER=${RSYNC_DST}
-
 #
 # Some temp files
 #
 
-umask 22
-TMPDIR=${TMPDIR:-/tmp}
-TMP=${TMPDIR}/pkg_upload.$$
-mkdir $TMP
+umask 022
+TMPDIR="${TMPDIR:-/tmp}"
+TMP="${TMPDIR}"/pkg_upload.$$
+(umask 077 && mkdir "${TMP}")
+if [ $? -ne 0 ]
+then
+        echo $0: cannot create temporary directory \""${TMP}"\" >&2
+        exit 1
+fi
 
-exf=$TMP/exclude
-osf=$TMP/osversion_specific
-upload=$TMP/upload
-upload_specific=$TMP/upload_specific
-upload_others=$TMP/upload_others
+exf="$TMP"/exclude
+vf="$TMP"/vulnerable
+upload="$TMP"/upload
+upload_general="$TMP"/upload_general
+upload_vulnerable="$TMP"/upload_vulnerable
 
 # May be different than $USR_PKGSRC:
 pkgsrcdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=_PKGSRCDIR`
@@ -79,7 +74,7 @@ distdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=DISTDIR`
 ( cd net/rsync ;               ${BMAKE} bulk-install )
 ( cd security/audit-packages ; ${BMAKE} bulk-install )
 
-echo "Making sure vulnerability-list is upto date:"
+echo "Making sure vulnerability-list is up-to-date:"
 if [ -z "$UPDATE_VULNERABILITY_LIST" -o "$UPDATE_VULNERABILITY_LIST" = "yes" ]
 then
 	env PKGVULNDIR=${distdir} download-vulnerability-list
@@ -96,14 +91,13 @@ yes|YES)
 	;;
 esac
 
-echo "Checking for restricted, out of date, and vulnerable packages:"
+echo "Checking for restricted and out of date packages:"
 # -p  =  report old versions of packages
 # -R  =  report restricted packages
-# -V  =  report vulnerable packages
-lintpkgsrc $lintpkgsrc_cache -K $packages -P $pkgsrcdir -pRV  | sed 's@'$packages'/@@' > $exf
+lintpkgsrc $lintpkgsrc_cache -K $packages -P $pkgsrcdir -pR  | sed 's@'$packages'/@@' > "$exf"
 
-echo "Checking for OSVERSION_SPECIFIC pkgs:"
-lintpkgsrc $lintpkgsrc_cache -K $packages -P $pkgsrcdir -O  | sed 's@'$packages'/@@' > $osf
+echo "Checking for vulnerable packages:"
+lintpkgsrc $lintpkgsrc_cache -K $packages -P $pkgsrcdir -V  | sed 's@'$packages'/@@' > "$vf"
 
 RSFLAGS="-vap --progress $RSYNC_OPTS"
 
@@ -112,6 +106,8 @@ cd $packages
 
 if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then
 
+	echo "Calculating checksum files..."
+
 	SUMFILES="BSDSUM CKSUM MD5 SHA1 SYSVSUM"
 
 	rm -f ${SUMFILES}
@@ -150,50 +146,53 @@ if [ "${MKSUMS}" = "yes" -o "${MKSUMS}" = "YES" ]; then
 			if [ -s $i ]; then
 				echo "Signing $i"
 				gpg --clearsign $i && rm $i
-				echo ${i}.asc >> $osf
 			fi
 		done
+	else
+		echo "Checksum files not PGP-signed. Please do so manually!"
+		echo "(Run 'gpg --clearsign' on all of them)"
 	fi
 fi
 
 
-echo "#!/bin/sh" > $upload
-echo "packages=$packages" >> $upload
-echo "if ! cd $packages ; then" >> $upload
-echo "	echo \"could not cd to $packages\"" >> $upload
-echo "	exit 1" >> $upload
-echo "fi" >> $upload
-
-echo "Uploading OSVERSION_SPECIFIC pkgs"
-cmd="rsync $RSFLAGS --include '*/' --exclude-from=$exf --include-from=$osf \
-	--exclude '*' . $RSYNC_DST_SPECIFIC"
-cp -f $upload $upload_specific
-echo $cmd >> $upload_specific
-chmod 755 $upload_specific
-echo $cmd
-. $upload_specific
+echo "#!/bin/sh" > "$upload"
+echo "packages=$packages" >> "$upload"
+echo "if ! cd $packages ; then" >> "$upload"
+echo "	echo \"could not cd to $packages\"" >> "$upload"
+echo "	exit 1" >> "$upload"
+echo "fi" >> "$upload"
+
+echo "Uploading non-vulnerable pkgs"
+cmd="rsync $RSFLAGS --exclude-from=\"$exf\" --exclude-from=\"$vf\" . \"$RSYNC_DST\""
+cp -f "$upload" "$upload_general"
+echo "$cmd" >> "$upload_general"
+chmod 755 "$upload_general"
+echo "$cmd"
+sh "$upload_general"
 if [ $? != 0 ]; then
 	echo "--------------------------------------------------"
 	echo " "
-	echo "WARNING rsync failed.  To retry later, you can run"
-	echo "    $upload_specific"
+	echo "WARNING: rsync failed.  To retry later, you can run"
+	echo "    $upload_general"
 	echo " "
 	echo "--------------------------------------------------"
 	failed=yes
 fi
 
-echo "Uploading non-OSVERSION_SPECIFIC pkgs"
-cmd="rsync $RSFLAGS --exclude-from=$exf --exclude-from=$osf . $RSYNC_DST_OTHER"
-cp -f $upload $upload_others
-echo $cmd >> $upload_others
-chmod 755 $upload_others
-echo $cmd
-. $upload_others
+echo "Uploading vulnerable pkgs"
+sed -n "s@All/@@p" "$exf" > "$exf.new"
+sed -n "s@All/@@p" "$vf" > "$vf.new"
+cmd="rsync $RSFLAGS --exclude-from=\"$exf.new\" --include-from=\"$vf.new\" --exclude='*' All/ \"$RSYNC_DST/vulnerable/\""
+cp -f "$upload" "$upload_vulnerable"
+echo "$cmd" >> "$upload_vulnerable"
+chmod 755 "$upload_vulnerable"
+echo "$cmd"
+sh "$upload_vulnerable"
 if [ $? != 0 ]; then
 	echo "--------------------------------------------------"
 	echo " "
-	echo "WARNING rsync failed.  To retry later, you can run"
-	echo "    $upload_others"
+	echo "WARNING: rsync failed.  To retry later, you can run"
+	echo "    $upload_vulnerable"
 	echo " "
 	echo "--------------------------------------------------"
 	failed=yes
@@ -201,5 +200,5 @@ fi
 
 # clean up temp files
 if [ "$failed" = "no" ]; then
-	rm -fr $TMP
+	rm -fr "$TMP"
 fi
diff --git a/mk/compiler/f2c.mk b/mk/compiler/f2c.mk
index b0dd069a068..8b3b1df72f3 100644
--- a/mk/compiler/f2c.mk
+++ b/mk/compiler/f2c.mk
@@ -1,4 +1,4 @@
-# $NetBSD: f2c.mk,v 1.3.2.3 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: f2c.mk,v 1.3.2.4 2005/05/17 18:29:45 tv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -96,11 +96,7 @@ PREPEND_PATH+=	${_F2C_DIR}/bin
 .  endif
 
 # Add the dependency on f2c.
-.  if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.    include "../../lang/f2c/buildlink3.mk"
-.  else
-DEPENDS+=	f2c>=20001205nb3:../../lang/f2c
-.  endif
+.  include "../../lang/f2c/buildlink3.mk"
 
 .  if defined(F2C_DIR) && !empty(F2C_DIR)
 BUILD_ENV+=	F2C_DIR=${F2C_DIR:Q}
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index 0286bf3f489..da1ca9b1382 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.74.2.4 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: gcc.mk,v 1.74.2.5 2005/05/17 18:29:45 tv Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	defined
@@ -403,17 +403,9 @@ PREPEND_PATH+=	${_GCC_DIR}/bin
 
 # Add the dependency on GCC.
 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
-.  if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.    for _dir_ in ${_GCC_PKGSRCDIR}
-.      include "${_dir_}/buildlink3.mk"
-.    endfor
-.  else
-.    if defined(_USE_GCC_SHLIB)
-DEPENDS+=	${_GCC_DEPENDENCY}
-.    else
-BUILD_DEPENDS+=	${_GCC_DEPENDENCY}
-.    endif
-.  endif
+.  for _dir_ in ${_GCC_PKGSRCDIR}
+.    include "${_dir_}/buildlink3.mk"
+.  endfor
 .endif
 
 # Create compiler driver scripts in ${WRKDIR}.
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index a330c9ecf90..6163d502a8e 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.14.2.9 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: mk.conf,v 1.14.2.10 2005/05/17 18:29:45 tv Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -26,6 +26,11 @@ MANINSTALL?= maninstall catinstall
 # Possible: defined, not defined
 # Default: not defined
 
+GZIP?=	-9
+# default compression level when compressing files with gzip
+# Possible: -[0-9], --fast, --best (see gzip(1))
+# Default: -9
+
 #MKCRYPTO= no
 # If not YES or yes, don't fetch, build or install crypto packages.
 # Possible: not defined, no
@@ -97,7 +102,7 @@ IGNORE_RECOMMENDED?=	no
 # are possibly ignored.
 #
 # WARNING: This should only be set if you know what you're doing.
-# Please read pkgsrc/Packages.txt for details.
+# Please read pkgsrc/doc/pkgsrc.txt for details.
 #
 # Possible: yes, no
 # Default: no
@@ -502,10 +507,10 @@ PATCH_FUZZ_FACTOR?= -F0
 # Possible: any combination of packages
 # Default: not set
 
-#EXTRACT_USING_PAX=
-# Use pax(1) to extract archives, rather than GNU tar.
-# Possible: defined, not defined
-# Default: not defined
+EXTRACT_USING?= nbtar
+# Use the specified tool to extract tar/ustar archives.
+# Possible: gtar, nbtar, pax
+# Default: nbtar
 
 #FAILOVER_FETCH=
 # Perform a checksum at "make fetch" time.  If the checksum doesn't
@@ -636,7 +641,7 @@ WARN_NO_OBJECT_FMT?=yes
 # Default: (no option)
 
 #LOCALPATCHES=...
-# Directory where local patches are stored. See pkgsrc/Packages.txt.
+# Directory where local patches are stored. See pkgsrc/doc/pkgsrc.txt.
 # Possible: Any local directory
 # Default: none
 
@@ -644,6 +649,11 @@ WARN_NO_OBJECT_FMT?=yes
 #	Definitions used only in the packages collection
 #
 
+#ACROREAD_FONTPATH?=	${PREFIX}/lib/X11/fonts/TTF
+# Colon separated list of additional directories for acroread7 to
+# look in for TTF/Type1 fonts.
+# Default: ${PREFIX}/lib/X11/fonts/TTF
+
 #AMANDA_SMB=
 # Used in amanda-client and amanda-dev-client to enable backup with
 # smbclient.
@@ -1914,6 +1924,31 @@ RPM_DB_PREFIX?=	${VARBASE}/pkg
 # Possible: any valid location, e.g. ${LOCALBASE}
 # Default: ${VARBASE}/pkg
 
+#RSSH_SCP_PATH=
+# Used in the rssh package to specify pathname to scp(1)
+# Possible: any valid pathname for scp command
+# Default: not defined
+
+#RSSH_SFTP_SERVER_PATH=
+# Used in the rssh package to specify pathname to sftp-server(8)
+# Possible: any valid pathname for sftp-server command
+# Default: not defined
+
+#RSSH_CVS_PATH=
+# Used in the rssh package to specify pathname to cvs(1)
+# Possible: any valid pathname for cvs command
+# Default: not defined
+
+#RSSH_RDIST_PATH=
+# Used in the rssh package to specify pathname to rdist(1)
+# Possible: any valid pathname for rdist command
+# Default: not defined
+
+#RSSH_RSYNC_PATH=
+# Used in the rssh package to specify pathname to rsync(1)
+# Possible: any valid pathname for rsync command
+# Default: not defined
+
 #SAWFISH_THEMES=
 # Specifies the DISTFILES for wm/sawfish-themes, to allow the user to choose
 # which themes to install
@@ -2348,21 +2383,21 @@ XEN12_USE_COM2?=	NO
 
 # Japan
 #
-#MASTER_SITE_CYGWIN=	ftp://ftp.ring.gr.jp/archives/pc/gnu-win32/
-#MASTER_SITE_GNOME=	ftp://ftp.ring.gr.jp/pub/X/gnome/
-#MASTER_SITE_GNU=	ftp://ftp.ring.gr.jp/pub/GNU/
-#MASTER_SITE_MOZILLA=	ftp://ftp.ring.gr.jp/pub/net/www/mozilla/mozilla/releases/
-#MASTER_SITE_PERL_CPAN=	ftp://ftp.ring.gr.jp/pub/lang/perl/CPAN/modules/by-module/
+#MASTER_SITE_CYGWIN=	ftp://ftp.t.ring.gr.jp/archives/pc/gnu-win32/
+#MASTER_SITE_GNOME=	ftp://ftp.t.ring.gr.jp/pub/X/gnome/
+#MASTER_SITE_GNU=	ftp://ftp.t.ring.gr.jp/pub/GNU/
+#MASTER_SITE_MOZILLA=	ftp://ftp.t.ring.gr.jp/pub/net/www/mozilla/mozilla/releases/
+#MASTER_SITE_PERL_CPAN=	ftp://ftp.t.ring.gr.jp/pub/lang/perl/CPAN/modules/by-module/
 #MASTER_SITE_OPENOFFICE=ftp://ftp.kddlabs.co.jp/office/openoffice/ \
-#			ftp://ftp.ring.gr.jp/pub/misc/openoffice/
-#MASTER_SITE_TEX_CTAN=	ftp://ftp.ring.gr.jp/pub/text/CTAN/
+#			ftp://ftp.t.ring.gr.jp/pub/misc/openoffice/
+#MASTER_SITE_TEX_CTAN=	ftp://ftp.t.ring.gr.jp/pub/text/CTAN/
 #MASTER_SITE_SUSE=	\
 #	ftp://ftp.kddlabs.co.jp/Linux/packages/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/
 #MASTER_SITE_SUNSITE=	ftp://sunsite.sut.ac.jp/pub/archives/linux/sunsite-unc/
-#MASTER_SITE_XCONTRIB=	ftp://ftp.ring.gr.jp/pub/X/opengroup/contrib/
+#MASTER_SITE_XCONTRIB=	ftp://ftp.t.ring.gr.jp/pub/X/opengroup/contrib/
 #MASTER_SITE_XEMACS=	ftp://ftp.jp.xemacs.org/pub/GNU/xemacs/
 #MASTER_SITE_BACKUP=	\
-#	ftp://ftp.ring.gr.jp/pub/NetBSD/packages/distfiles/ \
+#	ftp://ftp.t.ring.gr.jp/pub/NetBSD/packages/distfiles/ \
 #	ftp://ftp.jp.NetBSD.org/pub/NetBSD/packages/distfiles/
 
 # Switzerland
@@ -2408,11 +2443,3 @@ XEN12_USE_COM2?=	NO
 #	ftp://ftp2.fr.NetBSD.org/pub/NetBSD/packages/distfiles/
 #MASTER_SITE_LOCAL=	\
 #	ftp://ftp.fr.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
-
-.if exists(${.CURDIR}/mk/defaults/obsolete.mk)
-.  include "${.CURDIR}/mk/defaults/obsolete.mk"
-.elif exists(${.CURDIR}/../mk/defaults/obsolete.mk)
-.  include "${.CURDIR}/../mk/defaults/obsolete.mk"
-.elif exists(${.CURDIR}/../../mk/defaults/obsolete.mk)
-.  include "${.CURDIR}/../../mk/defaults/obsolete.mk"
-.endif
diff --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk
index 89287e68140..2814db09482 100644
--- a/mk/defaults/obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mk,v 1.2.2.2 2005/03/06 02:47:42 tv Exp $
+# $NetBSD: obsolete.mk,v 1.2.2.3 2005/05/17 18:29:45 tv Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
@@ -9,73 +9,43 @@ PKG_SYSCONFDIR.priv?=	${PRIV_CONF_DIR}
 .endif
 
 ###
-### Set PKG_DEFAULT_OPTIONS based on global variable settings.
+### Set _PKG_LEGACY_OPTIONS based on to-be-deprecated global variables.
 ###
+
 .if defined(KERBEROS)
-.  if ${KERBEROS} == "4"
-PKG_DEFAULT_OPTIONS+=	kerberos4
-.  else
-PKG_DEFAULT_OPTIONS+=	kerberos
+.  if ${KERBEROS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Mkerberos4)
+_PKG_LEGACY_OPTIONS+=	kerberos4
+_DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos4 instead."
+.  elif !empty(PKG_SUPPORTED_OPTIONS:Mkerberos)
+_PKG_LEGACY_OPTIONS+=	kerberos
+_DEPRECATED_WARNING+="Deprecated variable KERBEROS used, use PKG_DEFAULT_OPTIONS+=kerberos instead."
 .  endif
 .endif
-.if defined(USE_CANNA) && !empty(USE_CANNA:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	canna
-.endif
-.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	cups
-.endif
-.if defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	db4
-.endif
-.if defined(USE_ESOUND) && !empty(USE_ESOUND:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	esound
-.endif
-.if defined(USE_GIF)
-PKG_DEFAULT_OPTIONS+=	gif
-.endif
-.if defined(USE_I586) && !empty(USE_I586:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	i586
-.endif
-.if defined(USE_IDEA) && !empty(USE_IDEA:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	idea
-.endif
-.if defined(USE_INN) && !empty(USE_INN:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	inn
-.endif
-.if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	libcrack
-.endif
-.if defined(USE_MMX) && !empty(USE_MMX:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	mmx
-.endif
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ldap
-.endif
-.if defined(USE_OSS)
-PKG_DEFAULT_OPTIONS+=	oss
-.endif
-.if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	rsaref
-.endif
-.if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	sasl
-.endif
-.if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	sasl2
-.endif
-.if defined(USE_SJ3) && !empty(USE_SJ3:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	sj3
-.endif
 .if defined(USE_SOCKS)
-.  if ${USE_SOCKS} == "4"
-PKG_DEFAULT_OPTIONS+=	socks4
-.  elif ${USE_SOCKS} == "5"
-PKG_DEFAULT_OPTIONS+=	socks5
+.  if ${USE_SOCKS} == "4" && !empty(PKG_SUPPORTED_OPTIONS:Msocks4)
+_PKG_LEGACY_OPTIONS+=	socks4
+_DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks4 instead."
+.  elif ${USE_SOCKS} == "5 && !empty(PKG_SUPPORTED_OPTIONS:Msocks5)"
+_PKG_LEGACY_OPTIONS+=	socks5
+_DEPRECATED_WARNING+="Deprecated variable SOCKS used, use PKG_DEFAULT_OPTIONS+=socks5 instead."
 .  endif
 .endif
-.if defined(USE_WNN4) && !empty(USE_WNN4:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	wnn4
-.endif
-.if defined(USE_XFACE) && !empty(USE_XFACE:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	xface
-.endif
+
+PKG_OPTIONS_LEGACY_VARS+=	USE_CANNA:canna
+PKG_OPTIONS_LEGACY_VARS+=	USE_CUPS:cups
+PKG_OPTIONS_LEGACY_VARS+=	USE_DB4:db4
+PKG_OPTIONS_LEGACY_VARS+=	USE_ESOUND:esound
+PKG_OPTIONS_LEGACY_VARS+=	USE_GIF:gif
+PKG_OPTIONS_LEGACY_VARS+=	USE_I586:i586
+PKG_OPTIONS_LEGACY_VARS+=	USE_IDEA:idea
+PKG_OPTIONS_LEGACY_VARS+=	USE_INN:inn
+PKG_OPTIONS_LEGACY_VARS+=	USE_LIBCRACK:libcrack
+PKG_OPTIONS_LEGACY_VARS+=	USE_MMX:mmx
+PKG_OPTIONS_LEGACY_VARS+=	USE_OPENLDAP:ldap
+PKG_OPTIONS_LEGACY_VARS+=	USE_OSS:oss
+PKG_OPTIONS_LEGACY_VARS+=	USE_RSAREF2:rsaref
+PKG_OPTIONS_LEGACY_VARS+=	USE_SASL:sasl
+PKG_OPTIONS_LEGACY_VARS+=	USE_SASL2:sasl
+PKG_OPTIONS_LEGACY_VARS+=	USE_SJ3:sj3
+PKG_OPTIONS_LEGACY_VARS+=	USE_WNN4:wnn4
+PKG_OPTIONS_LEGACY_VARS+=	USE_XFACE:xface
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
new file mode 100644
index 00000000000..f2bbd1b8a4c
--- /dev/null
+++ b/mk/defaults/options.description
@@ -0,0 +1,242 @@
+2ch_dict	
+a52	
+aac	
+ac3_passthrough	
+ads	
+alsa	
+althash	
+anthy	
+antialias	
+apm	
+apop	
+ark	
+arping1	
+arping2	
+arts	
+aspell	
+ati	
+audiofile	
+authlib	
+avifile	
+awl-sql-tests	
+backend-mysql	
+backend-pgsql	
+badrcptto	
+bayes-sql-tests	
+bdb	
+bigdns	
+bktr	
+bpf	
+buffy-size	
+canna	
+catalog-pgsql	
+catalog-sqlite	
+charset	
+charts	
+chips	
+chroot	
+cirrus	
+cups	
+curl	
+curses	
+cyrix	
+darwin	
+db	
+db2	
+db4	
+debug	
+domainscale	
+drac	
+dummy	
+dynamic	
+eb	
+edit	
+esound			Enable support for Enlightment Sound Daemon.
+faac	
+faad	
+fam	
+ffmpeg	
+flac	
+freetype	
+frontend-fastcgi	
+frontend-modperl1	
+frontend-modperl2	
+gd	
+gdbm	
+gdk-pixbuf	
+glib1	
+glint	
+glpk	
+gnome	
+gnupg	
+gnuplot	
+gnutls	
+gpgsm	
+graphs	
+gsasl	
+gssapi	
+gstreamer	
+gtk	
+gtkfe	
+gucharmap	
+hdf5	
+homedir	
+hpn-patch	
+hub	
+i128	
+i586-optimized	
+i740	
+i810	
+iconv	
+id3	
+idea	
+ifevents	
+ignoreip2	
+imlib	
+imlib2	
+imstt	
+inet6	
+ipfilter	
+iptables	
+ipv6	
+ispell	
+java	
+jpeg	
+jpilot	
+kde	
+kerberos	
+kerberos4	
+kqueue	
+krb4	
+krb5	
+lame	
+largefile	
+largescale	
+ldap	
+ldap-compat	
+leaf	
+libcrack	
+libgcrypt	
+libnet10	
+libnet11	
+long-usernames	
+lookup	
+lua	
+lynxkey	
+lzw	
+m17n	
+m68060-optimized	
+mad	
+magick	
+mdc2	
+metarefresh	
+mga	
+mhash	
+milter	
+mmx	
+modperl	
+multibyte	
+mysql	
+mysql4	
+native	
+ncurses	
+neomagic	
+net-tests	
+netqmail	
+newport	
+nogui	
+nospoof	
+nsc	
+nullenvsender	
+nv	
+ogg	
+okinawa_dict	
+opengl			Use OpenGL as display library.
+openldap	
+openssl	
+outgoingip	
+pam	
+patchviewer	
+pcre	
+perf-tuning	
+perl	
+perl-taint-checks	
+perl-warnings	
+pf	
+pgsql	
+plplot	
+portals	
+postgresql	
+postgresql73	
+postgresql74	
+prefix-cmds	
+python	
+qregex	
+qt	
+quota	
+radius	
+rc5	
+readline	
+realrcptto	
+recommended-db	
+remoteinc	
+rendition	
+rrdtool	
+s3	
+s3virge	
+samba	
+sasl	
+savage	
+sdl			Use SDL as display library.
+siliconmotion	
+sis	
+skey	
+slang	
+slp	
+snmp	
+socketmap	
+socks	
+socks4	
+socks5	
+sqlite	
+ssl	
+starttls	
+static	
+subshell	
+suexec	
+svn	
+syncdir	
+tcpd	
+tcpwrappers	
+tdb	
+tdfx	
+tga	
+tinydns64	
+tls	
+trident	
+truetype	
+tseng	
+unicode	
+unrealircd	
+vesa	
+vflib	
+vfs	
+vga	
+via	
+virtualchroot	
+viruscan	
+vmware	
+vorbis	
+vpop	
+wrap	
+wx	
+x11	
+xface	
+xft	
+xft2	
+xmlimportbugs	
+xmms-eq	
+xvid	
+zaptel	
+zip	
+ziplinks	
diff --git a/mk/djbware.mk b/mk/djbware.mk
new file mode 100644
index 00000000000..adff690119b
--- /dev/null
+++ b/mk/djbware.mk
@@ -0,0 +1,74 @@
+# $NetBSD: djbware.mk,v 1.4.2.2 2005/05/17 18:29:44 tv Exp $
+#
+# Makefile fragment for packages with djb-style build machinery
+#
+# Common functions provided:
+# * a boilerplate RESTRICTED clause
+# * typical defaults for BUILD_TARGET and INSTALL_TARGET
+# * typical values for conf-* files
+# * replace inline definitions of errno with "#include <errno.h>"
+#
+# TODO:
+# * set RESTRICTED automatically iff patches or other mods are applied
+#
+
+.if !defined(DJBWARE_MK)
+DJBWARE_MK=		# defined
+
+DJB_RESTRICTED?=	YES
+DJB_ERRNO_HACK?=	YES
+DJB_BUILD_TARGETS?=	# empty
+DJB_INSTALL_TARGETS?=	# empty
+DJB_CONFIG_PREFIX?=	${PREFIX}
+DJB_CONFIG_HOME?=	conf-home
+DJB_CONFIG_CMDS?=	${DO_NADA}
+BGWARE_INSTALLER?=	NO
+
+BUILD_DEFS+=		DJB_ERRNO_HACK
+
+.if !empty(DJB_RESTRICTED:M[yY][eE][sS])
+RESTRICTED=		"modified source and binaries may not be distributed"
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+.endif
+
+BUILD_TARGET?=		it ${DJB_BUILD_TARGETS}
+INSTALL_TARGET?=	setup check ${DJB_INSTALL_TARGETS}
+
+.if !empty(DJB_ERRNO_HACK:M[yY][eE][sS])
+SUBST_CLASSES+=		djbware
+SUBST_STAGE.djbware=	do-configure
+SUBST_FILES.djbware=	error.h
+SUBST_SED.djbware=	-e 's|^extern\ int\ errno\;|\#include \<errno.h\>|'
+SUBST_MESSAGE.djbware=	"Correcting definition of errno."
+.endif
+
+.if !target(do-configure)
+do-configure:
+	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};			\
+	for i in conf-*; do ${CP} $${i} $${i}.orig_dist; done;		\
+	[ -f ${DJB_CONFIG_HOME} ] && \
+		${ECHO} ${DJB_CONFIG_PREFIX} > ${DJB_CONFIG_HOME};	\
+	[ -f conf-cc ] && \
+		${ECHO} ${CC:Q} ${CFLAGS:Q} > conf-cc;			\
+	[ -f conf-ld ] && \
+		${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > conf-ld;		\
+	[ -f conf-bin ] && \
+		${ECHO} ${DJB_CONFIG_PREFIX}/bin > conf-bin;		\
+	[ -f conf-man ] && \
+		${ECHO} ${DJB_CONFIG_PREFIX}/man > conf-man;		\
+	[ -f conf-qmail ] && \
+		${ECHO} ${QMAILDIR} > conf-qmail;			\
+	${DJB_CONFIG_CMDS}
+.endif
+
+.if !empty(BGWARE_INSTALLER:M[yY][eE][sS])
+. if !target(do-install)
+do-install:
+	${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};			\
+	./installer;							\
+	./instcheck
+. endif
+.endif
+
+.endif	# DJBWARE_MK
diff --git a/mk/emacs.mk b/mk/emacs.mk
index 9cc4ae53a12..f3b20f55eaf 100644
--- a/mk/emacs.mk
+++ b/mk/emacs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.16.10.1 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: emacs.mk,v 1.16.10.2 2005/05/17 18:29:44 tv Exp $
 #
 # A Makefile fragment for Emacs Lisp packages.
 #
@@ -175,9 +175,13 @@ EMACS_BIN=	${PREFIX}/bin/xemacs
 EMACS_PKG_VERSION=	${_EMACS_VERSION_XEMACS_FULL:C|^.*-||}
 EMACS_LISPPREFIX=	${PREFIX}/lib/xemacs/site-packages/lisp
 PKGNAME_PREFIX=		xemacs-
+.if defined(PKGNAME)
 PKGNAME:=		${PKGNAME_PREFIX}${PKGNAME}
+.else
+PKGNAME:=		${PKGNAME_PREFIX}${DISTNAME}${PKGREVISION}
 CONFLICTS+=		${PKGBASE:C|^xemacs-||}-[0-9]*
 .endif
+.endif
 # strip out nb?
 EMACS_VERSION=${EMACS_PKG_VERSION:C|nb[0-9]*$||}
 PLIST_SUBST+=	EMACS_VERSION=${EMACS_VERSION}
diff --git a/mk/endian.mk b/mk/endian.mk
index 341ac3966a0..883cec7ad72 100644
--- a/mk/endian.mk
+++ b/mk/endian.mk
@@ -1,4 +1,4 @@
-# $NetBSD: endian.mk,v 1.3 2004/02/06 19:04:25 jlam Exp $
+# $NetBSD: endian.mk,v 1.3.8.1 2005/05/17 18:29:44 tv Exp $
 #
 # Determine the endianness of the platform by checking header files.
 #
@@ -15,37 +15,37 @@
 # .endif
 
 .include "../../mk/bsd.prefs.mk"
+
 .if !defined(MACHINE_ENDIAN)
-_ENDIAN_H_FILES=	/usr/include/endian.h		# Linux
-_ENDIAN_H_FILES+=	/usr/include/sys/endian.h	# NetBSD=>1.5
-_ENDIAN_H_FILES+=	/usr/include/machine/endian.h	# NetBSD<1.5
-_ENDIAN_H_FILES+=	/usr/include/sys/byteorder.h	# Solaris
-_ENDIAN_H_FILES+=	/dev/null
-.  for FILE in ${_ENDIAN_H_FILES}
-.    if !defined(_ENDIAN_H)
-.      if exists(${FILE})
-_ENDIAN_H?=		${FILE:S/\/usr\/include\///}
-.      endif
-.    endif
-.  endfor
+.  if exists(/usr/include/endian.h)
+_ENDIAN_H=	/usr/include/endian.h		# Linux
+.  elif exists(/usr/include/sys/endian.h)
+_ENDIAN_H=	/usr/include/sys/endian.h	# NetBSD>=1.5
+.  elif exists(/usr/include/machine/endian.h)
+_ENDIAN_H=	/usr/include/machine/endian.h	# NetBSD<1.5
+.  elif exists(/usr/include/sys/byteorder.h)
+_ENDIAN_H=	/usr/include/sys/byteorder.h	# Solaris
+.  else
+_ENDIAN_H=	/dev/null
+.  endif
+
 MACHINE_ENDIAN!=							\
-	byte_order=`							\
-		(							\
-			${ECHO} "\#include <${_ENDIAN_H}>";		\
-			${ECHO} "\#ifndef BYTE_ORDER";			\
-			${ECHO} "\#ifdef _BIG_ENDIAN";			\
-			${ECHO} "\#define BYTE_ORDER 4321";		\
-			${ECHO} "\#else";				\
-			${ECHO} "\#define BYTE_ORDER 1234";		\
-			${ECHO} "\#endif";				\
-			${ECHO} "\#endif";				\
-			${ECHO} "BYTE_ORDER";				\
-		) | ${CC} -E - | ${EGREP} "^(1234|4321)"		\
-	`;								\
-	case `${ECHO} $${byte_order}` in				\
-	1234)	${ECHO} little ;;					\
-	4321)	${ECHO} big ;;						\
-	*)	${ECHO} unknown ;;					\
-	esac
-MAKEFLAGS+=	MACHINE_ENDIAN=${MACHINE_ENDIAN}
+	{ ${ECHO} "\#include <${_ENDIAN_H}>";				\
+	  ${ECHO} "\#ifndef BYTE_ORDER";				\
+	  ${ECHO} "\#ifdef _BIG_ENDIAN";				\
+	  ${ECHO} "\#define BYTE_ORDER 4321";				\
+	  ${ECHO} "\#else";						\
+	  ${ECHO} "\#define BYTE_ORDER 1234";				\
+	  ${ECHO} "\#endif";						\
+	  ${ECHO} "\#endif";						\
+	  ${ECHO} "BYTE_ORDER"; } | ${CC} -E - |			\
+	{ while read line; do						\
+		case $$line in						\
+		1234)	${ECHO} "little"; exit 0 ;;			\
+		4321)	${ECHO} "big"; exit 0 ;;			\
+		esac;							\
+	  done;								\
+	  ${ECHO} "unknown"; }
+
+MAKEFLAGS+=	MACHINE_ENDIAN=${MACHINE_ENDIAN:Q}
 .endif
diff --git a/mk/find-prefix.mk b/mk/find-prefix.mk
new file mode 100644
index 00000000000..d0036aa5ca1
--- /dev/null
+++ b/mk/find-prefix.mk
@@ -0,0 +1,32 @@
+# $NetBSD: find-prefix.mk,v 1.3.2.2 2005/05/17 18:29:44 tv Exp $
+#
+# This is a "subroutine" that can be included to find the installation
+# prefix of a package.
+#
+# The input variable is FIND_PREFIX, which is a list of VARNAME=<package>
+# pairs, where "VARNAME" is the variable that will be set to the
+# installation prefix for the package, and <package> is the ${PKGNAME}
+# for the package.
+#
+# An example use is:
+#
+# FIND_PREFIX:=	M4DIR=gm4
+# .include "../../mk/find-prefix.mk"
+# # ${M4DIR} now contains the installation prefix for the "gm4" package
+#
+
+.for _def_ in ${FIND_PREFIX}
+.  if !defined(${_def_:C/=.*$//})
+${_def_:C/=.*$//}_DEFAULT?=	${LOCALBASE}
+_${_def_:C/=.*$//}_cmd=		\
+	${PKG_INFO} -qp ${_def_:C/^.*=//} 2>/dev/null |			\
+	{ read cmd arg;							\
+	  case "$$arg" in						\
+	  "")	${ECHO} ${${_def_:C/=.*$//}_DEFAULT:Q} ;;		\
+	  *)	${ECHO} "$$arg" ;;					\
+	  esac; }
+${_def_:C/=.*$//}=		${_${_def_:C/=.*$//}_cmd:sh}
+.  endif
+MAKEVARS+=	${_def_:C/=.*$//}
+.endfor
+.undef _def_
diff --git a/mk/bsd.pkg.install.mk b/mk/install/bsd.pkginstall.mk
index 130b22464b1..cb5e518d6e6 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/install/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.65.2.3 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.1.2.2 2005/05/17 18:29:45 tv Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -223,7 +223,7 @@ ${INSTALL_PERMS_FILE}: ../../mk/install/perms
 #	at post-install time.
 #
 # RCD_SCRIPTS works lists the basenames of the rc.d scripts.  They are
-#	expected to be found in ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}, and
+#	expected to be found in ${PREFIX}/share/examples/rc.d, and
 #	the scripts will be copied into ${RCD_SCRIPTS_DIR} with
 #	${RCD_SCRIPTS_MODE} permissions.
 #
@@ -235,11 +235,7 @@ SUPPORT_FILES_MODE?=	0644
 SUPPORT_FILES_PERMS?=	# empty
 RCD_SCRIPTS?=		# empty
 RCD_SCRIPTS_MODE?=	0755
-RCD_SCRIPTS_EXAMPLEDIR?=	share/examples/rc.d
-.if !empty(RCD_SCRIPTS_EXAMPLEDIR:M/*)
-PKG_FAIL_REASON+= \
-	"bsd.pkg.install.mk: RCD_SCRIPTS_EXAMPLEDIR can't be an absolute path."
-.endif
+RCD_SCRIPTS_EXAMPLEDIR=	share/examples/rc.d
 RCD_SCRIPTS_SHELL?=	${SH}
 FILES_SUBST+=		RCD_SCRIPTS_SHELL=${RCD_SCRIPTS_SHELL}
 MESSAGE_SUBST+=		RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
@@ -528,10 +524,6 @@ ${INSTALL_FILE}: ${INSTALL_SRC}
 #				the rc.d script (defaults to
 #				${FILESDIR}/<script>.sh)
 #
-# RCD_SCRIPTS_EXAMPLEDIR	the directory relative to ${PREFIX} in
-#				which to install the example rc.d scripts
-#				(defaults to share/examples/rc.d)
-#
 # If the source rc.d script is not present, then the automatic handling
 # doesn't occur.
 
@@ -547,8 +539,6 @@ install-rcd-scripts:	# do nothing
 RCD_SCRIPT_SRC.${_script_}?=	${FILESDIR}/${_script_}.sh
 RCD_SCRIPT_WRK.${_script_}?=	${WRKDIR}/${_script_}
 
-GENERATE_PLIST+=	${ECHO} ${RCD_SCRIPTS_EXAMPLEDIR}/${_script_};
-
 .  if !empty(RCD_SCRIPT_SRC.${_script_})
 .    if exists(${RCD_SCRIPT_SRC.${_script_}})
 generate-rcd-scripts: ${RCD_SCRIPT_WRK.${_script_}}
diff --git a/mk/install/deinstall b/mk/install/deinstall
index f869d194df1..d1dec3c287a 100644
--- a/mk/install/deinstall
+++ b/mk/install/deinstall
@@ -1,6 +1,7 @@
+# -*- sh -*-
 # start of deinstall
 #
-# $NetBSD: deinstall,v 1.29.2.1 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: deinstall,v 1.29.2.2 2005/05/17 18:29:45 tv Exp $
 
 case ${STAGE} in
 VIEW-DEINSTALL)
diff --git a/mk/install/files b/mk/install/files
index 53d0870752f..0ffc5363343 100644
--- a/mk/install/files
+++ b/mk/install/files
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: files,v 1.1.2.3 2005/02/15 16:25:23 tv Exp $
+# $NetBSD: files,v 1.1.2.4 2005/05/17 18:29:45 tv Exp $
 #
 # +FILES - reference-counted configuration file management script
 #
@@ -118,10 +118,6 @@ ADD)
 				${ECHO} "	$file"
 				${ECHO} "	    [$f_eg]"
 				${CP} $f_eg $file
-				case $f_mode in
-				"")	;;
-				*)	${CHMOD} $f_mode $file ;;
-				esac
 				case $f_user in
 				"")	;;
 				*)	${CHOWN} $f_user $file ;;
@@ -130,6 +126,10 @@ ADD)
 				"")	;;
 				*)	${CHGRP} $f_group $file ;;
 				esac
+				case $f_mode in
+				"")	;;
+				*)	${CHMOD} $f_mode $file ;;
+				esac
 			fi
 		fi
 	done
@@ -250,7 +250,7 @@ CHECK-REMOVE)
 		yes)	;;
 		*)	printed_header=yes
 			${ECHO} "==========================================================================="
-			${ECHO} "The following file are no longer being used by ${PKGNAME},"
+			${ECHO} "The following files are no longer being used by ${PKGNAME},"
 			${ECHO} "and they can be removed if no other packages are using them:"
 			${ECHO} ""
 			;;
diff --git a/mk/install/install b/mk/install/install
index 6e861496e7c..2f82daa4c67 100644
--- a/mk/install/install
+++ b/mk/install/install
@@ -1,6 +1,7 @@
+# -*- sh -*-
 # start of install
 #
-# $NetBSD: install,v 1.32.2.2 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: install,v 1.32.2.3 2005/05/17 18:29:45 tv Exp $
 
 case ${STAGE} in
 PRE-INSTALL)
diff --git a/mk/install/perms b/mk/install/perms
index 3292728b1ca..a1bb0488001 100644
--- a/mk/install/perms
+++ b/mk/install/perms
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: perms,v 1.1.2.2 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: perms,v 1.1.2.3 2005/05/17 18:29:45 tv Exp $
 #
 # +PERMS - special file and directory permissions management script
 #
@@ -58,10 +58,6 @@ ${SED} -n "/^\# PERMS: /{s/^\# PERMS: //;p;}" ${SELF} | ${SORT} -u |
 		${ECHO} "	$file (o=$f_user, g=$f_group, m=$f_mode)"
 		;;
 	esac
-	case $f_mode in
-	"")	;;
-	*)	${CHMOD} $f_mode $file ;;
-	esac
 	case $f_user in
 	"")	;;
 	*)	${CHOWN} $f_user $file ;;
@@ -70,6 +66,10 @@ ${SED} -n "/^\# PERMS: /{s/^\# PERMS: //;p;}" ${SELF} | ${SORT} -u |
 	"")	;;
 	*)	${CHGRP} $f_group $file ;;
 	esac
+	case $f_mode in
+	"")	;;
+	*)	${CHMOD} $f_mode $file ;;
+	esac
 done
 case "$printed_header" in
 yes)	${ECHO} ""
diff --git a/mk/install/usergroup b/mk/install/usergroup
index c3e1ea9cab8..37d2ea96949 100644
--- a/mk/install/usergroup
+++ b/mk/install/usergroup
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: usergroup,v 1.7.2.2 2005/02/11 15:27:57 tv Exp $
+# $NetBSD: usergroup,v 1.7.2.3 2005/05/17 18:29:45 tv Exp $
 #
 # +USERGROUP - users and groups management script
 #
@@ -68,13 +68,14 @@ PKG_USER_SHELL="@PKG_USER_SHELL@"
 
 group_exists()
 {
-	case $group in
+	_group="$1"
+	case $_group in
 	"")	return 2 ;;
 	esac
 	# Check using chgrp to work properly in an NIS environment.
 	testfile="./grouptest.tmp.$$"
 	${ECHO} > $testfile
-	if ${CHGRP} $group $testfile >/dev/null 2>&1; then
+	if ${CHGRP} $_group $testfile >/dev/null 2>&1; then
 		${RM} -f $testfile
 		return 0
 	fi
@@ -84,11 +85,12 @@ group_exists()
 
 user_exists()
 {
-	case $user in
+	_user="$1"
+	case $_user in
 	"")	return 2 ;;
 	esac
 	# Check using id to work properly in an NIS environment.
-	if ${ID} $user >/dev/null 2>&1; then
+	if ${ID} $_user >/dev/null 2>&1; then
 		return 0
 	fi
 	return 1
@@ -96,24 +98,24 @@ user_exists()
 
 listwrap()
 {
-	length=$1
-	buffer=
-	while read line; do
-		set -- $line
-		for word; do
-			case $buffer in
-			"")	buffer="$word" ;;
-			*)	buffer="$buffer  $word" ;;
+	_length=$1
+	_buffer=
+	while read _line; do
+		set -- $_line
+		for _word; do
+			case $_buffer in
+			"")	_buffer="$_word" ;;
+			*)	_buffer="$_buffer  $_word" ;;
 			esac
-			if ${TEST} ${#buffer} -gt $length; then
-				${ECHO} "	$buffer"
-				buffer=
+			if ${TEST} ${#_buffer} -gt $_length; then
+				${ECHO} "	$_buffer"
+				_buffer=
 			fi
 		done
 	done
-	case $buffer in
+	case $_buffer in
 	"")	;;
-	*)	${ECHO} "	$buffer" ;;
+	*)	${ECHO} "	$_buffer" ;;
 	esac
 }
 
diff --git a/mk/java-vm.mk b/mk/java-vm.mk
index 61cc81181e5..c0e0ee78e5b 100644
--- a/mk/java-vm.mk
+++ b/mk/java-vm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-vm.mk,v 1.34.2.3 2005/01/13 20:11:55 tv Exp $
+# $NetBSD: java-vm.mk,v 1.34.2.4 2005/05/17 18:29:44 tv Exp $
 #
 # This Makefile fragment handles Java dependencies and make variables,
 # and is meant to be included by packages that require Java either at
@@ -40,14 +40,13 @@ PKG_JVM_DEFAULT?=	# empty
 PKG_JVMS_ACCEPTED?=	${_PKG_JVMS}
 
 # This is a list of all of the JVMs that may be used with java-vm.mk.
-# Note: The wonka configuration is still under development
 #
 .if defined(USE_JAVA2) && !empty(USE_JAVA2:M[yY][eE][sS])
-_PKG_JVMS?=		sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe wonka \
+_PKG_JVMS?=		sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \
 			sun-jdk15 jdk14 # win32-jdk
 .else
 _PKG_JVMS?=		jdk sun-jdk13 sun-jdk14 blackdown-jdk13 kaffe \
-			wonka sun-jdk15 jdk14 # win32-jdk
+			sun-jdk15 jdk14 # win32-jdk
 .endif
 
 # To be deprecated: if PKG_JVM is explicitly set, then use it as the
@@ -103,8 +102,6 @@ _ONLY_FOR_PLATFORMS.sun-jdk15= \
 	Linux-*-i[3-6]86
 #_ONLY_FOR_PLATFORMS.win32-jdk= \
 #	Interix-*-*
-_ONLY_FOR_PLATFORMS.wonka= \
-	*-*-arm *-*-arm32 *-*-i386
 
 # Set the accepted JVMs for this platform.
 .for _jvm_ in ${_PKG_JVMS}
@@ -119,11 +116,10 @@ _JAVA_PKGBASE.blackdown-jdk13=	blackdown-jdk13
 _JAVA_PKGBASE.jdk=		jdk
 _JAVA_PKGBASE.jdk14=		jdk14
 _JAVA_PKGBASE.kaffe=		kaffe
-_JAVA_PKGBASE.sun-jdk13=	sun-jdk13
-_JAVA_PKGBASE.sun-jdk14=	sun-jdk14
-_JAVA_PKGBASE.sun-jdk15=	sun-jdk15
+_JAVA_PKGBASE.sun-jdk13=	sun-jre13
+_JAVA_PKGBASE.sun-jdk14=	sun-jre14
+_JAVA_PKGBASE.sun-jdk15=	sun-jre15
 #_JAVA_PKGBASE.win32-jdk=	win32-jdk
-_JAVA_PKGBASE.wonka=		wonka
 
 # Mark the acceptable JVMs and check which JVM packages are installed.
 .for _jvm_ in ${_PKG_JVMS_ACCEPTED}
@@ -209,7 +205,6 @@ BUILDLINK_DEPENDS.sun-jre14?=		sun-jre14-[0-9]*
 BUILDLINK_DEPENDS.sun-jdk15?=		sun-jdk15-[0-9]*
 BUILDLINK_DEPENDS.sun-jre15?=		sun-jre15-[0-9]*
 #BUILDLINK_DEPENDS.win32-jdk?=		win32-jdk>=0.1
-BUILDLINK_DEPENDS.wonka?=		wonka-[0-9]*
 
 _JRE.blackdown-jdk13=	blackdown-jre13
 _JRE.jdk=		jdk
@@ -219,7 +214,6 @@ _JRE.sun-jdk13=		sun-jre13
 _JRE.sun-jdk14=		sun-jre14
 _JRE.sun-jdk15=		sun-jre15
 #_JRE.win32-jdk=		win32-jdk
-_JRE.wonka=		wonka
 
 _JAVA_BASE_CLASSES=	classes.zip
 
@@ -261,15 +255,7 @@ UNLIMIT_RESOURCES+=	datasize
 #_JDK_PKGSRCDIR=		../../lang/win32-jdk
 #_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
 #_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/win32
-.elif ${_PKG_JVM} == "wonka"
-_JDK_PKGSRCDIR=		../../lang/wonka
-_JRE_PKGSRCDIR=		${_JDK_PKGSRCDIR}
-_JAVA_HOME_DEFAULT=	${LOCALBASE}/java/wonka
-_JAVA_BASE_CLASSES=	wre.jar
-SCRIPTS_ENV+=		JAVAC="jikes"
 .endif
-_JDK_DEPENDENCY?=	${BUILDLINK_DEPENDS.${_PKG_JVM}}:${_JDK_PKGSRCDIR}
-_JRE_DEPENDENCY?=	${BUILDLINK_DEPENDS.${_JRE.${_PKG_JVM}}}:${_JRE_PKGSRCDIR}
 
 .if defined(_JAVA_HOME_DEFAULT)
 _JAVA_HOME=		${_JAVA_HOME_DEFAULT}
@@ -279,12 +265,8 @@ EVAL_PREFIX+=		_JAVA_HOME=${_JAVA_PKGBASE.${_PKG_JVM}}
 
 # We always need a run-time dependency on the JRE.
 .if defined(_JRE_PKGSRCDIR)
-.  if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo])
-.    if exists(${_JRE_PKGSRCDIR}/buildlink3.mk)
-.      include "${_JRE_PKGSRCDIR}/buildlink3.mk"
-.    endif
-.  else
-DEPENDS+=		${_JRE_DEPENDENCY}
+.  if exists(${_JRE_PKGSRCDIR}/buildlink3.mk)
+.    include "${_JRE_PKGSRCDIR}/buildlink3.mk"
 .  endif
 .endif
 
@@ -293,12 +275,8 @@ DEPENDS+=		${_JRE_DEPENDENCY}
 #
 .if empty(USE_JAVA:M[rR][uU][nN])
 .  if defined(_JDK_PKGSRCDIR)
-.    if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[Nn][Oo])
-.      if exists(${_JDK_PKGSRCDIR}/buildlink3.mk)
-.        include "${_JDK_PKGSRCDIR}/buildlink3.mk"
-.      endif
-.    else
-BUILD_DEPENDS+=		${_JDK_DEPENDENCY}
+.    if exists(${_JDK_PKGSRCDIR}/buildlink3.mk)
+.      include "${_JDK_PKGSRCDIR}/buildlink3.mk"
 .    endif
 .  endif
 .endif
diff --git a/mk/mysql.buildlink3.mk b/mk/mysql.buildlink3.mk
index 36507426532..4bae6a1f182 100644
--- a/mk/mysql.buildlink3.mk
+++ b/mk/mysql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.1 2004/10/28 11:28:27 xtraeme Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.1.2.1 2005/05/17 18:29:44 tv Exp $
 
 .if !defined(MYSQL_VERSION_MK)
 MYSQL_VERSION_MK=	# defined
@@ -6,7 +6,7 @@ MYSQL_VERSION_MK=	# defined
 .include "../../mk/bsd.prefs.mk"
 
 MYSQL_VERSION_DEFAULT?=		41
-MYSQL_VERSIONS_ACCEPTED?=	41 40 30
+MYSQL_VERSIONS_ACCEPTED?=	41 40
 
 # transform the list into individual variables
 .for mv in ${MYSQL_VERSIONS_ACCEPTED}
@@ -22,10 +22,6 @@ _MYSQL_VERSION_41_INSTALLED=	yes
 _MYSQL_VERSION_40_INSTALLED=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
-_MYSQL_VERSION_30_INSTALLED=	yes
-.endif
-
 # if a version is explicitely required, take it
 .if defined(MYSQL_VERSION_REQD)
 _MYSQL_VERSION=	${MYSQL_VERSION_REQD}
@@ -67,15 +63,11 @@ _MYSQL_VERSION=	${_MYSQL_VERSION_FIRSTACCEPTED}
 MYSQL_PKGSRCDIR=	../../databases/mysql4-client
 .elif ${_MYSQL_VERSION} == "40"
 MYSQL_PKGSRCDIR=	../../databases/mysql-client
-.elif ${_MYSQL_VERSION} == "30"
-MYSQL_PKGSRCDIR=	../../databases/mysql3-client
 .else
 # force an error
 PKG_SKIP_REASON+=	"${_MYSQL_VERSION} is not a valid mysql package."
 .endif
 
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
-.  include "${MYSQL_PKGSRCDIR}/buildlink3.mk"
-.endif
+.include "${MYSQL_PKGSRCDIR}/buildlink3.mk"
 
 .endif	# MYSQL_VERSION_MK
diff --git a/mk/pam.buildlink3.mk b/mk/pam.buildlink3.mk
index aa397fd9ca8..1ee00c22eb8 100644
--- a/mk/pam.buildlink3.mk
+++ b/mk/pam.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pam.buildlink3.mk,v 1.3.2.2 2005/01/24 18:40:01 tv Exp $
+# $NetBSD: pam.buildlink3.mk,v 1.3.2.3 2005/05/17 18:29:44 tv Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a PAM implementation.  pam.buildlink3.mk will:
@@ -25,7 +25,19 @@ PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
 # This is an exhaustive list of all of the PAM implementations
 # that may be used with PAM.buildlink3.mk, in order of precedence.
 #
-_PAM_PKGS?=	linux-pam openpam solaris-pam
+# OS conditionals can exclude implementations not available on
+# some platforms.
+#
+.if ${OPSYS} != "Interix"
+_PAM_PKGS+=	linux-pam
+.endif
+
+.if ${OPSYS} != "Interix"
+_PAM_PKGS+=	openpam
+.endif
+
+# builtin only, so no conditional needed
+_PAM_PKGS+=	solaris-pam
 
 BUILDLINK_BUILTIN_MK.linux-pam=		../../security/PAM/builtin.mk
 BUILDLINK_BUILTIN_MK.openpam=		../../security/openpam/builtin.mk
diff --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk
index 6137e2fb7fe..92f894984aa 100644
--- a/mk/pgsql.buildlink3.mk
+++ b/mk/pgsql.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.3.2.2 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.3.2.3 2005/05/17 18:29:44 tv Exp $
 
 .if !defined(PGVERSION_MK)
 PGVERSION_MK=	defined
@@ -13,8 +13,25 @@ PGSQL_VERSIONS_ACCEPTED?=	80 74 73
 _PGSQL_VERSION_${pv}_OK=	yes
 .endfor
 
+.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+PG_LIB_EXT=dylib
+.else
+PG_LIB_EXT=so
+.endif
+
 # check what is installed
-.if exists(${LOCALBASE}/lib/libecpg.so.4.2)
+.if ${OPSYS} == "Darwin"
+.if exists(${LOCALBASE}/lib/libecpg.5.0.dylib)
+_PGSQL_VERSION_80_INSTALLED=	yes
+.endif
+.if exists(${LOCALBASE}/lib/libecpg.4.1.dylib)
+_PGSQL_VERSION_74_INSTALLED=	yes
+.endif
+.if exists(${LOCALBASE}/lib/libecpg.3.dylib)
+_PGSQL_VERSION_73_INSTALLED=yes
+.endif
+.else
+.if exists(${LOCALBASE}/lib/libecpg.so.5.0)
 _PGSQL_VERSION_80_INSTALLED=	yes
 .endif
 .if exists(${LOCALBASE}/lib/libecpg.so.4.1)
@@ -23,6 +40,7 @@ _PGSQL_VERSION_74_INSTALLED=	yes
 .if exists(${LOCALBASE}/lib/libecpg.so.3)
 _PGSQL_VERSION_73_INSTALLED=yes
 .endif
+.endif
 
 # if a version is explicitely required, take it
 .if defined(PGSQL_VERSION_REQD)
@@ -62,8 +80,8 @@ _PGSQL_VERSION=	${_PGSQL_VERSION_FIRSTACCEPTED}
 # set variables for the version we decided to use:
 #
 .if ${_PGSQL_VERSION} == "80"
-PGSQL_TYPE=	postgresql80-lib
-PGPKGSRCDIR=	../../databases/postgresql80-lib
+PGSQL_TYPE=	postgresql80-client
+PGPKGSRCDIR=	../../databases/postgresql80-client
 .elif ${_PGSQL_VERSION} == "74"
 PGSQL_TYPE=	postgresql74-lib
 PGPKGSRCDIR=	../../databases/postgresql74-lib
@@ -76,9 +94,7 @@ PGSQL_TYPE=		none
 PKG_SKIP_REASON+=	"${_PGSQL_VERSION} is not a valid package"
 .endif
 
-.if (defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO]))
-.  include "${PGPKGSRCDIR}/buildlink3.mk"
+.include "${PGPKGSRCDIR}/buildlink3.mk"
 PGSQL_PREFIX=	${BUILDLINK_PREFIX.${PGSQL_TYPE}}
-.endif
 
 .endif	# PGVERSION_MK
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
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index cd7c30c2eb2..c4100a1ca97 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.17.2.2 2004/11/30 15:06:34 tv Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.17.2.3 2005/05/17 18:29:44 tv Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  A package that uses
@@ -167,7 +167,7 @@ BUILDLINK_LIBS.pthread=			${BUILDLINK_LIBS.${_PKG_PTHREAD}}
 BUILDLINK_AUTO_VARS.${_PKG_PTHREAD}?=	${PTHREAD_AUTO_VARS}
 BUILDLINK_AUTO_VARS.pthread=		${BUILDLINK_AUTO_VARS.${_PKG_PTHREAD}}
 .  else
-PKG_SKIP_REASON= "${PKGNAME} needs pthreads, but ${_PKG_PTHREAD_BUILDLINK3_MK} is missing."
+PKG_SKIP_REASON= ${PKGNAME:Q}" needs pthreads, but "${_PKG_PTHREAD_BUILDLINK3_MK:Q}" is missing."
 .  endif
 .endif
 
@@ -180,15 +180,15 @@ PTHREAD_CFLAGS=		${BUILDLINK_CFLAGS.pthread}
 PTHREAD_CFLAGS+=	${BUILDLINK_CPPFLAGS.pthread}
 PTHREAD_LDFLAGS=	${BUILDLINK_LDFLAGS.pthread}
 PTHREAD_LIBS=		${BUILDLINK_LIBS.pthread}
-CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-CONFIGURE_ENV+=		PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
-CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}"
-MAKE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
-MAKE_ENV+=		PTHREAD_LDFLAGS="${PTHREAD_LDFLAGS}"
-MAKE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS:Q}
+CONFIGURE_ENV+=		PTHREAD_LDFLAGS=${PTHREAD_LDFLAGS:Q}
+CONFIGURE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:Q}
+MAKE_ENV+=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS:Q}
+MAKE_ENV+=		PTHREAD_LDFLAGS=${PTHREAD_LDFLAGS:Q}
+MAKE_ENV+=		PTHREAD_LIBS=${PTHREAD_LIBS:Q}
 
 PTHREADBASE=		${BUILDLINK_PREFIX.pthread}
-CONFIGURE_ENV+=		PTHREADBASE=${PTHREADBASE}
-MAKE_ENV+=		PTHREADBASE=${PTHREADBASE}
+CONFIGURE_ENV+=		PTHREADBASE=${PTHREADBASE:Q}
+MAKE_ENV+=		PTHREADBASE=${PTHREADBASE:Q}
 
 .endif	# PTHREAD_BUILDLINK3_MK
diff --git a/mk/subst.mk b/mk/subst.mk
index fe0ba4f887f..f6e194e15b6 100644
--- a/mk/subst.mk
+++ b/mk/subst.mk
@@ -1,4 +1,4 @@
-# $NetBSD: subst.mk,v 1.16 2004/08/23 16:37:09 jlam Exp $
+# $NetBSD: subst.mk,v 1.16.4.1 2005/05/17 18:29:44 tv Exp $
 #
 # This Makefile fragment implements a general text replacement facility.
 # Package makefiles define a ``class'', for each of which a paricular
@@ -43,11 +43,7 @@ _SUBST_BACKUP_SUFFIX=	.subst.sav
 .for _class_ in ${SUBST_CLASSES}
 _SUBST_COOKIE.${_class_}=	${WRKDIR}/.subst_${_class_}_done
 
-.  if defined(SUBST_SED.${_class_}) && !empty(SUBST_SED.${_class_})
 SUBST_FILTER_CMD.${_class_}?=	${SED} ${SUBST_SED.${_class_}}
-.  else
-SUBST_FILTER_CMD.${_class_}?=	# empty
-.  endif
 SUBST_POSTCMD.${_class_}?=	${RM} -f $$file${_SUBST_BACKUP_SUFFIX}
 
 SUBST_TARGETS+=			subst-${_class_}
@@ -77,7 +73,6 @@ subst-${_class_}: ${_SUBST_TARGETS.${_class_}}
 	${TOUCH} ${TOUCH_FLAGS} ${_SUBST_COOKIE.${_class_}}
 
 ${_SUBST_COOKIE.${_class_}}:
-.  if !empty(SUBST_FILTER_CMD.${_class_})
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	cd ${WRKSRC};							\
 	files="${SUBST_FILES.${_class_}}";				\
@@ -101,5 +96,4 @@ ${_SUBST_COOKIE.${_class_}}:
 			fi;						\
 		done ;;							\
 	esac
-.  endif
 .endfor
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 603287e62d4..b6d97c2941f 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.24.10.1 2005/01/13 20:11:55 tv Exp $
+# $NetBSD: texinfo.mk,v 1.24.10.2 2005/05/17 18:29:44 tv Exp $
 #
 # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -48,8 +48,9 @@ TEXINFO_MK=	# defined
 # Handle install-info.
 # 
 
-# Use bsd.pkg.install.mk framework i.e. INSTALL/DEINSTALL scripts
-# to handle install-info execution.
+# Use pkginstall framework i.e. INSTALL/DEINSTALL scripts to handle
+# install-info execution.
+#
 USE_PKGINSTALL=		YES
 
 # Pathname relative to ${PREFIX} of directory holding the info
diff --git a/mk/tools.mk b/mk/tools.mk
index 1711f84ff5c..dbbfc482fa0 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.46.2.6 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: tools.mk,v 1.46.2.7 2005/05/17 18:29:44 tv Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -251,11 +251,7 @@ _TOOLS_OVERRIDE.lex=	YES
 _TOOLS_PROGNAME.lex=	${LEX}
 .endif
 .if (${_TOOLS_NEED_GNU.lex} == "YES") && empty(PKGPATH:Mdevel/flex)
-.if defined(USE_BUILDLINK3) && empty(USE_BUILDLINK3:M[nN][oO])
 .include "../../devel/flex/buildlink3.mk"
-.else
-BUILD_DEPENDS+=		flex>=2.5:../../devel/flex
-.endif
 _TOOLS_OVERRIDE.lex=	YES
 _TOOLS_PROGNAME.lex=	${LOCALBASE}/bin/flex
 .  if exists(${_TOOLS_PROGNAME.lex})
diff --git a/mk/tools/autoconf.mk b/mk/tools/autoconf.mk
new file mode 100644
index 00000000000..c0750cb4610
--- /dev/null
+++ b/mk/tools/autoconf.mk
@@ -0,0 +1,190 @@
+# $NetBSD: autoconf.mk,v 1.7.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# This Makefile fragment handles packages that use GNU autoconf.
+#
+# By default, all of the autoconf-related scripts are marked as
+# "missing" by running the GNU missing script in place of the utility.
+# This hides the autoconf-related scripts from makefiles that aggressively
+# call them when some of the inputs are modified in ways the makefiles
+# don't expect.
+#
+# If a package needs to use GNU autoconf, then the package Makefile
+# should contain one of the following lines:
+#
+#	USE_TOOLS+=	autoconf	# use recent GNU autoconf (>=2.50)
+#	USE_TOOLS+=	autoconf213	# use GNU autoconf ~2.13
+#
+# This will allow the package to invoke "autoconf", "autoreconf", etc.
+# by their usual, bare names.
+#
+# If a particular minimum version of autoconf is required, then the
+# package Makefile can additionally set AUTOCONF_REQD to the desired
+# version, e.g.:
+#
+#	AUTOCONF_REQD=	2.54	# use at least autoconf>=2.54
+#
+# To globally prevent any GNU autoconf handling, set the following
+# in the package Makefile:
+#
+#	AUTOMAKE_OVERRIDE=	no
+#
+
+# Only allow one of "autoconf" and "autoconf213" in USE_TOOLS.
+.if !empty(USE_TOOLS:Mautoconf) && !empty(USE_TOOLS:Mautoconf213)
+PKG_FAIL_REASON+=	"\`\`autoconf'' and \`\`autoconf213'' conflict in USE_TOOLS."
+.endif
+
+# This is an exhaustive list of all of the scripts supplied by GNU
+# autoconf.
+#
+_TOOLS_AC_NAMES=	autoconf	autoconf-2.13
+_TOOLS_AC_NAMES+=	autoheader	autoheader-2.13	
+_TOOLS_AC_NAMES+=	autom4te
+_TOOLS_AC_NAMES+=	autoreconf	autoreconf-2.13
+_TOOLS_AC_NAMES+=	autoscan	autoscan-2.13
+_TOOLS_AC_NAMES+=	autoupdate	autoupdate-2.13
+_TOOLS_AC_NAMES+=	ifnames		ifnames-2.13
+
+.for _t_ in ${_TOOLS_AC_NAMES}
+_TOOLS_AC_TYPE.${_t_}?=	TOOLS_GNU_MISSING
+.endfor _t_
+.undef _t_
+
+.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:Mautoconf)
+.  if !empty(PKGPATH:Mdevel/autoconf)
+MAKEFLAGS+=		TOOLS_IGNORE.autoconf=
+.  else
+AUTOCONF_REQD?=		2.50
+
+TOOLS_DEPMETHOD.autoconf?=	BUILD_DEPENDS
+TOOLS_DEPENDS.autoconf?=	autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
+.    if empty(${TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
+${TOOLS_DEPMETHOD.autoconf}+=	${TOOLS_DEPENDS.autoconf}
+.    endif
+EVAL_PREFIX+=			_TOOLS_AC_PREFIX=autoconf
+
+_TOOLS_AC_TYPE.autoconf=	TOOLS_CREATE
+TOOLS_REAL_CMD.autoconf=	${_TOOLS_AC_PREFIX}/bin/autoconf
+
+_TOOLS_AC_TYPE.autoheader=	TOOLS_CREATE
+TOOLS_REAL_CMD.autoheader=	${_TOOLS_AC_PREFIX}/bin/autoheader
+
+_TOOLS_AC_TYPE.autom4te=	TOOLS_CREATE
+TOOLS_REAL_CMD.autom4te=	${_TOOLS_AC_PREFIX}/bin/autom4te
+
+_TOOLS_AC_TYPE.autoreconf=	TOOLS_CREATE
+TOOLS_REAL_CMD.autoreconf=	${_TOOLS_AC_PREFIX}/bin/autoreconf
+
+_TOOLS_AC_TYPE.autoscan=	TOOLS_CREATE
+TOOLS_REAL_CMD.autoscan=	${_TOOLS_AC_PREFIX}/bin/autoscan
+
+_TOOLS_AC_TYPE.autoupdate=	TOOLS_CREATE
+TOOLS_REAL_CMD.autoupdate=	${_TOOLS_AC_PREFIX}/bin/autoupdate
+
+_TOOLS_AC_TYPE.ifnames=		TOOLS_CREATE
+TOOLS_REAL_CMD.ifnames=		${_TOOLS_AC_PREFIX}/bin/ifnames
+
+# Continue to define the following variables until packages have been
+# taught to just use "autoconf", "autoheader", and "autoreconf" instead.
+#
+AUTOCONF=	${TOOLS_CMD.autoconf}
+AUTOHEADER=	${TOOLS_CMD.autoheader}
+AUTORECONF=	${TOOLS_CMD.autoreconf}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:Mautoconf213)
+.  if !empty(PKGPATH:Mdevel/autoconf213)
+MAKEFLAGS+=		TOOLS_IGNORE.autoconf213=
+.  else
+AUTOCONF_REQD?=		2.13
+
+TOOLS_DEPMETHOD.autoconf213?=	BUILD_DEPENDS
+TOOLS_DEPENDS.autoconf213?=	autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
+.    if empty(${TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
+${TOOLS_DEPMETHOD.autoconf213}+=	${TOOLS_DEPENDS.autoconf213}
+.    endif
+EVAL_PREFIX+=			_TOOLS_AC_PREFIX=autoconf213
+
+_TOOLS_AC_TYPE.autoconf-2.13=	TOOLS_CREATE
+_TOOLS_AC_TYPE.autoconf=	# empty
+TOOLS_REAL_CMD.autoconf-2.13=	${_TOOLS_AC_PREFIX}/bin/autoconf-2.13
+TOOLS_ALIASES.autoconf-2.13=	autoconf
+
+_TOOLS_AC_TYPE.autoheader-2.13=	TOOLS_CREATE
+_TOOLS_AC_TYPE.autoheader=	# empty
+TOOLS_REAL_CMD.autoheader-2.13=	${_TOOLS_AC_PREFIX}/bin/autoheader-2.13
+TOOLS_ALIASES.autoheader-2.13=	autoheader
+
+_TOOLS_AC_TYPE.autoreconf-2.13=	TOOLS_CREATE
+_TOOLS_AC_TYPE.autoreconf=	# empty
+TOOLS_REAL_CMD.autoreconf-2.13=	${_TOOLS_AC_PREFIX}/bin/autoreconf-2.13
+TOOLS_ALIASES.autoreconf-2.13=	autoreconf
+
+_TOOLS_AC_TYPE.autoscan-2.13=	TOOLS_CREATE
+_TOOLS_AC_TYPE.autoscan=	# empty
+TOOLS_REAL_CMD.autoscan-2.13=	${_TOOLS_AC_PREFIX}/bin/autoscan-2.13
+TOOLS_ALIASES.autoscan-2.13=	autoscan
+
+_TOOLS_AC_TYPE.autoupdate-2.13=	TOOLS_CREATE
+_TOOLS_AC_TYPE.autoupdate=	# empty
+TOOLS_REAL_CMD.autoupdate-2.13=	${_TOOLS_AC_PREFIX}/bin/autoupdate-2.13
+TOOLS_ALIASES.autoupdate-2.13=	autoupdate
+
+_TOOLS_AC_TYPE.ifnames-2.13=	TOOLS_CREATE
+_TOOLS_AC_TYPE.ifnames=		# empty
+TOOLS_REAL_CMD.ifnames-2.13=	${_TOOLS_AC_PREFIX}/bin/ifnames-2.13
+TOOLS_ALIASES.ifnames-2.13=	ifnames
+
+# Continue to define the following variables until packages have been
+# taught to just use "autoconf", "autoheader", and "autoreconf" instead.
+#
+AUTOCONF=	${TOOLS_CMD.autoconf-2.13}
+AUTOHEADER=	${TOOLS_CMD.autoheader-2.13}
+AUTORECONF=	${TOOLS_CMD.autoreconf-2.13}
+
+.    if defined(USE_LIBTOOL)
+pre-configure: tools-libtool-m4-override
+.    endif
+.  endif
+.endif
+
+# If the package wants to override the GNU auto* tools, then do it.
+AUTOMAKE_OVERRIDE?=	yes
+.if !empty(AUTOMAKE_OVERRIDE:M[yY][eE][sS])
+.  for _t_ in ${_TOOLS_AC_NAMES}
+.    if !empty(_TOOLS_AC_TYPE.${_t_})
+${_TOOLS_AC_TYPE.${_t_}}+=	${_t_}
+.    endif
+.  endfor
+.  undef _t_
+.endif
+
+# LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
+# will be created.  The libtool.m4 symlink is only created if a GNU
+# configure script exists at that location.
+#
+LIBTOOL_M4_OVERRIDE?=	libtool.m4 */libtool.m4 */*/libtool.m4
+
+# Symlink the libtool-1.4.m4 file into any directory in which there's
+# a configure script under ${WRKSRC}.  The symlink is called "libtool.m4",
+# which is the name expected by the autoconf tools.  The symlinking
+# is only done if we need autoconf-2.13 and libtool.  This allows
+# autoconf-2.13, autoreconf-2.13 and aclocal-2.13 to use the older
+# libtool.m4 file when regenerating files.  This is okay, because we
+# later override the generated libtool file anyway.
+#
+.PHONY: tools-libtool-m4-override
+tools-libtool-m4-override:
+.for _pattern_ in ${LIBTOOL_M4_OVERRIDE}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	cd ${WRKSRC};							\
+	for cfile in ${_pattern_:S/libtool.m4$/configure/}; do		\
+		if ${TEST} -f "$$cfile"; then				\
+			libtool_m4=`${DIRNAME} $$cfile`/libtool.m4;	\
+			${LN} -sf ${PKGSRCDIR}/mk/gnu-config/libtool-1.4.m4 \
+				$$libtool_m4;				\
+		fi;							\
+	done
+.endfor
+.undef _pattern_
diff --git a/mk/tools/automake.mk b/mk/tools/automake.mk
new file mode 100644
index 00000000000..3480084aa66
--- /dev/null
+++ b/mk/tools/automake.mk
@@ -0,0 +1,146 @@
+# $NetBSD: automake.mk,v 1.7.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# This Makefile fragment handles packages that use GNU automake.
+#
+# By default, all of the automake-related scripts are marked as
+# "missing" by running the GNU missing script in place of the utility.
+# This hides the automake-related scripts from makefiles that aggressively
+# call them when some of the inputs are modified in ways the makefiles
+# don't expect.
+#
+# If a package needs to use GNU automake, then the package Makefile
+# should contain one of the following lines:
+#
+#	USE_TOOLS+=	automake	# use recent GNU automake (>=1.9)
+#	USE_TOOLS+=	automake14	# use GNU automake ~1.4
+#
+# This will allow the package to invoke "aclocal" and "automake" by
+# their usual, bare names.
+#
+# If a particular minimum version of automake is required, then the
+# package Makefile can additionally set AUTOMAKE_REQD to the desired
+# version, e.g.:
+#
+#	AUTOMAKE_REQD=	1.8	# use at least automake>=1.8
+#
+# If a package additionally needs to regenerate configure scripts and
+# Makefiles that use gettext, then the package Makefile should contain
+# the following line:
+#
+#	USE_TOOLS+=	gettext-m4	# need gettext.m4 to re-gen files
+#
+# To globally prevent any GNU automake handling, set the following
+# in the package Makefile:
+#
+#	AUTOMAKE_OVERRIDE=    no
+#
+
+# This variable is obsoleted, but continue to allow it until packages
+# have been taught to use the new syntax.
+#
+.if defined(BUILD_USES_GETTEXT_M4)
+USE_TOOLS+=	gettext-m4
+.endif
+
+# Only allow one of "automake" and "automake14" in USE_TOOLS.
+.if !empty(USE_TOOLS:Mautomake) && !empty(USE_TOOLS:Mautomake14)
+PKG_FAIL_REASON+=	"\`\`automake'' and \`\`automake14'' conflict in USE_TOOLS."
+.endif
+
+# This is an exhaustive list of all of the scripts supplied by GNU
+# automake.
+#
+_TOOLS_AM_NAMES=	aclocal		aclocal-1.4			\
+					aclocal-1.5			\
+					aclocal-1.6			\
+					aclocal-1.7			\
+					aclocal-1.8			\
+					aclocal-1.9
+_TOOLS_AM_NAMES+=	automake	automake-1.4			\
+					automake-1.5			\
+					automake-1.6			\
+					automake-1.7			\
+					automake-1.8			\
+					automake-1.9
+
+.for _t_ in ${_TOOLS_AM_NAMES}
+_TOOLS_AM_TYPE.${_t_}?=	TOOLS_GNU_MISSING
+.endfor
+.undef _t_
+
+.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:Mautomake)
+.  if !empty(PKGPATH:Mdevel/automake)
+MAKEFLAGS+=		TOOLS_IGNORE.automake=
+.  else
+AUTOMAKE_REQD?=		1.9
+AUTOCONF_REQD?=		2.58
+USE_TOOLS+=		autoconf
+
+TOOLS_DEPMETHOD.automake?=	BUILD_DEPENDS
+TOOLS_DEPENDS.automake?=	automake>=${AUTOMAKE_REQD}:../../devel/automake
+.    if empty(${TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake})
+${TOOLS_DEPMETHOD.automake}+=	${TOOLS_DEPENDS.automake}
+.    endif
+EVAL_PREFIX+=			_TOOLS_AM_PREFIX=automake
+
+_TOOLS_AM_TYPE.aclocal=		TOOLS_CREATE
+TOOLS_REAL_CMD.aclocal=		${_TOOLS_AM_PREFIX}/bin/aclocal
+
+_TOOLS_AM_TYPE.automake=	TOOLS_CREATE
+TOOLS_REAL_CMD.automake=	${_TOOLS_AM_PREFIX}/bin/automake
+
+# Continue to define the following variables until packages have been
+# taught to just use "aclocal" and "automake" instead.
+#
+ACLOCAL=	${TOOLS_CMD.aclocal}
+AUTOMAKE=	${TOOLS_CMD.automake}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:Mautomake14)
+.  if !empty(PKGPATH:Mdevel/automake14)
+MAKEFLAGS+=		TOOLS_IGNORE.automake14=
+.  else
+AUTOMAKE_REQD?=		1.4
+AUTOCONF_REQD?=		2.13
+USE_TOOLS+=		autoconf213
+
+TOOLS_DEPMETHOD.automake14?=	BUILD_DEPENDS
+TOOLS_DEPENDS.automake14?=	automake14>=${AUTOMAKE_REQD}:../../devel/automake14
+.    if empty(${TOOLS_DEPMETHOD.automake14}:M${TOOLS_DEPENDS.automake14})
+${TOOLS_DEPMETHOD.automake14}+=	${TOOLS_DEPENDS.automake14}
+.    endif
+EVAL_PREFIX+=			_TOOLS_AM_PREFIX=automake14
+
+_TOOLS_AM_TYPE.aclocal-1.4=	TOOLS_CREATE
+_TOOLS_AM_TYPE.aclocal=		# empty
+TOOLS_REAL_CMD.aclocal-1.4=	${_TOOLS_AM_PREFIX}/bin/aclocal-1.4
+TOOLS_ALIASES.aclocal-1.4=	aclocal
+
+_TOOLS_AM_TYPE.automake-1.4=	TOOLS_CREATE
+_TOOLS_AM_TYPE.automake=	# empty
+TOOLS_REAL_CMD.automake-1.4=	${_TOOLS_AM_PREFIX}/bin/automake-1.4
+TOOLS_ALIASES.automake-1.4=	automake
+
+# Continue to define the following variables until packages have been
+# taught to just use "aclocal" and "automake" instead.
+#
+ACLOCAL=	${TOOLS_CMD.aclocal-1.4}
+AUTOMAKE=	${TOOLS_CMD.automake-1.4}
+.  endif
+.endif
+
+# If the package wants to override the GNU auto* tools, then do it.
+AUTOMAKE_OVERRIDE?=	yes
+.if !empty(AUTOMAKE_OVERRIDE:M[yY][eE][sS])
+.  for _t_ in ${_TOOLS_AM_NAMES}
+.    if !empty(_TOOLS_AM_TYPE.${_t_})
+${_TOOLS_AM_TYPE.${_t_}}+=	${_t_}
+.    endif
+.  endfor
+.  undef _t_
+.endif
+
+.if !empty(USE_TOOLS:Mgettext-m4)
+BUILD_DEPENDS+=	{gettext-0.10.35nb1,gettext-m4-[0-9]*}:../../devel/gettext-m4
+.endif
diff --git a/mk/tools/bootstrap.mk b/mk/tools/bootstrap.mk
new file mode 100644
index 00000000000..e396106ef32
--- /dev/null
+++ b/mk/tools/bootstrap.mk
@@ -0,0 +1,105 @@
+# $NetBSD: bootstrap.mk,v 1.2.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# bootstrap.mk contains settings matching the contents of
+# pkgsrc/bootstrap/bootstrap.  Where we install the bootstrap versions
+# of tools, we point TOOLS_PLATFORM.* to them so that pkgsrc knows
+# that they are system-supplied and won't need replacement by pkgsrc
+# versions of those tools.
+#
+# XXX This file should go away and the bootstrap script should be
+# XXX taught to write out the correct TOOLS_PLATFORM.* definitions
+# XXX on its own, based on the configuration used.
+# 
+
+.if ${OPSYS} == "AIX"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.strip?=		${LOCALBASE}/bin/strip
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "Darwin"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "DragonFly"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "FreeBSD"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "HPUX"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "Interix"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "IRIX"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "Linux"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "NetBSD"
+# NetBSD has everything.
+
+.elif ${OPSYS} == "OpenBSD"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "OSF1"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.install?=	${LOCALBASE}/bin/install-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "SunOS"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.elif ${OPSYS} == "UnixWare"
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.mkdir?=		${LOCALBASE}/sbin/mkdir-sh
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+
+.else
+TOOLS_PLATFORM.gtar?=		${TOOLS_PLATFORM.tar}
+TOOLS_PLATFORM.mtree?=		${LOCALBASE}/sbin/mtree
+TOOLS_PLATFORM.pax?=		${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.sed?=		${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?=		${LOCALBASE}/bin/tar
+.endif
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
new file mode 100644
index 00000000000..f4bee8f1889
--- /dev/null
+++ b/mk/tools/bsd.tools.mk
@@ -0,0 +1,185 @@
+# $NetBSD: bsd.tools.mk,v 1.23.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# This Makefile fragment creates tools under ${TOOLS_DIR} that are
+# found before similarly-named tools in the system path.
+#
+#    TOOLS_CREATE is a whitespace-separated list of tools for which a
+#       corresponding tool is created.  Either a wrapper script or a
+#       symlink is created depending on the tool that is being
+#	overridden.
+#
+# The following variables specify the details of each <tool>:
+#
+#    TOOLS_CMD.<tool> is the path to the tool under ${TOOLS_DIR}.  This
+#	variable is optional, and if left unspecified it defaults to
+#	${TOOLS_DIRS}/bin/<tool>.
+#
+#    TOOLS_ALIASES.<tool> is a whitespace-separated list of names for
+#	which <tool> should also be created under ${TOOLS_DIR}.
+#
+#    TOOLS_REAL_CMD.<tool> is the path to the actual command that is
+#	invoked when ${TOOLS_CMD.<tool>} is called.  If <tool> should
+#	be a symlink, then this variable is required and should be a
+#	full path.  If <tool> should be a wrapper, then this variable
+#	is required unless TOOLS_REAL_CMDLINE.<tool> is defined (see
+#	below).
+#
+# The following variables specify further details of each <tool> and
+# if set, cause a wrapper script to be created.
+#
+#    TOOLS_REAL_ARGS.<tool> additional arguments that are passed to the
+#	real command ahead of any command-line arguments.  This variable
+#	is optional.
+#
+#    TOOLS_REAL_CMDLINE.<tool> specifies the full command-line to invoke
+#	in the wrapper script when <tool> is called.  This variable is
+#	optional, and if left unspecified, then this is built up from
+#	TOOLS_REAL_CMD.<tool> and TOOLS_REAL_ARGS.<tool> by default.
+#
+# The following variables provide shortcuts for creating certain classes
+# of tools:
+#
+#    TOOLS_NOOP is a list of tools that do nothing and return true.
+#
+#    TOOLS_BROKEN is a list of tools that do nothing and return false.
+#
+#    TOOLS_GNU_MISSING is a list of tools for which the GNU missing
+#	script is invoked in place of the real tool.  This is used
+#	primarily to hide GNU auto* tools.
+#
+
+.if !defined(BSD_TOOLS_MK)
+BSD_TOOLS_MK=	defined
+
+.include "../../mk/bsd.prefs.mk"
+
+# Prepend ${TOOLS_DIR}/bin to the PATH so that our scripts are found
+# first when searching for executables.
+#
+TOOLS_DIR=	${WRKDIR}/.tools
+PREPEND_PATH+=	${TOOLS_DIR}/bin
+
+TOOLS_SHELL?=		${SH}
+_TOOLS_WRAP_LOG=	${WRKLOG}
+
+.PHONY: do-tools override-tools
+do-tools: override-tools
+override-tools: .OPTIONAL
+
+USE_TOOLS?=		# empty
+
+# Include the other mk/tools/*.mk files here that help specify the
+# wrappers and symlinks that will be created by this file.  Order
+# matters!
+#
+.include "../../mk/tools/automake.mk"
+.include "../../mk/tools/autoconf.mk"
+.include "../../mk/tools/texinfo.mk"
+.include "../../mk/tools/ldconfig.mk"
+.include "../../mk/tools/rpcgen.mk"
+.include "../../mk/tools/strip.mk"
+.include "../../mk/tools/replace.mk"
+.include "../../mk/tools/perl.mk"
+.include "../../mk/tools/make.mk"
+
+######################################################################
+
+.for _t_ in ${TOOLS_NOOP}
+TOOLS_CREATE+=			${_t_}
+TOOLS_REAL_CMDLINE.${_t_}?=	exit 0
+.endfor
+.undef _t_
+
+.for _t_ in ${TOOLS_BROKEN}
+TOOLS_CREATE+=			${_t_}
+TOOLS_REAL_CMDLINE.${_t_}?=	exit 1
+.endfor
+.undef _t_
+
+.for _t_ in ${TOOLS_GNU_MISSING}
+TOOLS_CREATE+=			${_t_}
+TOOLS_REAL_CMD.${_t_}?=		${PKGSRCDIR}/mk/gnu-config/missing
+TOOLS_REAL_CMDLINE.${_t_}?=	${TOOLS_REAL_CMD.${_t_}} ${_t_:T:C/-[0-9].*$//}
+.endfor
+.undef _t_
+
+######################################################################
+
+# These tools are used in the targets that actually create the wrappers
+# and symlinks.  We define them here so that as a fallback, we'll just
+# use the ones in the PATH.  This makes the tools framework more
+# standalone.
+
+CHMOD?=         chmod
+ECHO?=          echo
+FALSE?=         false
+LN?=            ln
+MKDIR?=         mkdir -p
+
+######################################################################
+
+# If the command line was defined, then we create a wrapper.
+# If the real command isn't a full path, then we create a wrapper.
+# If some command arguments were given, then we create a wrapper.
+# Otherwise, we create a symlink.
+#
+# By default, the tool in ${TOOLS_DIR} will be in the "bin" directory
+# and will be called <tool>.
+#
+# The default wrapper script will invoke the real command, followed
+# by any arguments specified in TOOLS_REAL_ARGS.*, followed by any
+# command-line arguments passed to the wrapper script.
+#
+.for _t_ in ${TOOLS_CREATE}
+TOOLS_CMD.${_t_}?=		${TOOLS_DIR}/bin/${_t_}
+TOOLS_REAL_CMD.${_t_}?=		${FALSE}
+TOOLS_REAL_CMDLINE_DFLT.${_t_}= \
+	${TOOLS_REAL_CMD.${_t_}} ${TOOLS_REAL_ARGS.${_t_}} "$$@"
+
+override-tools: ${TOOLS_CMD.${_t_}}
+
+${TOOLS_CMD.${_t_}}:
+	${_PKG_SILENT}${_PKG_DEBUG}${TEST} -d ${.TARGET:H:Q} ||		\
+		${MKDIR} ${.TARGET:H:Q}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	if ${TEST} -n ${TOOLS_REAL_CMDLINE.${_t_}:Q}""; then		\
+		create=wrapper;						\
+		cmdline=${TOOLS_REAL_CMDLINE.${_t_}:Q};			\
+	elif ${TEST} -n ${TOOLS_REAL_CMD.${_t_}:Q}""; then		\
+		if ${TEST} -n ${TOOLS_REAL_ARGS.${_t_}:Q}""; then	\
+			create=wrapper;					\
+			cmdline=${TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q};	\
+		else							\
+			case ${TOOLS_REAL_CMD.${_t_}:Q}"" in		\
+			/*)	create=symlink ;;			\
+			*)	create=wrapper;				\
+				cmdline=${TOOLS_REAL_CMDLINE_DFLT.${_t_}:Q}; \
+			esac;						\
+		fi;							\
+	else								\
+		create=symlink;						\
+	fi;								\
+	case "$$create" in						\
+	wrapper)							\
+		{ ${ECHO} '#!'${TOOLS_SHELL:Q};				\
+		  ${ECHO} 'wrapperlog="$${TOOLS_WRAPPER_LOG-'${_TOOLS_WRAP_LOG:Q}'}"'; \
+		  ${ECHO} '${ECHO} "[*] "'${.TARGET:Q}'" $$@" >> $$wrapperlog'; \
+		  ${ECHO} "${ECHO} \"<.> $$cmdline\" >> \$$wrapperlog"; \
+		  ${ECHO} "$$cmdline";					\
+		} > ${.TARGET:Q};					\
+		${CHMOD} +x ${.TARGET:Q};				\
+		;;							\
+	*)								\
+		${LN} -fs ${TOOLS_REAL_CMD.${_t_}:Q} ${.TARGET:Q};	\
+		;;							\
+	esac
+.  for _a_ in ${TOOLS_ALIASES.${_t_}}
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	${TEST} ${.TARGET:Q} = ${.TARGET:H:Q}/${_a_} ||			\
+		${LN} -fs ${.TARGET:T:Q} ${.TARGET:H:Q}/${_a_}
+.  endfor
+.  undef _a_
+.endfor
+.undef _t_
+
+.endif	# BSD_TOOLS_MK
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
new file mode 100644
index 00000000000..3603a16e24b
--- /dev/null
+++ b/mk/tools/defaults.mk
@@ -0,0 +1,108 @@
+# $NetBSD: defaults.mk,v 1.15.2.2 2005/05/17 18:29:46 tv Exp $
+
+.if !defined(TOOLS_DEFAULTS_MK)
+TOOLS_DEFAULTS_MK=	defined
+
+# These are the platform-specific lists of system-supplied tools.
+#
+# XXX These should eventually just migrate over to the appropriate
+# XXX pkgsrc/mk/platform/${OPSYS}.mk file.
+#
+.include "${_PKGSRC_TOPDIR}/mk/tools/bootstrap.mk"
+.if exists(${_PKGSRC_TOPDIR}/mk/tools/tools.${OPSYS}.mk)
+.  include "${_PKGSRC_TOPDIR}/mk/tools/tools.${OPSYS}.mk"
+.endif
+
+# "TOOL" variable names associated with each of the tools
+_TOOLS_VARNAME.awk=		AWK
+_TOOLS_VARNAME.basename=	BASENAME
+_TOOLS_VARNAME.bison-yacc=	YACC
+_TOOLS_VARNAME.bzcat=		BZCAT
+_TOOLS_VARNAME.cat=		CAT
+_TOOLS_VARNAME.chgrp=		CHGRP
+_TOOLS_VARNAME.chmod=		CHMOD
+_TOOLS_VARNAME.chown=		CHOWN
+_TOOLS_VARNAME.cmp=		CMP
+_TOOLS_VARNAME.cp=		CP
+_TOOLS_VARNAME.cut=		CUT
+_TOOLS_VARNAME.date=		DATE
+_TOOLS_VARNAME.dirname=		DIRNAME
+_TOOLS_VARNAME.echo=		ECHO
+_TOOLS_VARNAME.egrep=		EGREP
+_TOOLS_VARNAME.env=		SETENV
+_TOOLS_VARNAME.expr=		EXPR
+_TOOLS_VARNAME.false=		FALSE
+_TOOLS_VARNAME.fgrep=		FGREP
+_TOOLS_VARNAME.file=		FILE_CMD
+_TOOLS_VARNAME.find=		FIND
+_TOOLS_VARNAME.gawk=		AWK
+_TOOLS_VARNAME.gm4=		M4
+_TOOLS_VARNAME.gmake=		GMAKE
+_TOOLS_VARNAME.grep=		GREP
+_TOOLS_VARNAME.gsed=		SED
+_TOOLS_VARNAME.gtar=		GTAR
+_TOOLS_VARNAME.gunzip=		GUNZIP_CMD
+_TOOLS_VARNAME.gzcat=		GZCAT
+_TOOLS_VARNAME.gzip=		GZIP_CMD
+_TOOLS_VARNAME.head=		HEAD
+_TOOLS_VARNAME.hostname=	HOSTNAME_CMD
+_TOOLS_VARNAME.id=		ID
+_TOOLS_VARNAME.imake=		IMAKE
+_TOOLS_VARNAME.install=		INSTALL
+_TOOLS_VARNAME.ldconfig=	LDCONFIG
+_TOOLS_VARNAME.lex=		LEX
+_TOOLS_VARNAME.lha=		LHA
+_TOOLS_VARNAME.ln=		LN
+_TOOLS_VARNAME.ls=		LS
+_TOOLS_VARNAME.m4=		M4
+_TOOLS_VARNAME.mail=		MAIL_CMD
+_TOOLS_VARNAME.mkdir=		MKDIR
+_TOOLS_VARNAME.mtree=		MTREE
+_TOOLS_VARNAME.mv=		MV
+_TOOLS_VARNAME.nice=		NICE
+_TOOLS_VARNAME.patch=		PATCH
+_TOOLS_VARNAME.pax=		PAX
+_TOOLS_VARNAME.pwd=		PWD_CMD
+_TOOLS_VARNAME.rm=		RM
+_TOOLS_VARNAME.rmdir=		RMDIR
+_TOOLS_VARNAME.sed=		SED
+_TOOLS_VARNAME.sh=		SH
+_TOOLS_VARNAME.shlock=		SHLOCK
+_TOOLS_VARNAME.sort=		SORT
+_TOOLS_VARNAME.tail=		TAIL
+_TOOLS_VARNAME.tar=		TAR
+_TOOLS_VARNAME.tbl=		TBL
+_TOOLS_VARNAME.tee=		TEE
+_TOOLS_VARNAME.test=		TEST
+_TOOLS_VARNAME.touch=		TOUCH
+_TOOLS_VARNAME.tr=		TR
+_TOOLS_VARNAME.true=		TRUE
+_TOOLS_VARNAME.tsort=		TSORT
+_TOOLS_VARNAME.unrar=		UNRAR
+_TOOLS_VARNAME.unzip=		UNZIP
+_TOOLS_VARNAME.unzoo=		UNZOO
+_TOOLS_VARNAME.wc=		WC
+_TOOLS_VARNAME.xargs=		XARGS
+_TOOLS_VARNAME.xmkmf=		XMKMF_CMD
+_TOOLS_VARNAME.yacc=		YACC
+
+######################################################################
+
+# Set a default value for the TOOL names for each of the tools we claim
+# we'll use in PKGSRC_USE_TOOLS to point to the platform command, e.g.,
+# TBL, YACC, etc.  These tools are used in the top-level make(1), not
+# just in the targets, so these must be defined here, and this file be
+# included by bsd.prefs.mk.
+#
+.for _t_ in ${PKGSRC_USE_TOOLS:O:u}
+.  if defined(_TOOLS_VARNAME.${_t_}) && \
+      defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
+.    for _v_ in ${_TOOLS_VARNAME.${_t_}}
+${_v_}?=	${TOOLS_PLATFORM.${_t_}}
+.    endfor
+.    undef _v_
+.  endif
+.endfor
+.undef _t_
+
+.endif	# TOOLS_DEFAULTS_MK
diff --git a/mk/tools/imake.mk b/mk/tools/imake.mk
new file mode 100644
index 00000000000..e44275b1b5b
--- /dev/null
+++ b/mk/tools/imake.mk
@@ -0,0 +1,91 @@
+# $NetBSD: imake.mk,v 1.9.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# This Makefile fragment handles packages that need imake and xmkmf
+# to build X11-related packages.  The correct imake and xmkmf tools
+# are placed under ${TOOLS_DIR}/bin, so that they may be invoked by
+# their bare names.  The tools are chosen based on which type of X11
+# distribution pkgsrc will be using, e.g. X11_TYPE.
+#
+# Variables defined by this file are:
+#
+#	IMAKE		path to imake tool + any imake-specific args
+#	XMKMF_CMD	path to xmkmf tool + any xmkmf-specific args
+#	XMKMF		command to create all Makefiles from Imakefiles,
+#			usually "xmkmf -a".
+#
+# TOOLS_IMAKE, TOOLS_XMKMF_CMD and TOOLS_XMKMF are set to the same
+# corresponding values.
+#
+# Optional variables that may be defined by the package are:
+#
+#	IMAKEOPTS	Options to pass to imake
+#	XMKMF_FLAGS	Options to pass to xmkmf
+#
+# If they are non-empty, then a wrapper script will be created instead
+# of a symlink for the corresponding tool.
+#
+# A platform/${OPSYS}.mk file may note that additional tools are
+# required when using imake by setting _IMAKE_TOOLS to the appropriate
+# value, e.g. _IMAKE_TOOLS+=gmake to use GNU make to build packages
+# that use imake.
+#
+# This file is included by mk/tools/replace.mk and follows the same
+# rules as for other replacement tools.
+#
+
+.if defined(USE_IMAKE)
+USE_TOOLS+=	imake
+.endif
+
+# Skip the processing at the end of replace.mk.  If we need to use
+# imake, then we always want the clause below to trigger.
+#
+_TOOLS_USE_PKGSRC.imake=	yes
+
+.if !defined(TOOLS_IGNORE.imake) && !empty(USE_TOOLS:Mimake)
+.  if !empty(PKGPATH:Mx11/imake) || !empty(PKGPATH:Mx11/xorg-imake)
+MAKEFLAGS+=			TOOLS_IGNORE.imake=
+.  else
+#
+# Depending on which X11_TYPE we're using, depend on the correct package
+# to pull in imake and xmkmf.
+#
+.    if defined(X11_TYPE) && (${X11_TYPE} == "XFree86")
+TOOLS_DEPENDS.imake?=		imake>=4.4.0:../../x11/imake
+TOOLS_REAL_CMD.imake?=		${X11PREFIX}/${X11ROOT_PREFIX}/bin/imake
+TOOLS_REAL_CMD.xmkmf?=		${X11PREFIX}/${X11ROOT_PREFIX}/bin/xmkmf
+.    elif defined(X11_TYPE) && (${X11_TYPE} == "xorg")
+TOOLS_DEPENDS.imake?=		xorg-imake>=6.8:../../x11/xorg-imake
+TOOLS_REAL_CMD.imake?=		${X11PREFIX}/${X11ROOT_PREFIX}/bin/imake
+TOOLS_REAL_CMD.xmkmf?=		${X11PREFIX}/${X11ROOT_PREFIX}/bin/xmkmf
+.    else # ${X11_TYPE} == "native"
+TOOLS_REAL_CMD.imake?=		${X11BASE}/bin/imake
+TOOLS_REAL_CMD.xmkmf?=		${X11BASE}/bin/xmkmf
+.    endif
+TOOLS_REAL_ARGS.imake?=		${IMAKEOPTS}
+TOOLS_REAL_ARGS.xmkmf?=		${XMKMF_FLAGS}
+#
+# If we're using xpkgwedge, then we need to invoke the special xmkmf
+# script that will find imake config files in both ${PREFIX} and in
+# ${X11BASE}.
+#
+.    if !empty(USE_XPKGWEDGE:M[yY][eE][sS])
+TOOLS_REAL_CMD.xmkmf=		${X11PREFIX}/bin/pkgxmkmf
+.    endif
+#
+# Add any extra tools that may be required when using imake, e.g. gmake.
+#
+USE_TOOLS+=			${_IMAKE_TOOLS:Nimake}
+#
+# Define IMAKE and XMKMF_CMD and create wrappers/symlinks corresponding
+# to imake and xmkmf.
+#
+TOOLS_CREATE+=			imake xmkmf
+TOOLS_${_TOOLS_VARNAME.imake}=	${TOOLS_REAL_CMD.imake} ${TOOLS_REAL_ARGS.imake}
+TOOLS_${_TOOLS_VARNAME.xmkmf}=	${TOOLS_REAL_CMD.xmkmf} ${TOOLS_REAL_ARGS.xmkmf}
+TOOLS_XMKMF=			${${_TOOLS_VARNAME.xmkmf}} -a
+${_TOOLS_VARNAME.imake}=	${TOOLS_${_TOOLS_VARNAME.imake}}
+${_TOOLS_VARNAME.xmkmf}=	${TOOLS_${_TOOLS_VARNAME.xmkmf}}
+XMKMF?=				${TOOLS_XMKMF}
+.  endif
+.endif
diff --git a/mk/tools/ldconfig.mk b/mk/tools/ldconfig.mk
new file mode 100644
index 00000000000..afd8fa05b8e
--- /dev/null
+++ b/mk/tools/ldconfig.mk
@@ -0,0 +1,17 @@
+# $NetBSD: ldconfig.mk,v 1.1.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# Depending on whether the platform has ldconfig, we cause
+# ${TOOLS_DIR}/bin/ldconfig to be either the correct ldconfig tool or
+# a no-op.
+#
+.if !defined(TOOLS_PLATFORM.ldconfig)
+TOOLS_NOOP+=			ldconfig
+.else
+TOOLS_CREATE+=			ldconfig
+TOOLS_REAL_CMD.ldconfig=	${TOOLS_PLATFORM.ldconfig}
+.endif
+
+# Make ${LDCONFIG} call "ldconfig" through the PATH, which should find
+# the one under ${TOOLS_DIR}.
+#
+LDCONFIG?=	ldconfig
diff --git a/mk/tools/make.mk b/mk/tools/make.mk
new file mode 100644
index 00000000000..a9a09f2d77d
--- /dev/null
+++ b/mk/tools/make.mk
@@ -0,0 +1,25 @@
+# $NetBSD: make.mk,v 1.9.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# This Makefile fragment creates a tool called "make" under ${TOOLS_DIR}
+# that corresponds to the make program used to build the package.
+# This lets a bare "make" invoke the correct program if called from
+# within a makefile or script.  It also sets MAKE_PROGRAM to the path
+# of that make program.  Lastly, pass ${MAKE_PROGRAM} to GNU configure
+# scripts in the MAKE variable so that the scripts will embed the
+# correct path to the make program used to build the package
+# into the generated Makefiles.
+#
+
+# Define MAKE_PROGRAM to be the "make" used to build the package.
+.if !empty(_USE_TOOLS:Mgmake)
+MAKE_PROGRAM=		${GMAKE}
+.elif !empty(_USE_TOOLS:Mimake) && defined(_IMAKE_MAKE)
+MAKE_PROGRAM=		${_IMAKE_MAKE}
+.else
+MAKE_PROGRAM=		${MAKE}
+.endif
+
+TOOLS_CREATE+=		make
+TOOLS_REAL_CMD.make=	${MAKE_PROGRAM}
+
+CONFIGURE_ENV+=		MAKE=make
diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk
new file mode 100644
index 00000000000..4e74ee44879
--- /dev/null
+++ b/mk/tools/perl.mk
@@ -0,0 +1,38 @@
+# $NetBSD: perl.mk,v 1.9.2.2 2005/05/17 18:29:46 tv Exp $
+
+# Create a symlink from ${TOOLS_DIR}/bin/perl to ${PERL5} when USE_PERL5
+# is defined.  This ensures that when "perl" is invoked, the pkgsrc perl
+# is executed on systems that also provide a perl binary.
+#
+.if defined(USE_PERL5) && !defined(TOOLS_IGNORE.perl)
+.  if !empty(PKGPATH:Mlang/perl58)
+MAKEFLAGS+=		TOOLS_IGNORE.perl=
+.  else
+.    include "../../lang/perl5/buildlink3.mk"
+TOOLS_DEPMETHOD.perl?=	BUILD_DEPENDS
+_TOOLS_DEPENDS.perl=	# empty
+.    for _dep_ in ${BUILDLINK_DEPENDS.perl}
+_TOOLS_DEPENDS.perl+=	${_dep_}:${BUILDLINK_PKGSRCDIR.perl}
+.    endfor
+.    undef _dep_
+TOOLS_DEPENDS.perl?=	${_TOOLS_DEPENDS.perl}
+TOOLS_CREATE+=		perl
+FIND_PREFIX:=		TOOLS_PREFIX.perl=perl
+.    include "../../mk/find-prefix.mk"
+TOOLS_REAL_CMD.perl=	${TOOLS_PREFIX.perl}/bin/perl
+PERL5=			${TOOLS_REAL_CMD.perl}
+CONFIGURE_ENV+=		PERL=${PERL5:Q}
+.  endif
+.  if defined(TOOLS_DEPMETHOD.perl) && defined(TOOLS_DEPENDS.perl)
+.    if empty(${TOOLS_DEPMETHOD.perl}:M${TOOLS_DEPENDS.perl})
+${TOOLS_DEPMETHOD.perl}+=	${TOOLS_DEPENDS.perl}
+.    endif
+.  endif
+
+# Define PERL5_* variables that locate the site directories for ${PERL5}.
+# These variables depend on PERL5 being properly defined and existing
+# on the filesystem.
+#
+.  include "../../lang/perl5/vars.mk"
+
+.endif
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
new file mode 100644
index 00000000000..1bf1a9cfe20
--- /dev/null
+++ b/mk/tools/replace.mk
@@ -0,0 +1,1070 @@
+# $NetBSD: replace.mk,v 1.81.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# This Makefile fragment handles "replacements" of system-supplied
+# tools with pkgsrc versions.
+#
+# The replacement tools are placed under ${TOOLS_DIR} so that they
+# appear earlier in the search path when invoked using the bare name
+# of the tool.
+#
+# "TOOLS_TOOL" variables, e.g. TOOLS_AWK, TOOLS_SED, etc. are set to
+# the full command lines necessary to invoke the real tools on the
+# filesystem, and represent the tools required by the package.
+#
+# "TOOL" variables, e.g. AWK, SED, etc. are set to the full command
+# lines necessary to invoke the real tools on the filesystem, and
+# represent the tools required by pkgsrc itself.
+#
+# The tools that could be replaced with pkgsrc counterparts (usually
+# GNU versions of the tools) that are required by pkgsrc itself, i.e.
+# in targets that are part of pkgsrc infrastructure or part of the
+# package Makefile, should be listed as:
+#
+#	PKGSRC_USE_TOOLS+=	awk sed
+#
+# The tools that are required by the package itself, i.e. within the
+# software's own build system, should be listed as:
+#
+#	USE_TOOLS+=	gawk gmake lex
+#
+# If a package requires yacc to generate a parser, then the package
+# Makefile should contain one of the following two lines:
+#
+#	USE_TOOLS+=	yacc	# any yacc will do
+#	USE_TOOLS+=	bison	# requires bison-specific features
+#
+# Adding either "yacc" or "bison" to USE_TOOLS will cause a "yacc" tool
+# to be generated that may be used as a yacc-replacement.
+#
+# By default, any dependencies on the pkgsrc tools are build dependencies,
+# but this may be changed by explicitly setting TOOLS_DEPMETHOD.<tool>,
+# e.g.:
+#
+#	TOOLS_DEPMETHOD.tbl=	DEPENDS
+#
+
+# Continue to allow USE_GNU_TOOLS and USE_TBL until packages have been
+# taught to use the new syntax.
+#
+.if defined(USE_GNU_TOOLS) && !empty(USE_GNU_TOOLS)
+USE_TOOLS+=	${USE_GNU_TOOLS:S/^awk$/gawk/:S/^m4$/gm4/:S/^make$/gmake/:S/^sed$/gsed/:S/^yacc$/bison/}
+.endif
+.if defined(USE_TBL) && !empty(USE_TBL:M[yY][eE][sS])
+USE_TOOLS+=	tbl
+.endif
+
+# bison implies "bison-yacc"
+.if !empty(USE_TOOLS:Mbison)
+USE_TOOLS+=	bison-yacc
+.endif
+
+.include "../../mk/tools/imake.mk"
+
+######################################################################
+
+# Create _USE_TOOLS, a sanitized version of PKGSRC_USE_TOOLS and
+# USE_TOOLS that removes the ones that are overridden by superseding
+# ones.
+#
+.if !defined(_USE_TOOLS)
+_USE_TOOLS:=	${PKGSRC_USE_TOOLS} ${USE_TOOLS}
+_USE_TOOLS:=	${_USE_TOOLS:O:u}
+.  if !empty(USE_TOOLS:Mbison-yacc)	# bison-yacc > yacc
+_USE_TOOLS:=	${_USE_TOOLS:Nyacc}
+.  endif
+.  if !empty(USE_TOOLS:Mgawk)		# gawk > awk
+_USE_TOOLS:=	${_USE_TOOLS:Nawk}
+.  endif
+.  if !empty(USE_TOOLS:Mgm4)		# gm4 > m4
+_USE_TOOLS:=	${_USE_TOOLS:Nm4}
+.  endif
+.  if !empty(USE_TOOLS:Mgsed)		# gsed > sed
+_USE_TOOLS:=	${_USE_TOOLS:Nsed}
+.  endif
+.endif
+MAKEVARS+=	_USE_TOOLS
+
+######################################################################
+
+# _TOOLS_USE_PKGSRC.<tool> is "yes" or "no" depending on whether we're
+# using a pkgsrc-supplied tool to replace the system-supplied one.  We
+# use the system-supplied one if TOOLS_PLATFORM.<tool> is non-empty, or
+# otherwise if this is a particular ${MACHINE_PLATFORM} listed above.
+#
+.for _t_ in ${_USE_TOOLS}
+.  if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
+_TOOLS_USE_PKGSRC.${_t_}?=	no
+.  endif
+_TOOLS_USE_PKGSRC.${_t_}?=	yes
+.endfor
+.undef _t_
+
+# TOOLS_DEPMETHOD.<tool> defaults to BUILD_DEPENDS.
+.for _t_ in ${_USE_TOOLS}
+TOOLS_DEPMETHOD.${_t_}?=	BUILD_DEPENDS
+.endfor
+.undef _t_
+
+######################################################################
+
+# For each of the blocks below, we create either symlinks or wrappers
+# for each of the tools requested.  We need to be careful that we don't
+# get into dependency loops; do this by setting and checking the value
+# of TOOLS_IGNORE.<tool>.  These blocks handle the case where we are
+# using the pkgsrc-supplied tool.
+#
+# Always set the "TOOLS_TOOL" name for each tool to point to the real
+# command, e.g., TOOLS_TBL, TOOLS_YACC, etc., provided that "TOOL" has
+# been associated with <tool>.
+#
+.if !defined(TOOLS_IGNORE.[) && !empty(_USE_TOOLS:M\[)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.[=
+.  elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
+TOOLS_DEPENDS.[?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			[
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.[=coreutils
+TOOLS_REAL_CMD.[=		${TOOLS_PREFIX.[}/bin/${GNU_PROGRAM_PREFIX}[
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.awk) && !empty(_USE_TOOLS:Mawk)
+.  if !empty(PKGPATH:Mlang/gawk)
+MAKEFLAGS+=			TOOLS_IGNORE.awk=
+.  elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
+TOOLS_DEPENDS.awk?=		gawk>=3.1.1:../../lang/gawk
+TOOLS_CREATE+=			awk
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.awk=gawk
+TOOLS_REAL_CMD.awk=		${TOOLS_PREFIX.awk}/bin/${GNU_PROGRAM_PREFIX}awk
+TOOLS_${_TOOLS_VARNAME.awk}=	${TOOLS_REAL_CMD.awk}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.basename) && !empty(_USE_TOOLS:Mbasename)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.basename=
+.  elif !empty(_TOOLS_USE_PKGSRC.basename:M[yY][eE][sS])
+TOOLS_DEPENDS.basename?=	coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			basename
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.basename=coreutils
+TOOLS_REAL_CMD.basename=	${TOOLS_PREFIX.basename}/bin/${GNU_PROGRAM_PREFIX}basename
+TOOLS_${_TOOLS_VARNAME.basename}=	${TOOLS_REAL_CMD.basename}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.bison) && !empty(_USE_TOOLS:Mbison)
+.  if !empty(PKGPATH:Mdevel/bison)
+MAKEFLAGS+=			TOOLS_IGNORE.bison=
+.  elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS])
+TOOLS_DEPENDS.bison?=		bison>=1.0:../../devel/bison
+TOOLS_CREATE+=			bison
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bison=bison
+TOOLS_REAL_CMD.bison=		${TOOLS_PREFIX.bison}/bin/bison
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.bison-yacc) && !empty(_USE_TOOLS:Mbison-yacc)
+.  if !empty(PKGPATH:Mdevel/bison)
+MAKEFLAGS+=			TOOLS_IGNORE.bison-yacc=
+.  elif !empty(_TOOLS_USE_PKGSRC.bison-yacc:M[yY][eE][sS])
+TOOLS_DEPENDS.bison-yacc?=	bison>=1.0:../../devel/bison
+TOOLS_CREATE+=			bison-yacc
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bison-yacc=bison
+TOOLS_REAL_CMD.bison-yacc=	${TOOLS_PREFIX.bison-yacc}/bin/bison
+TOOLS_REAL_ARGS.bison-yacc=	-y
+TOOLS_${_TOOLS_VARNAME.bison-yacc}=	\
+	${TOOLS_REAL_CMD.bison-yacc} ${TOOLS_REAL_ARGS.bison-yacc}
+.  endif
+TOOLS_CMD.bison-yacc=		${TOOLS_DIR}/bin/yacc
+.endif
+
+.if !defined(TOOLS_IGNORE.bzcat) && !empty(_USE_TOOLS:Mbzcat)
+.  if !empty(PKGPATH:Marchivers/bzip2)
+MAKEFLAGS+=			TOOLS_IGNORE.bzcat=
+.  elif !empty(_TOOLS_USE_PKGSRC.bzcat:M[yY][eE][sS])
+TOOLS_DEPENDS.bzcat?=		bzip2>=0.9.0b:../../archivers/bzip2
+TOOLS_CREATE+=			bzcat
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.bzcat=bzip2
+TOOLS_REAL_CMD.bzcat=		${TOOLS_PREFIX.bzcat}/bin/bzcat
+TOOLS_${_TOOLS_VARNAME.bzcat}=	${TOOLS_REAL_CMD.bzcat}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.cat) && !empty(_USE_TOOLS:Mcat)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.cat=
+.  elif !empty(_TOOLS_USE_PKGSRC.cat:M[yY][eE][sS])
+TOOLS_DEPENDS.cat?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			cat
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cat=coreutils
+TOOLS_REAL_CMD.cat=		${TOOLS_PREFIX.cat}/bin/${GNU_PROGRAM_PREFIX}cat
+TOOLS_${_TOOLS_VARNAME.cat}=	${TOOLS_REAL_CMD.cat}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.chgrp) && !empty(_USE_TOOLS:Mchgrp)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.chgrp=
+.  elif !empty(_TOOLS_USE_PKGSRC.chgrp:M[yY][eE][sS])
+TOOLS_DEPENDS.chgrp?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			chgrp
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.chgrp=coreutils
+TOOLS_REAL_CMD.chgrp=		${TOOLS_PREFIX.chgrp}/bin/${GNU_PROGRAM_PREFIX}chgrp
+TOOLS_${_TOOLS_VARNAME.chgrp}=	${TOOLS_REAL_CMD.chgrp}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.chmod) && !empty(_USE_TOOLS:Mchmod)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.chmod=
+.  elif !empty(_TOOLS_USE_PKGSRC.chmod:M[yY][eE][sS])
+TOOLS_DEPENDS.chmod?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			chmod
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.chmod=coreutils
+TOOLS_REAL_CMD.chmod=		${TOOLS_PREFIX.chmod}/bin/${GNU_PROGRAM_PREFIX}chmod
+TOOLS_${_TOOLS_VARNAME.chmod}=	${TOOLS_REAL_CMD.chmod}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.chown) && !empty(_USE_TOOLS:Mchown)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.chown=
+.  elif !empty(_TOOLS_USE_PKGSRC.chown:M[yY][eE][sS])
+TOOLS_DEPENDS.chown?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			chown
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.chown=coreutils
+TOOLS_REAL_CMD.chown=		${TOOLS_PREFIX.chown}/bin/${GNU_PROGRAM_PREFIX}chown
+TOOLS_${_TOOLS_VARNAME.chown}=	${TOOLS_REAL_CMD.chown}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.cmp) && !empty(_USE_TOOLS:Mcmp)
+.  if !empty(PKGPATH:Mdevel/diffutils)
+MAKEFLAGS+=			TOOLS_IGNORE.cmp=
+.  elif !empty(_TOOLS_USE_PKGSRC.cmp:M[yY][eE][sS])
+TOOLS_DEPENDS.cmp?=		diffutils>=2.8.1:../../devel/diffutils
+TOOLS_CREATE+=			cmp
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cmp=diffutils
+TOOLS_REAL_CMD.cmp=		${TOOLS_PREFIX.cmp}/bin/cmp
+TOOLS_${_TOOLS_VARNAME.cmp}=	${TOOLS_REAL_CMD.cmp}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.cp) && !empty(_USE_TOOLS:Mcp)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.cp=
+.  elif !empty(_TOOLS_USE_PKGSRC.cp:M[yY][eE][sS])
+TOOLS_DEPENDS.cp?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			cp
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cp=coreutils
+TOOLS_REAL_CMD.cp=		${TOOLS_PREFIX.cp}/bin/${GNU_PROGRAM_PREFIX}cp
+TOOLS_${_TOOLS_VARNAME.cp}=	${TOOLS_REAL_CMD.cp}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.cut) && !empty(_USE_TOOLS:Mcut)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.cut=
+.  elif !empty(_TOOLS_USE_PKGSRC.cut:M[yY][eE][sS])
+TOOLS_DEPENDS.cut?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			cut
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.cut=coreutils
+TOOLS_REAL_CMD.cut=		${TOOLS_PREFIX.cut}/bin/${GNU_PROGRAM_PREFIX}cut
+TOOLS_${_TOOLS_VARNAME.cut}=	${TOOLS_REAL_CMD.cut}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.date) && !empty(_USE_TOOLS:Mdate)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.date=
+.  elif !empty(_TOOLS_USE_PKGSRC.date:M[yY][eE][sS])
+TOOLS_DEPENDS.date?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			date
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.date=coreutils
+TOOLS_REAL_CMD.date=		${TOOLS_PREFIX.date}/bin/${GNU_PROGRAM_PREFIX}date
+TOOLS_${_TOOLS_VARNAME.date}=	${TOOLS_REAL_CMD.date}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.dirname) && !empty(_USE_TOOLS:Mdirname)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.dirname=
+.  elif !empty(_TOOLS_USE_PKGSRC.dirname:M[yY][eE][sS])
+TOOLS_DEPENDS.dirname?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			dirname
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.dirname=coreutils
+TOOLS_REAL_CMD.dirname=		${TOOLS_PREFIX.dirname}/bin/${GNU_PROGRAM_PREFIX}dirname
+TOOLS_${_TOOLS_VARNAME.dirname}=	${TOOLS_REAL_CMD.dirname}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.echo) && !empty(_USE_TOOLS:Mecho)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.echo=
+.  elif !empty(_TOOLS_USE_PKGSRC.echo:M[yY][eE][sS])
+TOOLS_DEPENDS.echo?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			echo
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.echo=coreutils
+TOOLS_REAL_CMD.echo=		${TOOLS_PREFIX.echo}/bin/${GNU_PROGRAM_PREFIX}echo
+TOOLS_${_TOOLS_VARNAME.echo}=	${TOOLS_REAL_CMD.echo}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.egrep) && !empty(_USE_TOOLS:Megrep)
+.  if !empty(PKGPATH:Mtextproc/grep)
+MAKEFLAGS+=			TOOLS_IGNORE.egrep=
+.  elif !empty(_TOOLS_USE_PKGSRC.egrep:M[yY][eE][sS])
+TOOLS_DEPENDS.egrep?=		grep>=2.5.1:../../textproc/grep
+TOOLS_CREATE+=			egrep
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.egrep=grep
+TOOLS_REAL_CMD.egrep=		${TOOLS_PREFIX.egrep}/bin/${GNU_PROGRAM_PREFIX}egrep
+TOOLS_${_TOOLS_VARNAME.egrep}=	${TOOLS_REAL_CMD.egrep}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.env) && !empty(_USE_TOOLS:Menv)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.env=
+.  elif !empty(_TOOLS_USE_PKGSRC.env:M[yY][eE][sS])
+TOOLS_DEPENDS.env?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			env
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.env=coreutilsj
+TOOLS_REAL_CMD.env=		${TOOLS_PREFIX.env}/bin/${GNU_PROGRAM_PREFIX}env
+TOOLS_${_TOOLS_VARNAME.env}=	${TOOLS_REAL_CMD.env}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.expr) && !empty(_USE_TOOLS:Mexpr)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.expr=
+.  elif !empty(_TOOLS_USE_PKGSRC.expr:M[yY][eE][sS])
+TOOLS_DEPENDS.expr?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			expr
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.expr=coreutils
+TOOLS_REAL_CMD.expr=		${TOOLS_PREFIX.expr}/bin/${GNU_PROGRAM_PREFIX}expr
+TOOLS_${_TOOLS_VARNAME.expr}=	${TOOLS_REAL_CMD.expr}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.false) && !empty(_USE_TOOLS:Mfalse)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.false=
+.  elif !empty(_TOOLS_USE_PKGSRC.false:M[yY][eE][sS])
+TOOLS_DEPENDS.false?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			false
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.false=coreutils
+TOOLS_REAL_CMD.false=		${TOOLS_PREFIX.false}/bin/${GNU_PROGRAM_PREFIX}false
+TOOLS_${_TOOLS_VARNAME.false}=	${TOOLS_REAL_CMD.false}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.fgrep) && !empty(_USE_TOOLS:Mfgrep)
+.  if !empty(PKGPATH:Mtextproc/grep)
+MAKEFLAGS+=			TOOLS_IGNORE.fgrep=
+.  elif !empty(_TOOLS_USE_PKGSRC.fgrep:M[yY][eE][sS])
+TOOLS_DEPENDS.fgrep?=		grep>=2.5.1:../../textproc/grep
+TOOLS_CREATE+=			fgrep
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.fgrep=grep
+TOOLS_REAL_CMD.fgrep=		${TOOLS_PREFIX.fgrep}/bin/${GNU_PROGRAM_PREFIX}fgrep
+TOOLS_${_TOOLS_VARNAME.fgrep}=	${TOOLS_REAL_CMD.fgrep}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.file) && !empty(_USE_TOOLS:Mfile)
+.  if !empty(PKGPATH:Msysutils/file)
+MAKEFLAGS+=			TOOLS_IGNORE.file=
+.  elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS])
+TOOLS_DEPENDS.file?=		file>=4.13:../../sysutils/file
+TOOLS_CREATE+=			file
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.file=file
+TOOLS_REAL_CMD.file=		${TOOLS_PREFIX.file}/bin/file
+TOOLS_${_TOOLS_VARNAME.file}=	${TOOLS_REAL_CMD.file}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.find) && !empty(_USE_TOOLS:Mfind)
+.  if !empty(PKGPATH:Msysutils/findutils)
+MAKEFLAGS+=			TOOLS_IGNORE.find=
+.  elif !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS])
+TOOLS_DEPENDS.find?=		findutils>=4.1:../../sysutils/findutils
+TOOLS_CREATE+=			find
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.find=findutils
+TOOLS_REAL_CMD.find=		${TOOLS_PREFIX.find}/bin/${GNU_PROGRAM_PREFIX}find
+TOOLS_${_TOOLS_VARNAME.find}=	${TOOLS_REAL_CMD.find}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.gawk) && !empty(_USE_TOOLS:Mgawk)
+.  if !empty(PKGPATH:Mlang/gawk)
+MAKEFLAGS+=			TOOLS_IGNORE.gawk=
+.  elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS])
+TOOLS_DEPENDS.gawk?=		gawk>=3.1.1:../../lang/gawk
+TOOLS_CREATE+=			gawk
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gawk=gawk
+TOOLS_REAL_CMD.gawk=		${TOOLS_PREFIX.gawk}/bin/${GNU_PROGRAM_PREFIX}awk
+TOOLS_${_TOOLS_VARNAME.gawk}=	${TOOLS_REAL_CMD.gawk}
+.  endif
+TOOLS_ALIASES.gawk=		awk
+.endif
+
+.if !defined(TOOLS_IGNORE.gm4) && !empty(_USE_TOOLS:Mgm4)
+.  if !empty(PKGPATH:Mdevel/m4)
+MAKEFLAGS+=			TOOLS_IGNORE.gm4=
+.  elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS])
+TOOLS_DEPENDS.gm4?=		m4>=1.4:../../devel/m4
+TOOLS_CREATE+=			gm4
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gm4=m4
+TOOLS_REAL_CMD.gm4=		${TOOLS_PREFIX.gm4}/bin/gm4
+TOOLS_${_TOOLS_VARNAME.gm4}=	${TOOLS_REAL_CMD.gm4}
+.  endif
+TOOLS_ALIASES.gm4=		m4
+.endif
+
+.if !defined(TOOLS_IGNORE.gmake) && !empty(_USE_TOOLS:Mgmake)
+.  if !empty(PKGPATH:Mdevel/gmake)
+MAKEFLAGS+=			TOOLS_IGNORE.gmake=
+.  elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
+TOOLS_DEPENDS.gmake?=		gmake>=3.78:../../devel/gmake
+TOOLS_CREATE+=			gmake
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gmake=gmake
+TOOLS_REAL_CMD.gmake=		${TOOLS_PREFIX.gmake}/bin/gmake
+TOOLS_${_TOOLS_VARNAME.gmake}=	${TOOLS_REAL_CMD.gmake}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.grep) && !empty(_USE_TOOLS:Mgrep)
+.  if !empty(PKGPATH:Mtextproc/grep)
+MAKEFLAGS+=			TOOLS_IGNORE.grep=
+.  elif !empty(_TOOLS_USE_PKGSRC.grep:M[yY][eE][sS])
+TOOLS_DEPENDS.grep?=		grep>=2.5.1:../../textproc/grep
+TOOLS_CREATE+=			grep
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.grep=grep
+TOOLS_REAL_CMD.grep=		${TOOLS_PREFIX.grep}/bin/${GNU_PROGRAM_PREFIX}grep
+TOOLS_${_TOOLS_VARNAME.grep}=	${TOOLS_REAL_CMD.grep}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.gsed) && !empty(_USE_TOOLS:Mgsed)
+.  if !empty(PKGPATH:Mtextproc/gsed)
+MAKEFLAGS+=			TOOLS_IGNORE.gsed=
+.  elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS])
+TOOLS_DEPENDS.gsed?=		gsed>=3.0.2:../../textproc/gsed
+TOOLS_CREATE+=			gsed
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gsed=gsed
+TOOLS_REAL_CMD.gsed=		${TOOLS_PREFIX.gsed}/bin/${GNU_PROGRAM_PREFIX}sed
+TOOLS_${_TOOLS_VARNAME.gsed}=	${TOOLS_REAL_CMD.gsed}
+.  endif
+TOOLS_ALIASES.gsed=		sed
+.endif
+
+.if !defined(TOOLS_IGNORE.gtar) && !empty(_USE_TOOLS:Mgtar)
+.  if !empty(PKGPATH:Marchivers/gtar-base)
+MAKEFLAGS+=			TOOLS_IGNORE.gtar=
+.  elif !empty(_TOOLS_USE_PKGSRC.gtar:M[yY][eE][sS])
+TOOLS_DEPENDS.gtar?=		gtar-base>=1.13.25:../../archivers/gtar-base
+TOOLS_CREATE+=			gtar
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gtar=gtar-base
+TOOLS_REAL_CMD.gtar=		${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar
+TOOLS_${_TOOLS_VARNAME.gtar}=	${TOOLS_REAL_CMD.gtar}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip)
+.  if !empty(PKGPATH:Marchivers/gzip-base)
+MAKEFLAGS+=			TOOLS_IGNORE.gunzip=
+.  elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS])
+TOOLS_DEPENDS.gunzip?=		gzip-base>=1.2.4b:../../archivers/gzip-base
+TOOLS_CREATE+=			gunzip
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gunzip=gzip-base
+TOOLS_REAL_CMD.gunzip=		${TOOLS_PREFIX.gunzip}/bin/gunzip
+TOOLS_REAL_ARGS.gunzip=		-f
+TOOLS_${_TOOLS_VARNAME.gunzip}=	${TOOLS_REAL_CMD.gunzip} ${TOOLS_REAL_ARGS.gunzip}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.gzcat) && !empty(_USE_TOOLS:Mgzcat)
+.  if !empty(PKGPATH:Marchivers/gzip-base)
+MAKEFLAGS+=			TOOLS_IGNORE.gzcat=
+.  elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS])
+TOOLS_DEPENDS.gzcat?=		gzip-base>=1.2.4b:../../archivers/gzip-base
+TOOLS_CREATE+=			gzcat
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gzcat=gzip-base
+TOOLS_REAL_CMD.gzcat=		${TOOLS_PREFIX.gzcat}/bin/zcat
+TOOLS_${_TOOLS_VARNAME.gzcat}=	${TOOLS_REAL_CMD.gzcat}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.gzip) && !empty(_USE_TOOLS:Mgzip)
+.  if !empty(PKGPATH:Marchivers/gzip-base)
+MAKEFLAGS+=			TOOLS_IGNORE.gzip=
+.  elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
+TOOLS_DEPENDS.gzip?=		gzip-base>=1.2.4b:../../archivers/gzip-base
+TOOLS_CREATE+=			gzip
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.gzip=gzip-base
+TOOLS_REAL_CMD.gzip=		${TOOLS_PREFIX.gzip}/bin/gzip
+TOOLS_REAL_ARGS.gzip=		-nf ${GZIP}
+TOOLS_${_TOOLS_VARNAME.gzip}=	${TOOLS_REAL_CMD.gzip} ${TOOLS_REAL_ARGS.gzip}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.head) && !empty(_USE_TOOLS:Mhead)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.head=
+.  elif !empty(_TOOLS_USE_PKGSRC.head:M[yY][eE][sS])
+TOOLS_DEPENDS.head?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			head
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.head=coreutils
+TOOLS_REAL_CMD.head=		${TOOLS_PREFIX.head}/bin/${GNU_PROGRAM_PREFIX}head
+TOOLS_${_TOOLS_VARNAME.head}=	${TOOLS_REAL_CMD.head}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.hostname) && !empty(_USE_TOOLS:Mhostname)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.hostname=
+.  elif !empty(_TOOLS_USE_PKGSRC.hostname:M[yY][eE][sS])
+TOOLS_DEPENDS.hostname?=	coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			hostname
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.hostname=coreutils
+TOOLS_REAL_CMD.hostname=	${TOOLS_PREFIX.hostname}/bin/${GNU_PROGRAM_PREFIX}hostname
+TOOLS_${_TOOLS_VARNAME.hostname}=	${TOOLS_REAL_CMD.hostname}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.id) && !empty(_USE_TOOLS:Mid)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.id=
+.  elif !empty(_TOOLS_USE_PKGSRC.id:M[yY][eE][sS])
+TOOLS_DEPENDS.id?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			id
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.id=coreutils
+TOOLS_REAL_CMD.id=		${TOOLS_PREFIX.id}/bin/${GNU_PROGRAM_PREFIX}id
+TOOLS_${_TOOLS_VARNAME.id}=	${TOOLS_REAL_CMD.id}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.install) && !empty(_USE_TOOLS:Minstall)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.install=
+.  elif !empty(_TOOLS_USE_PKGSRC.install:M[yY][eE][sS])
+TOOLS_DEPENDS.install?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			install
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.install=coreutils
+TOOLS_REAL_CMD.install=		${TOOLS_PREFIX.install}/bin/${GNU_PROGRAM_PREFIX}install
+TOOLS_${_TOOLS_VARNAME.install}=	${TOOLS_REAL_CMD.install}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.lex) && !empty(_USE_TOOLS:Mlex)
+.  if !empty(PKGPATH:Mdevel/flex)
+MAKEFLAGS+=			TOOLS_IGNORE.lex=
+.  elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS])
+.    include "../../devel/flex/buildlink3.mk"
+_TOOLS_DEPENDS.lex=		# empty
+.      for _dep_ in ${BUILDLINK_DEPENDS.flex}
+_TOOLS_DEPENDS.lex+=		${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
+.      endfor
+.      undef _dep_
+TOOLS_DEPENDS.lex?=		${_TOOLS_DEPENDS.lex}
+TOOLS_CREATE+=			lex
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lex=flex
+TOOLS_REAL_CMD.lex=		${TOOLS_PREFIX.lex}/bin/flex
+TOOLS_${_TOOLS_VARNAME.lex}=	${TOOLS_REAL_CMD.lex}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.lha) && !empty(_USE_TOOLS:Mlha)
+.  if !empty(PKGPATH:Marchivers/lha)
+MAKEFLAGS+=			TOOLS_IGNORE.lha=
+.  elif !empty(_TOOLS_USE_PKGSRC.lha:M[yY][eE][sS])
+TOOLS_DEPENDS.lha?=		lha>=114.9:../../archivers/lha
+TOOLS_CREATE+=			lha
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.lha=lha
+TOOLS_REAL_CMD.lha=		${TOOLS_PREFIX.lha}/bin/lha
+TOOLS_${_TOOLS_VARNAME.lha}=	${TOOLS_REAL_CMD.lha}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.ln) && !empty(_USE_TOOLS:Mln)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.ln=
+.  elif !empty(_TOOLS_USE_PKGSRC.ln:M[yY][eE][sS])
+TOOLS_DEPENDS.ln?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			ln
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ln=coreutils
+TOOLS_REAL_CMD.ln=		${TOOLS_PREFIX.ln}/bin/${GNU_PROGRAM_PREFIX}ln
+TOOLS_${_TOOLS_VARNAME.ln}=	${TOOLS_REAL_CMD.ln}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.ls) && !empty(_USE_TOOLS:Mls)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.ls=
+.  elif !empty(_TOOLS_USE_PKGSRC.ls:M[yY][eE][sS])
+TOOLS_DEPENDS.ls?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			ls
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ls=coreutils
+TOOLS_REAL_CMD.ls=		${TOOLS_PREFIX.ls}/bin/${GNU_PROGRAM_PREFIX}ls
+TOOLS_${_TOOLS_VARNAME.ls}=	${TOOLS_REAL_CMD.ls}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.m4) && !empty(_USE_TOOLS:Mm4)
+.  if !empty(PKGPATH:Mdevel/m4)
+MAKEFLAGS+=			TOOLS_IGNORE.m4=
+.  elif !empty(_TOOLS_USE_PKGSRC.m4:M[yY][eE][sS])
+TOOLS_DEPENDS.m4?=		m4>=1.4:../../devel/m4
+TOOLS_CREATE+=			m4
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.m4=m4
+TOOLS_REAL_CMD.m4=		${TOOLS_PREFIX.m4}/bin/gm4
+TOOLS_${_TOOLS_VARNAME.m4}=	${TOOLS_REAL_CMD.m4}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.mail) && !empty(_USE_TOOLS:Mmail)
+.  if !empty(PKGPATH:Mmail/nail)
+MAKEFLAGS+=			TOOLS_IGNORE.mail=
+.  elif !empty(_TOOLS_USE_PKGSRC.mail:M[yY][eE][sS])
+TOOLS_DEPENDS.mail?=		nail>=11.22:../../mail/nail
+TOOLS_CREATE+=			mail
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mail=nail
+TOOLS_REAL_CMD.mail=		${TOOLS_PREFIX.mail}/bin/nail
+TOOLS_${_TOOLS_VARNAME.mail}=	${TOOLS_REAL_CMD.mail}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.mkdir) && !empty(_USE_TOOLS:Mmkdir)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.mkdir=
+.  elif !empty(_TOOLS_USE_PKGSRC.mkdir:M[yY][eE][sS])
+TOOLS_DEPENDS.mkdir?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			mkdir
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mkdir=coreutils
+TOOLS_REAL_CMD.mkdir=		${TOOLS_PREFIX.mkdir}/bin/${GNU_PROGRAM_PREFIX}mkdir
+TOOLS_REAL_ARGS.mkdir=		-p
+TOOLS_${_TOOLS_VARNAME.mkdir}=	${TOOLS_REAL_CMD.mkdir} ${TOOLS_REAL_ARGS.mkdir}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.mtree) && !empty(_USE_TOOLS:Mmtree)
+.  if !empty(PKGPATH:Mpkgtools/mtree)
+MAKEFLAGS+=			TOOLS_IGNORE.mtree=
+.  elif !empty(_TOOLS_USE_PKGSRC.mtree:M[yY][eE][sS])
+#
+# This is installed by pkgsrc bootstrap, and is never registered, so
+# comment out the dependency on it.
+#
+#TOOLS_DEPENDS.mtree?=		mtree>=20040722:../../pkgtools/mtree
+TOOLS_CREATE+=			mtree
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mtree=mtree
+TOOLS_REAL_CMD.mtree=		${TOOLS_PREFIX.mtree}/bin/mtree
+TOOLS_${_TOOLS_VARNAME.mtree}=	${TOOLS_REAL_CMD.mtree}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.mv) && !empty(_USE_TOOLS:Mmv)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.mv=
+.  elif !empty(_TOOLS_USE_PKGSRC.mv:M[yY][eE][sS])
+TOOLS_DEPENDS.mv?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			mv
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.mv=coreutils
+TOOLS_REAL_CMD.mv=		${TOOLS_PREFIX.mv}/bin/${GNU_PROGRAM_PREFIX}mv
+TOOLS_${_TOOLS_VARNAME.mv}=	${TOOLS_REAL_CMD.mv}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.nice) && !empty(_USE_TOOLS:Mnice)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.nice=
+.  elif !empty(_TOOLS_USE_PKGSRC.nice:M[yY][eE][sS])
+TOOLS_DEPENDS.nice?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			nice
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.nice=coreutils
+TOOLS_REAL_CMD.nice=		${TOOLS_PREFIX.nice}/bin/${GNU_PROGRAM_PREFIX}nice
+TOOLS_${_TOOLS_VARNAME.nice}=	${TOOLS_REAL_CMD.nice}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch)
+.  if !empty(PKGPATH:Mdevel/patch)
+MAKEFLAGS+=			TOOLS_IGNORE.patch=
+.  elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
+TOOLS_DEPENDS.patch?=		patch>=2.2:../../devel/patch
+TOOLS_CREATE+=			patch
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.patch=patch
+TOOLS_REAL_CMD.patch=		${TOOLS_PREFIX.patch}/bin/gpatch
+TOOLS_${_TOOLS_VARNAME.patch}=	${TOOLS_REAL_CMD.patch}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.pax) && !empty(_USE_TOOLS:Mpax)
+.  if !empty(PKGPATH:Marchivers/pax)
+MAKEFLAGS+=			TOOLS_IGNORE.pax=
+.  elif !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS])
+#
+# This is installed by pkgsrc bootstrap, and is never registered, so
+# comment out the dependency on it.
+#
+#TOOLS_DEPENDS.pax?=		pax>=20040802:../../archivers/pax
+TOOLS_CREATE+=			pax
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.pax=pax
+TOOLS_REAL_CMD.pax=		${TOOLS_PREFIX.pax}/bin/pax
+TOOLS_${_TOOLS_VARNAME.pax}=	${TOOLS_REAL_CMD.pax}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.pwd) && !empty(_USE_TOOLS:Mpwd)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.pwd=
+.  elif !empty(_TOOLS_USE_PKGSRC.pwd:M[yY][eE][sS])
+TOOLS_DEPENDS.pwd?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			pwd
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.pwd=coreutils
+TOOLS_REAL_CMD.pwd=		${TOOLS_PREFIX.pwd}/bin/${GNU_PROGRAM_PREFIX}pwd
+TOOLS_${_TOOLS_VARNAME.pwd}=	${TOOLS_REAL_CMD.pwd}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.rm) && !empty(_USE_TOOLS:Mrm)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.rm=
+.  elif !empty(_TOOLS_USE_PKGSRC.rm:M[yY][eE][sS])
+TOOLS_DEPENDS.rm?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			rm
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.rm=coreutils
+TOOLS_REAL_CMD.rm=		${TOOLS_PREFIX.rm}/bin/${GNU_PROGRAM_PREFIX}rm
+TOOLS_${_TOOLS_VARNAME.rm}=	${TOOLS_REAL_CMD.rm}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.rmdir) && !empty(_USE_TOOLS:Mrmdir)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.rmdir=
+.  elif !empty(_TOOLS_USE_PKGSRC.rmdir:M[yY][eE][sS])
+TOOLS_DEPENDS.rmdir?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			rmdir
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.rmdir=coreutils
+TOOLS_REAL_CMD.rmdir=		${TOOLS_PREFIX.rmdir}/bin/${GNU_PROGRAM_PREFIX}rmdir
+TOOLS_${_TOOLS_VARNAME.rmdir}=	${TOOLS_REAL_CMD.rmdir}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.sed) && !empty(_USE_TOOLS:Msed)
+.  if !empty(PKGPATH:Mtextproc/nbsed)
+MAKEFLAGS+=			TOOLS_IGNORE.sed=
+.  elif !empty(_TOOLS_USE_PKGSRC.sed:M[yY][eE][sS])
+TOOLS_DEPENDS.sed?=		nbsed>=20040821:../../textproc/nbsed
+TOOLS_CREATE+=			sed
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sed=nbsed
+TOOLS_REAL_CMD.sed=		${TOOLS_PREFIX.nbsed}/bin/nbsed
+TOOLS_${_TOOLS_VARNAME.sed}=	${TOOLS_REAL_CMD.sed}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.sh) && !empty(_USE_TOOLS:Msh)
+.  if !empty(PKGPATH:Mshells/pdksh)
+MAKEFLAGS+=			TOOLS_IGNORE.sh=
+.  elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS])
+TOOLS_DEPENDS.sh?=		pdksh>=5.2.14:../../shells/pdksh
+TOOLS_CREATE+=			sh
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sh=pdksh
+TOOLS_REAL_CMD.sh=		${TOOLS_PREFIX.sh}/bin/pdksh
+TOOLS_${_TOOLS_VARNAME.sh}=	${TOOLS_REAL_CMD.sh}
+.  endif
+TOOLS_CMD.sh=			${TOOLS_DIR}/bin/sh
+.endif
+
+.if !defined(TOOLS_IGNORE.shlock) && !empty(_USE_TOOLS:Mshlock)
+.  if !empty(PKGPATH:Mpkgtools/shlock)
+MAKEFLAGS+=			TOOLS_IGNORE.shlock=
+.  elif !empty(_TOOLS_USE_PKGSRC.shlock:M[yY][eE][sS])
+TOOLS_DEPENDS.shlock?=		shlock>=20020114:../../pkgtools/shlock
+TOOLS_CREATE+=			shlock
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.shlock=shlock
+TOOLS_REAL_CMD.shlock=		${TOOLS_PREFIX.shlock}/bin/shlock
+TOOLS_${_TOOLS_VARNAME.shlock}=	${TOOLS_REAL_CMD.shlock}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.sort) && !empty(_USE_TOOLS:Msort)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.sort=
+.  elif !empty(_TOOLS_USE_PKGSRC.sort:M[yY][eE][sS])
+TOOLS_DEPENDS.sort?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			sort
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.sort=coreutils
+TOOLS_REAL_CMD.sort=		${TOOLS_PREFIX.sort}/bin/${GNU_PROGRAM_PREFIX}sort
+TOOLS_${_TOOLS_VARNAME.sort}=	${TOOLS_REAL_CMD.sort}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.tail) && !empty(_USE_TOOLS:Mtail)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.tail=
+.  elif !empty(_TOOLS_USE_PKGSRC.tail:M[yY][eE][sS])
+TOOLS_DEPENDS.tail?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			tail
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tail=coreutils
+TOOLS_REAL_CMD.tail=		${TOOLS_PREFIX.tail}/bin/${GNU_PROGRAM_PREFIX}tail
+TOOLS_${_TOOLS_VARNAME.tail}=	${TOOLS_REAL_CMD.tail}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.tar) && !empty(_USE_TOOLS:Mtar)
+.  if !empty(PKGPATH:Marchivers/pax)
+MAKEFLAGS+=			TOOLS_IGNORE.tar=
+.  elif !empty(_TOOLS_USE_PKGSRC.tar:M[yY][eE][sS])
+#
+# This is installed by pkgsrc bootstrap, and is never registered, so
+# comment out the dependency on it.
+#
+#TOOLS_DEPENDS.tar?=		pax>=20040802:../../archivers/pax
+TOOLS_CREATE+=			tar
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tar=pax
+TOOLS_REAL_CMD.tar=		${TOOLS_PREFIX.tar}/bin/tar
+TOOLS_${_TOOLS_VARNAME.tar}=	${TOOLS_REAL_CMD.tar}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.tbl) && !empty(_USE_TOOLS:Mtbl)
+.  if !empty(PKGPATH:Mtextproc/groff)
+MAKEFLAGS+=			TOOLS_IGNORE.tbl=
+.  elif !empty(_TOOLS_USE_PKGSRC.tbl:M[yY][eE][sS])
+TOOLS_DEPENDS.tbl?=		groff>=1.19nb4:../../textproc/groff
+TOOLS_CREATE+=			tbl
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tbl=groff
+TOOLS_REAL_CMD.tbl=		${TOOLS_PREFIX.tbl}/bin/tbl
+TOOLS_${_TOOLS_VARNAME.tbl}=	${TOOLS_REAL_CMD.tbl}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.tee) && !empty(_USE_TOOLS:Mtee)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.tee=
+.  elif !empty(_TOOLS_USE_PKGSRC.tee:M[yY][eE][sS])
+TOOLS_DEPENDS.tee?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			tee
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tee=coreutils
+TOOLS_REAL_CMD.tee=		${TOOLS_PREFIX.tee}/bin/${GNU_PROGRAM_PREFIX}tee
+TOOLS_${_TOOLS_VARNAME.tee}=	${TOOLS_REAL_CMD.tee}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.test) && !empty(_USE_TOOLS:Mtest)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.test=
+.  elif !empty(_TOOLS_USE_PKGSRC.test:M[yY][eE][sS])
+TOOLS_DEPENDS.test?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			test
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.test=coreutils
+TOOLS_REAL_CMD.test=		${TOOLS_PREFIX.test}/bin/${GNU_PROGRAM_PREFIX}test
+TOOLS_${_TOOLS_VARNAME.test}=	${TOOLS_REAL_CMD.test}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.touch) && !empty(_USE_TOOLS:Mtouch)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.touch=
+.  elif !empty(_TOOLS_USE_PKGSRC.touch:M[yY][eE][sS])
+TOOLS_DEPENDS.touch?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			touch
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.touch=coreutils
+TOOLS_REAL_CMD.touch=		${TOOLS_PREFIX.touch}/bin/${GNU_PROGRAM_PREFIX}touch
+TOOLS_${_TOOLS_VARNAME.touch}=	${TOOLS_REAL_CMD.touch}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.tr) && !empty(_USE_TOOLS:Mtr)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.tr=
+.  elif !empty(_TOOLS_USE_PKGSRC.tr:M[yY][eE][sS])
+TOOLS_DEPENDS.tr?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			tr
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tr=coreutils
+TOOLS_REAL_CMD.tr=		${TOOLS_PREFIX.tr}/bin/${GNU_PROGRAM_PREFIX}tr
+TOOLS_${_TOOLS_VARNAME.tr}=	${TOOLS_REAL_CMD.tr}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.true) && !empty(_USE_TOOLS:Mtrue)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.true=
+.  elif !empty(_TOOLS_USE_PKGSRC.true:M[yY][eE][sS])
+TOOLS_DEPENDS.true?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			true
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.true=coreutils
+TOOLS_REAL_CMD.true=		${TOOLS_PREFIX.true}/bin/${GNU_PROGRAM_PREFIX}true
+TOOLS_${_TOOLS_VARNAME.true}=	${TOOLS_REAL_CMD.true}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.tsort) && !empty(_USE_TOOLS:Mtsort)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.tsort=
+.  elif !empty(_TOOLS_USE_PKGSRC.tsort:M[yY][eE][sS])
+TOOLS_DEPENDS.tsort?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			tsort
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.tsort=coreutils
+TOOLS_REAL_CMD.tsort=		${TOOLS_PREFIX.tsort}/bin/${GNU_PROGRAM_PREFIX}tsort
+TOOLS_${_TOOLS_VARNAME.tsort}=	${TOOLS_REAL_CMD.tsort}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.unrar) && !empty(_USE_TOOLS:Munrar)
+.  if !empty(PKGPATH:Marchivers/unrar)
+MAKEFLAGS+=			TOOLS_IGNORE.unrar=
+.  elif !empty(_TOOLS_USE_PKGSRC.unrar:M[yY][eE][sS])
+TOOLS_DEPENDS.unrar?=		unrar>=3.3.4:../../archivers/unrar
+TOOLS_CREATE+=			unrar
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unrar=unrar
+TOOLS_REAL_CMD.unrar=		${TOOLS_PREFIX.unrar}/bin/unrar
+TOOLS_${_TOOLS_VARNAME.unrar}=	${TOOLS_REAL_CMD.unrar}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.unzip) && !empty(_USE_TOOLS:Munzip)
+.  if !empty(PKGPATH:Marchivers/unzip)
+MAKEFLAGS+=			TOOLS_IGNORE.unzip=
+.  elif !empty(_TOOLS_USE_PKGSRC.unzip:M[yY][eE][sS])
+TOOLS_DEPENDS.unzip?=		unzip-[0-9]*:../../archivers/unzip
+TOOLS_CREATE+=			unzip
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unzip=unzip
+TOOLS_REAL_CMD.unzip=		${TOOLS_PREFIX.unzip}/bin/unzip
+TOOLS_${_TOOLS_VARNAME.unzip}=	${TOOLS_REAL_CMD.unzip}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.unzoo) && !empty(_USE_TOOLS:Munzoo)
+.  if !empty(PKGPATH:Marchivers/unzoo)
+MAKEFLAGS+=			TOOLS_IGNORE.unzoo=
+.  elif !empty(_TOOLS_USE_PKGSRC.unzoo:M[yY][eE][sS])
+TOOLS_DEPENDS.unzoo?=		unzoo-[0-9]*:../../archivers/unzoo
+TOOLS_CREATE+=			unzoo
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.unzoo=unzoo
+TOOLS_REAL_CMD.unzoo=		${TOOLS_PREFIX.unzoo}/bin/unzoo
+TOOLS_${_TOOLS_VARNAME.unzoo}=	${TOOLS_REAL_CMD.unzoo}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.wc) && !empty(_USE_TOOLS:Mwc)
+.  if !empty(PKGPATH:Msysutils/coreutils)
+MAKEFLAGS+=			TOOLS_IGNORE.wc=
+.  elif !empty(_TOOLS_USE_PKGSRC.wc:M[yY][eE][sS])
+TOOLS_DEPENDS.wc?=		coreutils>=5.2.1:../../sysutils/coreutils
+TOOLS_CREATE+=			wc
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.wc=coreutils
+TOOLS_REAL_CMD.wc=		${TOOLS_PREFIX.wc}/bin/${GNU_PROGRAM_PREFIX}wc
+TOOLS_${_TOOLS_VARNAME.wc}=	${TOOLS_REAL_CMD.wc}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.xargs) && !empty(_USE_TOOLS:Mxargs)
+.  if !empty(PKGPATH:Msysutils/findutils)
+MAKEFLAGS+=			TOOLS_IGNORE.xargs=
+.  elif !empty(_TOOLS_USE_PKGSRC.xargs:M[yY][eE][sS])
+TOOLS_DEPENDS.xargs?=		findutils>=4.1:../../sysutils/findutils
+TOOLS_CREATE+=			xargs
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.xargs=findutils
+TOOLS_REAL_CMD.xargs=		${TOOLS_PREFIX.xargs}/bin/${GNU_PROGRAM_PREFIX}xargs
+TOOLS_REAL_ARGS.xargs=		-r	# don't run command if stdin is empty
+TOOLS_${_TOOLS_VARNAME.xargs}=	${TOOLS_REAL_CMD.xargs} ${TOOLS_REAL_ARGS.xargs}
+.  endif
+.endif
+
+.if !defined(TOOLS_IGNORE.yacc) && !empty(_USE_TOOLS:Myacc)
+.  if !empty(PKGPATH:Mdevel/bison)
+MAKEFLAGS+=			TOOLS_IGNORE.yacc=
+.  elif !empty(_TOOLS_USE_PKGSRC.yacc:M[yY][eE][sS])
+TOOLS_DEPENDS.yacc?=		bison>=1.0:../../devel/bison
+TOOLS_CREATE+=			yacc
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.yacc=bison
+TOOLS_REAL_CMD.yacc=		${TOOLS_PREFIX.yacc}/bin/bison
+TOOLS_REAL_ARGS.yacc=		-y
+TOOLS_${_TOOLS_VARNAME.yacc}=	${TOOLS_REAL_CMD.yacc} ${TOOLS_REAL_ARGS.yacc}
+.  endif
+.endif
+
+# Compute the locations of the pkgsrc-supplied tools.
+FIND_PREFIX:=	${TOOLS_FIND_PREFIX}
+.include "../../mk/find-prefix.mk"
+
+######################################################################
+
+# Add the dependencies for each pkgsrc-supplied tool.
+#
+.for _t_ in ${_USE_TOOLS}
+.  if defined(TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
+.    if empty(${TOOLS_DEPMETHOD.${_t_}}:M${TOOLS_DEPENDS.${_t_}})
+${TOOLS_DEPMETHOD.${_t_}}+=	${TOOLS_DEPENDS.${_t_}}
+.    endif
+.  endif
+.endfor
+
+######################################################################
+
+# For each tool that pkgsrc requires, make sure that the "TOOL" name
+# points to the real command, e.g., AWK, SED, etc., provided that
+# "TOOL" has been associated with <tool>.
+#
+.for _t_ in ${PKGSRC_USE_TOOLS:O:u}
+_TOOLS_USE_PKGSRC.${_t_}?=	no
+.  if defined(_TOOLS_VARNAME.${_t_})
+.    if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO])
+.      if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
+${_TOOLS_VARNAME.${_t_}}=	${TOOLS_PLATFORM.${_t_}}
+.      endif
+.    else
+${_TOOLS_VARNAME.${_t_}}=	${TOOLS_${_TOOLS_VARNAME.${_t_}}}
+.    endif
+.  endif
+.endfor
+.undef _t_
+
+######################################################################
+
+# If we are using the system-supplied tool, create symlinks or wrappers
+# for each of the tools requested.
+#
+# Set TOOLS_REAL_CMD.<tool> appropriately in the case where we are
+# using the system-supplied tool.  Here, we first check to see if
+# TOOLS_PLATFORM.<tool> is defined.  If it is, then use that as the
+# path to the real command and extract any arguments into
+# TOOLS_REAL_ARGS.<tool>.
+#
+# Always set the "TOOLS_TOOL" name for each tool to point to the real
+# command, e.g., TOOLS_TBL, TOOLS_YACC, etc., provided that "TOOL" has
+# been associated with <tool>.  If the "TOOL" name is undefined, then
+# set it to the same value to provide a simple name for use by package
+# Makefiles.
+#
+.for _t_ in ${_USE_TOOLS}
+.  if !defined(TOOLS_IGNORE.${_t_}) && \
+      !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO])
+.    if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
+TOOLS_REAL_CMD.${_t_}?=		\
+	${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+TOOLS_REAL_ARGS.${_t_}?=	\
+	${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:N_asdf_*}
+.      if defined(_TOOLS_VARNAME.${_t_})
+TOOLS_${_TOOLS_VARNAME.${_t_}}=	${TOOLS_PLATFORM.${_t_}}
+.      endif
+TOOLS_CREATE+=			${_t_}
+.    elif defined(_TOOLS_VARNAME.${_t_})
+.      if defined(TOOLS_REAL_CMD.${_t_})
+TOOLS_${_TOOLS_VARNAME.${_t_}}=	${TOOLS_REAL_CMD.${_t_}} ${TOOLS_REAL_ARGS.${_t_}}
+.      else
+TOOLS_${_TOOLS_VARNAME.${_t_}}=	${_TOOLS_VARNAME.${_t_}}_not_defined_
+.      endif
+.    endif
+.  endif
+.  if defined(_TOOLS_VARNAME.${_t_})
+.    if defined(TOOLS_${_TOOLS_VARNAME.${_t_}})
+.      for _v_ in ${_TOOLS_VARNAME.${_t_}}
+${_v_}?=	${TOOLS_${_TOOLS_VARNAME.${_t_}}}
+.      endfor
+.      undef _v_
+.    endif
+.  endif
+.endfor
+.undef _t_
diff --git a/mk/tools/rpcgen.mk b/mk/tools/rpcgen.mk
new file mode 100644
index 00000000000..b6c1e362474
--- /dev/null
+++ b/mk/tools/rpcgen.mk
@@ -0,0 +1,28 @@
+# $NetBSD: rpcgen.mk,v 1.5.2.2 2005/05/17 18:29:46 tv Exp $
+
+# Create an rpcgen script that correctly sets the CPP environment
+# variable to a stat(2)able path to a C preprocessor, then invokes
+# the real rpcgen.
+#
+TOOLS_CREATE+=		rpcgen
+.if !defined(TOOLS_REAL_CMD.rpcgen)
+TOOLS_EXECDIRS.rpcgen?=	/bin /sbin /usr/bin /usr/sbin
+.  for _d_ in ${TOOLS_EXECDIRS.rpcgen}
+.    if exists(${_d_}/rpcgen)
+TOOLS_REAL_CMD.rpcgen?=	${_d_}/rpcgen
+.    endif
+.  endfor
+.  undef _d_
+TOOLS_REAL_CMD.rpcgen?=	${FALSE}
+.endif
+TOOLS_CMD.rpcgen=	${TOOLS_DIR}/bin/rpcgen
+.if ${OPSYS} == "NetBSD"
+TOOLS_REAL_ARGS.rpcgen?=	-b
+.endif
+TOOLS_REAL_CMDLINE.rpcgen=	\
+	CPP=${WRAPPER_BINDIR:Q}/cpp ${TOOLS_REAL_CMD.rpcgen} ${TOOLS_REAL_ARGS.rpcgen} "$$@"
+
+# Make ${RPCGEN} call the "rpcgen" through the PATH, which should find
+# the rpcgen tool wrapper.
+#
+RPCGEN?=	rpcgen
diff --git a/mk/tools/strip.mk b/mk/tools/strip.mk
new file mode 100644
index 00000000000..79153e769b5
--- /dev/null
+++ b/mk/tools/strip.mk
@@ -0,0 +1,16 @@
+# $NetBSD: strip.mk,v 1.1.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# Depending on whether _INSTALL_UNSTRIPPED is defined, we cause
+# ${TOOLS_DIR}/bin/strip to be either the correct strip tool or a no-op.
+#
+.if defined(_INSTALL_UNSTRIPPED) || !defined(TOOLS_PLATFORM.strip)
+TOOLS_NOOP+=		strip
+.else
+TOOLS_CREATE+=		strip
+TOOLS_REAL_CMD.strip=	${TOOLS_PLATFORM.strip}
+.endif
+
+# Make ${STRIP} call "strip" through the PATH, which should find the one
+# under ${TOOLS_DIR}.
+#
+STRIP?=		strip
diff --git a/mk/tools/texinfo.mk b/mk/tools/texinfo.mk
new file mode 100644
index 00000000000..1259f26f970
--- /dev/null
+++ b/mk/tools/texinfo.mk
@@ -0,0 +1,23 @@
+# $NetBSD: texinfo.mk,v 1.5.2.2 2005/05/17 18:29:46 tv Exp $
+
+# Create an install-info script that is a "no operation" command, as
+# registration of info files is handled by the INSTALL script.
+#
+TOOLS_NOOP+=		install-info
+CONFIGURE_ENV+=		INSTALL_INFO=${TOOLS_CMD.install-info:Q}
+MAKE_ENV+=		INSTALL_INFO=${TOOLS_CMD.install-info:Q}
+
+# Create a makeinfo script that will invoke the right makeinfo command
+# if USE_MAKEINFO is "yes" or will exit on error if not.  MAKEINFO is
+# defined by mk/texinfo.mk if USE_MAKEINFO is "yes".
+#
+USE_MAKEINFO?=			no
+.if empty(USE_MAKEINFO:M[nN][oO])
+TOOLS_CREATE+=			makeinfo
+TOOLS_REAL_CMD.makeinfo=	${MAKEINFO:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
+TOOLS_REAL_ARGS.makeinfo=	${MAKEINFO:C/^/_asdf_/1:N_asdf_*}
+.else
+TOOLS_BROKEN+=			makeinfo
+.endif
+CONFIGURE_ENV+=			MAKEINFO=${TOOLS_CMD.makeinfo:Q}
+MAKE_ENV+=			MAKEINFO=${TOOLS_CMD.makeinfo:Q}
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
new file mode 100644
index 00000000000..4ec43953160
--- /dev/null
+++ b/mk/tools/tools.AIX.mk
@@ -0,0 +1,53 @@
+# $NetBSD: tools.AIX.mk,v 1.8.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the AIX operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/bin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/grep -E
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/grep -F
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
new file mode 100644
index 00000000000..645f46241b8
--- /dev/null
+++ b/mk/tools/tools.BSDOS.mk
@@ -0,0 +1,63 @@
+# $NetBSD: tools.BSDOS.mk,v 1.11.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the BSD/OS operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/bin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/contrib/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/contrib/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/contrib/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.install?=	/usr/bin/install
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/contrib/bin/patch
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/bash
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+.if exists(/bin/tar)
+TOOLS_PLATFORM.tar?=		/bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+.endif
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
new file mode 100644
index 00000000000..35a80339aa2
--- /dev/null
+++ b/mk/tools/tools.Darwin.mk
@@ -0,0 +1,63 @@
+# $NetBSD: tools.Darwin.mk,v 1.10.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the Darwin (Mac OS X) operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.gmake?=		/usr/bin/gnumake
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gtar?=		/usr/bin/gnutar
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.install?=	/usr/bin/install
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
new file mode 100644
index 00000000000..6b9c7952238
--- /dev/null
+++ b/mk/tools/tools.DragonFly.mk
@@ -0,0 +1,65 @@
+# $NetBSD: tools.DragonFly.mk,v 1.12.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the DragonFly operating system.
+
+TOOLS_PLATFORM.[?=		/bin/[
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		/usr/bin/false
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.install?=	/usr/bin/install
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+TOOLS_PLATFORM.test?=		/bin/test
+TOOLS_PLATFORM.touch?=		/usr/bin/touch
+TOOLS_PLATFORM.tr?=		/usr/bin/tr
+TOOLS_PLATFORM.true?=		/usr/bin/true
+TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
new file mode 100644
index 00000000000..37d311fe124
--- /dev/null
+++ b/mk/tools/tools.FreeBSD.mk
@@ -0,0 +1,67 @@
+# $NetBSD: tools.FreeBSD.mk,v 1.12.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the FreeBSD operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+.if exists(/usr/bin/bzcat)
+TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
+.endif
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.install?=	/usr/bin/install
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
new file mode 100644
index 00000000000..88e0b089353
--- /dev/null
+++ b/mk/tools/tools.IRIX.mk
@@ -0,0 +1,63 @@
+# $NetBSD: tools.IRIX.mk,v 1.12.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the IRIX operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/nawk
+TOOLS_PLATFORM.basename?=	/sbin/basename
+TOOLS_PLATFORM.cat?=		/sbin/cat
+TOOLS_PLATFORM.chgrp?=		/sbin/chgrp
+TOOLS_PLATFORM.chmod?=		/sbin/chmod
+TOOLS_PLATFORM.chown?=		/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/sbin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/sbin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/sbin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/sbin/find
+TOOLS_PLATFORM.grep?=		/sbin/grep
+.if exists(/usr/sbin/gunzip)
+TOOLS_PLATFORM.gunzip?=		/usr/sbin/gunzip -f
+.endif
+.if exists(/usr/sbin/gzcat)
+TOOLS_PLATFORM.gzcat?=		/usr/sbin/gzcat
+.endif
+.if exists(/usr/sbin/gzip)
+TOOLS_PLATFORM.gzip?=		/usr/sbin/gzip -nf ${GZIP}
+.endif
+TOOLS_PLATFORM.head?=		/usr/bsd/head
+TOOLS_PLATFORM.hostname?=	/usr/bsd/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.ln?=		/sbin/ln
+TOOLS_PLATFORM.ls?=		/sbin/ls
+TOOLS_PLATFORM.m4?=		/sbin/m4
+.if exists(/usr/sbin/mailx)
+TOOLS_PLATFORM.mail?=		/usr/sbin/mailx
+.elif exists(/usr/bin/mail)
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+.endif
+TOOLS_PLATFORM.mkdir?=		/sbin/mkdir -p
+TOOLS_PLATFORM.mv?=		/sbin/mv
+TOOLS_PLATFORM.nice?=		/sbin/nice
+TOOLS_PLATFORM.pwd?=		/sbin/pwd
+TOOLS_PLATFORM.rm?=		/sbin/rm
+TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
+TOOLS_PLATFORM.sed?=		/sbin/sed
+TOOLS_PLATFORM.sh?=		/bin/ksh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/sbin/wc
+TOOLS_PLATFORM.xargs?=		/sbin/xargs
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
new file mode 100644
index 00000000000..da09a4ba003
--- /dev/null
+++ b/mk/tools/tools.Interix.mk
@@ -0,0 +1,53 @@
+# $NetBSD: tools.Interix.mk,v 1.11.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the Interix operating system.
+
+TOOLS_PLATFORM.[?=		/bin/[
+TOOLS_PLATFORM.awk?=		/usr/contrib/bin/gawk
+TOOLS_PLATFORM.basename?=	/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/bin/chown
+TOOLS_PLATFORM.cmp?=		/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/bin/egrep
+TOOLS_PLATFORM.env?=		/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/bin/fgrep
+TOOLS_PLATFORM.file?=		/bin/file
+TOOLS_PLATFORM.find?=		/bin/find
+TOOLS_PLATFORM.grep?=		/bin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/contrib/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/contrib/bin/gunzip -c
+TOOLS_PLATFORM.gzip?=		/usr/contrib/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/bin/id
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/bin/m4
+TOOLS_PLATFORM.mail?=		/bin/mail
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/bin/nice
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sort?=		/bin/sort
+TOOLS_PLATFORM.strip?=		/bin/strip
+TOOLS_PLATFORM.tail?=		/bin/tail
+TOOLS_PLATFORM.tee?=		/bin/tee
+TOOLS_PLATFORM.test?=		/bin/test
+TOOLS_PLATFORM.touch?=		/bin/touch
+TOOLS_PLATFORM.tr?=		/bin/tr
+TOOLS_PLATFORM.true?=		true			# shell builtin
+TOOLS_PLATFORM.tsort?=		/bin/tsort
+TOOLS_PLATFORM.wc?=		/bin/wc
+TOOLS_PLATFORM.xargs?=		/bin/xargs
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
new file mode 100644
index 00000000000..4cc80b59a97
--- /dev/null
+++ b/mk/tools/tools.Linux.mk
@@ -0,0 +1,129 @@
+# $NetBSD: tools.Linux.mk,v 1.17.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the Linux operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		${TOOLS_PLATFORM.gawk}
+.if exists(/bin/basename)
+TOOLS_PLATFORM.basename?=	/bin/basename
+.elif exists(/usr/bin/basename)
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+.endif
+.if exists(/usr/bin/bison)
+TOOLS_PLATFORM.bison?=		/usr/bin/bison
+TOOLS_PLATFORM.bison-yacc?=	/usr/bin/bison -y
+.endif
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/bin/chown
+.if exists(/bin/cmp)
+TOOLS_PLATFORM.cmp?=		/bin/cmp
+.elif exists(/usr/bin/cmp)
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+.endif
+TOOLS_PLATFORM.cp?=		/bin/cp
+.if exists(/bin/cut)
+TOOLS_PLATFORM.cut?=		/bin/cut
+.elif exists(/usr/bin/cut)
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+.endif
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+.if exists(/bin/egrep)
+TOOLS_PLATFORM.egrep?=		/bin/egrep
+.elif exists(/usr/bin/egrep)
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+.endif
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/usr/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+.if exists(/bin/fgrep)
+TOOLS_PLATFORM.fgrep?=		/bin/fgrep
+.elif exists(/usr/bin/fgrep)
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+.endif
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.gawk?=		/usr/bin/awk
+TOOLS_PLATFORM.gm4?=		/usr/bin/m4
+.if exists(/usr/bin/make)
+TOOLS_PLATFORM.gmake?=		/usr/bin/make
+.endif
+.if exists(/bin/grep)
+TOOLS_PLATFORM.grep?=		/bin/grep
+.elif exists(/usr/bin/grep)
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+.endif
+.if exists(/bin/sed)
+TOOLS_PLATFORM.gsed?=		/bin/sed
+.elif exists(/usr/bin/sed)
+TOOLS_PLATFORM.gsed?=		/usr/bin/sed
+.endif
+TOOLS_PLATFORM.gtar?=		/bin/tar
+.if exists(/bin/gunzip)
+TOOLS_PLATFORM.gunzip?=		/bin/gunzip -f
+.elif exists(/usr/bin/gunzip)
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+.endif
+TOOLS_PLATFORM.gzcat?=		/bin/zcat
+.if exists(/bin/gzip)
+TOOLS_PLATFORM.gzip?=		/bin/gzip -nf ${GZIP}
+.elif exists(/usr/bin/gzip)
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+.endif
+.if exists(/bin/head)
+TOOLS_PLATFORM.head?=		/bin/head
+.elif exists(/usr/bin/head)
+TOOLS_PLATFORM.head?=		/usr/bin/head
+.endif
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+.if exists(/bin/id)
+TOOLS_PLATFORM.id?=		/bin/id
+.elif exists(/usr/bin/id)
+TOOLS_PLATFORM.id?=		/usr/bin/id
+.endif
+TOOLS_PLATFORM.install?=	/usr/bin/install
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		${TOOLS_PLATFORM.gm4}
+.if exists(/bin/mail)
+TOOLS_PLATFORM.mail?=		/bin/mail	# RH, Mandrake
+.elif exists(/usr/bin/mail)
+TOOLS_PLATFORM.mail?=		/usr/bin/mail	# Debian, Slackware, SuSE
+.endif
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
+.if exists(/bin/nice)
+TOOLS_PLATFORM.nice?=		/bin/nice
+.elif exists(/usr/bin/nice)
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+.endif
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		${TOOLS_PLATFORM.gsed}
+TOOLS_PLATFORM.sh?=		/bin/sh
+.if exists(/bin/sort)
+TOOLS_PLATFORM.sort?=		/bin/sort
+.elif exists(/usr/bin/sort)
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+.endif
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		${TOOLS_PLATFORM.gtar}
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+TOOLS_PLATFORM.test?=		test			# shell builtin
+.if exists(/bin/touch)
+TOOLS_PLATFORM.touch?=		/bin/touch
+.elif exists(/usr/bin/touch)
+TOOLS_PLATFORM.touch?=		/usr/bin/touch
+.endif
+TOOLS_PLATFORM.tr?=		/usr/bin/tr
+TOOLS_PLATFORM.true?=		true			# shell builtin
+TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
new file mode 100644
index 00000000000..83fbc92853d
--- /dev/null
+++ b/mk/tools/tools.NetBSD.mk
@@ -0,0 +1,77 @@
+# $NetBSD: tools.NetBSD.mk,v 1.13.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the NetBSD operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+.if exists(/usr/bin/bzcat)
+TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
+.endif
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+.if !empty(MACHINE_PLATFORM:MNetBSD-1.[0-6]*-*)
+TOOLS_PLATFORM.gawk?=		${TOOLS_PLATFORM.awk}
+.endif
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gsed?=		${TOOLS_PLATFORM.sed}	# GNUish
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.install?=	/usr/bin/install
+.if exists(/sbin/ldconfig)
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+.endif
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pax?=		/bin/pax
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+.if exists(/bin/tar)
+TOOLS_PLATFORM.tar?=		/bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+.endif
+TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
new file mode 100644
index 00000000000..cba5b7ee649
--- /dev/null
+++ b/mk/tools/tools.OSF1.mk
@@ -0,0 +1,54 @@
+# $NetBSD: tools.OSF1.mk,v 1.9.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the OSF/1 operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/bin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		/usr/bin/echo
+TOOLS_PLATFORM.egrep?=		/usr/bin/grep -E
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/grep -F
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sh?=		/bin/ksh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/ccs/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
new file mode 100644
index 00000000000..553e4742ebb
--- /dev/null
+++ b/mk/tools/tools.OpenBSD.mk
@@ -0,0 +1,66 @@
+# $NetBSD: tools.OpenBSD.mk,v 1.11.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the OpenBSD operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/awk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/sbin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		echo			# shell builtin
+TOOLS_PLATFORM.egrep?=		/usr/bin/egrep
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/bin/expr
+TOOLS_PLATFORM.false?=		false			# shell builtin
+TOOLS_PLATFORM.fgrep?=		/usr/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.install?=	/usr/bin/install
+TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
+TOOLS_PLATFORM.lex?=		/usr/bin/lex
+TOOLS_PLATFORM.ln?=		/bin/ln
+TOOLS_PLATFORM.ls?=		/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
+TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
+TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
+TOOLS_PLATFORM.mv?=		/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.patch?=		/usr/bin/patch
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/bin/rm
+TOOLS_PLATFORM.rmdir?=		/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/bin/sh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+.if exists(/bin/tar)
+TOOLS_PLATFORM.tar?=		/bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.tar?=		/usr/bin/tar
+.endif
+TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+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.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
+TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
new file mode 100644
index 00000000000..13ab85dc293
--- /dev/null
+++ b/mk/tools/tools.SunOS.mk
@@ -0,0 +1,66 @@
+# $NetBSD: tools.SunOS.mk,v 1.13.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the Solaris operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/nawk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+.if exists(/usr/bin/bzcat)
+TOOLS_PLATFORM.bzcat?=		/usr/bin/bzcat
+.endif
+TOOLS_PLATFORM.cat?=		/usr/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/usr/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/bin/chown
+.if exists(/bin/cmp)
+TOOLS_PLATFORM.cmp?=		/bin/cmp
+.elif exists(/usr/bin/cmp)
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+.endif
+TOOLS_PLATFORM.cp?=		/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/usr/xpg4/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		/usr/ucb/echo
+TOOLS_PLATFORM.egrep?=		/usr/xpg4/bin/grep -E
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/usr/xpg4/bin/expr
+TOOLS_PLATFORM.false?=		/usr/bin/false
+TOOLS_PLATFORM.fgrep?=		/usr/xpg4/bin/fgrep
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/xpg4/bin/grep
+.if exists(/usr/bin/gzip)
+TOOLS_PLATFORM.gunzip?=		/usr/bin/gzip -df
+TOOLS_PLATFORM.gzcat?=		/usr/bin/gzip -cd
+TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
+.endif
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/xpg4/bin/id
+TOOLS_PLATFORM.install?=	/usr/ucb/install
+TOOLS_PLATFORM.ln?=		/usr/bin/ln
+TOOLS_PLATFORM.ls?=		/usr/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
+TOOLS_PLATFORM.mkdir?=		/usr/bin/mkdir -p
+TOOLS_PLATFORM.mv?=		/usr/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/xpg4/bin/nice
+.if exists(/usr/bin/gpatch)
+TOOLS_PLATFORM.patch?=		/usr/bin/gpatch
+.endif
+TOOLS_PLATFORM.pwd?=		/bin/pwd
+TOOLS_PLATFORM.rm?=		/usr/bin/rm
+TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
+TOOLS_PLATFORM.sh?=		/bin/ksh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		/usr/ccs/bin/strip
+TOOLS_PLATFORM.tail?=		/usr/xpg4/bin/tail
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+TOOLS_PLATFORM.test?=		test			# shell builtin
+TOOLS_PLATFORM.touch?=		/usr/bin/touch
+TOOLS_PLATFORM.tr?=		/usr/bin/tr
+TOOLS_PLATFORM.true?=		/usr/bin/true
+TOOLS_PLATFORM.tsort?=		/usr/ccs/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
new file mode 100644
index 00000000000..b44248ec11c
--- /dev/null
+++ b/mk/tools/tools.UnixWare.mk
@@ -0,0 +1,50 @@
+# $NetBSD: tools.UnixWare.mk,v 1.9.2.2 2005/05/17 18:29:46 tv Exp $
+#
+# System-supplied tools for the UnixWare 7 operating system.
+
+TOOLS_PLATFORM.[?=		[			# shell builtin
+TOOLS_PLATFORM.awk?=		/usr/bin/nawk
+TOOLS_PLATFORM.basename?=	/usr/bin/basename
+TOOLS_PLATFORM.cat?=		/usr/bin/cat
+TOOLS_PLATFORM.chgrp?=		/usr/bin/chgrp
+TOOLS_PLATFORM.chmod?=		/usr/bin/chmod
+TOOLS_PLATFORM.chown?=		/usr/bin/chown
+TOOLS_PLATFORM.cmp?=		/usr/bin/cmp
+TOOLS_PLATFORM.cp?=		/usr/bin/cp
+TOOLS_PLATFORM.cut?=		/usr/bin/cut
+TOOLS_PLATFORM.date?=		/usr/bin/date
+TOOLS_PLATFORM.dirname?=	/usr/bin/dirname
+TOOLS_PLATFORM.echo?=		/usr/ucb/echo
+TOOLS_PLATFORM.egrep?=		/usr/bin/grep -E
+TOOLS_PLATFORM.env?=		/usr/bin/env
+TOOLS_PLATFORM.expr?=		/usr/bin/expr
+TOOLS_PLATFORM.false?=		/usr/bin/false
+TOOLS_PLATFORM.fgrep?=		/usr/bin/grep -F
+TOOLS_PLATFORM.file?=		/usr/bin/file
+TOOLS_PLATFORM.find?=		/usr/bin/find
+TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.head?=		/usr/bin/head
+TOOLS_PLATFORM.hostname?=	/usr/bin/hostname
+TOOLS_PLATFORM.id?=		/usr/bin/id
+TOOLS_PLATFORM.install?=	/usr/ucb/install
+TOOLS_PLATFORM.ln?=		/usr/bin/ln
+TOOLS_PLATFORM.ls?=		/usr/bin/ls
+TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
+TOOLS_PLATFORM.mv?=		/usr/bin/mv
+TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.pwd?=		/usr/bin/pwd
+TOOLS_PLATFORM.rm?=		/usr/bin/rm
+TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
+TOOLS_PLATFORM.sed?=		/usr/bin/sed
+TOOLS_PLATFORM.sh?=		/usr/bin/ksh
+TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.tail?=		/usr/bin/tail
+TOOLS_PLATFORM.tee?=		/usr/bin/tee
+TOOLS_PLATFORM.test?=		test			# shell builtin
+TOOLS_PLATFORM.touch?=		/usr/bin/touch
+TOOLS_PLATFORM.tr?=		/usr/bin/tr
+TOOLS_PLATFORM.true?=		/usr/bin/true
+TOOLS_PLATFORM.tsort?=		/usr/ccs/bin/tsort
+TOOLS_PLATFORM.wc?=		/usr/bin/wc
+TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk
index 316925c530f..53fd2f49da7 100644
--- a/mk/wrapper/bsd.wrapper.mk
+++ b/mk/wrapper/bsd.wrapper.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.wrapper.mk,v 1.12.2.11 2005/03/21 15:43:00 tv Exp $
+# $NetBSD: bsd.wrapper.mk,v 1.12.2.12 2005/05/17 18:29:46 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -44,19 +44,9 @@ ECHO_WRAPPER_MSG?=	${ECHO}
 .else
 ECHO_WRAPPER_MSG?=	${TRUE}
 .endif
-_WRAP_VARS_MK=		${WRAPPER_DIR}/vars.mk
-
-.if exists(${_WRAP_VARS_MK})
-.  include "${_WRAP_VARS_MK}"
-.endif
 
 .PHONY: do-wrapper
 
-# Create the saved variables Makefile fragment to pass variables
-# through to sub-make processes invoked on the same Makefile.
-#
-do-wrapper: ${_WRAP_VARS_MK}
-
 # Prepend ${WRAPPER_BINDIR} to the PATH so that the wrappers are found
 # first when searching for executables.
 #
@@ -109,9 +99,9 @@ _WRAP_TRANSFORM_CMDS+=	${WRAPPER_TRANSFORM_CMDS}
 # are already being called with the correct arguments.
 #
 .if !defined(_WRAP_PATH)
-_WRAP_PATH=		${PATH:S/${WRAPPER_BINDIR}://:S/:${WRAPPER_BINDIR}//}
-WRAPPER_VARS+=		_WRAP_PATH
+_WRAP_PATH=	${PATH:S/${WRAPPER_BINDIR}://:S/:${WRAPPER_BINDIR}//}
 .endif
+MAKEVARS+=	_WRAP_PATH
 
 # Generate wrapper scripts for the compiler tools.  These wrapper
 # scripts are to be used instead of the actual compiler tools when
@@ -700,22 +690,6 @@ ${_WRAP_SCAN.${_wrappee_}}: ${WRAPPER_SRCDIR}/scan
 .  endif
 .endfor	# _WRAPPEES
 
-.if !target(${_WRAP_VARS_MK})
-${_WRAP_VARS_MK}:
-	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
-	${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
-.  for _var_ in ${WRAPPER_VARS}
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${ECHO} "${_var_}=	${${_var_}}" >> ${.TARGET}.tmp
-.  endfor
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	if [ -f ${.TARGET}.tmp ]; then					\
-		${SORT} -u ${.TARGET}.tmp > ${.TARGET};			\
-		${RM} -f ${.TARGET}.tmp;				\
-	fi 
-	${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
-.endif
-
 # UNWRAP_PATTERNS and UNWRAP_FILES list shell globs and files relative to
 # ${WRKSRC} that need to be "unwrapped".
 #
diff --git a/mk/wrapper/cmd-sink-aix-cc b/mk/wrapper/cmd-sink-aix-cc
index 1a629edac8e..83e1c54b759 100644
--- a/mk/wrapper/cmd-sink-aix-cc
+++ b/mk/wrapper/cmd-sink-aix-cc
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-aix-cc,v 1.1.2.2 2005/02/25 14:46:51 tv Exp $
+# $NetBSD: cmd-sink-aix-cc,v 1.1.2.3 2005/05/17 18:29:46 tv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -60,7 +60,7 @@ while ! queue_is_empty cmdbuf; do
 		"")	blibpath="$dir" ;;
 		*)	blibpath="$blibpath:$dir" ;;
 		esac
-		$debug_log "    (cmd-sink-aix-cc) drop: $dir [adding to blibpath]"
+		$debug_log $wrapperlog "    (cmd-sink-aix-cc) drop: $dir [adding to blibpath]"
 		dynamic=yes
 		;;
 	*)
@@ -72,16 +72,16 @@ done
 # AIX ld(1) uses -blibpath to set the runtime library search path.
 if $test -n "$blibpath"; then
 	arg="-Wl,-blibpath:/lib:/usr/lib:$blibpath"
-	$debug_log "    (cmd-sink-aix-cc) pop: $arg"
+	$debug_log $wrapperlog "    (cmd-sink-aix-cc) pop: $arg"
 	. $buildcmd
 fi
 
 # If we are dynamically linking, make sure the runtime linker is used.
 if $test -n "$dynamic"; then
 	arg=-Wl,-brtl
-	$debug_log "    (cmd-sink-aix-cc) pop: $arg"
+	$debug_log $wrapperlog "    (cmd-sink-aix-cc) pop: $arg"
 	. $buildcmd
 	arg=-Wl,-bdynamic
-	$debug_log "    (cmd-sink-aix-cc) pop: $arg"
+	$debug_log $wrapperlog "    (cmd-sink-aix-cc) pop: $arg"
 	. $buildcmd
 fi
diff --git a/mk/wrapper/cmd-sink-aix-ld b/mk/wrapper/cmd-sink-aix-ld
index 7b25d9b0085..68a4e41b0d1 100644
--- a/mk/wrapper/cmd-sink-aix-ld
+++ b/mk/wrapper/cmd-sink-aix-ld
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-aix-ld,v 1.1.2.2 2005/02/25 14:46:51 tv Exp $
+# $NetBSD: cmd-sink-aix-ld,v 1.1.2.3 2005/05/17 18:29:46 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -60,7 +60,7 @@ while ! queue_is_empty cmdbuf; do
 		"")	blibpath="$dir" ;;
 		*)	blibpath="$blibpath:$dir" ;;
 		esac
-		$debug_log "    (cmd-sink-aix-ld) drop: $dir [adding to blibpath]"
+		$debug_log $wrapperlog "    (cmd-sink-aix-ld) drop: $dir [adding to blibpath]"
 		dynamic=yes
 		;;
 	*)
@@ -72,16 +72,16 @@ done
 # AIX ld(1) uses -blibpath to set the runtime library search path.
 if $test -n "$blibpath"; then
         arg="-blibpath:/lib:/usr/lib:$blibpath"
-        $debug_log "    (cmd-sink-aix-ld) pop: $arg"
+        $debug_log $wrapperlog "    (cmd-sink-aix-ld) pop: $arg"
         . $buildcmd
 fi
 
 # If we are dynamically linking, make sure the runtime linker is used.
 if $test -n "$dynamic"; then
         arg=-brtl
-        $debug_log "    (cmd-sink-aix-ld) pop: $arg"
+        $debug_log $wrapperlog "    (cmd-sink-aix-ld) pop: $arg"
         . $buildcmd
         arg=-bdynamic
-        $debug_log "    (cmd-sink-aix-ld) pop: $arg"
+        $debug_log $wrapperlog "    (cmd-sink-aix-ld) pop: $arg"
         . $buildcmd
 fi
diff --git a/mk/wrapper/cmd-sink-aix-xlc b/mk/wrapper/cmd-sink-aix-xlc
index 4ffd919b82e..cfcef9c3a9a 100644
--- a/mk/wrapper/cmd-sink-aix-xlc
+++ b/mk/wrapper/cmd-sink-aix-xlc
@@ -1,4 +1,4 @@
-# $NetBSD: cmd-sink-aix-xlc,v 1.1 2004/09/21 15:01:41 jlam Exp $
+# $NetBSD: cmd-sink-aix-xlc,v 1.1.2.1 2005/05/17 18:29:46 tv Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -58,7 +58,7 @@ while ! queue_is_empty cmdbuf; do
 		"")	blibpath="$dir" ;;
 		*)	blibpath="$blibpath:$dir" ;;
 		esac
-		$debug_log "    (cmd-sink-aix-xlc) drop: $dir [adding to blibpath]"
+		$debug_log $wrapperlog "    (cmd-sink-aix-xlc) drop: $dir [adding to blibpath]"
 		;;
 	*)
 		. $buildcmd
@@ -69,6 +69,6 @@ done
 # AIX xlc uses -blibpath to set the runtime library search path.
 if $test -n "$blibpath"; then
 	arg="-blibpath:$blibpath"
-	$debug_log "    (cmd-sink-aix-xlc) pop: $arg"
+	$debug_log $wrapperlog "    (cmd-sink-aix-xlc) pop: $arg"
 	. $buildcmd
 fi
diff --git a/mk/x11-clients.buildlink3.mk b/mk/x11-clients.buildlink3.mk
new file mode 100644
index 00000000000..856d7a2db15
--- /dev/null
+++ b/mk/x11-clients.buildlink3.mk
@@ -0,0 +1,42 @@
+# $NetBSD: x11-clients.buildlink3.mk,v 1.1.2.2 2005/05/17 18:29:44 tv Exp $
+#
+# This Makefile fragment is meant to be used for packages requiring
+# X11 applications like bdftopcf and so on, this Makefile is useless
+# if you are using the X11 distribution that comes with your system,
+# but it's useful if you use xorg or XFree86 from pkgsrc.
+
+.if !defined(X11CLIENTS_BUILDLINK3_MK)
+X11CLIENTS_BUILDLINK3_MK=       defined
+
+.include "../../mk/bsd.prefs.mk"
+
+X11CLIENTS_DEPMETHOD?=         build
+
+# Require at least these versions for now.
+
+XORG_DISTVER?=                  6.8.0
+XFREE86_DISTVER?=               4.4.0
+
+.if defined(X11_TYPE) && empty(X11_TYPE:Mnative)
+.  if !empty(X11CLIENTS_DEPMETHOD:Mbuild)
+.    if !empty(X11_TYPE:Mxorg)
+BUILD_DEPENDS+=                 \
+        xorg-clients>=${XORG_DISTVER}:../../x11/xorg-clients
+.    elif !empty(X11_TYPE:MXFree86)
+BUILD_DEPENDS+=                 \
+        XFree86-clients>=${XFREE86_DISTVER}:../../x11/XFree86-clients
+.    endif
+.  endif
+
+.  if !empty(X11CLIENTS_DEPMETHOD:Mfull)
+.    if !empty(X11_TYPE:Mxorg)
+DEPENDS+=                       \
+        xorg-clients>=${XORG_DISTVER}:../../x11/xorg-clients
+.    elif !empty(X11_TYPE:MXFree86)
+DEPENDS+=                       \
+        XFree86-clients>=${XFREE86_DISTVER}:../../x11/XFree86-clients
+.    endif
+.  endif
+.endif # X11_TYPE=native
+
+.endif # X11CLIENTS_BUILDLINK3_MK