Teach the tools framework about "groff" as a tool.

5 files changed, 21 insertions, 7 deletions

diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 1f787da0172..f0bf259163f 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.166 2006/04/13 19:24:29 jlam Exp $
+# $NetBSD: replace.mk,v 1.167 2006/05/21 16:55:21 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -825,17 +825,21 @@ TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${GNU_PROGRAM_PREFIX}${_t_}
 # These tools are all supplied by the textproc/groff package if there is
 # no native tool available.
 #
-_TOOLS.groff=	nroff soelim tbl
+_TOOLS.groff=	groff nroff soelim tbl
 
 .for _t_ in ${_TOOLS.groff}
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
 .    if !empty(PKGPATH:Mtextproc/groff)
 MAKEFLAGS+=		TOOLS_IGNORE.${_t_}=
 .    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
-TOOLS_DEPENDS.${_t_}?=	groff>=1.19nb4:../../textproc/groff
+TOOLS_DEPENDS.${_t_}?=	groff>=1.19.2nb3:../../textproc/groff
 TOOLS_CREATE+=		${_t_}
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.${_t_}=groff
+.      if ${OPSYS} == "SunOS"
+TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
+.      else
 TOOLS_PATH.${_t_}=	${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+.      endif
 .    endif
 .  endif
 .endfor
@@ -850,7 +854,11 @@ MAKEFLAGS+=		TOOLS_IGNORE.gsoelim=
 TOOLS_DEPENDS.gsoelim?=	groff>=1.19nb4:../../textproc/groff
 TOOLS_CREATE+=		gsoelim
 TOOLS_FIND_PREFIX+=	TOOLS_PREFIX.gsoelim=groff
+.    if ${OPSYS} == "SunOS"
+TOOLS_PATH.gsoelim=	${TOOLS_PREFIX.gsoelim}/bin/gsoelim
+.    else
 TOOLS_PATH.gsoelim=	${TOOLS_PREFIX.gsoelim}/bin/soelim
+.    endif
 .  endif
 TOOLS_ALIASES.gsoelim=	soelim
 .endif
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index 149acbdd569..f1a5d7a5c3f 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.24 2006/03/06 05:25:45 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.25 2006/05/21 16:55:23 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -28,6 +28,7 @@ TOOLS_PLATFORM.file?=		/usr/bin/file
 TOOLS_PLATFORM.find?=		/usr/bin/find
 TOOLS_PLATFORM.flex?=		/usr/bin/lex
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.groff?=		/usr/bin/groff
 TOOLS_PLATFORM.gtar?=		/usr/bin/gtar
 TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index e6537c1d61d..d668afba20b 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.25 2006/03/06 05:25:45 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.26 2006/05/21 16:55:23 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -30,6 +30,7 @@ TOOLS_PLATFORM.file?=		/usr/bin/file
 TOOLS_PLATFORM.find?=		/usr/bin/find
 TOOLS_PLATFORM.flex?=		/usr/bin/lex
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.groff?=		/usr/bin/groff
 TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
 TOOLS_PLATFORM.gzip?=		/usr/bin/gzip -nf ${GZIP}
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 86e7ad54385..056f62a2b4b 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.32 2006/04/13 18:45:01 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.33 2006/05/21 16:55:23 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -68,6 +68,9 @@ TOOLS_PLATFORM.grep?=		/bin/grep
 .elif exists(/usr/bin/grep)
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
 .endif
+.if exists(/usr/bin/groff)
+TOOLS_PLATFORM.groff?=		/usr/bin/groff
+.endif
 .if exists(/bin/sed)
 TOOLS_PLATFORM.gsed?=		/bin/sed
 .elif exists(/usr/bin/sed)
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 9913c9c639a..38d79e7adf6 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.28 2006/04/13 18:45:01 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.29 2006/05/21 16:55:23 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -33,6 +33,7 @@ TOOLS_PLATFORM.flex?=		/usr/bin/lex
 TOOLS_PLATFORM.gawk?=		${TOOLS_PLATFORM.awk}
 .endif
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
+TOOLS_PLATFORM.groff?=		/usr/bin/groff
 TOOLS_PLATFORM.gsed?=		${TOOLS_PLATFORM.sed}	# GNUish
 TOOLS_PLATFORM.gsoelim?=	${TOOLS_PLATFORM.soelim}
 TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f