summaryrefslogtreecommitdiff
path: root/mk/tools
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-06-23 20:45:34 +0000
committerjlam <jlam@pkgsrc.org>2005-06-23 20:45:34 +0000
commitdf8c47b2f25e46a438bcf63e46e57de341c4ce8c (patch)
tree0dd8dfa6d1eac1703ef1bf0592bc6f8f3d474773 /mk/tools
parent805d6d300af217184e5d1187782ceb3b5c1b0b80 (diff)
downloadpkgsrc-df8c47b2f25e46a438bcf63e46e57de341c4ce8c.tar.gz
Note locations for native diff tools.
Diffstat (limited to 'mk/tools')
-rw-r--r--mk/tools/tools.AIX.mk3
-rw-r--r--mk/tools/tools.BSDOS.mk3
-rw-r--r--mk/tools/tools.Darwin.mk3
-rw-r--r--mk/tools/tools.DragonFly.mk3
-rw-r--r--mk/tools/tools.FreeBSD.mk3
-rw-r--r--mk/tools/tools.IRIX.mk3
-rw-r--r--mk/tools/tools.Interix.mk3
-rw-r--r--mk/tools/tools.Linux.mk7
-rw-r--r--mk/tools/tools.NetBSD.mk3
-rw-r--r--mk/tools/tools.OSF1.mk3
-rw-r--r--mk/tools/tools.OpenBSD.mk3
-rw-r--r--mk/tools/tools.SunOS.mk7
-rw-r--r--mk/tools/tools.UnixWare.mk3
13 files changed, 34 insertions, 13 deletions
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index f6cdbe5bd86..301c2574f88 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.9 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.10 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the AIX operating system.
@@ -13,6 +13,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /usr/bin/grep -E
diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
index cd25dcf9ea3..c3af7b5f4f2 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.12 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.13 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the BSD/OS operating system.
@@ -13,6 +13,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /bin/egrep
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index e956df17100..1c26dcec276 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.13 2005/06/03 22:54:44 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.14 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the Darwin (Mac OS X) operating system.
@@ -13,6 +13,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /usr/bin/egrep
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index 970160c1535..28fe4179d39 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.15 2005/06/03 22:54:44 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the DragonFly operating system.
@@ -14,6 +14,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /usr/bin/egrep
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 5c7ff13a90c..ecb8bfafcdd 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.15 2005/06/03 22:54:44 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the FreeBSD operating system.
@@ -16,6 +16,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /usr/bin/egrep
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index 833442ddc17..0ee17165bdc 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.12 2005/05/15 22:31:50 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.13 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the IRIX operating system.
@@ -13,6 +13,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /sbin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /sbin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /usr/bin/egrep
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index c481c70385c..f9bfbc98a51 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.11 2005/05/10 21:15:22 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.12 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the Interix operating system.
@@ -13,6 +13,7 @@ TOOLS_PLATFORM.cmp?= /bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /bin/diff
TOOLS_PLATFORM.dirname?= /bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /bin/egrep
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 2eada60599c..74493d4d440 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.20 2005/06/16 04:30:46 grant Exp $
+# $NetBSD: tools.Linux.mk,v 1.21 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the Linux operating system.
@@ -34,6 +34,11 @@ TOOLS_PLATFORM.cut?= /bin/cut
TOOLS_PLATFORM.cut?= /usr/bin/cut
.endif
TOOLS_PLATFORM.date?= /bin/date
+.if exists(/bin/diff)
+TOOLS_PLATFORM.diff?= /bin/diff
+.elif exists(/usr/bin/diff)
+TOOLS_PLATFORM.diff?= /usr/bin/diff
+.endif
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
.if exists(/bin/egrep)
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 03f5f0607bc..a6fcef1579e 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.16 2005/06/03 22:54:44 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.17 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -16,6 +16,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /usr/bin/egrep
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
index 51d882edcd1..f79004a01d6 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.9 2005/05/14 21:15:07 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.10 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the OSF/1 operating system.
@@ -13,6 +13,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= /usr/bin/echo
TOOLS_PLATFORM.egrep?= /usr/bin/grep -E
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index 35c6df00096..d65218f5ab3 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.15 2005/06/17 20:58:58 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the OpenBSD operating system.
@@ -21,6 +21,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= echo # shell builtin
TOOLS_PLATFORM.egrep?= /usr/bin/egrep
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 5aaea9a55b7..2932d589d84 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.15 2005/06/03 22:54:44 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.16 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the Solaris operating system.
@@ -20,6 +20,11 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /usr/xpg4/bin/date
+.if exists(/bin/diff)
+TOOLS_PLATFORM.diff?= /bin/diff
+.elif exists(/usr/bin/diff)
+TOOLS_PLATFORM.diff?= /usr/bin/diff
+.endif
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= /usr/ucb/echo
TOOLS_PLATFORM.egrep?= /usr/xpg4/bin/grep -E
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
index 0551674808c..935632175d5 100644
--- a/mk/tools/tools.UnixWare.mk
+++ b/mk/tools/tools.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.10 2005/05/26 21:46:14 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.11 2005/06/23 20:45:34 jlam Exp $
#
# System-supplied tools for the UnixWare 7 operating system.
@@ -13,6 +13,7 @@ TOOLS_PLATFORM.cmp?= /usr/bin/cmp
TOOLS_PLATFORM.cp?= /usr/bin/cp
TOOLS_PLATFORM.cut?= /usr/bin/cut
TOOLS_PLATFORM.date?= /usr/bin/date
+TOOLS_PLATFORM.diff?= /usr/bin/diff
TOOLS_PLATFORM.dirname?= /usr/bin/dirname
TOOLS_PLATFORM.echo?= /usr/ucb/echo
TOOLS_PLATFORM.egrep?= /usr/bin/grep -E