Teach the tools framework about nroff.

12 files changed, 37 insertions, 12 deletions

diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index be1e31c28de..639d318a033 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.22 2005/05/23 17:07:22 jlam Exp $
+# $NetBSD: defaults.mk,v 1.23 2005/05/26 21:46:13 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -98,6 +98,7 @@ _TOOLS_VARNAME.mkdir=		MKDIR
 _TOOLS_VARNAME.mtree=		MTREE
 _TOOLS_VARNAME.mv=		MV
 _TOOLS_VARNAME.nice=		NICE
+_TOOLS_VARNAME.nroff=		NROFF
 _TOOLS_VARNAME.patch=		PATCH
 _TOOLS_VARNAME.pax=		PAX
 _TOOLS_VARNAME.perl=		PERL5
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 7870c35326e..30874785548 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.94 2005/05/23 01:20:50 jlam Exp $
+# $NetBSD: replace.mk,v 1.95 2005/05/26 21:46:14 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -769,6 +769,18 @@ TOOLS_${_TOOLS_VARNAME.nice}=	${TOOLS_REAL_CMD.nice}
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.nroff) && !empty(_USE_TOOLS:Mnroff)
+.  if !empty(PKGPATH:Mtextproc/groff)
+MAKEFLAGS+=			TOOLS_IGNORE.nroff=
+.  elif !empty(_TOOLS_USE_PKGSRC.nroff:M[yY][eE][sS])
+TOOLS_DEPENDS.nroff?=		groff>=1.19nb4:../../textproc/groff
+TOOLS_CREATE+=			nroff
+TOOLS_FIND_PREFIX+=		TOOLS_PREFIX.nroff=groff
+TOOLS_REAL_CMD.nroff=		${TOOLS_PREFIX.nroff}/bin/nroff
+TOOLS_${_TOOLS_VARNAME.nroff}=	${TOOLS_REAL_CMD.nroff}
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch)
 .  if !empty(PKGPATH:Mdevel/patch)
 MAKEFLAGS+=			TOOLS_IGNORE.patch=
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index cb3b6389162..f6cdbe5bd86 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.8 2005/05/14 21:15:07 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.9 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -34,6 +34,7 @@ TOOLS_PLATFORM.mail?=		/usr/bin/mailx
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
 TOOLS_PLATFORM.rmdir?=		/bin/rmdir
diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
index 495db8d7c40..cd25dcf9ea3 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.11 2005/05/16 03:07:38 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.12 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
@@ -39,6 +39,7 @@ TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/contrib/bin/patch
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index e1bfcabb35e..71c9efefe5d 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.11 2005/05/23 01:20:50 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.12 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -43,6 +43,7 @@ TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index e3891ebb5ab..8d8ebe47b0d 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.13 2005/05/23 01:20:50 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.14 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -42,6 +42,7 @@ TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pax?=		/bin/pax
 TOOLS_PLATFORM.pwd?=		/bin/pwd
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index cdc2436c6d3..4194f24eeed 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.13 2005/05/23 01:20:50 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.14 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -44,6 +44,7 @@ TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pax?=		/bin/pax
 TOOLS_PLATFORM.pwd?=		/bin/pwd
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 32a685695f5..4b383d49552 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.17 2005/05/15 23:20:38 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.18 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -101,6 +101,9 @@ TOOLS_PLATFORM.nice?=		/bin/nice
 .elif exists(/usr/bin/nice)
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
 .endif
+.if exists(/usr/bin/nroff)
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
+.endif
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 0514c0e64ed..ca8f0c33adf 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.14 2005/05/23 01:20:50 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.15 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -50,6 +50,7 @@ TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pax?=		/bin/pax
 TOOLS_PLATFORM.pwd?=		/bin/pwd
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index dbd5911f473..cbe38f5b303 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.12 2005/05/23 01:20:50 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.13 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -41,6 +41,7 @@ TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.patch?=		/usr/bin/patch
 TOOLS_PLATFORM.pwd?=		/bin/pwd
 TOOLS_PLATFORM.rm?=		/bin/rm
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index f42be38264a..76147fc8556 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.13 2005/05/14 10:14:29 rillig Exp $
+# $NetBSD: tools.SunOS.mk,v 1.14 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -46,6 +46,7 @@ TOOLS_PLATFORM.mail?=		/usr/bin/mailx
 TOOLS_PLATFORM.mkdir?=		/usr/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/usr/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/xpg4/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 .if exists(/usr/bin/gpatch)
 TOOLS_PLATFORM.patch?=		/usr/bin/gpatch
 .endif
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
index 7c54a8d0dff..0551674808c 100644
--- a/mk/tools/tools.UnixWare.mk
+++ b/mk/tools/tools.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.9 2005/05/10 20:14:27 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.10 2005/05/26 21:46:14 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -33,6 +33,7 @@ TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
 TOOLS_PLATFORM.mail?=		/usr/bin/mailx
 TOOLS_PLATFORM.mv?=		/usr/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
+TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
 TOOLS_PLATFORM.pwd?=		/usr/bin/pwd
 TOOLS_PLATFORM.rm?=		/usr/bin/rm
 TOOLS_PLATFORM.rmdir?=		/usr/bin/rmdir