Add "soelim", also part of groff if replacement is needed.

8 files changed, 30 insertions, 8 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 8f9bb17c67c..1feea9b5b94 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.40 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: defaults.mk,v 1.41 2005/11/08 03:36:13 tv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -115,6 +115,7 @@ _TOOLS_VARNAME.sed=		SED
 _TOOLS_VARNAME.sh=		SH
 _TOOLS_VARNAME.shlock=		SHLOCK
 _TOOLS_VARNAME.sleep=		SLEEP
+_TOOLS_VARNAME.soelim=		SOELIM
 _TOOLS_VARNAME.sort=		SORT
 _TOOLS_VARNAME.tail=		TAIL
 _TOOLS_VARNAME.tar=		TAR
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 600733f8f50..a9076d9595a 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.131 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: replace.mk,v 1.132 2005/11/08 03:36:13 tv Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1005,6 +1005,17 @@ TOOLS_PATH.sleep=		${TOOLS_PREFIX.sleep}/bin/${GNU_PROGRAM_PREFIX}sleep
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.soelim) && !empty(_USE_TOOLS:Msoelim)
+.  if !empty(PKGPATH:Mtextproc/groff)
+MAKEFLAGS+=			TOOLS_IGNORE.soelim=
+.  elif !empty(_TOOLS_USE_PKGSRC.soelim:M[yY][eE][sS])
+TOOLS_DEPENDS.soelim?=		groff>=1.19nb4:../../textproc/groff
+TOOLS_CREATE+=			soelim
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.soelim=groff
+TOOLS_PATH.soelim=		${TOOLS_PREFIX.soelim}/bin/soelim
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.sort) && !empty(_USE_TOOLS:Msort)
 .  if !empty(PKGPATH:Msysutils/coreutils)
 MAKEFLAGS+=			TOOLS_IGNORE.sort=
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index 09f8f3c5aa7..cee7f39a341 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.20 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.21 2005/11/08 03:36:13 tv Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -57,6 +57,7 @@ TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
 TOOLS_PLATFORM.sleep?=		/bin/sleep
+TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 6a66093bbb1..213a602f180 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.22 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.23 2005/11/08 03:36:13 tv Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -58,6 +58,7 @@ TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.sleep?=		/bin/sleep
+TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 3d76df668cb..08007716223 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.26 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.27 2005/11/08 03:36:13 tv Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -129,6 +129,9 @@ TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		${TOOLS_PLATFORM.gsed}
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.sleep?=		/bin/sleep
+.if exists(/usr/bin/soelim)
+TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
+.endif
 .if exists(/bin/sort)
 TOOLS_PLATFORM.sort?=		/bin/sort
 .elif exists(/usr/bin/sort)
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index a9745130c32..c5f95e67541 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.21 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.22 2005/11/08 03:36:13 tv Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -65,6 +65,7 @@ TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.shlock?=		/usr/bin/shlock
 TOOLS_PLATFORM.sleep?=		/bin/sleep
+TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index c8c41ff0fc8..8d1b09292cd 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.20 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.21 2005/11/08 03:36:13 tv Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -62,6 +62,7 @@ TOOLS_PLATFORM.rmdir?=		/bin/rmdir
 TOOLS_PLATFORM.sed?=		/usr/bin/sed
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.sleep?=		/bin/sleep
+TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/bin/tail
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 4a0385839c6..c351d0a3f30 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.22 2005/11/04 20:02:01 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.23 2005/11/08 03:36:13 tv Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -67,6 +67,9 @@ TOOLS_PLATFORM.rm?=		/usr/bin/rm
 TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir
 TOOLS_PLATFORM.sh?=		/bin/ksh
 TOOLS_PLATFORM.sleep?=		/bin/sleep
+.if exists(/usr/bin/soelim)
+TOOLS_PLATFORM.tbl?=		/usr/bin/soelim
+.endif
 TOOLS_PLATFORM.sort?=		/usr/bin/sort
 TOOLS_PLATFORM.strip?=		/usr/ccs/bin/strip
 TOOLS_PLATFORM.tail?=		/usr/xpg4/bin/tail