[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_rolling-replace pkg_rr: substitute pkg_ad...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bf744d70231
branches:  trunk
changeset: 444965:8bf744d70231
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jan 15 10:56:52 2021 +0000

description:
pkg_rr: substitute pkg_admin with PKG_ADMIN_CMD. Bump to 0.24.10.

diffstat:

 pkgtools/pkg_rolling-replace/Makefile                     |  6 +++---
 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh |  5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r 23e0a7b03812 -r 8bf744d70231 pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Fri Jan 15 10:02:53 2021 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Fri Jan 15 10:56:52 2021 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2021/01/09 19:12:46 rhialto Exp $
+# $NetBSD: Makefile,v 1.47 2021/01/15 10:56:52 tnn Exp $
 
-PKGNAME=       pkg_rolling-replace-0.24.9
+PKGNAME=       pkg_rolling-replace-0.24.10
 CATEGORIES=    pkgtools
 
 MAINTAINER=    gdt%NetBSD.org@localhost
@@ -24,7 +24,7 @@
 SUBST_STAGE.tools=     pre-configure
 SUBST_MESSAGE.tools=   Substituting tool locations.
 SUBST_FILES.tools=     pkg_rolling-replace.sh
-SUBST_VARS.tools=      PREFIX PKG_INFO_CMD MAKE PKG_CHK AWK MKDIR SETENV
+SUBST_VARS.tools=      PREFIX PKG_ADMIN_CMD PKG_INFO_CMD MAKE PKG_CHK AWK MKDIR SETENV
 
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    pre-configure
diff -r 23e0a7b03812 -r 8bf744d70231 pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Fri Jan 15 10:02:53 2021 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Fri Jan 15 10:56:52 2021 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.41 2021/01/09 19:12:46 rhialto Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.42 2021/01/15 10:56:52 tnn Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -92,6 +92,7 @@
 fi
 test -z "$PKGSRCDIR" && echo >&2 "Please set PKGSRCDIR" && exit 1
 test -z "$PKG_CHK" && PKG_CHK="@PKG_CHK@"
+test -z "$PKG_ADMIN" && PKG_ADMIN="@PKG_ADMIN_CMD@"
 test -z "$PKG_INFO" && PKG_INFO="@PKG_INFO_CMD@"
 
 export PKGSRCDIR
@@ -159,7 +160,7 @@
         for word in $line; do
             if [ "$(echo $word | egrep '^[^/]+-[0-9][^-/]*$')" ]; then
                if [ -z "$opt_F" ]; then
-                   pkg_admin set mismatch=YES "$word" 1>&2
+                   ${PKG_ADMIN} set mismatch=YES "$word" 1>&2
                fi
                 echo $word | sed 's/-[0-9][^-]*$//'
                 break  #done with this line