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 "gsoelim", wh...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ef0ba204df3
branches:  trunk
changeset: 505898:7ef0ba204df3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 08 23:00:00 2006 +0000

description:
Teach the tools framework about "gsoelim", which is the soelim tool from
a groff distribution.

diffstat:

 mk/tools/defaults.mk     |   3 ++-
 mk/tools/replace.mk      |  26 +++++++++++++++++++++++++-
 mk/tools/tools.Linux.mk  |   5 ++++-
 mk/tools/tools.NetBSD.mk |   3 ++-
 4 files changed, 33 insertions(+), 4 deletions(-)

diffs (107 lines):

diff -r 193e795cbcdb -r 7ef0ba204df3 mk/tools/defaults.mk
--- a/mk/tools/defaults.mk      Sun Jan 08 22:13:19 2006 +0000
+++ b/mk/tools/defaults.mk      Sun Jan 08 23:00:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.42 2005/11/08 23:06:38 jlam Exp $
+# $NetBSD: defaults.mk,v 1.43 2006/01/08 23:00:00 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -82,6 +82,7 @@
 _TOOLS_VARNAME.gmake=          GMAKE
 _TOOLS_VARNAME.grep=           GREP
 _TOOLS_VARNAME.gsed=           SED
+_TOOLS_VARNAME.gsoelim=                SOELIM
 _TOOLS_VARNAME.gtar=           GTAR
 _TOOLS_VARNAME.gunzip=         GUNZIP_CMD
 _TOOLS_VARNAME.gzcat=          GZCAT
diff -r 193e795cbcdb -r 7ef0ba204df3 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sun Jan 08 22:13:19 2006 +0000
+++ b/mk/tools/replace.mk       Sun Jan 08 23:00:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.151 2006/01/08 22:09:05 jlam Exp $
+# $NetBSD: replace.mk,v 1.152 2006/01/08 23:00:00 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -118,6 +118,9 @@
 .  if !empty(_USE_TOOLS:Mgsed)         # gsed > sed
 _USE_TOOLS:=   ${_USE_TOOLS:Nsed}
 .  endif
+.  if !empty(_USE_TOOLS:Mgsoelim)      # gsoelim > soelim
+_USE_TOOLS:=   ${_USE_TOOLS:Nsoelim}
+.  endif
 .endif
 MAKEVARS+=     _USE_TOOLS
 
@@ -171,6 +174,12 @@
 _TOOLS_DEPMETHOD.gsed=         ${_TOOLS_DEPMETHOD.sed}
 .  endif
 .endif
+.if !empty(_USE_TOOLS:Mgsoelim)                # gsoelim > soelim
+.  if (${_TOOLS_DEPMETHOD.gsoelim} == "BUILD_DEPENDS") && \
+      defined(_TOOLS_DEPMETHOD.soelim)
+_TOOLS_DEPMETHOD.gsoelim=      ${_TOOLS_DEPMETHOD.soelim}
+.  endif
+.endif
 
 ######################################################################
 
@@ -789,6 +798,21 @@
 .  endif
 .endfor
 
+# The ``gsoelim'' tool is special because there's actually no tool named
+# ``gsoelim'' -- the real tool is called just ``soelim''.
+#
+.if !defined(TOOLS_IGNORE.gsoelim) && !empty(_USE_TOOLS:Mgsoelim)
+.  if !empty(PKGPATH:Mtextproc/groff)
+MAKEFLAGS+=            TOOLS_IGNORE.gsoelim=
+.  elif !empty(_TOOLS_USE_PKGSRC.gsoelim:M[yY][eE][sS])
+TOOLS_DEPENDS.gsoelim?=        groff>=1.19nb4:../../textproc/groff
+TOOLS_CREATE+=         gsoelim
+TOOLS_FIND_PREFIX+=    TOOLS_PREFIX.gsoelim=groff
+TOOLS_PATH.gsoelim=    ${TOOLS_PREFIX.gsoelim}/bin/soelim
+.  endif
+TOOLS_ALIASES.gsoelim= soelim
+.endif
+
 ######################################################################
 
 # These tools are all supplied by the devel/diffutils package if there is
diff -r 193e795cbcdb -r 7ef0ba204df3 mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk   Sun Jan 08 22:13:19 2006 +0000
+++ b/mk/tools/tools.Linux.mk   Sun Jan 08 23:00:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.27 2005/11/08 03:36:13 tv Exp $
+# $NetBSD: tools.Linux.mk,v 1.28 2006/01/08 23:00:00 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -73,6 +73,9 @@
 .elif exists(/usr/bin/sed)
 TOOLS_PLATFORM.gsed?=          /usr/bin/sed
 .endif
+.if exists(/usr/bin/soelim)
+TOOLS_PLATFORM.gsoelim?=       /usr/bin/soelim
+.endif
 TOOLS_PLATFORM.gtar?=          /bin/tar
 .if exists(/bin/gunzip)
 TOOLS_PLATFORM.gunzip?=                /bin/gunzip -f
diff -r 193e795cbcdb -r 7ef0ba204df3 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Sun Jan 08 22:13:19 2006 +0000
+++ b/mk/tools/tools.NetBSD.mk  Sun Jan 08 23:00:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.22 2005/11/08 03:36:13 tv Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.23 2006/01/08 23:00:00 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -34,6 +34,7 @@
 .endif
 TOOLS_PLATFORM.grep?=          /usr/bin/grep
 TOOLS_PLATFORM.gsed?=          ${TOOLS_PLATFORM.sed}   # GNUish
+TOOLS_PLATFORM.gsoelim?=       ${TOOLS_PLATFORM.soelim}
 TOOLS_PLATFORM.gunzip?=                /usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=         /usr/bin/gzcat
 TOOLS_PLATFORM.gzip?=          /usr/bin/gzip -nf ${GZIP}



Home | Main Index | Thread Index | Old Index