Add ident as tool and use /usr/bin/ident on those platforms I know to

have it. Fallback to devel/rcs otherwise.

Commited during freeze as it is a dependency of pbulk.

7 files changed, 26 insertions, 7 deletions

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index a57397117cc..4dcc4a7e608 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.190 2007/05/29 03:00:44 dmcmahill Exp $
+# $NetBSD: replace.mk,v 1.191 2007/06/19 14:21:18 joerg Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -435,6 +435,17 @@ TOOLS_ARGS.gzip=		-nf ${GZIP}
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.ident) && !empty(_USE_TOOLS:Mident)
+.  if !empty(PKGPATH:Mdevel/rcs)
+MAKEFLAGS+=			TOOLS_IGNORE.ident=
+.  elif !empty(_TOOLS_USE_PKGSRC.ident:M[yY][eE][sS])
+TOOLS_DEPENDS.ident?=		rcs-[0-9]*:../../devel/rcs
+TOOLS_CREATE+=			ident
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.ident=rcs
+TOOLS_PATH.ident=		${TOOLS_PREFIX.ident}/bin/ident
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.install-info) && !empty(_USE_TOOLS:Minstall-info)
 .  if !empty(PKGPATH:Mpkgtools/pkg_install-info)
 MAKEFLAGS+=			TOOLS_IGNORE.install-info=
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 2dff7abb1b5..77a0fcaad70 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.31 2006/12/13 01:03:14 minskim Exp $
+# $NetBSD: tools.Darwin.mk,v 1.32 2007/06/19 14:21:19 joerg Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -43,6 +43,7 @@ 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.ident?=		/usr/bin/ident
 TOOLS_PLATFORM.install?=	/usr/bin/install
 .if exists(/usr/bin/install-info)
 TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index ffd4f9b91f3..e2fbbaa430a 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.28 2007/02/07 19:25:33 joerg Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.29 2007/06/19 14:21:19 joerg Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -39,6 +39,7 @@ 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.ident?=		/usr/bin/ident
 TOOLS_PLATFORM.install?=	/usr/bin/install
 .if exists(/usr/bin/install-info)
 TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 5c2e698af73..4179923ce4e 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.28 2006/07/05 04:32:10 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.29 2007/06/19 14:21:19 joerg Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -38,6 +38,7 @@ 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.ident?=		/usr/bin/ident
 TOOLS_PLATFORM.install?=	/usr/bin/install
 .if exists(/usr/bin/install-info)
 TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 70f92adb8c0..398af1dbae5 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.40 2007/03/17 00:14:50 reed Exp $
+# $NetBSD: tools.Linux.mk,v 1.41 2007/06/19 14:21:19 joerg Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -117,6 +117,9 @@ TOOLS_PLATFORM.id?=		/bin/id
 .elif exists(/usr/bin/id)
 TOOLS_PLATFORM.id?=		/usr/bin/id
 .endif
+.if exists(/usr/bin/ident)
+TOOLS_PLATFORM.ident?=		/usr/bin/ident
+.endif
 .if exists(/bin/install)
 TOOLS_PLATFORM.install?=	/bin/install
 .else
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index f265e6a85a0..3f2046411a2 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.33 2006/07/05 04:32:10 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.34 2007/06/19 14:21:19 joerg Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -43,6 +43,7 @@ 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.ident?=		/usr/bin/ident
 TOOLS_PLATFORM.install?=	/usr/bin/install
 .if exists(/usr/bin/install-info)
 TOOLS_PLATFORM.install-info?=	/usr/bin/install-info
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 98f2af4dd5e..9c5967b556d 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.27 2007/04/13 06:56:20 hiramatsu Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.28 2007/06/19 14:21:19 joerg Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -42,6 +42,7 @@ 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.ident?=		/usr/bin/ident
 TOOLS_PLATFORM.install?=	/usr/bin/install
 .if exists(/usr/bin/install-info)
 TOOLS_PLATFORM.install-info?=	/usr/bin/install-info