catch up after removal of /boot/common on Haiku.

noticed by diger in pkgsrc-users@.

1 files changed, 47 insertions, 14 deletions

diff --git a/mk/tools/tools.Haiku.mk b/mk/tools/tools.Haiku.mk
index cd14a109d0f..607ce455502 100644
--- a/mk/tools/tools.Haiku.mk
+++ b/mk/tools/tools.Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Haiku.mk,v 1.11 2014/03/06 07:34:20 uebayasi Exp $
+# $NetBSD: tools.Haiku.mk,v 1.12 2014/05/18 09:37:50 obache Exp $
 #
 # System-supplied tools for the Haiku operating system.
 
@@ -6,7 +6,10 @@ TOOLS_PLATFORM.[?=		[			# shell builtin
 TOOLS_PLATFORM.awk?=		/bin/awk
 TOOLS_PLATFORM.basename?=	/bin/basename
 TOOLS_PLATFORM.bash?=		/bin/bash
-.if exists(/boot/common/bin/bison)
+.if exists(/bin/bison)
+TOOLS_PLATFORM.bison?=		/bin/bison
+TOOLS_PLATFORM.bison-yacc?=	/bin/bison -y
+.elif exists(/boot/common/bin/bison)
 TOOLS_PLATFORM.bison?=		/boot/common/bin/bison
 TOOLS_PLATFORM.bison-yacc?=	/boot/common/bin/bison -y
 .endif
@@ -37,7 +40,9 @@ TOOLS_PLATFORM.fgrep?=		/bin/fgrep
 TOOLS_PLATFORM.find?=		/bin/find
 TOOLS_PLATFORM.ftp?=		/bin/ftp
 TOOLS_PLATFORM.gawk?=		/bin/gawk
-.if exists(/boot/common/bin/m4)
+.if exists(/bin/m4)
+TOOLS_PLATFORM.gm4?=		/bin/m4
+.elif exists(/boot/common/bin/m4)
 TOOLS_PLATFORM.gm4?=		/boot/common/bin/m4
 .endif
 .if exists(/bin/make)
@@ -46,13 +51,17 @@ TOOLS_PLATFORM.gmake?=		/bin/make
 TOOLS_PLATFORM.gmake?=		/boot/common/bin/make
 .endif
 TOOLS_PLATFORM.grep?=		/bin/grep
-#TOOLS_PLATFORM.groff?=		/usr/bin/groff
+.if exists(/bin/groff)
+TOOLS_PLATFORM.groff?=		/bin/groff
+.endif
 .if exists(/bin/sed)
 TOOLS_PLATFORM.gsed?=		/bin/sed
 .elif exists(/boot/common/bin/sed)
 TOOLS_PLATFORM.gsed?=		/boot/common/bin/sed
 .endif
-#TOOLS_PLATFORM.gsoelim?=	/usr/bin/soelim
+.if exists(/bin/soelim)
+TOOLS_PLATFORM.gsoelim?=	/bin/soelim
+.endif
 .if exists(/bin/tar)
 TOOLS_PLATFORM.gtar?=		/bin/tar
 .elif exists(/boot/common/bin/tar)
@@ -66,19 +75,25 @@ TOOLS_PLATFORM.hostname?=	/bin/hostname
 TOOLS_PLATFORM.id?=		/bin/id
 TOOLS_PLATFORM.ident?=		/bin/ident
 TOOLS_PLATFORM.install?=	/bin/install
-.if exists(/boot/common/bin/install-info)
+.if exists(/bin/install-info)
+TOOLS_PLATFORM.install-info?=	/bin/install-info
+.elif exists(/boot/common/bin/install-info)
 TOOLS_PLATFORM.install-info?=	/boot/common/bin/install-info
 .endif
 #TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 # XXX: BFS currently no support of hard link.
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
-.if exists(/boot/common/bin/lzcat)
+.if exists(/bin/lzcat)
+TOOLS_PLATFORM.lzcat?=		/bin/lzcat
+.elif exists(/boot/common/bin/lzcat)
 TOOLS_PLATFORM.lzcat?=		/boot/common/bin/lzcat
 .endif
 TOOLS_PLATFORM.m4?=		${TOOLS_PLATFORM.gm4}
 #TOOLS_PLATFORM.mail?=		/bin/mail
-.if exists(/boot/common/bin/makeinfo)
+.if exists(/bin/makeinfo)
+TOOLS_PLATFORM.makeinfo?=	/bin/makeinfo
+.elif exists(/boot/common/bin/makeinfo)
 TOOLS_PLATFORM.makeinfo?=	/boot/common/bin/makeinfo
 .endif
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
@@ -88,8 +103,12 @@ TOOLS_PLATFORM.mktemp?=		/bin/mktemp
 #TOOLS_PLATFORM.msgfmt?=		/usr/bin/msgfmt
 TOOLS_PLATFORM.mv?=		/bin/mv
 #TOOLS_PLATFORM.nice?=		/bin/nice
-#TOOLS_PLATFORM.nroff?=		/usr/bin/nroff
-.if exists(/boot/common/bin/openssl)
+.if exists(/bin/nroff)
+TOOLS_PLATFORM.nroff?=		/bin/nroff
+.endif
+.if exists(/bin/openssl)
+TOOLS_PLATFORM.openssl?=	/bin/openssl
+.elif exists(/boot/common/bin/openssl)
 TOOLS_PLATFORM.openssl?=	/boot/common/bin/openssl
 .endif
 TOOLS_PLATFORM.patch?=		/bin/patch
@@ -104,12 +123,20 @@ TOOLS_PLATFORM.sdiff?=		/bin/sdiff
 TOOLS_PLATFORM.sed?=		${TOOLS_PLATFORM.gsed}
 TOOLS_PLATFORM.sh?=		/bin/sh
 TOOLS_PLATFORM.sleep?=		/bin/sleep
-#TOOLS_PLATFORM.soelim?=		/usr/bin/soelim
+.if exists(/bin/soelim)
+TOOLS_PLATFORM.soelim?=		/bin/soelim
+.endif
 TOOLS_PLATFORM.sort?=		/bin/sort
+.if exists(/bin/strip)
+TOOLS_PLATFORM.strip?=		/bin/strip
+.else
 TOOLS_PLATFORM.strip?=		/boot/develop/tools/gnupro/bin/strip
+.endif
 TOOLS_PLATFORM.tail?=		/bin/tail
 TOOLS_PLATFORM.tar?=		${TOOLS_PLATFORM.gtar}
-#TOOLS_PLATFORM.tbl?=		/usr/bin/tbl
+.if exists(/bin/tbl)
+TOOLS_PLATFORM.tbl?=		/bin/tbl
+.endif
 TOOLS_PLATFORM.tee?=		/bin/tee
 TOOLS_PLATFORM.test?=		test			# shell builtin
 TOOLS_PLATFORM.touch?=		/bin/touch
@@ -117,12 +144,18 @@ TOOLS_PLATFORM.tr?=		/bin/tr
 TOOLS_PLATFORM.true?=		true			# shell builtin
 TOOLS_PLATFORM.tsort?=		/bin/tsort
 TOOLS_PLATFORM.uniq?=		/bin/uniq
+TOOLS_PLATFORM.unzip?=		/bin/unzip
 TOOLS_PLATFORM.wc?=		/bin/wc
 TOOLS_PLATFORM.xargs?=		/bin/xargs -r
 #TOOLS_PLATFORM.xgettext?=	/usr/bin/xgettext
-.if exists(/boot/common/bin/xz)
+.if exists(/bin/xz)
+TOOLS_PLATFORM.xz?=		/bin/xz
+.elif exists(/boot/common/bin/xz)
 TOOLS_PLATFORM.xz?=		/boot/common/bin/xz
 .endif
-.if exists(/boot/common/bin/xzcat)
+.if exists(/bin/xzcat)
+TOOLS_PLATFORM.xzcat?=		/bin/xzcat
+.elif exists(/boot/common/bin/xzcat)
 TOOLS_PLATFORM.xzcat?=		/boot/common/bin/xzcat
 .endif
+TOOLS_PLATFORM.zip?=		/bin/zip