diff options
| author | joerg <joerg@pkgsrc.org> | 2020-01-12 23:35:01 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2020-01-12 23:35:01 +0000 |
| commit | 9d8356465a9185944c9a9757de009400ca4d0898 (patch) | |
| tree | 0f77601631253077d20f0bee6be9c065f28fa9d7 /pkgtools | |
| parent | a653ad3a595f25abdf7aa34e9b330154117ad17b (diff) | |
| download | pkgsrc-9d8356465a9185944c9a9757de009400ca4d0898.tar.gz | |
pbulk-0.67: Support both $NetBSD$ style RCS IDs and digests in +BUILD_INFO.
Bump configuration version for the new pkg_admin field.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 6 | ||||
| -rw-r--r-- | pkgtools/pbulk/files/pbulk/pbulk.conf | 5 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date | 14 |
3 files changed, 17 insertions, 8 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 0fa163b4c71..9e524ec4cff 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.83 2020/01/08 15:12:01 joerg Exp $ +# $NetBSD: Makefile,v 1.84 2020/01/12 23:35:01 joerg Exp $ -PKGNAME= pbulk-0.66 +PKGNAME= pbulk-0.67 COMMENT= Modular bulk build framework .include "../../pkgtools/pbulk/Makefile.common" @@ -39,7 +39,7 @@ SUBST_VARS.tools= AWK BZIP2 CHOWN DIGEST GZIP_CMD ID MAIL_CMD NEATO \ CONF_FILES+= share/examples/pbulk/pbulk.conf ${PKG_SYSCONFDIR}/pbulk.conf PBULK_CONFIG= ${PKG_SYSCONFDIR}/pbulk.conf -PBULK_CONFIG_VERSION= 0.65 +PBULK_CONFIG_VERSION= 0.67 INSTALLATION_DIRS= bin libexec/pbulk share/examples/pbulk USE_BSD_MAKEFILE= yes diff --git a/pkgtools/pbulk/files/pbulk/pbulk.conf b/pkgtools/pbulk/files/pbulk/pbulk.conf index ae4a4ce24fb..5a79692dd43 100644 --- a/pkgtools/pbulk/files/pbulk/pbulk.conf +++ b/pkgtools/pbulk/files/pbulk/pbulk.conf @@ -1,4 +1,4 @@ -# $NetBSD: pbulk.conf,v 1.24 2016/12/18 22:59:35 joerg Exp $ +# $NetBSD: pbulk.conf,v 1.25 2020/01/12 23:35:01 joerg Exp $ # Version of the configuration file. This is bumped whenever the default # config changes to notify the administrator about updates. @@ -83,9 +83,10 @@ pkgdb=/var/db/pkg varbase=/var # The following programs must NOT be inside ${prefix} -pkg_info=@PKG_INFO_CMD@ pkg_add=@PKG_ADD_CMD@ +pkg_admin=@PKG_ADMIN_CMD@ pkg_delete=@PKG_DELETE_CMD@ +pkg_info=@PKG_INFO_CMD@ # The tools that are used for building the packages. If you do not want # to publish anything at all, set rsync=: and mail=:. diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date index efbedaac766..7c476967fcf 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.9 2010/02/24 22:51:37 joerg Exp $ +# $NetBSD: pkg-up-to-date,v 1.10 2020/01/12 23:35:01 joerg Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -47,8 +47,16 @@ ${pkg_info} -qb ${pkg} | sed 's/:/ /' | while read file file_id; do [ -z "$file" ] && continue [ -e "${pkgsrc}/${file}" ] - id=`@SED@ -e '/[$]NetBSD/!d' -e 's/^.*\([$]NetBSD[^$]*[$]\).*$/\1/;q' ${pkgsrc}/${file}` - [ "$id" = "$file_id" ] + case $file_id in + [$]NetBSD*) + id=`@SED@ -e '/[$]NetBSD/!d' -e 's/^.*\([$]NetBSD[^$]*[$]\).*$/\1/;q' ${pkgsrc}/${file}` + [ "$id" = "$file_id" ] + ;; + *) + hash=`${pkg_admin} digest ${pkgsrc}/${file}` + [ "$hash" = "$file_id" ] + ;; + esac done # TODO: compare build options |