[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk Don't hard-code tar as tar, but make it...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/821988b20444
branches:  trunk
changeset: 532306:821988b20444
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Aug 15 21:10:54 2007 +0000

description:
Don't hard-code tar as tar, but make it an option and use the tool
version correctly. Fixes issues on platforms where the first tar
in path doesn't support -z. Bump to pbulk-0.12.

diffstat:

 pkgtools/pbulk/Makefile                         |  8 ++++----
 pkgtools/pbulk/files/pbulk/pbulk.conf           |  3 ++-
 pkgtools/pbulk/files/pbulk/scripts/client-clean |  4 ++--
 pkgtools/pbulk/files/pbulk/scripts/pkg-build    |  4 ++--
 pkgtools/pbulk/files/pbulk/scripts/pre-build    |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diffs (101 lines):

diff -r 7724ec6303c6 -r 821988b20444 pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Wed Aug 15 20:59:42 2007 +0000
+++ b/pkgtools/pbulk/Makefile   Wed Aug 15 21:10:54 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2007/08/05 14:15:55 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2007/08/15 21:10:54 joerg Exp $
 
-DISTNAME=      pbulk-0.11
+DISTNAME=      pbulk-0.12
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -16,7 +16,7 @@
 NO_CHECKSUM=   YES
 
 USE_TOOLS+=    awk:run bzip2:run digest:run gzip:run ident:run make:run \
-               mail:run
+               mail:run tar:run
 DEPENDS+=      rsync-[0-9]*:../../net/rsync
 
 SUBST_CLASSES+=                tools
@@ -30,7 +30,7 @@
        scripts/create-report-html.awk scripts/create-report-txt.awk \
        scripts/create-report.awk
 SUBST_VARS.tools=      AWK BZIP2 DIGEST GZIP_CMD IDENT MAKE MAIL_CMD \
-                       PBULK_CONFIG PKG_INFO PREFIX SH
+                       PBULK_CONFIG PKG_INFO PREFIX SH TAR
 
 CONF_FILES+=   share/examples/pbulk/pbulk.conf ${PKG_SYSCONFDIR}/pbulk.conf
 
diff -r 7724ec6303c6 -r 821988b20444 pkgtools/pbulk/files/pbulk/pbulk.conf
--- a/pkgtools/pbulk/files/pbulk/pbulk.conf     Wed Aug 15 20:59:42 2007 +0000
+++ b/pkgtools/pbulk/files/pbulk/pbulk.conf     Wed Aug 15 21:10:54 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pbulk.conf,v 1.5 2007/08/05 09:37:19 tnn Exp $
+# $NetBSD: pbulk.conf,v 1.6 2007/08/15 21:10:55 joerg Exp $
 
 base_url=http://www.pkgsrc-box.org/reports/current/DragonFly-1.8
 # On a single-processor, non-distributed build, you may want to say "no" here.
@@ -51,6 +51,7 @@
 make=@MAKE@
 mail=@MAIL_CMD@
 rsync=@PREFIX@/bin/rsync
+tar=@TAR@
 
 loc=${bulklog}/meta
 
diff -r 7724ec6303c6 -r 821988b20444 pkgtools/pbulk/files/pbulk/scripts/client-clean
--- a/pkgtools/pbulk/files/pbulk/scripts/client-clean   Wed Aug 15 20:59:42 2007 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/client-clean   Wed Aug 15 21:10:54 2007 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: client-clean,v 1.2 2007/08/05 14:15:55 joerg Exp $
+# $NetBSD: client-clean,v 1.3 2007/08/15 21:10:55 joerg Exp $
 
 . @PBULK_CONFIG@
 
@@ -8,4 +8,4 @@
 # Clean build system first
 rm -rf ${prefix} ${pkgdb} ${varbase}/qmail 2> /dev/null || true
 # Install fresh bootstrap state
-[ -z "${bootstrapkit}" ] || tar xzf ${bootstrapkit} -C /
+[ -z "${bootstrapkit}" ] || ${tar} -xzf ${bootstrapkit} -C /
diff -r 7724ec6303c6 -r 821988b20444 pkgtools/pbulk/files/pbulk/scripts/pkg-build
--- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build      Wed Aug 15 20:59:42 2007 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build      Wed Aug 15 21:10:54 2007 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pkg-build,v 1.2 2007/07/16 19:25:25 joerg Exp $
+# $NetBSD: pkg-build,v 1.3 2007/08/15 21:10:55 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -70,7 +70,7 @@
 # Clean build system first
 rm -rf ${prefix} ${pkgdb} ${varbase}/qmail 2> /dev/null || true
 # Install fresh bootstrap state
-[ -n "${bootstrapkit}" ] &&  tar xzf ${bootstrapkit} -C /
+[ -n "${bootstrapkit}" ] &&  ${tar} -xzf ${bootstrapkit} -C /
 
 # Output directory
 mkdir -p ${bulklog}/${pkgname}
diff -r 7724ec6303c6 -r 821988b20444 pkgtools/pbulk/files/pbulk/scripts/pre-build
--- a/pkgtools/pbulk/files/pbulk/scripts/pre-build      Wed Aug 15 20:59:42 2007 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/pre-build      Wed Aug 15 21:10:54 2007 +0000
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: pre-build,v 1.2 2007/07/20 19:39:34 joerg Exp $
+# $NetBSD: pre-build,v 1.3 2007/08/15 21:10:55 joerg Exp $
 #
 # Copyright (c) 2007 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
 # All rights reserved.
@@ -40,7 +40,7 @@
 # Clean build system first
 rm -rf ${prefix} ${pkgdb} ${varbase}/qmail 2> /dev/null || true
 # Install fresh bootstrap state
-[ -n "${bootstrapkit}" ] &&  tar xzf ${bootstrapkit} -C /
+[ -n "${bootstrapkit}" ] && ${tar} -xzf ${bootstrapkit} -C /
 
 # Log common settings...
 opsys=`cd ${pkgsrc}/pkgtools/pkg_install && ${make} show-var VARNAME=OPSYS`