diff options
| author | joerg <joerg@pkgsrc.org> | 2009-06-08 16:02:52 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-06-08 16:02:52 +0000 |
| commit | 9b0458dcdd4980384e236a3f415f6182659d3ab8 (patch) | |
| tree | 0a60c5cb3b69c0080e18a30587b0bbeab03fa52d /pkgtools | |
| parent | 4a4989c3be68f1249e1235fd3182eaf2f0c05fde (diff) | |
| download | pkgsrc-9b0458dcdd4980384e236a3f415f6182659d3ab8.tar.gz | |
pbulk-0.40:
Use plain sed to extract RCS IDs. GNU ident has issues with unexpanded
RCS IDs.
Diffstat (limited to 'pkgtools')
| -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/pkg-up-to-date | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index c6bfe1007ee..8d306c1d38e 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.53 2009/06/07 18:07:00 joerg Exp $ +# $NetBSD: Makefile,v 1.54 2009/06/08 16:02:52 joerg Exp $ -DISTNAME= pbulk-0.39 +DISTNAME= pbulk-0.40 COMMENT= Modular bulk build framework PKG_DESTDIR_SUPPORT= user-destdir .include "../../pkgtools/pbulk/Makefile.common" -USE_TOOLS+= awk:run bzip2:run digest:run gzip:run ident:run make:run \ +USE_TOOLS+= awk:run bzip2:run digest:run gzip:run make:run \ mail:run sed:run tar:run DEPENDS+= rsync-[0-9]*:../../net/rsync DEPENDS+= pbulk-base>=0.38:../../pkgtools/pbulk-base @@ -33,7 +33,7 @@ SUBST_FILES.tools= pbulk.conf scripts/build scripts/build-client-start \ scripts/compute-packages.awk scripts/create-broken-graph.awk \ scripts/create-report-html.awk scripts/create-report-txt.awk \ scripts/create-report.awk -SUBST_VARS.tools= AWK BZIP2 CHOWN DIGEST GZIP_CMD IDENT MAIL_CMD NEATO \ +SUBST_VARS.tools= AWK BZIP2 CHOWN DIGEST GZIP_CMD MAIL_CMD NEATO \ PBULK_CONFIG PBULK_CONFIG_VERSION PKG_ADD_CMD \ PKG_DELETE_CMD PKG_INFO_CMD PREFIX SED SH TAR \ TARGET_MAKE diff --git a/pkgtools/pbulk/files/pbulk/pbulk.conf b/pkgtools/pbulk/files/pbulk/pbulk.conf index 1c065357c99..6200fc41c0b 100644 --- a/pkgtools/pbulk/files/pbulk/pbulk.conf +++ b/pkgtools/pbulk/files/pbulk/pbulk.conf @@ -1,4 +1,4 @@ -# $NetBSD: pbulk.conf,v 1.15 2008/09/16 18:21:30 joerg Exp $ +# $NetBSD: pbulk.conf,v 1.16 2009/06/08 16:02:52 joerg Exp $ # Version of the configuration file. This is bumped whenver the default # config changes to notify the administrator about updates. @@ -79,7 +79,6 @@ pkg_delete=@PKG_DELETE_CMD@ bzip2=@BZIP2@ digest=@DIGEST@ gzip="@GZIP_CMD@" -ident=@IDENT@ # On non-NetBSD, this should usually point at the bmake in ${prefix}, not the # make used to build pbulk itself. make=@TARGET_MAKE@ diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date index a6608f75e5c..7e77c448762 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date +++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pkg-up-to-date,v 1.6 2009/03/06 15:53:21 tnn Exp $ +# $NetBSD: pkg-up-to-date,v 1.7 2009/06/08 16:02:53 joerg Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -46,7 +46,7 @@ pkg="${packages}/All/$1.tgz" ${pkg_info} -qb ${pkg} | sed 's/:/ /' | while read file file_id; do [ -z "$file" ] && continue - id=`${ident} ${pkgsrc}/${file} 2> /dev/null | head -n 2 | sed -e 1d -e 's/^ //'` + id=`@SED@ -e '/[$]NetBSD/!d' -e 's/^.*\([$]NetBSD[^$]*[$]\).*$/\1/;q' ${pkgsrc}/${file}` [ "$id" = "$file_id" ] done |