Wed Mar 9 22:27:29 2016 UTC ()
Add special handling for Debian derived systems as they do not have GNU awk
in /usr/bin/awk but mawk. Use /usr/bin/gawk if it exists, otherwise
depend on gawk from pkgsrc when required.


(tnn)
diff -r1.59 -r1.60 pkgsrc/mk/tools/tools.Linux.mk
cvs diff -r1.59 -r1.60 pkgsrc/mk/tools/tools.Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/tools/tools.Linux.mk 2015/02/16 11:01:40 1.59
+++ pkgsrc/mk/tools/tools.Linux.mk 2016/03/09 22:27:29 1.60
@@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
1# $NetBSD: tools.Linux.mk,v 1.59 2015/02/16 11:01:40 jperkin Exp $ 1# $NetBSD: tools.Linux.mk,v 1.60 2016/03/09 22:27:29 tnn 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)
 7TOOLS_PLATFORM.awk?= /usr/bin/awk
 8.else
6TOOLS_PLATFORM.awk?= ${TOOLS_PLATFORM.gawk} 9TOOLS_PLATFORM.awk?= ${TOOLS_PLATFORM.gawk}
 10.endif
7.if exists(/usr/bin/autopoint) 11.if exists(/usr/bin/autopoint)
8TOOLS_PLATFORM.autopoint?= /usr/bin/autopoint 12TOOLS_PLATFORM.autopoint?= /usr/bin/autopoint
9.endif 13.endif
10.if exists(/bin/basename) 14.if exists(/bin/basename)
11TOOLS_PLATFORM.basename?= /bin/basename 15TOOLS_PLATFORM.basename?= /bin/basename
12.elif exists(/usr/bin/basename) 16.elif exists(/usr/bin/basename)
13TOOLS_PLATFORM.basename?= /usr/bin/basename 17TOOLS_PLATFORM.basename?= /usr/bin/basename
14.endif 18.endif
15TOOLS_PLATFORM.bash?= /bin/bash 19TOOLS_PLATFORM.bash?= /bin/bash
16.if exists(/usr/bin/bison) 20.if exists(/usr/bin/bison)
17TOOLS_PLATFORM.bison?= /usr/bin/bison 21TOOLS_PLATFORM.bison?= /usr/bin/bison
18TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y 22TOOLS_PLATFORM.bison-yacc?= /usr/bin/bison -y
19.endif 23.endif
@@ -80,30 +84,36 @@ TOOLS_PLATFORM.env?= /usr/bin/env @@ -80,30 +84,36 @@ TOOLS_PLATFORM.env?= /usr/bin/env
80.if exists(/usr/bin/expr) 84.if exists(/usr/bin/expr)
81TOOLS_PLATFORM.expr?= /usr/bin/expr 85TOOLS_PLATFORM.expr?= /usr/bin/expr
82.elif exists(/bin/expr) 86.elif exists(/bin/expr)
83TOOLS_PLATFORM.expr?= /bin/expr 87TOOLS_PLATFORM.expr?= /bin/expr
84.endif 88.endif
85TOOLS_PLATFORM.false?= false # shell builtin 89TOOLS_PLATFORM.false?= false # shell builtin
86.if exists(/bin/fgrep) 90.if exists(/bin/fgrep)
87TOOLS_PLATFORM.fgrep?= /bin/fgrep 91TOOLS_PLATFORM.fgrep?= /bin/fgrep
88.elif exists(/usr/bin/fgrep) 92.elif exists(/usr/bin/fgrep)
89TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep 93TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
90.endif 94.endif
91TOOLS_PLATFORM.file?= /usr/bin/file 95TOOLS_PLATFORM.file?= /usr/bin/file
92TOOLS_PLATFORM.find?= /usr/bin/find 96TOOLS_PLATFORM.find?= /usr/bin/find
93.if exists(/bin/awk) 97.if exists(/etc/debian_version)
94TOOLS_PLATFORM.gawk?= /bin/awk 98. if exists(/usr/bin/gawk)
 99TOOLS_PLATFORM.gawk?= /usr/bin/gawk
 100. endif
95.else 101.else
 102. if exists(/bin/awk)
 103TOOLS_PLATFORM.gawk?= /bin/awk
 104. else
96TOOLS_PLATFORM.gawk?= /usr/bin/awk 105TOOLS_PLATFORM.gawk?= /usr/bin/awk
 106. endif
97.endif 107.endif
98.if exists(/usr/bin/gettext) 108.if exists(/usr/bin/gettext)
99TOOLS_PLATFORM.gettext?= /usr/bin/gettext 109TOOLS_PLATFORM.gettext?= /usr/bin/gettext
100.endif 110.endif
101.if exists(/usr/bin/m4) 111.if exists(/usr/bin/m4)
102TOOLS_PLATFORM.gm4?= /usr/bin/m4 112TOOLS_PLATFORM.gm4?= /usr/bin/m4
103.endif 113.endif
104.if exists(/usr/bin/make) 114.if exists(/usr/bin/make)
105TOOLS_PLATFORM.gmake?= /usr/bin/make 115TOOLS_PLATFORM.gmake?= /usr/bin/make
106.endif 116.endif
107.if exists(/bin/grep) 117.if exists(/bin/grep)
108TOOLS_PLATFORM.grep?= /bin/grep 118TOOLS_PLATFORM.grep?= /bin/grep
109.elif exists(/usr/bin/grep) 119.elif exists(/usr/bin/grep)