pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/tools Teach the tools framework about "groff" as a ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7524b2da3be7
branches:  trunk
changeset: 513146:7524b2da3be7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun May 21 16:55:21 2006 +0000

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

diffstat:

 mk/tools/replace.mk         |  14 +++++++++++---
 mk/tools/tools.DragonFly.mk |   3 ++-
 mk/tools/tools.FreeBSD.mk   |   3 ++-
 mk/tools/tools.Linux.mk     |   5 ++++-
 mk/tools/tools.NetBSD.mk    |   3 ++-
 5 files changed, 21 insertions(+), 7 deletions(-)

diffs (115 lines):

diff -r dc7d0c3a8c87 -r 7524b2da3be7 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sun May 21 16:43:27 2006 +0000
+++ b/mk/tools/replace.mk       Sun May 21 16:55:21 2006 +0000
@@ -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 @@
 # 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 @@
 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 -r dc7d0c3a8c87 -r 7524b2da3be7 mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk       Sun May 21 16:43:27 2006 +0000
+++ b/mk/tools/tools.DragonFly.mk       Sun May 21 16:55:21 2006 +0000
@@ -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.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 -r dc7d0c3a8c87 -r 7524b2da3be7 mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Sun May 21 16:43:27 2006 +0000
+++ b/mk/tools/tools.FreeBSD.mk Sun May 21 16:55:21 2006 +0000
@@ -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.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 -r dc7d0c3a8c87 -r 7524b2da3be7 mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Sun May 21 16:43:27 2006 +0000
+++ b/mk/tools/tools.Linux.mk   Sun May 21 16:55:21 2006 +0000
@@ -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 @@
 .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 -r dc7d0c3a8c87 -r 7524b2da3be7 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Sun May 21 16:43:27 2006 +0000
+++ b/mk/tools/tools.NetBSD.mk  Sun May 21 16:55:21 2006 +0000
@@ -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.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



Home | Main Index | Thread Index | Old Index