Provide uniq(1) as a TOOLS.

21 files changed, 46 insertions, 21 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 37c95ee2415..161e0a3ce19 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.60 2013/12/01 02:57:36 obache Exp $
+# $NetBSD: defaults.mk,v 1.61 2014/03/06 07:34:20 uebayasi Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -139,6 +139,7 @@ _TOOLS_VARNAME.touch=		TOUCH
 _TOOLS_VARNAME.tr=		TR
 _TOOLS_VARNAME.true=		TRUE
 _TOOLS_VARNAME.tsort=		TSORT
+_TOOLS_VARNAME.uniq=		UNIQ
 _TOOLS_VARNAME.unrar=		UNRAR
 _TOOLS_VARNAME.unzip=		UNZIP_CMD
 _TOOLS_VARNAME.unzoo=		UNZOO
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index f2c5424917a..0f2616a4237 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.16 2009/02/05 19:03:29 joerg Exp $
+# $NetBSD: tools.AIX.mk,v 1.17 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -63,6 +63,7 @@ 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.uniq?=		/usr/bin/uniq
 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
index 236b45ef3b6..8bad48758ea 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.17 2006/10/17 06:13:51 rillig Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.18 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
@@ -82,5 +82,6 @@ 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.uniq?=		/usr/bin/uniq
 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 6f18755e362..efa298c996e 100644
--- a/mk/tools/tools.Cygwin.mk
+++ b/mk/tools/tools.Cygwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Cygwin.mk,v 1.7 2014/02/27 08:47:32 obache Exp $
+# $NetBSD: tools.Cygwin.mk,v 1.8 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Cygwin operating system.
 
@@ -131,6 +131,7 @@ TOOLS_PLATFORM.touch?=		/bin/touch
 TOOLS_PLATFORM.tr?=		/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/bin/tsort
+TOOLS_PLATFORM.uniq?=		/bin/uniq
 .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 31584727ab9..4b196d75b7e 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.50 2013/10/26 15:31:26 joerg Exp $
+# $NetBSD: tools.Darwin.mk,v 1.51 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -116,6 +116,7 @@ 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.uniq?=		/usr/bin/uniq
 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 58d1bdd7417..155eec19991 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.41 2013/12/19 23:50:29 tron Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.42 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -91,6 +91,7 @@ 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.uniq?=		/usr/bin/uniq
 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 56375702f64..9f8d84d8a1a 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.39 2013/12/13 07:04:09 obache Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.40 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -84,6 +84,7 @@ 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.uniq?=		/usr/bin/uniq
 .if exists(/usr/bin/unzip)
 TOOLS_PLATFORM.unzip?=		/usr/bin/unzip
 .endif
diff --git a/mk/tools/tools.FreeMiNT.mk b/mk/tools/tools.FreeMiNT.mk
index 4f13324ee83..2a93943ae38 100644
--- a/mk/tools/tools.FreeMiNT.mk
+++ b/mk/tools/tools.FreeMiNT.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeMiNT.mk,v 1.3 2013/09/12 13:19:06 ryoon Exp $
+# $NetBSD: tools.FreeMiNT.mk,v 1.4 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the FreeMiNT operating system.
 
@@ -86,6 +86,7 @@ TOOLS_PLATFORM.touch?=		/bin/touch
 TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.uniq?=		/bin/uniq
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
 TOOLS_PLATFORM.xgettext?=	/usr/bin/xgettext
diff --git a/mk/tools/tools.GNUkFreeBSD.mk b/mk/tools/tools.GNUkFreeBSD.mk
index 99ebd9ee962..d416a74765d 100644
--- a/mk/tools/tools.GNUkFreeBSD.mk
+++ b/mk/tools/tools.GNUkFreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.GNUkFreeBSD.mk,v 1.2 2013/11/06 13:12:50 obache Exp $
+# $NetBSD: tools.GNUkFreeBSD.mk,v 1.3 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Debian GNU/kFreeBSD operating system.
 
@@ -81,6 +81,7 @@ 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.uniq?=		/usr/bin/uniq
 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 cad3ac64067..ce480631a40 100644
--- a/mk/tools/tools.HPUX.mk
+++ b/mk/tools/tools.HPUX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.HPUX.mk,v 1.6 2013/08/22 00:41:12 obache Exp $
+# $NetBSD: tools.HPUX.mk,v 1.7 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the HP-UX operating system.
 
@@ -56,5 +56,6 @@ 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.uniq?=		/usr/bin/uniq
 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 4b5794a96bb..cd14a109d0f 100644
--- a/mk/tools/tools.Haiku.mk
+++ b/mk/tools/tools.Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Haiku.mk,v 1.10 2013/11/06 13:12:50 obache Exp $
+# $NetBSD: tools.Haiku.mk,v 1.11 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Haiku operating system.
 
@@ -116,6 +116,7 @@ TOOLS_PLATFORM.touch?=		/bin/touch
 TOOLS_PLATFORM.tr?=		/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/bin/tsort
+TOOLS_PLATFORM.uniq?=		/bin/uniq
 TOOLS_PLATFORM.wc?=		/bin/wc
 TOOLS_PLATFORM.xargs?=		/bin/xargs -r
 #TOOLS_PLATFORM.xgettext?=	/usr/bin/xgettext
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index f7b73caa259..91e11c88500 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.20 2012/03/19 12:34:19 joerg Exp $
+# $NetBSD: tools.IRIX.mk,v 1.21 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -66,5 +66,6 @@ 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.uniq?=		/usr/bin/uniq
 TOOLS_PLATFORM.wc?=		/sbin/wc
 TOOLS_PLATFORM.xargs?=		/sbin/xargs
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index 5980cc5e0fd..4c30c5baccc 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.23 2009/12/19 11:56:11 obache Exp $
+# $NetBSD: tools.Interix.mk,v 1.24 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -79,6 +79,7 @@ TOOLS_PLATFORM.touch?=		/bin/touch
 TOOLS_PLATFORM.tr?=		/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/bin/tsort
+TOOLS_PLATFORM.uniq?=		/bin/uniq
 TOOLS_PLATFORM.wc?=		/bin/wc
 .if !empty(MACHINE_PLATFORM:MInterix-[0-5].*-*)
 TOOLS_PLATFORM.xargs?=		/bin/xargs
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index c9deb135288..befe566670a 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.53 2014/02/14 07:43:46 obache Exp $
+# $NetBSD: tools.Linux.mk,v 1.54 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -238,6 +238,11 @@ TOOLS_PLATFORM.touch?=		/usr/bin/touch
 TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+.if exists(/bin/uniq)
+TOOLS_PLATFORM.uniq?=		/bin/uniq
+.elif exists(/usr/bin/uniq)
+TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
+.endif
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 .if exists(/usr/bin/wget)
 TOOLS_PLATFORM.wget?=		/usr/bin/wget
diff --git a/mk/tools/tools.Minix.mk b/mk/tools/tools.Minix.mk
index be5a42a707c..6a00c5c0bbc 100644
--- a/mk/tools/tools.Minix.mk
+++ b/mk/tools/tools.Minix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Minix.mk,v 1.3 2013/04/07 20:04:17 tcort Exp $
+# $NetBSD: tools.Minix.mk,v 1.4 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Minix operating system.
 
@@ -69,6 +69,7 @@ TOOLS_PLATFORM.touch?=		/usr/bin/touch
 TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		/bin/true
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs
 TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.MirBSD.mk b/mk/tools/tools.MirBSD.mk
index 1ac243ee03a..a19cc3e4307 100644
--- a/mk/tools/tools.MirBSD.mk
+++ b/mk/tools/tools.MirBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.MirBSD.mk,v 1.4 2012/09/28 19:07:59 bsiegert Exp $
+# $NetBSD: tools.MirBSD.mk,v 1.5 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the MirOS operating system.
 
@@ -72,6 +72,7 @@ TOOLS_PLATFORM.touch?=		/usr/bin/touch
 TOOLS_PLATFORM.tr?=		/usr/bin/tr
 TOOLS_PLATFORM.true?=		/bin/sh -c true
 TOOLS_PLATFORM.tsort?=		/usr/bin/tsort
+TOOLS_PLATFORM.uniq?=		/usr/bin/uniq
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
 TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 6f6f9cee9d2..9fbaa7711e5 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.50 2013/12/13 07:11:20 obache Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.51 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -113,6 +113,7 @@ 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.uniq?=		/usr/bin/uniq
 .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 c522e9ccab5..4e735e127f5 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.15 2013/05/12 06:07:45 obache Exp $
+# $NetBSD: tools.OSF1.mk,v 1.16 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 #
@@ -57,5 +57,6 @@ 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.uniq?=		/usr/bin/uniq
 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
index 8f498578ad6..ca22a6c556a 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.34 2013/08/24 10:12:52 tron Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.35 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -96,6 +96,7 @@ 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.uniq?=		/usr/bin/uniq
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs -r
 TOOLS_PLATFORM.yacc?=		/usr/bin/yacc
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 105f5ada8c1..889db4ab186 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.43 2013/07/03 12:31:33 jperkin Exp $
+# $NetBSD: tools.SunOS.mk,v 1.44 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the Solaris operating system.
 #
@@ -210,6 +210,7 @@ TOOLS_PLATFORM.touch?=		/usr/bin/touch
 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
 .if exists(/usr/bin/unzip)
 TOOLS_PLATFORM.unzip?=		/usr/bin/unzip
 .endif
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
index c34aa416692..d59bd916823 100644
--- a/mk/tools/tools.UnixWare.mk
+++ b/mk/tools/tools.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.13 2009/02/05 19:03:29 joerg Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.14 2014/03/06 07:34:20 uebayasi Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -49,6 +49,7 @@ 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.uniq?=		/usr/bin/uniq
 TOOLS_PLATFORM.wc?=		/usr/bin/wc
 TOOLS_PLATFORM.xargs?=		/usr/bin/xargs