[pkgsrc/trunk]: pkgsrc/mk/tools Remove conditional expression from tools.*.mk...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b18dfea3bc83
branches:  trunk
changeset: 493623:b18dfea3bc83
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue May 10 19:56:51 2005 +0000

description:
Remove conditional expression from tools.*.mk files.  Strip handling has
moved to its own file, and we only need to define TOOLS_PLATFORM.strip
if it actually exists on the system.

diffstat:

 mk/tools/tools.AIX.mk       |  3 +--
 mk/tools/tools.BSDOS.mk     |  5 ++---
 mk/tools/tools.Darwin.mk    |  5 ++---
 mk/tools/tools.DragonFly.mk |  5 ++---
 mk/tools/tools.FreeBSD.mk   |  5 ++---
 mk/tools/tools.IRIX.mk      |  3 +--
 mk/tools/tools.Linux.mk     |  5 ++---
 mk/tools/tools.NetBSD.mk    |  5 ++---
 mk/tools/tools.OSF1.mk      |  5 ++---
 mk/tools/tools.OpenBSD.mk   |  5 ++---
 mk/tools/tools.SunOS.mk     |  5 ++---
 mk/tools/tools.UnixWare.mk  |  3 +--
 12 files changed, 21 insertions(+), 33 deletions(-)

diffs (222 lines):

diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.AIX.mk
--- a/mk/tools/tools.AIX.mk     Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.AIX.mk     Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.6 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.7 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -41,7 +41,6 @@
 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 -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.BSDOS.mk
--- a/mk/tools/tools.BSDOS.mk   Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.BSDOS.mk   Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
@@ -47,8 +47,7 @@
 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.strip?=         /usr/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk  Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.Darwin.mk  Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -49,8 +49,7 @@
 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.strip?=         /usr/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk       Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk       Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -51,8 +51,7 @@
 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.strip?=         /usr/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -53,8 +53,7 @@
 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.strip?=         /usr/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.IRIX.mk
--- a/mk/tools/tools.IRIX.mk    Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.IRIX.mk    Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.8 2005/05/05 18:59:25 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -47,7 +47,6 @@
 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 -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.Linux.mk   Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.10 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.11 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -111,8 +111,7 @@
 .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.strip?=         /usr/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk  Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -65,8 +65,7 @@
 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.strip?=         /usr/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.OSF1.mk
--- a/mk/tools/tools.OSF1.mk    Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.OSF1.mk    Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.6 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.7 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 
@@ -42,8 +42,7 @@
 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.strip?=         /usr/ccs/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.OpenBSD.mk Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.8 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -52,8 +52,7 @@
 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.strip?=         /usr/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/bin/tail
 TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk   Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.SunOS.mk   Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.9 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -55,8 +55,7 @@
 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.strip?=         /usr/ccs/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/xpg4/bin/tail
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
diff -r a7f111549076 -r b18dfea3bc83 mk/tools/tools.UnixWare.mk
--- a/mk/tools/tools.UnixWare.mk        Tue May 10 19:52:30 2005 +0000
+++ b/mk/tools/tools.UnixWare.mk        Tue May 10 19:56:51 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.7 2005/05/04 06:42:43 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.8 2005/05/10 19:56:51 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -40,7 +40,6 @@
 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