summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2013-06-02 06:51:08 +0000
committerobache <obache@pkgsrc.org>2013-06-02 06:51:08 +0000
commit28fbe7fa70fcec42945641a06e953b5ce245811a (patch)
treea0c7ea09bb5a1be71156b6fbec81b35f64751a32
parent6e3d90566a13289c888e11991329c9ef8338c2d9 (diff)
downloadpkgsrc-28fbe7fa70fcec42945641a06e953b5ce245811a.tar.gz
more update for R1Alpha4, and let /boot/common/bin as optionlfy.
-rw-r--r--mk/tools/tools.Haiku.mk23
1 files changed, 20 insertions, 3 deletions
diff --git a/mk/tools/tools.Haiku.mk b/mk/tools/tools.Haiku.mk
index aa26a0f97b5..42f7f84c66e 100644
--- a/mk/tools/tools.Haiku.mk
+++ b/mk/tools/tools.Haiku.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Haiku.mk,v 1.7 2013/06/02 03:06:44 obache Exp $
+# $NetBSD: tools.Haiku.mk,v 1.8 2013/06/02 06:51:08 obache Exp $
#
# System-supplied tools for the Haiku operating system.
@@ -6,10 +6,17 @@ 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)
TOOLS_PLATFORM.bison?= /boot/common/bin/bison
TOOLS_PLATFORM.bison-yacc?= /boot/common/bin/bison -y
+.endif
+.if exists(/bin/bzip2)
TOOLS_PLATFORM.bzcat?= /bin/bzip2 -cd
TOOLS_PLATFORM.bzip2?= /bin/bzip2
+.elif exists(/boot/common/bin/bzip2)
+TOOLS_PLATFORM.bzcat?= /boot/common/bin/bzip2 -cd
+TOOLS_PLATFORM.bzip2?= /boot/common/bin/bzip2
+.endif
TOOLS_PLATFORM.cat?= /bin/cat
TOOLS_PLATFORM.chgrp?= /bin/chgrp
TOOLS_PLATFORM.chmod?= /bin/chmod
@@ -30,7 +37,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)
TOOLS_PLATFORM.gm4?= /boot/common/bin/m4
+.endif
.if exists(/bin/make)
TOOLS_PLATFORM.gmake?= /bin/make
.elif exists(/boot/common/bin/make)
@@ -57,9 +66,11 @@ 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)
TOOLS_PLATFORM.install-info?= /boot/common/bin/install-info
+.endif
#TOOLS_PLATFORM.ldconfig?= /sbin/ldconfig
-# XXX: Haiku currently no support of hard link.
+# XXX: BFS currently no support of hard link.
TOOLS_PLATFORM.ln?= /bin/ln
TOOLS_PLATFORM.ls?= /bin/ls
.if exists(/boot/common/bin/lzcat)
@@ -67,7 +78,9 @@ 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)
TOOLS_PLATFORM.makeinfo?= /boot/common/bin/makeinfo
+.endif
TOOLS_PLATFORM.mkdir?= /bin/mkdir -p
.if exists(/bin/mktemp)
TOOLS_PLATFORM.mktemp?= /bin/mktemp
@@ -76,13 +89,17 @@ TOOLS_PLATFORM.mktemp?= /bin/mktemp
TOOLS_PLATFORM.mv?= /bin/mv
#TOOLS_PLATFORM.nice?= /bin/nice
#TOOLS_PLATFORM.nroff?= /usr/bin/nroff
+.if exists(/boot/common/bin/openssl)
TOOLS_PLATFORM.openssl?= /boot/common/bin/openssl
+.endif
TOOLS_PLATFORM.patch?= /bin/patch
TOOLS_PLATFORM.printf?= /bin/printf
TOOLS_PLATFORM.pwd?= /bin/pwd
TOOLS_PLATFORM.rm?= /bin/rm
TOOLS_PLATFORM.rmdir?= /bin/rmdir
-#TOOLS_PLATFORM.sdiff?= /bin/sdiff
+.if exists(/bin/sdiff)
+TOOLS_PLATFORM.sdiff?= /bin/sdiff
+.endif
TOOLS_PLATFORM.sed?= ${TOOLS_PLATFORM.gsed}
TOOLS_PLATFORM.sh?= /bin/sh
TOOLS_PLATFORM.sleep?= /bin/sleep