Teach the tools framework about "gsoelim", which is the soelim tool from

a groff distribution.

4 files changed, 33 insertions, 4 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index f65d17f2276..9832fb2516b 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.42 2005/11/08 23:06:38 jlam Exp $
+# $NetBSD: defaults.mk,v 1.43 2006/01/08 23:00:00 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -82,6 +82,7 @@ _TOOLS_VARNAME.gm4=		M4
 _TOOLS_VARNAME.gmake=		GMAKE
 _TOOLS_VARNAME.grep=		GREP
 _TOOLS_VARNAME.gsed=		SED
+_TOOLS_VARNAME.gsoelim=		SOELIM
 _TOOLS_VARNAME.gtar=		GTAR
 _TOOLS_VARNAME.gunzip=		GUNZIP_CMD
 _TOOLS_VARNAME.gzcat=		GZCAT
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index fbfa924316a..439de8b6d83 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.151 2006/01/08 22:09:05 jlam Exp $
+# $NetBSD: replace.mk,v 1.152 2006/01/08 23:00:00 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -118,6 +118,9 @@ _USE_TOOLS:=	${_USE_TOOLS:Nm4}
 .  if !empty(_USE_TOOLS:Mgsed)		# gsed > sed
 _USE_TOOLS:=	${_USE_TOOLS:Nsed}
 .  endif
+.  if !empty(_USE_TOOLS:Mgsoelim)	# gsoelim > soelim
+_USE_TOOLS:=	${_USE_TOOLS:Nsoelim}
+.  endif
 .endif
 MAKEVARS+=	_USE_TOOLS
 
@@ -171,6 +174,12 @@ _TOOLS_DEPMETHOD.gm4=		${_TOOLS_DEPMETHOD.m4}
 _TOOLS_DEPMETHOD.gsed=		${_TOOLS_DEPMETHOD.sed}
 .  endif
 .endif
+.if !empty(_USE_TOOLS:Mgsoelim)		# gsoelim > soelim
+.  if (${_TOOLS_DEPMETHOD.gsoelim} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.soelim)
+_TOOLS_DEPMETHOD.gsoelim=	${_TOOLS_DEPMETHOD.soelim}
+.  endif
+.endif
 
 ######################################################################
 
@@ -789,6 +798,21 @@ TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
 .  endif
 .endfor
 
+# The ``gsoelim'' tool is special because there's actually no tool named
+# ``gsoelim'' -- the real tool is called just ``soelim''.
+#
+.if !defined(TOOLS_IGNORE.gsoelim) && !empty(_USE_TOOLS:Mgsoelim)
+.  if !empty(PKGPATH:Mtextproc/groff)
+MAKEFLAGS+=		TOOLS_IGNORE.gsoelim=
+.  elif !empty(_TOOLS_USE_PKGSRC.gsoelim:M[yY][eE][sS])
+TOOLS_DEPENDS.gsoelim?=	groff>=1.19nb4:../../textproc/groff
+TOOLS_CREATE+=		gsoelim
+TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.gsoelim=groff
+TOOLS_PATH.gsoelim=	${TOOLS_PREFIX.gsoelim}/bin/soelim
+.  endif
+TOOLS_ALIASES.gsoelim=	soelim
+.endif
+
 ######################################################################
 
 # These tools are all supplied by the devel/diffutils package if there is
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 08007716223..ac9a54e55a5 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.27 2005/11/08 03:36:13 tv Exp $
+# $NetBSD: tools.Linux.mk,v 1.28 2006/01/08 23:00:00 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -73,6 +73,9 @@ TOOLS_PLATFORM.gsed?=		/bin/sed
 .elif exists(/usr/bin/sed)
 TOOLS_PLATFORM.gsed?=		/usr/bin/sed
 .endif
+.if exists(/usr/bin/soelim)
+TOOLS_PLATFORM.gsoelim?=	/usr/bin/soelim
+.endif
 TOOLS_PLATFORM.gtar?=		/bin/tar
 .if exists(/bin/gunzip)
 TOOLS_PLATFORM.gunzip?=		/bin/gunzip -f
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index c5f95e67541..e669e0b2946 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.22 2005/11/08 03:36:13 tv Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.23 2006/01/08 23:00:00 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -34,6 +34,7 @@ TOOLS_PLATFORM.gawk?=		${TOOLS_PLATFORM.awk}
 .endif
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
 TOOLS_PLATFORM.gsed?=		${TOOLS_PLATFORM.sed}	# GNUish
+TOOLS_PLATFORM.gsoelim?=	${TOOLS_PLATFORM.soelim}
 TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
 TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}