pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Fix busted groff handling on SunOS.
details: https://anonhg.NetBSD.org/pkgsrc/rev/3fec315b0328
branches: trunk
changeset: 538384:3fec315b0328
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu Feb 07 12:10:36 2008 +0000
description:
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)
diffstat:
mk/tools/replace.mk | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 9e43cc31b99b -r 3fec315b0328 mk/tools/replace.mk
--- a/mk/tools/replace.mk Thu Feb 07 06:41:02 2008 +0000
+++ b/mk/tools/replace.mk Thu Feb 07 12:10:36 2008 +0000
@@ -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 @@
. 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_}
Home |
Main Index |
Thread Index |
Old Index