Tue Oct 4 13:08:42 2011 UTC ()
In SunOS 5.10 and earlier, some tools only exist in /usr/sfw/bin.


(hans)
diff -r1.34 -r1.35 pkgsrc/mk/tools/tools.SunOS.mk
cvs diff -r1.34 -r1.35 pkgsrc/mk/tools/tools.SunOS.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.SunOS.mk 2011/10/04 13:07:21 1.34
+++ pkgsrc/mk/tools/tools.SunOS.mk 2011/10/04 13:08:42 1.35
@@ -1,32 +1,35 @@ @@ -1,32 +1,35 @@
1# $NetBSD: tools.SunOS.mk,v 1.34 2011/10/04 13:07:21 hans Exp $ 1# $NetBSD: tools.SunOS.mk,v 1.35 2011/10/04 13:08:42 hans Exp $
2# 2#
3# System-supplied tools for the Solaris operating system. 3# System-supplied tools for the Solaris operating system.
4# 4#
5# We bootstrap a pdksh shell on this platform. 5# We bootstrap a pdksh shell on this platform.
6 6
7TOOLS_PLATFORM.[?= [ # shell builtin 7TOOLS_PLATFORM.[?= [ # shell builtin
8.if exists(/usr/bin/gawk) 8.if exists(/usr/bin/gawk)
9TOOLS_PLATFORM.awk?= /usr/bin/gawk 9TOOLS_PLATFORM.awk?= /usr/bin/gawk
10.else 10.else
11TOOLS_PLATFORM.awk?= /usr/bin/nawk 11TOOLS_PLATFORM.awk?= /usr/bin/nawk
12.endif 12.endif
13TOOLS_PLATFORM.basename?= /usr/bin/basename 13TOOLS_PLATFORM.basename?= /usr/bin/basename
14.if exists(/bin/bash) 14.if exists(/bin/bash)
15TOOLS_PLATFORM.bash?= /bin/bash 15TOOLS_PLATFORM.bash?= /bin/bash
16.endif 16.endif
17.if exists(/usr/bin/bison) 17.if exists(/usr/bin/bison)
18TOOLS_PLATFORM.bison?= /usr/bin/bison 18TOOLS_PLATFORM.bison?= /usr/bin/bison
19TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y 19TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y
 20.elif exists(/usr/sfw/bison)
 21TOOLS_PLATFORM.bison?= /usr/sfw/bin/bison
 22TOOLS_PLATFORM.bison-yacc?= /usr/sfw/bin/bison -y
20.endif 23.endif
21.if exists(/usr/bin/bzcat) 24.if exists(/usr/bin/bzcat)
22TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat 25TOOLS_PLATFORM.bzcat?= /usr/bin/bzcat
23.endif 26.endif
24.if exists(/usr/bin/bzip2) 27.if exists(/usr/bin/bzip2)
25TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2 28TOOLS_PLATFORM.bzip2?= /usr/bin/bzip2
26.endif 29.endif
27TOOLS_PLATFORM.cat?= /usr/bin/cat 30TOOLS_PLATFORM.cat?= /usr/bin/cat
28TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp 31TOOLS_PLATFORM.chgrp?= /usr/bin/chgrp
29TOOLS_PLATFORM.chmod?= /usr/bin/chmod 32TOOLS_PLATFORM.chmod?= /usr/bin/chmod
30TOOLS_PLATFORM.chown?= /usr/bin/chown 33TOOLS_PLATFORM.chown?= /usr/bin/chown
31.if exists(/bin/cmp) 34.if exists(/bin/cmp)
32TOOLS_PLATFORM.cmp?= /bin/cmp 35TOOLS_PLATFORM.cmp?= /bin/cmp
@@ -43,93 +46,110 @@ TOOLS_PLATFORM.diff?= /usr/bin/gdiff @@ -43,93 +46,110 @@ TOOLS_PLATFORM.diff?= /usr/bin/gdiff
43TOOLS_PLATFORM.diff?= /usr/bin/diff 46TOOLS_PLATFORM.diff?= /usr/bin/diff
44.endif 47.endif
45.if exists(/usr/bin/gdiff3) 48.if exists(/usr/bin/gdiff3)
46TOOLS_PLATFORM.diff3?= /usr/bin/gdiff3 49TOOLS_PLATFORM.diff3?= /usr/bin/gdiff3
47.else 50.else
48TOOLS_PLATFORM.diff3?= /usr/bin/diff3 51TOOLS_PLATFORM.diff3?= /usr/bin/diff3
49.endif 52.endif
50TOOLS_PLATFORM.dirname?= /usr/bin/dirname 53TOOLS_PLATFORM.dirname?= /usr/bin/dirname
51TOOLS_PLATFORM.echo?= echo # shell builtin 54TOOLS_PLATFORM.echo?= echo # shell builtin
52.if exists(/usr/gnu/bin/grep) 55.if exists(/usr/gnu/bin/grep)
53TOOLS_PLATFORM.grep?= /usr/gnu/bin/grep 56TOOLS_PLATFORM.grep?= /usr/gnu/bin/grep
54TOOLS_PLATFORM.egrep?= /usr/gnu/bin/grep -E 57TOOLS_PLATFORM.egrep?= /usr/gnu/bin/grep -E
55TOOLS_PLATFORM.fgrep?= /usr/gnu/bin/fgrep 58TOOLS_PLATFORM.fgrep?= /usr/gnu/bin/fgrep
 59.elif exists(/usr/sfw/bin/ggrep)
 60TOOLS_PLATFORM.grep?= /usr/sfw/bin/ggrep
 61TOOLS_PLATFORM.egrep?= /usr/sfw/bin/ggrep -E
 62TOOLS_PLATFORM.fgrep?= /usr/sfw/bin/gfgrep
56.else 63.else
57TOOLS_PLATFORM.grep?= /usr/xpg4/bin/grep 64TOOLS_PLATFORM.grep?= /usr/xpg4/bin/grep
58TOOLS_PLATFORM.egrep?= /usr/xpg4/bin/grep -E 65TOOLS_PLATFORM.egrep?= /usr/xpg4/bin/grep -E
59TOOLS_PLATFORM.fgrep?= /usr/xpg4/bin/fgrep 66TOOLS_PLATFORM.fgrep?= /usr/xpg4/bin/fgrep
60.endif 67.endif
61TOOLS_PLATFORM.env?= /usr/bin/env 68TOOLS_PLATFORM.env?= /usr/bin/env
62TOOLS_PLATFORM.expr?= /usr/xpg4/bin/expr 69TOOLS_PLATFORM.expr?= /usr/xpg4/bin/expr
63.if exists(/usr/gnu/bin/false) # if we are using OpenSolaris 70.if exists(/usr/gnu/bin/false) # if we are using OpenSolaris
64TOOLS_PLATFORM.false?= /usr/gnu/bin/false 71TOOLS_PLATFORM.false?= /usr/gnu/bin/false
65.else 72.else
66TOOLS_PLATFORM.false?= false # shell builtin 73TOOLS_PLATFORM.false?= false # shell builtin
67.endif 74.endif
68TOOLS_PLATFORM.file?= /usr/bin/file 75TOOLS_PLATFORM.file?= /usr/bin/file
69.if exists(/usr/gnu/bin/find) 76.if exists(/usr/gnu/bin/find)
70TOOLS_PLATFORM.find?= /usr/gnu/bin/find 77TOOLS_PLATFORM.find?= /usr/gnu/bin/find
71.else 78.else
72TOOLS_PLATFORM.find?= /usr/bin/find 79TOOLS_PLATFORM.find?= /usr/bin/find
73.endif 80.endif
74.if exists(/usr/bin/flex) 81.if exists(/usr/bin/flex)
75TOOLS_PLATFORM.flex?= /usr/bin/flex 82TOOLS_PLATFORM.flex?= /usr/bin/flex
76TOOLS_PLATFORM.lex?= /usr/bin/flex 83TOOLS_PLATFORM.lex?= /usr/bin/flex
 84.elif exists(/usr/sfw/bin/flex)
 85TOOLS_PLATFORM.flex?= /usr/sfw/bin/flex
 86TOOLS_PLATFORM.lex?= /usr/sfw/bin/flex
77.endif 87.endif
78.if exists(/usr/bin/gawk) 88.if exists(/usr/bin/gawk)
79TOOLS_PLATFORM.gawk?= /usr/bin/gawk 89TOOLS_PLATFORM.gawk?= /usr/bin/gawk
80.endif 90.endif
81.if exists(/usr/bin/gm4) 91.if exists(/usr/bin/gm4)
82TOOLS_PLATFORM.gm4?= /usr/bin/gm4 92TOOLS_PLATFORM.gm4?= /usr/bin/gm4
83.endif 93.endif
84.if exists(/usr/bin/gmake) 94.if exists(/usr/bin/gmake)
85TOOLS_PLATFORM.gmake?= /usr/bin/gmake 95TOOLS_PLATFORM.gmake?= /usr/bin/gmake
 96.elif exists(/usr/sfw/bin/gmake)
 97TOOLS_PLATFORM.gmake?= /usr/sfw/bin/gmake
86.endif 98.endif
87.if exists(/usr/bin/groff) 99.if exists(/usr/bin/groff)
88TOOLS_PLATFORM.groff?= /usr/bin/groff 100TOOLS_PLATFORM.groff?= /usr/bin/groff
89.endif 101.endif
90.if exists(/usr/bin/gsed) 102.if exists(/usr/bin/gsed)
91TOOLS_PLATFORM.gsed?= /usr/bin/gsed 103TOOLS_PLATFORM.gsed?= /usr/bin/gsed
92.endif 104.endif
93.if exists(/usr/bin/gsoelim) 105.if exists(/usr/bin/gsoelim)
94TOOLS_PLATFORM.gsoelim?= /usr/bin/gsoelim 106TOOLS_PLATFORM.gsoelim?= /usr/bin/gsoelim
95.endif 107.endif
96.if exists(/usr/bin/gtar) 108.if exists(/usr/bin/gtar)
97TOOLS_PLATFORM.bsdtar?= /usr/bin/gtar 109TOOLS_PLATFORM.bsdtar?= /usr/bin/gtar
98TOOLS_PLATFORM.gtar?= /usr/bin/gtar 110TOOLS_PLATFORM.gtar?= /usr/bin/gtar
99TOOLS_PLATFORM.tar?= /usr/bin/gtar 111TOOLS_PLATFORM.tar?= /usr/bin/gtar
 112.elif exists(/usr/sfw/bin/gtar)
 113TOOLS_PLATFORM.bsdtar?= /usr/sfw/bin/gtar
 114TOOLS_PLATFORM.gtar?= /usr/sfw/bin/gtar
 115TOOLS_PLATFORM.tar?= /usr/sfw/bin/gtar
100.endif 116.endif
101.if exists(/usr/bin/gzip) 117.if exists(/usr/bin/gzip)
102TOOLS_PLATFORM.gunzip?= /usr/bin/gzip -df 118TOOLS_PLATFORM.gunzip?= /usr/bin/gzip -df
103TOOLS_PLATFORM.gzcat?= /usr/bin/gzip -cd 119TOOLS_PLATFORM.gzcat?= /usr/bin/gzip -cd
104TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP} 120TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
105.endif 121.endif
106TOOLS_PLATFORM.head?= /usr/bin/head 122TOOLS_PLATFORM.head?= /usr/bin/head
107TOOLS_PLATFORM.hostname?= /bin/hostname 123TOOLS_PLATFORM.hostname?= /bin/hostname
108TOOLS_PLATFORM.id?= /usr/xpg4/bin/id 124TOOLS_PLATFORM.id?= /usr/xpg4/bin/id
109.if exists(/usr/bin/install-info) 125.if exists(/usr/bin/install-info)
110TOOLS_PLATFORM.install-info?= /usr/bin/install-info 126TOOLS_PLATFORM.install-info?= /usr/bin/install-info
 127.elif exists(/usr/sfw/bin/install-info)
 128TOOLS_PLATFORM.install-info?= /usr/sfw/bin/install-info
111.endif 129.endif
112.if exists(/usr/bin/ginstall) # if we are using OpenSolaris 130.if exists(/usr/bin/ginstall) # if we are using OpenSolaris
113TOOLS_PLATFORM.install?= /usr/bin/ginstall 131TOOLS_PLATFORM.install?= /usr/bin/ginstall
114.else 132.else
115TOOLS_PLATFORM.install?= /usr/ucb/install 133TOOLS_PLATFORM.install?= /usr/ucb/install
116.endif 134.endif
117TOOLS_PLATFORM.ln?= /usr/bin/ln 135TOOLS_PLATFORM.ln?= /usr/bin/ln
118TOOLS_PLATFORM.ls?= /usr/bin/ls 136TOOLS_PLATFORM.ls?= /usr/bin/ls
119TOOLS_PLATFORM.m4?= /usr/ccs/bin/m4 137TOOLS_PLATFORM.m4?= /usr/ccs/bin/m4
120TOOLS_PLATFORM.mail?= /usr/bin/mailx 138TOOLS_PLATFORM.mail?= /usr/bin/mailx
121.if exists(/usr/bin/makeinfo) 139.if exists(/usr/bin/makeinfo)
122TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo 140TOOLS_PLATFORM.makeinfo?= /usr/bin/makeinfo
 141.elif exists(/usr/sfw/bin/makeinfo)
 142TOOLS_PLATFORM.makeinfo?= /usr/sfw/bin/makeinfo
123.endif 143.endif
124TOOLS_PLATFORM.mkdir?= /usr/bin/mkdir -p 144TOOLS_PLATFORM.mkdir?= /usr/bin/mkdir -p
125.if exists(/usr/bin/mktemp) 145.if exists(/usr/bin/mktemp)
126TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp 146TOOLS_PLATFORM.mktemp?= /usr/bin/mktemp
127.endif 147.endif
128TOOLS_PLATFORM.mv?= /usr/bin/mv 148TOOLS_PLATFORM.mv?= /usr/bin/mv
129TOOLS_PLATFORM.nice?= /usr/xpg4/bin/nice 149TOOLS_PLATFORM.nice?= /usr/xpg4/bin/nice
130.if exists(/usr/bin/gnroff) 150.if exists(/usr/bin/gnroff)
131TOOLS_PLATFORM.nroff?= /usr/bin/gnroff 151TOOLS_PLATFORM.nroff?= /usr/bin/gnroff
132.endif 152.endif
133.if exists(/usr/bin/openssl) 153.if exists(/usr/bin/openssl)
134TOOLS_PLATFORM.openssl?= /usr/bin/openssl 154TOOLS_PLATFORM.openssl?= /usr/bin/openssl
135.endif 155.endif
@@ -138,52 +158,56 @@ TOOLS_PLATFORM.gpatch?= /usr/bin/gpatch @@ -138,52 +158,56 @@ TOOLS_PLATFORM.gpatch?= /usr/bin/gpatch
138TOOLS_PLATFORM.patch?= /usr/bin/gpatch 158TOOLS_PLATFORM.patch?= /usr/bin/gpatch
139.endif 159.endif
140#.if exists(/usr/bin/perl) 160#.if exists(/usr/bin/perl)
141#TOOLS_PLATFORM.perl?= /usr/bin/perl 161#TOOLS_PLATFORM.perl?= /usr/bin/perl
142#TOOLS_PLATFORM.pod2man?= /usr/perl5/bin/pod2man 162#TOOLS_PLATFORM.pod2man?= /usr/perl5/bin/pod2man
143#.endif 163#.endif
144.if ${OS_VERSION} == "5.11" && exists(/usr/bin/pkg-config) 164.if ${OS_VERSION} == "5.11" && exists(/usr/bin/pkg-config)
145TOOLS_PLATFORM.pkg-config?= /usr/bin/pkg-config 165TOOLS_PLATFORM.pkg-config?= /usr/bin/pkg-config
146.endif 166.endif
147TOOLS_PLATFORM.printf?= /bin/printf 167TOOLS_PLATFORM.printf?= /bin/printf
148TOOLS_PLATFORM.pwd?= /bin/pwd 168TOOLS_PLATFORM.pwd?= /bin/pwd
149.if exists(/usr/gnu/bin/readelf) 169.if exists(/usr/gnu/bin/readelf)
150TOOLS_PLATFORM.readelf?= /usr/gnu/bin/readelf 170TOOLS_PLATFORM.readelf?= /usr/gnu/bin/readelf
 171.elif exists(/usr/sfw/bin/greadelf)
 172TOOLS_PLATFORM.readelf?= /usr/sfw/bin/greadelf
151.endif 173.endif
152TOOLS_PLATFORM.rm?= /usr/bin/rm 174TOOLS_PLATFORM.rm?= /usr/bin/rm
153TOOLS_PLATFORM.rmdir?= /usr/bin/rmdir 175TOOLS_PLATFORM.rmdir?= /usr/bin/rmdir
154.if exists(/usr/bin/gsdiff) 176.if exists(/usr/bin/gsdiff)
155TOOLS_PLATFORM.sdiff?= /usr/bin/gsdiff 177TOOLS_PLATFORM.sdiff?= /usr/bin/gsdiff
156.else 178.else
157TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 179TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
158.endif 180.endif
159.if exists(/usr/gnu/bin/sed) 181.if exists(/usr/gnu/bin/sed)
160TOOLS_PLATFORM.sed?= /usr/gnu/bin/sed 182TOOLS_PLATFORM.sed?= /usr/gnu/bin/sed
161.endif 183.endif
162TOOLS_PLATFORM.sh?= /bin/ksh 184TOOLS_PLATFORM.sh?= /bin/ksh
163TOOLS_PLATFORM.sleep?= /bin/sleep 185TOOLS_PLATFORM.sleep?= /bin/sleep
164.if exists(/usr/bin/soelim) 186.if exists(/usr/bin/soelim)
165TOOLS_PLATFORM.soelim?= /usr/bin/soelim 187TOOLS_PLATFORM.soelim?= /usr/bin/soelim
166.endif 188.endif
167TOOLS_PLATFORM.sort?= /usr/bin/sort 189TOOLS_PLATFORM.sort?= /usr/bin/sort
168TOOLS_PLATFORM.strip?= /usr/ccs/bin/strip 190TOOLS_PLATFORM.strip?= /usr/ccs/bin/strip
169TOOLS_PLATFORM.tail?= /usr/xpg4/bin/tail 191TOOLS_PLATFORM.tail?= /usr/xpg4/bin/tail
170.if exists(/usr/bin/tbl) 192.if exists(/usr/bin/tbl)
171TOOLS_PLATFORM.tbl?= /usr/bin/tbl 193TOOLS_PLATFORM.tbl?= /usr/bin/tbl
172.endif 194.endif
173TOOLS_PLATFORM.tee?= /usr/bin/tee 195TOOLS_PLATFORM.tee?= /usr/bin/tee
174TOOLS_PLATFORM.test?= test # shell builtin 196TOOLS_PLATFORM.test?= test # shell builtin
175.if exists(/usr/bin/texi2html) 197.if exists(/usr/bin/texi2html)
176TOOLS_PLATFORM.texi2html?= /usr/bin/texi2html 198TOOLS_PLATFORM.texi2html?= /usr/bin/texi2html
 199.elif exists(/usr/sfw/bin/texi2html)
 200TOOLS_PLATFORM.texi2html?= /usr/sfw/bin/texi2html
177.endif 201.endif
178TOOLS_PLATFORM.touch?= /usr/bin/touch 202TOOLS_PLATFORM.touch?= /usr/bin/touch
179TOOLS_PLATFORM.tr?= /usr/xpg4/bin/tr 203TOOLS_PLATFORM.tr?= /usr/xpg4/bin/tr
180TOOLS_PLATFORM.true?= true # shell builtin 204TOOLS_PLATFORM.true?= true # shell builtin
181TOOLS_PLATFORM.tsort?= /usr/ccs/bin/tsort 205TOOLS_PLATFORM.tsort?= /usr/ccs/bin/tsort
182.if exists(/usr/bin/unzip) 206.if exists(/usr/bin/unzip)
183TOOLS_PLATFORM.unzip?= /usr/bin/unzip 207TOOLS_PLATFORM.unzip?= /usr/bin/unzip
184.endif 208.endif
185TOOLS_PLATFORM.wc?= /usr/bin/wc 209TOOLS_PLATFORM.wc?= /usr/bin/wc
186TOOLS_PLATFORM.xargs?= /usr/bin/xargs 210TOOLS_PLATFORM.xargs?= /usr/bin/xargs
187.if exists(/usr/bin/yacc) 211.if exists(/usr/bin/yacc)
188TOOLS_PLATFORM.yacc?= /usr/bin/yacc 212TOOLS_PLATFORM.yacc?= /usr/bin/yacc
189.endif 213.endif