CVS commit: pkgsrc/pkgtools/R2pkg

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Jan 13 18:06:48 UTC 2020

Modified Files:
        pkgsrc/pkgtools/R2pkg: Makefile
        pkgsrc/pkgtools/R2pkg/files: R2pkg.R R2pkg.sh RELEASE

Log Message:
pkgtools/R2pkg: update to 0.6.4

Changes since 0.6.3:

* Fix hardcoded use of bmake.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/pkgtools/R2pkg/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/pkgtools/R2pkg/files/R2pkg.R
cvs rdiff -u -r1.13 -r1.14 pkgsrc/pkgtools/R2pkg/files/R2pkg.sh
cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/R2pkg/files/RELEASE

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

Modified files:

Index: pkgsrc/pkgtools/R2pkg/Makefile
diff -u pkgsrc/pkgtools/R2pkg/Makefile:1.10 pkgsrc/pkgtools/R2pkg/Makefile:1.11
--- pkgsrc/pkgtools/R2pkg/Makefile:1.10 Sat Oct 19 15:47:03 2019
+++ pkgsrc/pkgtools/R2pkg/Makefile      Mon Jan 13 18:06:47 2020
@@ -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
 

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg.R
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.27 pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.28
--- pkgsrc/pkgtools/R2pkg/files/R2pkg.R:1.27    Fri Oct 25 19:00:16 2019
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.R Mon Jan 13 18:06:47 2020
@@ -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.dependency_list      <- Sys.getenv('
 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 @@ new.depends.pkg <- function(dependency)
   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) {

Index: pkgsrc/pkgtools/R2pkg/files/R2pkg.sh
diff -u pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.13 pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.14
--- pkgsrc/pkgtools/R2pkg/files/R2pkg.sh:1.13   Sat Oct 19 18:47:59 2019
+++ pkgsrc/pkgtools/R2pkg/files/R2pkg.sh        Mon Jan 13 18:06:47 2020
@@ -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 @@ make_package ()
        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

Index: pkgsrc/pkgtools/R2pkg/files/RELEASE
diff -u pkgsrc/pkgtools/R2pkg/files/RELEASE:1.6 pkgsrc/pkgtools/R2pkg/files/RELEASE:1.7
--- pkgsrc/pkgtools/R2pkg/files/RELEASE:1.6     Sat Oct 19 15:47:03 2019
+++ pkgsrc/pkgtools/R2pkg/files/RELEASE Mon Jan 13 18:06:47 2020
@@ -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 @@ R2pkg v0.6.3 (2019-10-19)
 * Fix comparison of articles (a, an) in comments.
 
 * Lots of refactorings.
+
+R2pkg v0.6.4 (2020-01-13)
+-------------------------
+
+* Fix hardcoded use of bmake.