Wed Oct 17 08:30:43 2018 UTC ()
mk: Add native GNU/BSD grep where they are known to exist.


(jperkin)
diff -r1.58 -r1.59 pkgsrc/mk/tools/tools.Darwin.mk
diff -r1.44 -r1.45 pkgsrc/mk/tools/tools.FreeBSD.mk
diff -r1.61 -r1.62 pkgsrc/mk/tools/tools.Linux.mk
diff -r1.61 -r1.62 pkgsrc/mk/tools/tools.NetBSD.mk
cvs diff -r1.58 -r1.59 pkgsrc/mk/tools/tools.Darwin.mk (switch to unified diff)

--- pkgsrc/mk/tools/tools.Darwin.mk 2017/06/12 16:11:51 1.58
+++ pkgsrc/mk/tools/tools.Darwin.mk 2018/10/17 08:30:43 1.59
@@ -1,127 +1,130 @@ @@ -1,127 +1,130 @@
1# $NetBSD: tools.Darwin.mk,v 1.58 2017/06/12 16:11:51 sevan Exp $ 1# $NetBSD: tools.Darwin.mk,v 1.59 2018/10/17 08:30:43 jperkin Exp $
2# 2#
3# System-supplied tools for the Darwin (Mac OS X) operating system. 3# System-supplied tools for the Darwin (Mac OS X) 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.bash?= /bin/bash 8TOOLS_PLATFORM.bash?= /bin/bash
9# Native bison (at least up to version 2.3 in OSX Lion) does not work 9# Native bison (at least up to version 2.3 in OSX Lion) does not work
10# well in the tools environment and cannot locate m4sugar.m4 without 10# well in the tools environment and cannot locate m4sugar.m4 without
11# BISON_PKGDATADIR being set. For now just pull in the pkgsrc tool. 11# BISON_PKGDATADIR being set. For now just pull in the pkgsrc tool.
12#TOOLS_PLATFORM.bison?= /usr/bin/bison 12#TOOLS_PLATFORM.bison?= /usr/bin/bison
13#TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y 13#TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y
14.if exists(/usr/bin/bsdtar) 14.if exists(/usr/bin/bsdtar)
15TOOLS_PLATFORM.bsdtar?= /usr/bin/bsdtar 15TOOLS_PLATFORM.bsdtar?= /usr/bin/bsdtar
16.endif 16.endif
17TOOLS_PLATFORM.byacc?= /usr/bin/yacc 17TOOLS_PLATFORM.byacc?= /usr/bin/yacc
18.if exists(/usr/bin/bzcat) 18.if exists(/usr/bin/bzcat)
19TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 19TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
20.endif 20.endif
21.if exists(/usr/bin/bzip2) 21.if exists(/usr/bin/bzip2)
22TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 22TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
23.endif 23.endif
24TOOLS_PLATFORM.cat?= /bin/cat 24TOOLS_PLATFORM.cat?= /bin/cat
25TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 25TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
26TOOLS_PLATFORM.chmod?= /bin/chmod 26TOOLS_PLATFORM.chmod?= /bin/chmod
27TOOLS_PLATFORM.chown?= /usr/sbin/chown 27TOOLS_PLATFORM.chown?= /usr/sbin/chown
28TOOLS_PLATFORM.cmp?= /usr/bin/cmp 28TOOLS_PLATFORM.cmp?= /usr/bin/cmp
29TOOLS_PLATFORM.cp?= /bin/cp 29TOOLS_PLATFORM.cp?= /bin/cp
30TOOLS_PLATFORM.csh?= /bin/tcsh 30TOOLS_PLATFORM.csh?= /bin/tcsh
31.if exists(/usr/bin/curl) 31.if exists(/usr/bin/curl)
32TOOLS_PLATFORM.curl?= /usr/bin/curl 32TOOLS_PLATFORM.curl?= /usr/bin/curl
33.endif 33.endif
34TOOLS_PLATFORM.cut?= /usr/bin/cut 34TOOLS_PLATFORM.cut?= /usr/bin/cut
35TOOLS_PLATFORM.date?= /bin/date 35TOOLS_PLATFORM.date?= /bin/date
36TOOLS_PLATFORM.diff?= /usr/bin/diff 36TOOLS_PLATFORM.diff?= /usr/bin/diff
37TOOLS_PLATFORM.dirname?= /usr/bin/dirname 37TOOLS_PLATFORM.dirname?= /usr/bin/dirname
38TOOLS_PLATFORM.echo?= echo # shell builtin 38TOOLS_PLATFORM.echo?= echo # shell builtin
39TOOLS_PLATFORM.egrep?= /usr/bin/egrep 39TOOLS_PLATFORM.egrep?= /usr/bin/egrep
40TOOLS_PLATFORM.env?= /usr/bin/env 40TOOLS_PLATFORM.env?= /usr/bin/env
41TOOLS_PLATFORM.expr?= /bin/expr 41TOOLS_PLATFORM.expr?= /bin/expr
42TOOLS_PLATFORM.false?= false # shell builtin 42TOOLS_PLATFORM.false?= false # shell builtin
43TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep 43TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
44TOOLS_PLATFORM.file?= /usr/bin/file 44TOOLS_PLATFORM.file?= /usr/bin/file
45TOOLS_PLATFORM.find?= /usr/bin/find 45TOOLS_PLATFORM.find?= /usr/bin/find
46TOOLS_PLATFORM.flex?= /usr/bin/flex 46TOOLS_PLATFORM.flex?= /usr/bin/flex
47TOOLS_PLATFORM.ftp?= /usr/bin/ftp 47TOOLS_PLATFORM.ftp?= /usr/bin/ftp
 48TOOLS_PLATFORM.gerep?= /usr/bin/egrep
 49TOOLS_PLATFORM.gfrep?= /usr/bin/fgrep
 50TOOLS_PLATFORM.ggrep?= /usr/bin/grep
48.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 51.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
49TOOLS_PLATFORM.gmake?= /usr/bin/gnumake 52TOOLS_PLATFORM.gmake?= /usr/bin/gnumake
50TOOLS_PLATFORM.gm4?= /usr/bin/gm4 53TOOLS_PLATFORM.gm4?= /usr/bin/gm4
51.endif 54.endif
52TOOLS_PLATFORM.grep?= /usr/bin/grep 55TOOLS_PLATFORM.grep?= /usr/bin/grep
53.if exists(/usr/bin/groff) 56.if exists(/usr/bin/groff)
54TOOLS_PLATFORM.groff?=/usr/bin/groff 57TOOLS_PLATFORM.groff?=/usr/bin/groff
55.endif 58.endif
56.if exists(/usr/bin/gnutar) 59.if exists(/usr/bin/gnutar)
57TOOLS_PLATFORM.gtar?= /usr/bin/gnutar 60TOOLS_PLATFORM.gtar?= /usr/bin/gnutar
58.endif 61.endif
59TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 62TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
60TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 63TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
61TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 64TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
62TOOLS_PLATFORM.head?= /usr/bin/head 65TOOLS_PLATFORM.head?= /usr/bin/head
63TOOLS_PLATFORM.hostname?= /bin/hostname 66TOOLS_PLATFORM.hostname?= /bin/hostname
64TOOLS_PLATFORM.id?= /usr/bin/id 67TOOLS_PLATFORM.id?= /usr/bin/id
65TOOLS_PLATFORM.ident?= /usr/bin/ident 68TOOLS_PLATFORM.ident?= /usr/bin/ident
66TOOLS_PLATFORM.install?= /usr/bin/install 69TOOLS_PLATFORM.install?= /usr/bin/install
67.if exists(/usr/bin/install-info) 70.if exists(/usr/bin/install-info)
68TOOLS_PLATFORM.install-info?= /usr/bin/install-info 71TOOLS_PLATFORM.install-info?= /usr/bin/install-info
69.endif 72.endif
70.if exists(/bin/ksh) 73.if exists(/bin/ksh)
71TOOLS_PLATFORM.ksh?= /bin/ksh 74TOOLS_PLATFORM.ksh?= /bin/ksh
72.endif 75.endif
73TOOLS_PLATFORM.lex?= /usr/bin/lex 76TOOLS_PLATFORM.lex?= /usr/bin/lex
74TOOLS_PLATFORM.ln?= /bin/ln 77TOOLS_PLATFORM.ln?= /bin/ln
75TOOLS_PLATFORM.ls?= /bin/ls 78TOOLS_PLATFORM.ls?= /bin/ls
76TOOLS_PLATFORM.m4?= /usr/bin/m4 79TOOLS_PLATFORM.m4?= /usr/bin/m4
77TOOLS_PLATFORM.mail?= /usr/bin/mail 80TOOLS_PLATFORM.mail?= /usr/bin/mail
78.if exists(/usr/bin/makeinfo) 81.if exists(/usr/bin/makeinfo)
79TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 82TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
80.endif 83.endif
81TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 84TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
82TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 85TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
83TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 86TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
84TOOLS_PLATFORM.mv?= /bin/mv 87TOOLS_PLATFORM.mv?= /bin/mv
85TOOLS_PLATFORM.nice?= /usr/bin/nice 88TOOLS_PLATFORM.nice?= /usr/bin/nice
86TOOLS_PLATFORM.nroff?= /usr/bin/nroff 89TOOLS_PLATFORM.nroff?= /usr/bin/nroff
87TOOLS_PLATFORM.openssl?= /usr/bin/openssl 90TOOLS_PLATFORM.openssl?= /usr/bin/openssl
88TOOLS_PLATFORM.pax?= /bin/pax 91TOOLS_PLATFORM.pax?= /bin/pax
89# Don't use GNU patch 92# Don't use GNU patch
90#TOOLS_PLATFORM.patch?= /usr/bin/patch 93#TOOLS_PLATFORM.patch?= /usr/bin/patch
91TOOLS_PLATFORM.printf?= /usr/bin/printf 94TOOLS_PLATFORM.printf?= /usr/bin/printf
92TOOLS_PLATFORM.pwd?= /bin/pwd 95TOOLS_PLATFORM.pwd?= /bin/pwd
93TOOLS_PLATFORM.readlink?= /usr/bin/readlink 96TOOLS_PLATFORM.readlink?= /usr/bin/readlink
94TOOLS_PLATFORM.rm?= /bin/rm 97TOOLS_PLATFORM.rm?= /bin/rm
95TOOLS_PLATFORM.rmdir?= /bin/rmdir 98TOOLS_PLATFORM.rmdir?= /bin/rmdir
96TOOLS_PLATFORM.sed?= /usr/bin/sed 99TOOLS_PLATFORM.sed?= /usr/bin/sed
97TOOLS_PLATFORM.sh?= /bin/sh 100TOOLS_PLATFORM.sh?= /bin/sh
98.if exists(/usr/bin/shlock) 101.if exists(/usr/bin/shlock)
99TOOLS_PLATFORM.shlock?= /usr/bin/shlock 102TOOLS_PLATFORM.shlock?= /usr/bin/shlock
100.endif 103.endif
101TOOLS_PLATFORM.sleep?= /bin/sleep 104TOOLS_PLATFORM.sleep?= /bin/sleep
102.if exists(/usr/bin/soelim) 105.if exists(/usr/bin/soelim)
103TOOLS_PLATFORM.soelim?= /usr/bin/soelim 106TOOLS_PLATFORM.soelim?= /usr/bin/soelim
104TOOLS_PLATFORM.gsoelim?= /usr/bin/soelim 107TOOLS_PLATFORM.gsoelim?= /usr/bin/soelim
105.endif 108.endif
106TOOLS_PLATFORM.sort?= /usr/bin/sort 109TOOLS_PLATFORM.sort?= /usr/bin/sort
107TOOLS_PLATFORM.strip?= /usr/bin/strip 110TOOLS_PLATFORM.strip?= /usr/bin/strip
108TOOLS_PLATFORM.tail?= /usr/bin/tail 111TOOLS_PLATFORM.tail?= /usr/bin/tail
109TOOLS_PLATFORM.tar?= /usr/bin/tar 112TOOLS_PLATFORM.tar?= /usr/bin/tar
110.if exists(/usr/bin/tbl) 113.if exists(/usr/bin/tbl)
111TOOLS_PLATFORM.tbl?= /usr/bin/tbl 114TOOLS_PLATFORM.tbl?= /usr/bin/tbl
112.endif 115.endif
113TOOLS_PLATFORM.tclsh?= /usr/bin/tclsh 116TOOLS_PLATFORM.tclsh?= /usr/bin/tclsh
114TOOLS_PLATFORM.tee?= /usr/bin/tee 117TOOLS_PLATFORM.tee?= /usr/bin/tee
115TOOLS_PLATFORM.test?= test # shell builtin 118TOOLS_PLATFORM.test?= test # shell builtin
116TOOLS_PLATFORM.touch?= /usr/bin/touch 119TOOLS_PLATFORM.touch?= /usr/bin/touch
117TOOLS_PLATFORM.tr?= /usr/bin/tr 120TOOLS_PLATFORM.tr?= /usr/bin/tr
118TOOLS_PLATFORM.true?= true # shell builtin 121TOOLS_PLATFORM.true?= true # shell builtin
119TOOLS_PLATFORM.tsort?= /usr/bin/tsort 122TOOLS_PLATFORM.tsort?= /usr/bin/tsort
120TOOLS_PLATFORM.uniq?= /usr/bin/uniq 123TOOLS_PLATFORM.uniq?= /usr/bin/uniq
121TOOLS_PLATFORM.unzip?= /usr/bin/unzip 124TOOLS_PLATFORM.unzip?= /usr/bin/unzip
122TOOLS_PLATFORM.wc?= /usr/bin/wc 125TOOLS_PLATFORM.wc?= /usr/bin/wc
123.if exists(/usr/bin/wish) 126.if exists(/usr/bin/wish)
124TOOLS_PLATFORM.wish?= /usr/bin/wish 127TOOLS_PLATFORM.wish?= /usr/bin/wish
125.endif 128.endif
126TOOLS_PLATFORM.xargs?= /usr/bin/xargs 129TOOLS_PLATFORM.xargs?= /usr/bin/xargs
127TOOLS_PLATFORM.yacc?= /usr/bin/yacc 130TOOLS_PLATFORM.yacc?= /usr/bin/yacc
cvs diff -r1.44 -r1.45 pkgsrc/mk/tools/tools.FreeBSD.mk (switch to unified diff)

--- pkgsrc/mk/tools/tools.FreeBSD.mk 2017/07/22 18:10:25 1.44
+++ pkgsrc/mk/tools/tools.FreeBSD.mk 2018/10/17 08:30:43 1.45
@@ -1,104 +1,107 @@ @@ -1,104 +1,107 @@
1# $NetBSD: tools.FreeBSD.mk,v 1.44 2017/07/22 18:10:25 maya Exp $ 1# $NetBSD: tools.FreeBSD.mk,v 1.45 2018/10/17 08:30:43 jperkin Exp $
2# 2#
3# System-supplied tools for the FreeBSD operating system. 3# System-supplied tools for the FreeBSD 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 empty(MACHINE_PLATFORM:MFreeBSD-[0-4].*-*) && empty(MACHINE_PLATFORM:MFreeBSD-5.[0-3]-*) 8.if empty(MACHINE_PLATFORM:MFreeBSD-[0-4].*-*) && empty(MACHINE_PLATFORM:MFreeBSD-5.[0-3]-*)
9TOOLS_PLATFORM.bsdtar?= /usr/bin/tar 9TOOLS_PLATFORM.bsdtar?= /usr/bin/tar
10.endif 10.endif
11TOOLS_PLATFORM.byacc?= /usr/bin/yacc 11TOOLS_PLATFORM.byacc?= /usr/bin/yacc
12TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 12TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
13TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 13TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
14TOOLS_PLATFORM.cat?= /bin/cat 14TOOLS_PLATFORM.cat?= /bin/cat
15TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 15TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
16TOOLS_PLATFORM.chmod?= /bin/chmod 16TOOLS_PLATFORM.chmod?= /bin/chmod
17TOOLS_PLATFORM.chown?= /usr/sbin/chown 17TOOLS_PLATFORM.chown?= /usr/sbin/chown
18TOOLS_PLATFORM.cmp?= /usr/bin/cmp 18TOOLS_PLATFORM.cmp?= /usr/bin/cmp
19TOOLS_PLATFORM.cp?= /bin/cp 19TOOLS_PLATFORM.cp?= /bin/cp
20TOOLS_PLATFORM.csh?= /bin/csh 20TOOLS_PLATFORM.csh?= /bin/csh
21TOOLS_PLATFORM.cut?= /usr/bin/cut 21TOOLS_PLATFORM.cut?= /usr/bin/cut
22TOOLS_PLATFORM.date?= /bin/date 22TOOLS_PLATFORM.date?= /bin/date
23TOOLS_PLATFORM.diff?= /usr/bin/diff 23TOOLS_PLATFORM.diff?= /usr/bin/diff
24TOOLS_PLATFORM.diff3?= /usr/bin/diff3 24TOOLS_PLATFORM.diff3?= /usr/bin/diff3
25TOOLS_PLATFORM.dirname?= /usr/bin/dirname 25TOOLS_PLATFORM.dirname?= /usr/bin/dirname
26TOOLS_PLATFORM.echo?= echo # shell builtin 26TOOLS_PLATFORM.echo?= echo # shell builtin
27TOOLS_PLATFORM.egrep?= /usr/bin/egrep 27TOOLS_PLATFORM.egrep?= /usr/bin/egrep
28TOOLS_PLATFORM.env?= /usr/bin/env 28TOOLS_PLATFORM.env?= /usr/bin/env
29TOOLS_PLATFORM.expr?= /bin/expr 29TOOLS_PLATFORM.expr?= /bin/expr
30TOOLS_PLATFORM.false?= false # shell builtin 30TOOLS_PLATFORM.false?= false # shell builtin
31TOOLS_PLATFORM.fetch?= /usr/bin/fetch 31TOOLS_PLATFORM.fetch?= /usr/bin/fetch
32TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep 32TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
33TOOLS_PLATFORM.file?= /usr/bin/file 33TOOLS_PLATFORM.file?= /usr/bin/file
34TOOLS_PLATFORM.find?= /usr/bin/find 34TOOLS_PLATFORM.find?= /usr/bin/find
35TOOLS_PLATFORM.flex?= /usr/bin/lex 35TOOLS_PLATFORM.flex?= /usr/bin/lex
 36TOOLS_PLATFORM.gegrep?= /usr/bin/egrep
 37TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep
 38TOOLS_PLATFORM.ggrep?= /usr/bin/grep
36TOOLS_PLATFORM.grep?= /usr/bin/grep 39TOOLS_PLATFORM.grep?= /usr/bin/grep
37TOOLS_PLATFORM.groff?= /usr/bin/groff 40TOOLS_PLATFORM.groff?= /usr/bin/groff
38TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 41TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
39TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 42TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
40TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 43TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
41TOOLS_PLATFORM.head?= /usr/bin/head 44TOOLS_PLATFORM.head?= /usr/bin/head
42TOOLS_PLATFORM.hostname?= /bin/hostname 45TOOLS_PLATFORM.hostname?= /bin/hostname
43TOOLS_PLATFORM.id?= /usr/bin/id 46TOOLS_PLATFORM.id?= /usr/bin/id
44TOOLS_PLATFORM.ident?= /usr/bin/ident 47TOOLS_PLATFORM.ident?= /usr/bin/ident
45TOOLS_PLATFORM.install?= /usr/bin/install 48TOOLS_PLATFORM.install?= /usr/bin/install
46.if exists(/usr/bin/install-info) 49.if exists(/usr/bin/install-info)
47TOOLS_PLATFORM.install-info?= /usr/bin/install-info 50TOOLS_PLATFORM.install-info?= /usr/bin/install-info
48.endif 51.endif
49TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig 52TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
50TOOLS_PLATFORM.lex?= /usr/bin/lex 53TOOLS_PLATFORM.lex?= /usr/bin/lex
51TOOLS_PLATFORM.ln?= /bin/ln 54TOOLS_PLATFORM.ln?= /bin/ln
52TOOLS_PLATFORM.ls?= /bin/ls 55TOOLS_PLATFORM.ls?= /bin/ls
53TOOLS_PLATFORM.m4?= /usr/bin/m4 56TOOLS_PLATFORM.m4?= /usr/bin/m4
54TOOLS_PLATFORM.mail?= /usr/bin/mail 57TOOLS_PLATFORM.mail?= /usr/bin/mail
55.if exists(/usr/bin/makeinfo) 58.if exists(/usr/bin/makeinfo)
56TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 59TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
57.endif 60.endif
58TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 61TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
59TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 62TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
60TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 63TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
61TOOLS_PLATFORM.mv?= /bin/mv 64TOOLS_PLATFORM.mv?= /bin/mv
62TOOLS_PLATFORM.nice?= /usr/bin/nice 65TOOLS_PLATFORM.nice?= /usr/bin/nice
63TOOLS_PLATFORM.nroff?= /usr/bin/nroff 66TOOLS_PLATFORM.nroff?= /usr/bin/nroff
64TOOLS_PLATFORM.openssl?= /usr/bin/openssl 67TOOLS_PLATFORM.openssl?= /usr/bin/openssl
65# Don't use GNU patch 68# Don't use GNU patch
66#TOOLS_PLATFORM.patch?= /usr/bin/patch 69#TOOLS_PLATFORM.patch?= /usr/bin/patch
67TOOLS_PLATFORM.pax?= /bin/pax 70TOOLS_PLATFORM.pax?= /bin/pax
68TOOLS_PLATFORM.printf?= /usr/bin/printf 71TOOLS_PLATFORM.printf?= /usr/bin/printf
69TOOLS_PLATFORM.pwd?= /bin/pwd 72TOOLS_PLATFORM.pwd?= /bin/pwd
70TOOLS_PLATFORM.readelf?= /usr/bin/readelf 73TOOLS_PLATFORM.readelf?= /usr/bin/readelf
71TOOLS_PLATFORM.readlink?= /usr/bin/readlink 74TOOLS_PLATFORM.readlink?= /usr/bin/readlink
72TOOLS_PLATFORM.rm?= /bin/rm 75TOOLS_PLATFORM.rm?= /bin/rm
73TOOLS_PLATFORM.rmdir?= /bin/rmdir 76TOOLS_PLATFORM.rmdir?= /bin/rmdir
74TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 77TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
75TOOLS_PLATFORM.sed?= /usr/bin/sed 78TOOLS_PLATFORM.sed?= /usr/bin/sed
76TOOLS_PLATFORM.sh?= /bin/sh 79TOOLS_PLATFORM.sh?= /bin/sh
77TOOLS_PLATFORM.sleep?= /bin/sleep 80TOOLS_PLATFORM.sleep?= /bin/sleep
78TOOLS_PLATFORM.soelim?= /usr/bin/soelim 81TOOLS_PLATFORM.soelim?= /usr/bin/soelim
79TOOLS_PLATFORM.sort?= /usr/bin/sort 82TOOLS_PLATFORM.sort?= /usr/bin/sort
80TOOLS_PLATFORM.strip?= /usr/bin/strip 83TOOLS_PLATFORM.strip?= /usr/bin/strip
81TOOLS_PLATFORM.tail?= /usr/bin/tail 84TOOLS_PLATFORM.tail?= /usr/bin/tail
82TOOLS_PLATFORM.tar?= /usr/bin/tar 85TOOLS_PLATFORM.tar?= /usr/bin/tar
83.if exists(/usr/bin/tbl) 86.if exists(/usr/bin/tbl)
84TOOLS_PLATFORM.tbl?= /usr/bin/tbl 87TOOLS_PLATFORM.tbl?= /usr/bin/tbl
85.endif 88.endif
86TOOLS_PLATFORM.tee?= /usr/bin/tee 89TOOLS_PLATFORM.tee?= /usr/bin/tee
87TOOLS_PLATFORM.test?= test # shell builtin 90TOOLS_PLATFORM.test?= test # shell builtin
88TOOLS_PLATFORM.touch?= /usr/bin/touch 91TOOLS_PLATFORM.touch?= /usr/bin/touch
89TOOLS_PLATFORM.tr?= /usr/bin/tr 92TOOLS_PLATFORM.tr?= /usr/bin/tr
90TOOLS_PLATFORM.true?= true # shell builtin 93TOOLS_PLATFORM.true?= true # shell builtin
91TOOLS_PLATFORM.tsort?= /usr/bin/tsort 94TOOLS_PLATFORM.tsort?= /usr/bin/tsort
92TOOLS_PLATFORM.uniq?= /usr/bin/uniq 95TOOLS_PLATFORM.uniq?= /usr/bin/uniq
93.if exists(/usr/bin/unzip) 96.if exists(/usr/bin/unzip)
94TOOLS_PLATFORM.unzip?= /usr/bin/unzip 97TOOLS_PLATFORM.unzip?= /usr/bin/unzip
95.endif 98.endif
96TOOLS_PLATFORM.wc?= /usr/bin/wc 99TOOLS_PLATFORM.wc?= /usr/bin/wc
97TOOLS_PLATFORM.xargs?= /usr/bin/xargs 100TOOLS_PLATFORM.xargs?= /usr/bin/xargs
98.if exists(/usr/bin/xz) 101.if exists(/usr/bin/xz)
99TOOLS_PLATFORM.xz?= /usr/bin/xz 102TOOLS_PLATFORM.xz?= /usr/bin/xz
100.endif 103.endif
101.if exists(/usr/bin/xzcat) 104.if exists(/usr/bin/xzcat)
102TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat 105TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat
103.endif 106.endif
104TOOLS_PLATFORM.yacc?= /usr/bin/yacc 107TOOLS_PLATFORM.yacc?= /usr/bin/yacc
cvs diff -r1.61 -r1.62 pkgsrc/mk/tools/tools.Linux.mk (switch to unified diff)

--- pkgsrc/mk/tools/tools.Linux.mk 2017/07/10 12:32:30 1.61
+++ pkgsrc/mk/tools/tools.Linux.mk 2018/10/17 08:30:43 1.62
@@ -1,289 +1,295 @@ @@ -1,289 +1,295 @@
1# $NetBSD: tools.Linux.mk,v 1.61 2017/07/10 12:32:30 joerg Exp $ 1# $NetBSD: tools.Linux.mk,v 1.62 2018/10/17 08:30:43 jperkin Exp $
2# 2#
3# System-supplied tools for the Linux operating system. 3# System-supplied tools for the Linux operating system.
4 4
5TOOLS_PLATFORM.[?= [ # shell builtin 5TOOLS_PLATFORM.[?= [ # shell builtin
6.if exists(/etc/debian_version) 6.if exists(/etc/debian_version)
7TOOLS_PLATFORM.awk?= /usr/bin/awk 7TOOLS_PLATFORM.awk?= /usr/bin/awk
8.else 8.else
9TOOLS_PLATFORM.awk?= ${TOOLS_PLATFORM.gawk} 9TOOLS_PLATFORM.awk?= ${TOOLS_PLATFORM.gawk}
10.endif 10.endif
11.if exists(/usr/bin/autopoint) 11.if exists(/usr/bin/autopoint)
12TOOLS_PLATFORM.autopoint?= /usr/bin/autopoint 12TOOLS_PLATFORM.autopoint?= /usr/bin/autopoint
13.endif 13.endif
14.if exists(/bin/basename) 14.if exists(/bin/basename)
15TOOLS_PLATFORM.basename?= /bin/basename 15TOOLS_PLATFORM.basename?= /bin/basename
16.elif exists(/usr/bin/basename) 16.elif exists(/usr/bin/basename)
17TOOLS_PLATFORM.basename?= /usr/bin/basename 17TOOLS_PLATFORM.basename?= /usr/bin/basename
18.endif 18.endif
19TOOLS_PLATFORM.bash?= /bin/bash 19TOOLS_PLATFORM.bash?= /bin/bash
20.if exists(/usr/bin/bison) 20.if exists(/usr/bin/bison)
21TOOLS_PLATFORM.bison?= /usr/bin/bison 21TOOLS_PLATFORM.bison?= /usr/bin/bison
22TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y 22TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y
23.endif 23.endif
24.if exists(/usr/bin/bzcat) 24.if exists(/usr/bin/bzcat)
25TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 25TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
26.elif exists(/bin/bzcat) 26.elif exists(/bin/bzcat)
27TOOLS_PLATFORM.bzcat?= /bin/bzcat 27TOOLS_PLATFORM.bzcat?= /bin/bzcat
28.elif exists(/usr/bin/bzip2) 28.elif exists(/usr/bin/bzip2)
29TOOLS_PLATFORM.bzcat?= /usr/bin/bzip2 -cd 29TOOLS_PLATFORM.bzcat?= /usr/bin/bzip2 -cd
30.endif 30.endif
31.if exists(/usr/bin/bzip2) 31.if exists(/usr/bin/bzip2)
32TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 32TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
33.elif exists(/bin/bzip2) 33.elif exists(/bin/bzip2)
34TOOLS_PLATFORM.bzip2?= /bin/bzip2 34TOOLS_PLATFORM.bzip2?= /bin/bzip2
35.endif 35.endif
36TOOLS_PLATFORM.cat?= /bin/cat 36TOOLS_PLATFORM.cat?= /bin/cat
37.if exists(/bin/chgrp) 37.if exists(/bin/chgrp)
38TOOLS_PLATFORM.chgrp?= /bin/chgrp 38TOOLS_PLATFORM.chgrp?= /bin/chgrp
39.elif exists(/usr/bin/chgrp) 39.elif exists(/usr/bin/chgrp)
40TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 40TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
41.endif 41.endif
42TOOLS_PLATFORM.chmod?= /bin/chmod 42TOOLS_PLATFORM.chmod?= /bin/chmod
43.if exists(/bin/chown) 43.if exists(/bin/chown)
44TOOLS_PLATFORM.chown?= /bin/chown 44TOOLS_PLATFORM.chown?= /bin/chown
45.elif exists(/usr/sbin/chown) 45.elif exists(/usr/sbin/chown)
46TOOLS_PLATFORM.chown?= /usr/sbin/chown 46TOOLS_PLATFORM.chown?= /usr/sbin/chown
47.endif 47.endif
48.if exists(/bin/cmp) 48.if exists(/bin/cmp)
49TOOLS_PLATFORM.cmp?= /bin/cmp 49TOOLS_PLATFORM.cmp?= /bin/cmp
50.elif exists(/usr/bin/cmp) 50.elif exists(/usr/bin/cmp)
51TOOLS_PLATFORM.cmp?= /usr/bin/cmp 51TOOLS_PLATFORM.cmp?= /usr/bin/cmp
52.endif 52.endif
53TOOLS_PLATFORM.cp?= /bin/cp 53TOOLS_PLATFORM.cp?= /bin/cp
54.if exists(/bin/tcsh) 54.if exists(/bin/tcsh)
55TOOLS_PLATFORM.csh?= /bin/tcsh 55TOOLS_PLATFORM.csh?= /bin/tcsh
56.endif 56.endif
57.if exists(/usr/bin/curl) 57.if exists(/usr/bin/curl)
58TOOLS_PLATFORM.curl?= /usr/bin/curl 58TOOLS_PLATFORM.curl?= /usr/bin/curl
59.endif 59.endif
60.if exists(/bin/cut) 60.if exists(/bin/cut)
61TOOLS_PLATFORM.cut?= /bin/cut 61TOOLS_PLATFORM.cut?= /bin/cut
62.elif exists(/usr/bin/cut) 62.elif exists(/usr/bin/cut)
63TOOLS_PLATFORM.cut?= /usr/bin/cut 63TOOLS_PLATFORM.cut?= /usr/bin/cut
64.endif 64.endif
65TOOLS_PLATFORM.date?= /bin/date 65TOOLS_PLATFORM.date?= /bin/date
66.if exists(/bin/diff) 66.if exists(/bin/diff)
67TOOLS_PLATFORM.diff?= /bin/diff 67TOOLS_PLATFORM.diff?= /bin/diff
68.elif exists(/usr/bin/diff) 68.elif exists(/usr/bin/diff)
69TOOLS_PLATFORM.diff?= /usr/bin/diff 69TOOLS_PLATFORM.diff?= /usr/bin/diff
70.endif 70.endif
71.if exists(/bin/diff3) 71.if exists(/bin/diff3)
72TOOLS_PLATFORM.diff3?= /bin/diff3 72TOOLS_PLATFORM.diff3?= /bin/diff3
73.elif exists(/usr/bin/diff3) 73.elif exists(/usr/bin/diff3)
74TOOLS_PLATFORM.diff3?= /usr/bin/diff3 74TOOLS_PLATFORM.diff3?= /usr/bin/diff3
75.endif 75.endif
76TOOLS_PLATFORM.dirname?= /usr/bin/dirname 76TOOLS_PLATFORM.dirname?= /usr/bin/dirname
77TOOLS_PLATFORM.echo?= echo # shell builtin 77TOOLS_PLATFORM.echo?= echo # shell builtin
78.if exists(/bin/egrep) 78.if exists(/bin/egrep)
79TOOLS_PLATFORM.egrep?= /bin/egrep 79TOOLS_PLATFORM.egrep?= /bin/egrep
 80TOOLS_PLATFORM.gegrep?= /bin/egrep
80.elif exists(/usr/bin/egrep) 81.elif exists(/usr/bin/egrep)
81TOOLS_PLATFORM.egrep?= /usr/bin/egrep 82TOOLS_PLATFORM.egrep?= /usr/bin/egrep
 83TOOLS_PLATFORM.gegrep?= /usr/bin/egrep
82.endif 84.endif
83TOOLS_PLATFORM.env?= /usr/bin/env 85TOOLS_PLATFORM.env?= /usr/bin/env
84.if exists(/usr/bin/expr) 86.if exists(/usr/bin/expr)
85TOOLS_PLATFORM.expr?= /usr/bin/expr 87TOOLS_PLATFORM.expr?= /usr/bin/expr
86.elif exists(/bin/expr) 88.elif exists(/bin/expr)
87TOOLS_PLATFORM.expr?= /bin/expr 89TOOLS_PLATFORM.expr?= /bin/expr
88.endif 90.endif
89TOOLS_PLATFORM.false?= false # shell builtin 91TOOLS_PLATFORM.false?= false # shell builtin
90.if exists(/bin/fgrep) 92.if exists(/bin/fgrep)
91TOOLS_PLATFORM.fgrep?= /bin/fgrep 93TOOLS_PLATFORM.fgrep?= /bin/fgrep
 94TOOLS_PLATFORM.gfgrep?= /bin/fgrep
92.elif exists(/usr/bin/fgrep) 95.elif exists(/usr/bin/fgrep)
93TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep 96TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
 97TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep
94.endif 98.endif
95TOOLS_PLATFORM.file?= /usr/bin/file 99TOOLS_PLATFORM.file?= /usr/bin/file
96TOOLS_PLATFORM.find?= /usr/bin/find 100TOOLS_PLATFORM.find?= /usr/bin/find
97.if exists(/etc/debian_version) 101.if exists(/etc/debian_version)
98. if exists(/usr/bin/gawk) 102. if exists(/usr/bin/gawk)
99TOOLS_PLATFORM.gawk?= /usr/bin/gawk 103TOOLS_PLATFORM.gawk?= /usr/bin/gawk
100. endif 104. endif
101.else 105.else
102. if exists(/bin/awk) 106. if exists(/bin/awk)
103TOOLS_PLATFORM.gawk?= /bin/awk 107TOOLS_PLATFORM.gawk?= /bin/awk
104. else 108. else
105TOOLS_PLATFORM.gawk?= /usr/bin/awk 109TOOLS_PLATFORM.gawk?= /usr/bin/awk
106. endif 110. endif
107.endif 111.endif
108.if exists(/usr/bin/gettext) 112.if exists(/usr/bin/gettext)
109TOOLS_PLATFORM.gettext?= /usr/bin/gettext 113TOOLS_PLATFORM.gettext?= /usr/bin/gettext
110.endif 114.endif
111.if exists(/usr/bin/m4) 115.if exists(/usr/bin/m4)
112TOOLS_PLATFORM.gm4?= /usr/bin/m4 116TOOLS_PLATFORM.gm4?= /usr/bin/m4
113.endif 117.endif
114.if exists(/usr/bin/make) 118.if exists(/usr/bin/make)
115TOOLS_PLATFORM.gmake?= /usr/bin/make 119TOOLS_PLATFORM.gmake?= /usr/bin/make
116.endif 120.endif
117.if exists(/bin/grep) 121.if exists(/bin/grep)
118TOOLS_PLATFORM.grep?= /bin/grep 122TOOLS_PLATFORM.grep?= /bin/grep
 123TOOLS_PLATFORM.ggrep?= /bin/grep
119.elif exists(/usr/bin/grep) 124.elif exists(/usr/bin/grep)
120TOOLS_PLATFORM.grep?= /usr/bin/grep 125TOOLS_PLATFORM.grep?= /usr/bin/grep
 126TOOLS_PLATFORM.ggrep?= /usr/bin/grep
121.endif 127.endif
122.if exists(/usr/bin/groff) 128.if exists(/usr/bin/groff)
123TOOLS_PLATFORM.groff?= /usr/bin/groff 129TOOLS_PLATFORM.groff?= /usr/bin/groff
124.endif 130.endif
125.if exists(/bin/sed) 131.if exists(/bin/sed)
126TOOLS_PLATFORM.gsed?= /bin/sed 132TOOLS_PLATFORM.gsed?= /bin/sed
127.elif exists(/usr/bin/sed) 133.elif exists(/usr/bin/sed)
128TOOLS_PLATFORM.gsed?= /usr/bin/sed 134TOOLS_PLATFORM.gsed?= /usr/bin/sed
129.endif 135.endif
130.if exists(/usr/bin/soelim) 136.if exists(/usr/bin/soelim)
131TOOLS_PLATFORM.gsoelim?= /usr/bin/soelim 137TOOLS_PLATFORM.gsoelim?= /usr/bin/soelim
132.endif 138.endif
133.if exists(/bin/tar) 139.if exists(/bin/tar)
134TOOLS_PLATFORM.gtar?= /bin/tar 140TOOLS_PLATFORM.gtar?= /bin/tar
135.elif exists(/usr/bin/tar) 141.elif exists(/usr/bin/tar)
136TOOLS_PLATFORM.gtar?= /usr/bin/tar 142TOOLS_PLATFORM.gtar?= /usr/bin/tar
137.endif 143.endif
138.if exists(/bin/gunzip) 144.if exists(/bin/gunzip)
139TOOLS_PLATFORM.gunzip?= /bin/gunzip -f 145TOOLS_PLATFORM.gunzip?= /bin/gunzip -f
140.elif exists(/usr/bin/gunzip) 146.elif exists(/usr/bin/gunzip)
141TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 147TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
142.endif 148.endif
143.if exists(/bin/zcat) 149.if exists(/bin/zcat)
144TOOLS_PLATFORM.gzcat?= /bin/zcat 150TOOLS_PLATFORM.gzcat?= /bin/zcat
145.elif exists(/usr/bin/zcat) 151.elif exists(/usr/bin/zcat)
146TOOLS_PLATFORM.gzcat?= /usr/bin/zcat 152TOOLS_PLATFORM.gzcat?= /usr/bin/zcat
147.endif 153.endif
148.if exists(/bin/gzip) 154.if exists(/bin/gzip)
149TOOLS_PLATFORM.gzip?= /bin/gzip -nf ${GZIP} 155TOOLS_PLATFORM.gzip?= /bin/gzip -nf ${GZIP}
150.elif exists(/usr/bin/gzip) 156.elif exists(/usr/bin/gzip)
151TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 157TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
152.endif 158.endif
153.if exists(/bin/head) 159.if exists(/bin/head)
154TOOLS_PLATFORM.head?= /bin/head 160TOOLS_PLATFORM.head?= /bin/head
155.elif exists(/usr/bin/head) 161.elif exists(/usr/bin/head)
156TOOLS_PLATFORM.head?= /usr/bin/head 162TOOLS_PLATFORM.head?= /usr/bin/head
157.endif 163.endif
158TOOLS_PLATFORM.hostname?= /bin/hostname 164TOOLS_PLATFORM.hostname?= /bin/hostname
159.if exists(/bin/id) 165.if exists(/bin/id)
160TOOLS_PLATFORM.id?= /bin/id 166TOOLS_PLATFORM.id?= /bin/id
161.elif exists(/usr/bin/id) 167.elif exists(/usr/bin/id)
162TOOLS_PLATFORM.id?= /usr/bin/id 168TOOLS_PLATFORM.id?= /usr/bin/id
163.endif 169.endif
164.if exists(/usr/bin/ident) 170.if exists(/usr/bin/ident)
165TOOLS_PLATFORM.ident?= /usr/bin/ident 171TOOLS_PLATFORM.ident?= /usr/bin/ident
166.endif 172.endif
167.if exists(/bin/install) 173.if exists(/bin/install)
168TOOLS_PLATFORM.install?= /bin/install 174TOOLS_PLATFORM.install?= /bin/install
169.else 175.else
170TOOLS_PLATFORM.install?= /usr/bin/install 176TOOLS_PLATFORM.install?= /usr/bin/install
171.endif 177.endif
172.if exists(/sbin/install-info) 178.if exists(/sbin/install-info)
173TOOLS_PLATFORM.install-info?= /sbin/install-info 179TOOLS_PLATFORM.install-info?= /sbin/install-info
174.elif exists(/usr/sbin/install-info) 180.elif exists(/usr/sbin/install-info)
175TOOLS_PLATFORM.install-info?= /usr/sbin/install-info 181TOOLS_PLATFORM.install-info?= /usr/sbin/install-info
176.elif exists(/usr/bin/install-info) 182.elif exists(/usr/bin/install-info)
177TOOLS_PLATFORM.install-info?= /usr/bin/install-info 183TOOLS_PLATFORM.install-info?= /usr/bin/install-info
178.endif 184.endif
179TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig 185TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
180TOOLS_PLATFORM.ln?= /bin/ln 186TOOLS_PLATFORM.ln?= /bin/ln
181TOOLS_PLATFORM.ls?= /bin/ls 187TOOLS_PLATFORM.ls?= /bin/ls
182TOOLS_PLATFORM.m4?= ${TOOLS_PLATFORM.gm4} 188TOOLS_PLATFORM.m4?= ${TOOLS_PLATFORM.gm4}
183.if exists(/bin/mail) 189.if exists(/bin/mail)
184TOOLS_PLATFORM.mail?= /bin/mail # RH, Mandrake 190TOOLS_PLATFORM.mail?= /bin/mail # RH, Mandrake
185.elif exists(/usr/bin/mail) 191.elif exists(/usr/bin/mail)
186TOOLS_PLATFORM.mail?= /usr/bin/mail # Debian, Slackware, SuSE 192TOOLS_PLATFORM.mail?= /usr/bin/mail # Debian, Slackware, SuSE
187.endif 193.endif
188.if exists(/usr/bin/makeinfo) 194.if exists(/usr/bin/makeinfo)
189TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 195TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
190.endif 196.endif
191TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 197TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
192.if exists(/usr/bin/mktemp) 198.if exists(/usr/bin/mktemp)
193TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 199TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
194.elif exists(/bin/mktemp) 200.elif exists(/bin/mktemp)
195TOOLS_PLATFORM.mktemp?= /bin/mktemp 201TOOLS_PLATFORM.mktemp?= /bin/mktemp
196.endif 202.endif
197.if exists(/usr/bin/msgconv) 203.if exists(/usr/bin/msgconv)
198TOOLS_PLATFORM.msgconv?= /usr/bin/msgconv 204TOOLS_PLATFORM.msgconv?= /usr/bin/msgconv
199.endif 205.endif
200.if exists(/usr/bin/msgfmt) 206.if exists(/usr/bin/msgfmt)
201TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt 207TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt
202.endif 208.endif
203.if exists(/usr/bin/msgmerge) 209.if exists(/usr/bin/msgmerge)
204TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge 210TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge
205.endif 211.endif
206TOOLS_PLATFORM.mv?= /bin/mv 212TOOLS_PLATFORM.mv?= /bin/mv
207.if exists(/bin/nice) 213.if exists(/bin/nice)
208TOOLS_PLATFORM.nice?= /bin/nice 214TOOLS_PLATFORM.nice?= /bin/nice
209.elif exists(/usr/bin/nice) 215.elif exists(/usr/bin/nice)
210TOOLS_PLATFORM.nice?= /usr/bin/nice 216TOOLS_PLATFORM.nice?= /usr/bin/nice
211.endif 217.endif
212.if exists(/usr/bin/nroff) 218.if exists(/usr/bin/nroff)
213TOOLS_PLATFORM.nroff?= /usr/bin/nroff 219TOOLS_PLATFORM.nroff?= /usr/bin/nroff
214.endif 220.endif
215.if exists(/usr/bin/openssl) 221.if exists(/usr/bin/openssl)
216TOOLS_PLATFORM.openssl?= /usr/bin/openssl 222TOOLS_PLATFORM.openssl?= /usr/bin/openssl
217.endif 223.endif
218# Don't use GNU patch 224# Don't use GNU patch
219#TOOLS_PLATFORM.patch?= /usr/bin/patch 225#TOOLS_PLATFORM.patch?= /usr/bin/patch
220.if exists(/usr/bin/printf) 226.if exists(/usr/bin/printf)
221TOOLS_PLATFORM.printf?= /usr/bin/printf 227TOOLS_PLATFORM.printf?= /usr/bin/printf
222.endif 228.endif
223TOOLS_PLATFORM.pwd?= /bin/pwd 229TOOLS_PLATFORM.pwd?= /bin/pwd
224TOOLS_PLATFORM.readlink?= /bin/readlink 230TOOLS_PLATFORM.readlink?= /bin/readlink
225TOOLS_PLATFORM.rm?= /bin/rm 231TOOLS_PLATFORM.rm?= /bin/rm
226TOOLS_PLATFORM.rmdir?= /bin/rmdir 232TOOLS_PLATFORM.rmdir?= /bin/rmdir
227.if exists(/bin/sdiff) 233.if exists(/bin/sdiff)
228TOOLS_PLATFORM.sdiff?= /bin/sdiff 234TOOLS_PLATFORM.sdiff?= /bin/sdiff
229.elif exists(/usr/bin/sdiff) 235.elif exists(/usr/bin/sdiff)
230TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 236TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
231.endif 237.endif
232TOOLS_PLATFORM.sed?= ${TOOLS_PLATFORM.gsed} 238TOOLS_PLATFORM.sed?= ${TOOLS_PLATFORM.gsed}
233TOOLS_PLATFORM.sh?= /bin/sh 239TOOLS_PLATFORM.sh?= /bin/sh
234.if exists(/usr/bin/sleep) 240.if exists(/usr/bin/sleep)
235TOOLS_PLATFORM.sleep?= /usr/bin/sleep 241TOOLS_PLATFORM.sleep?= /usr/bin/sleep
236.else 242.else
237TOOLS_PLATFORM.sleep?= /bin/sleep 243TOOLS_PLATFORM.sleep?= /bin/sleep
238.endif 244.endif
239.if exists(/usr/bin/soelim) 245.if exists(/usr/bin/soelim)
240TOOLS_PLATFORM.soelim?= /usr/bin/soelim 246TOOLS_PLATFORM.soelim?= /usr/bin/soelim
241.endif 247.endif
242.if exists(/bin/sort) 248.if exists(/bin/sort)
243TOOLS_PLATFORM.sort?= /bin/sort 249TOOLS_PLATFORM.sort?= /bin/sort
244.elif exists(/usr/bin/sort) 250.elif exists(/usr/bin/sort)
245TOOLS_PLATFORM.sort?= /usr/bin/sort 251TOOLS_PLATFORM.sort?= /usr/bin/sort
246.endif 252.endif
247TOOLS_PLATFORM.strip?= /usr/bin/strip 253TOOLS_PLATFORM.strip?= /usr/bin/strip
248TOOLS_PLATFORM.tail?= /usr/bin/tail 254TOOLS_PLATFORM.tail?= /usr/bin/tail
249TOOLS_PLATFORM.tar?= ${TOOLS_PLATFORM.gtar} 255TOOLS_PLATFORM.tar?= ${TOOLS_PLATFORM.gtar}
250.if exists(/usr/bin/tbl) 256.if exists(/usr/bin/tbl)
251TOOLS_PLATFORM.tbl?= /usr/bin/tbl 257TOOLS_PLATFORM.tbl?= /usr/bin/tbl
252.endif 258.endif
253TOOLS_PLATFORM.tee?= /usr/bin/tee 259TOOLS_PLATFORM.tee?= /usr/bin/tee
254TOOLS_PLATFORM.test?= test # shell builtin 260TOOLS_PLATFORM.test?= test # shell builtin
255.if exists(/bin/touch) 261.if exists(/bin/touch)
256TOOLS_PLATFORM.touch?= /bin/touch 262TOOLS_PLATFORM.touch?= /bin/touch
257.elif exists(/usr/bin/touch) 263.elif exists(/usr/bin/touch)
258TOOLS_PLATFORM.touch?= /usr/bin/touch 264TOOLS_PLATFORM.touch?= /usr/bin/touch
259.endif 265.endif
260TOOLS_PLATFORM.tr?= /usr/bin/tr 266TOOLS_PLATFORM.tr?= /usr/bin/tr
261TOOLS_PLATFORM.true?= true # shell builtin 267TOOLS_PLATFORM.true?= true # shell builtin
262TOOLS_PLATFORM.tsort?= /usr/bin/tsort 268TOOLS_PLATFORM.tsort?= /usr/bin/tsort
263.if exists(/bin/uniq) 269.if exists(/bin/uniq)
264TOOLS_PLATFORM.uniq?= /bin/uniq 270TOOLS_PLATFORM.uniq?= /bin/uniq
265.elif exists(/usr/bin/uniq) 271.elif exists(/usr/bin/uniq)
266TOOLS_PLATFORM.uniq?= /usr/bin/uniq 272TOOLS_PLATFORM.uniq?= /usr/bin/uniq
267.endif 273.endif
268.if exists(/bin/wc) 274.if exists(/bin/wc)
269TOOLS_PLATFORM.wc?= /bin/wc 275TOOLS_PLATFORM.wc?= /bin/wc
270.elif exists(/usr/bin/wc) 276.elif exists(/usr/bin/wc)
271TOOLS_PLATFORM.wc?= /usr/bin/wc 277TOOLS_PLATFORM.wc?= /usr/bin/wc
272.endif 278.endif
273.if exists(/usr/bin/wget) 279.if exists(/usr/bin/wget)
274TOOLS_PLATFORM.wget?= /usr/bin/wget 280TOOLS_PLATFORM.wget?= /usr/bin/wget
275.endif 281.endif
276TOOLS_PLATFORM.xargs?= /usr/bin/xargs -r 282TOOLS_PLATFORM.xargs?= /usr/bin/xargs -r
277.if exists(/usr/bin/xgettext) 283.if exists(/usr/bin/xgettext)
278TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext 284TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
279.endif 285.endif
280.if exists(/usr/bin/yacc) 286.if exists(/usr/bin/yacc)
281TOOLS_PLATFORM.yacc?= /usr/bin/yacc 287TOOLS_PLATFORM.yacc?= /usr/bin/yacc
282.endif 288.endif
283.if exists(/usr/bin/xz) 289.if exists(/usr/bin/xz)
284TOOLS_PLATFORM.xz?= /usr/bin/xz 290TOOLS_PLATFORM.xz?= /usr/bin/xz
285.endif 291.endif
286.if exists(/usr/bin/xzcat) 292.if exists(/usr/bin/xzcat)
287TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat 293TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat
288.endif 294.endif
289 295
cvs diff -r1.61 -r1.62 pkgsrc/mk/tools/tools.NetBSD.mk (switch to unified diff)

--- pkgsrc/mk/tools/tools.NetBSD.mk 2017/04/21 16:03:10 1.61
+++ pkgsrc/mk/tools/tools.NetBSD.mk 2018/10/17 08:30:43 1.62
@@ -1,169 +1,172 @@ @@ -1,169 +1,172 @@
1# $NetBSD: tools.NetBSD.mk,v 1.61 2017/04/21 16:03:10 maya Exp $ 1# $NetBSD: tools.NetBSD.mk,v 1.62 2018/10/17 08:30:43 jperkin 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
8TOOLS_PLATFORM.byacc?= /usr/bin/yacc 8TOOLS_PLATFORM.byacc?= /usr/bin/yacc
9.if exists(/usr/bin/bzcat) 9.if exists(/usr/bin/bzcat)
10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 10TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
11.endif 11.endif
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?= /usr/bin/chgrp 14TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
15TOOLS_PLATFORM.chmod?= /bin/chmod 15TOOLS_PLATFORM.chmod?= /bin/chmod
16TOOLS_PLATFORM.chown?= /usr/sbin/chown 16TOOLS_PLATFORM.chown?= /usr/sbin/chown
17TOOLS_PLATFORM.cmp?= /usr/bin/cmp 17TOOLS_PLATFORM.cmp?= /usr/bin/cmp
18TOOLS_PLATFORM.cp?= /bin/cp 18TOOLS_PLATFORM.cp?= /bin/cp
19TOOLS_PLATFORM.csh?= /bin/csh 19TOOLS_PLATFORM.csh?= /bin/csh
20.if exists(/usr/bin/ctfconvert) 20.if exists(/usr/bin/ctfconvert)
21TOOLS_PLATFORM.ctfconvert?= /usr/bin/ctfconvert 21TOOLS_PLATFORM.ctfconvert?= /usr/bin/ctfconvert
22.endif 22.endif
23.if exists(/usr/bin/ctfmerge) 23.if exists(/usr/bin/ctfmerge)
24TOOLS_PLATFORM.ctfmerge?= /usr/bin/ctfmerge 24TOOLS_PLATFORM.ctfmerge?= /usr/bin/ctfmerge
25.endif 25.endif
26TOOLS_PLATFORM.cut?= /usr/bin/cut 26TOOLS_PLATFORM.cut?= /usr/bin/cut
27TOOLS_PLATFORM.date?= /bin/date 27TOOLS_PLATFORM.date?= /bin/date
28TOOLS_PLATFORM.diff?= /usr/bin/diff 28TOOLS_PLATFORM.diff?= /usr/bin/diff
29TOOLS_PLATFORM.diff3?= /usr/bin/diff3 29TOOLS_PLATFORM.diff3?= /usr/bin/diff3
30TOOLS_PLATFORM.dirname?= /usr/bin/dirname 30TOOLS_PLATFORM.dirname?= /usr/bin/dirname
31TOOLS_PLATFORM.echo?= echo # shell builtin 31TOOLS_PLATFORM.echo?= echo # shell builtin
32TOOLS_PLATFORM.egrep?= /usr/bin/egrep 32TOOLS_PLATFORM.egrep?= /usr/bin/egrep
33TOOLS_PLATFORM.env?= /usr/bin/env 33TOOLS_PLATFORM.env?= /usr/bin/env
34TOOLS_PLATFORM.expr?= /bin/expr 34TOOLS_PLATFORM.expr?= /bin/expr
35TOOLS_PLATFORM.false?= false # shell builtin 35TOOLS_PLATFORM.false?= false # shell builtin
36TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep 36TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
37TOOLS_PLATFORM.file?= /usr/bin/file 37TOOLS_PLATFORM.file?= /usr/bin/file
38TOOLS_PLATFORM.find?= /usr/bin/find 38TOOLS_PLATFORM.find?= /usr/bin/find
39TOOLS_PLATFORM.flex?= /usr/bin/lex 39TOOLS_PLATFORM.flex?= /usr/bin/lex
40TOOLS_PLATFORM.ftp?= /usr/bin/ftp 40TOOLS_PLATFORM.ftp?= /usr/bin/ftp
41.if exists(/usr/bin/gettext) 41.if exists(/usr/bin/gettext)
42TOOLS_PLATFORM.gettext?= /usr/bin/gettext 42TOOLS_PLATFORM.gettext?= /usr/bin/gettext
43.endif 43.endif
 44TOOLS_PLATFORM.gegrep?= /usr/bin/egrep
 45TOOLS_PLATFORM.gfgrep?= /usr/bin/fgrep
 46TOOLS_PLATFORM.ggrep?= /usr/bin/grep
44TOOLS_PLATFORM.grep?= /usr/bin/grep 47TOOLS_PLATFORM.grep?= /usr/bin/grep
45TOOLS_PLATFORM.groff?= /usr/bin/groff 48TOOLS_PLATFORM.groff?= /usr/bin/groff
46TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish 49TOOLS_PLATFORM.gsoelim?= ${TOOLS_PLATFORM.soelim} # GNUish
47TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 50TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
48TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 51TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
49TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 52TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
50TOOLS_PLATFORM.head?= /usr/bin/head 53TOOLS_PLATFORM.head?= /usr/bin/head
51TOOLS_PLATFORM.hostname?= /bin/hostname 54TOOLS_PLATFORM.hostname?= /bin/hostname
52TOOLS_PLATFORM.id?= /usr/bin/id 55TOOLS_PLATFORM.id?= /usr/bin/id
53TOOLS_PLATFORM.ident?= /usr/bin/ident 56TOOLS_PLATFORM.ident?= /usr/bin/ident
54.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 57.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
55TOOLS_PLATFORM.install?= /usr/bin/install 58TOOLS_PLATFORM.install?= /usr/bin/install
56.else 59.else
57TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install 60TOOLS_PLATFORM.install?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
58.endif 61.endif
59.if exists(/usr/bin/install-info) 62.if exists(/usr/bin/install-info)
60TOOLS_PLATFORM.install-info?= /usr/bin/install-info 63TOOLS_PLATFORM.install-info?= /usr/bin/install-info
61.endif 64.endif
62.if exists(/sbin/ldconfig) && ${OBJECT_FMT} == "a.out" 65.if exists(/sbin/ldconfig) && ${OBJECT_FMT} == "a.out"
63TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig 66TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
64.endif 67.endif
65TOOLS_PLATFORM.ksh?= /bin/ksh 68TOOLS_PLATFORM.ksh?= /bin/ksh
66TOOLS_PLATFORM.lex?= /usr/bin/lex 69TOOLS_PLATFORM.lex?= /usr/bin/lex
67TOOLS_PLATFORM.ln?= /bin/ln 70TOOLS_PLATFORM.ln?= /bin/ln
68TOOLS_PLATFORM.ls?= /bin/ls 71TOOLS_PLATFORM.ls?= /bin/ls
69TOOLS_PLATFORM.m4?= /usr/bin/m4 72TOOLS_PLATFORM.m4?= /usr/bin/m4
70TOOLS_PLATFORM.mail?= /usr/bin/mail 73TOOLS_PLATFORM.mail?= /usr/bin/mail
71.if exists(/usr/bin/makeinfo) 74.if exists(/usr/bin/makeinfo)
72TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 75TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
73.endif 76.endif
74TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 77TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
75TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 78TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
76.if exists(/usr/bin/msgconv) 79.if exists(/usr/bin/msgconv)
77TOOLS_PLATFORM.msgconv?= /usr/bin/msgconv 80TOOLS_PLATFORM.msgconv?= /usr/bin/msgconv
78.endif 81.endif
79.if exists(/usr/bin/msgfmt) 82.if exists(/usr/bin/msgfmt)
80TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt 83TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt
81.endif 84.endif
82.if exists(/usr/bin/msgmerge) 85.if exists(/usr/bin/msgmerge)
83TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge 86TOOLS_PLATFORM.msgmerge?= /usr/bin/msgmerge
84.endif 87.endif
85TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 88TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
86TOOLS_PLATFORM.mv?= /bin/mv 89TOOLS_PLATFORM.mv?= /bin/mv
87TOOLS_PLATFORM.nice?= /usr/bin/nice 90TOOLS_PLATFORM.nice?= /usr/bin/nice
88TOOLS_PLATFORM.nroff?= /usr/bin/nroff 91TOOLS_PLATFORM.nroff?= /usr/bin/nroff
89TOOLS_PLATFORM.openssl?= /usr/bin/openssl 92TOOLS_PLATFORM.openssl?= /usr/bin/openssl
90TOOLS_PLATFORM.patch?= /usr/bin/patch 93TOOLS_PLATFORM.patch?= /usr/bin/patch
91TOOLS_PLATFORM.pax?= /bin/pax 94TOOLS_PLATFORM.pax?= /bin/pax
92.if exists(/usr/sbin/paxctl) 95.if exists(/usr/sbin/paxctl)
93TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl 96TOOLS_PLATFORM.paxctl?= /usr/sbin/paxctl
94.endif 97.endif
95TOOLS_PLATFORM.printf?= /usr/bin/printf 98TOOLS_PLATFORM.printf?= /usr/bin/printf
96TOOLS_PLATFORM.pwd?= /bin/pwd 99TOOLS_PLATFORM.pwd?= /bin/pwd
97.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 100.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
98TOOLS_PLATFORM.readelf?= /usr/bin/readelf 101TOOLS_PLATFORM.readelf?= /usr/bin/readelf
99.else 102.else
100TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf 103TOOLS_PLATFORM.readelf?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
101.endif 104.endif
102TOOLS_PLATFORM.readlink?= /usr/bin/readlink 105TOOLS_PLATFORM.readlink?= /usr/bin/readlink
103TOOLS_PLATFORM.rm?= /bin/rm 106TOOLS_PLATFORM.rm?= /bin/rm
104TOOLS_PLATFORM.rmdir?= /bin/rmdir 107TOOLS_PLATFORM.rmdir?= /bin/rmdir
105TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 108TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
106TOOLS_PLATFORM.sed?= /usr/bin/sed 109TOOLS_PLATFORM.sed?= /usr/bin/sed
107TOOLS_PLATFORM.sh?= /bin/sh 110TOOLS_PLATFORM.sh?= /bin/sh
108TOOLS_PLATFORM.shlock?= /usr/bin/shlock 111TOOLS_PLATFORM.shlock?= /usr/bin/shlock
109TOOLS_PLATFORM.sleep?= /bin/sleep 112TOOLS_PLATFORM.sleep?= /bin/sleep
110TOOLS_PLATFORM.soelim?= /usr/bin/soelim 113TOOLS_PLATFORM.soelim?= /usr/bin/soelim
111TOOLS_PLATFORM.sort?= /usr/bin/sort 114TOOLS_PLATFORM.sort?= /usr/bin/sort
112.if empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 115.if empty(USE_CROSS_COMPILE:M[yY][eE][sS])
113TOOLS_PLATFORM.strip?= /usr/bin/strip 116TOOLS_PLATFORM.strip?= /usr/bin/strip
114.else 117.else
115TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip 118TOOLS_PLATFORM.strip?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
116.endif 119.endif
117 120
118TOOLS_PLATFORM.tail?= /usr/bin/tail 121TOOLS_PLATFORM.tail?= /usr/bin/tail
119.if exists(/bin/tar) 122.if exists(/bin/tar)
120TOOLS_PLATFORM.tar?= /bin/tar 123TOOLS_PLATFORM.tar?= /bin/tar
121.elif exists(/usr/bin/tar) 124.elif exists(/usr/bin/tar)
122TOOLS_PLATFORM.tar?= /usr/bin/tar 125TOOLS_PLATFORM.tar?= /usr/bin/tar
123.endif 126.endif
124TOOLS_PLATFORM.tbl?= /usr/bin/tbl 127TOOLS_PLATFORM.tbl?= /usr/bin/tbl
125TOOLS_PLATFORM.tee?= /usr/bin/tee 128TOOLS_PLATFORM.tee?= /usr/bin/tee
126TOOLS_PLATFORM.test?= test # shell builtin 129TOOLS_PLATFORM.test?= test # shell builtin
127TOOLS_PLATFORM.touch?= /usr/bin/touch 130TOOLS_PLATFORM.touch?= /usr/bin/touch
128TOOLS_PLATFORM.tr?= /usr/bin/tr 131TOOLS_PLATFORM.tr?= /usr/bin/tr
129TOOLS_PLATFORM.true?= true # shell builtin 132TOOLS_PLATFORM.true?= true # shell builtin
130TOOLS_PLATFORM.tsort?= /usr/bin/tsort 133TOOLS_PLATFORM.tsort?= /usr/bin/tsort
131TOOLS_PLATFORM.uniq?= /usr/bin/uniq 134TOOLS_PLATFORM.uniq?= /usr/bin/uniq
132.if exists(/usr/bin/unzip) 135.if exists(/usr/bin/unzip)
133TOOLS_PLATFORM.unzip?= /usr/bin/unzip 136TOOLS_PLATFORM.unzip?= /usr/bin/unzip
134.endif 137.endif
135TOOLS_PLATFORM.wc?= /usr/bin/wc 138TOOLS_PLATFORM.wc?= /usr/bin/wc
136TOOLS_PLATFORM.xargs?= /usr/bin/xargs 139TOOLS_PLATFORM.xargs?= /usr/bin/xargs
137.if exists(/usr/bin/xgettext) 140.if exists(/usr/bin/xgettext)
138TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext 141TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext
139.endif 142.endif
140.if exists(/usr/bin/xz) 143.if exists(/usr/bin/xz)
141TOOLS_PLATFORM.xz?= /usr/bin/xz 144TOOLS_PLATFORM.xz?= /usr/bin/xz
142.endif 145.endif
143.if exists(/usr/bin/xzcat) 146.if exists(/usr/bin/xzcat)
144TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat 147TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat
145.endif 148.endif
146TOOLS_PLATFORM.yacc?= /usr/bin/yacc 149TOOLS_PLATFORM.yacc?= /usr/bin/yacc
147 150
148.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 151.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
149. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip 152. for _t_ in ar as ld nm objcopy objdump ranlib readelf strip
150TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \ 153TOOLS_PATH.${MACHINE_GNU_PLATFORM}-${_t_}?= \
151 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_} 154 ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-${_t_}
152TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_} 155TOOLS_CREATE+= ${MACHINE_GNU_PLATFORM}-${_t_}
153. endfor 156. endfor
154 157
155TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar 158TOOLS_PATH.ar?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
156TOOLS_CREATE+= ar 159TOOLS_CREATE+= ar
157TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib 160TOOLS_PATH.ranlib?= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
158TOOLS_CREATE+= ranlib 161TOOLS_CREATE+= ranlib
159 162
160NATIVE_CC:= /usr/bin/cc -B /usr/libexec -B /usr/bin 163NATIVE_CC:= /usr/bin/cc -B /usr/libexec -B /usr/bin
161CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc 164CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
162 165
163NATIVE_CXX:= /usr/bin/c++ -B /usr/libexec -B /usr/bin 166NATIVE_CXX:= /usr/bin/c++ -B /usr/libexec -B /usr/bin
164CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g++ 167CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g++
165 168
166NATIVE_LD:= /usr/bin/ld 169NATIVE_LD:= /usr/bin/ld
167LD= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld 170LD= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld
168 171
169.endif 172.endif