kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/mk/tools/replace.mk

1054 lines
37 KiB
Makefile
Raw Normal View History

Teach the tools framework about ttmkfdir and type1inst.
2005-12-28 23:41:27 +01:00
# $NetBSD: replace.mk,v 1.150 2005/12/28 22:41:27 jlam Exp $
Add TNF copyright to the new tools framework makefiles.
2005-05-21 06:46:52 +02:00
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
#
# This code is derived from software contributed to The NetBSD Foundation
Grammar 101 -- sentences should end in a period.
2005-05-21 06:53:17 +02:00
# by Johnny C. Lam.
Add TNF copyright to the new tools framework makefiles.
2005-05-21 06:46:52 +02:00
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. All advertising materials mentioning features or use of this software
# must display the following acknowledgement:
# This product includes software developed by the NetBSD
# Foundation, Inc. and its contributors.
# 4. Neither the name of The NetBSD Foundation nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
#
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
#
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
# This Makefile fragment handles "replacements" of system-supplied
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
# tools with pkgsrc versions.
#
# The replacement tools are placed under ${TOOLS_DIR} so that they
# appear earlier in the search path when invoked using the bare name
# of the tool.
#
Export a new variable TOOLS_CMDLINE_<TOOL> that holds the full command line (path and arguments) needed to run the real tool. Modify TOOLS_<TOOL> to hold only the path to the real tool. Modify falcons-eye/Makefile and qt3-libs/Makefile.common to use TOOLS_CMDLINE_YACC instead of TOOLS_YACC to that they'll use "bison -y".
2005-07-18 04:33:27 +02:00
# "TOOLS_TOOLS" variables, e.g. TOOLS_AWK, TOOLS_SED, etc. are set to
# the full paths to the real tools on the filesystem, and represent
# tools required by the package.
#
# "TOOLS_CMDLINE_TOOL" variables, e.g. TOOLS_CMDLINE_AWK,
# TOOLS_CMDLINE_SED, etc. are set to the full command lines (path and
# arguments) necessary to invoke the real tools on the filesystem
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
#
# "TOOL" variables, e.g. AWK, SED, etc. are set to the full command
# lines necessary to invoke the real tools on the filesystem, and
# represent the tools required by pkgsrc itself.
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
#
# The tools that could be replaced with pkgsrc counterparts (usually
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
# GNU versions of the tools) that are required by pkgsrc itself, i.e.
# in targets that are part of pkgsrc infrastructure or part of the
Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making PKGSRC_USE_TOOLS go away. There is now only a single USE_TOOLS variable that specifies all of the tools we need to build/run the package.
2005-07-15 20:27:48 +02:00
# package Makefile, or by the package itself, i.e. within the
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
# software's own build system, should be listed as:
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
#
Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making PKGSRC_USE_TOOLS go away. There is now only a single USE_TOOLS variable that specifies all of the tools we need to build/run the package.
2005-07-15 20:27:48 +02:00
# USE_TOOLS+= awk gmake lex sed
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
#
# If a package requires yacc to generate a parser, then the package
# Makefile should contain one of the following two lines:
#
# USE_TOOLS+= yacc # any yacc will do
# USE_TOOLS+= bison # requires bison-specific features
#
# Adding either "yacc" or "bison" to USE_TOOLS will cause a "yacc" tool
# to be generated that may be used as a yacc-replacement.
#
Allow TOOLS_DEPENDS.<tool> to be set to change the nature of the dependency if we're using the pkgsrc tool, e.g. TOOL_DEPENDS.yacc=DEPENDS. By default, we use BUILD_DEPENDS.
2005-04-15 08:52:25 +02:00
# By default, any dependencies on the pkgsrc tools are build dependencies,
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
# but this may be changed by adding a :run modifier to the tool name,
Allow TOOLS_DEPENDS.<tool> to be set to change the nature of the dependency if we're using the pkgsrc tool, e.g. TOOL_DEPENDS.yacc=DEPENDS. By default, we use BUILD_DEPENDS.
2005-04-15 08:52:25 +02:00
# e.g.:
#
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
# USE_TOOLS+= perl:run
Allow TOOLS_DEPENDS.<tool> to be set to change the nature of the dependency if we're using the pkgsrc tool, e.g. TOOL_DEPENDS.yacc=DEPENDS. By default, we use BUILD_DEPENDS.
2005-04-15 08:52:25 +02:00
#
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
We can only use the subst.mk framework if the files are relative to ${WRKSRC}. Just directly create the msgfmt wrapper in the proper target. Also, note that the msgfmt handling should eventually migrate to the tools framework so that build dependencies and binary paths are correct.
2005-05-19 22:08:44 +02:00
# XXX Keep this hack here until the day that msgfmt and msgfmt-plurals
# XXX is handled directly by the tools framework.
# XXX
.if defined(USE_MSGFMT_PLURALS) && !empty(USE_MSGFMT_PLURALS:M[yY][eE][sS])
USE_TOOLS+= perl
.endif
Asking the tools framework for "bison" now provides two distinct tools: "bison" and "bison-yacc". bison is just a symlink to the real bison, but "bison-yacc" provides a "yacc" in ${TOOLS_DIR} that does "bison -y". This allows the tools framework to provide everything that a package might look for when asking for "bison" and avoids relying on the bison being available in the PATH.
2005-05-16 01:20:38 +02:00
# bison implies "bison-yacc"
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
.if !empty(USE_TOOLS:Mbison) || !empty(USE_TOOLS:Mbison\:*)
Asking the tools framework for "bison" now provides two distinct tools: "bison" and "bison-yacc". bison is just a symlink to the real bison, but "bison-yacc" provides a "yacc" in ${TOOLS_DIR} that does "bison -y". This allows the tools framework to provide everything that a package might look for when asking for "bison" and avoids relying on the bison being available in the PATH.
2005-05-16 01:20:38 +02:00
USE_TOOLS+= bison-yacc
.endif
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
######################################################################
Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making PKGSRC_USE_TOOLS go away. There is now only a single USE_TOOLS variable that specifies all of the tools we need to build/run the package.
2005-07-15 20:27:48 +02:00
# Create _USE_TOOLS, a sanitized version of USE_TOOLS that removes the
# ones that are overridden by superseding ones.
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
#
.if !defined(_USE_TOOLS)
Redo workaround in revision 1.111. We now use a loop to copy one list to another. This appears to fix whatever hidden bug a bit more completely. "make show-var VARNAME=RM" in pkgsrc/x11/kdepim3 no longer returns an empty value. XXX I still have no idea why this "fixes" the problem. I can't seem to XXX create a test case that exposes this problem.
2005-07-17 22:51:04 +02:00
. for _t_ in ${USE_TOOLS:C/:.*//:O:u}
_USE_TOOLS+= ${_t_}
. endfor
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
. if !empty(_USE_TOOLS:Mbison-yacc) # bison-yacc > yacc
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
_USE_TOOLS:= ${_USE_TOOLS:Nyacc}
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
. endif
Teach the tools framework about "byacc", which is a Berkeley-compatible YACC. This should be used by packages that require NOT using bison (maybe because bison can't handle the .y file) but still need a yacc.
2005-09-20 05:50:18 +02:00
. if !empty(_USE_TOOLS:Mbyacc) # byacc > yacc
_USE_TOOLS:= ${_USE_TOOLS:Nyacc}
. endif
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
. if !empty(_USE_TOOLS:Mflex) # flex > lex
Teach the tools framework about "flex" so that packages can specify that they require flex instead of any old lex.
2005-05-23 03:20:50 +02:00
_USE_TOOLS:= ${_USE_TOOLS:Nlex}
. endif
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
. if !empty(_USE_TOOLS:Mgawk) # gawk > awk
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
_USE_TOOLS:= ${_USE_TOOLS:Nawk}
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
. endif
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
. if !empty(_USE_TOOLS:Mgm4) # gm4 > m4
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
_USE_TOOLS:= ${_USE_TOOLS:Nm4}
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
. endif
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
. if !empty(_USE_TOOLS:Mgsed) # gsed > sed
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
_USE_TOOLS:= ${_USE_TOOLS:Nsed}
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
. endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.endif
Rename MAKE_VARS to MAKEVARS so that it more closely resembles "MAKEFLAGS". Both "MAKEVARS" and "MAKEFLAGS" affect the package-level make process, not the software's own make process.
2005-05-12 00:08:18 +02:00
MAKEVARS+= _USE_TOOLS
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
Teach the tools framework about "byacc", which is a Berkeley-compatible YACC. This should be used by packages that require NOT using bison (maybe because bison can't handle the .y file) but still need a yacc.
2005-09-20 05:50:18 +02:00
# Catch conflicting tools.
.if !empty(_USE_TOOLS:Mbison) && !empty(_USE_TOOLS:Mbyacc)
PKG_FAIL_REASON+= "\`\`bison'' and \`\`byacc'' conflict in USE_TOOLS."
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
######################################################################
There is still one small but important distinction between some of the tools listed in USE_TOOLS -- some of them are required by the pkgsrc infrastructure in variable assignment statements that look like: VARIABLE!= ${AWK} ... These tools are actually *required* by pkgsrc to be installed on the system before it can even work (bootstrap situation). For these tools, only override the "TOOL" name representing the tool if we're really using the pkgsrc version of the tool. We accomplish this by adding a new :pkgsrc modifier that is appended to these tools listed in USE_TOOLS. We also list these tools in bsd.prefs.mk so that all packages pick them up fairly early on.
2005-07-17 00:33:18 +02:00
# Set the type of dependency requested for the tool. The type of
# dependency is determined by the modifier specified for each tool:
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
#
There is still one small but important distinction between some of the tools listed in USE_TOOLS -- some of them are required by the pkgsrc infrastructure in variable assignment statements that look like: VARIABLE!= ${AWK} ... These tools are actually *required* by pkgsrc to be installed on the system before it can even work (bootstrap situation). For these tools, only override the "TOOL" name representing the tool if we're really using the pkgsrc version of the tool. We accomplish this by adding a new :pkgsrc modifier that is appended to these tools listed in USE_TOOLS. We also list these tools in bsd.prefs.mk so that all packages pick them up fairly early on.
2005-07-17 00:33:18 +02:00
# BUILD_DEPENDS: :build (default), :pkgsrc
# DEPENDS: :run
#
.for _t_ in ${USE_TOOLS:N*\:*} ${USE_TOOLS:M*\:build} ${USE_TOOLS:M*\:pkgsrc}
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
_TOOLS_DEPMETHOD.${_t_:C/:.*//}= BUILD_DEPENDS
.endfor
.for _t_ in ${USE_TOOLS:M*\:run}
_TOOLS_DEPMETHOD.${_t_:C/:.*//}= DEPENDS
.endfor
.if !empty(_USE_TOOLS:Mbison-yacc) # bison-yacc > yacc
. if (${_TOOLS_DEPMETHOD.bison-yacc} == "BUILD_DEPENDS") && \
defined(_TOOLS_DEPMETHOD.yacc)
_TOOLS_DEPMETHOD.bison-yacc= ${_TOOLS_DEPMETHOD.yacc}
. endif
.endif
.if !empty(_USE_TOOLS:Mflex) # flex > lex
. if (${_TOOLS_DEPMETHOD.flex} == "BUILD_DEPENDS") && \
defined(_TOOLS_DEPMETHOD.lex)
_TOOLS_DEPMETHOD.flex= ${_TOOLS_DEPMETHOD.lex}
. endif
.endif
.if !empty(_USE_TOOLS:Mgawk) # gawk > awk
. if (${_TOOLS_DEPMETHOD.gawk} == "BUILD_DEPENDS") && \
defined(_TOOLS_DEPMETHOD.awk)
_TOOLS_DEPMETHOD.gawk= ${_TOOLS_DEPMETHOD.awk}
. endif
.endif
.if !empty(_USE_TOOLS:Mgm4) # gm4 > m4
. if (${_TOOLS_DEPMETHOD.gm4} == "BUILD_DEPENDS") && \
defined(_TOOLS_DEPMETHOD.m4)
_TOOLS_DEPMETHOD.gm4= ${_TOOLS_DEPMETHOD.m4}
. endif
.endif
.if !empty(_USE_TOOLS:Mgsed) # gsed > sed
. if (${_TOOLS_DEPMETHOD.gsed} == "BUILD_DEPENDS") && \
defined(_TOOLS_DEPMETHOD.sed)
_TOOLS_DEPMETHOD.gsed= ${_TOOLS_DEPMETHOD.sed}
. endif
.endif
######################################################################
If PLATFORM_TOOL.<tool> is defined for a particular tool, then use it instead of the pkgsrc version of the tool. This is an alternative to adding the appropriate platform to the _TOOLS_USE_PLATFORM.* tables.
2005-04-25 08:16:38 +02:00
# _TOOLS_USE_PKGSRC.<tool> is "yes" or "no" depending on whether we're
# using a pkgsrc-supplied tool to replace the system-supplied one. We
Rename PLATFORM_TOOLS.* to TOOLS_PLATFORM.* to bring the variable names under the same namespace as the other parts of the new tools framework.
2005-04-27 18:52:28 +02:00
# use the system-supplied one if TOOLS_PLATFORM.<tool> is non-empty, or
If PLATFORM_TOOL.<tool> is defined for a particular tool, then use it instead of the pkgsrc version of the tool. This is an alternative to adding the appropriate platform to the _TOOLS_USE_PLATFORM.* tables.
2005-04-25 08:16:38 +02:00
# otherwise if this is a particular ${MACHINE_PLATFORM} listed above.
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
#
We only need to loop over the tools that we say we're going to use.
2005-04-28 17:51:10 +02:00
.for _t_ in ${_USE_TOOLS}
Rename PLATFORM_TOOLS.* to TOOLS_PLATFORM.* to bring the variable names under the same namespace as the other parts of the new tools framework.
2005-04-27 18:52:28 +02:00
. if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
_TOOLS_USE_PKGSRC.${_t_}?= no
Get rid of the _TOOLS_USE_PLATFORM.* table as the information has now been placed in the various tools.${OPSYS}.mk files using PLATFORM_TOOL.* definitions.
2005-04-27 18:02:08 +02:00
. endif
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
_TOOLS_USE_PKGSRC.${_t_}?= yes
.endfor
######################################################################
# For each of the blocks below, we create either symlinks or wrappers
# for each of the tools requested. We need to be careful that we don't
# get into dependency loops; do this by setting and checking the value
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
# of TOOLS_IGNORE.<tool>. These blocks handle the case where we are
# using the pkgsrc-supplied tool.
#
# Always set the "TOOLS_TOOL" name for each tool to point to the real
# command, e.g., TOOLS_TBL, TOOLS_YACC, etc., provided that "TOOL" has
# been associated with <tool>.
#
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.awk) && !empty(_USE_TOOLS:Mawk)
Use nawk as the default "awk" replacement since it has no dependencies and is still strong enough for pkgsrc use.
2005-05-18 07:31:55 +02:00
. if !empty(PKGPATH:Mlang/nawk)
Teach replace.mk about awk, m4, and sed when the GNU versions aren't required.
2005-04-27 18:28:19 +02:00
MAKEFLAGS+= TOOLS_IGNORE.awk=
. elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
Use nawk as the default "awk" replacement since it has no dependencies and is still strong enough for pkgsrc use.
2005-05-18 07:31:55 +02:00
TOOLS_DEPENDS.awk?= nawk>=20040207:../../lang/nawk
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= awk
Use nawk as the default "awk" replacement since it has no dependencies and is still strong enough for pkgsrc use.
2005-05-18 07:31:55 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.awk=nawk
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.awk= ${TOOLS_PREFIX.awk}/bin/nawk
Teach replace.mk about awk, m4, and sed when the GNU versions aren't required.
2005-04-27 18:28:19 +02:00
. endif
.endif
Support bash as a tool, so that packages containing bash scripts (e.g. graphics/netpbm) use native bash if available.
2005-06-24 21:39:10 +02:00
.if !defined(TOOLS_IGNORE.bash) && !empty(_USE_TOOLS:Mbash)
. if !empty(PKGPATH:Mshells/bash)
MAKEFLAGS+= TOOLS_IGNORE.bash=
. elif !empty(_TOOLS_USE_PKGSRC.bash:M[yY][eE][sS])
TOOLS_DEPENDS.bash?= bash-[0-9]*:../../shells/bash
TOOLS_CREATE+= bash
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bash=bash
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.bash= ${TOOLS_PREFIX.bash}/bin/bash
Support bash as a tool, so that packages containing bash scripts (e.g. graphics/netpbm) use native bash if available.
2005-06-24 21:39:10 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.bison) && !empty(_USE_TOOLS:Mbison)
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. if !empty(PKGPATH:Mdevel/bison)
MAKEFLAGS+= TOOLS_IGNORE.bison=
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.bison?= bison>=1.0:../../devel/bison
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= bison
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bison=bison
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.bison= ${TOOLS_PREFIX.bison}/bin/bison
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. endif
Asking the tools framework for "bison" now provides two distinct tools: "bison" and "bison-yacc". bison is just a symlink to the real bison, but "bison-yacc" provides a "yacc" in ${TOOLS_DIR} that does "bison -y". This allows the tools framework to provide everything that a package might look for when asking for "bison" and avoids relying on the bison being available in the PATH.
2005-05-16 01:20:38 +02:00
.endif
.if !defined(TOOLS_IGNORE.bison-yacc) && !empty(_USE_TOOLS:Mbison-yacc)
. if !empty(PKGPATH:Mdevel/bison)
MAKEFLAGS+= TOOLS_IGNORE.bison-yacc=
. elif !empty(_TOOLS_USE_PKGSRC.bison-yacc:M[yY][eE][sS])
TOOLS_DEPENDS.bison-yacc?= bison>=1.0:../../devel/bison
TOOLS_CREATE+= bison-yacc
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bison-yacc=bison
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.bison-yacc= ${TOOLS_PREFIX.bison-yacc}/bin/bison
Whitespace fix.
2005-07-19 05:01:13 +02:00
TOOLS_ARGS.bison-yacc= -y
Asking the tools framework for "bison" now provides two distinct tools: "bison" and "bison-yacc". bison is just a symlink to the real bison, but "bison-yacc" provides a "yacc" in ${TOOLS_DIR} that does "bison -y". This allows the tools framework to provide everything that a package might look for when asking for "bison" and avoids relying on the bison being available in the PATH.
2005-05-16 01:20:38 +02:00
. endif
TOOLS_CMD.bison-yacc= ${TOOLS_DIR}/bin/yacc
There is a new variable TOOLS_VALUE_GNU.<tool> for each tool that is the value passed via the shell environment to the GNU configure script for each of the "GNU" variables names for the tool. It defaults to the full path to the real tool so that these may be safely embedded in scripts and config files. One exception is the value for YACC when we use bison. In that case, pass YACC="bison -y" to the configure script so that we will invoke bison in yacc-compatibility mode.
2005-07-19 06:18:51 +02:00
#
# bison/yacc is typically a build tool whose path is not embedded in
# any scripts or config files. In this case, pass the full command
# line (path and arguments) of the tool to the GNU configure script
# so that bison will be correctly invoked in yacc-compatilility mode.
#
TOOLS_VALUE_GNU.bison-yacc= ${TOOLS_CMDLINE.bison-yacc}
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
.endif
Teach the tools framework about "byacc", which is a Berkeley-compatible YACC. This should be used by packages that require NOT using bison (maybe because bison can't handle the .y file) but still need a yacc.
2005-09-20 05:50:18 +02:00
.if !defined(TOOLS_IGNORE.byacc) && !empty(_USE_TOOLS:Mbyacc)
. if !empty(PKGPATH:Mdevel/byacc)
MAKEFLAGS+= TOOLS_IGNORE.byacc=
. elif !empty(_TOOLS_USE_PKGSRC.byacc:M[yY][eE][sS])
TOOLS_DEPENDS.byacc?= byacc>=20040328:../../devel/byacc
TOOLS_CREATE+= byacc
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.byacc=byacc
TOOLS_PATH.byacc= ${TOOLS_PREFIX.byacc}/bin/yacc
TOOLS_CMD.byacc= ${TOOLS_DIR}/bin/yacc
. endif
.endif
Teach the new tools framework about USE_TOOLS+=bzcat.
2005-05-02 04:50:33 +02:00
.if !defined(TOOLS_IGNORE.bzcat) && !empty(_USE_TOOLS:Mbzcat)
. if !empty(PKGPATH:Marchivers/bzip2)
MAKEFLAGS+= TOOLS_IGNORE.bzcat=
. elif !empty(_TOOLS_USE_PKGSRC.bzcat:M[yY][eE][sS])
TOOLS_DEPENDS.bzcat?= bzip2>=0.9.0b:../../archivers/bzip2
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= bzcat
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bzcat=bzip2
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.bzcat= ${TOOLS_PREFIX.bzcat}/bin/bzcat
Teach the new tools framework about USE_TOOLS+=bzcat.
2005-05-02 04:50:33 +02:00
. endif
.endif
Teach the tools framework about csh, and replace with tcsh if necessary.
2005-06-24 22:59:59 +02:00
.if !defined(TOOLS_IGNORE.csh) && !empty(_USE_TOOLS:Mcsh)
. if !empty(PKGPATH:Mshells/tcsh)
MAKEFLAGS+= TOOLS_IGNORE.csh=
. elif !empty(_TOOLS_USE_PKGSRC.csh:M[yY][eE][sS])
TOOLS_DEPENDS.csh?= tcsh-[0-9]*:../../shells/tcsh
TOOLS_CREATE+= csh
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.csh=tcsh
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.csh= ${TOOLS_PREFIX.csh}/bin/tcsh
Teach the tools framework about csh, and replace with tcsh if necessary.
2005-06-24 22:59:59 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.file) && !empty(_USE_TOOLS:Mfile)
Teach replace.mk about egrep, fgrep, and file.
2005-04-15 18:01:23 +02:00
. if !empty(PKGPATH:Msysutils/file)
MAKEFLAGS+= TOOLS_IGNORE.file=
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.file?= file>=4.13:../../sysutils/file
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= file
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.file=file
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.file= ${TOOLS_PREFIX.file}/bin/file
Teach replace.mk about egrep, fgrep, and file.
2005-04-15 18:01:23 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.find) && !empty(_USE_TOOLS:Mfind)
Merge findutils.mk into replace.mk. We now just use USE_TOOLS+=find or USE_TOOLS+=xargs, and cause FIND and XARGS to point to the correct commands.
2005-04-27 00:28:03 +02:00
. if !empty(PKGPATH:Msysutils/findutils)
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
MAKEFLAGS+= TOOLS_IGNORE.find=
. elif !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.find?= findutils>=4.1:../../sysutils/findutils
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= find
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.find=findutils
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.find= ${TOOLS_PREFIX.find}/bin/${GNU_PROGRAM_PREFIX}find
Merge findutils.mk into replace.mk. We now just use USE_TOOLS+=find or USE_TOOLS+=xargs, and cause FIND and XARGS to point to the correct commands.
2005-04-27 00:28:03 +02:00
. endif
.endif
Teach the tools framework about "flex" so that packages can specify that they require flex instead of any old lex.
2005-05-23 03:20:50 +02:00
.if !defined(TOOLS_IGNORE.flex) && !empty(_USE_TOOLS:Mflex)
. if !empty(PKGPATH:Mdevel/flex)
MAKEFLAGS+= TOOLS_IGNORE.flex=
. elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS])
. include "../../devel/flex/buildlink3.mk"
_TOOLS_DEPENDS.flex= # empty
. for _dep_ in ${BUILDLINK_DEPENDS.flex}
_TOOLS_DEPENDS.flex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
. endfor
TOOLS_DEPENDS.flex?= ${_TOOLS_DEPENDS.flex}
TOOLS_CREATE+= flex
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.flex=flex
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.flex= ${TOOLS_PREFIX.flex}/bin/flex
Teach the tools framework about "flex" so that packages can specify that they require flex instead of any old lex.
2005-05-23 03:20:50 +02:00
. endif
TOOLS_ALIASES.flex= lex
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gawk) && !empty(_USE_TOOLS:Mgawk)
Rename "awk" to "gawk" to make it more explicit that we want GNU awk (probably for gensub() ).
2005-04-25 00:34:35 +02:00
. if !empty(PKGPATH:Mlang/gawk)
MAKEFLAGS+= TOOLS_IGNORE.gawk=
. elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.gawk?= gawk>=3.1.1:../../lang/gawk
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gawk
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gawk=gawk
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gawk= ${TOOLS_PREFIX.gawk}/bin/${GNU_PROGRAM_PREFIX}awk
Rename "awk" to "gawk" to make it more explicit that we want GNU awk (probably for gensub() ).
2005-04-25 00:34:35 +02:00
. endif
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
TOOLS_ALIASES.gawk= awk
Rename "awk" to "gawk" to make it more explicit that we want GNU awk (probably for gensub() ).
2005-04-25 00:34:35 +02:00
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gm4) && !empty(_USE_TOOLS:Mgm4)
Rename "m4" to "gm4" to more explicitly note that we want GNU m4. The tool name under ${TOOLS_DIR} is still "m4".
2005-04-25 00:42:00 +02:00
. if !empty(PKGPATH:Mdevel/m4)
MAKEFLAGS+= TOOLS_IGNORE.gm4=
. elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.gm4?= m4>=1.4:../../devel/m4
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gm4
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gm4=m4
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gm4= ${TOOLS_PREFIX.gm4}/bin/gm4
Rename "m4" to "gm4" to more explicitly note that we want GNU m4. The tool name under ${TOOLS_DIR} is still "m4".
2005-04-25 00:42:00 +02:00
. endif
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
TOOLS_ALIASES.gm4= m4
Rename "m4" to "gm4" to more explicitly note that we want GNU m4. The tool name under ${TOOLS_DIR} is still "m4".
2005-04-25 00:42:00 +02:00
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gmake) && !empty(_USE_TOOLS:Mgmake)
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. if !empty(PKGPATH:Mdevel/gmake)
MAKEFLAGS+= TOOLS_IGNORE.gmake=
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.gmake?= gmake>=3.78:../../devel/gmake
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gmake
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gmake=gmake
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gmake= ${TOOLS_PREFIX.gmake}/bin/gmake
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gsed) && !empty(_USE_TOOLS:Mgsed)
Correct the PKGPATH for gsed.
2005-04-28 06:00:15 +02:00
. if !empty(PKGPATH:Mtextproc/gsed)
Sort the tool-specific sections for easier browsing.
2005-04-26 21:15:38 +02:00
MAKEFLAGS+= TOOLS_IGNORE.gsed=
. elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.gsed?= gsed>=3.0.2:../../textproc/gsed
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gsed
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gsed=gsed
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gsed= ${TOOLS_PREFIX.gsed}/bin/${GNU_PROGRAM_PREFIX}sed
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. endif
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
TOOLS_ALIASES.gsed= sed
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gtar) && !empty(_USE_TOOLS:Mgtar)
Consider ${TAR} differently from ${GTAR}. Currently, mark pkgsrc down as needing both (no impact since they're both satisfied by the tar binary installed by the bootstrap kit). There's some funniness in the extraction code where we check for pax or GNU tar that needs to be resolved. Remove the TAR=${GTAR} hack since it's no longer needed after these changes. XXX Later, a sweep needs to be made to see where we actually need GTAR XXX and where we only need TAR, probably triggered by whether we call it XXX with the "z" option or not. Packages that need GTAR should explicitly XXX add USE_TOOLS+=gtar to the package Makefile.
2005-05-14 23:15:07 +02:00
. if !empty(PKGPATH:Marchivers/gtar-base)
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
MAKEFLAGS+= TOOLS_IGNORE.gtar=
. elif !empty(_TOOLS_USE_PKGSRC.gtar:M[yY][eE][sS])
Consider ${TAR} differently from ${GTAR}. Currently, mark pkgsrc down as needing both (no impact since they're both satisfied by the tar binary installed by the bootstrap kit). There's some funniness in the extraction code where we check for pax or GNU tar that needs to be resolved. Remove the TAR=${GTAR} hack since it's no longer needed after these changes. XXX Later, a sweep needs to be made to see where we actually need GTAR XXX and where we only need TAR, probably triggered by whether we call it XXX with the "z" option or not. Packages that need GTAR should explicitly XXX add USE_TOOLS+=gtar to the package Makefile.
2005-05-14 23:15:07 +02:00
TOOLS_DEPENDS.gtar?= gtar-base>=1.13.25:../../archivers/gtar-base
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gtar
Consider ${TAR} differently from ${GTAR}. Currently, mark pkgsrc down as needing both (no impact since they're both satisfied by the tar binary installed by the bootstrap kit). There's some funniness in the extraction code where we check for pax or GNU tar that needs to be resolved. Remove the TAR=${GTAR} hack since it's no longer needed after these changes. XXX Later, a sweep needs to be made to see where we actually need GTAR XXX and where we only need TAR, probably triggered by whether we call it XXX with the "z" option or not. Packages that need GTAR should explicitly XXX add USE_TOOLS+=gtar to the package Makefile.
2005-05-14 23:15:07 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gtar=gtar-base
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gtar= ${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar
Teach replace.mk about GTAR and PAX (replace with archivers/pax if necessary).
2005-04-27 05:41:17 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip)
We want to check if we're in gzip-base to avoid circular dependencies on gzip.
2005-05-16 00:33:08 +02:00
. if !empty(PKGPATH:Marchivers/gzip-base)
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
MAKEFLAGS+= TOOLS_IGNORE.gunzip=
. elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS])
TOOLS_DEPENDS.gunzip?= gzip-base>=1.2.4b:../../archivers/gzip-base
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gunzip
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gunzip=gzip-base
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gunzip= ${TOOLS_PREFIX.gunzip}/bin/gunzip
TOOLS_ARGS.gunzip= -f
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gzcat) && !empty(_USE_TOOLS:Mgzcat)
We want to check if we're in gzip-base to avoid circular dependencies on gzip.
2005-05-16 00:33:08 +02:00
. if !empty(PKGPATH:Marchivers/gzip-base)
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
MAKEFLAGS+= TOOLS_IGNORE.gzcat=
. elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS])
TOOLS_DEPENDS.gzcat?= gzip-base>=1.2.4b:../../archivers/gzip-base
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gzcat
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzcat=gzip-base
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gzcat= ${TOOLS_PREFIX.gzcat}/bin/zcat
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.gzip) && !empty(_USE_TOOLS:Mgzip)
We want to check if we're in gzip-base to avoid circular dependencies on gzip.
2005-05-16 00:33:08 +02:00
. if !empty(PKGPATH:Marchivers/gzip-base)
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
MAKEFLAGS+= TOOLS_IGNORE.gzip=
. elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.gzip?= gzip-base>=1.2.4b:../../archivers/gzip-base
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= gzip
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzip=gzip-base
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.gzip= ${TOOLS_PREFIX.gzip}/bin/gzip
TOOLS_ARGS.gzip= -nf ${GZIP}
Teach replace.mk about gzip, gunzip, and gzcat.
2005-04-24 05:59:44 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.lex) && !empty(_USE_TOOLS:Mlex)
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. if !empty(PKGPATH:Mdevel/flex)
MAKEFLAGS+= TOOLS_IGNORE.lex=
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS])
. include "../../devel/flex/buildlink3.mk"
BUILDLINK_DEPENDS.* can be lists, so iterate over the lists when creating a proper BUILD_DEPENDS or DEPENDS list.
2005-05-14 23:38:18 +02:00
_TOOLS_DEPENDS.lex= # empty
. for _dep_ in ${BUILDLINK_DEPENDS.flex}
_TOOLS_DEPENDS.lex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
. endfor
TOOLS_DEPENDS.lex?= ${_TOOLS_DEPENDS.lex}
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= lex
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.lex=flex
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.lex= ${TOOLS_PREFIX.lex}/bin/flex
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. endif
.endif
Teach the new tools framework about lha, unrar, unzip, and unzoo and modify bsd.pkg.extract.mk to use them. As a side-effect, we stop hardcoding ${LOCALBASE} as the install prefix for these tools so this becomes more pkgviews-friendly.
2005-05-14 00:08:20 +02:00
.if !defined(TOOLS_IGNORE.lha) && !empty(_USE_TOOLS:Mlha)
. if !empty(PKGPATH:Marchivers/lha)
MAKEFLAGS+= TOOLS_IGNORE.lha=
. elif !empty(_TOOLS_USE_PKGSRC.lha:M[yY][eE][sS])
TOOLS_DEPENDS.lha?= lha>=114.9:../../archivers/lha
TOOLS_CREATE+= lha
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.lha=lha
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.lha= ${TOOLS_PREFIX.lha}/bin/lha
Teach the new tools framework about lha, unrar, unzip, and unzoo and modify bsd.pkg.extract.mk to use them. As a side-effect, we stop hardcoding ${LOCALBASE} as the install prefix for these tools so this becomes more pkgviews-friendly.
2005-05-14 00:08:20 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.m4) && !empty(_USE_TOOLS:Mm4)
Teach replace.mk about awk, m4, and sed when the GNU versions aren't required.
2005-04-27 18:28:19 +02:00
. if !empty(PKGPATH:Mdevel/m4)
MAKEFLAGS+= TOOLS_IGNORE.m4=
. elif !empty(_TOOLS_USE_PKGSRC.m4:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.m4?= m4>=1.4:../../devel/m4
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= m4
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.m4=m4
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.m4= ${TOOLS_PREFIX.m4}/bin/gm4
Teach replace.mk about awk, m4, and sed when the GNU versions aren't required.
2005-04-27 18:28:19 +02:00
. endif
.endif
Teach the new tools framework about MAIL_CMD. We use mail/nail as a "mail" replacement in case TOOLS_PLATFORM.mail is empty.
2005-05-03 18:30:34 +02:00
.if !defined(TOOLS_IGNORE.mail) && !empty(_USE_TOOLS:Mmail)
. if !empty(PKGPATH:Mmail/nail)
MAKEFLAGS+= TOOLS_IGNORE.mail=
. elif !empty(_TOOLS_USE_PKGSRC.mail:M[yY][eE][sS])
TOOLS_DEPENDS.mail?= nail>=11.22:../../mail/nail
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= mail
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mail=nail
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.mail= ${TOOLS_PREFIX.mail}/bin/nail
Teach the new tools framework about MAIL_CMD. We use mail/nail as a "mail" replacement in case TOOLS_PLATFORM.mail is empty.
2005-05-03 18:30:34 +02:00
. endif
.endif
Teach the tools framework about mktemp. Replace explicit tests for mktemp with USE_TOOLS+=mktemp in the samba packages.
2005-06-04 00:54:44 +02:00
.if !defined(TOOLS_IGNORE.mktemp) && !empty(_USE_TOOLS:Mmktemp)
. if !empty(PKGPATH:Msysutils/mktemp)
MAKEFLAGS+= TOOLS_IGNORE.mktemp=
. elif !empty(_TOOLS_USE_PKGSRC.mktemp:M[yY][eE][sS])
TOOLS_DEPENDS.mktemp?= mktemp>=1.5:../../sysutils/mktemp
TOOLS_CREATE+= mktemp
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mktemp=mktemp
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.mktemp= ${TOOLS_PREFIX.mktemp}/bin/mktemp
Teach the tools framework about mktemp. Replace explicit tests for mktemp with USE_TOOLS+=mktemp in the samba packages.
2005-06-04 00:54:44 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.mtree) && !empty(_USE_TOOLS:Mmtree)
Teach replace about mtree/MTREE.
2005-04-27 08:15:53 +02:00
. if !empty(PKGPATH:Mpkgtools/mtree)
MAKEFLAGS+= TOOLS_IGNORE.mtree=
. elif !empty(_TOOLS_USE_PKGSRC.mtree:M[yY][eE][sS])
We can't add dependencies on packages that are never registered. archivers/pax and pkgtools/mtree fall in this category since they are usually installed by pkgsrc bootstrap.
2005-04-27 17:21:50 +02:00
#
# This is installed by pkgsrc bootstrap, and is never registered, so
# comment out the dependency on it.
#
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
#TOOLS_DEPENDS.mtree?= mtree>=20040722:../../pkgtools/mtree
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= mtree
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.mtree=mtree
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.mtree= ${TOOLS_PREFIX.mtree}/bin/mtree
Teach replace about mtree/MTREE.
2005-04-27 08:15:53 +02:00
. endif
.endif
Teach the tools framework about nroff.
2005-05-26 23:46:13 +02:00
.if !defined(TOOLS_IGNORE.nroff) && !empty(_USE_TOOLS:Mnroff)
. if !empty(PKGPATH:Mtextproc/groff)
MAKEFLAGS+= TOOLS_IGNORE.nroff=
. elif !empty(_TOOLS_USE_PKGSRC.nroff:M[yY][eE][sS])
TOOLS_DEPENDS.nroff?= groff>=1.19nb4:../../textproc/groff
TOOLS_CREATE+= nroff
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.nroff=groff
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.nroff= ${TOOLS_PREFIX.nroff}/bin/nroff
Teach the tools framework about nroff.
2005-05-26 23:46:13 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch)
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. if !empty(PKGPATH:Mdevel/patch)
MAKEFLAGS+= TOOLS_IGNORE.patch=
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.patch?= patch>=2.2:../../devel/patch
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= patch
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.patch=patch
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.patch= ${TOOLS_PREFIX.patch}/bin/gpatch
If we're using devel/patch, then we know that we can create backup files and how, so set this. Fixes problems observed under (at least) IRIX, where otherwise a call to gpatch ${_PATCH_BACKUP_ARG} .orig <patch would fail, as ${_PATCH_BACKUP_ARG} would be the empty string.
2005-10-30 18:32:07 +01:00
_PATCH_CAN_BACKUP= yes
_PATCH_BACKUP_ARG?= -b -V simple -z
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.pax) && !empty(_USE_TOOLS:Mpax)
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
. if !empty(PKGPATH:Marchivers/pax)
MAKEFLAGS+= TOOLS_IGNORE.pax=
. elif !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS])
#
# This is installed by pkgsrc bootstrap, and is never registered, so
# comment out the dependency on it.
#
#TOOLS_DEPENDS.pax?= pax>=20040802:../../archivers/pax
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= pax
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pax=pax
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.pax= ${TOOLS_PREFIX.pax}/bin/pax
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
. endif
.endif
Back out previous change, and correct the surrounding check -- we need to see if _USE_TOOLS contains "perl", not USE_TOOLS.
2005-06-02 23:03:32 +02:00
.if !defined(TOOLS_IGNORE.perl) && !empty(_USE_TOOLS:Mperl)
Drop the perl-5.6.x package from pkgsrc. Remove lang/perl58 and update lang/perl5 to perl-5.8.6nb4. Modify packages that referred to lang/perl58 to point to lang/perl5 instead.
2005-06-24 08:43:43 +02:00
. if !empty(PKGPATH:Mlang/perl5)
Merge most of perl.mk into replace.mk and leave perl.mk to contain the extra bits required by packages that use perl. This causes PKGSRC_USE_TOOLS+=perl to work properly.
2005-05-19 05:52:23 +02:00
MAKEFLAGS+= TOOLS_IGNORE.perl=
Back out previous change, and correct the surrounding check -- we need to see if _USE_TOOLS contains "perl", not USE_TOOLS.
2005-06-02 23:03:32 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.perl:M[yY][eE][sS])
Merge most of perl.mk into replace.mk and leave perl.mk to contain the extra bits required by packages that use perl. This causes PKGSRC_USE_TOOLS+=perl to work properly.
2005-05-19 05:52:23 +02:00
. include "../../lang/perl5/version.mk"
Update lang/perl5 to 5.8.7. Changes from version 5.8.6 include updates for many "core" modules, UTF-8 and Unicode bugfixes, and ithreads bugfixes. The major changes are in the pkgsrc infrastructure to handle Perl and Perl modules. All pkgsrc-installed Perl modules are now installed in "vendor" directories, and the perl interpreter has been modifed to search for libraries in the following order: site, vendor, perl. The Perl library is stored in a directory that is named for the Perl ABI version associated with the Perl release, so any updates of Perl to newer versions can be done "in-place" as long as Perl ABI version remains the same. All Perl scripts and man pages are stored in locations that won't conflict between site, vendor, and perl modules, and a new utility perllink(1) now manages symlinks to those scripts and man pages under the usual ${LOCALBASE}/bin and ${LOCALBASE}/man/man1. PERL5_SITEPREFIX may be set to the prefix where local, site-specific modules will be installed, e.g. PERL5_SITEPREFIX=/usr/local. Note that modules installed here are completely unmanaged by pkgsrc. Update the buildlink and tool dependencies on perl to require perl>=5.8.7 to reflect the new locations for Perl modules and the Perl shared library.
2005-08-06 08:18:44 +02:00
TOOLS_DEPENDS.perl?= perl>=${PERL5_REQD}:../../lang/perl5
Merge most of perl.mk into replace.mk and leave perl.mk to contain the extra bits required by packages that use perl. This causes PKGSRC_USE_TOOLS+=perl to work properly.
2005-05-19 05:52:23 +02:00
TOOLS_CREATE+= perl
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.perl=perl
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.perl= ${TOOLS_PREFIX.perl}/bin/perl
Merge most of perl.mk into replace.mk and leave perl.mk to contain the extra bits required by packages that use perl. This causes PKGSRC_USE_TOOLS+=perl to work properly.
2005-05-19 05:52:23 +02:00
. endif
.endif
Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That file's sole purpose was to provide a dependency on pkg-config and set some environment variables. Instead, turn pkg-config into a "tool" in the tools framework, where the pkg-config wrapper automatically adds PKG_CONFIG_LIBDIR to the environment before invoking the real pkg-config. For all package Makefiles that included pkg-config/buildlink3.mk, remove that inclusion and replace it with USE_TOOLS+=pkg-config.
2005-08-10 22:56:10 +02:00
.if !defined(TOOLS_IGNORE.pkg-config) && !empty(_USE_TOOLS:Mpkg-config)
. if !empty(PKGPATH:Mdevel/pkg-config)
MAKEFLAGS+= TOOLS_IGNORE.pkg-config=
. elif !empty(_TOOLS_USE_PKGSRC.pkg-config:M[yY][eE][sS])
TOOLS_DEPENDS.pkg-config?= pkg-config>=0.19:../../devel/pkg-config
TOOLS_CREATE+= pkg-config
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pkg-config=pkg-config
TOOLS_PATH.pkg-config= ${TOOLS_PREFIX.pkg-config}/bin/pkg-config
. endif
.endif
Provide a "pod2man" tool used by some packages to build man pages. Based on suggestion by Matthias Drochner.
2005-07-26 22:00:50 +02:00
.if !defined(TOOLS_IGNORE.pod2man) && !empty(_USE_TOOLS:Mpod2man)
. if !empty(PKGPATH:Mlang/perl5)
MAKEFLAGS+= TOOLS_IGNORE.pod2man=
. elif !empty(_TOOLS_USE_PKGSRC.pod2man:M[yY][eE][sS])
. include "../../lang/perl5/version.mk"
Fix a cut-and-paste bug.
2005-08-10 08:08:48 +02:00
TOOLS_DEPENDS.pod2man?= perl>=${PERL5_REQD}:../../lang/perl5
Provide a "pod2man" tool used by some packages to build man pages. Based on suggestion by Matthias Drochner.
2005-07-26 22:00:50 +02:00
TOOLS_CREATE+= pod2man
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pod2man=perl
TOOLS_PATH.pod2man= ${TOOLS_PREFIX.pod2man}/bin/pod2man
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.sed) && !empty(_USE_TOOLS:Msed)
Teach replace.mk about awk, m4, and sed when the GNU versions aren't required.
2005-04-27 18:28:19 +02:00
. if !empty(PKGPATH:Mtextproc/nbsed)
MAKEFLAGS+= TOOLS_IGNORE.sed=
. elif !empty(_TOOLS_USE_PKGSRC.sed:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.sed?= nbsed>=20040821:../../textproc/nbsed
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= sed
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.sed=nbsed
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.sed= ${TOOLS_PREFIX.nbsed}/bin/nbsed
Teach replace.mk about awk, m4, and sed when the GNU versions aren't required.
2005-04-27 18:28:19 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.sh) && !empty(_USE_TOOLS:Msh)
Teach replace.mk about replacements for SH (shells/pdksh) and SHLOCK (pkgtools/shlock).
2005-04-27 06:47:41 +02:00
. if !empty(PKGPATH:Mshells/pdksh)
MAKEFLAGS+= TOOLS_IGNORE.sh=
. elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.sh?= pdksh>=5.2.14:../../shells/pdksh
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= sh
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.sh=pdksh
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.sh= ${TOOLS_PREFIX.sh}/bin/pdksh
Teach replace.mk about replacements for SH (shells/pdksh) and SHLOCK (pkgtools/shlock).
2005-04-27 06:47:41 +02:00
. endif
TOOLS_CMD.sh= ${TOOLS_DIR}/bin/sh
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.shlock) && !empty(_USE_TOOLS:Mshlock)
Teach replace.mk about replacements for SH (shells/pdksh) and SHLOCK (pkgtools/shlock).
2005-04-27 06:47:41 +02:00
. if !empty(PKGPATH:Mpkgtools/shlock)
MAKEFLAGS+= TOOLS_IGNORE.shlock=
. elif !empty(_TOOLS_USE_PKGSRC.shlock:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.shlock?= shlock>=20020114:../../pkgtools/shlock
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= shlock
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.shlock=shlock
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.shlock= ${TOOLS_PREFIX.shlock}/bin/shlock
Teach replace.mk about replacements for SH (shells/pdksh) and SHLOCK (pkgtools/shlock).
2005-04-27 06:47:41 +02:00
. endif
.endif
Add "soelim", also part of groff if replacement is needed.
2005-11-08 04:36:13 +01:00
.if !defined(TOOLS_IGNORE.soelim) && !empty(_USE_TOOLS:Msoelim)
. if !empty(PKGPATH:Mtextproc/groff)
MAKEFLAGS+= TOOLS_IGNORE.soelim=
. elif !empty(_TOOLS_USE_PKGSRC.soelim:M[yY][eE][sS])
TOOLS_DEPENDS.soelim?= groff>=1.19nb4:../../textproc/groff
TOOLS_CREATE+= soelim
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.soelim=groff
TOOLS_PATH.soelim= ${TOOLS_PREFIX.soelim}/bin/soelim
. endif
.endif
Consider ${TAR} differently from ${GTAR}. Currently, mark pkgsrc down as needing both (no impact since they're both satisfied by the tar binary installed by the bootstrap kit). There's some funniness in the extraction code where we check for pax or GNU tar that needs to be resolved. Remove the TAR=${GTAR} hack since it's no longer needed after these changes. XXX Later, a sweep needs to be made to see where we actually need GTAR XXX and where we only need TAR, probably triggered by whether we call it XXX with the "z" option or not. Packages that need GTAR should explicitly XXX add USE_TOOLS+=gtar to the package Makefile.
2005-05-14 23:15:07 +02:00
.if !defined(TOOLS_IGNORE.tar) && !empty(_USE_TOOLS:Mtar)
. if !empty(PKGPATH:Marchivers/pax)
MAKEFLAGS+= TOOLS_IGNORE.tar=
. elif !empty(_TOOLS_USE_PKGSRC.tar:M[yY][eE][sS])
#
# This is installed by pkgsrc bootstrap, and is never registered, so
# comment out the dependency on it.
#
#TOOLS_DEPENDS.tar?= pax>=20040802:../../archivers/pax
TOOLS_CREATE+= tar
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.tar=pax
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.tar= ${TOOLS_PREFIX.tar}/bin/tar
Consider ${TAR} differently from ${GTAR}. Currently, mark pkgsrc down as needing both (no impact since they're both satisfied by the tar binary installed by the bootstrap kit). There's some funniness in the extraction code where we check for pax or GNU tar that needs to be resolved. Remove the TAR=${GTAR} hack since it's no longer needed after these changes. XXX Later, a sweep needs to be made to see where we actually need GTAR XXX and where we only need TAR, probably triggered by whether we call it XXX with the "z" option or not. Packages that need GTAR should explicitly XXX add USE_TOOLS+=gtar to the package Makefile.
2005-05-14 23:15:07 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.tbl) && !empty(_USE_TOOLS:Mtbl)
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. if !empty(PKGPATH:Mtextproc/groff)
MAKEFLAGS+= TOOLS_IGNORE.tbl=
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.tbl:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.tbl?= groff>=1.19nb4:../../textproc/groff
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= tbl
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.tbl=groff
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.tbl= ${TOOLS_PREFIX.tbl}/bin/tbl
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. endif
.endif
Teach the tools framework about wish and tclsh, and set WISH and TCLSH accordingly for packages that need it.
2005-11-09 00:06:38 +01:00
.if !defined(TOOLS_IGNORE.tclsh) && !empty(_USE_TOOLS:Mtclsh)
. if !empty(PKGPATH:Mlang/tcl)
MAKEFLAGS+= TOOLS_IGNORE.tclsh=
. elif !empty(_TOOLS_USE_PKGSRC.tclsh:M[yY][eE][sS])
TOOLS_DEPENDS.tclsh?= tcl>=8.4:../../lang/tcl
TOOLS_CREATE+= tclsh
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.tclsh=tcl
TOOLS_PATH.tclsh= ${TOOLS_PREFIX.tclsh}/bin/tclsh
. endif
.endif
Teach the tools framework about ttmkfdir and type1inst.
2005-12-28 23:41:27 +01:00
.if !defined(TOOLS_IGNORE.ttmkfdir) && !empty(_USE_TOOLS:Mttmkfdir)
. if !empty(PKGPATH:Mfonts/ttmkfdir2)
MAKEFLAGS+= TOOLS_IGNORE.ttmkfdir=
. elif !empty(_TOOLS_USE_PKGSRC.ttmkfdir:M[yY][eE][sS])
TOOLS_DEPENDS.ttmkfdir?= ttmkfdir2>=20021109:../../fonts/ttmkfdir2
TOOLS_CREATE+= ttmkfdir
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.ttmkfdir=ttmkfdir2
TOOLS_PATH.ttmkfdir= ${TOOLS_PREFIX.ttmkfdir}/bin/ttmkfdir
. endif
.endif
.if !defined(TOOLS_IGNORE.type1inst) && !empty(_USE_TOOLS:Mtype1inst)
. if !empty(PKGPATH:Mfonts/type1inst)
MAKEFLAGS+= TOOLS_IGNORE.type1inst=
. elif !empty(_TOOLS_USE_PKGSRC.type1inst:M[yY][eE][sS])
TOOLS_DEPENDS.type1inst?= type1inst2>=0.6.1:../../fonts/type1inst
TOOLS_CREATE+= type1inst
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.type1inst=type1inst
TOOLS_PATH.type1inst= ${TOOLS_PREFIX.type1inst}/bin/type1inst
. endif
.endif
Teach the new tools framework about lha, unrar, unzip, and unzoo and modify bsd.pkg.extract.mk to use them. As a side-effect, we stop hardcoding ${LOCALBASE} as the install prefix for these tools so this becomes more pkgviews-friendly.
2005-05-14 00:08:20 +02:00
.if !defined(TOOLS_IGNORE.unrar) && !empty(_USE_TOOLS:Munrar)
. if !empty(PKGPATH:Marchivers/unrar)
MAKEFLAGS+= TOOLS_IGNORE.unrar=
. elif !empty(_TOOLS_USE_PKGSRC.unrar:M[yY][eE][sS])
TOOLS_DEPENDS.unrar?= unrar>=3.3.4:../../archivers/unrar
TOOLS_CREATE+= unrar
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.unrar=unrar
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.unrar= ${TOOLS_PREFIX.unrar}/bin/unrar
Teach the new tools framework about lha, unrar, unzip, and unzoo and modify bsd.pkg.extract.mk to use them. As a side-effect, we stop hardcoding ${LOCALBASE} as the install prefix for these tools so this becomes more pkgviews-friendly.
2005-05-14 00:08:20 +02:00
. endif
.endif
.if !defined(TOOLS_IGNORE.unzip) && !empty(_USE_TOOLS:Munzip)
. if !empty(PKGPATH:Marchivers/unzip)
MAKEFLAGS+= TOOLS_IGNORE.unzip=
. elif !empty(_TOOLS_USE_PKGSRC.unzip:M[yY][eE][sS])
TOOLS_DEPENDS.unzip?= unzip-[0-9]*:../../archivers/unzip
TOOLS_CREATE+= unzip
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.unzip=unzip
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.unzip= ${TOOLS_PREFIX.unzip}/bin/unzip
Teach the new tools framework about lha, unrar, unzip, and unzoo and modify bsd.pkg.extract.mk to use them. As a side-effect, we stop hardcoding ${LOCALBASE} as the install prefix for these tools so this becomes more pkgviews-friendly.
2005-05-14 00:08:20 +02:00
. endif
.endif
.if !defined(TOOLS_IGNORE.unzoo) && !empty(_USE_TOOLS:Munzoo)
. if !empty(PKGPATH:Marchivers/unzoo)
MAKEFLAGS+= TOOLS_IGNORE.unzoo=
. elif !empty(_TOOLS_USE_PKGSRC.unzoo:M[yY][eE][sS])
TOOLS_DEPENDS.unzoo?= unzoo-[0-9]*:../../archivers/unzoo
TOOLS_CREATE+= unzoo
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.unzoo=unzoo
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.unzoo= ${TOOLS_PREFIX.unzoo}/bin/unzoo
Teach the new tools framework about lha, unrar, unzip, and unzoo and modify bsd.pkg.extract.mk to use them. As a side-effect, we stop hardcoding ${LOCALBASE} as the install prefix for these tools so this becomes more pkgviews-friendly.
2005-05-14 00:08:20 +02:00
. endif
.endif
Teach the tools framework about wish and tclsh, and set WISH and TCLSH accordingly for packages that need it.
2005-11-09 00:06:38 +01:00
.if !defined(TOOLS_IGNORE.wish) && !empty(_USE_TOOLS:Mwish)
. if !empty(PKGPATH:Mx11/tk)
MAKEFLAGS+= TOOLS_IGNORE.wish=
. elif !empty(_TOOLS_USE_PKGSRC.wish:M[yY][eE][sS])
TOOLS_DEPENDS.wish?= tk>=8.4:../../x11/tk
TOOLS_CREATE+= wish
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.wish=tk
TOOLS_PATH.wish= ${TOOLS_PREFIX.wish}/bin/wish
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.xargs) && !empty(_USE_TOOLS:Mxargs)
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
. if !empty(PKGPATH:Msysutils/findutils)
MAKEFLAGS+= TOOLS_IGNORE.xargs=
. elif !empty(_TOOLS_USE_PKGSRC.xargs:M[yY][eE][sS])
TOOLS_DEPENDS.xargs?= findutils>=4.1:../../sysutils/findutils
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= xargs
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xargs=findutils
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.xargs= ${TOOLS_PREFIX.xargs}/bin/${GNU_PROGRAM_PREFIX}xargs
TOOLS_ARGS.xargs= -r # don't run command if stdin is empty
Split out the tools from the same package into separate clauses so that you can specify wanting individual tools from that package.
2005-04-28 05:57:39 +02:00
. endif
.endif
Create _USE_TOOLS, a sanitized versino of USE_TOOLS that removes the tools that are overridden by superseding ones. Use it in place of USE_TOOLS in most places. This fixes the situation where we can depend on the tool that overridden, e.g. USE_TOOLS= gawk awk.
2005-04-28 17:47:43 +02:00
.if !defined(TOOLS_IGNORE.yacc) && !empty(_USE_TOOLS:Myacc)
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. if !empty(PKGPATH:Mdevel/bison)
MAKEFLAGS+= TOOLS_IGNORE.yacc=
Rewrite code for using system-supplied tools so that we can replace tools that are defined as a command plus arguments, e.g. for gunzip, GUNZIP= /usr/bin/gzip -d In this case, we generate a wrapper script that invokes the real command plus arguments. If there are no arguments, then just symlink the command for simplicity. Also, restructure the tool-specific blocks so that we always define TOOLS_CMD.<tool> to the correct name (important for yacc/bison), and check that the real command actually exists before assigning it to the "TOOL" name.
2005-04-24 05:07:36 +02:00
. elif !empty(_TOOLS_USE_PKGSRC.yacc:M[yY][eE][sS])
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
TOOLS_DEPENDS.yacc?= bison>=1.0:../../devel/bison
Replace TOOLS_WRAP and TOOLS_SYMLINK with TOOLS_CREATE, and let the tools framework figure out by itself whether a wrapper or a symlink should be created based on the real command and any arguments that may need to be invoked.
2005-05-09 03:11:58 +02:00
TOOLS_CREATE+= yacc
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.yacc=bison
Rename the following variables for brevity: TOOLS_REAL_CMD.<tool> => TOOLS_PATH.<tool> TOOLS_REAL_ARGS.<tool> => TOOLS_ARGS.<tool> TOOLS_REAL_CMDLINE.<tool> => TOOLS_CMDLINE.<tool>
2005-07-17 23:36:24 +02:00
TOOLS_PATH.yacc= ${TOOLS_PREFIX.yacc}/bin/bison
TOOLS_ARGS.yacc= -y
If bison is used, always pass YACC="bison -y". This should fix PR pkg/31493, where YACC="bison" was wrongly being passed to the configure script.
2005-12-22 19:55:41 +01:00
#
# bison/yacc is typically a build tool whose path is not embedded in
# any scripts or config files. In this case, pass the full command
# line (path and arguments) of the tool to the GNU configure script
# so that bison will be correctly invoked in yacc-compatilility mode.
#
TOOLS_VALUE_GNU.yacc= ${TOOLS_CMDLINE.yacc}
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
. endif
.endif
Consolidate blocks for tools that were supplied by the same package into a loop so that it's easier to maintain and add new tools.
2005-11-08 18:38:52 +01:00
######################################################################
# These tools are all supplied by the sysutuils/coreutils package if
# there is no native tool available.
#
_TOOLS.coreutils= basename cat chgrp chmod chown cp cut date \
dirname echo env expr false head hostname id \
install ln ls mkdir mv nice printf pwd rm rmdir \
sleep sort tail tee test touch tr true tsort wc
.for _t_ in ${_TOOLS.coreutils}
. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
. if !empty(PKGPATH:Msysutils/coreutils)
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
Fix a copy-and-paste bug that probably caused some tools to not be created on platforms lacking "coreutils", "grep", or "diffutils".
2005-11-28 06:39:20 +01:00
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
Consolidate blocks for tools that were supplied by the same package into a loop so that it's easier to maintain and add new tools.
2005-11-08 18:38:52 +01:00
TOOLS_DEPENDS.${_t_}?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= ${_t_}
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=coreutils
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${GNU_PROGRAM_PREFIX}${_t_}
. endif
. endif
.endfor
# The ``['' tool is special because it matches a token that's interpreted
# by bmake.
#
.if !defined(TOOLS_IGNORE.[) && !empty(_USE_TOOLS:M\[)
. if !empty(PKGPATH:Msysutils/coreutils)
MAKEFLAGS+= TOOLS_IGNORE.[=
. elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
TOOLS_DEPENDS.[?= coreutils>=5.2.1:../../sysutils/coreutils
TOOLS_CREATE+= [
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.[=coreutils
TOOLS_PATH.[= ${TOOLS_PREFIX.[}/bin/${GNU_PROGRAM_PREFIX}[
. endif
.endif
######################################################################
# These tools are all supplied by the textproc/grep package if there is
# no native tool available.
#
_TOOLS.grep= egrep fgrep grep
.for _t_ in ${_TOOLS.grep}
. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
. if !empty(PKGPATH:Mtextproc/grep)
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
Fix a copy-and-paste bug that probably caused some tools to not be created on platforms lacking "coreutils", "grep", or "diffutils".
2005-11-28 06:39:20 +01:00
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
Consolidate blocks for tools that were supplied by the same package into a loop so that it's easier to maintain and add new tools.
2005-11-08 18:38:52 +01:00
TOOLS_DEPENDS.${_t_}?= grep>=2.5.1:../../textproc/grep
TOOLS_CREATE+= ${_t_}
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=grep
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${GNU_PROGRAM_PREFIX}${_t_}
. endif
. endif
.endfor
######################################################################
# These tools are all supplied by the devel/diffutils package if there is
# no native tool available.
#
_TOOLS.diffutils= cmp diff
.for _t_ in ${_TOOLS.diffutils}
. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
. if !empty(PKGPATH:Mdevel/diffutils)
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
Fix a copy-and-paste bug that probably caused some tools to not be created on platforms lacking "coreutils", "grep", or "diffutils".
2005-11-28 06:39:20 +01:00
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
Consolidate blocks for tools that were supplied by the same package into a loop so that it's easier to maintain and add new tools.
2005-11-08 18:38:52 +01:00
TOOLS_DEPENDS.${_t_}?= diffutils>=2.8.1:../../devel/diffutils
TOOLS_CREATE+= ${_t_}
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=diffutils
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${GNU_PROGRAM_PREFIX}${_t_}
. endif
. endif
.endfor
######################################################################
Teach the tools framework about gs, pdftops and pstopdf, which can be supplied by one of several Ghostscript packages. The minimum required version of Ghostscript can be specified in GHOSTSCRIPT_REQD, which defaults to "6.01".
2005-11-28 07:06:16 +01:00
# These tools are all supplied by a Ghostscript package if there is no
# native tool available.
#
_TOOLS.ghostscript= gs pdf2ps ps2pdf
# This is the minimum version of Ghostscript required by the current
# package.
#
GHOSTSCRIPT_REQD?= 6.01
# Set TOOLS_DEPENDS.ghostscript to an appropriate dependency based on
# various package options.
#
.if !defined(TOOLS_DEPENDS.ghostscript)
_TOOLS_DEP.ghostscript:= ghostscript
_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-afpl
_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-esp
_TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-gnu
#
# Determine the default Ghostscript package to build based on the
# PKG_OPTIONS for the current package.
#
Remove NO_X11 handling completely -- it is not referenced anywhere else in pkgsrc.
2005-12-01 19:38:45 +01:00
. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups))
The make(1) of NetBSD 1.6.2 gets confused by complicated conditionals involving undefined variables. Added a work-around by splitting up the conditionals. Fixes PR 32206.
2005-12-01 10:24:09 +01:00
_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-esp
Remove NO_X11 handling completely -- it is not referenced anywhere else in pkgsrc.
2005-12-01 19:38:45 +01:00
. else
Teach the tools framework about gs, pdftops and pstopdf, which can be supplied by one of several Ghostscript packages. The minimum required version of Ghostscript can be specified in GHOSTSCRIPT_REQD, which defaults to "6.01".
2005-11-28 07:06:16 +01:00
_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-gnu
. endif
TOOLS_DEPENDS.ghostscript= {${_TOOLS_DEP.ghostscript}}>=${GHOSTSCRIPT_REQD}:${_TOOLS_PKGSRCDIR.ghostscript}
MAKEVARS+= ${TOOLS_DEPENDS.ghostscript}
.endif
.for _t_ in ${_TOOLS.ghostscript}
. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
. if !empty(PKGPATH:Mprint/ghostscript) || \
!empty(PKGPATH:Mprint/ghostscript-afpl) || \
!empty(PKGPATH:Mprint/ghostscript-esp) || \
Desupport the various ghostscript*x11* packages (replaced by x11 option).
2005-12-09 21:32:22 +01:00
!empty(PKGPATH:Mprint/ghostscript-gnu)
Teach the tools framework about gs, pdftops and pstopdf, which can be supplied by one of several Ghostscript packages. The minimum required version of Ghostscript can be specified in GHOSTSCRIPT_REQD, which defaults to "6.01".
2005-11-28 07:06:16 +01:00
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
TOOLS_DEPENDS.${_t_}?= ${TOOLS_DEPENDS.ghostscript}
TOOLS_CREATE+= ${_t_}
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=${TOOLS_DEPENDS.ghostscript:C/:.*//}
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
. endif
. endif
.endfor
######################################################################
Consolidate blocks for tools that were supplied by the same package into a loop so that it's easier to maintain and add new tools.
2005-11-08 18:38:52 +01:00
# These tools are all supplied by an X11 clients package if there is no
# native tool available.
#
Add makepsres to _TOOLS.x11-clients. (makepsres used for lyx install for example.)
2005-12-28 05:24:37 +01:00
_TOOLS.x11-clients= bdftopcf iceauth mkfontdir mkfontscale \
makepsres xmessage
Consolidate blocks for tools that were supplied by the same package into a loop so that it's easier to maintain and add new tools.
2005-11-08 18:38:52 +01:00
.for _t_ in ${_TOOLS.x11-clients}
. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
. if !empty(PKGPATH:Mx11/XFree86-clients) || \
!empty(PKGPATH:Mx11/xorg-clients)
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
TOOLS_CREATE+= ${_t_}
. if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
TOOLS_DEPENDS.${_t_}?= XFree86-clients>=4.4.0:../../x11/XFree86-clients
For the x11-clients section, use "XFree86-clients" instead of "imake" for the TOOLS_PREFIX (for the XFree86-clients provided tool). (Asked about on tech-pkg and jlam said to commit.)
2005-12-28 17:46:38 +01:00
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=XFree86-clients
Consolidate blocks for tools that were supplied by the same package into a loop so that it's easier to maintain and add new tools.
2005-11-08 18:38:52 +01:00
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
. elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
TOOLS_DEPENDS.${_t_}?= xorg-clients>=6.8:../../x11/xorg-clients
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=xorg-clients
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
. else # !empty(X11_TYPE:Mnative)
TOOLS_PATH.${_t_}= ${X11BASE}/bin/${_t_}
. endif
. endif
. endif
.endfor
######################################################################
Add mkdirhier to the tools provided by an imake package. Move the code down to the X11 clients handling as suggested by jlam@.
2005-12-22 15:49:10 +01:00
# These tools are all supplied by an X11 imake package if there is no
# native tool available.
#
Consolidate xmkmf with the other "imake" tools.
2005-12-28 23:21:19 +01:00
_TOOLS.x11-imake= imake mkdirhier xmkmf
Add mkdirhier to the tools provided by an imake package. Move the code down to the X11 clients handling as suggested by jlam@.
2005-12-22 15:49:10 +01:00
.for _t_ in ${_TOOLS.x11-imake}
. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
. if !empty(PKGPATH:Mx11/XFree86-imake) || !empty(PKGPATH:Mx11/xorg-imake)
Whitespace changes to align with other sections.
2005-12-28 23:26:50 +01:00
MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
Add mkdirhier to the tools provided by an imake package. Move the code down to the X11 clients handling as suggested by jlam@.
2005-12-22 15:49:10 +01:00
. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
Whitespace changes to align with other sections.
2005-12-28 23:26:50 +01:00
TOOLS_CREATE+= ${_t}
Add mkdirhier to the tools provided by an imake package. Move the code down to the X11 clients handling as suggested by jlam@.
2005-12-22 15:49:10 +01:00
. if defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
Whitespace changes to align with other sections.
2005-12-28 23:26:50 +01:00
TOOLS_DEPENDS.${_t_}?= XFree86-imake>=4.4.0:../../x11/XFree86-imake
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=imake
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
Add mkdirhier to the tools provided by an imake package. Move the code down to the X11 clients handling as suggested by jlam@.
2005-12-22 15:49:10 +01:00
. elif defined(X11_TYPE) && !empty(X11_TYPE:Mxorg)
Whitespace changes to align with other sections.
2005-12-28 23:26:50 +01:00
TOOLS_DEPENDS.${_t_}?= xorg-imake>=6.8:../../x11/xorg-imake
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=xorg-imake
TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/${X11ROOT_PREFIX}/bin/${_t_}
. else # !empty(X11_TYPE:Mnative)
TOOLS_PATH.${_t_}= ${X11BASE}/bin/${_t_}
Add mkdirhier to the tools provided by an imake package. Move the code down to the X11 clients handling as suggested by jlam@.
2005-12-22 15:49:10 +01:00
. endif
. endif
. endif
.endfor
Consolidate xmkmf with the other "imake" tools.
2005-12-28 23:21:19 +01:00
#
# If we're using xpkgwedge, then we need to invoke the special xmkmf
# script that will find imake config files in both ${PREFIX} and in
# ${X11BASE}.
#
.if !defined(TOOLS_IGNORE.xmkmf) && !empty(_USE_TOOLS:Mxmkmf)
. if !empty(USE_XPKGWEDGE:M[yY][eE][sS])
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xpkgwedge=xpkgwedge
TOOLS_PATH.xmkmf= ${TOOLS_PREFIX.xpkgwedge}/bin/pkgxmkmf
. endif
.endif
Add mkdirhier to the tools provided by an imake package. Move the code down to the X11 clients handling as suggested by jlam@.
2005-12-22 15:49:10 +01:00
######################################################################
Compute the installation prefix for every tool specified so that the "TOOL" variables defined by replace.mk, e.g. AWK, GREP, SED, TRUE, etc., can be used immediately after bsd.tools.mk is included.
2005-05-14 07:57:43 +02:00
# Compute the locations of the pkgsrc-supplied tools.
FIND_PREFIX:= ${TOOLS_FIND_PREFIX}
.include "../../mk/find-prefix.mk"
Make a distinction between the tools that pkgsrc needs and the tools that a package needs. Tools that pkgsrc needs are listed in PKGSRC_USE_TOOLS, and tools that a package needs on top of that are listed in USE_TOOLS. Define "TOOL" variables, e.g. SED, AWK, MKDIR, etc. for each of the tools that pkgsrc needs, and "TOOLS_TOOL" variables, e.g. TOOLS_SED, TOOLS_AWK, TOOLS_MKDIR, etc. for each of the tools that a package needs. These variables contain the full command line to the real command and arguments needed to invoke the tool.
2005-05-10 21:06:58 +02:00
######################################################################
We only need to loop over the tools that we say we're going to use.
2005-04-28 17:51:10 +02:00
.for _t_ in ${_USE_TOOLS}
We only need to recognize TOOLS_IGNORE.* in the case where the tool is pkgsrc-supplied. In other cases, e.g. using the system tool, falling back toS the system tool, etc., we should still create wrappers and set "TOOL" variables.
2005-07-25 23:51:19 +02:00
. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) && \
!defined(TOOLS_IGNORE.${_t_})
Export a new variable TOOLS_CMDLINE_<TOOL> that holds the full command line (path and arguments) needed to run the real tool. Modify TOOLS_<TOOL> to hold only the path to the real tool. Modify falcons-eye/Makefile and qt3-libs/Makefile.common to use TOOLS_CMDLINE_YACC instead of TOOLS_YACC to that they'll use "bison -y".
2005-07-18 04:33:27 +02:00
#####
##### Add the dependencies for each pkgsrc-supplied tool.
#####
. if defined(_TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
. for _dep_ in ${TOOLS_DEPENDS.${_t_}}
. if empty(${_TOOLS_DEPMETHOD.${_t_}}:C/\:.*$//:M${_dep_:C/\:.*$//})
Drop support for TOOLS_DEPMETHOD.<tool>. The new way to specify a run-time dependency (DEPENDS) on a tool is to append a ":run" modifier to the tool name, e.g., USE_TOOLS+= perl:run Tools without modifiers or with an explicit ":build" modifier will cause build dependencies (BUILD_DEPENDS) on those tools to be added. This makes the notation a bit more compact.
2005-07-15 22:14:02 +02:00
${_TOOLS_DEPMETHOD.${_t_}}+= ${_dep_}
Export a new variable TOOLS_CMDLINE_<TOOL> that holds the full command line (path and arguments) needed to run the real tool. Modify TOOLS_<TOOL> to hold only the path to the real tool. Modify falcons-eye/Makefile and qt3-libs/Makefile.common to use TOOLS_CMDLINE_YACC instead of TOOLS_YACC to that they'll use "bison -y".
2005-07-18 04:33:27 +02:00
. endif
. endfor
Properly deal with case where TOOL_DEPENDS.* is a list of values by iterating over each dependency in the list.
2005-05-19 04:27:38 +02:00
. endif
We only need to recognize TOOLS_IGNORE.* in the case where the tool is pkgsrc-supplied. In other cases, e.g. using the system tool, falling back toS the system tool, etc., we should still create wrappers and set "TOOL" variables.
2005-07-25 23:51:19 +02:00
. elif defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
Export a new variable TOOLS_CMDLINE_<TOOL> that holds the full command line (path and arguments) needed to run the real tool. Modify TOOLS_<TOOL> to hold only the path to the real tool. Modify falcons-eye/Makefile and qt3-libs/Makefile.common to use TOOLS_CMDLINE_YACC instead of TOOLS_YACC to that they'll use "bison -y".
2005-07-18 04:33:27 +02:00
#####
##### For each system-supplied tool, break the tool down into a path
##### and arguments so that either a symlink or a wrapper will be
##### properly created.
#####
TOOLS_CREATE+= ${_t_}
TOOLS_PATH.${_t_}?= \
${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}
TOOLS_ARGS.${_t_}?= \
${TOOLS_PLATFORM.${_t_}:C/^/_asdf_/1:N_asdf_*}
. endif
###
### For each tool, TOOLS_CMDLINE.<tool> is the full command (path and
### arguments) that should be run to properly execute the tool.
###
Avoid trailing spaces in TOOLS_<TOOL> values if TOOLS_ARGS.* is empty.
2005-07-18 23:40:55 +02:00
. if defined(TOOLS_PATH.${_t_}) && !empty(TOOLS_PATH.${_t_})
. if defined(TOOLS_ARGS.${_t_}) && !empty(TOOLS_ARGS.${_t_})
Export a new variable TOOLS_CMDLINE_<TOOL> that holds the full command line (path and arguments) needed to run the real tool. Modify TOOLS_<TOOL> to hold only the path to the real tool. Modify falcons-eye/Makefile and qt3-libs/Makefile.common to use TOOLS_CMDLINE_YACC instead of TOOLS_YACC to that they'll use "bison -y".
2005-07-18 04:33:27 +02:00
TOOLS_CMDLINE.${_t_}?= ${TOOLS_PATH.${_t_}} ${TOOLS_ARGS.${_t_}}
Avoid trailing spaces in TOOLS_<TOOL> values if TOOLS_ARGS.* is empty.
2005-07-18 23:40:55 +02:00
. else
TOOLS_CMDLINE.${_t_}?= ${TOOLS_PATH.${_t_}}
. endif
Export a new variable TOOLS_CMDLINE_<TOOL> that holds the full command line (path and arguments) needed to run the real tool. Modify TOOLS_<TOOL> to hold only the path to the real tool. Modify falcons-eye/Makefile and qt3-libs/Makefile.common to use TOOLS_CMDLINE_YACC instead of TOOLS_YACC to that they'll use "bison -y".
2005-07-18 04:33:27 +02:00
. endif
###
### If a "TOOL" name is associated with the tool, then export two
### variables:
###
### (1) The "TOOLS_TOOL" name for each tool points to the path
### to the real command, e.g. TOOLS_TBL, TOOLS_YACC, etc.
###
### (2) The "TOOLS_CMDLINE_TOOL" name for each tool to point to the
### full command, e.g. TOOLS_CMDLINE_TBL, TOOLS_CMDLINE_YACC,
### etc.
###
. if defined(_TOOLS_VARNAME.${_t_})
. if defined(TOOLS_PATH.${_t_})
TOOLS_${_TOOLS_VARNAME.${_t_}}= ${TOOLS_PATH.${_t_}}
. endif
. if defined(TOOLS_CMDLINE.${_t_})
TOOLS_CMDLINE_${_TOOLS_VARNAME.${_t_}}= ${TOOLS_CMDLINE.${_t_}}
. for _v_ in ${_TOOLS_VARNAME.${_t_}}
${_v_}?= ${TOOLS_CMDLINE_${_TOOLS_VARNAME.${_t_}}}
. endfor
. endif
Define TOOLS_DEPENDS.* to be the dependency that will be added, and filter out dependencies that have already been added.
2005-04-28 05:01:11 +02:00
. endif
.endfor
Initial commit of the new tools framework. This is currently designed to be a drop-in replacement for mk/tools.mk, but isn't yet enabled pending further testing. To use, edit bsd.pkg.mk to include bsd.tools.mk instead of tools.mk. The major changes from the old tools framework are: (1) The new interface to using the tools framework is through setting USE_TOOLS in the package Makefile, e.g., USE_TOOLS+= autoconf gmake yacc (2) Bison/yacc handling is improved. Instead of adding checks for /usr/bin/yacc to the package Makefile and explicitly setting YACC, e.g., security/mit-krb5/Makefile, simply add "yacc" to USE_TOOLS. If bison is explicitly required, then add "bison" to USE_TOOLS instead. (3) GNU auto* tools are handled differently. "autoconf", "aclocal", "automake", etc. will be tools in ${TOOLS_DIR} that point to the correct versions of the auto* tools. Instead of patching Makefiles or scripts to use ${AUTOCONF}, ${ACLOCAL}, etc., the correct versions of the tools will be called if they are invoked simply by their bare names. This is selected by adding either "autoconf" or "autoconf213", or "automake" or "automake14" to USE_TOOLS. The new tools framework will deprecate the following variables: ACLOCAL AUTORECONF AUTOCONF BUILD_USES_GETTEXT_M4 AUTOHEADER USE_GNU_TOOLS AUTOMAKE USE_TBL The new tools framework will deprecate the following *.mk files: mk/autoconf.mk mk/automake.mk mk/tools.mk Additional documentation on how to use bsd.tools.mk to create new tools under ${TOOLS_DIR} may be found in the header comments in bsd.tools.mk.
2005-04-15 02:00:21 +02:00
######################################################################
There is still one small but important distinction between some of the tools listed in USE_TOOLS -- some of them are required by the pkgsrc infrastructure in variable assignment statements that look like: VARIABLE!= ${AWK} ... These tools are actually *required* by pkgsrc to be installed on the system before it can even work (bootstrap situation). For these tools, only override the "TOOL" name representing the tool if we're really using the pkgsrc version of the tool. We accomplish this by adding a new :pkgsrc modifier that is appended to these tools listed in USE_TOOLS. We also list these tools in bsd.prefs.mk so that all packages pick them up fairly early on.
2005-07-17 00:33:18 +02:00
# For each tool that pkgsrc requires, make sure that the "TOOL" name
# points to the real command, e.g., AWK, SED, etc., provided that
# "TOOL" has been associated with <tool>.
Define the "TOOL" names for the tools to be the same as the "TOOLS_TOOL" names if the former are undefined. This allows the "TOOL" names, e.g. GMAKE, YACC, etc., to be used by package Makefiles for simplicity.
2005-05-11 07:05:03 +02:00
#
There is still one small but important distinction between some of the tools listed in USE_TOOLS -- some of them are required by the pkgsrc infrastructure in variable assignment statements that look like: VARIABLE!= ${AWK} ... These tools are actually *required* by pkgsrc to be installed on the system before it can even work (bootstrap situation). For these tools, only override the "TOOL" name representing the tool if we're really using the pkgsrc version of the tool. We accomplish this by adding a new :pkgsrc modifier that is appended to these tools listed in USE_TOOLS. We also list these tools in bsd.prefs.mk so that all packages pick them up fairly early on.
2005-07-17 00:33:18 +02:00
.for _t_ in ${USE_TOOLS:M*\:pkgsrc:C/:.*//:O:u}
Define the "TOOL" names for the tools to be the same as the "TOOLS_TOOL" names if the former are undefined. This allows the "TOOL" names, e.g. GMAKE, YACC, etc., to be used by package Makefiles for simplicity.
2005-05-11 07:05:03 +02:00
_TOOLS_USE_PKGSRC.${_t_}?= no
. if defined(_TOOLS_VARNAME.${_t_})
. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[nN][oO])
. if defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
Don't condtionally set the "TOOL" variables... set them explicitly. Also fix variable name in the case where we're using the pkgsrc tool, since we were referencing the wrong variable.
2005-05-13 23:57:13 +02:00
${_TOOLS_VARNAME.${_t_}}= ${TOOLS_PLATFORM.${_t_}}
Define the "TOOL" names for the tools to be the same as the "TOOLS_TOOL" names if the former are undefined. This allows the "TOOL" names, e.g. GMAKE, YACC, etc., to be used by package Makefiles for simplicity.
2005-05-11 07:05:03 +02:00
. endif
. else
Don't condtionally set the "TOOL" variables... set them explicitly. Also fix variable name in the case where we're using the pkgsrc tool, since we were referencing the wrong variable.
2005-05-13 23:57:13 +02:00
${_TOOLS_VARNAME.${_t_}}= ${TOOLS_${_TOOLS_VARNAME.${_t_}}}
Define the "TOOL" names for the tools to be the same as the "TOOLS_TOOL" names if the former are undefined. This allows the "TOOL" names, e.g. GMAKE, YACC, etc., to be used by package Makefiles for simplicity.
2005-05-11 07:05:03 +02:00
. endif
. endif
.endfor
######################################################################
There is a new variable TOOLS_VALUE_GNU.<tool> for each tool that is the value passed via the shell environment to the GNU configure script for each of the "GNU" variables names for the tool. It defaults to the full path to the real tool so that these may be safely embedded in scripts and config files. One exception is the value for YACC when we use bison. In that case, pass YACC="bison -y" to the configure script so that we will invoke bison in yacc-compatibility mode.
2005-07-19 06:18:51 +02:00
# For packages that use GNU configure scripts, pass the appropriate
# environment variables to ensure the proper command is invoked for
# each tool. We do this since these paths may be hardcoded into
# package scripts, and if they're not pre-specified, then they'll be
# searched for in the PATH, which would find the ones in ${TOOLS_DIR}.
#
# The value passed via the shell environment is stored in
# TOOLS_VALUE_GNU.<tool>, which defaults to just the path to the
# tool.
For packages that use GNU configure scripts, pass the real command paths for the tools that the package uses through the shell environment. We do this since these paths may be hardcoded into package scripts, and if they're not pre-specified, then they'll be searched for in the PATH, which would find the ones in ${TOOLS_DIR}. The variable names that GNU configure scripts expect are named in _TOOLS_VARNAME_GNU.* for the various tools.
2005-05-22 01:09:36 +02:00
#
There is a new variable TOOLS_VALUE_GNU.<tool> for each tool that is the value passed via the shell environment to the GNU configure script for each of the "GNU" variables names for the tool. It defaults to the full path to the real tool so that these may be safely embedded in scripts and config files. One exception is the value for YACC when we use bison. In that case, pass YACC="bison -y" to the configure script so that we will invoke bison in yacc-compatibility mode.
2005-07-19 06:18:51 +02:00
.for _t_ in ${_USE_TOOLS}
. if defined(GNU_CONFIGURE)
Allow a tool to be passed to GNU configure scripts under more than one name.
2005-05-22 03:56:27 +02:00
. if defined(TOOLS_${_TOOLS_VARNAME.${_t_}})
There is a new variable TOOLS_VALUE_GNU.<tool> for each tool that is the value passed via the shell environment to the GNU configure script for each of the "GNU" variables names for the tool. It defaults to the full path to the real tool so that these may be safely embedded in scripts and config files. One exception is the value for YACC when we use bison. In that case, pass YACC="bison -y" to the configure script so that we will invoke bison in yacc-compatibility mode.
2005-07-19 06:18:51 +02:00
TOOLS_VALUE_GNU.${_t_}?= ${TOOLS_PATH.${_t_}}
. endif
. if defined(TOOLS_VALUE_GNU.${_t_})
Allow a tool to be passed to GNU configure scripts under more than one name.
2005-05-22 03:56:27 +02:00
. for _v_ in ${_TOOLS_VARNAME_GNU.${_t_}}
There is a new variable TOOLS_VALUE_GNU.<tool> for each tool that is the value passed via the shell environment to the GNU configure script for each of the "GNU" variables names for the tool. It defaults to the full path to the real tool so that these may be safely embedded in scripts and config files. One exception is the value for YACC when we use bison. In that case, pass YACC="bison -y" to the configure script so that we will invoke bison in yacc-compatibility mode.
2005-07-19 06:18:51 +02:00
CONFIGURE_ENV+= ${_v_}=${TOOLS_VALUE_GNU.${_t_}:Q}
Allow a tool to be passed to GNU configure scripts under more than one name.
2005-05-22 03:56:27 +02:00
. endfor
For packages that use GNU configure scripts, pass the real command paths for the tools that the package uses through the shell environment. We do this since these paths may be hardcoded into package scripts, and if they're not pre-specified, then they'll be searched for in the PATH, which would find the ones in ${TOOLS_DIR}. The variable names that GNU configure scripts expect are named in _TOOLS_VARNAME_GNU.* for the various tools.
2005-05-22 01:09:36 +02:00
. endif
There is a new variable TOOLS_VALUE_GNU.<tool> for each tool that is the value passed via the shell environment to the GNU configure script for each of the "GNU" variables names for the tool. It defaults to the full path to the real tool so that these may be safely embedded in scripts and config files. One exception is the value for YACC when we use bison. In that case, pass YACC="bison -y" to the configure script so that we will invoke bison in yacc-compatibility mode.
2005-07-19 06:18:51 +02:00
. endif
.endfor
Reference in a new issue Copy permalink