revert "Add unlink as a tool.", I cannot describe why is it on the Earth.

proposed/discussed is required for such changes, from PMC gdt@.

14 files changed, 15 insertions, 35 deletions

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index b0f4cade24a..fd012947427 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.273 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: replace.mk,v 1.274 2015/02/01 08:48:56 obache Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1009,8 +1009,7 @@ TOOLS_PATH.${_t_}=		${TOOLS_PREFIX.${_t_}}/bin/${_t_}
 _TOOLS.coreutils=	basename cat chgrp chmod chown cp cut date	\
 		dirname echo env expr false head hostname id install	\
 		ln ls mkdir mv nice numfmt printf pwd readlink realpath \
-		rm rmdir sleep sort tail tee test touch tr true tsort	\
-		unlink wc
+		rm rmdir sleep sort tail tee test touch tr true tsort wc
 
 .for _t_ in ${_TOOLS.coreutils}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index 65fd126498c..d358456f02a 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.18 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.AIX.mk,v 1.19 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -64,7 +64,6 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/usr/sbin/unlink
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
 
diff --git a/mk/tools/tools.Cygwin.mk b/mk/tools/tools.Cygwin.mk
index c06944c74c7..1959f8b226b 100644
--- a/mk/tools/tools.Cygwin.mk
+++ b/mk/tools/tools.Cygwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Cygwin.mk,v 1.10 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.Cygwin.mk,v 1.11 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the Cygwin operating system.
 
@@ -144,7 +144,6 @@ TOOLS_PLATFORM.tr?=		/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/bin/tsort
 TOOLS_PLATFORM.uniq?=		/bin/uniq
-TOOLS_PLATFORM.unlink?=		/bin/unlink
 .if exists(/bin/unzip)
 TOOLS_PLATFORM.unzip?=		/bin/unzip
 .endif
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index d26395bea96..6803b8677f8 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.54 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.Darwin.mk,v 1.55 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -117,9 +117,6 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-.if exists(/bin/unlink)
-TOOLS_PLATFORM.unlink?=		/bin/unlink
-.endif
 TOOLS_PLATFORM.unzip?=		/usr/bin/unzip
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 .if exists(/usr/bin/wish)
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index b6d8a80ce49..d0533aff27c 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.43 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.44 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -92,7 +92,6 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		/usr/bin/true
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/bin/unlink
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
 TOOLS_PLATFORM.xz?=		/usr/bin/xz
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 2ff956b30ef..715628602db 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.42 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.43 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -88,7 +88,6 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/bin/unlink
 .if exists(/usr/bin/unzip)
 TOOLS_PLATFORM.unzip?=		/usr/bin/unzip
 .endif
diff --git a/mk/tools/tools.GNUkFreeBSD.mk b/mk/tools/tools.GNUkFreeBSD.mk
index 02b841c9e9e..2972c83dc1f 100644
--- a/mk/tools/tools.GNUkFreeBSD.mk
+++ b/mk/tools/tools.GNUkFreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.GNUkFreeBSD.mk,v 1.4 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.GNUkFreeBSD.mk,v 1.5 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the Debian GNU/kFreeBSD operating system.
 
@@ -82,7 +82,6 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/usr/bin/unlink
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
 TOOLS_PLATFORM.xz?=		/usr/bin/xz
diff --git a/mk/tools/tools.HPUX.mk b/mk/tools/tools.HPUX.mk
index 90be545691a..03a88589675 100644
--- a/mk/tools/tools.HPUX.mk
+++ b/mk/tools/tools.HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.HPUX.mk,v 1.8 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.HPUX.mk,v 1.9 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the HP-UX operating system.
 
@@ -57,6 +57,5 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/sbin/unlink
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/tools/tools.Haiku.mk b/mk/tools/tools.Haiku.mk
index 1b993e0883e..0bca51421dc 100644
--- a/mk/tools/tools.Haiku.mk
+++ b/mk/tools/tools.Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Haiku.mk,v 1.15 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.Haiku.mk,v 1.16 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the Haiku operating system.
 
@@ -150,7 +150,6 @@ TOOLS_PLATFORM.tr?=		/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/bin/tsort
 TOOLS_PLATFORM.uniq?=		/bin/uniq
-TOOLS_PLATFORM.unlink?=		/bin/unlink
 TOOLS_PLATFORM.unzip?=		/bin/unzip
 TOOLS_PLATFORM.wc?=		/bin/wc
 TOOLS_PLATFORM.wget?=		/bin/wget
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index 1d5cb1800ae..f761a7e6523 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.22 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.IRIX.mk,v 1.23 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -67,6 +67,5 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/usr/sbin/unlink
 TOOLS_PLATFORM.wc?=		/sbin/wc
 TOOLS_PLATFORM.xargs?=		/sbin/xargs
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index f451e8a3798..a169c95d35c 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.56 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.Linux.mk,v 1.57 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -255,11 +255,6 @@ TOOLS_PLATFORM.uniq?=		/bin/uniq
 .elif exists(/usr/bin/uniq)
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
 .endif
-.if exists(/bin/unlink)
-TOOLS_PLATFORM.unlink?=		/bin/unlink
-.elif exists(/usr/bin/unlink)
-TOOLS_PLATFORM.unlink?=		/usr/bin/unlink
-.endif
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 .if exists(/usr/bin/wget)
 TOOLS_PLATFORM.wget?=		/usr/bin/wget
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index f45ed900b00..ba650cdc837 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.53 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.54 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -123,7 +123,6 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/usr/sbin/unlink
 .if exists(/usr/bin/unzip)
 TOOLS_PLATFORM.unzip?=		/usr/bin/unzip
 .endif
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
index bbc1b6f3936..56ce82dfac1 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.17 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.OSF1.mk,v 1.18 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 #
@@ -58,6 +58,5 @@ TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/usr/sbin/unlink
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 6fb47e3595a..2e3d84d6096 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.46 2015/01/30 11:06:36 obache Exp $
+# $NetBSD: tools.SunOS.mk,v 1.47 2015/02/01 08:48:56 obache Exp $
 #
 # System-supplied tools for the Solaris operating system.
 #
@@ -211,7 +211,6 @@ TOOLS_PLATFORM.tr?=		/usr/xpg4/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/ccs/bin/tsort
 TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
-TOOLS_PLATFORM.unlink?=		/usr/sbin/unlink
 .if exists(/usr/bin/unzip)
 TOOLS_PLATFORM.unzip?=		/usr/bin/unzip
 .endif