Sat May 17 18:34:50 2008 UTC ()
Check that /usr/bin/patch really exists, so that we can gracefully fall
back to depending on devel/patch.


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

--- pkgsrc/mk/tools/tools.Linux.mk 2008/04/04 15:49:18 1.43
+++ pkgsrc/mk/tools/tools.Linux.mk 2008/05/17 18:34:50 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: tools.Linux.mk,v 1.43 2008/04/04 15:49:18 tnn Exp $ 1# $NetBSD: tools.Linux.mk,v 1.44 2008/05/17 18:34:50 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
6TOOLS_PLATFORM.awk?= ${TOOLS_PLATFORM.gawk} 6TOOLS_PLATFORM.awk?= ${TOOLS_PLATFORM.gawk}
7.if exists(/bin/basename) 7.if exists(/bin/basename)
8TOOLS_PLATFORM.basename?= /bin/basename 8TOOLS_PLATFORM.basename?= /bin/basename
9.elif exists(/usr/bin/basename) 9.elif exists(/usr/bin/basename)
10TOOLS_PLATFORM.basename?= /usr/bin/basename 10TOOLS_PLATFORM.basename?= /usr/bin/basename
11.endif 11.endif
12TOOLS_PLATFORM.bash?= /bin/bash 12TOOLS_PLATFORM.bash?= /bin/bash
13.if exists(/usr/bin/bison) 13.if exists(/usr/bin/bison)
14TOOLS_PLATFORM.bison?= /usr/bin/bison 14TOOLS_PLATFORM.bison?= /usr/bin/bison
@@ -160,27 +160,29 @@ TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt @@ -160,27 +160,29 @@ TOOLS_PLATFORM.msgfmt?= /usr/bin/msgfmt
160.endif 160.endif
161TOOLS_PLATFORM.mv?= /bin/mv 161TOOLS_PLATFORM.mv?= /bin/mv
162.if exists(/bin/nice) 162.if exists(/bin/nice)
163TOOLS_PLATFORM.nice?= /bin/nice 163TOOLS_PLATFORM.nice?= /bin/nice
164.elif exists(/usr/bin/nice) 164.elif exists(/usr/bin/nice)
165TOOLS_PLATFORM.nice?= /usr/bin/nice 165TOOLS_PLATFORM.nice?= /usr/bin/nice
166.endif 166.endif
167.if exists(/usr/bin/nroff) 167.if exists(/usr/bin/nroff)
168TOOLS_PLATFORM.nroff?= /usr/bin/nroff 168TOOLS_PLATFORM.nroff?= /usr/bin/nroff
169.endif 169.endif
170.if exists(/usr/bin/openssl) 170.if exists(/usr/bin/openssl)
171TOOLS_PLATFORM.openssl?= /usr/bin/openssl 171TOOLS_PLATFORM.openssl?= /usr/bin/openssl
172.endif 172.endif
 173.if exists(/usr/bin/patch)
173TOOLS_PLATFORM.patch?= /usr/bin/patch 174TOOLS_PLATFORM.patch?= /usr/bin/patch
 175.endif
174.if exists(/usr/bin/printf) 176.if exists(/usr/bin/printf)
175TOOLS_PLATFORM.printf?= /usr/bin/printf 177TOOLS_PLATFORM.printf?= /usr/bin/printf
176.endif 178.endif
177TOOLS_PLATFORM.pwd?= /bin/pwd 179TOOLS_PLATFORM.pwd?= /bin/pwd
178TOOLS_PLATFORM.rm?= /bin/rm 180TOOLS_PLATFORM.rm?= /bin/rm
179TOOLS_PLATFORM.rmdir?= /bin/rmdir 181TOOLS_PLATFORM.rmdir?= /bin/rmdir
180.if exists(/bin/sdiff) 182.if exists(/bin/sdiff)
181TOOLS_PLATFORM.sdiff?= /bin/sdiff 183TOOLS_PLATFORM.sdiff?= /bin/sdiff
182.elif exists(/usr/bin/sdiff) 184.elif exists(/usr/bin/sdiff)
183TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff 185TOOLS_PLATFORM.sdiff?= /usr/bin/sdiff
184.endif 186.endif
185TOOLS_PLATFORM.sed?= ${TOOLS_PLATFORM.gsed} 187TOOLS_PLATFORM.sed?= ${TOOLS_PLATFORM.gsed}
186TOOLS_PLATFORM.sh?= /bin/sh 188TOOLS_PLATFORM.sh?= /bin/sh