CVS commit: pkgsrc/pkgtools/pbulk

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Jan 12 23:35:02 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pbulk: Makefile
        pkgsrc/pkgtools/pbulk/files/pbulk: pbulk.conf
        pkgsrc/pkgtools/pbulk/files/pbulk/scripts: pkg-up-to-date

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


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/pkgtools/pbulk/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf
cvs rdiff -u -r1.9 -r1.10 \
    pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pbulk/Makefile
diff -u pkgsrc/pkgtools/pbulk/Makefile:1.83 pkgsrc/pkgtools/pbulk/Makefile:1.84
--- pkgsrc/pkgtools/pbulk/Makefile:1.83 Wed Jan  8 15:12:01 2020
+++ pkgsrc/pkgtools/pbulk/Makefile      Sun Jan 12 23:35:01 2020
@@ -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
 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

Index: pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf
diff -u pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf:1.24 pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf:1.25
--- pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf:1.24   Sun Dec 18 22:59:35 2016
+++ pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf        Sun Jan 12 23:35:01 2020
@@ -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=:.

Index: pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date
diff -u pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date:1.9 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date:1.10
--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date:1.9        Wed Feb 24 22:51:37 2010
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date    Sun Jan 12 23:35:01 2020
@@ -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 @@ ${pkg_info} -qb ${pkg} | sed 's/:/ /' | 
        [ -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