summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/bsd.pkg.mk6
-rw-r--r--mk/tools/bootstrap.mk41
-rw-r--r--mk/tools/defaults.mk8
-rw-r--r--mk/tools/replace.mk31
-rw-r--r--mk/tools/tools.AIX.mk3
-rw-r--r--mk/tools/tools.BSDOS.mk7
-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.Linux.mk3
-rw-r--r--mk/tools/tools.NetBSD.mk13
-rw-r--r--mk/tools/tools.OSF1.mk3
-rw-r--r--mk/tools/tools.OpenBSD.mk13
13 files changed, 85 insertions, 52 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 579fc054cf6..cdbd296bc51 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1651 2005/05/14 19:37:53 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1652 2005/05/14 21:15:07 jlam Exp $
#
# This file is in the public domain.
#
@@ -833,8 +833,8 @@ PKGSRC_USE_TOOLS+= \
[ awk basename cat chgrp chmod chown cmp cp cut date dirname \
echo egrep env expr false fgrep file find grep gtar gunzip \
gzcat gzip head hostname id install ln ls m4 mkdir mtree mv \
- nice pax pwd rm rmdir sed sh sort tail tee test touch tr true \
- tsort wc xargs
+ nice pax pwd rm rmdir sed sh sort tail tar tee test touch tr \
+ true tsort wc xargs
# We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}.
.if !empty(PKGSRC_MESSAGE_RECIPIENTS)
diff --git a/mk/tools/bootstrap.mk b/mk/tools/bootstrap.mk
index 845fef098cf..a1eaa34e320 100644
--- a/mk/tools/bootstrap.mk
+++ b/mk/tools/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.1 2005/04/27 17:15:13 jlam Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2005/05/14 21:15:07 jlam Exp $
#
# bootstrap.mk contains settings matching the contents of
# pkgsrc/bootstrap/bootstrap. Where we install the bootstrap versions
@@ -12,81 +12,94 @@
#
.if ${OPSYS} == "AIX"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
TOOLS_PLATFORM.strip?= ${LOCALBASE}/bin/strip
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "Darwin"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "DragonFly"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "FreeBSD"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "HPUX"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "Interix"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "IRIX"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "Linux"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "NetBSD"
# NetBSD has everything.
.elif ${OPSYS} == "OpenBSD"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "OSF1"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "SunOS"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.elif ${OPSYS} == "UnixWare"
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.mkdir?= ${LOCALBASE}/sbin/mkdir-sh
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.else
-TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree
TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax
TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed
+TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar
.endif
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 6cb62432a3b..e6002feab0b 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.13 2005/05/14 20:05:05 jlam Exp $
+# $NetBSD: defaults.mk,v 1.14 2005/05/14 21:15:07 jlam Exp $
.if !defined(TOOLS_DEFAULTS_MK)
TOOLS_DEFAULTS_MK= defined
@@ -70,6 +70,7 @@ _TOOLS_VARNAME.sh= SH
_TOOLS_VARNAME.shlock= SHLOCK
_TOOLS_VARNAME.sort= SORT
_TOOLS_VARNAME.tail= TAIL
+_TOOLS_VARNAME.tar= TAR
_TOOLS_VARNAME.tbl= TBL
_TOOLS_VARNAME.tee= TEE
_TOOLS_VARNAME.test= TEST
@@ -104,9 +105,4 @@ ${_v_}?= ${TOOLS_PLATFORM.${_t_}}
.endfor
.undef _t_
-# XXX Temporarily set this here until we figure out a better way to handle
-# XXX TAR/GTAR in a better way.
-#
-TAR?= ${GTAR}
-
.endif # TOOLS_DEFAULTS_MK
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 0e466e1f939..f821a187c13 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.72 2005/05/14 05:57:43 jlam Exp $
+# $NetBSD: replace.mk,v 1.73 2005/05/14 21:15:07 jlam Exp $
#
# This Makefile fragment handles "replacements" of system-supplied
# tools with pkgsrc versions.
@@ -441,20 +441,15 @@ TOOLS_ALIASES.gsed= sed
.endif
.if !defined(TOOLS_IGNORE.gtar) && !empty(_USE_TOOLS:Mgtar)
-. if !empty(PKGPATH:Marchivers/pax)
+. if !empty(PKGPATH:Marchivers/gtar-base)
MAKEFLAGS+= TOOLS_IGNORE.gtar=
. elif !empty(_TOOLS_USE_PKGSRC.gtar:M[yY][eE][sS])
-#
-# This is installed by pkgsrc bootstrap, and is never registered, so
-# comment out the dependency on it.
-#
-#TOOLS_DEPENDS.gtar?= pax>=20040802:../../archivers/pax
+TOOLS_DEPENDS.gtar?= gtar-base>=1.13.25:../../archivers/gtar-base
TOOLS_CREATE+= gtar
-TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gtar=pax
-TOOLS_REAL_CMD.gtar= ${TOOLS_PREFIX.gtar}/bin/tar
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gtar=gtar-base
+TOOLS_REAL_CMD.gtar= ${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar
TOOLS_${_TOOLS_VARNAME.gtar}= ${TOOLS_REAL_CMD.gtar}
. endif
-TOOLS_ALIASES.gtar= tar
.endif
.if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip)
@@ -794,6 +789,22 @@ TOOLS_${_TOOLS_VARNAME.tail}= ${TOOLS_REAL_CMD.tail}
. endif
.endif
+.if !defined(TOOLS_IGNORE.tar) && !empty(_USE_TOOLS:Mtar)
+. if !empty(PKGPATH:Marchivers/pax)
+MAKEFLAGS+= TOOLS_IGNORE.tar=
+. elif !empty(_TOOLS_USE_PKGSRC.tar:M[yY][eE][sS])
+#
+# This is installed by pkgsrc bootstrap, and is never registered, so
+# comment out the dependency on it.
+#
+#TOOLS_DEPENDS.tar?= pax>=20040802:../../archivers/pax
+TOOLS_CREATE+= tar
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.tar=pax
+TOOLS_REAL_CMD.tar= ${TOOLS_PREFIX.tar}/bin/tar
+TOOLS_${_TOOLS_VARNAME.tar}= ${TOOLS_REAL_CMD.tar}
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.tbl) && !empty(_USE_TOOLS:Mtbl)
. if !empty(PKGPATH:Mtextproc/groff)
MAKEFLAGS+= TOOLS_IGNORE.tbl=
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index 85d5f446750..cb3b6389162 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.7 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.8 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the AIX operating system.
@@ -42,6 +42,7 @@ TOOLS_PLATFORM.sh?= /bin/sh
TOOLS_PLATFORM.shlock?= /usr/bin/shlock
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.tail?= /usr/bin/tail
+TOOLS_PLATFORM.tar?= /usr/bin/tar
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
TOOLS_PLATFORM.touch?= /usr/bin/touch
diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
index a465f958aca..1f4a8d8eff3 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.10 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the BSD/OS operating system.
@@ -49,6 +49,11 @@ TOOLS_PLATFORM.sh?= /bin/bash
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.strip?= /usr/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+.if exists(/bin/tar)
+TOOLS_PLATFORM.tar?= /bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.tar?= /usr/bin/tar
+.endif
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
TOOLS_PLATFORM.touch?= /usr/bin/touch
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 40106ebf9da..2045d8738c3 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.10 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the Darwin (Mac OS X) operating system.
@@ -51,6 +51,7 @@ TOOLS_PLATFORM.sh?= /bin/sh
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.strip?= /usr/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+TOOLS_PLATFORM.tar?= /usr/bin/tar
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
TOOLS_PLATFORM.touch?= /usr/bin/touch
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index d7057d5224c..ba396ef19ac 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.11 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the DragonFly operating system.
@@ -53,6 +53,7 @@ TOOLS_PLATFORM.shlock?= /usr/bin/shlock
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.strip?= /usr/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+TOOLS_PLATFORM.tar?= /usr/bin/tar
TOOLS_PLATFORM.tbl?= /usr/bin/tbl
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= /bin/test
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 1d23e3d0aea..bf0fc3b70fe 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.10 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.11 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the FreeBSD operating system.
@@ -55,6 +55,7 @@ TOOLS_PLATFORM.shlock?= /usr/bin/shlock
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.strip?= /usr/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+TOOLS_PLATFORM.tar?= /usr/bin/tar
TOOLS_PLATFORM.tbl?= /usr/bin/tbl
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index 409896900b3..1c50f836fc3 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.14 2005/05/14 10:19:36 rillig Exp $
+# $NetBSD: tools.Linux.mk,v 1.15 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the Linux operating system.
@@ -113,6 +113,7 @@ TOOLS_PLATFORM.sort?= /usr/bin/sort
.endif
TOOLS_PLATFORM.strip?= /usr/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+TOOLS_PLATFORM.tar?= ${TOOLS_PLATFORM.gtar}
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
.if exists(/bin/touch)
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index cd13a43aba5..010f9d0aa8a 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.11 2005/05/10 20:14:27 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.12 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the NetBSD operating system.
@@ -30,11 +30,7 @@ TOOLS_PLATFORM.gawk?= ${TOOLS_PLATFORM.awk}
.endif
TOOLS_PLATFORM.grep?= /usr/bin/grep
TOOLS_PLATFORM.gsed?= ${TOOLS_PLATFORM.sed} # GNUish
-.if exists(/bin/tar)
-TOOLS_PLATFORM.gtar?= /bin/tar
-.elif exists(/usr/bin/tar)
-TOOLS_PLATFORM.gtar?= /usr/bin/tar
-.endif
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
@@ -65,6 +61,11 @@ TOOLS_PLATFORM.shlock?= /usr/bin/shlock
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.strip?= /usr/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+.if exists(/bin/tar)
+TOOLS_PLATFORM.tar?= /bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.tar?= /usr/bin/tar
+.endif
TOOLS_PLATFORM.tbl?= /usr/bin/tbl
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
index e693c972689..51d882edcd1 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.8 2005/05/10 20:14:27 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.9 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the OSF/1 operating system.
@@ -43,6 +43,7 @@ TOOLS_PLATFORM.sh?= /bin/ksh
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.strip?= /usr/ccs/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+TOOLS_PLATFORM.tar?= /usr/bin/tar
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
TOOLS_PLATFORM.touch?= /usr/bin/touch
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index c463a2e68f3..323e61f2d0d 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.9 2005/05/10 19:56:51 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.10 2005/05/14 21:15:07 jlam Exp $
#
# System-supplied tools for the OpenBSD operating system.
@@ -23,11 +23,7 @@ TOOLS_PLATFORM.fgrep?= /usr/bin/fgrep
TOOLS_PLATFORM.file?= /usr/bin/file
TOOLS_PLATFORM.find?= /usr/bin/find
TOOLS_PLATFORM.grep?= /usr/bin/grep
-.if exists(/bin/tar)
-TOOLS_PLATFORM.gtar?= /bin/tar
-.elif exists(/usr/bin/tar)
-TOOLS_PLATFORM.gtar?= /usr/bin/tar
-.endif
+TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar}
TOOLS_PLATFORM.gunzip?= /usr/bin/gunzip -f
TOOLS_PLATFORM.gzcat?= /usr/bin/gzcat
TOOLS_PLATFORM.gzip?= /usr/bin/gzip -nf ${GZIP}
@@ -54,6 +50,11 @@ TOOLS_PLATFORM.sh?= /bin/sh
TOOLS_PLATFORM.sort?= /usr/bin/sort
TOOLS_PLATFORM.strip?= /usr/bin/strip
TOOLS_PLATFORM.tail?= /usr/bin/tail
+.if exists(/bin/tar)
+TOOLS_PLATFORM.tar?= /bin/tar
+.elif exists(/usr/bin/tar)
+TOOLS_PLATFORM.tar?= /usr/bin/tar
+.endif
TOOLS_PLATFORM.tbl?= /usr/bin/tbl
TOOLS_PLATFORM.tee?= /usr/bin/tee
TOOLS_PLATFORM.test?= test # shell builtin
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-14 21:36:43 +0000