diff options
author | joerg <joerg@pkgsrc.org> | 2007-08-15 21:10:54 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2007-08-15 21:10:54 +0000 |
commit | 020f22df97cb3b11ab5735dde6b3868d6a3d083d (patch) | |
tree | 01e9be53512e218e282eeb4dd4494d3372af978a /pkgtools/pbulk | |
parent | 4319d364cdddbd2d43a290ced696b81632ab02db (diff) | |
download | pkgsrc-020f22df97cb3b11ab5735dde6b3868d6a3d083d.tar.gz |
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 (limited to 'pkgtools/pbulk')
-rw-r--r-- | pkgtools/pbulk/Makefile | 8 | ||||
-rw-r--r-- | pkgtools/pbulk/files/pbulk/pbulk.conf | 3 | ||||
-rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/client-clean | 4 | ||||
-rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 4 | ||||
-rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pre-build | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 5af1af6af4a..692d991b8f9 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -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 @@ EXTRACT_ONLY= # empty 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 @@ SUBST_FILES.tools= pbulk.conf scripts/build scripts/build-client-start \ 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 --git a/pkgtools/pbulk/files/pbulk/pbulk.conf b/pkgtools/pbulk/files/pbulk/pbulk.conf index ad584298ec6..cad4dbc3e11 100644 --- a/pkgtools/pbulk/files/pbulk/pbulk.conf +++ b/pkgtools/pbulk/files/pbulk/pbulk.conf @@ -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 @@ ident=@IDENT@ make=@MAKE@ mail=@MAIL_CMD@ rsync=@PREFIX@/bin/rsync +tar=@TAR@ loc=${bulklog}/meta diff --git a/pkgtools/pbulk/files/pbulk/scripts/client-clean b/pkgtools/pbulk/files/pbulk/scripts/client-clean index d6717391343..c3c5cb88ace 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/client-clean +++ b/pkgtools/pbulk/files/pbulk/scripts/client-clean @@ -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 @@ set -e # 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 --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 10dbce01cbd..7ce43994258 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build @@ -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>. # All rights reserved. @@ -70,7 +70,7 @@ set -e # 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 --git a/pkgtools/pbulk/files/pbulk/scripts/pre-build b/pkgtools/pbulk/files/pbulk/scripts/pre-build index 3e6c7bdd6fc..2284b1ecf52 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pre-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pre-build @@ -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>. # All rights reserved. @@ -40,7 +40,7 @@ mkdir -p "${bulklog}" "${loc}" # 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` |