[pkgsrc/trunk]: pkgsrc/pkgtools/pbulk pbulk-0.67: Support both $NetBSD$ style...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2e65923f67b
branches:  trunk
changeset: 408026:f2e65923f67b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jan 12 23:35:01 2020 +0000

description:
pbulk-0.67: Support both $NetBSD$ style RCS IDs and digests in +BUILD_INFO.
Bump configuration version for the new pkg_admin field.

diffstat:

 pkgtools/pbulk/Makefile                           |   6 +++---
 pkgtools/pbulk/files/pbulk/pbulk.conf             |   7 ++++---
 pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date |  14 +++++++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diffs (72 lines):

diff -r 23f559b05dbb -r f2e65923f67b pkgtools/pbulk/Makefile
--- a/pkgtools/pbulk/Makefile   Sun Jan 12 23:04:09 2020 +0000
+++ b/pkgtools/pbulk/Makefile   Sun Jan 12 23:35:01 2020 +0000
@@ -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 @@
 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 -r 23f559b05dbb -r f2e65923f67b pkgtools/pbulk/files/pbulk/pbulk.conf
--- a/pkgtools/pbulk/files/pbulk/pbulk.conf     Sun Jan 12 23:04:09 2020 +0000
+++ b/pkgtools/pbulk/files/pbulk/pbulk.conf     Sun Jan 12 23:35:01 2020 +0000
@@ -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 @@
 varbase=/var
 
 # The following programs must NOT be inside ${prefix}
+pkg_add=@PKG_ADD_CMD@
+pkg_admin=@PKG_ADMIN_CMD@
+pkg_delete=@PKG_DELETE_CMD@
 pkg_info=@PKG_INFO_CMD@
-pkg_add=@PKG_ADD_CMD@
-pkg_delete=@PKG_DELETE_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 -r 23f559b05dbb -r f2e65923f67b pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date
--- a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date Sun Jan 12 23:04:09 2020 +0000
+++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date Sun Jan 12 23:35:01 2020 +0000
@@ -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@localhost>.
 # All rights reserved.
@@ -47,8 +47,16 @@
        [ -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