[pkgsrc/pkgsrc-2005Q2]: pkgsrc/mk/tools Pullup ticket 711 - requested by Gran...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c304026343a0
branches:  pkgsrc-2005Q2
changeset: 496029:c304026343a0
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Aug 24 09:31:21 2005 +0000

description:
Pullup ticket 711 - requested by Grant Beattie
portability fix for tools framework

Revisions pulled up:
- pkgsrc/mk/tools/tools.SunOS.mk                1.18

   Module Name:         pkgsrc
   Committed By:        grant
   Date:                Sun Jul 31 05:24:52 UTC 2005

   Modified Files:
        pkgsrc/mk/tools: tools.SunOS.mk

   Log Message:
   Solaris may have tbl(1) from the SUNWdoc package. avoids unnecessary
   dependency on groff just for tbl(1) when available in the base system.

   also, add .if exists() around nroff(1) because SUNWdoc is optional.

diffstat:

 mk/tools/tools.SunOS.mk |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (29 lines):

diff -r 6ca72549e87d -r c304026343a0 mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk   Wed Aug 24 09:27:27 2005 +0000
+++ b/mk/tools/tools.SunOS.mk   Wed Aug 24 09:31:21 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.15 2005/06/03 22:54:44 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.15.2.1 2005/08/24 09:31:21 salo Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -49,7 +49,9 @@
 .endif
 TOOLS_PLATFORM.mv?=            /usr/bin/mv
 TOOLS_PLATFORM.nice?=          /usr/xpg4/bin/nice
+.if exists(/usr/bin/nroff)
 TOOLS_PLATFORM.nroff?=         /usr/bin/nroff
+.endif
 .if exists(/usr/bin/gpatch)
 TOOLS_PLATFORM.patch?=         /usr/bin/gpatch
 .endif
@@ -60,6 +62,9 @@
 TOOLS_PLATFORM.sort?=          /usr/bin/sort
 TOOLS_PLATFORM.strip?=         /usr/ccs/bin/strip
 TOOLS_PLATFORM.tail?=          /usr/xpg4/bin/tail
+.if exists(/usr/bin/tbl)
+TOOLS_PLATFORM.tbl?=           /usr/bin/tbl
+.endif
 TOOLS_PLATFORM.tee?=           /usr/bin/tee
 TOOLS_PLATFORM.test?=          test                    # shell builtin
 TOOLS_PLATFORM.touch?=         /usr/bin/touch