[pkgsrc/trunk]: pkgsrc/pkgtools/R2pkg pkgtools/R2pkg: update to 0.6.4

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ed15e873f2f
branches:  trunk
changeset: 421252:7ed15e873f2f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Jan 13 18:06:47 2020 +0000

description:
pkgtools/R2pkg: update to 0.6.4

Changes since 0.6.3:

* Fix hardcoded use of bmake.

diffstat:

 pkgtools/R2pkg/Makefile       |  4 ++--
 pkgtools/R2pkg/files/R2pkg.R  |  9 ++++++---
 pkgtools/R2pkg/files/R2pkg.sh |  3 ++-
 pkgtools/R2pkg/files/RELEASE  |  7 ++++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diffs (79 lines):

diff -r 6e6b48d57e14 -r 7ed15e873f2f pkgtools/R2pkg/Makefile
--- a/pkgtools/R2pkg/Makefile   Mon Jan 13 17:36:48 2020 +0000
+++ b/pkgtools/R2pkg/Makefile   Mon Jan 13 18:06:47 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2019/10/19 15:47:03 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2020/01/13 18:06:47 rillig Exp $
 #
 
-VERS=          0.6.3
+VERS=          0.6.4
 PKGNAME=       R2pkg-${VERS}
 CATEGORIES=    pkgtools
 
diff -r 6e6b48d57e14 -r 7ed15e873f2f pkgtools/R2pkg/files/R2pkg.R
--- a/pkgtools/R2pkg/files/R2pkg.R      Mon Jan 13 17:36:48 2020 +0000
+++ b/pkgtools/R2pkg/files/R2pkg.R      Mon Jan 13 18:06:47 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: R2pkg.R,v 1.27 2019/10/25 19:00:16 rillig Exp $
+# $NetBSD: R2pkg.R,v 1.28 2020/01/13 18:06:47 rillig Exp $
 #
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #      Brook Milligan.  All rights reserved.
@@ -42,6 +42,7 @@
 arg.maintainer_email     <- Sys.getenv('MAINTAINER_EMAIL')
 arg.rpkg_description_url <- Sys.getenv('RPKG_DESCRIPTION_URL')
 arg.quiet_curl           <- as.logical(Sys.getenv('QUIET_CURL'))
+arg.make                 <- Sys.getenv('MAKE')
 
 mkcvsid <- paste0('# $', 'NetBSD$')
 
@@ -349,8 +350,10 @@
   Sys.glob(paste0('../../wip/R-', depends(dependency)))
 
 depends.pkg.fullname <- function(dependency, index=1) {
-  result <- system(paste('cd', depends.pkg(dependency)[index], '&& bmake show-var VARNAME=PKGNAME'), intern = TRUE)
-  result
+  cmd <- sprintf('cd %s && %s show-var VARNAME=PKGNAME',
+    depends.pkg(dependency)[index], arg.make)
+message(cmd)
+  system(cmd, intern = TRUE)
 }
 
 depends.pkg.vers <- function(dependency, index=1) {
diff -r 6e6b48d57e14 -r 7ed15e873f2f pkgtools/R2pkg/files/R2pkg.sh
--- a/pkgtools/R2pkg/files/R2pkg.sh     Mon Jan 13 17:36:48 2020 +0000
+++ b/pkgtools/R2pkg/files/R2pkg.sh     Mon Jan 13 18:06:47 2020 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: R2pkg.sh,v 1.13 2019/10/19 18:47:59 rillig Exp $
+# $NetBSD: R2pkg.sh,v 1.14 2020/01/13 18:06:47 rillig Exp $
 #
 # Copyright (c) 2014,2015,2016,2017,2018,2019
 #      Brook Milligan.  All rights reserved.
@@ -160,6 +160,7 @@
        RPKG_DESCRIPTION_URL="$rpkg_description_url" \
        QUIET_CURL="$quiet_curl" \
        LC_ALL="C" \
+       MAKE="$make" \
        Rscript --no-save -e "source('@LIBDIR@/R2pkg.R'); main()"
     retval=${?}
     if [ $retval -ne 0 ]; then
diff -r 6e6b48d57e14 -r 7ed15e873f2f pkgtools/R2pkg/files/RELEASE
--- a/pkgtools/R2pkg/files/RELEASE      Mon Jan 13 17:36:48 2020 +0000
+++ b/pkgtools/R2pkg/files/RELEASE      Mon Jan 13 18:06:47 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: RELEASE,v 1.6 2019/10/19 15:47:03 rillig Exp $
+$NetBSD: RELEASE,v 1.7 2020/01/13 18:06:47 rillig Exp $
 
 RELEASE
 =======
@@ -70,3 +70,8 @@
 * Fix comparison of articles (a, an) in comments.
 
 * Lots of refactorings.
+
+R2pkg v0.6.4 (2020-01-13)
+-------------------------
+
+* Fix hardcoded use of bmake.