Mon Jul 21 00:33:11 2014 UTC ()
revert, acceptable condition must be clealify.


(obache)
diff -r1.52 -r1.53 pkgsrc/mk/tools/tools.Darwin.mk
cvs diff -r1.52 -r1.53 pkgsrc/mk/tools/tools.Darwin.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.Darwin.mk 2014/07/21 00:25:48 1.52
+++ pkgsrc/mk/tools/tools.Darwin.mk 2014/07/21 00:33:11 1.53
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.Darwin.mk,v 1.52 2014/07/21 00:25:48 obache Exp $ 1# $NetBSD: tools.Darwin.mk,v 1.53 2014/07/21 00:33:11 obache 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)
@@ -34,29 +34,27 @@ TOOLS_PLATFORM.curl?= /usr/bin/curl @@ -34,29 +34,27 @@ TOOLS_PLATFORM.curl?= /usr/bin/curl
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
47.if empty(MACHINE_PLATFORM:MDarwin-[0-9].*-*) 
48TOOLS_PLATFORM.ftp?= /usr/bin/ftp 47TOOLS_PLATFORM.ftp?= /usr/bin/ftp
49.endif 
50.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 48.if empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
51TOOLS_PLATFORM.gmake?= /usr/bin/gnumake 49TOOLS_PLATFORM.gmake?= /usr/bin/gnumake
52TOOLS_PLATFORM.gm4?= /usr/bin/gm4 50TOOLS_PLATFORM.gm4?= /usr/bin/gm4
53.endif 51.endif
54TOOLS_PLATFORM.grep?= /usr/bin/grep 52TOOLS_PLATFORM.grep?= /usr/bin/grep
55.if exists(/usr/bin/groff) 53.if exists(/usr/bin/groff)
56TOOLS_PLATFORM.groff?=/usr/bin/groff 54TOOLS_PLATFORM.groff?=/usr/bin/groff
57.endif 55.endif
58.if exists(/usr/bin/gnutar) 56.if exists(/usr/bin/gnutar)
59TOOLS_PLATFORM.gtar?= /usr/bin/gnutar 57TOOLS_PLATFORM.gtar?= /usr/bin/gnutar
60.endif 58.endif
61TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f 59TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
62TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat 60TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat