diff options
| author | tnn <tnn@pkgsrc.org> | 2008-02-07 12:10:36 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-02-07 12:10:36 +0000 |
| commit | 677ba266b7c8c4cffbfa24c451b6054f07f20222 (patch) | |
| tree | 2d439afd40ff7c6b03bf37ebb6b8e0407530ffce | |
| parent | 0e0927754a8015a4f7cae11a9407c34370d7f9bd (diff) | |
| download | pkgsrc-677ba266b7c8c4cffbfa24c451b6054f07f20222.tar.gz | |
Fix busted groff handling on SunOS.
Also, change the logic so that the construct:
USE_TOOLS+= groff nroff
means:
"iff groff is to be provided by textproc/groff, then nroff is
also to be provided by textproc/groff".
This provides a sane mechanism to express need for GNU nroff.
This is part one of fixing packages that set USE_BSD_MAKEFILE=yes
on SunOS. (bsd.man.mk needs an nroff that understands -mandoc)
| -rw-r--r-- | mk/tools/replace.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index ef150704416..da2172fd2d1 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.204 2008/01/04 01:46:27 rillig Exp $ +# $NetBSD: replace.mk,v 1.205 2008/02/07 12:10:36 tnn Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -895,11 +895,15 @@ _TOOLS.groff= groff nroff soelim tbl . 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]) +. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) || \ + !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS]) +. if !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS]) +_TOOLS_USE_PKGSRC.${_t_}= yes +. endif TOOLS_DEPENDS.${_t_}?= groff>=1.19.2nb3:../../textproc/groff TOOLS_CREATE+= ${_t_} TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=groff -. if ${OPSYS} == "SunOS" +. if ${OPSYS} == "SunOS" && "${_t_}" != "groff" TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/g${_t_} . else TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} |