diff options
| author | jlam <jlam> | 2005-05-14 21:15:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-14 21:15:07 +0000 |
| commit | f961314edce8fe22800d591e28c4c6d56330aa19 (patch) | |
| tree | abb61edb38473cf587b49a23812a600f1d00bca9 /mk/tools/tools.OpenBSD.mk | |
| parent | 8649e953f6e7d4480518c6eacc327ff7629a6b50 (diff) | |
| download | pkgsrc-f961314edce8fe22800d591e28c4c6d56330aa19.tar.gz | |
Consider ${TAR} differently from ${GTAR}. Currently, mark pkgsrc down
as needing both (no impact since they're both satisfied by the tar
binary installed by the bootstrap kit). There's some funniness in
the extraction code where we check for pax or GNU tar that needs to
be resolved. Remove the TAR=${GTAR} hack since it's no longer needed
after these changes.
XXX Later, a sweep needs to be made to see where we actually need GTAR
XXX and where we only need TAR, probably triggered by whether we call it
XXX with the "z" option or not. Packages that need GTAR should explicitly
XXX add USE_TOOLS+=gtar to the package Makefile.
Diffstat (limited to 'mk/tools/tools.OpenBSD.mk')
| -rw-r--r-- | mk/tools/tools.OpenBSD.mk | 13 |
1 files changed, 7 insertions, 6 deletions
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 |