Sat Mar 4 23:29:24 2023 UTC ()
mk/tools: replace '!empty' conditions with '==' or '!='

Main work done by running 'pkglint -F --only "simpler" --only
"simplified" *.mk', with manual improvements afterwards:

* Removed several redundant ':U' modifiers, as pkglint doesn't know the
  exact order in which the infrastructure files include each other.

* Removed redundant 'defined(X11_TYPE)' and the corresponding comment.


(rillig)
diff -r1.22 -r1.23 pkgsrc/mk/tools/autoconf.mk
diff -r1.22 -r1.23 pkgsrc/mk/tools/gettext.mk
diff -r1.32 -r1.33 pkgsrc/mk/tools/automake.mk
diff -r1.4 -r1.5 pkgsrc/mk/tools/digest.mk
diff -r1.10 -r1.11 pkgsrc/mk/tools/intltool.mk
diff -r1.296 -r1.297 pkgsrc/mk/tools/replace.mk
diff -r1.5 -r1.6 pkgsrc/mk/tools/tools.FreeMiNT.mk
diff -r1.14 -r1.15 pkgsrc/mk/tools/tools.Minix.mk
diff -r1.72 -r1.73 pkgsrc/mk/tools/tools.NetBSD.mk
diff -r1.2 -r1.3 pkgsrc/mk/tools/tools.QNX.mk
cvs diff -r1.22 -r1.23 pkgsrc/mk/tools/autoconf.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/autoconf.mk 2022/11/23 13:06:33 1.22
+++ pkgsrc/mk/tools/autoconf.mk 2023/03/04 23:29:24 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: autoconf.mk,v 1.22 2022/11/23 13:06:33 jperkin Exp $ 1# $NetBSD: autoconf.mk,v 1.23 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -80,27 +80,27 @@ _TOOLS_AC_NAMES+= autoheader autoheader- @@ -80,27 +80,27 @@ _TOOLS_AC_NAMES+= autoheader autoheader-
80_TOOLS_AC_NAMES+= autom4te 80_TOOLS_AC_NAMES+= autom4te
81_TOOLS_AC_NAMES+= autoreconf autoreconf-2.13 81_TOOLS_AC_NAMES+= autoreconf autoreconf-2.13
82_TOOLS_AC_NAMES+= autoscan autoscan-2.13 82_TOOLS_AC_NAMES+= autoscan autoscan-2.13
83_TOOLS_AC_NAMES+= autoupdate autoupdate-2.13 83_TOOLS_AC_NAMES+= autoupdate autoupdate-2.13
84_TOOLS_AC_NAMES+= ifnames ifnames-2.13 84_TOOLS_AC_NAMES+= ifnames ifnames-2.13
85 85
86.if defined(GNU_CONFIGURE) 86.if defined(GNU_CONFIGURE)
87. for _t_ in ${_TOOLS_AC_NAMES} 87. for _t_ in ${_TOOLS_AC_NAMES}
88_TOOLS_AC_TYPE.${_t_}?= TOOLS_GNU_MISSING 88_TOOLS_AC_TYPE.${_t_}?= TOOLS_GNU_MISSING
89. endfor 89. endfor
90.endif 90.endif
91 91
92.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:C/:.*//:Mautoconf) 92.if !defined(TOOLS_IGNORE.autoconf) && !empty(USE_TOOLS:C/:.*//:Mautoconf)
93. if !empty(PKGPATH:Mdevel/autoconf) 93. if ${PKGPATH} == devel/autoconf
94MAKEFLAGS+= TOOLS_IGNORE.autoconf= 94MAKEFLAGS+= TOOLS_IGNORE.autoconf=
95. else 95. else
96AUTOCONF_REQD?= 2.50 96AUTOCONF_REQD?= 2.50
97 97
98. if !empty(USE_TOOLS:Mautoconf\:run) 98. if !empty(USE_TOOLS:Mautoconf\:run)
99_TOOLS_DEPMETHOD.autoconf= DEPENDS 99_TOOLS_DEPMETHOD.autoconf= DEPENDS
100. elif !empty(USE_TOOLS:Mautoconf\:test) 100. elif !empty(USE_TOOLS:Mautoconf\:test)
101_TOOLS_DEPMETHOD.autoconf= TEST_DEPENDS 101_TOOLS_DEPMETHOD.autoconf= TEST_DEPENDS
102. else 102. else
103_TOOLS_DEPMETHOD.autoconf= TOOL_DEPENDS 103_TOOLS_DEPMETHOD.autoconf= TOOL_DEPENDS
104. endif 104. endif
105TOOLS_DEPENDS.autoconf?= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf 105TOOLS_DEPENDS.autoconf?= autoconf>=${AUTOCONF_REQD}:../../devel/autoconf
106. if empty(${_TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf}) 106. if empty(${_TOOLS_DEPMETHOD.autoconf}:M${TOOLS_DEPENDS.autoconf})
@@ -121,27 +121,27 @@ TOOLS_PATH.autoreconf= ${LOCALBASE}/bin @@ -121,27 +121,27 @@ TOOLS_PATH.autoreconf= ${LOCALBASE}/bin
121 121
122_TOOLS_AC_TYPE.autoscan= TOOLS_CREATE 122_TOOLS_AC_TYPE.autoscan= TOOLS_CREATE
123TOOLS_PATH.autoscan= ${LOCALBASE}/bin/autoscan 123TOOLS_PATH.autoscan= ${LOCALBASE}/bin/autoscan
124 124
125_TOOLS_AC_TYPE.autoupdate= TOOLS_CREATE 125_TOOLS_AC_TYPE.autoupdate= TOOLS_CREATE
126TOOLS_PATH.autoupdate= ${LOCALBASE}/bin/autoupdate 126TOOLS_PATH.autoupdate= ${LOCALBASE}/bin/autoupdate
127 127
128_TOOLS_AC_TYPE.ifnames= TOOLS_CREATE 128_TOOLS_AC_TYPE.ifnames= TOOLS_CREATE
129TOOLS_PATH.ifnames= ${LOCALBASE}/bin/ifnames 129TOOLS_PATH.ifnames= ${LOCALBASE}/bin/ifnames
130. endif 130. endif
131.endif 131.endif
132 132
133.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:C/:.*//:Mautoconf213) 133.if !defined(TOOLS_IGNORE.autoconf213) && !empty(USE_TOOLS:C/:.*//:Mautoconf213)
134. if !empty(PKGPATH:Mdevel/autoconf213) 134. if ${PKGPATH} == devel/autoconf213
135MAKEFLAGS+= TOOLS_IGNORE.autoconf213= 135MAKEFLAGS+= TOOLS_IGNORE.autoconf213=
136. else 136. else
137AUTOCONF_REQD?= 2.13 137AUTOCONF_REQD?= 2.13
138 138
139. if !empty(USE_TOOLS:Mautoconf213\:run) 139. if !empty(USE_TOOLS:Mautoconf213\:run)
140_TOOLS_DEPMETHOD.autoconf213= DEPENDS 140_TOOLS_DEPMETHOD.autoconf213= DEPENDS
141. elif !empty(USE_TOOLS:Mautoconf213\:test) 141. elif !empty(USE_TOOLS:Mautoconf213\:test)
142_TOOLS_DEPMETHOD.autoconf= TEST_DEPENDS 142_TOOLS_DEPMETHOD.autoconf= TEST_DEPENDS
143. else 143. else
144_TOOLS_DEPMETHOD.autoconf213= TOOL_DEPENDS 144_TOOLS_DEPMETHOD.autoconf213= TOOL_DEPENDS
145. endif 145. endif
146TOOLS_DEPENDS.autoconf213?= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213 146TOOLS_DEPENDS.autoconf213?= autoconf213>=${AUTOCONF_REQD}:../../devel/autoconf213
147. if empty(${_TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213}) 147. if empty(${_TOOLS_DEPMETHOD.autoconf213}:M${TOOLS_DEPENDS.autoconf213})
@@ -176,27 +176,27 @@ TOOLS_ALIASES.autoupdate-2.13= autoupdat @@ -176,27 +176,27 @@ TOOLS_ALIASES.autoupdate-2.13= autoupdat
176_TOOLS_AC_TYPE.ifnames-2.13= TOOLS_CREATE 176_TOOLS_AC_TYPE.ifnames-2.13= TOOLS_CREATE
177_TOOLS_AC_TYPE.ifnames= # empty 177_TOOLS_AC_TYPE.ifnames= # empty
178TOOLS_PATH.ifnames-2.13= ${LOCALBASE}/bin/ifnames-2.13 178TOOLS_PATH.ifnames-2.13= ${LOCALBASE}/bin/ifnames-2.13
179TOOLS_ALIASES.ifnames-2.13= ifnames 179TOOLS_ALIASES.ifnames-2.13= ifnames
180 180
181. if defined(USE_LIBTOOL) 181. if defined(USE_LIBTOOL)
182pre-configure: tools-libtool-m4-override 182pre-configure: tools-libtool-m4-override
183. endif 183. endif
184. endif 184. endif
185.endif 185.endif
186 186
187# If the package wants to override the GNU auto* tools, then do it. 187# If the package wants to override the GNU auto* tools, then do it.
188AUTOMAKE_OVERRIDE?= yes 188AUTOMAKE_OVERRIDE?= yes
189.if !empty(AUTOMAKE_OVERRIDE:M[yY][eE][sS]) 189.if ${AUTOMAKE_OVERRIDE:M[yY][eE][sS]}
190. for _t_ in ${_TOOLS_AC_NAMES} 190. for _t_ in ${_TOOLS_AC_NAMES}
191. if !empty(_TOOLS_AC_TYPE.${_t_}) 191. if !empty(_TOOLS_AC_TYPE.${_t_})
192${_TOOLS_AC_TYPE.${_t_}}+= ${_t_} 192${_TOOLS_AC_TYPE.${_t_}}+= ${_t_}
193. endif 193. endif
194. endfor 194. endfor
195.endif 195.endif
196 196
197# LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink 197# LIBTOOL_M4_OVERRIDE lists the locations where the libtool.m4 symlink
198# will be created. The libtool.m4 symlink is only created if a GNU 198# will be created. The libtool.m4 symlink is only created if a GNU
199# configure script exists at that location. 199# configure script exists at that location.
200# 200#
201LIBTOOL_M4_OVERRIDE?= libtool.m4 */libtool.m4 */*/libtool.m4 201LIBTOOL_M4_OVERRIDE?= libtool.m4 */libtool.m4 */*/libtool.m4
202 202
cvs diff -r1.22 -r1.23 pkgsrc/mk/tools/gettext.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/gettext.mk 2018/08/22 20:48:37 1.22
+++ pkgsrc/mk/tools/gettext.mk 2023/03/04 23:29:24 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: gettext.mk,v 1.22 2018/08/22 20:48:37 maya Exp $ 1# $NetBSD: gettext.mk,v 1.23 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# Copyright (c) 2006 The NetBSD Foundation, Inc. 3# Copyright (c) 2006 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -36,36 +36,36 @@ _TOOLS.gettext-tools= gettext msgmerge  @@ -36,36 +36,36 @@ _TOOLS.gettext-tools= gettext msgmerge
36_TOOLS_DEP.gettext-tools= gettext-tools>=0.15 36_TOOLS_DEP.gettext-tools= gettext-tools>=0.15
37 37
38.for _t_ in ${_TOOLS.gettext-tools} 38.for _t_ in ${_TOOLS.gettext-tools}
39. if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_}) 39. if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_})
40USE_TOOLS+= msgfmt 40USE_TOOLS+= msgfmt
41. endif 41. endif
42.endfor 42.endfor
43 43
44### 44###
45### Handle "msgfmt". We use either the pkgsrc version or the built-in 45### Handle "msgfmt". We use either the pkgsrc version or the built-in
46### version of msgfmt depending on availability and version. 46### version of msgfmt depending on availability and version.
47### 47###
48.if !defined(TOOLS_IGNORE.msgfmt) && !empty(USE_TOOLS:C/:.*//:Mmsgfmt) 48.if !defined(TOOLS_IGNORE.msgfmt) && !empty(USE_TOOLS:C/:.*//:Mmsgfmt)
49. if !empty(PKGPATH:Mdevel/gettext-tools) 49. if ${PKGPATH} == devel/gettext-tools
50MAKEFLAGS+= TOOLS_IGNORE.msgfmt= 50MAKEFLAGS+= TOOLS_IGNORE.msgfmt=
51. else 51. else
52# If we're not using the builtin gettext implementation, then we should 52# If we're not using the builtin gettext implementation, then we should
53# definitely be using the pkgsrc version of msgfmt (gettext-tools). 53# definitely be using the pkgsrc version of msgfmt (gettext-tools).
54# 54#
55CHECK_BUILTIN.gettext:= yes 55CHECK_BUILTIN.gettext:= yes
56. include "../../devel/gettext-lib/builtin.mk" 56. include "../../devel/gettext-lib/builtin.mk"
57CHECK_BUILTIN.gettext:= no 57CHECK_BUILTIN.gettext:= no
58. if !empty(USE_BUILTIN.gettext:M[nN][oO]) 58. if ${USE_BUILTIN.gettext:U:tl} == no
59_TOOLS_USE_PKGSRC.msgfmt= yes 59_TOOLS_USE_PKGSRC.msgfmt= yes
60. endif 60. endif
61 61
62_TOOLS_USE_PKGSRC.msgfmt?= no 62_TOOLS_USE_PKGSRC.msgfmt?= no
63. if empty(_TOOLS_USE_PKGSRC.msgfmt:M[Yy][Ee][Ss]) && \ 63. if empty(_TOOLS_USE_PKGSRC.msgfmt:M[Yy][Ee][Ss]) && \
64 defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt) 64 defined(TOOLS_PLATFORM.msgfmt) && !empty(TOOLS_PLATFORM.msgfmt)
65# 65#
66# MSGFMT_STRIP_MSGID_PLURAL: Yes for msgfmt < 0.10.36 66# MSGFMT_STRIP_MSGID_PLURAL: Yes for msgfmt < 0.10.36
67# MSGFMT_STRIP_MSGCTXT: Yes for msgfmt < 0.15 67# MSGFMT_STRIP_MSGCTXT: Yes for msgfmt < 0.15
68# 68#
69# Determine if the platform-supplied msgfmt is new enough to support 69# Determine if the platform-supplied msgfmt is new enough to support
70# the msgid_plural statement. We need at least 0.10.36 for GNU msgfmt. 70# the msgid_plural statement. We need at least 0.10.36 for GNU msgfmt.
71# 71#
@@ -123,22 +123,22 @@ TOOLS_SCRIPT.msgfmt= AWK=${TOOLS_AWK:Q}  @@ -123,22 +123,22 @@ TOOLS_SCRIPT.msgfmt= AWK=${TOOLS_AWK:Q}
123. endif 123. endif
124. endif 124. endif
125.endif 125.endif
126 126
127.for _t_ in ${_TOOLS.gettext-tools} 127.for _t_ in ${_TOOLS.gettext-tools}
128. if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_}) 128. if !defined(TOOLS_IGNORE.${_t_}) && !empty(USE_TOOLS:C/:.*//:M${_t_})
129. if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS]) 129. if !empty(_TOOLS_USE_PKGSRC.msgfmt:M[yY][eE][sS])
130_TOOLS_USE_PKGSRC.${_t_}= yes 130_TOOLS_USE_PKGSRC.${_t_}= yes
131. elif defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_}) 131. elif defined(TOOLS_PLATFORM.${_t_}) && !empty(TOOLS_PLATFORM.${_t_})
132_TOOLS_USE_PKGSRC.${_t_}?= no 132_TOOLS_USE_PKGSRC.${_t_}?= no
133. else 133. else
134_TOOLS_USE_PKGSRC.${_t_}?= yes 134_TOOLS_USE_PKGSRC.${_t_}?= yes
135. endif 135. endif
136. if !empty(PKGPATH:Mdevel/gettext-tools) 136. if ${PKGPATH} == devel/gettext-tools
137MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 137MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
138. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 138. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
139TOOLS_DEPENDS.${_t_}?= ${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools 139TOOLS_DEPENDS.${_t_}?= ${_TOOLS_DEP.gettext-tools}:../../devel/gettext-tools
140TOOLS_CREATE+= ${_t_} 140TOOLS_CREATE+= ${_t_}
141TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 141TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
142. endif 142. endif
143. endif 143. endif
144.endfor 144.endfor
cvs diff -r1.32 -r1.33 pkgsrc/mk/tools/automake.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/automake.mk 2022/11/23 13:06:33 1.32
+++ pkgsrc/mk/tools/automake.mk 2023/03/04 23:29:24 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: automake.mk,v 1.32 2022/11/23 13:06:33 jperkin Exp $ 1# $NetBSD: automake.mk,v 1.33 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -99,54 +99,54 @@ _TOOLS_AM_NAMES+= automake automake-1.4  @@ -99,54 +99,54 @@ _TOOLS_AM_NAMES+= automake automake-1.4
99 automake-1.12 \ 99 automake-1.12 \
100 automake-1.13 \ 100 automake-1.13 \
101 automake-1.14 \ 101 automake-1.14 \
102 automake-1.15 \ 102 automake-1.15 \
103 automake-1.16 103 automake-1.16
104 104
105.if defined(GNU_CONFIGURE) 105.if defined(GNU_CONFIGURE)
106. for _t_ in ${_TOOLS_AM_NAMES} 106. for _t_ in ${_TOOLS_AM_NAMES}
107_TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING 107_TOOLS_AM_TYPE.${_t_}?= TOOLS_GNU_MISSING
108. endfor 108. endfor
109.endif 109.endif
110 110
111.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake) 111.if !defined(TOOLS_IGNORE.automake) && !empty(USE_TOOLS:C/:.*//:Mautomake)
112. if !empty(PKGPATH:Mdevel/automake) 112. if ${PKGPATH} == devel/automake
113MAKEFLAGS+= TOOLS_IGNORE.automake= 113MAKEFLAGS+= TOOLS_IGNORE.automake=
114. else 114. else
115AUTOMAKE_REQD?= 1.9 115AUTOMAKE_REQD?= 1.9
116AUTOCONF_REQD?= 2.58 116AUTOCONF_REQD?= 2.58
117 117
118. if !empty(USE_TOOLS:Mautomake\:run) 118. if !empty(USE_TOOLS:Mautomake\:run)
119_TOOLS_DEPMETHOD.automake= DEPENDS 119_TOOLS_DEPMETHOD.automake= DEPENDS
120. elif !empty(USE_TOOLS:Mautomake\:test) 120. elif !empty(USE_TOOLS:Mautomake\:test)
121_TOOLS_DEPMETHOD.automake= TEST_DEPENDS 121_TOOLS_DEPMETHOD.automake= TEST_DEPENDS
122. else 122. else
123_TOOLS_DEPMETHOD.automake= TOOL_DEPENDS 123_TOOLS_DEPMETHOD.automake= TOOL_DEPENDS
124. endif 124. endif
125TOOLS_DEPENDS.automake?= automake>=${AUTOMAKE_REQD}:../../devel/automake 125TOOLS_DEPENDS.automake?= automake>=${AUTOMAKE_REQD}:../../devel/automake
126. if empty(${_TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake}) 126. if empty(${_TOOLS_DEPMETHOD.automake}:M${TOOLS_DEPENDS.automake})
127${_TOOLS_DEPMETHOD.automake}+= ${TOOLS_DEPENDS.automake} 127${_TOOLS_DEPMETHOD.automake}+= ${TOOLS_DEPENDS.automake}
128. endif 128. endif
129 129
130_TOOLS_AM_TYPE.aclocal= TOOLS_CREATE 130_TOOLS_AM_TYPE.aclocal= TOOLS_CREATE
131TOOLS_PATH.aclocal= ${LOCALBASE}/bin/aclocal 131TOOLS_PATH.aclocal= ${LOCALBASE}/bin/aclocal
132 132
133_TOOLS_AM_TYPE.automake= TOOLS_CREATE 133_TOOLS_AM_TYPE.automake= TOOLS_CREATE
134TOOLS_PATH.automake= ${LOCALBASE}/bin/automake 134TOOLS_PATH.automake= ${LOCALBASE}/bin/automake
135. endif 135. endif
136.endif 136.endif
137 137
138.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:C/:.*//:Mautomake14) 138.if !defined(TOOLS_IGNORE.automake14) && !empty(USE_TOOLS:C/:.*//:Mautomake14)
139. if !empty(PKGPATH:Mdevel/automake14) 139. if ${PKGPATH} == devel/automake14
140MAKEFLAGS+= TOOLS_IGNORE.automake14= 140MAKEFLAGS+= TOOLS_IGNORE.automake14=
141. else 141. else
142AUTOMAKE_REQD?= 1.4 142AUTOMAKE_REQD?= 1.4
143AUTOCONF_REQD?= 2.13 143AUTOCONF_REQD?= 2.13
144 144
145. if !empty(USE_TOOLS:Mautomake14\:run) 145. if !empty(USE_TOOLS:Mautomake14\:run)
146_TOOLS_DEPMETHOD.automake14= DEPENDS 146_TOOLS_DEPMETHOD.automake14= DEPENDS
147. elif !empty(USE_TOOLS:Mautomake14\:test) 147. elif !empty(USE_TOOLS:Mautomake14\:test)
148_TOOLS_DEPMETHOD.automake= TEST_DEPENDS 148_TOOLS_DEPMETHOD.automake= TEST_DEPENDS
149. else 149. else
150_TOOLS_DEPMETHOD.automake14= TOOL_DEPENDS 150_TOOLS_DEPMETHOD.automake14= TOOL_DEPENDS
151. endif 151. endif
152TOOLS_DEPENDS.automake14?= automake14>=${AUTOMAKE_REQD}:../../devel/automake14 152TOOLS_DEPENDS.automake14?= automake14>=${AUTOMAKE_REQD}:../../devel/automake14
@@ -173,24 +173,24 @@ _TOOLS_AM_AUTOCONF!= \ @@ -173,24 +173,24 @@ _TOOLS_AM_AUTOCONF!= \
173 dep="autoconf>="${AUTOCONF_REQD:Q}; \ 173 dep="autoconf>="${AUTOCONF_REQD:Q}; \
174 if ${PKG_ADMIN} pmatch "$$dep" autoconf-2.13; then \ 174 if ${PKG_ADMIN} pmatch "$$dep" autoconf-2.13; then \
175 ${ECHO} "autoconf213"; \ 175 ${ECHO} "autoconf213"; \
176 else \ 176 else \
177 ${ECHO} "autoconf"; \ 177 ${ECHO} "autoconf"; \
178 fi 178 fi
179. endif 179. endif
180MAKEVARS+= _TOOLS_AM_AUTOCONF 180MAKEVARS+= _TOOLS_AM_AUTOCONF
181USE_TOOLS+= ${_TOOLS_AM_AUTOCONF} 181USE_TOOLS+= ${_TOOLS_AM_AUTOCONF}
182.endif 182.endif
183 183
184# If the package wants to override the GNU auto* tools, then do it. 184# If the package wants to override the GNU auto* tools, then do it.
185AUTOMAKE_OVERRIDE?= yes 185AUTOMAKE_OVERRIDE?= yes
186.if !empty(AUTOMAKE_OVERRIDE:M[yY][eE][sS]) 186.if ${AUTOMAKE_OVERRIDE:M[yY][eE][sS]}
187. for _t_ in ${_TOOLS_AM_NAMES} 187. for _t_ in ${_TOOLS_AM_NAMES}
188. if !empty(_TOOLS_AM_TYPE.${_t_}) 188. if !empty(_TOOLS_AM_TYPE.${_t_})
189${_TOOLS_AM_TYPE.${_t_}}+= ${_t_} 189${_TOOLS_AM_TYPE.${_t_}}+= ${_t_}
190. endif 190. endif
191. endfor 191. endfor
192.endif 192.endif
193 193
194.if !empty(USE_TOOLS:Mgettext-m4) 194.if !empty(USE_TOOLS:Mgettext-m4)
195TOOL_DEPENDS+= {gettext-m4-[0-9]*,gettext-0.10.35nb1}:../../devel/gettext-m4 195TOOL_DEPENDS+= {gettext-m4-[0-9]*,gettext-0.10.35nb1}:../../devel/gettext-m4
196.endif 196.endif
cvs diff -r1.4 -r1.5 pkgsrc/mk/tools/digest.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/digest.mk 2021/10/26 18:46:49 1.4
+++ pkgsrc/mk/tools/digest.mk 2023/03/04 23:29:24 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: digest.mk,v 1.4 2021/10/26 18:46:49 nia Exp $ 1# $NetBSD: digest.mk,v 1.5 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# Copyright (c) 2006 The NetBSD Foundation, Inc. 3# Copyright (c) 2006 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -33,27 +33,27 @@ @@ -33,27 +33,27 @@
33# by packages that need digest. 33# by packages that need digest.
34# 34#
35# Optional variables that may be defined by the package are: 35# Optional variables that may be defined by the package are:
36# 36#
37# DIGEST_REQD is the minimum version of digest required. 37# DIGEST_REQD is the minimum version of digest required.
38# 38#
39# This file needs to be included before replace.mk as it uses the 39# This file needs to be included before replace.mk as it uses the
40# replace.mk magic to set the TOOLS_DIGEST and DIGEST variables. 40# replace.mk magic to set the TOOLS_DIGEST and DIGEST variables.
41# 41#
42 42
43DIGEST_REQD?= 20211023 43DIGEST_REQD?= 20211023
44 44
45.if !defined(TOOLS_IGNORE.digest) && !empty(USE_TOOLS:C/:.*//:Mdigest) 45.if !defined(TOOLS_IGNORE.digest) && !empty(USE_TOOLS:C/:.*//:Mdigest)
46. if !empty(PKGPATH:Mpkgtools/digest) 46. if ${PKGPATH} == pkgtools/digest
47MAKEFLAGS+= TOOLS_IGNORE.digest= 47MAKEFLAGS+= TOOLS_IGNORE.digest=
48. else 48. else
49. if defined(TOOLS_PLATFORM.digest) && !empty(TOOLS_PLATFORM.digest) 49. if defined(TOOLS_PLATFORM.digest) && !empty(TOOLS_PLATFORM.digest)
50_TOOLS_USE_PKGSRC.digest?= no 50_TOOLS_USE_PKGSRC.digest?= no
51. if !defined(_TOOLS_VERSION.digest) 51. if !defined(_TOOLS_VERSION.digest)
52_TOOLS_VERSION.digest!= \ 52_TOOLS_VERSION.digest!= \
53 ${TOOLS_PLATFORM.digest} -V 2>/dev/null || ${ECHO} 20010301 53 ${TOOLS_PLATFORM.digest} -V 2>/dev/null || ${ECHO} 20010301
54_TOOLS_USE_PKGSRC.digest!= \ 54_TOOLS_USE_PKGSRC.digest!= \
55 if ${PKG_ADMIN} pmatch "digest>="${DIGEST_REQD:Q} \ 55 if ${PKG_ADMIN} pmatch "digest>="${DIGEST_REQD:Q} \
56 digest-${_TOOLS_VERSION.digest:Q}; then \ 56 digest-${_TOOLS_VERSION.digest:Q}; then \
57 ${ECHO} no; \ 57 ${ECHO} no; \
58 else \ 58 else \
59 ${ECHO} yes; \ 59 ${ECHO} yes; \
cvs diff -r1.10 -r1.11 pkgsrc/mk/tools/intltool.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/intltool.mk 2022/11/23 13:06:33 1.10
+++ pkgsrc/mk/tools/intltool.mk 2023/03/04 23:29:24 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: intltool.mk,v 1.10 2022/11/23 13:06:33 jperkin Exp $ 1# $NetBSD: intltool.mk,v 1.11 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# Copyright (c) 2006 The NetBSD Foundation, Inc. 3# Copyright (c) 2006 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28# POSSIBILITY OF SUCH DAMAGE. 28# POSSIBILITY OF SUCH DAMAGE.
29# 29#
30 30
31# These tools are all supplied by the textproc/intltool package. 31# These tools are all supplied by the textproc/intltool package.
32_TOOLS.intltool= intltoolize \ 32_TOOLS.intltool= intltoolize \
33 intltool-extract intltool-merge \ 33 intltool-extract intltool-merge \
34 intltool-prepare intltool-update 34 intltool-prepare intltool-update
35 35
36.if !defined(TOOLS_IGNORE.intltool) && !empty(USE_TOOLS:C/:.*//:Mintltool) 36.if !defined(TOOLS_IGNORE.intltool) && !empty(USE_TOOLS:C/:.*//:Mintltool)
37. if !empty(PKGPATH:Mtextproc/intltool) 37. if ${PKGPATH} == textproc/intltool
38MAKEFLAGS+= TOOLS_IGNORE.intltool 38MAKEFLAGS+= TOOLS_IGNORE.intltool
39. else 39. else
40USE_TOOLS+= perl 40USE_TOOLS+= perl
41CONFIGURE_ENV+= INTLTOOL_PERL=${TOOLS_PERL5:Q} 41CONFIGURE_ENV+= INTLTOOL_PERL=${TOOLS_PERL5:Q}
42TOOLS_DEPENDS.intltool?= intltool>=0.40.0:../../textproc/intltool 42TOOLS_DEPENDS.intltool?= intltool>=0.40.0:../../textproc/intltool
43_TOOLS_USE_PKGSRC.perl= yes 43_TOOLS_USE_PKGSRC.perl= yes
44. if !empty(USE_TOOLS:Mintltool\:run) 44. if !empty(USE_TOOLS:Mintltool\:run)
45DEPENDS+= ${TOOLS_DEPENDS.intltool} 45DEPENDS+= ${TOOLS_DEPENDS.intltool}
46. else 46. else
47TOOL_DEPENDS+= ${TOOLS_DEPENDS.intltool} 47TOOL_DEPENDS+= ${TOOLS_DEPENDS.intltool}
48. endif 48. endif
49. for _t_ in ${_TOOLS.intltool} 49. for _t_ in ${_TOOLS.intltool}
50TOOLS_DEPENDS.${_t_}= ${TOOLS_DEPENDS.intltool} 50TOOLS_DEPENDS.${_t_}= ${TOOLS_DEPENDS.intltool}
cvs diff -r1.296 -r1.297 pkgsrc/mk/tools/replace.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/replace.mk 2022/11/16 12:12:46 1.296
+++ pkgsrc/mk/tools/replace.mk 2023/03/04 23:29:24 1.297
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: replace.mk,v 1.296 2022/11/16 12:12:46 jperkin Exp $ 1# $NetBSD: replace.mk,v 1.297 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# Copyright (c) 2005 The NetBSD Foundation, Inc. 3# Copyright (c) 2005 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -194,696 +194,696 @@ _TOOLS_USE_PKGSRC.${_t_}?= yes @@ -194,696 +194,696 @@ _TOOLS_USE_PKGSRC.${_t_}?= yes
194###################################################################### 194######################################################################
195 195
196# For each of the blocks below, we create either symlinks or wrappers 196# For each of the blocks below, we create either symlinks or wrappers
197# for each of the tools requested. We need to be careful that we don't 197# for each of the tools requested. We need to be careful that we don't
198# get into dependency loops; do this by setting and checking the value 198# get into dependency loops; do this by setting and checking the value
199# of TOOLS_IGNORE.<tool>. These blocks handle the case where we are 199# of TOOLS_IGNORE.<tool>. These blocks handle the case where we are
200# using the pkgsrc-supplied tool. 200# using the pkgsrc-supplied tool.
201# 201#
202# Always set the "TOOLS_TOOL" name for each tool to point to the real 202# Always set the "TOOLS_TOOL" name for each tool to point to the real
203# command, e.g., TOOLS_TBL, TOOLS_YACC, etc., provided that "TOOL" has 203# command, e.g., TOOLS_TBL, TOOLS_YACC, etc., provided that "TOOL" has
204# been associated with <tool>. 204# been associated with <tool>.
205# 205#
206.if !defined(TOOLS_IGNORE.zstd) && !empty(_USE_TOOLS:Mzstd) 206.if !defined(TOOLS_IGNORE.zstd) && !empty(_USE_TOOLS:Mzstd)
207. if !empty(PKGPATH:Marchivers/zstd) 207. if ${PKGPATH} == archivers/zstd
208MAKEFLAGS+= TOOLS_IGNORE.zstd= 208MAKEFLAGS+= TOOLS_IGNORE.zstd=
209. elif !empty(_TOOLS_USE_PKGSRC.zstd:M[yY][eE][sS]) 209. elif !empty(_TOOLS_USE_PKGSRC.zstd:M[yY][eE][sS])
210TOOLS_DEPENDS.zstd?= zstd>=1.5.0:../../archivers/zstd 210TOOLS_DEPENDS.zstd?= zstd>=1.5.0:../../archivers/zstd
211TOOLS_CREATE+= zstd 211TOOLS_CREATE+= zstd
212TOOLS_PATH.zstd= ${LOCALBASE}/bin/zstd 212TOOLS_PATH.zstd= ${LOCALBASE}/bin/zstd
213. endif 213. endif
214.endif 214.endif
215 215
216.if !defined(TOOLS_IGNORE.7za) && !empty(_USE_TOOLS:M7za) 216.if !defined(TOOLS_IGNORE.7za) && !empty(_USE_TOOLS:M7za)
217. if !empty(PKGPATH:Marchivers/p7zip) 217. if ${PKGPATH} == archivers/p7zip
218MAKEFLAGS+= TOOLS_IGNORE.7za= 218MAKEFLAGS+= TOOLS_IGNORE.7za=
219. elif !empty(_TOOLS_USE_PKGSRC.7za:M[yY][eE][sS]) 219. elif !empty(_TOOLS_USE_PKGSRC.7za:M[yY][eE][sS])
220TOOLS_DEPENDS.7za?= p7zip>=9.04:../../archivers/p7zip 220TOOLS_DEPENDS.7za?= p7zip>=9.04:../../archivers/p7zip
221TOOLS_CREATE+= 7za 221TOOLS_CREATE+= 7za
222TOOLS_PATH.7za= ${LOCALBASE}/bin/7za 222TOOLS_PATH.7za= ${LOCALBASE}/bin/7za
223. endif 223. endif
224.endif 224.endif
225 225
226.if !defined(TOOLS_IGNORE.awk) && !empty(_USE_TOOLS:Mawk) 226.if !defined(TOOLS_IGNORE.awk) && !empty(_USE_TOOLS:Mawk)
227. if !empty(PKGPATH:Mlang/nawk) 227. if ${PKGPATH} == lang/nawk
228MAKEFLAGS+= TOOLS_IGNORE.awk= 228MAKEFLAGS+= TOOLS_IGNORE.awk=
229. elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS]) 229. elif !empty(_TOOLS_USE_PKGSRC.awk:M[yY][eE][sS])
230TOOLS_DEPENDS.awk?= nawk>=20040207:../../lang/nawk 230TOOLS_DEPENDS.awk?= nawk>=20040207:../../lang/nawk
231TOOLS_CREATE+= awk 231TOOLS_CREATE+= awk
232TOOLS_PATH.awk= ${LOCALBASE}/bin/nawk 232TOOLS_PATH.awk= ${LOCALBASE}/bin/nawk
233. endif 233. endif
234.endif 234.endif
235 235
236.if !defined(TOOLS_IGNORE.bash) && !empty(_USE_TOOLS:Mbash) 236.if !defined(TOOLS_IGNORE.bash) && !empty(_USE_TOOLS:Mbash)
237. if !empty(PKGPATH:Mshells/bash) 237. if ${PKGPATH} == shells/bash
238MAKEFLAGS+= TOOLS_IGNORE.bash= 238MAKEFLAGS+= TOOLS_IGNORE.bash=
239. elif !empty(_TOOLS_USE_PKGSRC.bash:M[yY][eE][sS]) 239. elif !empty(_TOOLS_USE_PKGSRC.bash:M[yY][eE][sS])
240TOOLS_DEPENDS.bash?= bash-[0-9]*:../../shells/bash 240TOOLS_DEPENDS.bash?= bash-[0-9]*:../../shells/bash
241TOOLS_CREATE+= bash 241TOOLS_CREATE+= bash
242TOOLS_PATH.bash= ${LOCALBASE}/bin/bash 242TOOLS_PATH.bash= ${LOCALBASE}/bin/bash
243. endif 243. endif
244.endif 244.endif
245 245
246.if !defined(TOOLS_IGNORE.bison) && !empty(_USE_TOOLS:Mbison) 246.if !defined(TOOLS_IGNORE.bison) && !empty(_USE_TOOLS:Mbison)
247. if !empty(PKGPATH:Mdevel/bison) 247. if ${PKGPATH} == devel/bison
248MAKEFLAGS+= TOOLS_IGNORE.bison= 248MAKEFLAGS+= TOOLS_IGNORE.bison=
249. elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS]) 249. elif !empty(_TOOLS_USE_PKGSRC.bison:M[yY][eE][sS])
250TOOLS_DEPENDS.bison?= bison>=1.0:../../devel/bison 250TOOLS_DEPENDS.bison?= bison>=1.0:../../devel/bison
251TOOLS_CREATE+= bison 251TOOLS_CREATE+= bison
252TOOLS_PATH.bison= ${LOCALBASE}/bin/bison 252TOOLS_PATH.bison= ${LOCALBASE}/bin/bison
253. endif 253. endif
254.endif 254.endif
255 255
256.if !defined(TOOLS_IGNORE.bison-yacc) && !empty(_USE_TOOLS:Mbison-yacc) 256.if !defined(TOOLS_IGNORE.bison-yacc) && !empty(_USE_TOOLS:Mbison-yacc)
257. if !empty(PKGPATH:Mdevel/bison) 257. if ${PKGPATH} == devel/bison
258MAKEFLAGS+= TOOLS_IGNORE.bison-yacc= 258MAKEFLAGS+= TOOLS_IGNORE.bison-yacc=
259. elif !empty(_TOOLS_USE_PKGSRC.bison-yacc:M[yY][eE][sS]) 259. elif !empty(_TOOLS_USE_PKGSRC.bison-yacc:M[yY][eE][sS])
260TOOLS_DEPENDS.bison-yacc?= bison>=1.0:../../devel/bison 260TOOLS_DEPENDS.bison-yacc?= bison>=1.0:../../devel/bison
261TOOLS_CREATE+= bison-yacc 261TOOLS_CREATE+= bison-yacc
262TOOLS_PATH.bison-yacc= ${LOCALBASE}/bin/bison 262TOOLS_PATH.bison-yacc= ${LOCALBASE}/bin/bison
263TOOLS_ARGS.bison-yacc= -y 263TOOLS_ARGS.bison-yacc= -y
264. endif 264. endif
265TOOLS_CMD.bison-yacc= ${TOOLS_DIR}/bin/yacc 265TOOLS_CMD.bison-yacc= ${TOOLS_DIR}/bin/yacc
266# 266#
267# bison/yacc is typically a build tool whose path is not embedded in 267# bison/yacc is typically a build tool whose path is not embedded in
268# any scripts or config files. In this case, pass the full command 268# any scripts or config files. In this case, pass the full command
269# line (path and arguments) of the tool to the GNU configure script 269# line (path and arguments) of the tool to the GNU configure script
270# so that bison will be correctly invoked in yacc-compatilility mode. 270# so that bison will be correctly invoked in yacc-compatilility mode.
271# 271#
272TOOLS_VALUE_GNU.bison-yacc= ${TOOLS_CMDLINE.bison-yacc} 272TOOLS_VALUE_GNU.bison-yacc= ${TOOLS_CMDLINE.bison-yacc}
273.endif 273.endif
274 274
275.if !defined(TOOLS_IGNORE.bsdtar) && !empty(_USE_TOOLS:Mbsdtar) 275.if !defined(TOOLS_IGNORE.bsdtar) && !empty(_USE_TOOLS:Mbsdtar)
276. if !empty(PKGPATH:Marchivers/bsdtar) 276. if ${PKGPATH} == archivers/bsdtar
277MAKEFLAGS+= TOOLS_IGNORE.bsdtar= 277MAKEFLAGS+= TOOLS_IGNORE.bsdtar=
278. elif !empty(_TOOLS_USE_PKGSRC.bsdtar:M[yY][eE][sS]) 278. elif !empty(_TOOLS_USE_PKGSRC.bsdtar:M[yY][eE][sS])
279TOOLS_DEPENDS.bsdtar?= bsdtar-[0-9]*:../../archivers/bsdtar 279TOOLS_DEPENDS.bsdtar?= bsdtar-[0-9]*:../../archivers/bsdtar
280TOOLS_CREATE+= bsdtar 280TOOLS_CREATE+= bsdtar
281TOOLS_PATH.bsdtar= ${LOCALBASE}/bin/bsdtar 281TOOLS_PATH.bsdtar= ${LOCALBASE}/bin/bsdtar
282. endif 282. endif
283.endif 283.endif
284 284
285.if !defined(TOOLS_IGNORE.byacc) && !empty(_USE_TOOLS:Mbyacc) 285.if !defined(TOOLS_IGNORE.byacc) && !empty(_USE_TOOLS:Mbyacc)
286. if !empty(PKGPATH:Mdevel/byacc) 286. if ${PKGPATH} == devel/byacc
287MAKEFLAGS+= TOOLS_IGNORE.byacc= 287MAKEFLAGS+= TOOLS_IGNORE.byacc=
288. elif !empty(_TOOLS_USE_PKGSRC.byacc:M[yY][eE][sS]) 288. elif !empty(_TOOLS_USE_PKGSRC.byacc:M[yY][eE][sS])
289TOOLS_DEPENDS.byacc?= byacc>=20040328:../../devel/byacc 289TOOLS_DEPENDS.byacc?= byacc>=20040328:../../devel/byacc
290TOOLS_CREATE+= byacc 290TOOLS_CREATE+= byacc
291TOOLS_PATH.byacc= ${LOCALBASE}/bin/yacc 291TOOLS_PATH.byacc= ${LOCALBASE}/bin/yacc
292TOOLS_CMD.byacc= ${TOOLS_DIR}/bin/yacc 292TOOLS_CMD.byacc= ${TOOLS_DIR}/bin/yacc
293. endif 293. endif
294.endif 294.endif
295 295
296_TOOLS.bzip2= bzip2 bzcat 296_TOOLS.bzip2= bzip2 bzcat
297.for _t_ in ${_TOOLS.bzip2} 297.for _t_ in ${_TOOLS.bzip2}
298. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 298. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
299. if !empty(PKGPATH:Marchivers/bzip2) 299. if ${PKGPATH} == archivers/bzip2
300MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 300MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
301. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 301. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
302TOOLS_DEPENDS.${_t_}?= bzip2>=0.9.0b:../../archivers/bzip2 302TOOLS_DEPENDS.${_t_}?= bzip2>=0.9.0b:../../archivers/bzip2
303TOOLS_CREATE+= ${_t_} 303TOOLS_CREATE+= ${_t_}
304TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 304TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
305. endif 305. endif
306. endif 306. endif
307.endfor 307.endfor
308 308
309.if !defined(TOOLS_IGNORE.chrpath) && !empty(_USE_TOOLS:Mchrpath) 309.if !defined(TOOLS_IGNORE.chrpath) && !empty(_USE_TOOLS:Mchrpath)
310. if !empty(PKGPATH:Mdevel/chrpath) 310. if ${PKGPATH} == devel/chrpath
311MAKEFLAGS+= TOOLS_IGNORE.chrpath= 311MAKEFLAGS+= TOOLS_IGNORE.chrpath=
312. elif !empty(_TOOLS_USE_PKGSRC.chrpath:M[yY][eE][sS]) 312. elif !empty(_TOOLS_USE_PKGSRC.chrpath:M[yY][eE][sS])
313TOOLS_DEPENDS.chrpath?= chrpath>=0.13:../../devel/chrpath 313TOOLS_DEPENDS.chrpath?= chrpath>=0.13:../../devel/chrpath
314TOOLS_CREATE+= chrpath 314TOOLS_CREATE+= chrpath
315TOOLS_PATH.chrpath= ${LOCALBASE}/bin/chrpath 315TOOLS_PATH.chrpath= ${LOCALBASE}/bin/chrpath
316. endif 316. endif
317.endif 317.endif
318 318
319_TOOLS.cmake= cmake cpack 319_TOOLS.cmake= cmake cpack
320.for _t_ in ${_TOOLS.cmake} 320.for _t_ in ${_TOOLS.cmake}
321. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 321. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
322. if !empty(PKGPATH:Mdevel/cmake) 322. if ${PKGPATH} == devel/cmake
323MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 323MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
324. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 324. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
325TOOLS_DEPENDS.${_t_}?= cmake>=2.8.1nb1:../../devel/cmake 325TOOLS_DEPENDS.${_t_}?= cmake>=2.8.1nb1:../../devel/cmake
326TOOLS_CREATE+= ${_t_} 326TOOLS_CREATE+= ${_t_}
327TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 327TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
328. endif 328. endif
329. endif 329. endif
330.endfor 330.endfor
331 331
332.if !defined(TOOLS_IGNORE.csh) && !empty(_USE_TOOLS:Mcsh) 332.if !defined(TOOLS_IGNORE.csh) && !empty(_USE_TOOLS:Mcsh)
333. if !empty(PKGPATH:Mshells/tcsh) 333. if ${PKGPATH} == shells/tcsh
334MAKEFLAGS+= TOOLS_IGNORE.csh= 334MAKEFLAGS+= TOOLS_IGNORE.csh=
335. elif !empty(_TOOLS_USE_PKGSRC.csh:M[yY][eE][sS]) 335. elif !empty(_TOOLS_USE_PKGSRC.csh:M[yY][eE][sS])
336TOOLS_DEPENDS.csh?= tcsh-[0-9]*:../../shells/tcsh 336TOOLS_DEPENDS.csh?= tcsh-[0-9]*:../../shells/tcsh
337TOOLS_CREATE+= csh 337TOOLS_CREATE+= csh
338TOOLS_PATH.csh= ${LOCALBASE}/bin/tcsh 338TOOLS_PATH.csh= ${LOCALBASE}/bin/tcsh
339. endif 339. endif
340.endif 340.endif
341 341
342.if !defined(TOOLS_IGNORE.curl) && !empty(_USE_TOOLS:Mcurl) 342.if !defined(TOOLS_IGNORE.curl) && !empty(_USE_TOOLS:Mcurl)
343. if !empty(PKGPATH:Mwww/curl) 343. if ${PKGPATH} == www/curl
344MAKEFLAGS+= TOOLS_IGNORE.curl= 344MAKEFLAGS+= TOOLS_IGNORE.curl=
345. elif !empty(_TOOLS_USE_PKGSRC.curl:M[yY][eE][sS]) 345. elif !empty(_TOOLS_USE_PKGSRC.curl:M[yY][eE][sS])
346TOOLS_DEPENDS.curl?= curl-[0-9]*:../../www/curl 346TOOLS_DEPENDS.curl?= curl-[0-9]*:../../www/curl
347TOOLS_PATH.curl= ${LOCALBASE}/bin/curl 347TOOLS_PATH.curl= ${LOCALBASE}/bin/curl
348. endif 348. endif
349.endif 349.endif
350 350
351.if !defined(TOOLS_IGNORE.fetch) && !empty(_USE_TOOLS:Mfetch) 351.if !defined(TOOLS_IGNORE.fetch) && !empty(_USE_TOOLS:Mfetch)
352. if !empty(PKGPATH:Mnet/fetch) 352. if ${PKGPATH} == net/fetch
353MAKEFLAGS+= TOOLS_IGNORE.fetch= 353MAKEFLAGS+= TOOLS_IGNORE.fetch=
354. elif !empty(_TOOLS_USE_PKGSRC.fetch:M[yY][eE][sS]) 354. elif !empty(_TOOLS_USE_PKGSRC.fetch:M[yY][eE][sS])
355TOOLS_DEPENDS.fetch?= fetch-[0-9]*:../../net/fetch 355TOOLS_DEPENDS.fetch?= fetch-[0-9]*:../../net/fetch
356TOOLS_PATH.fetch= ${LOCALBASE}/bin/fetch 356TOOLS_PATH.fetch= ${LOCALBASE}/bin/fetch
357. endif 357. endif
358.endif 358.endif
359 359
360.if !defined(TOOLS_IGNORE.file) && !empty(_USE_TOOLS:Mfile) 360.if !defined(TOOLS_IGNORE.file) && !empty(_USE_TOOLS:Mfile)
361. if !empty(PKGPATH:Msysutils/file) 361. if ${PKGPATH} == sysutils/file
362MAKEFLAGS+= TOOLS_IGNORE.file= 362MAKEFLAGS+= TOOLS_IGNORE.file=
363. elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS]) 363. elif !empty(_TOOLS_USE_PKGSRC.file:M[yY][eE][sS])
364TOOLS_DEPENDS.file?= file>=4.13:../../sysutils/file 364TOOLS_DEPENDS.file?= file>=4.13:../../sysutils/file
365TOOLS_CREATE+= file 365TOOLS_CREATE+= file
366TOOLS_PATH.file= ${LOCALBASE}/bin/file 366TOOLS_PATH.file= ${LOCALBASE}/bin/file
367. endif 367. endif
368.endif 368.endif
369 369
370.if !defined(TOOLS_IGNORE.find) && !empty(_USE_TOOLS:Mfind) 370.if !defined(TOOLS_IGNORE.find) && !empty(_USE_TOOLS:Mfind)
371. if !empty(PKGPATH:Msysutils/findutils) 371. if ${PKGPATH} == sysutils/findutils
372MAKEFLAGS+= TOOLS_IGNORE.find= 372MAKEFLAGS+= TOOLS_IGNORE.find=
373. elif !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS]) 373. elif !empty(_TOOLS_USE_PKGSRC.find:M[yY][eE][sS])
374TOOLS_DEPENDS.find?= findutils>=4.1:../../sysutils/findutils 374TOOLS_DEPENDS.find?= findutils>=4.1:../../sysutils/findutils
375TOOLS_CREATE+= find 375TOOLS_CREATE+= find
376TOOLS_PATH.find= ${LOCALBASE}/bin/gfind 376TOOLS_PATH.find= ${LOCALBASE}/bin/gfind
377. endif 377. endif
378.endif 378.endif
379 379
380.if !defined(TOOLS_IGNORE.flex) && !empty(_USE_TOOLS:Mflex) 380.if !defined(TOOLS_IGNORE.flex) && !empty(_USE_TOOLS:Mflex)
381. if !empty(PKGPATH:Mdevel/flex) 381. if ${PKGPATH} == devel/flex
382MAKEFLAGS+= TOOLS_IGNORE.flex= 382MAKEFLAGS+= TOOLS_IGNORE.flex=
383. elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS]) 383. elif !empty(_TOOLS_USE_PKGSRC.flex:M[yY][eE][sS])
384. include "../../devel/flex/buildlink3.mk" 384. include "../../devel/flex/buildlink3.mk"
385_TOOLS_DEPENDS.flex= # empty 385_TOOLS_DEPENDS.flex= # empty
386. for _dep_ in ${BUILDLINK_API_DEPENDS.flex} ${FLEX_REQD:S,^,flex>=,} 386. for _dep_ in ${BUILDLINK_API_DEPENDS.flex} ${FLEX_REQD:S,^,flex>=,}
387_TOOLS_DEPENDS.flex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex} 387_TOOLS_DEPENDS.flex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
388. endfor 388. endfor
389TOOLS_DEPENDS.flex?= ${_TOOLS_DEPENDS.flex} 389TOOLS_DEPENDS.flex?= ${_TOOLS_DEPENDS.flex}
390TOOLS_CREATE+= flex 390TOOLS_CREATE+= flex
391TOOLS_PATH.flex= ${LOCALBASE}/bin/flex 391TOOLS_PATH.flex= ${LOCALBASE}/bin/flex
392. endif 392. endif
393TOOLS_ALIASES.flex= lex 393TOOLS_ALIASES.flex= lex
394.endif 394.endif
395 395
396.if !defined(TOOLS_IGNORE.ftp) && !empty(_USE_TOOLS:Mftp) 396.if !defined(TOOLS_IGNORE.ftp) && !empty(_USE_TOOLS:Mftp)
397. if !empty(PKGPATH:Mnet/tnftp) 397. if ${PKGPATH} == net/tnftp
398MAKEFLAGS+= TOOLS_IGNORE.ftp= 398MAKEFLAGS+= TOOLS_IGNORE.ftp=
399. elif !empty(_TOOLS_USE_PKGSRC.ftp:M[yY][eE][sS]) 399. elif !empty(_TOOLS_USE_PKGSRC.ftp:M[yY][eE][sS])
400TOOLS_DEPENDS.ftp?= tnftp-[0-9]*:../../net/tnftp 400TOOLS_DEPENDS.ftp?= tnftp-[0-9]*:../../net/tnftp
401TOOLS_PATH.ftp= ${LOCALBASE}/bin/ftp 401TOOLS_PATH.ftp= ${LOCALBASE}/bin/ftp
402. endif 402. endif
403.endif 403.endif
404 404
405.if !defined(TOOLS_IGNORE.gawk) && !empty(_USE_TOOLS:Mgawk) 405.if !defined(TOOLS_IGNORE.gawk) && !empty(_USE_TOOLS:Mgawk)
406. if !empty(PKGPATH:Mlang/gawk) 406. if ${PKGPATH} == lang/gawk
407MAKEFLAGS+= TOOLS_IGNORE.gawk= 407MAKEFLAGS+= TOOLS_IGNORE.gawk=
408. elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS]) 408. elif !empty(_TOOLS_USE_PKGSRC.gawk:M[yY][eE][sS])
409TOOLS_DEPENDS.gawk?= gawk>=3.1.1:../../lang/gawk 409TOOLS_DEPENDS.gawk?= gawk>=3.1.1:../../lang/gawk
410TOOLS_CREATE+= gawk 410TOOLS_CREATE+= gawk
411TOOLS_PATH.gawk= ${LOCALBASE}/bin/gawk 411TOOLS_PATH.gawk= ${LOCALBASE}/bin/gawk
412. endif 412. endif
413TOOLS_ALIASES.gawk= awk 413TOOLS_ALIASES.gawk= awk
414.endif 414.endif
415 415
416.if !defined(TOOLS_IGNORE.gem) && !empty(_USE_TOOLS:Mgem) 416.if !defined(TOOLS_IGNORE.gem) && !empty(_USE_TOOLS:Mgem)
417. if !empty(_TOOLS_USE_PKGSRC.gem:M[yY][eE][sS]) 417. if !empty(_TOOLS_USE_PKGSRC.gem:M[yY][eE][sS])
418TOOLS_DEPENDS.gem?= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR} 418TOOLS_DEPENDS.gem?= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
419TOOLS_CREATE+= gem 419TOOLS_CREATE+= gem
420TOOLS_PATH.gem= ${LOCALBASE}/bin/gem${RUBY_SUFFIX} 420TOOLS_PATH.gem= ${LOCALBASE}/bin/gem${RUBY_SUFFIX}
421. endif 421. endif
422.endif 422.endif
423 423
424.if !defined(TOOLS_IGNORE.gm4) && !empty(_USE_TOOLS:Mgm4) 424.if !defined(TOOLS_IGNORE.gm4) && !empty(_USE_TOOLS:Mgm4)
425. if !empty(PKGPATH:Mdevel/m4) 425. if ${PKGPATH} == devel/m4
426MAKEFLAGS+= TOOLS_IGNORE.gm4= 426MAKEFLAGS+= TOOLS_IGNORE.gm4=
427. elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS]) 427. elif !empty(_TOOLS_USE_PKGSRC.gm4:M[yY][eE][sS])
428TOOLS_DEPENDS.gm4?= m4>=1.4:../../devel/m4 428TOOLS_DEPENDS.gm4?= m4>=1.4:../../devel/m4
429TOOLS_CREATE+= gm4 429TOOLS_CREATE+= gm4
430TOOLS_PATH.gm4= ${LOCALBASE}/bin/gm4 430TOOLS_PATH.gm4= ${LOCALBASE}/bin/gm4
431. endif 431. endif
432TOOLS_ALIASES.gm4= m4 432TOOLS_ALIASES.gm4= m4
433.endif 433.endif
434 434
435.if !defined(TOOLS_IGNORE.gmake) && !empty(_USE_TOOLS:Mgmake) 435.if !defined(TOOLS_IGNORE.gmake) && !empty(_USE_TOOLS:Mgmake)
436. if !empty(PKGPATH:Mdevel/gmake) 436. if ${PKGPATH} == devel/gmake
437MAKEFLAGS+= TOOLS_IGNORE.gmake= 437MAKEFLAGS+= TOOLS_IGNORE.gmake=
438. elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS]) 438. elif !empty(_TOOLS_USE_PKGSRC.gmake:M[yY][eE][sS])
439TOOLS_DEPENDS.gmake?= gmake>=${GMAKE_REQD}:../../devel/gmake 439TOOLS_DEPENDS.gmake?= gmake>=${GMAKE_REQD}:../../devel/gmake
440TOOLS_CREATE+= gmake 440TOOLS_CREATE+= gmake
441TOOLS_PATH.gmake= ${LOCALBASE}/bin/gmake 441TOOLS_PATH.gmake= ${LOCALBASE}/bin/gmake
442. endif 442. endif
443.endif 443.endif
444 444
445.if !defined(TOOLS_IGNORE.gsed) && !empty(_USE_TOOLS:Mgsed) 445.if !defined(TOOLS_IGNORE.gsed) && !empty(_USE_TOOLS:Mgsed)
446. if !empty(PKGPATH:Mtextproc/gsed) 446. if ${PKGPATH} == textproc/gsed
447MAKEFLAGS+= TOOLS_IGNORE.gsed= 447MAKEFLAGS+= TOOLS_IGNORE.gsed=
448. elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS]) 448. elif !empty(_TOOLS_USE_PKGSRC.gsed:M[yY][eE][sS])
449TOOLS_DEPENDS.gsed?= gsed>=3.0.2:../../textproc/gsed 449TOOLS_DEPENDS.gsed?= gsed>=3.0.2:../../textproc/gsed
450TOOLS_CREATE+= gsed 450TOOLS_CREATE+= gsed
451TOOLS_PATH.gsed= ${LOCALBASE}/bin/gsed 451TOOLS_PATH.gsed= ${LOCALBASE}/bin/gsed
452. endif 452. endif
453TOOLS_ALIASES.gsed= sed 453TOOLS_ALIASES.gsed= sed
454.endif 454.endif
455 455
456.if !defined(TOOLS_IGNORE.gtar) && !empty(_USE_TOOLS:Mgtar) 456.if !defined(TOOLS_IGNORE.gtar) && !empty(_USE_TOOLS:Mgtar)
457. if !empty(PKGPATH:Marchivers/gtar-base) 457. if ${PKGPATH} == archivers/gtar-base
458MAKEFLAGS+= TOOLS_IGNORE.gtar= 458MAKEFLAGS+= TOOLS_IGNORE.gtar=
459. elif !empty(_TOOLS_USE_PKGSRC.gtar:M[yY][eE][sS]) 459. elif !empty(_TOOLS_USE_PKGSRC.gtar:M[yY][eE][sS])
460TOOLS_DEPENDS.gtar?= gtar-base>=1.13.25:../../archivers/gtar-base 460TOOLS_DEPENDS.gtar?= gtar-base>=1.13.25:../../archivers/gtar-base
461TOOLS_CREATE+= gtar 461TOOLS_CREATE+= gtar
462TOOLS_PATH.gtar= ${LOCALBASE}/bin/gtar 462TOOLS_PATH.gtar= ${LOCALBASE}/bin/gtar
463. endif 463. endif
464.endif 464.endif
465 465
466.if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip) 466.if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip)
467. if !empty(PKGPATH:Marchivers/gzip) 467. if ${PKGPATH} == archivers/gzip
468MAKEFLAGS+= TOOLS_IGNORE.gunzip= 468MAKEFLAGS+= TOOLS_IGNORE.gunzip=
469. elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS]) 469. elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS])
470TOOLS_DEPENDS.gunzip?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip 470TOOLS_DEPENDS.gunzip?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip
471TOOLS_CREATE+= gunzip 471TOOLS_CREATE+= gunzip
472TOOLS_PATH.gunzip= ${LOCALBASE}/bin/gunzip 472TOOLS_PATH.gunzip= ${LOCALBASE}/bin/gunzip
473TOOLS_ARGS.gunzip= -f 473TOOLS_ARGS.gunzip= -f
474. endif 474. endif
475.endif 475.endif
476 476
477.if !defined(TOOLS_IGNORE.gzcat) && !empty(_USE_TOOLS:Mgzcat) 477.if !defined(TOOLS_IGNORE.gzcat) && !empty(_USE_TOOLS:Mgzcat)
478. if !empty(PKGPATH:Marchivers/gzip) 478. if ${PKGPATH} == archivers/gzip
479MAKEFLAGS+= TOOLS_IGNORE.gzcat= 479MAKEFLAGS+= TOOLS_IGNORE.gzcat=
480. elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS]) 480. elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS])
481TOOLS_DEPENDS.gzcat?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip 481TOOLS_DEPENDS.gzcat?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip
482TOOLS_CREATE+= gzcat 482TOOLS_CREATE+= gzcat
483TOOLS_PATH.gzcat= ${LOCALBASE}/bin/zcat 483TOOLS_PATH.gzcat= ${LOCALBASE}/bin/zcat
484. endif 484. endif
485.endif 485.endif
486 486
487.if !defined(TOOLS_IGNORE.gzip) && !empty(_USE_TOOLS:Mgzip) 487.if !defined(TOOLS_IGNORE.gzip) && !empty(_USE_TOOLS:Mgzip)
488. if !empty(PKGPATH:Marchivers/gzip) 488. if ${PKGPATH} == archivers/gzip
489MAKEFLAGS+= TOOLS_IGNORE.gzip= 489MAKEFLAGS+= TOOLS_IGNORE.gzip=
490. elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS]) 490. elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS])
491TOOLS_DEPENDS.gzip?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip 491TOOLS_DEPENDS.gzip?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip
492TOOLS_CREATE+= gzip 492TOOLS_CREATE+= gzip
493TOOLS_PATH.gzip= ${LOCALBASE}/bin/gzip 493TOOLS_PATH.gzip= ${LOCALBASE}/bin/gzip
494TOOLS_ARGS.gzip= -nf ${GZIP} 494TOOLS_ARGS.gzip= -nf ${GZIP}
495. endif 495. endif
496.endif 496.endif
497 497
498.if !defined(TOOLS_IGNORE.ident) && !empty(_USE_TOOLS:Mident) 498.if !defined(TOOLS_IGNORE.ident) && !empty(_USE_TOOLS:Mident)
499. if !empty(PKGPATH:Mdevel/rcs) 499. if ${PKGPATH} == devel/rcs
500MAKEFLAGS+= TOOLS_IGNORE.ident= 500MAKEFLAGS+= TOOLS_IGNORE.ident=
501. elif !empty(_TOOLS_USE_PKGSRC.ident:M[yY][eE][sS]) 501. elif !empty(_TOOLS_USE_PKGSRC.ident:M[yY][eE][sS])
502TOOLS_DEPENDS.ident?= rcs-[0-9]*:../../devel/rcs 502TOOLS_DEPENDS.ident?= rcs-[0-9]*:../../devel/rcs
503TOOLS_CREATE+= ident 503TOOLS_CREATE+= ident
504TOOLS_PATH.ident= ${LOCALBASE}/bin/ident 504TOOLS_PATH.ident= ${LOCALBASE}/bin/ident
505. endif 505. endif
506.endif 506.endif
507 507
508.if !defined(TOOLS_IGNORE.install-info) && !empty(_USE_TOOLS:Minstall-info) 508.if !defined(TOOLS_IGNORE.install-info) && !empty(_USE_TOOLS:Minstall-info)
509. if !empty(PKGPATH:Mpkgtools/pkg_install-info) 509. if ${PKGPATH} == pkgtools/pkg_install-info
510MAKEFLAGS+= TOOLS_IGNORE.install-info= 510MAKEFLAGS+= TOOLS_IGNORE.install-info=
511. elif !empty(_TOOLS_USE_PKGSRC.install-info:M[yY][eE][sS]) 511. elif !empty(_TOOLS_USE_PKGSRC.install-info:M[yY][eE][sS])
512TOOLS_DEPENDS.install-info?= pkg_install-info-[0-9]*:../../pkgtools/pkg_install-info 512TOOLS_DEPENDS.install-info?= pkg_install-info-[0-9]*:../../pkgtools/pkg_install-info
513TOOLS_CREATE+= install-info 513TOOLS_CREATE+= install-info
514TOOLS_PATH.install-info= ${LOCALBASE}/bin/pkg_install-info 514TOOLS_PATH.install-info= ${LOCALBASE}/bin/pkg_install-info
515. endif 515. endif
516.endif 516.endif
517# 517#
518# Always create an install-info tool that is a "no operation" command, as 518# Always create an install-info tool that is a "no operation" command, as
519# registration of info files is handled by the INSTALL script. 519# registration of info files is handled by the INSTALL script.
520# 520#
521TOOLS_SCRIPT.install-info= exit 0 521TOOLS_SCRIPT.install-info= exit 0
522 522
523.if !defined(TOOLS_IGNORE.ksh) && !empty(_USE_TOOLS:Mksh) 523.if !defined(TOOLS_IGNORE.ksh) && !empty(_USE_TOOLS:Mksh)
524. if !empty(PKGPATH:Mshells/pdksh) 524. if ${PKGPATH} == shells/pdksh
525MAKEFLAGS+= TOOLS_IGNORE.ksh= 525MAKEFLAGS+= TOOLS_IGNORE.ksh=
526. elif !empty(_TOOLS_USE_PKGSRC.ksh:M[yY][eE][sS]) 526. elif !empty(_TOOLS_USE_PKGSRC.ksh:M[yY][eE][sS])
527TOOLS_DEPENDS.ksh?= pdksh>=5.2.14:../../shells/pdksh 527TOOLS_DEPENDS.ksh?= pdksh>=5.2.14:../../shells/pdksh
528TOOLS_CREATE+= ksh 528TOOLS_CREATE+= ksh
529TOOLS_PATH.ksh= ${LOCALBASE}/bin/pdksh 529TOOLS_PATH.ksh= ${LOCALBASE}/bin/pdksh
530. endif 530. endif
531.endif 531.endif
532 532
533.if !defined(TOOLS_IGNORE.lex) && !empty(_USE_TOOLS:Mlex) 533.if !defined(TOOLS_IGNORE.lex) && !empty(_USE_TOOLS:Mlex)
534. if !empty(PKGPATH:Mdevel/flex) 534. if ${PKGPATH} == devel/flex
535MAKEFLAGS+= TOOLS_IGNORE.lex= 535MAKEFLAGS+= TOOLS_IGNORE.lex=
536. elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS]) 536. elif !empty(_TOOLS_USE_PKGSRC.lex:M[yY][eE][sS])
537. include "../../devel/flex/buildlink3.mk" 537. include "../../devel/flex/buildlink3.mk"
538_TOOLS_DEPENDS.lex= # empty 538_TOOLS_DEPENDS.lex= # empty
539. for _dep_ in ${BUILDLINK_API_DEPENDS.flex} 539. for _dep_ in ${BUILDLINK_API_DEPENDS.flex}
540_TOOLS_DEPENDS.lex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex} 540_TOOLS_DEPENDS.lex+= ${_dep_}:${BUILDLINK_PKGSRCDIR.flex}
541. endfor 541. endfor
542TOOLS_DEPENDS.lex?= ${_TOOLS_DEPENDS.lex} 542TOOLS_DEPENDS.lex?= ${_TOOLS_DEPENDS.lex}
543TOOLS_CREATE+= lex 543TOOLS_CREATE+= lex
544TOOLS_PATH.lex= ${LOCALBASE}/bin/flex 544TOOLS_PATH.lex= ${LOCALBASE}/bin/flex
545. endif 545. endif
546.endif 546.endif
547 547
548.if !defined(TOOLS_IGNORE.lha) && !empty(_USE_TOOLS:Mlha) 548.if !defined(TOOLS_IGNORE.lha) && !empty(_USE_TOOLS:Mlha)
549. if !empty(PKGPATH:Marchivers/lha) 549. if ${PKGPATH} == archivers/lha
550MAKEFLAGS+= TOOLS_IGNORE.lha= 550MAKEFLAGS+= TOOLS_IGNORE.lha=
551. elif !empty(_TOOLS_USE_PKGSRC.lha:M[yY][eE][sS]) 551. elif !empty(_TOOLS_USE_PKGSRC.lha:M[yY][eE][sS])
552TOOLS_DEPENDS.lha?= lha>=114.9:../../archivers/lha 552TOOLS_DEPENDS.lha?= lha>=114.9:../../archivers/lha
553TOOLS_CREATE+= lha 553TOOLS_CREATE+= lha
554TOOLS_PATH.lha= ${LOCALBASE}/bin/lha 554TOOLS_PATH.lha= ${LOCALBASE}/bin/lha
555. endif 555. endif
556.endif 556.endif
557 557
558.if !defined(TOOLS_IGNORE.lzip) && !empty(_USE_TOOLS:Mlzip) 558.if !defined(TOOLS_IGNORE.lzip) && !empty(_USE_TOOLS:Mlzip)
559. if !empty(PKGPATH:Marchivers/lzip) 559. if ${PKGPATH} == archivers/lzip
560MAKEFLAGS+= TOOLS_IGNORE.lzip= 560MAKEFLAGS+= TOOLS_IGNORE.lzip=
561. elif !empty(_TOOLS_USE_PKGSRC.lzip:M[yY][eE][sS]) 561. elif !empty(_TOOLS_USE_PKGSRC.lzip:M[yY][eE][sS])
562TOOLS_DEPENDS.lzip?= lzip>=1.14:../../archivers/lzip 562TOOLS_DEPENDS.lzip?= lzip>=1.14:../../archivers/lzip
563TOOLS_CREATE+= lzip 563TOOLS_CREATE+= lzip
564TOOLS_PATH.lzip= ${LOCALBASE}/bin/lzip 564TOOLS_PATH.lzip= ${LOCALBASE}/bin/lzip
565. endif 565. endif
566.endif 566.endif
567 567
568.if !defined(TOOLS_IGNORE.lzcat) && !empty(_USE_TOOLS:Mlzcat) 568.if !defined(TOOLS_IGNORE.lzcat) && !empty(_USE_TOOLS:Mlzcat)
569. if !empty(PKGPATH:Marchivers/xz) 569. if ${PKGPATH} == archivers/xz
570MAKEFLAGS+= TOOLS_IGNORE.lzcat= 570MAKEFLAGS+= TOOLS_IGNORE.lzcat=
571. elif !empty(_TOOLS_USE_PKGSRC.lzcat:M[yY][eE][sS]) 571. elif !empty(_TOOLS_USE_PKGSRC.lzcat:M[yY][eE][sS])
572TOOLS_DEPENDS.lzcat?= xz>=4.999.9betanb1:../../archivers/xz 572TOOLS_DEPENDS.lzcat?= xz>=4.999.9betanb1:../../archivers/xz
573TOOLS_CREATE+= lzcat 573TOOLS_CREATE+= lzcat
574TOOLS_PATH.lzcat= ${LOCALBASE}/bin/lzcat 574TOOLS_PATH.lzcat= ${LOCALBASE}/bin/lzcat
575. endif 575. endif
576.endif 576.endif
577 577
578.if !defined(TOOLS_IGNORE.m4) && !empty(_USE_TOOLS:Mm4) 578.if !defined(TOOLS_IGNORE.m4) && !empty(_USE_TOOLS:Mm4)
579. if !empty(PKGPATH:Mdevel/m4) 579. if ${PKGPATH} == devel/m4
580MAKEFLAGS+= TOOLS_IGNORE.m4= 580MAKEFLAGS+= TOOLS_IGNORE.m4=
581. elif !empty(_TOOLS_USE_PKGSRC.m4:M[yY][eE][sS]) 581. elif !empty(_TOOLS_USE_PKGSRC.m4:M[yY][eE][sS])
582TOOLS_DEPENDS.m4?= m4>=1.4:../../devel/m4 582TOOLS_DEPENDS.m4?= m4>=1.4:../../devel/m4
583TOOLS_CREATE+= m4 583TOOLS_CREATE+= m4
584TOOLS_PATH.m4= ${LOCALBASE}/bin/gm4 584TOOLS_PATH.m4= ${LOCALBASE}/bin/gm4
585. endif 585. endif
586.endif 586.endif
587 587
588.if !defined(TOOLS_IGNORE.mail) && !empty(_USE_TOOLS:Mmail) 588.if !defined(TOOLS_IGNORE.mail) && !empty(_USE_TOOLS:Mmail)
589. if !empty(PKGPATH:Mmail/heirloom-mailx) 589. if ${PKGPATH} == mail/heirloom-mailx
590MAKEFLAGS+= TOOLS_IGNORE.mail= 590MAKEFLAGS+= TOOLS_IGNORE.mail=
591. elif !empty(_TOOLS_USE_PKGSRC.mail:M[yY][eE][sS]) 591. elif !empty(_TOOLS_USE_PKGSRC.mail:M[yY][eE][sS])
592TOOLS_DEPENDS.mail?= heirloom-mailx-[0-9]*:../../mail/heirloom-mailx 592TOOLS_DEPENDS.mail?= heirloom-mailx-[0-9]*:../../mail/heirloom-mailx
593TOOLS_CREATE+= mail 593TOOLS_CREATE+= mail
594TOOLS_PATH.mail= ${LOCALBASE}/bin/mailx 594TOOLS_PATH.mail= ${LOCALBASE}/bin/mailx
595. endif 595. endif
596.endif 596.endif
597 597
598.if !defined(TOOLS_IGNORE.makeinfo) && !empty(_USE_TOOLS:Mmakeinfo) 598.if !defined(TOOLS_IGNORE.makeinfo) && !empty(_USE_TOOLS:Mmakeinfo)
599. if !empty(PKGPATH:Mdevel/gtexinfo) 599. if ${PKGPATH} == devel/gtexinfo
600MAKEFLAGS+= TOOLS_IGNORE.makeinfo= 600MAKEFLAGS+= TOOLS_IGNORE.makeinfo=
601. elif !empty(_TOOLS_USE_PKGSRC.makeinfo:M[yY][eE][sS]) 601. elif !empty(_TOOLS_USE_PKGSRC.makeinfo:M[yY][eE][sS])
602TOOLS_DEPENDS.makeinfo?= gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo 602TOOLS_DEPENDS.makeinfo?= gtexinfo>=${TEXINFO_REQD}:../../devel/gtexinfo
603TOOLS_CREATE+= makeinfo 603TOOLS_CREATE+= makeinfo
604TOOLS_PATH.makeinfo= ${LOCALBASE}/bin/makeinfo 604TOOLS_PATH.makeinfo= ${LOCALBASE}/bin/makeinfo
605. endif 605. endif
606.endif 606.endif
607 607
608.if !defined(TOOLS_IGNORE.mktemp) && !empty(_USE_TOOLS:Mmktemp) 608.if !defined(TOOLS_IGNORE.mktemp) && !empty(_USE_TOOLS:Mmktemp)
609. if !empty(PKGPATH:Msysutils/mktemp) 609. if ${PKGPATH} == sysutils/mktemp
610MAKEFLAGS+= TOOLS_IGNORE.mktemp= 610MAKEFLAGS+= TOOLS_IGNORE.mktemp=
611. elif !empty(_TOOLS_USE_PKGSRC.mktemp:M[yY][eE][sS]) 611. elif !empty(_TOOLS_USE_PKGSRC.mktemp:M[yY][eE][sS])
612TOOLS_DEPENDS.mktemp?= mktemp>=1.5:../../sysutils/mktemp 612TOOLS_DEPENDS.mktemp?= mktemp>=1.5:../../sysutils/mktemp
613TOOLS_CREATE+= mktemp 613TOOLS_CREATE+= mktemp
614TOOLS_PATH.mktemp= ${LOCALBASE}/bin/mktemp 614TOOLS_PATH.mktemp= ${LOCALBASE}/bin/mktemp
615. endif 615. endif
616.endif 616.endif
617 617
618.if !defined(TOOLS_IGNORE.mtree) && !empty(_USE_TOOLS:Mmtree) 618.if !defined(TOOLS_IGNORE.mtree) && !empty(_USE_TOOLS:Mmtree)
619. if !empty(PKGPATH:Mpkgtools/mtree) 619. if ${PKGPATH} == pkgtools/mtree
620MAKEFLAGS+= TOOLS_IGNORE.mtree= 620MAKEFLAGS+= TOOLS_IGNORE.mtree=
621. elif !empty(_TOOLS_USE_PKGSRC.mtree:M[yY][eE][sS]) 621. elif !empty(_TOOLS_USE_PKGSRC.mtree:M[yY][eE][sS])
622# 622#
623# This is installed by pkgsrc bootstrap, and is never registered, so 623# This is installed by pkgsrc bootstrap, and is never registered, so
624# comment out the dependency on it. 624# comment out the dependency on it.
625# 625#
626TOOLS_DEPENDS.mtree?= mtree>=20040722:../../pkgtools/mtree 626TOOLS_DEPENDS.mtree?= mtree>=20040722:../../pkgtools/mtree
627TOOLS_CREATE+= mtree 627TOOLS_CREATE+= mtree
628TOOLS_PATH.mtree= ${LOCALBASE}/bin/mtree 628TOOLS_PATH.mtree= ${LOCALBASE}/bin/mtree
629. endif 629. endif
630.endif 630.endif
631 631
632.if !defined(TOOLS_IGNORE.openssl) && !empty(_USE_TOOLS:Mopenssl) 632.if !defined(TOOLS_IGNORE.openssl) && !empty(_USE_TOOLS:Mopenssl)
633# 633#
634# Ensure we use pkgsrc openssl if we're not using builtin. 634# Ensure we use pkgsrc openssl if we're not using builtin.
635# 635#
636CHECK_BUILTIN.openssl:= yes 636CHECK_BUILTIN.openssl:= yes
637. include "../../security/openssl/builtin.mk" 637. include "../../security/openssl/builtin.mk"
638CHECK_BUILTIN.openssl:= no 638CHECK_BUILTIN.openssl:= no
639. if !empty(USE_BUILTIN.openssl:M[nN][oO]) 639. if ${USE_BUILTIN.openssl:U:tl} == no
640_TOOLS_USE_PKGSRC.openssl= yes 640_TOOLS_USE_PKGSRC.openssl= yes
641. endif 641. endif
642. if !empty(PKGPATH:Msecurity/openssl) 642. if ${PKGPATH} == security/openssl
643MAKEFLAGS+= TOOLS_IGNORE.openssl= 643MAKEFLAGS+= TOOLS_IGNORE.openssl=
644. elif !empty(_TOOLS_USE_PKGSRC.openssl:M[yY][eE][sS]) 644. elif !empty(_TOOLS_USE_PKGSRC.openssl:M[yY][eE][sS])
645TOOLS_DEPENDS.openssl?= openssl>=0.9.6:../../security/openssl 645TOOLS_DEPENDS.openssl?= openssl>=0.9.6:../../security/openssl
646TOOLS_CREATE+= openssl 646TOOLS_CREATE+= openssl
647TOOLS_PATH.openssl= ${LOCALBASE}/bin/openssl 647TOOLS_PATH.openssl= ${LOCALBASE}/bin/openssl
648. endif 648. endif
649.endif 649.endif
650 650
651.if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch) 651.if !defined(TOOLS_IGNORE.patch) && !empty(_USE_TOOLS:Mpatch)
652. if !empty(PKGPATH:Mdevel/nbpatch) 652. if ${PKGPATH} == devel/nbpatch
653MAKEFLAGS+= TOOLS_IGNORE.patch= 653MAKEFLAGS+= TOOLS_IGNORE.patch=
654. elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS]) 654. elif !empty(_TOOLS_USE_PKGSRC.patch:M[yY][eE][sS])
655TOOLS_DEPENDS.patch?= nbpatch-[0-9]*:../../devel/nbpatch 655TOOLS_DEPENDS.patch?= nbpatch-[0-9]*:../../devel/nbpatch
656TOOLS_CREATE+= patch 656TOOLS_CREATE+= patch
657TOOLS_PATH.patch= ${LOCALBASE}/bin/nbpatch 657TOOLS_PATH.patch= ${LOCALBASE}/bin/nbpatch
658_PATCH_CAN_BACKUP= yes 658_PATCH_CAN_BACKUP= yes
659_PATCH_BACKUP_ARG= -V simple -z 659_PATCH_BACKUP_ARG= -V simple -z
660. endif 660. endif
661.endif 661.endif
662 662
663.if !defined(TOOLS_IGNORE.pax) && !empty(_USE_TOOLS:Mpax) 663.if !defined(TOOLS_IGNORE.pax) && !empty(_USE_TOOLS:Mpax)
664. if !empty(PKGPATH:Marchivers/pax) 664. if ${PKGPATH} == archivers/pax
665MAKEFLAGS+= TOOLS_IGNORE.pax= 665MAKEFLAGS+= TOOLS_IGNORE.pax=
666. elif !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS]) 666. elif !empty(_TOOLS_USE_PKGSRC.pax:M[yY][eE][sS])
667TOOLS_DEPENDS.pax?= pax>=20040802:../../archivers/pax 667TOOLS_DEPENDS.pax?= pax>=20040802:../../archivers/pax
668TOOLS_CREATE+= pax 668TOOLS_CREATE+= pax
669TOOLS_PATH.pax= ${LOCALBASE}/bin/${NBPAX_PROGRAM_PREFIX}pax 669TOOLS_PATH.pax= ${LOCALBASE}/bin/${NBPAX_PROGRAM_PREFIX}pax
670. endif 670. endif
671.endif 671.endif
672 672
673.if !defined(TOOLS_IGNORE.pkg-config) && !empty(_USE_TOOLS:Mpkg-config) 673.if !defined(TOOLS_IGNORE.pkg-config) && !empty(_USE_TOOLS:Mpkg-config)
674. if !empty(PKGPATH:Mdevel/pkg-config) 674. if ${PKGPATH} == devel/pkg-config
675MAKEFLAGS+= TOOLS_IGNORE.pkg-config= 675MAKEFLAGS+= TOOLS_IGNORE.pkg-config=
676. elif !empty(_TOOLS_USE_PKGSRC.pkg-config:M[yY][eE][sS]) 676. elif !empty(_TOOLS_USE_PKGSRC.pkg-config:M[yY][eE][sS])
677TOOLS_DEPENDS.pkg-config?= pkgconf-[0-9]*:../../devel/pkgconf 677TOOLS_DEPENDS.pkg-config?= pkgconf-[0-9]*:../../devel/pkgconf
678TOOLS_CREATE+= pkg-config 678TOOLS_CREATE+= pkg-config
679TOOLS_PATH.pkg-config= ${LOCALBASE}/bin/pkg-config 679TOOLS_PATH.pkg-config= ${LOCALBASE}/bin/pkg-config
680. else 680. else
681AUTORECONF_ARGS+= -I ${TOOLS_PLATFORM.pkg-config:S/\/bin\/pkg-config//}/share/aclocal 681AUTORECONF_ARGS+= -I ${TOOLS_PLATFORM.pkg-config:S/\/bin\/pkg-config//}/share/aclocal
682. endif 682. endif
683.else 683.else
684# 684#
685# If a package doesn't explicitly say it uses pkg-config, create a 685# If a package doesn't explicitly say it uses pkg-config, create a
686# "broken" pkg-config in the tools directory. 686# "broken" pkg-config in the tools directory.
687# 687#
688TOOLS_FAIL+= pkg-config 688TOOLS_FAIL+= pkg-config
689.endif 689.endif
690 690
691.if !defined(TOOLS_IGNORE.rpm2pkg) && !empty(_USE_TOOLS:Mrpm2pkg) 691.if !defined(TOOLS_IGNORE.rpm2pkg) && !empty(_USE_TOOLS:Mrpm2pkg)
692. if !empty(PKGPATH:Mpkgtools/rpm2pkg) 692. if ${PKGPATH} == pkgtools/rpm2pkg
693MAKEFLAGS+= TOOLS_IGNORE.rpm2pkg= 693MAKEFLAGS+= TOOLS_IGNORE.rpm2pkg=
694. elif !empty(_TOOLS_USE_PKGSRC.rpm2pkg:M[yY][eE][sS]) 694. elif !empty(_TOOLS_USE_PKGSRC.rpm2pkg:M[yY][eE][sS])
695TOOLS_DEPENDS.rpm2pkg?= rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg 695TOOLS_DEPENDS.rpm2pkg?= rpm2pkg>=3.1.4:../../pkgtools/rpm2pkg
696TOOLS_CREATE+= rpm2pkg 696TOOLS_CREATE+= rpm2pkg
697TOOLS_PATH.rpm2pkg= ${LOCALBASE}/sbin/rpm2pkg 697TOOLS_PATH.rpm2pkg= ${LOCALBASE}/sbin/rpm2pkg
698. endif 698. endif
699.endif 699.endif
700 700
701.if !defined(TOOLS_IGNORE.sed) && !empty(_USE_TOOLS:Msed) 701.if !defined(TOOLS_IGNORE.sed) && !empty(_USE_TOOLS:Msed)
702. if !empty(PKGPATH:Mtextproc/nbsed) 702. if ${PKGPATH} == textproc/nbsed
703MAKEFLAGS+= TOOLS_IGNORE.sed= 703MAKEFLAGS+= TOOLS_IGNORE.sed=
704. elif !empty(_TOOLS_USE_PKGSRC.sed:M[yY][eE][sS]) 704. elif !empty(_TOOLS_USE_PKGSRC.sed:M[yY][eE][sS])
705TOOLS_DEPENDS.sed?= nbsed>=20040821:../../textproc/nbsed 705TOOLS_DEPENDS.sed?= nbsed>=20040821:../../textproc/nbsed
706TOOLS_CREATE+= sed 706TOOLS_CREATE+= sed
707TOOLS_PATH.sed= ${LOCALBASE}/bin/nbsed 707TOOLS_PATH.sed= ${LOCALBASE}/bin/nbsed
708. endif 708. endif
709.endif 709.endif
710 710
711.if !defined(TOOLS_IGNORE.sh) && !empty(_USE_TOOLS:Msh) 711.if !defined(TOOLS_IGNORE.sh) && !empty(_USE_TOOLS:Msh)
712. if !empty(PKGPATH:Mshells/pdksh) 712. if ${PKGPATH} == shells/pdksh
713MAKEFLAGS+= TOOLS_IGNORE.sh= 713MAKEFLAGS+= TOOLS_IGNORE.sh=
714. elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS]) 714. elif !empty(_TOOLS_USE_PKGSRC.sh:M[yY][eE][sS])
715TOOLS_DEPENDS.sh?= pdksh>=5.2.14:../../shells/pdksh 715TOOLS_DEPENDS.sh?= pdksh>=5.2.14:../../shells/pdksh
716TOOLS_CREATE+= sh 716TOOLS_CREATE+= sh
717TOOLS_PATH.sh= ${LOCALBASE}/bin/pdksh 717TOOLS_PATH.sh= ${LOCALBASE}/bin/pdksh
718. endif 718. endif
719TOOLS_CMD.sh= ${TOOLS_DIR}/bin/sh 719TOOLS_CMD.sh= ${TOOLS_DIR}/bin/sh
720.endif 720.endif
721 721
722.if !defined(TOOLS_IGNORE.shlock) && !empty(_USE_TOOLS:Mshlock) 722.if !defined(TOOLS_IGNORE.shlock) && !empty(_USE_TOOLS:Mshlock)
723. if !empty(PKGPATH:Mpkgtools/shlock) 723. if ${PKGPATH} == pkgtools/shlock
724MAKEFLAGS+= TOOLS_IGNORE.shlock= 724MAKEFLAGS+= TOOLS_IGNORE.shlock=
725. elif !empty(_TOOLS_USE_PKGSRC.shlock:M[yY][eE][sS]) 725. elif !empty(_TOOLS_USE_PKGSRC.shlock:M[yY][eE][sS])
726TOOLS_DEPENDS.shlock?= shlock>=20020114:../../pkgtools/shlock 726TOOLS_DEPENDS.shlock?= shlock>=20020114:../../pkgtools/shlock
727TOOLS_CREATE+= shlock 727TOOLS_CREATE+= shlock
728TOOLS_PATH.shlock= ${LOCALBASE}/bin/shlock 728TOOLS_PATH.shlock= ${LOCALBASE}/bin/shlock
729. endif 729. endif
730.endif 730.endif
731 731
732.if !defined(TOOLS_IGNORE.tar) && !empty(_USE_TOOLS:Mtar) 732.if !defined(TOOLS_IGNORE.tar) && !empty(_USE_TOOLS:Mtar)
733. if !empty(PKGPATH:Marchivers/pax) 733. if ${PKGPATH} == archivers/pax
734MAKEFLAGS+= TOOLS_IGNORE.tar= 734MAKEFLAGS+= TOOLS_IGNORE.tar=
735. elif !empty(_TOOLS_USE_PKGSRC.tar:M[yY][eE][sS]) 735. elif !empty(_TOOLS_USE_PKGSRC.tar:M[yY][eE][sS])
736TOOLS_DEPENDS.tar?= pax>=20040802:../../archivers/pax 736TOOLS_DEPENDS.tar?= pax>=20040802:../../archivers/pax
737TOOLS_CREATE+= tar 737TOOLS_CREATE+= tar
738TOOLS_PATH.tar= ${LOCALBASE}/bin/${NBPAX_PROGRAM_PREFIX}tar 738TOOLS_PATH.tar= ${LOCALBASE}/bin/${NBPAX_PROGRAM_PREFIX}tar
739. endif 739. endif
740.endif 740.endif
741 741
742.if !defined(TOOLS_IGNORE.tclsh) && !empty(_USE_TOOLS:Mtclsh) 742.if !defined(TOOLS_IGNORE.tclsh) && !empty(_USE_TOOLS:Mtclsh)
743. if !empty(PKGPATH:Mlang/tcl) 743. if ${PKGPATH} == lang/tcl
744MAKEFLAGS+= TOOLS_IGNORE.tclsh= 744MAKEFLAGS+= TOOLS_IGNORE.tclsh=
745. elif !empty(_TOOLS_USE_PKGSRC.tclsh:M[yY][eE][sS]) 745. elif !empty(_TOOLS_USE_PKGSRC.tclsh:M[yY][eE][sS])
746TOOLS_DEPENDS.tclsh?= tcl>=8.4:../../lang/tcl 746TOOLS_DEPENDS.tclsh?= tcl>=8.4:../../lang/tcl
747TOOLS_CREATE+= tclsh 747TOOLS_CREATE+= tclsh
748TOOLS_PATH.tclsh= ${LOCALBASE}/bin/tclsh 748TOOLS_PATH.tclsh= ${LOCALBASE}/bin/tclsh
749. endif 749. endif
750.endif 750.endif
751 751
752.if !defined(TOOLS_IGNORE.texi2html) && !empty(_USE_TOOLS:Mtexi2html) 752.if !defined(TOOLS_IGNORE.texi2html) && !empty(_USE_TOOLS:Mtexi2html)
753. if !empty(PKGPATH:Mtextproc/texi2html) 753. if ${PKGPATH} == textproc/texi2html
754MAKEFLAGS+= TOOLS_IGNORE.texi2html= 754MAKEFLAGS+= TOOLS_IGNORE.texi2html=
755. elif !empty(_TOOLS_USE_PKGSRC.texi2html:M[yY][eE][sS]) 755. elif !empty(_TOOLS_USE_PKGSRC.texi2html:M[yY][eE][sS])
756TOOLS_DEPENDS.texi2html?= texi2html>=1.76:../../textproc/texi2html 756TOOLS_DEPENDS.texi2html?= texi2html>=1.76:../../textproc/texi2html
757TOOLS_CREATE+= texi2html 757TOOLS_CREATE+= texi2html
758TOOLS_PATH.texi2html= ${LOCALBASE}/bin/texi2html 758TOOLS_PATH.texi2html= ${LOCALBASE}/bin/texi2html
759. endif 759. endif
760.endif 760.endif
761 761
762.if !defined(TOOLS_IGNORE.ttmkfdir) && !empty(_USE_TOOLS:Mttmkfdir) 762.if !defined(TOOLS_IGNORE.ttmkfdir) && !empty(_USE_TOOLS:Mttmkfdir)
763. if !empty(PKGPATH:Mfonts/ttmkfdir2) 763. if ${PKGPATH} == fonts/ttmkfdir2
764MAKEFLAGS+= TOOLS_IGNORE.ttmkfdir= 764MAKEFLAGS+= TOOLS_IGNORE.ttmkfdir=
765. elif !empty(_TOOLS_USE_PKGSRC.ttmkfdir:M[yY][eE][sS]) 765. elif !empty(_TOOLS_USE_PKGSRC.ttmkfdir:M[yY][eE][sS])
766TOOLS_DEPENDS.ttmkfdir?= ttmkfdir2>=20021109:../../fonts/ttmkfdir2 766TOOLS_DEPENDS.ttmkfdir?= ttmkfdir2>=20021109:../../fonts/ttmkfdir2
767TOOLS_CREATE+= ttmkfdir 767TOOLS_CREATE+= ttmkfdir
768TOOLS_PATH.ttmkfdir= ${LOCALBASE}/bin/ttmkfdir 768TOOLS_PATH.ttmkfdir= ${LOCALBASE}/bin/ttmkfdir
769. endif 769. endif
770.endif 770.endif
771 771
772.if !defined(TOOLS_IGNORE.type1inst) && !empty(_USE_TOOLS:Mtype1inst) 772.if !defined(TOOLS_IGNORE.type1inst) && !empty(_USE_TOOLS:Mtype1inst)
773. if !empty(PKGPATH:Mfonts/type1inst) 773. if ${PKGPATH} == fonts/type1inst
774MAKEFLAGS+= TOOLS_IGNORE.type1inst= 774MAKEFLAGS+= TOOLS_IGNORE.type1inst=
775. elif !empty(_TOOLS_USE_PKGSRC.type1inst:M[yY][eE][sS]) 775. elif !empty(_TOOLS_USE_PKGSRC.type1inst:M[yY][eE][sS])
776TOOLS_DEPENDS.type1inst?= type1inst>=0.6.1:../../fonts/type1inst 776TOOLS_DEPENDS.type1inst?= type1inst>=0.6.1:../../fonts/type1inst
777TOOLS_CREATE+= type1inst 777TOOLS_CREATE+= type1inst
778TOOLS_PATH.type1inst= ${LOCALBASE}/bin/type1inst 778TOOLS_PATH.type1inst= ${LOCALBASE}/bin/type1inst
779. endif 779. endif
780.endif 780.endif
781 781
782.if !defined(TOOLS_IGNORE.unrar) && !empty(_USE_TOOLS:Munrar) 782.if !defined(TOOLS_IGNORE.unrar) && !empty(_USE_TOOLS:Munrar)
783. if !empty(PKGPATH:Marchivers/unrar) 783. if ${PKGPATH} == archivers/unrar
784MAKEFLAGS+= TOOLS_IGNORE.unrar= 784MAKEFLAGS+= TOOLS_IGNORE.unrar=
785. elif !empty(_TOOLS_USE_PKGSRC.unrar:M[yY][eE][sS]) 785. elif !empty(_TOOLS_USE_PKGSRC.unrar:M[yY][eE][sS])
786TOOLS_DEPENDS.unrar?= unrar>=3.3.4:../../archivers/unrar 786TOOLS_DEPENDS.unrar?= unrar>=3.3.4:../../archivers/unrar
787TOOLS_CREATE+= unrar 787TOOLS_CREATE+= unrar
788TOOLS_PATH.unrar= ${LOCALBASE}/bin/unrar 788TOOLS_PATH.unrar= ${LOCALBASE}/bin/unrar
789. endif 789. endif
790.endif 790.endif
791 791
792.if !defined(TOOLS_IGNORE.unzip) && !empty(_USE_TOOLS:Munzip) 792.if !defined(TOOLS_IGNORE.unzip) && !empty(_USE_TOOLS:Munzip)
793. if !empty(PKGPATH:Marchivers/unzip) 793. if ${PKGPATH} == archivers/unzip
794MAKEFLAGS+= TOOLS_IGNORE.unzip= 794MAKEFLAGS+= TOOLS_IGNORE.unzip=
795. elif !empty(_TOOLS_USE_PKGSRC.unzip:M[yY][eE][sS]) 795. elif !empty(_TOOLS_USE_PKGSRC.unzip:M[yY][eE][sS])
796TOOLS_DEPENDS.unzip?= unzip-[0-9]*:../../archivers/unzip 796TOOLS_DEPENDS.unzip?= unzip-[0-9]*:../../archivers/unzip
797TOOLS_CREATE+= unzip 797TOOLS_CREATE+= unzip
798TOOLS_PATH.unzip= ${LOCALBASE}/bin/unzip 798TOOLS_PATH.unzip= ${LOCALBASE}/bin/unzip
799. endif 799. endif
800.endif 800.endif
801 801
802.if !defined(TOOLS_IGNORE.unzoo) && !empty(_USE_TOOLS:Munzoo) 802.if !defined(TOOLS_IGNORE.unzoo) && !empty(_USE_TOOLS:Munzoo)
803. if !empty(PKGPATH:Marchivers/unzoo) 803. if ${PKGPATH} == archivers/unzoo
804MAKEFLAGS+= TOOLS_IGNORE.unzoo= 804MAKEFLAGS+= TOOLS_IGNORE.unzoo=
805. elif !empty(_TOOLS_USE_PKGSRC.unzoo:M[yY][eE][sS]) 805. elif !empty(_TOOLS_USE_PKGSRC.unzoo:M[yY][eE][sS])
806TOOLS_DEPENDS.unzoo?= unzoo-[0-9]*:../../archivers/unzoo 806TOOLS_DEPENDS.unzoo?= unzoo-[0-9]*:../../archivers/unzoo
807TOOLS_CREATE+= unzoo 807TOOLS_CREATE+= unzoo
808TOOLS_PATH.unzoo= ${LOCALBASE}/bin/unzoo 808TOOLS_PATH.unzoo= ${LOCALBASE}/bin/unzoo
809. endif 809. endif
810.endif 810.endif
811 811
812.if !defined(TOOLS_IGNORE.wget) && !empty(_USE_TOOLS:Mwget) 812.if !defined(TOOLS_IGNORE.wget) && !empty(_USE_TOOLS:Mwget)
813. if !empty(PKGPATH:Mnet/wget) 813. if ${PKGPATH} == net/wget
814MAKEFLAGS+= TOOLS_IGNORE.wget= 814MAKEFLAGS+= TOOLS_IGNORE.wget=
815. elif !empty(_TOOLS_USE_PKGSRC.wget:M[yY][eE][sS]) 815. elif !empty(_TOOLS_USE_PKGSRC.wget:M[yY][eE][sS])
816TOOLS_DEPENDS.wget?= wget-[0-9]*:../../net/wget 816TOOLS_DEPENDS.wget?= wget-[0-9]*:../../net/wget
817TOOLS_PATH.wget= ${LOCALBASE}/bin/wget 817TOOLS_PATH.wget= ${LOCALBASE}/bin/wget
818. endif 818. endif
819.endif 819.endif
820 820
821.if !defined(TOOLS_IGNORE.wish) && !empty(_USE_TOOLS:Mwish) 821.if !defined(TOOLS_IGNORE.wish) && !empty(_USE_TOOLS:Mwish)
822. if !empty(PKGPATH:Mx11/tk) 822. if ${PKGPATH} == x11/tk
823MAKEFLAGS+= TOOLS_IGNORE.wish= 823MAKEFLAGS+= TOOLS_IGNORE.wish=
824. elif !empty(_TOOLS_USE_PKGSRC.wish:M[yY][eE][sS]) 824. elif !empty(_TOOLS_USE_PKGSRC.wish:M[yY][eE][sS])
825TOOLS_DEPENDS.wish?= tk>=8.4:../../x11/tk 825TOOLS_DEPENDS.wish?= tk>=8.4:../../x11/tk
826TOOLS_CREATE+= wish 826TOOLS_CREATE+= wish
827TOOLS_PATH.wish= ${LOCALBASE}/bin/wish 827TOOLS_PATH.wish= ${LOCALBASE}/bin/wish
828. endif 828. endif
829.endif 829.endif
830 830
831.if !defined(TOOLS_IGNORE.xargs) && !empty(_USE_TOOLS:Mxargs) 831.if !defined(TOOLS_IGNORE.xargs) && !empty(_USE_TOOLS:Mxargs)
832. if !empty(PKGPATH:Msysutils/findutils) 832. if ${PKGPATH} == sysutils/findutils
833MAKEFLAGS+= TOOLS_IGNORE.xargs= 833MAKEFLAGS+= TOOLS_IGNORE.xargs=
834. elif !empty(_TOOLS_USE_PKGSRC.xargs:M[yY][eE][sS]) 834. elif !empty(_TOOLS_USE_PKGSRC.xargs:M[yY][eE][sS])
835TOOLS_DEPENDS.xargs?= findutils>=4.1:../../sysutils/findutils 835TOOLS_DEPENDS.xargs?= findutils>=4.1:../../sysutils/findutils
836TOOLS_CREATE+= xargs 836TOOLS_CREATE+= xargs
837TOOLS_PATH.xargs= ${LOCALBASE}/bin/gxargs 837TOOLS_PATH.xargs= ${LOCALBASE}/bin/gxargs
838TOOLS_ARGS.xargs= -r # don't run command if stdin is empty 838TOOLS_ARGS.xargs= -r # don't run command if stdin is empty
839. endif 839. endif
840.endif 840.endif
841 841
842_TOOLS.xz= xz xzcat 842_TOOLS.xz= xz xzcat
843.for _t_ in ${_TOOLS.xz} 843.for _t_ in ${_TOOLS.xz}
844. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 844. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
845. if !empty(PKGPATH:Marchivers/xz) 845. if ${PKGPATH} == archivers/xz
846MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 846MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
847. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 847. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
848TOOLS_DEPENDS.${_t_}?= xz>=4.999.9betanb1:../../archivers/xz 848TOOLS_DEPENDS.${_t_}?= xz>=4.999.9betanb1:../../archivers/xz
849TOOLS_CREATE+= ${_t_} 849TOOLS_CREATE+= ${_t_}
850TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 850TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
851. endif 851. endif
852. endif 852. endif
853.endfor 853.endfor
854 854
855.if !defined(TOOLS_IGNORE.yacc) && !empty(_USE_TOOLS:Myacc) 855.if !defined(TOOLS_IGNORE.yacc) && !empty(_USE_TOOLS:Myacc)
856. if !empty(PKGPATH:Mdevel/bison) 856. if ${PKGPATH} == devel/bison
857MAKEFLAGS+= TOOLS_IGNORE.yacc= 857MAKEFLAGS+= TOOLS_IGNORE.yacc=
858. elif !empty(_TOOLS_USE_PKGSRC.yacc:M[yY][eE][sS]) 858. elif !empty(_TOOLS_USE_PKGSRC.yacc:M[yY][eE][sS])
859TOOLS_DEPENDS.yacc?= bison>=1.0:../../devel/bison 859TOOLS_DEPENDS.yacc?= bison>=1.0:../../devel/bison
860TOOLS_CREATE+= yacc 860TOOLS_CREATE+= yacc
861TOOLS_PATH.yacc= ${LOCALBASE}/bin/bison 861TOOLS_PATH.yacc= ${LOCALBASE}/bin/bison
862TOOLS_ARGS.yacc= -y 862TOOLS_ARGS.yacc= -y
863# 863#
864# bison/yacc is typically a build tool whose path is not embedded in 864# bison/yacc is typically a build tool whose path is not embedded in
865# any scripts or config files. In this case, pass the full command 865# any scripts or config files. In this case, pass the full command
866# line (path and arguments) of the tool to the GNU configure script 866# line (path and arguments) of the tool to the GNU configure script
867# so that bison will be correctly invoked in yacc-compatilility mode. 867# so that bison will be correctly invoked in yacc-compatilility mode.
868# 868#
869TOOLS_VALUE_GNU.yacc= ${TOOLS_CMDLINE.yacc} 869TOOLS_VALUE_GNU.yacc= ${TOOLS_CMDLINE.yacc}
870. endif 870. endif
871.endif 871.endif
872 872
873_TOOLS.zip= zip zipcloak zipnote zipsplit 873_TOOLS.zip= zip zipcloak zipnote zipsplit
874.for _t_ in ${_TOOLS.zip} 874.for _t_ in ${_TOOLS.zip}
875. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 875. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
876. if !empty(PKGPATH:Marchivers/zip) 876. if ${PKGPATH} == archivers/zip
877MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 877MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
878. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 878. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
879TOOLS_DEPENDS.${_t_}?= zip-[0-9]*:../../archivers/zip 879TOOLS_DEPENDS.${_t_}?= zip-[0-9]*:../../archivers/zip
880TOOLS_CREATE+= ${_t_} 880TOOLS_CREATE+= ${_t_}
881TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 881TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
882. endif 882. endif
883. endif 883. endif
884.endfor 884.endfor
885 885
886###################################################################### 886######################################################################
887 887
888# These tools are all supplied by the lang/perl5 package if there is 888# These tools are all supplied by the lang/perl5 package if there is
889# no native tool available. 889# no native tool available.
@@ -927,182 +927,182 @@ _TOOLS_USE_PKGSRC.perl!= \ @@ -927,182 +927,182 @@ _TOOLS_USE_PKGSRC.perl!= \
927. endfor 927. endfor
928. if !empty(_TOOLS_USE_PKGSRC.perl:M[nN][oO]) 928. if !empty(_TOOLS_USE_PKGSRC.perl:M[nN][oO])
929DEPENDS:= ${DEPENDS:N{perl[><=-]*,*}\:*:N{*,perl[><=-]*}\:*} 929DEPENDS:= ${DEPENDS:N{perl[><=-]*,*}\:*:N{*,perl[><=-]*}\:*}
930BUILD_DEPENDS:= ${BUILD_DEPENDS:N{perl[><=-]*,*}\:*:N{*,perl[><=-]*}\:*} 930BUILD_DEPENDS:= ${BUILD_DEPENDS:N{perl[><=-]*,*}\:*:N{*,perl[><=-]*}\:*}
931TOOL_DEPENDS:= ${TOOL_DEPENDS:N{perl[><=-]*,*}\:*:N{*,perl[><=-]*}\:*} 931TOOL_DEPENDS:= ${TOOL_DEPENDS:N{perl[><=-]*,*}\:*:N{*,perl[><=-]*}\:*}
932. endif 932. endif
933. endif 933. endif
934.endif 934.endif
935 935
936_TOOLS.perl= perl perldoc pod2html pod2man pod2text 936_TOOLS.perl= perl perldoc pod2html pod2man pod2text
937 937
938.for _t_ in ${_TOOLS.perl} 938.for _t_ in ${_TOOLS.perl}
939. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 939. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
940. if !empty(PKGPATH:Mlang/perl5) 940. if ${PKGPATH} == lang/perl5
941MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 941MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
942. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) || \ 942. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) || \
943 !empty(DEPENDS:Mp5-*) || !empty(PERL5_PREFIX:M${PREFIX}) 943 ${DEPENDS:Mp5-*} || !empty(PERL5_PREFIX:M${PREFIX})
944. include "../../lang/perl5/version.mk" 944. include "../../lang/perl5/version.mk"
945_TOOLS_USE_PKGSRC.perl= yes 945_TOOLS_USE_PKGSRC.perl= yes
946TOOLS_DEPENDS.${_t_}?= perl>=${PERL5_REQD}:../../lang/perl5 946TOOLS_DEPENDS.${_t_}?= perl>=${PERL5_REQD}:../../lang/perl5
947TOOLS_CREATE+= ${_t_} 947TOOLS_CREATE+= ${_t_}
948TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 948TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
949. endif 949. endif
950. endif 950. endif
951.endfor 951.endfor
952 952
953# These tools are all supplied by the sysutils/coreutils package if 953# These tools are all supplied by the sysutils/coreutils package if
954# there is no native tool available. 954# there is no native tool available.
955# 955#
956_TOOLS.coreutils= basename cat chgrp chmod chown cp cut date \ 956_TOOLS.coreutils= basename cat chgrp chmod chown cp cut date \
957 dirname echo env expr false head hostname id install \ 957 dirname echo env expr false head hostname id install \
958 ln ls mkdir mv nice numfmt printf pwd readlink realpath \ 958 ln ls mkdir mv nice numfmt printf pwd readlink realpath \
959 rm rmdir sleep sort tail tee test touch tr true tsort wc 959 rm rmdir sleep sort tail tee test touch tr true tsort wc
960 960
961.for _t_ in ${_TOOLS.coreutils} 961.for _t_ in ${_TOOLS.coreutils}
962. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 962. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
963. if !empty(PKGPATH:Msysutils/coreutils) 963. if ${PKGPATH} == sysutils/coreutils
964MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 964MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
965. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 965. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
966TOOLS_DEPENDS.${_t_}?= coreutils>=5.2.1:../../sysutils/coreutils 966TOOLS_DEPENDS.${_t_}?= coreutils>=5.2.1:../../sysutils/coreutils
967TOOLS_CREATE+= ${_t_} 967TOOLS_CREATE+= ${_t_}
968TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_} 968TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_}
969. endif 969. endif
970. endif 970. endif
971.endfor 971.endfor
972 972
973# The ``['' tool is special because it matches a token that's interpreted 973# The ``['' tool is special because it matches a token that's interpreted
974# by bmake. 974# by bmake.
975# 975#
976.if !defined(TOOLS_IGNORE.[) && !empty(_USE_TOOLS:M\[) 976.if !defined(TOOLS_IGNORE.[) && !empty(_USE_TOOLS:M\[)
977. if !empty(PKGPATH:Msysutils/coreutils) 977. if ${PKGPATH} == sysutils/coreutils
978MAKEFLAGS+= TOOLS_IGNORE.[= 978MAKEFLAGS+= TOOLS_IGNORE.[=
979. elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS]) 979. elif !empty(_TOOLS_USE_PKGSRC.[:M[yY][eE][sS])
980TOOLS_DEPENDS.[?= coreutils>=5.2.1:../../sysutils/coreutils 980TOOLS_DEPENDS.[?= coreutils>=5.2.1:../../sysutils/coreutils
981TOOLS_CREATE+= [ 981TOOLS_CREATE+= [
982TOOLS_PATH.[= ${LOCALBASE}/bin/g[ 982TOOLS_PATH.[= ${LOCALBASE}/bin/g[
983. endif 983. endif
984.endif 984.endif
985 985
986###################################################################### 986######################################################################
987 987
988# These tools are all supplied by the textproc/grep package if there is 988# These tools are all supplied by the textproc/grep package if there is
989# no native tool available. If explicit GNU versions are requested via 989# no native tool available. If explicit GNU versions are requested via
990# "ggrep" then they are preferred. 990# "ggrep" then they are preferred.
991# 991#
992_TOOLS.grep= egrep fgrep grep 992_TOOLS.grep= egrep fgrep grep
993 993
994.if !defined(TOOLS_IGNORE.ggrep) && !empty(_USE_TOOLS:Mggrep) 994.if !defined(TOOLS_IGNORE.ggrep) && !empty(_USE_TOOLS:Mggrep)
995. if !empty(PKGPATH:Mtextproc/grep) 995. if ${PKGPATH} == textproc/grep
996MAKEFLAGS+= TOOLS_IGNORE.ggrep= 996MAKEFLAGS+= TOOLS_IGNORE.ggrep=
997. elif !empty(_TOOLS_USE_PKGSRC.ggrep:M[yY][eE][sS]) 997. elif !empty(_TOOLS_USE_PKGSRC.ggrep:M[yY][eE][sS])
998TOOLS_DEPENDS.ggrep?= grep>=2.5.1:../../textproc/grep 998TOOLS_DEPENDS.ggrep?= grep>=2.5.1:../../textproc/grep
999. for _t_ in ${_TOOLS.grep} 999. for _t_ in ${_TOOLS.grep}
1000TOOLS_CREATE+= g${_t_} 1000TOOLS_CREATE+= g${_t_}
1001TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/ggrep 1001TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/ggrep
1002TOOLS_PATH.g${_t_}= ${LOCALBASE}/bin/ggrep 1002TOOLS_PATH.g${_t_}= ${LOCALBASE}/bin/ggrep
1003. endfor 1003. endfor
1004TOOLS_ARGS.egrep= -E 1004TOOLS_ARGS.egrep= -E
1005TOOLS_ARGS.gegrep= -E 1005TOOLS_ARGS.gegrep= -E
1006TOOLS_ARGS.fgrep= -F 1006TOOLS_ARGS.fgrep= -F
1007TOOLS_ARGS.gfgrep= -F 1007TOOLS_ARGS.gfgrep= -F
1008. endif 1008. endif
1009.else 1009.else
1010. for _t_ in ${_TOOLS.grep} 1010. for _t_ in ${_TOOLS.grep}
1011. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 1011. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
1012. if !empty(PKGPATH:Mtextproc/grep) 1012. if ${PKGPATH} == textproc/grep
1013MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 1013MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
1014. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 1014. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
1015TOOLS_DEPENDS.${_t_}?= grep>=2.5.1:../../textproc/grep 1015TOOLS_DEPENDS.${_t_}?= grep>=2.5.1:../../textproc/grep
1016TOOLS_CREATE+= ${_t_} 1016TOOLS_CREATE+= ${_t_}
1017TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_} 1017TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_}
1018. endif 1018. endif
1019. endif 1019. endif
1020. endfor 1020. endfor
1021.endif 1021.endif
1022 1022
1023###################################################################### 1023######################################################################
1024 1024
1025# These tools are supplied by textproc/mandoc as replacements for their 1025# These tools are supplied by textproc/mandoc as replacements for their
1026# groff counterparts. As this package has fewer dependencies it should 1026# groff counterparts. As this package has fewer dependencies it should
1027# be preferred over groff wherever possible. 1027# be preferred over groff wherever possible.
1028# 1028#
1029_TOOLS.mandoc= nroff 1029_TOOLS.mandoc= nroff
1030 1030
1031.for _t_ in ${_TOOLS.mandoc} 1031.for _t_ in ${_TOOLS.mandoc}
1032. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 1032. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
1033. if !empty(PKGPATH:Mtextproc/mandoc) 1033. if ${PKGPATH} == textproc/mandoc
1034MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 1034MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
1035. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 1035. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
1036TOOLS_DEPENDS.${_t_}?= mandoc>=1.12.0nb3:../../textproc/mandoc 1036TOOLS_DEPENDS.${_t_}?= mandoc>=1.12.0nb3:../../textproc/mandoc
1037TOOLS_CREATE+= ${_t_} 1037TOOLS_CREATE+= ${_t_}
1038TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/mandoc 1038TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/mandoc
1039. endif 1039. endif
1040. endif 1040. endif
1041.endfor 1041.endfor
1042 1042
1043###################################################################### 1043######################################################################
1044 1044
1045# These tools are all supplied by the textproc/groff package if there is 1045# These tools are all supplied by the textproc/groff package if there is
1046# no native tool available. 1046# no native tool available.
1047# 1047#
1048_TOOLS.groff= groff soelim tbl 1048_TOOLS.groff= groff soelim tbl
1049 1049
1050.for _t_ in ${_TOOLS.groff} 1050.for _t_ in ${_TOOLS.groff}
1051. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 1051. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
1052. if !empty(PKGPATH:Mtextproc/groff) 1052. if ${PKGPATH} == textproc/groff
1053MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 1053MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
1054. else 1054. else
1055. if defined(_TOOLS_USE_PKGSRC.groff) && \ 1055. if defined(_TOOLS_USE_PKGSRC.groff) && \
1056 !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS]) 1056 !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS])
1057_TOOLS_USE_PKGSRC.${_t_}= yes 1057_TOOLS_USE_PKGSRC.${_t_}= yes
1058. endif 1058. endif
1059. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 1059. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
1060TOOLS_DEPENDS.${_t_}?= groff>=1.19.2nb3:../../textproc/groff 1060TOOLS_DEPENDS.${_t_}?= groff>=1.19.2nb3:../../textproc/groff
1061TOOLS_CREATE+= ${_t_} 1061TOOLS_CREATE+= ${_t_}
1062. if "${_t_}" != "groff" 1062. if "${_t_}" != "groff"
1063TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_} 1063TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_}
1064TOOLS_ALIASES.${_t_}= g${_t_} 1064TOOLS_ALIASES.${_t_}= g${_t_}
1065. else 1065. else
1066TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 1066TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
1067. endif 1067. endif
1068. endif 1068. endif
1069. endif 1069. endif
1070. endif 1070. endif
1071.endfor 1071.endfor
1072 1072
1073# ``gsoelim'' is the real tool ``soelim'' above, but the 1073# ``gsoelim'' is the real tool ``soelim'' above, but the
1074# legacy tools names are still possible. 1074# legacy tools names are still possible.
1075.if !defined(TOOLS_IGNORE.gsoelim) && !empty(_USE_TOOLS:Mgsoelim) 1075.if !defined(TOOLS_IGNORE.gsoelim) && !empty(_USE_TOOLS:Mgsoelim)
1076. if !empty(PKGPATH:Mtextproc/groff) 1076. if ${PKGPATH} == textproc/groff
1077MAKEFLAGS+= TOOLS_IGNORE.gsoelim= 1077MAKEFLAGS+= TOOLS_IGNORE.gsoelim=
1078. elif !empty(_TOOLS_USE_PKGSRC.gsoelim:M[yY][eE][sS]) 1078. elif !empty(_TOOLS_USE_PKGSRC.gsoelim:M[yY][eE][sS])
1079TOOLS_DEPENDS.gsoelim?= groff>=1.19nb4:../../textproc/groff 1079TOOLS_DEPENDS.gsoelim?= groff>=1.19nb4:../../textproc/groff
1080TOOLS_CREATE+= gsoelim 1080TOOLS_CREATE+= gsoelim
1081TOOLS_PATH.gsoelim= ${LOCALBASE}/bin/gsoelim 1081TOOLS_PATH.gsoelim= ${LOCALBASE}/bin/gsoelim
1082. endif 1082. endif
1083TOOLS_ALIASES.gsoelim= soelim 1083TOOLS_ALIASES.gsoelim= soelim
1084.endif 1084.endif
1085 1085
1086###################################################################### 1086######################################################################
1087 1087
1088# These tools are all supplied by the devel/diffutils package if there is 1088# These tools are all supplied by the devel/diffutils package if there is
1089# no native tool available. 1089# no native tool available.
1090# 1090#
1091_TOOLS.diffutils= cmp diff diff3 sdiff 1091_TOOLS.diffutils= cmp diff diff3 sdiff
1092 1092
1093.for _t_ in ${_TOOLS.diffutils} 1093.for _t_ in ${_TOOLS.diffutils}
1094. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 1094. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
1095. if !empty(PKGPATH:Mdevel/diffutils) 1095. if ${PKGPATH} == devel/diffutils
1096MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 1096MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
1097. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 1097. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
1098TOOLS_DEPENDS.${_t_}?= diffutils>=2.8.1:../../devel/diffutils 1098TOOLS_DEPENDS.${_t_}?= diffutils>=2.8.1:../../devel/diffutils
1099TOOLS_CREATE+= ${_t_} 1099TOOLS_CREATE+= ${_t_}
1100TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_} 1100TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/g${_t_}
1101. endif 1101. endif
1102. endif 1102. endif
1103.endfor 1103.endfor
1104 1104
1105###################################################################### 1105######################################################################
1106 1106
1107# These tools are all supplied by a Ghostscript package if there is no 1107# These tools are all supplied by a Ghostscript package if there is no
1108# native tool available. 1108# native tool available.
@@ -1115,158 +1115,158 @@ _TOOLS.ghostscript= dvipdf gs pdf2ps ps2 @@ -1115,158 +1115,158 @@ _TOOLS.ghostscript= dvipdf gs pdf2ps ps2
1115GHOSTSCRIPT_REQD?= 6.01 1115GHOSTSCRIPT_REQD?= 6.01
1116 1116
1117# Set TOOLS_DEPENDS.ghostscript to an appropriate dependency based on 1117# Set TOOLS_DEPENDS.ghostscript to an appropriate dependency based on
1118# various package options. 1118# various package options.
1119# 1119#
1120.if !defined(TOOLS_DEPENDS.ghostscript) 1120.if !defined(TOOLS_DEPENDS.ghostscript)
1121_TOOLS_DEP.ghostscript:= ghostscript 1121_TOOLS_DEP.ghostscript:= ghostscript
1122TOOLS_DEPENDS.ghostscript= ghostscript>=${GHOSTSCRIPT_REQD}:../../print/ghostscript 1122TOOLS_DEPENDS.ghostscript= ghostscript>=${GHOSTSCRIPT_REQD}:../../print/ghostscript
1123MAKEVARS+= TOOLS_DEPENDS.ghostscript 1123MAKEVARS+= TOOLS_DEPENDS.ghostscript
1124.endif 1124.endif
1125 1125
1126.for _t_ in ${_TOOLS.ghostscript} 1126.for _t_ in ${_TOOLS.ghostscript}
1127. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) 1127. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
1128. if !empty(PKGPATH:Mprint/ghostscript) 1128. if ${PKGPATH} == print/ghostscript
1129MAKEFLAGS+= TOOLS_IGNORE.${_t_}= 1129MAKEFLAGS+= TOOLS_IGNORE.${_t_}=
1130. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 1130. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
1131TOOLS_DEPENDS.${_t_}?= ${TOOLS_DEPENDS.ghostscript} 1131TOOLS_DEPENDS.${_t_}?= ${TOOLS_DEPENDS.ghostscript}
1132TOOLS_CREATE+= ${_t_} 1132TOOLS_CREATE+= ${_t_}
1133TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 1133TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
1134. endif 1134. endif
1135. endif 1135. endif
1136.endfor 1136.endfor
1137 1137
1138###################################################################### 1138######################################################################
1139 1139
1140# For modular Xorg, these are individual packages. 1140# For modular Xorg, these are individual packages.
1141# 1141#
1142.if !defined(TOOLS_IGNORE.iceauth) && !empty(_USE_TOOLS:Miceauth) 1142.if !defined(TOOLS_IGNORE.iceauth) && !empty(_USE_TOOLS:Miceauth)
1143. if !empty(PKGPATH:Mx11/iceauth) 1143. if ${PKGPATH} == x11/iceauth
1144MAKEFLAGS+= TOOLS_IGNORE.iceauth= 1144MAKEFLAGS+= TOOLS_IGNORE.iceauth=
1145. elif !empty(_TOOLS_USE_PKGSRC.iceauth:M[yY][eE][sS]) 1145. elif !empty(_TOOLS_USE_PKGSRC.iceauth:M[yY][eE][sS])
1146TOOLS_CREATE+= iceauth 1146TOOLS_CREATE+= iceauth
1147. if !empty(X11_TYPE:Mnative) 1147. if ${X11_TYPE} == native
1148TOOLS_PATH.iceauth= ${X11BASE}/bin/iceauth 1148TOOLS_PATH.iceauth= ${X11BASE}/bin/iceauth
1149. else 1149. else
1150TOOLS_DEPENDS.iceauth?= iceauth-[0-9]*:../../x11/iceauth 1150TOOLS_DEPENDS.iceauth?= iceauth-[0-9]*:../../x11/iceauth
1151TOOLS_PATH.iceauth= ${LOCALBASE}/bin/iceauth 1151TOOLS_PATH.iceauth= ${LOCALBASE}/bin/iceauth
1152. endif 1152. endif
1153. endif 1153. endif
1154.endif 1154.endif
1155 1155
1156.if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir) 1156.if !defined(TOOLS_IGNORE.mkfontdir) && !empty(_USE_TOOLS:Mmkfontdir)
1157. if !empty(PKGPATH:Mfonts/mkfontscale) 1157. if ${PKGPATH} == fonts/mkfontscale
1158MAKEFLAGS+= TOOLS_IGNORE.mkfontdir= 1158MAKEFLAGS+= TOOLS_IGNORE.mkfontdir=
1159. elif !empty(_TOOLS_USE_PKGSRC.mkfontdir:M[yY][eE][sS]) 1159. elif !empty(_TOOLS_USE_PKGSRC.mkfontdir:M[yY][eE][sS])
1160TOOLS_CREATE+= mkfontdir 1160TOOLS_CREATE+= mkfontdir
1161. if !empty(X11_TYPE:Mnative) 1161. if ${X11_TYPE} == native
1162TOOLS_PATH.mkfontdir= ${X11BASE}/bin/mkfontdir 1162TOOLS_PATH.mkfontdir= ${X11BASE}/bin/mkfontdir
1163. else 1163. else
1164TOOLS_DEPENDS.mkfontdir?= mkfontscale>=1.2:../../fonts/mkfontscale 1164TOOLS_DEPENDS.mkfontdir?= mkfontscale>=1.2:../../fonts/mkfontscale
1165TOOLS_PATH.mkfontdir= ${LOCALBASE}/bin/mkfontdir 1165TOOLS_PATH.mkfontdir= ${LOCALBASE}/bin/mkfontdir
1166. endif 1166. endif
1167. endif 1167. endif
1168.endif 1168.endif
1169 1169
1170.if !defined(TOOLS_IGNORE.mkfontscale) && !empty(_USE_TOOLS:Mmkfontscale) 1170.if !defined(TOOLS_IGNORE.mkfontscale) && !empty(_USE_TOOLS:Mmkfontscale)
1171. if !empty(PKGPATH:Mfonts/mkfontscale) 1171. if ${PKGPATH} == fonts/mkfontscale
1172MAKEFLAGS+= TOOLS_IGNORE.mkfontscale= 1172MAKEFLAGS+= TOOLS_IGNORE.mkfontscale=
1173. elif !empty(_TOOLS_USE_PKGSRC.mkfontscale:M[yY][eE][sS]) 1173. elif !empty(_TOOLS_USE_PKGSRC.mkfontscale:M[yY][eE][sS])
1174TOOLS_CREATE+= mkfontscale 1174TOOLS_CREATE+= mkfontscale
1175. if !empty(X11_TYPE:Mnative) 1175. if ${X11_TYPE} == native
1176TOOLS_PATH.mkfontscale= ${X11BASE}/bin/mkfontscale 1176TOOLS_PATH.mkfontscale= ${X11BASE}/bin/mkfontscale
1177. else 1177. else
1178TOOLS_DEPENDS.mkfontscale?= mkfontscale-[0-9]*:../../fonts/mkfontscale 1178TOOLS_DEPENDS.mkfontscale?= mkfontscale-[0-9]*:../../fonts/mkfontscale
1179TOOLS_PATH.mkfontscale= ${LOCALBASE}/bin/mkfontscale 1179TOOLS_PATH.mkfontscale= ${LOCALBASE}/bin/mkfontscale
1180. endif 1180. endif
1181. endif 1181. endif
1182.endif 1182.endif
1183 1183
1184.if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf) 1184.if !defined(TOOLS_IGNORE.bdftopcf) && !empty(_USE_TOOLS:Mbdftopcf)
1185. if !empty(PKGPATH:Mfonts/bdftopcf) 1185. if ${PKGPATH} == fonts/bdftopcf
1186MAKEFLAGS+= TOOLS_IGNORE.bdftopcf= 1186MAKEFLAGS+= TOOLS_IGNORE.bdftopcf=
1187. elif !empty(_TOOLS_USE_PKGSRC.bdftopcf:M[yY][eE][sS]) 1187. elif !empty(_TOOLS_USE_PKGSRC.bdftopcf:M[yY][eE][sS])
1188TOOLS_CREATE+= bdftopcf 1188TOOLS_CREATE+= bdftopcf
1189. if !empty(X11_TYPE:Mnative) && exists(${X11BASE}/bin/bdftopcf) 1189. if ${X11_TYPE} == native && exists(${X11BASE}/bin/bdftopcf)
1190TOOLS_PATH.bdftopcf= ${X11BASE}/bin/bdftopcf 1190TOOLS_PATH.bdftopcf= ${X11BASE}/bin/bdftopcf
1191. else 1191. else
1192TOOLS_DEPENDS.bdftopcf?= bdftopcf-[0-9]*:../../fonts/bdftopcf 1192TOOLS_DEPENDS.bdftopcf?= bdftopcf-[0-9]*:../../fonts/bdftopcf
1193TOOLS_PATH.bdftopcf= ${LOCALBASE}/bin/bdftopcf 1193TOOLS_PATH.bdftopcf= ${LOCALBASE}/bin/bdftopcf
1194. endif 1194. endif
1195. endif 1195. endif
1196.endif 1196.endif
1197 1197
1198.if !defined(TOOLS_IGNORE.ucs2any) && !empty(_USE_TOOLS:Mucs2any) 1198.if !defined(TOOLS_IGNORE.ucs2any) && !empty(_USE_TOOLS:Mucs2any)
1199. if !empty(PKGPATH:Mfonts/font-util) 1199. if ${PKGPATH} == fonts/font-util
1200MAKEFLAGS+= TOOLS_IGNORE.ucs2any= 1200MAKEFLAGS+= TOOLS_IGNORE.ucs2any=
1201. elif !empty(_TOOLS_USE_PKGSRC.ucs2any:M[yY][eE][sS]) 1201. elif !empty(_TOOLS_USE_PKGSRC.ucs2any:M[yY][eE][sS])
1202TOOLS_CREATE+= ucs2any 1202TOOLS_CREATE+= ucs2any
1203. if !empty(X11_TYPE:Mnative) 1203. if ${X11_TYPE} == native
1204TOOLS_PATH.ucs2any= ${X11BASE}/bin/ucs2any 1204TOOLS_PATH.ucs2any= ${X11BASE}/bin/ucs2any
1205. else 1205. else
1206TOOLS_DEPENDS.ucs2any?= font-util-[0-9]*:../../fonts/font-util 1206TOOLS_DEPENDS.ucs2any?= font-util-[0-9]*:../../fonts/font-util
1207TOOLS_PATH.ucs2any= ${LOCALBASE}/bin/ucs2any 1207TOOLS_PATH.ucs2any= ${LOCALBASE}/bin/ucs2any
1208. endif 1208. endif
1209. endif 1209. endif
1210.endif 1210.endif
1211 1211
1212.if !defined(TOOLS_IGNORE.bdftruncate) && !empty(_USE_TOOLS:Mbdftruncate) 1212.if !defined(TOOLS_IGNORE.bdftruncate) && !empty(_USE_TOOLS:Mbdftruncate)
1213. if !empty(PKGPATH:Mfonts/font-util) 1213. if ${PKGPATH} == fonts/font-util
1214MAKEFLAGS+= TOOLS_IGNORE.bdftruncate= 1214MAKEFLAGS+= TOOLS_IGNORE.bdftruncate=
1215. elif !empty(_TOOLS_USE_PKGSRC.bdftruncate:M[yY][eE][sS]) 1215. elif !empty(_TOOLS_USE_PKGSRC.bdftruncate:M[yY][eE][sS])
1216TOOLS_CREATE+= bdftruncate 1216TOOLS_CREATE+= bdftruncate
1217. if !empty(X11_TYPE:Mnative) 1217. if ${X11_TYPE} == native
1218TOOLS_PATH.bdftruncate= ${X11BASE}/bin/bdftruncate 1218TOOLS_PATH.bdftruncate= ${X11BASE}/bin/bdftruncate
1219. else 1219. else
1220TOOLS_DEPENDS.bdftruncate?= font-util-[0-9]*:../../fonts/font-util 1220TOOLS_DEPENDS.bdftruncate?= font-util-[0-9]*:../../fonts/font-util
1221TOOLS_PATH.bdftruncate= ${LOCALBASE}/bin/bdftruncate 1221TOOLS_PATH.bdftruncate= ${LOCALBASE}/bin/bdftruncate
1222. endif 1222. endif
1223. endif 1223. endif
1224.endif 1224.endif
1225 1225
1226.if !defined(TOOLS_IGNORE.xauth) && !empty(_USE_TOOLS:Mxauth) 1226.if !defined(TOOLS_IGNORE.xauth) && !empty(_USE_TOOLS:Mxauth)
1227. if !empty(PKGPATH:Mx11/xauth) 1227. if ${PKGPATH} == x11/xauth
1228MAKEFLAGS+= TOOLS_IGNORE.xauth= 1228MAKEFLAGS+= TOOLS_IGNORE.xauth=
1229. elif !empty(_TOOLS_USE_PKGSRC.xauth:M[yY][eE][sS]) 1229. elif !empty(_TOOLS_USE_PKGSRC.xauth:M[yY][eE][sS])
1230TOOLS_CREATE+= xauth 1230TOOLS_CREATE+= xauth
1231. if !empty(X11_TYPE:Mnative) 1231. if ${X11_TYPE} == native
1232TOOLS_PATH.xauth= ${X11BASE}/bin/xauth 1232TOOLS_PATH.xauth= ${X11BASE}/bin/xauth
1233. else 1233. else
1234TOOLS_DEPENDS.xauth?= xauth-[0-9]*:../../x11/xauth 1234TOOLS_DEPENDS.xauth?= xauth-[0-9]*:../../x11/xauth
1235TOOLS_PATH.xauth= ${LOCALBASE}/bin/xauth 1235TOOLS_PATH.xauth= ${LOCALBASE}/bin/xauth
1236. endif 1236. endif
1237. endif 1237. endif
1238.endif 1238.endif
1239 1239
1240.if !defined(TOOLS_IGNORE.xinit) && !empty(_USE_TOOLS:Mxinit) 1240.if !defined(TOOLS_IGNORE.xinit) && !empty(_USE_TOOLS:Mxinit)
1241. if !empty(PKGPATH:Mx11/xinit) 1241. if ${PKGPATH} == x11/xinit
1242MAKEFLAGS+= TOOLS_IGNORE.xinit= 1242MAKEFLAGS+= TOOLS_IGNORE.xinit=
1243. elif !empty(_TOOLS_USE_PKGSRC.xinit:M[yY][eE][sS]) 1243. elif !empty(_TOOLS_USE_PKGSRC.xinit:M[yY][eE][sS])
1244TOOLS_CREATE+= xinit 1244TOOLS_CREATE+= xinit
1245. if !empty(X11_TYPE:Mnative) 1245. if ${X11_TYPE} == native
1246TOOLS_PATH.xinit= ${X11BASE}/bin/xinit 1246TOOLS_PATH.xinit= ${X11BASE}/bin/xinit
1247. else 1247. else
1248TOOLS_DEPENDS.xinit?= xinit-[0-9]*:../../x11/xinit 1248TOOLS_DEPENDS.xinit?= xinit-[0-9]*:../../x11/xinit
1249TOOLS_PATH.xinit= ${LOCALBASE}/bin/xinit 1249TOOLS_PATH.xinit= ${LOCALBASE}/bin/xinit
1250. endif 1250. endif
1251. endif 1251. endif
1252.endif 1252.endif
1253 1253
1254.if !defined(TOOLS_IGNORE.xmessage) && !empty(_USE_TOOLS:Mxmessage) 1254.if !defined(TOOLS_IGNORE.xmessage) && !empty(_USE_TOOLS:Mxmessage)
1255. if !empty(PKGPATH:Mx11/xmessage) 1255. if ${PKGPATH} == x11/xmessage
1256MAKEFLAGS+= TOOLS_IGNORE.xmessage= 1256MAKEFLAGS+= TOOLS_IGNORE.xmessage=
1257. elif !empty(_TOOLS_USE_PKGSRC.xmessage:M[yY][eE][sS]) 1257. elif !empty(_TOOLS_USE_PKGSRC.xmessage:M[yY][eE][sS])
1258TOOLS_CREATE+= xmessage 1258TOOLS_CREATE+= xmessage
1259. if !empty(X11_TYPE:Mnative) 1259. if ${X11_TYPE} == native
1260TOOLS_PATH.xmessage= ${X11BASE}/bin/xmessage 1260TOOLS_PATH.xmessage= ${X11BASE}/bin/xmessage
1261. else 1261. else
1262TOOLS_DEPENDS.xmessage?= xmessage-[0-9]*:../../x11/xmessage 1262TOOLS_DEPENDS.xmessage?= xmessage-[0-9]*:../../x11/xmessage
1263TOOLS_PATH.xmessage= ${LOCALBASE}/bin/xmessage 1263TOOLS_PATH.xmessage= ${LOCALBASE}/bin/xmessage
1264. endif 1264. endif
1265. endif 1265. endif
1266.endif 1266.endif
1267 1267
1268###################################################################### 1268######################################################################
1269 1269
1270# These tools are all supplied by an X11 imake package if there is no 1270# These tools are all supplied by an X11 imake package if there is no
1271# native tool available. 1271# native tool available.
1272# 1272#
@@ -1274,42 +1274,42 @@ _TOOLS.x11-imake= imake mkdirhier xmkmf @@ -1274,42 +1274,42 @@ _TOOLS.x11-imake= imake mkdirhier xmkmf
1274 1274
1275.for _t_ in ${_TOOLS.x11-imake} 1275.for _t_ in ${_TOOLS.x11-imake}
1276. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) && \ 1276. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) && \
1277 !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) 1277 !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
1278TOOLS_CREATE+= ${_t_} 1278TOOLS_CREATE+= ${_t_}
1279TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake 1279TOOLS_DEPENDS.${_t_}?= imake-[0-9]*:../../devel/imake
1280TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_} 1280TOOLS_PATH.${_t_}= ${LOCALBASE}/bin/${_t_}
1281. endif 1281. endif
1282.endfor 1282.endfor
1283 1283
1284.if !defined(TOOLS_IGNORE.makedepend) && !empty(_USE_TOOLS:Mmakedepend) && \ 1284.if !defined(TOOLS_IGNORE.makedepend) && !empty(_USE_TOOLS:Mmakedepend) && \
1285 !empty(_TOOLS_USE_PKGSRC.makedepend:M[yY][eE][sS]) 1285 !empty(_TOOLS_USE_PKGSRC.makedepend:M[yY][eE][sS])
1286TOOLS_CREATE+= makedepend 1286TOOLS_CREATE+= makedepend
1287. if defined(X11_TYPE) && !empty(X11_TYPE:Mmodular) 1287. if ${X11_TYPE:U} == modular
1288TOOLS_DEPENDS.makedepend?= makedepend-[0-9]*:../../devel/makedepend 1288TOOLS_DEPENDS.makedepend?= makedepend-[0-9]*:../../devel/makedepend
1289TOOLS_PATH.makedepend= ${LOCALBASE}/bin/makedepend 1289TOOLS_PATH.makedepend= ${LOCALBASE}/bin/makedepend
1290. else # !empty(X11_TYPE:Mnative) 1290. else
1291TOOLS_PATH.makedepend= ${X11BASE}/bin/makedepend 1291TOOLS_PATH.makedepend= ${X11BASE}/bin/makedepend
1292. endif 1292. endif
1293.endif 1293.endif
1294 1294
1295###################################################################### 1295######################################################################
1296 1296
1297.for _t_ in ${_USE_TOOLS} 1297.for _t_ in ${_USE_TOOLS}
1298### 1298###
1299### For each tool that depends on X11 for its native version, make 1299### For each tool that depends on X11 for its native version, make
1300### sure it is really installed (i.e. xbase has been installed). 1300### sure it is really installed (i.e. xbase has been installed).
1301### 1301###
1302. if defined(TOOLS_PATH.${_t_}) && !empty(X11_TYPE:Mnative) 1302. if defined(TOOLS_PATH.${_t_}) && ${X11_TYPE:U} == native
1303. if !exists(${TOOLS_PATH.${_t_}}) && !empty(TOOLS_PATH.${_t_}:M${X11BASE}*) 1303. if !exists(${TOOLS_PATH.${_t_}}) && !empty(TOOLS_PATH.${_t_}:M${X11BASE}*)
1304_tmiss_+= ${_t_} 1304_tmiss_+= ${_t_}
1305. endif 1305. endif
1306. endif 1306. endif
1307 1307
1308. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) && \ 1308. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) && \
1309 !defined(TOOLS_IGNORE.${_t_}) 1309 !defined(TOOLS_IGNORE.${_t_})
1310##### 1310#####
1311##### Add the dependencies for each pkgsrc-supplied tool. 1311##### Add the dependencies for each pkgsrc-supplied tool.
1312##### 1312#####
1313. if defined(_TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_}) 1313. if defined(_TOOLS_DEPMETHOD.${_t_}) && defined(TOOLS_DEPENDS.${_t_})
1314. for _dep_ in ${TOOLS_DEPENDS.${_t_}} 1314. for _dep_ in ${TOOLS_DEPENDS.${_t_}}
1315_dep_test:= ${_dep_:C/\:.*$//} 1315_dep_test:= ${_dep_:C/\:.*$//}
cvs diff -r1.5 -r1.6 pkgsrc/mk/tools/tools.FreeMiNT.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.FreeMiNT.mk 2022/04/04 11:23:07 1.5
+++ pkgsrc/mk/tools/tools.FreeMiNT.mk 2023/03/04 23:29:24 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.FreeMiNT.mk,v 1.5 2022/04/04 11:23:07 riastradh Exp $ 1# $NetBSD: tools.FreeMiNT.mk,v 1.6 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# System-supplied tools for the FreeMiNT operating system. 3# System-supplied tools for the FreeMiNT operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6TOOLS_PLATFORM.awk?= /bin/awk 6TOOLS_PLATFORM.awk?= /bin/awk
7TOOLS_PLATFORM.basename?= /bin/basename 7TOOLS_PLATFORM.basename?= /bin/basename
8TOOLS_PLATFORM.byacc?= /usr/bin/yacc 8TOOLS_PLATFORM.byacc?= /usr/bin/yacc
9TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 9TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
10TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 10TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
11TOOLS_PLATFORM.cat?= /bin/cat 11TOOLS_PLATFORM.cat?= /bin/cat
12TOOLS_PLATFORM.chgrp?= /bin/chgrp 12TOOLS_PLATFORM.chgrp?= /bin/chgrp
13TOOLS_PLATFORM.chmod?= /bin/chmod 13TOOLS_PLATFORM.chmod?= /bin/chmod
14TOOLS_PLATFORM.chown?= /bin/chown 14TOOLS_PLATFORM.chown?= /bin/chown
@@ -27,82 +27,82 @@ TOOLS_PLATFORM.false?= false # shell  @@ -27,82 +27,82 @@ TOOLS_PLATFORM.false?= false # shell
27TOOLS_PLATFORM.fgrep?= /bin/fgrep 27TOOLS_PLATFORM.fgrep?= /bin/fgrep
28TOOLS_PLATFORM.find?= /usr/bin/find 28TOOLS_PLATFORM.find?= /usr/bin/find
29TOOLS_PLATFORM.flex?= /usr/bin/lex 29TOOLS_PLATFORM.flex?= /usr/bin/lex
30TOOLS_PLATFORM.grep?= /bin/grep 30TOOLS_PLATFORM.grep?= /bin/grep
31TOOLS_PLATFORM.groff?= /usr/bin/groff 31TOOLS_PLATFORM.groff?= /usr/bin/groff
32TOOLS_PLATFORM.gsed?= ${TOOLS_PLATFORM.sed} # GNUish 32TOOLS_PLATFORM.gsed?= ${TOOLS_PLATFORM.sed} # GNUish
33TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish 33TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish
34TOOLS_PLATFORM.gunzip?= /bin/gunzip -f 34TOOLS_PLATFORM.gunzip?= /bin/gunzip -f
35TOOLS_PLATFORM.gzcat?= /bin/gunzip -c 35TOOLS_PLATFORM.gzcat?= /bin/gunzip -c
36TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 36TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
37TOOLS_PLATFORM.head?= /usr/bin/head 37TOOLS_PLATFORM.head?= /usr/bin/head
38TOOLS_PLATFORM.hostname?= /bin/hostname 38TOOLS_PLATFORM.hostname?= /bin/hostname
39TOOLS_PLATFORM.id?= /usr/bin/id 39TOOLS_PLATFORM.id?= /usr/bin/id
40.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 40.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
41TOOLS_PLATFORM.install?= /usr/bin/install 41TOOLS_PLATFORM.install?= /usr/bin/install
42.else 42.else
43TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install 43TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
44.endif 44.endif
45TOOLS_PLATFORM.install-info?= /sbin/install-info 45TOOLS_PLATFORM.install-info?= /sbin/install-info
46TOOLS_PLATFORM.lex?= /usr/bin/lex 46TOOLS_PLATFORM.lex?= /usr/bin/lex
47TOOLS_PLATFORM.ln?= /bin/ln 47TOOLS_PLATFORM.ln?= /bin/ln
48TOOLS_PLATFORM.ls?= /bin/ls 48TOOLS_PLATFORM.ls?= /bin/ls
49TOOLS_PLATFORM.m4?= /usr/bin/m4 49TOOLS_PLATFORM.m4?= /usr/bin/m4
50TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 50TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
51TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 51TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
52TOOLS_PLATFORM.mktemp?= /bin/mktemp 52TOOLS_PLATFORM.mktemp?= /bin/mktemp
53TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt 53TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt
54TOOLS_PLATFORM.mv?= /bin/mv 54TOOLS_PLATFORM.mv?= /bin/mv
55TOOLS_PLATFORM.nice?= /bin/nice 55TOOLS_PLATFORM.nice?= /bin/nice
56TOOLS_PLATFORM.nroff?= /usr/bin/nroff 56TOOLS_PLATFORM.nroff?= /usr/bin/nroff
57TOOLS_PLATFORM.openssl?= /usr/bin/openssl 57TOOLS_PLATFORM.openssl?= /usr/bin/openssl
58TOOLS_PLATFORM.patch?= /usr/bin/patch 58TOOLS_PLATFORM.patch?= /usr/bin/patch
59TOOLS_PLATFORM.printf?= /usr/bin/printf 59TOOLS_PLATFORM.printf?= /usr/bin/printf
60TOOLS_PLATFORM.pwd?= /bin/pwd 60TOOLS_PLATFORM.pwd?= /bin/pwd
61.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 61.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
62TOOLS_PLATFORM.readelf?= /usr/bin/readelf 62TOOLS_PLATFORM.readelf?= /usr/bin/readelf
63.else 63.else
64TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf 64TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
65.endif 65.endif
66TOOLS_PLATFORM.rm?= /bin/rm 66TOOLS_PLATFORM.rm?= /bin/rm
67TOOLS_PLATFORM.rmdir?= /bin/rmdir 67TOOLS_PLATFORM.rmdir?= /bin/rmdir
68TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 68TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
69TOOLS_PLATFORM.sed?= /bin/sed 69TOOLS_PLATFORM.sed?= /bin/sed
70TOOLS_PLATFORM.sh?= /bin/sh 70TOOLS_PLATFORM.sh?= /bin/sh
71TOOLS_PLATFORM.sleep?= /bin/sleep 71TOOLS_PLATFORM.sleep?= /bin/sleep
72TOOLS_PLATFORM.soelim?= /usr/bin/soelim 72TOOLS_PLATFORM.soelim?= /usr/bin/soelim
73TOOLS_PLATFORM.sort?= /bin/sort 73TOOLS_PLATFORM.sort?= /bin/sort
74.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 74.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
75TOOLS_PLATFORM.strip?= /usr/bin/strip 75TOOLS_PLATFORM.strip?= /usr/bin/strip
76.else 76.else
77TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip 77TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
78.endif 78.endif
79 79
80TOOLS_PLATFORM.tail?= /usr/bin/tail 80TOOLS_PLATFORM.tail?= /usr/bin/tail
81TOOLS_PLATFORM.tar?= /bin/tar 81TOOLS_PLATFORM.tar?= /bin/tar
82TOOLS_PLATFORM.tbl?= /usr/bin/tbl 82TOOLS_PLATFORM.tbl?= /usr/bin/tbl
83TOOLS_PLATFORM.tee?= /usr/bin/tee 83TOOLS_PLATFORM.tee?= /usr/bin/tee
84TOOLS_PLATFORM.test?= test # shell builtin 84TOOLS_PLATFORM.test?= test # shell builtin
85TOOLS_PLATFORM.touch?= /bin/touch 85TOOLS_PLATFORM.touch?= /bin/touch
86TOOLS_PLATFORM.tr?= /usr/bin/tr 86TOOLS_PLATFORM.tr?= /usr/bin/tr
87TOOLS_PLATFORM.true?= true # shell builtin 87TOOLS_PLATFORM.true?= true # shell builtin
88TOOLS_PLATFORM.tsort?= /usr/bin/tsort 88TOOLS_PLATFORM.tsort?= /usr/bin/tsort
89TOOLS_PLATFORM.uniq?= /bin/uniq 89TOOLS_PLATFORM.uniq?= /bin/uniq
90TOOLS_PLATFORM.wc?= /usr/bin/wc 90TOOLS_PLATFORM.wc?= /usr/bin/wc
91TOOLS_PLATFORM.xargs?= /usr/bin/xargs -r 91TOOLS_PLATFORM.xargs?= /usr/bin/xargs -r
92TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext 92TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
93TOOLS_PLATFORM.yacc?= /usr/bin/yacc 93TOOLS_PLATFORM.yacc?= /usr/bin/yacc
94 94
95.if !empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 95.if ${TOOLS_USE_CROSS_COMPILE:tl} == yes
96. for _t_ in ar as ld nm objdump ranlib readelf strip 96. for _t_ in ar as ld nm objdump ranlib readelf strip
97TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \ 97TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
98 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_} 98 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_}
99TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_} 99TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
100. endfor 100. endfor
101 101
102TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar 102TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
103TOOLS_CREATE+= ar 103TOOLS_CREATE+= ar
104TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib 104TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
105TOOLS_CREATE+= ranlib 105TOOLS_CREATE+= ranlib
106 106
107NATIVE_CC:= /usr/bin/cc 107NATIVE_CC:= /usr/bin/cc
108CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc 108CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
cvs diff -r1.14 -r1.15 pkgsrc/mk/tools/tools.Minix.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.Minix.mk 2022/04/04 11:23:07 1.14
+++ pkgsrc/mk/tools/tools.Minix.mk 2023/03/04 23:29:24 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.Minix.mk,v 1.14 2022/04/04 11:23:07 riastradh Exp $ 1# $NetBSD: tools.Minix.mk,v 1.15 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# System-supplied tools for the Minix operating system. 3# System-supplied tools for the Minix operating system.
4 4
5#System supplied tools 5#System supplied tools
6TOOLS_PLATFORM.[?= /bin/[ 6TOOLS_PLATFORM.[?= /bin/[
7TOOLS_PLATFORM.awk?= /usr/bin/awk 7TOOLS_PLATFORM.awk?= /usr/bin/awk
8TOOLS_PLATFORM.basename?= /usr/bin/basename 8TOOLS_PLATFORM.basename?= /usr/bin/basename
9TOOLS_PLATFORM.bsdtar?= /bin/tar 9TOOLS_PLATFORM.bsdtar?= /bin/tar
10TOOLS_PLATFORM.byacc?= /usr/bin/yacc 10TOOLS_PLATFORM.byacc?= /usr/bin/yacc
11TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 11TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
12TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 12TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
13TOOLS_PLATFORM.cat?= /bin/cat 13TOOLS_PLATFORM.cat?= /bin/cat
14TOOLS_PLATFORM.chgrp?= /bin/chgrp 14TOOLS_PLATFORM.chgrp?= /bin/chgrp
@@ -33,87 +33,87 @@ TOOLS_PLATFORM.flex?= /usr/bin/flex @@ -33,87 +33,87 @@ TOOLS_PLATFORM.flex?= /usr/bin/flex
33TOOLS_PLATFORM.ftp?= /usr/bin/ftp 33TOOLS_PLATFORM.ftp?= /usr/bin/ftp
34TOOLS_PLATFORM.gegrep?= /usr/bin/egrep 34TOOLS_PLATFORM.gegrep?= /usr/bin/egrep
35TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep 35TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep
36TOOLS_PLATFORM.ggrep?= /usr/bin/grep 36TOOLS_PLATFORM.ggrep?= /usr/bin/grep
37TOOLS_PLATFORM.grep?= /usr/bin/grep 37TOOLS_PLATFORM.grep?= /usr/bin/grep
38TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish 38TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish
39TOOLS_PLATFORM.gstrip?= /usr/bin/strip 39TOOLS_PLATFORM.gstrip?= /usr/bin/strip
40TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 40TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
41TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 41TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
42TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 42TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
43TOOLS_PLATFORM.head?= /usr/bin/head 43TOOLS_PLATFORM.head?= /usr/bin/head
44TOOLS_PLATFORM.hostname?= /bin/hostname 44TOOLS_PLATFORM.hostname?= /bin/hostname
45TOOLS_PLATFORM.id?= /usr/bin/id 45TOOLS_PLATFORM.id?= /usr/bin/id
46.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 46.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
47TOOLS_PLATFORM.install?= /usr/bin/install 47TOOLS_PLATFORM.install?= /usr/bin/install
48.else 48.else
49TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install 49TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
50.endif 50.endif
51TOOLS_PLATFORM.install-info?= /usr/bin/install-info 51TOOLS_PLATFORM.install-info?= /usr/bin/install-info
52TOOLS_PLATFORM.ksh?= /bin/ksh 52TOOLS_PLATFORM.ksh?= /bin/ksh
53TOOLS_PLATFORM.lex?= /usr/bin/lex 53TOOLS_PLATFORM.lex?= /usr/bin/lex
54TOOLS_PLATFORM.ln?= /bin/ln 54TOOLS_PLATFORM.ln?= /bin/ln
55TOOLS_PLATFORM.ls?= /bin/ls 55TOOLS_PLATFORM.ls?= /bin/ls
56TOOLS_PLATFORM.m4?= /usr/bin/m4 56TOOLS_PLATFORM.m4?= /usr/bin/m4
57TOOLS_PLATFORM.mail?= /usr/bin/mail 57TOOLS_PLATFORM.mail?= /usr/bin/mail
58TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 58TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
59TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 59TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
60TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 60TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
61TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 61TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
62TOOLS_PLATFORM.mv?= /bin/mv 62TOOLS_PLATFORM.mv?= /bin/mv
63TOOLS_PLATFORM.nice?= /usr/bin/nice 63TOOLS_PLATFORM.nice?= /usr/bin/nice
64TOOLS_PLATFORM.nroff?= /usr/bin/nroff 64TOOLS_PLATFORM.nroff?= /usr/bin/nroff
65TOOLS_PLATFORM.openssl?= /usr/bin/openssl 65TOOLS_PLATFORM.openssl?= /usr/bin/openssl
66TOOLS_PLATFORM.patch?= /usr/bin/patch 66TOOLS_PLATFORM.patch?= /usr/bin/patch
67TOOLS_PLATFORM.pax?= /bin/pax 67TOOLS_PLATFORM.pax?= /bin/pax
68TOOLS_PLATFORM.printf?= /usr/bin/printf 68TOOLS_PLATFORM.printf?= /usr/bin/printf
69TOOLS_PLATFORM.pwd?= /bin/pwd 69TOOLS_PLATFORM.pwd?= /bin/pwd
70.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 70.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
71TOOLS_PLATFORM.readelf?= /usr/bin/readelf 71TOOLS_PLATFORM.readelf?= /usr/bin/readelf
72.else 72.else
73TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf 73TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
74.endif 74.endif
75TOOLS_PLATFORM.readlink?= /usr/bin/readlink 75TOOLS_PLATFORM.readlink?= /usr/bin/readlink
76TOOLS_PLATFORM.rm?= /bin/rm 76TOOLS_PLATFORM.rm?= /bin/rm
77TOOLS_PLATFORM.rmdir?= /bin/rmdir 77TOOLS_PLATFORM.rmdir?= /bin/rmdir
78TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 78TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
79TOOLS_PLATFORM.sed?= /usr/bin/sed 79TOOLS_PLATFORM.sed?= /usr/bin/sed
80TOOLS_PLATFORM.sh?= /bin/sh 80TOOLS_PLATFORM.sh?= /bin/sh
81TOOLS_PLATFORM.shlock?= /usr/bin/shlock 81TOOLS_PLATFORM.shlock?= /usr/bin/shlock
82TOOLS_PLATFORM.sleep?= /bin/sleep 82TOOLS_PLATFORM.sleep?= /bin/sleep
83TOOLS_PLATFORM.soelim?= /usr/bin/soelim 83TOOLS_PLATFORM.soelim?= /usr/bin/soelim
84TOOLS_PLATFORM.sort?= /usr/bin/sort 84TOOLS_PLATFORM.sort?= /usr/bin/sort
85.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 85.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
86TOOLS_PLATFORM.strip?= /usr/bin/strip 86TOOLS_PLATFORM.strip?= /usr/bin/strip
87.else 87.else
88TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip 88TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
89.endif 89.endif
90TOOLS_PLATFORM.tail?= /usr/bin/tail 90TOOLS_PLATFORM.tail?= /usr/bin/tail
91TOOLS_PLATFORM.tar?= /bin/tar 91TOOLS_PLATFORM.tar?= /bin/tar
92TOOLS_PLATFORM.tee?= /usr/bin/tee 92TOOLS_PLATFORM.tee?= /usr/bin/tee
93TOOLS_PLATFORM.test?= /bin/test 93TOOLS_PLATFORM.test?= /bin/test
94TOOLS_PLATFORM.touch?= /usr/bin/touch 94TOOLS_PLATFORM.touch?= /usr/bin/touch
95TOOLS_PLATFORM.tr?= /usr/bin/tr 95TOOLS_PLATFORM.tr?= /usr/bin/tr
96TOOLS_PLATFORM.true?= /usr/bin/true 96TOOLS_PLATFORM.true?= /usr/bin/true
97TOOLS_PLATFORM.tsort?= /usr/bin/tsort 97TOOLS_PLATFORM.tsort?= /usr/bin/tsort
98TOOLS_PLATFORM.uniq?= /usr/bin/uniq 98TOOLS_PLATFORM.uniq?= /usr/bin/uniq
99TOOLS_PLATFORM.unzip?= /usr/bin/unzip 99TOOLS_PLATFORM.unzip?= /usr/bin/unzip
100TOOLS_PLATFORM.wc?= /usr/bin/wc 100TOOLS_PLATFORM.wc?= /usr/bin/wc
101TOOLS_PLATFORM.xargs?= /usr/bin/xargs 101TOOLS_PLATFORM.xargs?= /usr/bin/xargs
102TOOLS_PLATFORM.xz?= /usr/bin/xz 102TOOLS_PLATFORM.xz?= /usr/bin/xz
103TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat 103TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat
104TOOLS_PLATFORM.yacc?= /usr/bin/yacc 104TOOLS_PLATFORM.yacc?= /usr/bin/yacc
105 105
106.if !empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 106.if ${TOOLS_USE_CROSS_COMPILE:tl} == yes
107. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip 107. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip
108TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \ 108TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
109 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_} 109 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_}
110TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_} 110TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
111. endfor 111. endfor
112 112
113TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar 113TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
114TOOLS_CREATE+= ar 114TOOLS_CREATE+= ar
115TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib 115TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
116TOOLS_CREATE+= ranlib 116TOOLS_CREATE+= ranlib
117 117
118NATIVE_CC:= /usr/bin/cc -B /usr/libexec -B /usr/bin 118NATIVE_CC:= /usr/bin/cc -B /usr/libexec -B /usr/bin
119CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc 119CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
cvs diff -r1.72 -r1.73 pkgsrc/mk/tools/tools.NetBSD.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.NetBSD.mk 2022/05/24 13:08:26 1.72
+++ pkgsrc/mk/tools/tools.NetBSD.mk 2023/03/04 23:29:24 1.73
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: tools.NetBSD.mk,v 1.72 2022/05/24 13:08:26 nia Exp $ 1# $NetBSD: tools.NetBSD.mk,v 1.73 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# System-supplied tools for the NetBSD operating system. 3# System-supplied tools for the NetBSD operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6TOOLS_PLATFORM.awk?= /usr/bin/awk 6TOOLS_PLATFORM.awk?= /usr/bin/awk
7TOOLS_PLATFORM.basename?= /usr/bin/basename 7TOOLS_PLATFORM.basename?= /usr/bin/basename
8.if ${OPSYS_VERSION} >= 090000 || !empty(MKBSDTAR:U:Myes) 8.if ${OPSYS_VERSION} >= 090000 || ${MKBSDTAR:U} == yes
9TOOLS_PLATFORM.bsdtar?= /bin/tar 9TOOLS_PLATFORM.bsdtar?= /bin/tar
10.endif 10.endif
11TOOLS_PLATFORM.byacc?= /usr/bin/yacc 11TOOLS_PLATFORM.byacc?= /usr/bin/yacc
12.if exists(/usr/bin/bzcat) 12.if exists(/usr/bin/bzcat)
13TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 13TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
14.endif 14.endif
15TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 15TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
16TOOLS_PLATFORM.cat?= /bin/cat 16TOOLS_PLATFORM.cat?= /bin/cat
17TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 17TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
18TOOLS_PLATFORM.chmod?= /bin/chmod 18TOOLS_PLATFORM.chmod?= /bin/chmod
19TOOLS_PLATFORM.chown?= /usr/sbin/chown 19TOOLS_PLATFORM.chown?= /usr/sbin/chown
20TOOLS_PLATFORM.cmp?= /usr/bin/cmp 20TOOLS_PLATFORM.cmp?= /usr/bin/cmp
21TOOLS_PLATFORM.cp?= /bin/cp 21TOOLS_PLATFORM.cp?= /bin/cp
@@ -48,27 +48,27 @@ TOOLS_PLATFORM.gegrep?= /usr/bin/egrep @@ -48,27 +48,27 @@ TOOLS_PLATFORM.gegrep?= /usr/bin/egrep
48TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep 48TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep
49TOOLS_PLATFORM.ggrep?= /usr/bin/grep 49TOOLS_PLATFORM.ggrep?= /usr/bin/grep
50TOOLS_PLATFORM.grep?= /usr/bin/grep 50TOOLS_PLATFORM.grep?= /usr/bin/grep
51TOOLS_PLATFORM.groff?= /usr/bin/groff 51TOOLS_PLATFORM.groff?= /usr/bin/groff
52TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish 52TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish
53TOOLS_PLATFORM.gstrip?= /usr/bin/strip 53TOOLS_PLATFORM.gstrip?= /usr/bin/strip
54TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 54TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
55TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 55TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
56TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 56TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
57TOOLS_PLATFORM.head?= /usr/bin/head 57TOOLS_PLATFORM.head?= /usr/bin/head
58TOOLS_PLATFORM.hostname?= /bin/hostname 58TOOLS_PLATFORM.hostname?= /bin/hostname
59TOOLS_PLATFORM.id?= /usr/bin/id 59TOOLS_PLATFORM.id?= /usr/bin/id
60TOOLS_PLATFORM.ident?= /usr/bin/ident 60TOOLS_PLATFORM.ident?= /usr/bin/ident
61.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 61.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
62TOOLS_PLATFORM.install?= /usr/bin/install 62TOOLS_PLATFORM.install?= /usr/bin/install
63.else 63.else
64TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install 64TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
65.endif 65.endif
66.if exists(/usr/bin/install-info) 66.if exists(/usr/bin/install-info)
67TOOLS_PLATFORM.install-info?= /usr/bin/install-info 67TOOLS_PLATFORM.install-info?= /usr/bin/install-info
68.endif 68.endif
69.if exists(/sbin/ldconfig) && ${OBJECT_FMT} == "a.out" 69.if exists(/sbin/ldconfig) && ${OBJECT_FMT} == "a.out"
70TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig 70TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
71.endif 71.endif
72TOOLS_PLATFORM.ksh?= /bin/ksh 72TOOLS_PLATFORM.ksh?= /bin/ksh
73TOOLS_PLATFORM.lex?= /usr/bin/lex 73TOOLS_PLATFORM.lex?= /usr/bin/lex
74TOOLS_PLATFORM.ln?= /bin/ln 74TOOLS_PLATFORM.ln?= /bin/ln
@@ -91,45 +91,45 @@ TOOLS_PLATFORM.msgmerge?= /usr/bin/msgme @@ -91,45 +91,45 @@ TOOLS_PLATFORM.msgmerge?= /usr/bin/msgme
91.endif 91.endif
92TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 92TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
93TOOLS_PLATFORM.mv?= /bin/mv 93TOOLS_PLATFORM.mv?= /bin/mv
94TOOLS_PLATFORM.nice?= /usr/bin/nice 94TOOLS_PLATFORM.nice?= /usr/bin/nice
95TOOLS_PLATFORM.nroff?= /usr/bin/nroff 95TOOLS_PLATFORM.nroff?= /usr/bin/nroff
96TOOLS_PLATFORM.openssl?= /usr/bin/openssl 96TOOLS_PLATFORM.openssl?= /usr/bin/openssl
97TOOLS_PLATFORM.patch?= /usr/bin/patch 97TOOLS_PLATFORM.patch?= /usr/bin/patch
98TOOLS_PLATFORM.pax?= /bin/pax 98TOOLS_PLATFORM.pax?= /bin/pax
99.if exists(/usr/sbin/paxctl) 99.if exists(/usr/sbin/paxctl)
100TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl 100TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl
101.endif 101.endif
102TOOLS_PLATFORM.printf?= /usr/bin/printf 102TOOLS_PLATFORM.printf?= /usr/bin/printf
103TOOLS_PLATFORM.pwd?= /bin/pwd 103TOOLS_PLATFORM.pwd?= /bin/pwd
104.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 104.if ${TOOLS_USE_CROSS_COMPILE:U:tl} != yes
105TOOLS_PLATFORM.readelf?= /usr/bin/readelf 105TOOLS_PLATFORM.readelf?= /usr/bin/readelf
106.else 106.else
107TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf 107TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
108.endif 108.endif
109TOOLS_PLATFORM.readlink?= /usr/bin/readlink 109TOOLS_PLATFORM.readlink?= /usr/bin/readlink
110.if exists(/usr/bin/realpath) 110.if exists(/usr/bin/realpath)
111TOOLS_PLATFORM.realpath?= /usr/bin/realpath 111TOOLS_PLATFORM.realpath?= /usr/bin/realpath
112.endif 112.endif
113TOOLS_PLATFORM.rm?= /bin/rm 113TOOLS_PLATFORM.rm?= /bin/rm
114TOOLS_PLATFORM.rmdir?= /bin/rmdir 114TOOLS_PLATFORM.rmdir?= /bin/rmdir
115TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 115TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
116TOOLS_PLATFORM.sed?= /usr/bin/sed 116TOOLS_PLATFORM.sed?= /usr/bin/sed
117TOOLS_PLATFORM.sh?= /bin/sh 117TOOLS_PLATFORM.sh?= /bin/sh
118TOOLS_PLATFORM.shlock?= /usr/bin/shlock 118TOOLS_PLATFORM.shlock?= /usr/bin/shlock
119TOOLS_PLATFORM.sleep?= /bin/sleep 119TOOLS_PLATFORM.sleep?= /bin/sleep
120TOOLS_PLATFORM.soelim?= /usr/bin/soelim 120TOOLS_PLATFORM.soelim?= /usr/bin/soelim
121TOOLS_PLATFORM.sort?= /usr/bin/sort 121TOOLS_PLATFORM.sort?= /usr/bin/sort
122.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 122.if ${TOOLS_USE_CROSS_COMPILE:U:tl} != yes
123TOOLS_PLATFORM.strip?= /usr/bin/strip 123TOOLS_PLATFORM.strip?= /usr/bin/strip
124.else 124.else
125TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip 125TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
126.endif 126.endif
127 127
128TOOLS_PLATFORM.tail?= /usr/bin/tail 128TOOLS_PLATFORM.tail?= /usr/bin/tail
129.if exists(/bin/tar) 129.if exists(/bin/tar)
130TOOLS_PLATFORM.tar?= /bin/tar 130TOOLS_PLATFORM.tar?= /bin/tar
131.elif exists(/usr/bin/tar) 131.elif exists(/usr/bin/tar)
132TOOLS_PLATFORM.tar?= /usr/bin/tar 132TOOLS_PLATFORM.tar?= /usr/bin/tar
133.endif 133.endif
134TOOLS_PLATFORM.tbl?= /usr/bin/tbl 134TOOLS_PLATFORM.tbl?= /usr/bin/tbl
135TOOLS_PLATFORM.tee?= /usr/bin/tee 135TOOLS_PLATFORM.tee?= /usr/bin/tee
@@ -145,27 +145,27 @@ TOOLS_PLATFORM.unzip?= /usr/bin/unzip @@ -145,27 +145,27 @@ TOOLS_PLATFORM.unzip?= /usr/bin/unzip
145TOOLS_PLATFORM.wc?= /usr/bin/wc 145TOOLS_PLATFORM.wc?= /usr/bin/wc
146TOOLS_PLATFORM.xargs?= /usr/bin/xargs 146TOOLS_PLATFORM.xargs?= /usr/bin/xargs
147.if exists(/usr/bin/xgettext) 147.if exists(/usr/bin/xgettext)
148TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext 148TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
149.endif 149.endif
150.if exists(/usr/bin/xz) 150.if exists(/usr/bin/xz)
151TOOLS_PLATFORM.xz?= /usr/bin/xz 151TOOLS_PLATFORM.xz?= /usr/bin/xz
152.endif 152.endif
153.if exists(/usr/bin/xzcat) 153.if exists(/usr/bin/xzcat)
154TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat 154TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat
155.endif 155.endif
156TOOLS_PLATFORM.yacc?= /usr/bin/yacc 156TOOLS_PLATFORM.yacc?= /usr/bin/yacc
157 157
158.if !empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 158.if ${TOOLS_USE_CROSS_COMPILE:U:tl} == yes
159. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip 159. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip
160TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \ 160TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
161 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_} 161 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_}
162TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_} 162TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
163. endfor 163. endfor
164 164
165TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar 165TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
166TOOLS_CREATE+= ar 166TOOLS_CREATE+= ar
167TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib 167TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
168TOOLS_CREATE+= ranlib 168TOOLS_CREATE+= ranlib
169TOOLS_PATH.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf 169TOOLS_PATH.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
170TOOLS_CREATE+= readelf 170TOOLS_CREATE+= readelf
171 171
cvs diff -r1.2 -r1.3 pkgsrc/mk/tools/tools.QNX.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.QNX.mk 2022/04/04 11:23:07 1.2
+++ pkgsrc/mk/tools/tools.QNX.mk 2023/03/04 23:29:24 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.QNX.mk,v 1.2 2022/04/04 11:23:07 riastradh Exp $ 1# $NetBSD: tools.QNX.mk,v 1.3 2023/03/04 23:29:24 rillig Exp $
2# 2#
3# System-supplied tools for the QNX operating system. 3# System-supplied tools for the QNX operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6TOOLS_PLATFORM.awk?= /usr/bin/awk 6TOOLS_PLATFORM.awk?= /usr/bin/awk
7TOOLS_PLATFORM.basename?= /usr/bin/basename 7TOOLS_PLATFORM.basename?= /usr/bin/basename
8TOOLS_PLATFORM.bison?= ${QNX_HOST}/usr/bin/bison 8TOOLS_PLATFORM.bison?= ${QNX_HOST}/usr/bin/bison
9TOOLS_PLATFORM.bison-yacc?= ${QNX_HOST}/usr/bin/bison -y 9TOOLS_PLATFORM.bison-yacc?= ${QNX_HOST}/usr/bin/bison -y
10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
11TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 11TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
12TOOLS_PLATFORM.cat?= /bin/cat 12TOOLS_PLATFORM.cat?= /bin/cat
13TOOLS_PLATFORM.chgrp?= /bin/chgrp 13TOOLS_PLATFORM.chgrp?= /bin/chgrp
14TOOLS_PLATFORM.chmod?= /bin/chmod 14TOOLS_PLATFORM.chmod?= /bin/chmod
@@ -45,57 +45,57 @@ TOOLS_PLATFORM.lex?= ${QNX_HOST}/usr/bi @@ -45,57 +45,57 @@ TOOLS_PLATFORM.lex?= ${QNX_HOST}/usr/bi
45TOOLS_PLATFORM.ln?= /bin/ln 45TOOLS_PLATFORM.ln?= /bin/ln
46TOOLS_PLATFORM.ls?= /bin/ls 46TOOLS_PLATFORM.ls?= /bin/ls
47TOOLS_PLATFORM.m4?= ${QNX_HOST}/usr/bin/m4 47TOOLS_PLATFORM.m4?= ${QNX_HOST}/usr/bin/m4
48TOOLS_PLATFORM.gmake?= ${QNX_HOST}/usr/bin/make 48TOOLS_PLATFORM.gmake?= ${QNX_HOST}/usr/bin/make
49TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 49TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
50TOOLS_PLATFORM.mv?= /bin/mv 50TOOLS_PLATFORM.mv?= /bin/mv
51TOOLS_PLATFORM.nice?= /usr/bin/nice 51TOOLS_PLATFORM.nice?= /usr/bin/nice
52TOOLS_PLATFORM.nroff?= ${QNX_HOST}/usr/bin/nroff 52TOOLS_PLATFORM.nroff?= ${QNX_HOST}/usr/bin/nroff
53TOOLS_PLATFORM.openssl?= /usr/bin/openssl 53TOOLS_PLATFORM.openssl?= /usr/bin/openssl
54TOOLS_PLATFORM.patch?= /usr/bin/patch 54TOOLS_PLATFORM.patch?= /usr/bin/patch
55TOOLS_PLATFORM.pax?= /bin/pax 55TOOLS_PLATFORM.pax?= /bin/pax
56TOOLS_PLATFORM.printf?= /usr/bin/printf 56TOOLS_PLATFORM.printf?= /usr/bin/printf
57TOOLS_PLATFORM.pwd?= /bin/pwd 57TOOLS_PLATFORM.pwd?= /bin/pwd
58.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 58.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
59TOOLS_PLATFORM.readelf?= ${QNX_HOST}/usr/bin/readelf 59TOOLS_PLATFORM.readelf?= ${QNX_HOST}/usr/bin/readelf
60.endif 60.endif
61TOOLS_PLATFORM.rm?= /bin/rm 61TOOLS_PLATFORM.rm?= /bin/rm
62TOOLS_PLATFORM.rmdir?= /usr/bin/rmdir 62TOOLS_PLATFORM.rmdir?= /usr/bin/rmdir
63TOOLS_PLATFORM.sed?= /usr/bin/sed 63TOOLS_PLATFORM.sed?= /usr/bin/sed
64TOOLS_PLATFORM.sh?= /bin/sh 64TOOLS_PLATFORM.sh?= /bin/sh
65TOOLS_PLATFORM.sleep?= /usr/bin/sleep 65TOOLS_PLATFORM.sleep?= /usr/bin/sleep
66TOOLS_PLATFORM.soelim?= ${QNX_HOST}/usr/bin/soelim 66TOOLS_PLATFORM.soelim?= ${QNX_HOST}/usr/bin/soelim
67TOOLS_PLATFORM.sort?= /usr/bin/sort 67TOOLS_PLATFORM.sort?= /usr/bin/sort
68.if empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 68.if ${TOOLS_USE_CROSS_COMPILE:tl} != yes
69TOOLS_PLATFORM.strip?= ${QNX_HOST}/usr/bin/strip 69TOOLS_PLATFORM.strip?= ${QNX_HOST}/usr/bin/strip
70.endif 70.endif
71TOOLS_PLATFORM.tail?= /usr/bin/tail 71TOOLS_PLATFORM.tail?= /usr/bin/tail
72TOOLS_PLATFORM.tar?= /usr/bin/tar 72TOOLS_PLATFORM.tar?= /usr/bin/tar
73TOOLS_PLATFORM.tbl?= ${QNX_HOST}/usr/bin/tbl 73TOOLS_PLATFORM.tbl?= ${QNX_HOST}/usr/bin/tbl
74TOOLS_PLATFORM.tee?= /usr/bin/tee 74TOOLS_PLATFORM.tee?= /usr/bin/tee
75TOOLS_PLATFORM.test?= test # shell builtin 75TOOLS_PLATFORM.test?= test # shell builtin
76TOOLS_PLATFORM.touch?= /usr/bin/touch 76TOOLS_PLATFORM.touch?= /usr/bin/touch
77TOOLS_PLATFORM.tr?= /usr/bin/tr 77TOOLS_PLATFORM.tr?= /usr/bin/tr
78TOOLS_PLATFORM.true?= true # shell builtin 78TOOLS_PLATFORM.true?= true # shell builtin
79TOOLS_PLATFORM.tsort?= /usr/bin/tsort 79TOOLS_PLATFORM.tsort?= /usr/bin/tsort
80TOOLS_PLATFORM.uniq?= /usr/bin/uniq 80TOOLS_PLATFORM.uniq?= /usr/bin/uniq
81TOOLS_PLATFORM.unzip?= /usr/bin/unzip 81TOOLS_PLATFORM.unzip?= /usr/bin/unzip
82TOOLS_PLATFORM.wc?= /usr/bin/wc 82TOOLS_PLATFORM.wc?= /usr/bin/wc
83TOOLS_PLATFORM.xargs?= /usr/bin/xargs 83TOOLS_PLATFORM.xargs?= /usr/bin/xargs
84TOOLS_PLATFORM.yacc?= ${QNX_HOST}/usr/bin/bison -y 84TOOLS_PLATFORM.yacc?= ${QNX_HOST}/usr/bin/bison -y
85 85
86 86
87 87
88.if !empty(TOOLS_USE_CROSS_COMPILE:M[yY][eE][sS]) 88.if ${TOOLS_USE_CROSS_COMPILE:tl} == yes
89. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip 89. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip
90TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \ 90TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
91 ${QNX_HOST}/usr/bin/nto${MACHINE_GNU_PLATFORM}-${_t_} 91 ${QNX_HOST}/usr/bin/nto${MACHINE_GNU_PLATFORM}-${_t_}
92TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_} 92TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
93. endfor 93. endfor
94TOOLS_PATH.ar?= ${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ar 94TOOLS_PATH.ar?= ${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ar
95TOOLS_CREATE+= ar 95TOOLS_CREATE+= ar
96TOOLS_PATH.ranlib?= ${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ranlib 96TOOLS_PATH.ranlib?= ${QNX_HOST}/usr/bin/${MACHINE_GNU_PLATFORM}-ranlib
97TOOLS_CREATE+= ranlib 97TOOLS_CREATE+= ranlib
98 98
99NATIVE_CC:= ${QNX_HOST}/usr/bin/qcc 99NATIVE_CC:= ${QNX_HOST}/usr/bin/qcc
100CC= ${QNX_HOST}/usr/bin/qcc -V gcc_nto${MACHINE_GNU_PLATFORM} 100CC= ${QNX_HOST}/usr/bin/qcc -V gcc_nto${MACHINE_GNU_PLATFORM}
101 101