CVS commit: pkgsrc/pkgtools/pkg_rolling-replace

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Mar 23 17:20:31 UTC 2019

Modified Files:
        pkgsrc/pkgtools/pkg_rolling-replace: Makefile
        pkgsrc/pkgtools/pkg_rolling-replace/files: pkg_rolling-replace.sh

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/pkgtools/pkg_rolling-replace/Makefile
cvs rdiff -u -r1.36 -r1.37 \
    pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh

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

Modified files:

Index: pkgsrc/pkgtools/pkg_rolling-replace/Makefile
diff -u pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.41 pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.42
--- pkgsrc/pkgtools/pkg_rolling-replace/Makefile:1.41   Sun May  6 18:06:18 2018
+++ pkgsrc/pkgtools/pkg_rolling-replace/Makefile        Sat Mar 23 17:20:31 2019
@@ -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

Index: pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh
diff -u pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.36 pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.37
--- pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh:1.36       Sun May  6 18:06:18 2018
+++ pkgsrc/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh    Sat Mar 23 17:20:31 2019
@@ -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 @@ while [ -n "$REPLACE_TODO" ]; do
        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