[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_rolling-replace pkgtools/pkg_rolling-repl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d98d3f67f7cb
branches:  trunk
changeset: 331707:d98d3f67f7cb
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Mar 23 17:20:31 2019 +0000

description:
pkgtools/pkg_rolling-replace: 0.24.5

In addition to adding in BUILD_DEPENDS, catch up to long-ago
improvements to pkgsrc and also add in TOOL_DEPENDS.

Thanks to Hauke Fath for reporting the issue.

diffstat:

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

diffs (34 lines):

diff -r edd03727d520 -r d98d3f67f7cb pkgtools/pkg_rolling-replace/Makefile
--- a/pkgtools/pkg_rolling-replace/Makefile     Sat Mar 23 14:54:13 2019 +0000
+++ b/pkgtools/pkg_rolling-replace/Makefile     Sat Mar 23 17:20:31 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2018/05/06 18:06:18 gdt Exp $
+# $NetBSD: Makefile,v 1.42 2019/03/23 17:20:31 gdt Exp $
 
-PKGNAME=       pkg_rolling-replace-0.24.4
+PKGNAME=       pkg_rolling-replace-0.24.5
 CATEGORIES=    pkgtools
 
 MAINTAINER=    gdt%NetBSD.org@localhost
diff -r edd03727d520 -r d98d3f67f7cb pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
--- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Sat Mar 23 14:54:13 2019 +0000
+++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh Sat Mar 23 17:20:31 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: pkg_rolling-replace.sh,v 1.36 2018/05/06 18:06:18 gdt Exp $
+# $NetBSD: pkg_rolling-replace.sh,v 1.37 2019/03/23 17:20:31 gdt Exp $
 #<license>
 # Copyright (c) 2006 BBN Technologies Corp.  All rights reserved.
 #
@@ -463,8 +463,9 @@
        NEW_DEPENDS=
        cd "$PKGSRCDIR/$pkgdir"
        bdeps=$(@SETENV@ ${MAKE_SET_VARS} ${MAKE} show-depends VARNAME=BUILD_DEPENDS)
+       tdeps=$(@SETENV@ ${MAKE_SET_VARS} ${MAKE} show-depends VARNAME=TOOL_DEPENDS)
        rdeps=$(@SETENV@ ${MAKE_SET_VARS} ${MAKE} show-depends)
-       for depver in $bdeps $rdeps; do
+       for depver in $bdeps $tdeps $rdeps; do
            dep=$(echo $depver | sed -e 's/[:[].*$/0/' -e 's/[<>]=/-/' \
                -e 's/-[0-9][^-]*$//')
            if ! is_member $dep $OLD_DEPENDS $NEW_DEPENDS; then