Teach the new tools framework about ${STRIP}, which is used in some

packages to strip installed executables.  If INSTALL_UNSTRIPPED ==
"yes", then we create a "strip" wrapper in ${TOOLS_DIR} that just
calls ${TRUE} by considering ${TRUE} the system-supplied strip command.

16 files changed, 42 insertions, 19 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 3e4212c6ddb..596f71c2071 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1626 2005/05/04 04:23:34 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1627 2005/05/04 06:42:43 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -943,8 +943,8 @@ USE_TOOLS+=	[ awk basename cat chgrp chmod chown cmp cp cut date	\
 		dirname echo egrep env expr false fgrep file find grep	\
 		gtar gunzip gzcat gzip head hostname id install		\
 		ldconfig ln ls m4 mkdir mtree mv nice pax pwd rm rmdir	\
-		sed sh shlock sort tail tee test touch tr true tsort wc	\
-		xargs
+		sed sh shlock sort strip tail tee test touch tr true	\
+		tsort wc xargs
 
 # We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}.
 .if !empty(PKGSRC_MESSAGE_RECIPIENTS)
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index a1e419d4fed..8dcbd0bce5b 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: defaults.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 
 .if !defined(TOOLS_DEFAULTS_MK)
 TOOLS_DEFAULTS_MK=	defined
@@ -68,6 +68,7 @@ _TOOLS_VARNAME.sed=		SED
 _TOOLS_VARNAME.sh=		SH
 _TOOLS_VARNAME.shlock=		SHLOCK
 _TOOLS_VARNAME.sort=		SORT
+_TOOLS_VARNAME.strip=		STRIP
 _TOOLS_VARNAME.tail=		TAIL
 _TOOLS_VARNAME.tbl=		TBL
 _TOOLS_VARNAME.tee=		TEE
diff --git a/mk/tools/make.mk b/mk/tools/make.mk
index ff0b6990ffd..f7011029561 100644
--- a/mk/tools/make.mk
+++ b/mk/tools/make.mk
@@ -1,4 +1,4 @@
-# $NetBSD: make.mk,v 1.4 2005/05/02 21:10:03 jlam Exp $
+# $NetBSD: make.mk,v 1.5 2005/05/04 06:42:43 jlam Exp $
 #
 # This Makefile fragment creates a tool called "make" under ${TOOLS_DIR}
 # that corresponds to the make program used to build the package.
@@ -20,6 +20,6 @@ MAKE_PROGRAM=		${MAKE}
 .endif
 
 TOOLS_SYMLINK+=		make
-TOOLS_REAL_CMD.make=	${MAKE_PROGRAM}
+TOOLS_REAL_CMD.make?=	${MAKE_PROGRAM}
 
 CONFIGURE_ENV+=		MAKE=${MAKE_PROGRAM:T:Q}
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index c32bdd778dd..b8f53205b97 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.6 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -41,6 +41,7 @@ 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?=		${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
index 8ecaa22ef79..6da2b5a3b6c 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.7 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
@@ -47,6 +47,8 @@ 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?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 6ffa2c356f9..ebca2ccc5e3 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.7 2005/05/03 21:06:14 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -49,6 +49,8 @@ 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?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index f98f59dcd9b..f87877a8180 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -51,6 +51,8 @@ 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?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 87bfac74610..c79b38b53da 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -53,6 +53,8 @@ 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?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index ae88c44569b..4cc4db0b8ca 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -48,6 +48,7 @@ TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
 TOOLS_PLATFORM.sed?=		/sbin/sed
 TOOLS_PLATFORM.sh?=		/bin/ksh
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		${TOOLS_PLATFORM.true}	# XXX
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index f1172b13ff5..6084091481d 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -43,6 +43,7 @@ TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.sort?=		/bin/sort
+TOOLS_PLATFORM.strip?=		${TOOLS_PLATFORM.true}	# XXX
 TOOLS_PLATFORM.tail?=		/bin/tail
 TOOLS_PLATFORM.tee?=		/bin/tee
 TOOLS_PLATFORM.test?=		/bin/test
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 2fcc38929e2..caed032ae13 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.9 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.10 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -111,6 +111,8 @@ TOOLS_PLATFORM.sort?=		/bin/sort
 .elif exists(/usr/bin/sort)
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 .endif
+TOOLS_PLATFORM.strip?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index f779211f9df..cd5c15d6400 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -65,6 +65,8 @@ 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?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
index 6cceb9557da..742b88b1e89 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.6 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 
@@ -42,6 +42,8 @@ TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sh?=		/bin/ksh
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
+TOOLS_PLATFORM.strip?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/ccs/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 42da2739e56..5f0ba011fe5 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.7 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -52,6 +52,8 @@ 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?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index db1c16bd28b..660a95fa409 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.8 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -55,6 +55,8 @@ 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?=		\
+	${_INSTALL_UNSTRIPPED:D${TOOLS_PLATFORM.true}:U/usr/ccs/bin/strip}
 TOOLS_PLATFORM.tail?=		/usr/xpg4/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
index 29ae6ca497e..3bd2eb8da4e 100644
--- a/mk/tools/tools.UnixWare.mk
+++ b/mk/tools/tools.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.6 2005/05/03 20:41:53 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -40,6 +40,7 @@ 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.strip?=		${TOOLS_PLATFORM.true}	# XXX
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
 TOOLS_PLATFORM.tee?=		/usr/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin