Sat Oct 26 15:31:26 2013 UTC ()
Newer versions of OSX don't ship with gnutar. From Jan Danielsson.


(joerg)
diff -r1.49 -r1.50 pkgsrc/mk/tools/tools.Darwin.mk
cvs diff -r1.49 -r1.50 pkgsrc/mk/tools/tools.Darwin.mk (switch to unified diff)

--- pkgsrc/mk/tools/tools.Darwin.mk 2013/08/18 11:45:33 1.49
+++ pkgsrc/mk/tools/tools.Darwin.mk 2013/10/26 15:31:26 1.50
@@ -1,123 +1,125 @@ @@ -1,123 +1,125 @@
1# $NetBSD: tools.Darwin.mk,v 1.49 2013/08/18 11:45:33 tron Exp $ 1# $NetBSD: tools.Darwin.mk,v 1.50 2013/10/26 15:31:26 joerg 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
48.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 48.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
49TOOLS_PLATFORM.gmake?= /usr/bin/gnumake 49TOOLS_PLATFORM.gmake?= /usr/bin/gnumake
50TOOLS_PLATFORM.gm4?= /usr/bin/gm4 50TOOLS_PLATFORM.gm4?= /usr/bin/gm4
51.endif 51.endif
52TOOLS_PLATFORM.grep?= /usr/bin/grep 52TOOLS_PLATFORM.grep?= /usr/bin/grep
53.if exists(/usr/bin/groff) 53.if exists(/usr/bin/groff)
54TOOLS_PLATFORM.groff?=/usr/bin/groff 54TOOLS_PLATFORM.groff?=/usr/bin/groff
55.endif 55.endif
 56.if exists(/usr/bin/gnutar)
56TOOLS_PLATFORM.gtar?= /usr/bin/gnutar 57TOOLS_PLATFORM.gtar?= /usr/bin/gnutar
 58.endif
57TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 59TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
58TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 60TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
59TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 61TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
60TOOLS_PLATFORM.head?= /usr/bin/head 62TOOLS_PLATFORM.head?= /usr/bin/head
61TOOLS_PLATFORM.hostname?= /bin/hostname 63TOOLS_PLATFORM.hostname?= /bin/hostname
62TOOLS_PLATFORM.id?= /usr/bin/id 64TOOLS_PLATFORM.id?= /usr/bin/id
63TOOLS_PLATFORM.ident?= /usr/bin/ident 65TOOLS_PLATFORM.ident?= /usr/bin/ident
64TOOLS_PLATFORM.install?= /usr/bin/install 66TOOLS_PLATFORM.install?= /usr/bin/install
65.if exists(/usr/bin/install-info) 67.if exists(/usr/bin/install-info)
66TOOLS_PLATFORM.install-info?= /usr/bin/install-info 68TOOLS_PLATFORM.install-info?= /usr/bin/install-info
67.endif 69.endif
68.if exists(/bin/ksh) 70.if exists(/bin/ksh)
69TOOLS_PLATFORM.ksh?= /bin/ksh 71TOOLS_PLATFORM.ksh?= /bin/ksh
70.endif 72.endif
71TOOLS_PLATFORM.lex?= /usr/bin/lex 73TOOLS_PLATFORM.lex?= /usr/bin/lex
72TOOLS_PLATFORM.ln?= /bin/ln 74TOOLS_PLATFORM.ln?= /bin/ln
73TOOLS_PLATFORM.ls?= /bin/ls 75TOOLS_PLATFORM.ls?= /bin/ls
74TOOLS_PLATFORM.m4?= /usr/bin/m4 76TOOLS_PLATFORM.m4?= /usr/bin/m4
75TOOLS_PLATFORM.mail?= /usr/bin/mail 77TOOLS_PLATFORM.mail?= /usr/bin/mail
76.if exists(/usr/bin/makeinfo) 78.if exists(/usr/bin/makeinfo)
77TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 79TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
78.endif 80.endif
79TOOLS_PLATFORM.mkdir?= /bin/mkdir -p 81TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
80TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 82TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
81TOOLS_PLATFORM.mtree?= /usr/sbin/mtree 83TOOLS_PLATFORM.mtree?= /usr/sbin/mtree
82TOOLS_PLATFORM.mv?= /bin/mv 84TOOLS_PLATFORM.mv?= /bin/mv
83TOOLS_PLATFORM.nice?= /usr/bin/nice 85TOOLS_PLATFORM.nice?= /usr/bin/nice
84TOOLS_PLATFORM.nroff?= /usr/bin/nroff 86TOOLS_PLATFORM.nroff?= /usr/bin/nroff
85TOOLS_PLATFORM.openssl?= /usr/bin/openssl 87TOOLS_PLATFORM.openssl?= /usr/bin/openssl
86TOOLS_PLATFORM.pax?= /bin/pax 88TOOLS_PLATFORM.pax?= /bin/pax
87# Don't use GNU patch 89# Don't use GNU patch
88#TOOLS_PLATFORM.patch?= /usr/bin/patch 90#TOOLS_PLATFORM.patch?= /usr/bin/patch
89TOOLS_PLATFORM.printf?= /usr/bin/printf 91TOOLS_PLATFORM.printf?= /usr/bin/printf
90TOOLS_PLATFORM.pwd?= /bin/pwd 92TOOLS_PLATFORM.pwd?= /bin/pwd
91TOOLS_PLATFORM.readlink?= /usr/bin/readlink 93TOOLS_PLATFORM.readlink?= /usr/bin/readlink
92TOOLS_PLATFORM.rm?= /bin/rm 94TOOLS_PLATFORM.rm?= /bin/rm
93TOOLS_PLATFORM.rmdir?= /bin/rmdir 95TOOLS_PLATFORM.rmdir?= /bin/rmdir
94TOOLS_PLATFORM.sed?= /usr/bin/sed 96TOOLS_PLATFORM.sed?= /usr/bin/sed
95TOOLS_PLATFORM.sh?= /bin/sh 97TOOLS_PLATFORM.sh?= /bin/sh
96.if exists(/usr/bin/shlock) 98.if exists(/usr/bin/shlock)
97TOOLS_PLATFORM.shlock?= /usr/bin/shlock 99TOOLS_PLATFORM.shlock?= /usr/bin/shlock
98.endif 100.endif
99TOOLS_PLATFORM.sleep?= /bin/sleep 101TOOLS_PLATFORM.sleep?= /bin/sleep
100.if exists(/usr/bin/soelim) 102.if exists(/usr/bin/soelim)
101TOOLS_PLATFORM.soelim?= /usr/bin/soelim 103TOOLS_PLATFORM.soelim?= /usr/bin/soelim
102.endif 104.endif
103TOOLS_PLATFORM.sort?= /usr/bin/sort 105TOOLS_PLATFORM.sort?= /usr/bin/sort
104TOOLS_PLATFORM.strip?= /usr/bin/strip 106TOOLS_PLATFORM.strip?= /usr/bin/strip
105TOOLS_PLATFORM.tail?= /usr/bin/tail 107TOOLS_PLATFORM.tail?= /usr/bin/tail
106TOOLS_PLATFORM.tar?= /usr/bin/tar 108TOOLS_PLATFORM.tar?= /usr/bin/tar
107.if exists(/usr/bin/tbl) 109.if exists(/usr/bin/tbl)
108TOOLS_PLATFORM.tbl?= /usr/bin/tbl 110TOOLS_PLATFORM.tbl?= /usr/bin/tbl
109.endif 111.endif
110TOOLS_PLATFORM.tclsh?= /usr/bin/tclsh 112TOOLS_PLATFORM.tclsh?= /usr/bin/tclsh
111TOOLS_PLATFORM.tee?= /usr/bin/tee 113TOOLS_PLATFORM.tee?= /usr/bin/tee
112TOOLS_PLATFORM.test?= test # shell builtin 114TOOLS_PLATFORM.test?= test # shell builtin
113TOOLS_PLATFORM.touch?= /usr/bin/touch 115TOOLS_PLATFORM.touch?= /usr/bin/touch
114TOOLS_PLATFORM.tr?= /usr/bin/tr 116TOOLS_PLATFORM.tr?= /usr/bin/tr
115TOOLS_PLATFORM.true?= true # shell builtin 117TOOLS_PLATFORM.true?= true # shell builtin
116TOOLS_PLATFORM.tsort?= /usr/bin/tsort 118TOOLS_PLATFORM.tsort?= /usr/bin/tsort
117TOOLS_PLATFORM.unzip?= /usr/bin/unzip 119TOOLS_PLATFORM.unzip?= /usr/bin/unzip
118TOOLS_PLATFORM.wc?= /usr/bin/wc 120TOOLS_PLATFORM.wc?= /usr/bin/wc
119.if exists(/usr/bin/wish) 121.if exists(/usr/bin/wish)
120TOOLS_PLATFORM.wish?= /usr/bin/wish 122TOOLS_PLATFORM.wish?= /usr/bin/wish
121.endif 123.endif
122TOOLS_PLATFORM.xargs?= /usr/bin/xargs 124TOOLS_PLATFORM.xargs?= /usr/bin/xargs
123TOOLS_PLATFORM.yacc?= /usr/bin/yacc 125TOOLS_PLATFORM.yacc?= /usr/bin/yacc