Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] build-style: R-cran: refactor
@ 2021-09-11  5:16 sgn
  2021-09-11 20:29 ` Chocimier
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: sgn @ 2021-09-11  5:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1603 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages build-style-R-cran-refactor
https://github.com/void-linux/void-packages/pull/32910

build-style: R-cran: refactor
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32910.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-style-R-cran-refactor-32910.patch --]
[-- Type: text/x-diff, Size: 99221 bytes --]

From c472a81a7da070ad0e94fbef49bbc737d48c11e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 11 Sep 2021 11:10:58 +0700
Subject: [PATCH 1/3] build-style: R-cran: move distfiles to template

Otherwise, update-check is broken.
---
 common/environment/build-style/R-cran.sh | 1 -
 srcpkgs/R-cran-R6/template               | 1 +
 srcpkgs/R-cran-RColorBrewer/template     | 1 +
 srcpkgs/R-cran-Rcpp/template             | 1 +
 srcpkgs/R-cran-assertthat/template       | 1 +
 srcpkgs/R-cran-backports/template        | 1 +
 srcpkgs/R-cran-callr/template            | 1 +
 srcpkgs/R-cran-cli/template              | 1 +
 srcpkgs/R-cran-colorspace/template       | 1 +
 srcpkgs/R-cran-cpp11/template            | 1 +
 srcpkgs/R-cran-crayon/template           | 1 +
 srcpkgs/R-cran-data.table/template       | 1 +
 srcpkgs/R-cran-desc/template             | 1 +
 srcpkgs/R-cran-dichromat/template        | 1 +
 srcpkgs/R-cran-digest/template           | 1 +
 srcpkgs/R-cran-dplyr/template            | 1 +
 srcpkgs/R-cran-ellipsis/template         | 1 +
 srcpkgs/R-cran-evaluate/template         | 1 +
 srcpkgs/R-cran-fansi/template            | 1 +
 srcpkgs/R-cran-farver/template           | 1 +
 srcpkgs/R-cran-generics/template         | 1 +
 srcpkgs/R-cran-ggplot2/template          | 1 +
 srcpkgs/R-cran-glue/template             | 1 +
 srcpkgs/R-cran-gsubfn/template           | 1 +
 srcpkgs/R-cran-gtable/template           | 1 +
 srcpkgs/R-cran-isoband/template          | 1 +
 srcpkgs/R-cran-labeling/template         | 1 +
 srcpkgs/R-cran-lazyeval/template         | 1 +
 srcpkgs/R-cran-lifecycle/template        | 1 +
 srcpkgs/R-cran-lubridate/template        | 1 +
 srcpkgs/R-cran-magrittr/template         | 1 +
 srcpkgs/R-cran-munsell/template          | 1 +
 srcpkgs/R-cran-nloptr/template           | 1 +
 srcpkgs/R-cran-pillar/template           | 1 +
 srcpkgs/R-cran-pkgbuild/template         | 1 +
 srcpkgs/R-cran-pkgconfig/template        | 1 +
 srcpkgs/R-cran-pkgload/template          | 1 +
 srcpkgs/R-cran-plyr/template             | 1 +
 srcpkgs/R-cran-praise/template           | 1 +
 srcpkgs/R-cran-prettyunits/template      | 1 +
 srcpkgs/R-cran-processx/template         | 1 +
 srcpkgs/R-cran-proto/template            | 1 +
 srcpkgs/R-cran-ps/template               | 1 +
 srcpkgs/R-cran-purrr/template            | 1 +
 srcpkgs/R-cran-reshape2/template         | 1 +
 srcpkgs/R-cran-rlang/template            | 1 +
 srcpkgs/R-cran-rprojroot/template        | 1 +
 srcpkgs/R-cran-rstudioapi/template       | 1 +
 srcpkgs/R-cran-scales/template           | 1 +
 srcpkgs/R-cran-stringi/template          | 1 +
 srcpkgs/R-cran-stringr/template          | 1 +
 srcpkgs/R-cran-svglite/template          | 1 +
 srcpkgs/R-cran-systemfonts/template      | 1 +
 srcpkgs/R-cran-testthat/template         | 1 +
 srcpkgs/R-cran-tibble/template           | 1 +
 srcpkgs/R-cran-tidyselect/template       | 1 +
 srcpkgs/R-cran-utf8/template             | 1 +
 srcpkgs/R-cran-vctrs/template            | 1 +
 srcpkgs/R-cran-viridisLite/template      | 1 +
 srcpkgs/R-cran-withr/template            | 1 +
 srcpkgs/R-cran-zeallot/template          | 1 +
 srcpkgs/R-cran-zoo/template              | 1 +
 62 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/common/environment/build-style/R-cran.sh b/common/environment/build-style/R-cran.sh
index d60f914f5f7a..755d18a040a0 100644
--- a/common/environment/build-style/R-cran.sh
+++ b/common/environment/build-style/R-cran.sh
@@ -1,4 +1,3 @@
 makedepends+=" R"
 depends+=" R"
-distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 wrksrc="${XBPS_BUILDDIR}/${pkgname#R-cran-}"
diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 3c35ffadb069..ab66344fa4d3 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -7,6 +7,7 @@ short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/r-lib/R6"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=aec1af9626ec532cb883b544bf9eff4cb2d89c343c7ce0fa31761ec5a7882e02
 
 post_install() {
diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index b64c8bcf5da9..62869af7296b 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -7,4 +7,5 @@ short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
 homepage="https://cran.r-project.org/web/packages/RColorBrewer/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=f3e9781e84e114b7a88eb099825936cc5ae7276bbba5af94d35adb1b3ea2ccdd
diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index e19cd395809b..561799b65ee9 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -7,6 +7,7 @@ short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="http://www.rcpp.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=b8462c643bcc6fe3b0e9caee9e0cd76c5f7f0e34ee2e7397f93c4c43885c5c04
 
 pre_install() {
diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 6e8161baa7d4..ca78c4f521ed 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -7,4 +7,5 @@ short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-only"
 homepage="https://cran.r-project.org/package=assertthat"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=85cf7fcc4753a8c86da9a6f454e46c2a58ffc70c4f47cac4d3e3bcefda2a9e9f
diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 09e500c45479..85a947dbab55 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -7,4 +7,5 @@ short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://github.com/r-lib/backports"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=a2834bbd57e305e5d8010322f1906ea1789b3b5ba5eca77c5ff4248aceb7c2d5
diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index a844ef36722a..33a75e2bcbc8 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -9,6 +9,7 @@ short_desc="Call R from R"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/r-lib/callr"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=ce338c648cc9ab501168a55f93e68fc81e31dc5ec881e908b5b4a9d6f5bd8696
 
 post_install() {
diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index b6c445ea9371..bc302ed64171 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -9,6 +9,7 @@ short_desc="Helpers for Developing Command Line Interfaces"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/r-lib/cli/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=516ce2de54b4a58afa943f31dfdd925e532b67cf5f91aec355e255637b2406ca
 
 post_install() {
diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index 8490d34fdb58..ccaedde64e8f 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -7,6 +7,7 @@ short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://www.hclwizard.org/r-colorspace/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=693d713a050f8bfecdb7322739f04b40d99b55aed168803686e43401d5f0d673
 
 post_install() {
diff --git a/srcpkgs/R-cran-cpp11/template b/srcpkgs/R-cran-cpp11/template
index db827ed635bd..25deb3e4c90c 100644
--- a/srcpkgs/R-cran-cpp11/template
+++ b/srcpkgs/R-cran-cpp11/template
@@ -7,6 +7,7 @@ short_desc="Header only, C++11 interface to R's C interface"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://github.com/r-lib/cpp11"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=1d4154c0d8ef4b564eea828ebebc836b7dbdc89a0848a840dd98173b07f661d4
 
 post_install() {
diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index c836f1b82ac2..3be897297d80 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -7,6 +7,7 @@ short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/r-lib/crayon/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=08b6e42e748d096960b2f32b7ffe690c25742e29fe14c19d1834cd6ff43029c7
 
 post_install() {
diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index 700bb33cadfe..4b6262689261 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -8,4 +8,5 @@ short_desc="Extension of 'data.frame'"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MPL-2.0"
 homepage="https://github.com/Rdatatable/data.table/wiki"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=13f1de244e7fa90fadfb0be964db5ffb324ca024d5f136feb4578b5daedaeb4d
diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index 8770cb9a55b9..797d873c2111 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -9,6 +9,7 @@ short_desc="Manipulate DESCRIPTION Files"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/r-lib/desc"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=e66fb5d4fc7974bc558abcdc107a1f258c9177a29dcfcf9164bc6b33dd08dae8
 
 post_install() {
diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 6d4cbc2cc206..4f4f5b5d7a53 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -7,4 +7,5 @@ short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://cran.r-project.org/web/packages/dichromat/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=31151eaf36f70bdc1172da5ff5088ee51cc0a3db4ead59c7c38c25316d580dd1
diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 0bf4c97052fe..3023b00e06c1 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -8,4 +8,5 @@ maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="http://dirk.eddelbuettel.com/code/digest.html"
 changelog="https://github.com/eddelbuettel/digest/raw/master/ChangeLog"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=f485f75122907da24c41d4a62c91a232f0c371befd2f77e973342a1bef00253f
diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template
index 46e0fe526326..5fcd8a80405f 100644
--- a/srcpkgs/R-cran-dplyr/template
+++ b/srcpkgs/R-cran-dplyr/template
@@ -13,6 +13,7 @@ short_desc="Grammar of Data Manipulation for R"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://dplyr.tidyverse.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=7541a09c66ecb40736e25bc9ec9591f26ec4ee67c99823b4ac855760b5c96e70
 
 post_install() {
diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 0e9f695fcec7..f6a8788c866c 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -9,4 +9,5 @@ short_desc="Tools for making ... safer"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://ellipsis.r-lib.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=4f8a15158dfc27cdc0f7554c7a61e92b02e4d70bfc3d968f01a99da2189b75db
diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index 2f7803563164..f3d49530b44d 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -7,6 +7,7 @@ short_desc="Parsing and Evaluation Tools that Provide More Details than the Defa
 maintainer="luhann <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/r-lib/evaluate"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=a8c88bdbe4e60046d95ddf7e181ee15a6f41cdf92127c9678f6f3d328a3c5e28
 
 post_install() {
diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index a10f86c52f5e..a1e033b35e1b 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -7,4 +7,5 @@ short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://cran.r-project.org/web/packages/fansi/index.html"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=a2edf06cf8b91333a5df4990d50cdb35a63aa4b63c8c8ddf5bedcb499daafc44
diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 370c2330df8a..29a3a70da331 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -7,6 +7,7 @@ short_desc="High Performance Colour Space Manipulation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/thomasp85/farver"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=0e1590df79ec6078f10426411b96216b70568a4eaf3ffd84ca723add0ed8e5cc
 
 post_install() {
diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 0d3797c2cddc..23f42edb7834 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -7,4 +7,5 @@ short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/r-lib/generics"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=ab71d1bdbb66c782364c61cede3c1186d6a94c03635f9af70d926e2c1ac88763
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index ddf1e5bb6038..53d023c8cec7 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -11,4 +11,5 @@ short_desc="Create Elegant Data Visualisations Using the Grammar of Graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://ggplot2.tidyverse.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=b075294faf3af31b18e415f260c62d6000b218770e430484fe38819bdc3224ea
diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 33a22e9c8dc7..995f90a8574b 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -7,6 +7,7 @@ short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/tidyverse/glue/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=9f7354132a26e9a876428fa87629b9aaddcd558f9932328e6ac065b95b8ef7ad
 
 post_install() {
diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index 5d65a8533125..691740161cda 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -9,4 +9,5 @@ short_desc="Utilities for strings and function arguments"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="http://gsubfn.googlecode.com/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=89351df9e65722d2862f26a0a3985666de3c86e8400808ced8a6eb6e165a4602
diff --git a/srcpkgs/R-cran-gtable/template b/srcpkgs/R-cran-gtable/template
index 08cf057baf8b..362e41a05fa3 100644
--- a/srcpkgs/R-cran-gtable/template
+++ b/srcpkgs/R-cran-gtable/template
@@ -7,4 +7,5 @@ short_desc="Arrange 'Grobs' in Tables"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://cran.r-project.org/web/packages/gtable/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=fd386cc4610b1cc7627dac34dba8367f7efe114b968503027fb2e1265c67d6d3
diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index dd88c5e9d570..da0d48489822 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -7,6 +7,7 @@ short_desc="Generate Isolines and Isobands from Regularly Spaced Elevation Grids
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/wilkelab/isoband"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=96d5bbdbfa4ead40bf30cec5a0d525b6a6b0f21eb92d179289ce2c4459bf387c
 
 post_install() {
diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index 4ec70142e3d9..c483bff213b1 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -7,6 +7,7 @@ short_desc="Axis Labeling"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://cran.r-project.org/web/packages/labeling/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=0d8069eb48e91f6f6d6a9148f4e2dc5026cabead15dd15fc343eff9cf33f538f
 
 post_install() {
diff --git a/srcpkgs/R-cran-lazyeval/template b/srcpkgs/R-cran-lazyeval/template
index 39c731f0d4c8..9fec691ed9b0 100644
--- a/srcpkgs/R-cran-lazyeval/template
+++ b/srcpkgs/R-cran-lazyeval/template
@@ -7,4 +7,5 @@ short_desc="Lazy (Non-Standard) Evaluation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-only"
 homepage="https://cran.r-project.org/web/packages/lazyeval/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=d6904112a21056222cfcd5eb8175a78aa063afe648a562d9c42c6b960a8820d4
diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index e3a2af69c4e6..1d810068f74c 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -9,6 +9,7 @@ short_desc="Manage the Life Cycle of your Package Functions"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://github.com/r-lib/lifecycle"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=03334ab213f2ad49a49e184e73f2051e04d35d43f562db903e68243cd2ec0f8e
 
 post_install() {
diff --git a/srcpkgs/R-cran-lubridate/template b/srcpkgs/R-cran-lubridate/template
index 76601e943c2b..86a42bcf7d32 100644
--- a/srcpkgs/R-cran-lubridate/template
+++ b/srcpkgs/R-cran-lubridate/template
@@ -9,6 +9,7 @@ short_desc="Make Dealing with Dates a Little Easier"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/tidyverse/lubridate"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=cbf95ee07323f3912a98f3cfdae04258d7ce1edb259787f284e2be3cddfed272
 
 pre_install() {
diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index 1e4ecaa43834..8b641d5266e5 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -7,6 +7,7 @@ short_desc="Forward-Pipe Operator for R"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://cran.r-project.org/web/packages/magrittr/index.html"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f
 
 post_install() {
diff --git a/srcpkgs/R-cran-munsell/template b/srcpkgs/R-cran-munsell/template
index 79dfa4ee3be0..b4a676bb62b3 100644
--- a/srcpkgs/R-cran-munsell/template
+++ b/srcpkgs/R-cran-munsell/template
@@ -9,6 +9,7 @@ short_desc="Utilities for Using Munsell Colours"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://cran.r-project.org/web/packages/munsell/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=d0f3a9fb30e2b5d411fa61db56d4be5733a2621c0edf017d090bdfa5e377e199
 
 post_install() {
diff --git a/srcpkgs/R-cran-nloptr/template b/srcpkgs/R-cran-nloptr/template
index aff2a57da941..5f717fecac6d 100644
--- a/srcpkgs/R-cran-nloptr/template
+++ b/srcpkgs/R-cran-nloptr/template
@@ -9,4 +9,5 @@ short_desc="R interface to NLopt"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="https://cran.r-project.org/package=nloptr"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=e80ea9619ac18f4bfe44812198b40b9ae5c0ddf3f9cc91778f9ccc82168d1372
diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index e041a7a7c4b9..6efa20c332aa 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -11,4 +11,5 @@ short_desc="Coloured Formatting for Columns"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/r-lib/pillar/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=0ce5d15364dab761dab5b159ec2a4586ed1635f058fa13975725a1921e43e672
diff --git a/srcpkgs/R-cran-pkgbuild/template b/srcpkgs/R-cran-pkgbuild/template
index 539be556b823..8663d0126950 100644
--- a/srcpkgs/R-cran-pkgbuild/template
+++ b/srcpkgs/R-cran-pkgbuild/template
@@ -11,4 +11,5 @@ short_desc="Find Tools Needed to Build R Packages"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-lib/pkgbuild"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=b39bfb7661fc53f88962e2380fa9ded2e323c6ad43ac6b582195c749b0ccabbd
diff --git a/srcpkgs/R-cran-pkgconfig/template b/srcpkgs/R-cran-pkgconfig/template
index 5d96a44becaa..8d976598b8b8 100644
--- a/srcpkgs/R-cran-pkgconfig/template
+++ b/srcpkgs/R-cran-pkgconfig/template
@@ -7,6 +7,7 @@ short_desc="Private Configuration for 'R' Packages"
 maintainer="q66 <daniel@octaforge.org>"
 license="MIT"
 homepage="https://github.com/r-lib/pkgconfig"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=330fef440ffeb842a7dcfffc8303743f1feae83e8d6131078b5a44ff11bc3850
 
 post_install() {
diff --git a/srcpkgs/R-cran-pkgload/template b/srcpkgs/R-cran-pkgload/template
index b4ee55f56b36..43a430840203 100644
--- a/srcpkgs/R-cran-pkgload/template
+++ b/srcpkgs/R-cran-pkgload/template
@@ -11,4 +11,5 @@ short_desc="Simulate Package Installation and Attach"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-lib/pkgload"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=189d460dbba2b35fa15dd59ce832df252dfa654a5acee0c9a8471b4d70477b0d
diff --git a/srcpkgs/R-cran-plyr/template b/srcpkgs/R-cran-plyr/template
index c046ee5601ca..11455a080b36 100644
--- a/srcpkgs/R-cran-plyr/template
+++ b/srcpkgs/R-cran-plyr/template
@@ -9,6 +9,7 @@ short_desc="Tools for Splitting, Applying and Combining Data"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="http://had.co.nz/plyr/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=ea55d26f155443e9774769531daa5d4c20a0697bb53abd832e891b126c935287
 
 pre_install() {
diff --git a/srcpkgs/R-cran-praise/template b/srcpkgs/R-cran-praise/template
index 99bf129de0e7..25238f1e2231 100644
--- a/srcpkgs/R-cran-praise/template
+++ b/srcpkgs/R-cran-praise/template
@@ -7,6 +7,7 @@ short_desc="Praise Users"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/rladies/praise"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=5c035e74fd05dfa59b03afe0d5f4c53fbf34144e175e90c53d09c6baedf5debd
 
 post_install() {
diff --git a/srcpkgs/R-cran-prettyunits/template b/srcpkgs/R-cran-prettyunits/template
index 918a4da4ea86..08c9fdb19fc1 100644
--- a/srcpkgs/R-cran-prettyunits/template
+++ b/srcpkgs/R-cran-prettyunits/template
@@ -7,6 +7,7 @@ short_desc="Pretty, Human Readable Formatting of Quantities"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/gaborcsardi/prettyunits"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=9a199aa80c6d5e50fa977bc724d6e39dae1fc597a96413053609156ee7fb75c5
 
 post_install() {
diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index 9560ded758b8..f41ce8b0837b 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -9,6 +9,7 @@ short_desc="Execute and Control System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/r-lib/processx"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=aaa40f10a6670eeb451e038bc0eb7c16f263dacb797f76d965b9fc75dda7482b
 
 post_install() {
diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index e06c26391f11..040f49346077 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -7,4 +7,5 @@ short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
 homepage="https://github.com/hadley/proto"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=9294d9a3b2b680bb6fac17000bfc97453d77c87ef68cfd609b4c4eb6d11d04d1
diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index d4497a4d2344..5cbfd18dd990 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -7,6 +7,7 @@ short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/r-lib/ps"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=5f79ae4489090e07abbea892049ec0db900d31955237b388664289e6dc00da7a
 
 post_install() {
diff --git a/srcpkgs/R-cran-purrr/template b/srcpkgs/R-cran-purrr/template
index f220f1f074fc..06040dc3bf9c 100644
--- a/srcpkgs/R-cran-purrr/template
+++ b/srcpkgs/R-cran-purrr/template
@@ -9,4 +9,5 @@ short_desc="Backend for selecting functions of the tidyverse"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://purrr.tidyverse.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=23ebc93bc9aed9e7575e8eb9683ff4acc0270ef7d6436cc2ef4236a9734840b2
diff --git a/srcpkgs/R-cran-reshape2/template b/srcpkgs/R-cran-reshape2/template
index fbc8a6b6aa93..591d84cabe72 100644
--- a/srcpkgs/R-cran-reshape2/template
+++ b/srcpkgs/R-cran-reshape2/template
@@ -9,6 +9,7 @@ short_desc="Flexibly Reshape Data: A Reboot of the Reshape Package"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/hadley/reshape"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=d88dcf9e2530fa9695fc57d0c78adfc5e361305fe8919fe09410b17da5ca12d8
 
 pre_install() {
diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index 73a4a65e4e9b..98bd130186b0 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -7,4 +7,5 @@ short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-or-later"
 homepage="https://rlang.r-lib.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=07530270c4c199f2b7efc5d57a476d99babd9d0c3388a02bb7d57fe312da3576
diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 69f37f7cf775..9510e2b8d1d9 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -7,4 +7,5 @@ short_desc="Finding Files in Project Subdirectories"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-lib/rprojroot"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=5fa161f0d4ac3b7a99dc6aa2d832251001dc92e93c828593a51fe90afd019e1f
diff --git a/srcpkgs/R-cran-rstudioapi/template b/srcpkgs/R-cran-rstudioapi/template
index d04c0773621b..bc7811a53d7d 100644
--- a/srcpkgs/R-cran-rstudioapi/template
+++ b/srcpkgs/R-cran-rstudioapi/template
@@ -7,6 +7,7 @@ short_desc="Safely Access the RStudio API"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="https://github.com/rstudio/rstudioapi"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=aac35bbdcb4a8e8caba943bc8a2b98120e8940b80cd1020224bb1a26ff776d8b
 
 post_install() {
diff --git a/srcpkgs/R-cran-scales/template b/srcpkgs/R-cran-scales/template
index c4dec24cdbc5..9fdb9c0c5ea9 100644
--- a/srcpkgs/R-cran-scales/template
+++ b/srcpkgs/R-cran-scales/template
@@ -13,6 +13,7 @@ short_desc="Scale Functions for Visualization"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/hadley/scales"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=40b2b66522f1f314a20fd09426011b0cdc9d16b23ee2e765fe1930292dd03705
 
 post_install() {
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 56636534ddae..78fc4e47b0fb 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -8,6 +8,7 @@ short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
 homepage="http://gagolewski.com/software/stringi/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=d98632f1d7dc22e0a190315ee3c435146894e18ef586adbeb80ad526673b1f56
 
 post_install() {
diff --git a/srcpkgs/R-cran-stringr/template b/srcpkgs/R-cran-stringr/template
index 9c4c5ffa24b7..7b2067cc24fd 100644
--- a/srcpkgs/R-cran-stringr/template
+++ b/srcpkgs/R-cran-stringr/template
@@ -9,4 +9,5 @@ short_desc="Simple, Consistent Wrappers for Common String Operations"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="https://stringr.tidyverse.org"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=87604d2d3a9ad8fd68444ce0865b59e2ffbdb548a38d6634796bbd83eeb931dd
diff --git a/srcpkgs/R-cran-svglite/template b/srcpkgs/R-cran-svglite/template
index 90557ae178aa..6453141ac869 100644
--- a/srcpkgs/R-cran-svglite/template
+++ b/srcpkgs/R-cran-svglite/template
@@ -9,4 +9,5 @@ short_desc="Lightweight svg graphics device for R"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-or-later"
 homepage="https://svglite.r-lib.org"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=76e625fe172a5b7ce99a67b6d631b037b3f7f0021cfe15f2e15e8851b89defa5
diff --git a/srcpkgs/R-cran-systemfonts/template b/srcpkgs/R-cran-systemfonts/template
index b779dd8d8ebf..868255e4f2c9 100644
--- a/srcpkgs/R-cran-systemfonts/template
+++ b/srcpkgs/R-cran-systemfonts/template
@@ -9,6 +9,7 @@ short_desc="System Native Font Handling in R"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
 homepage="https://github.com/r-lib/systemfonts"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=21ac96412846e06a4062362b159213cb9d83bd60fdf03aa235992b6c49fb36a9
 
 post_install() {
diff --git a/srcpkgs/R-cran-testthat/template b/srcpkgs/R-cran-testthat/template
index 8e3b946f3897..a425977f74b0 100644
--- a/srcpkgs/R-cran-testthat/template
+++ b/srcpkgs/R-cran-testthat/template
@@ -13,6 +13,7 @@ short_desc="Unit Testing for R"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
 homepage="http://testthat.r-lib.org"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=1a268d8df07f7cd8d282d03bb96ac2d96a24a95c9aa52f4cca5138a09dd8e06c
 
 post_install() {
diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 048d739f793e..6dec573a88a4 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -13,6 +13,7 @@ short_desc="Simple Data Frames"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="http://tibble.tidyverse.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=959e28dea05181a7cd43a744028892261bda4c7ec78ad35fb148d144dcf5154e
 
 post_install() {
diff --git a/srcpkgs/R-cran-tidyselect/template b/srcpkgs/R-cran-tidyselect/template
index e7cd851913e6..0274558a2c84 100644
--- a/srcpkgs/R-cran-tidyselect/template
+++ b/srcpkgs/R-cran-tidyselect/template
@@ -10,4 +10,5 @@ short_desc="Backend for selecting functions of the tidyverse"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://tidyselect.r-lib.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=e635ed381fb53f7a53c3fa36bb33e134a3273d272367de2a8d909c821be93893
diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index 55923b13fa51..38493505be2a 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -7,4 +7,5 @@ short_desc="Unicode Text Processing"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
 homepage="https://github.com/patperry/r-utf8/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=f6da9cadfc683057d45f54b43312a359cf96ec2731c0dda18a8eae31d1e31e54
diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 2246112ef700..e1bea6a5b10a 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -9,4 +9,5 @@ short_desc="Vector Helpers"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/r-lib/vctrs"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=df7d368c9f2d2ad14872ba2a09821ec4f5a8ad77c81a0b05e1f440e5ffebad25
diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index c0b759859975..4fd4dce33e8c 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -7,6 +7,7 @@ short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
 homepage="https://github.com/sjmgarnier/viridisLite"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=780ea12e7c4024d5ba9029f3a107321c74b8d6d9165262f6e64b79e00aa0c2af
 
 post_install() {
diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 60285166a63f..446d6471c21c 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -7,4 +7,5 @@ short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
 homepage="http://withr.r-lib.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=5f5ed9058d51b676f8b170b32bc0952ace6790e038f2b6d6860c5bb94f67178f
diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index fdf0fa4e1c19..5dd228153cf4 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -7,6 +7,7 @@ short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nteetor/zeallot"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=439f1213c97c8ddef9a1e1499bdf81c2940859f78b76bc86ba476cebd88ba1e9
 
 post_install() {
diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index 8b67dd292f58..b820d2824302 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -7,4 +7,5 @@ short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only, GPL-3.0-only"
 homepage="http://zoo.r-forge.r-project.org/"
+distfiles="https://cran.r-project.org/src/contrib/${pkgname#R-cran-}_${version//r/-}.tar.gz"
 checksum=4e8cc4065047ba12e103b9664f3b607c770673096e9c2b694fad2b2ec3203ce7

From 6f1dfc938be979777e434a2410d66f94d066791c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 11 Sep 2021 11:16:59 +0700
Subject: [PATCH 2/3] build-style: R-cran: move wrksrc declaration to template

---
 common/environment/build-style/R-cran.sh | 1 -
 srcpkgs/R-cran-R6/template               | 1 +
 srcpkgs/R-cran-RColorBrewer/template     | 1 +
 srcpkgs/R-cran-Rcpp/template             | 1 +
 srcpkgs/R-cran-assertthat/template       | 1 +
 srcpkgs/R-cran-backports/template        | 1 +
 srcpkgs/R-cran-callr/template            | 1 +
 srcpkgs/R-cran-cli/template              | 1 +
 srcpkgs/R-cran-colorspace/template       | 1 +
 srcpkgs/R-cran-cpp11/template            | 1 +
 srcpkgs/R-cran-crayon/template           | 1 +
 srcpkgs/R-cran-data.table/template       | 1 +
 srcpkgs/R-cran-desc/template             | 1 +
 srcpkgs/R-cran-dichromat/template        | 1 +
 srcpkgs/R-cran-digest/template           | 1 +
 srcpkgs/R-cran-dplyr/template            | 1 +
 srcpkgs/R-cran-ellipsis/template         | 1 +
 srcpkgs/R-cran-evaluate/template         | 1 +
 srcpkgs/R-cran-fansi/template            | 1 +
 srcpkgs/R-cran-farver/template           | 1 +
 srcpkgs/R-cran-generics/template         | 1 +
 srcpkgs/R-cran-ggplot2/template          | 1 +
 srcpkgs/R-cran-glue/template             | 1 +
 srcpkgs/R-cran-gsubfn/template           | 1 +
 srcpkgs/R-cran-gtable/template           | 1 +
 srcpkgs/R-cran-isoband/template          | 1 +
 srcpkgs/R-cran-labeling/template         | 1 +
 srcpkgs/R-cran-lazyeval/template         | 1 +
 srcpkgs/R-cran-lifecycle/template        | 1 +
 srcpkgs/R-cran-lubridate/template        | 1 +
 srcpkgs/R-cran-magrittr/template         | 1 +
 srcpkgs/R-cran-munsell/template          | 1 +
 srcpkgs/R-cran-nloptr/template           | 1 +
 srcpkgs/R-cran-pillar/template           | 1 +
 srcpkgs/R-cran-pkgbuild/template         | 1 +
 srcpkgs/R-cran-pkgconfig/template        | 1 +
 srcpkgs/R-cran-pkgload/template          | 1 +
 srcpkgs/R-cran-plyr/template             | 1 +
 srcpkgs/R-cran-praise/template           | 1 +
 srcpkgs/R-cran-prettyunits/template      | 1 +
 srcpkgs/R-cran-processx/template         | 1 +
 srcpkgs/R-cran-proto/template            | 1 +
 srcpkgs/R-cran-ps/template               | 1 +
 srcpkgs/R-cran-purrr/template            | 1 +
 srcpkgs/R-cran-reshape2/template         | 1 +
 srcpkgs/R-cran-rlang/template            | 1 +
 srcpkgs/R-cran-rprojroot/template        | 1 +
 srcpkgs/R-cran-rstudioapi/template       | 1 +
 srcpkgs/R-cran-scales/template           | 1 +
 srcpkgs/R-cran-stringi/template          | 1 +
 srcpkgs/R-cran-stringr/template          | 1 +
 srcpkgs/R-cran-svglite/template          | 1 +
 srcpkgs/R-cran-systemfonts/template      | 1 +
 srcpkgs/R-cran-testthat/template         | 1 +
 srcpkgs/R-cran-tibble/template           | 1 +
 srcpkgs/R-cran-tidyselect/template       | 1 +
 srcpkgs/R-cran-utf8/template             | 1 +
 srcpkgs/R-cran-vctrs/template            | 1 +
 srcpkgs/R-cran-viridisLite/template      | 1 +
 srcpkgs/R-cran-withr/template            | 1 +
 srcpkgs/R-cran-zeallot/template          | 1 +
 srcpkgs/R-cran-zoo/template              | 1 +
 62 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/common/environment/build-style/R-cran.sh b/common/environment/build-style/R-cran.sh
index 755d18a040a0..8dc622fc4d12 100644
--- a/common/environment/build-style/R-cran.sh
+++ b/common/environment/build-style/R-cran.sh
@@ -1,3 +1,2 @@
 makedepends+=" R"
 depends+=" R"
-wrksrc="${XBPS_BUILDDIR}/${pkgname#R-cran-}"
diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index ab66344fa4d3..0723967fb932 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-R6
 version=2.5.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 62869af7296b..24c4f9dcd40c 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-RColorBrewer
 version=1.1r2
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index 561799b65ee9..a4d0c1dc9701 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-Rcpp
 version=1.0.5
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index ca78c4f521ed..93c14aa4e019 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-assertthat
 version=0.2.1
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 85a947dbab55..31ae88839a34 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-backports
 version=1.2.1
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index 33a75e2bcbc8..ee8114ce4810 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-callr
 version=3.5.1
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
 depends="R-cran-processx R-cran-R6"
diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index bc302ed64171..5f78a8c6755b 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-cli
 version=2.3.1
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-assertthat R-cran-glue"
 depends="R-cran-assertthat R-cran-glue"
diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index ccaedde64e8f..556c5e2d2978 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-colorspace
 version=1.4r1
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-cpp11/template b/srcpkgs/R-cran-cpp11/template
index 25deb3e4c90c..956f51e0eeaa 100644
--- a/srcpkgs/R-cran-cpp11/template
+++ b/srcpkgs/R-cran-cpp11/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-cpp11
 version=0.2.7
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Header only, C++11 interface to R's C interface"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index 3be897297d80..039f6e2ae8e6 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-crayon
 version=1.4.1
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index 4b6262689261..0d0eb17fab8a 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-data.table
 version=1.14.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="libgomp-devel pkg-config zlib-devel"
 short_desc="Extension of 'data.frame'"
diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index 797d873c2111..3b9386d5aa5a 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-desc
 version=1.2.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
 depends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 4f4f5b5d7a53..408c10c2a622 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-dichromat
 version=2.0r0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 3023b00e06c1..223a74616fe7 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-digest
 version=0.6.27
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Create Compact Hash Digests of R Objects"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template
index 5fcd8a80405f..4ed72e1478ab 100644
--- a/srcpkgs/R-cran-dplyr/template
+++ b/srcpkgs/R-cran-dplyr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-dplyr
 version=1.0.5
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-ellipsis R-cran-generics R-cran-glue R-cran-lifecycle
  R-cran-magrittr R-cran-R6 R-cran-rlang R-cran-tibble R-cran-tidyselect
diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index f6a8788c866c..76f6b988cd77 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-ellipsis
 version=0.3.1
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-rlang"
 depends="R-cran-rlang>=0.3.0"
diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index f3d49530b44d..11891acaa466 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-evaluate
 version=0.14
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Parsing and Evaluation Tools that Provide More Details than the Default"
 maintainer="luhann <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index a1e033b35e1b..859c63b98efb 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-fansi
 version=0.4.2
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 29a3a70da331..2bb52c82b1a8 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-farver
 version=2.0.3
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="High Performance Colour Space Manipulation"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index 23f42edb7834..c4c1763a4992 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-generics
 version=0.1.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index 53d023c8cec7..aa78ac6390ae 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-ggplot2
 version=3.3.5
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
  R-cran-rlang R-cran-scales R-cran-tibble R-cran-withr"
diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index 995f90a8574b..aeb0a3c2d638 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-glue
 version=1.4.2
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index 691740161cda..fbbe7fb27ae6 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-gsubfn
 version=0.7
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-proto"
 depends="R-cran-proto"
diff --git a/srcpkgs/R-cran-gtable/template b/srcpkgs/R-cran-gtable/template
index 362e41a05fa3..a06d3f0acd9f 100644
--- a/srcpkgs/R-cran-gtable/template
+++ b/srcpkgs/R-cran-gtable/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-gtable
 version=0.3.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Arrange 'Grobs' in Tables"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index da0d48489822..fd98039ff5ae 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-isoband
 version=0.2.4
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Generate Isolines and Isobands from Regularly Spaced Elevation Grids"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index c483bff213b1..a35dff533014 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-labeling
 version=0.3
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Axis Labeling"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-lazyeval/template b/srcpkgs/R-cran-lazyeval/template
index 9fec691ed9b0..36264e6f9df2 100644
--- a/srcpkgs/R-cran-lazyeval/template
+++ b/srcpkgs/R-cran-lazyeval/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-lazyeval
 version=0.2.2
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Lazy (Non-Standard) Evaluation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index 1d810068f74c..7032fbd2969d 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-lifecycle
 version=1.0.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-glue R-cran-rlang"
 depends="R-cran-glue R-cran-rlang"
diff --git a/srcpkgs/R-cran-lubridate/template b/srcpkgs/R-cran-lubridate/template
index 86a42bcf7d32..6238c61478db 100644
--- a/srcpkgs/R-cran-lubridate/template
+++ b/srcpkgs/R-cran-lubridate/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-lubridate
 version=1.7.9
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-generics R-cran-Rcpp"
 depends="R-cran-generics R-cran-Rcpp>=0.12.13"
diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index 8b641d5266e5..827d536f1c20 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-magrittr
 version=2.0.1
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Forward-Pipe Operator for R"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-munsell/template b/srcpkgs/R-cran-munsell/template
index b4a676bb62b3..4d1a02c8ed90 100644
--- a/srcpkgs/R-cran-munsell/template
+++ b/srcpkgs/R-cran-munsell/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-munsell
 version=0.5.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-colorspace"
 depends="R-cran-colorspace"
diff --git a/srcpkgs/R-cran-nloptr/template b/srcpkgs/R-cran-nloptr/template
index 5f717fecac6d..af5854d967a6 100644
--- a/srcpkgs/R-cran-nloptr/template
+++ b/srcpkgs/R-cran-nloptr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-nloptr
 version=1.2.2.2
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="pkg-config"
 makedepends="nlopt-devel"
diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index 6efa20c332aa..e4399919f6de 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-pillar
 version=1.5.1
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
  R-cran-rlang R-cran-utf8 R-cran-fansi R-cran-vctrs"
diff --git a/srcpkgs/R-cran-pkgbuild/template b/srcpkgs/R-cran-pkgbuild/template
index 8663d0126950..3b46f6158c4f 100644
--- a/srcpkgs/R-cran-pkgbuild/template
+++ b/srcpkgs/R-cran-pkgbuild/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-pkgbuild
 version=1.1.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-callr R-cran-cli R-cran-crayon R-cran-desc
  R-cran-prettyunits R-cran-R6 R-cran-rprojroot R-cran-withr"
diff --git a/srcpkgs/R-cran-pkgconfig/template b/srcpkgs/R-cran-pkgconfig/template
index 8d976598b8b8..76a67378cf89 100644
--- a/srcpkgs/R-cran-pkgconfig/template
+++ b/srcpkgs/R-cran-pkgconfig/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-pkgconfig
 version=2.0.3
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Private Configuration for 'R' Packages"
 maintainer="q66 <daniel@octaforge.org>"
diff --git a/srcpkgs/R-cran-pkgload/template b/srcpkgs/R-cran-pkgload/template
index 43a430840203..ea955a5225a7 100644
--- a/srcpkgs/R-cran-pkgload/template
+++ b/srcpkgs/R-cran-pkgload/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-pkgload
 version=1.1.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-desc R-cran-pkgbuild
  R-cran-rlang R-cran-rprojroot R-cran-rstudioapi R-cran-withr"
diff --git a/srcpkgs/R-cran-plyr/template b/srcpkgs/R-cran-plyr/template
index 11455a080b36..d885d0bdf7fe 100644
--- a/srcpkgs/R-cran-plyr/template
+++ b/srcpkgs/R-cran-plyr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-plyr
 version=1.8.6
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-Rcpp"
 depends="R-cran-Rcpp>=0.11.0"
diff --git a/srcpkgs/R-cran-praise/template b/srcpkgs/R-cran-praise/template
index 25238f1e2231..f4a22c7e5261 100644
--- a/srcpkgs/R-cran-praise/template
+++ b/srcpkgs/R-cran-praise/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-praise
 version=1.0.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Praise Users"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-prettyunits/template b/srcpkgs/R-cran-prettyunits/template
index 08c9fdb19fc1..58880d2f04d3 100644
--- a/srcpkgs/R-cran-prettyunits/template
+++ b/srcpkgs/R-cran-prettyunits/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-prettyunits
 version=1.1.1
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Pretty, Human Readable Formatting of Quantities"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index f41ce8b0837b..442ef58f5982 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-processx
 version=3.4.4
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
 depends="R-cran-ps R-cran-R6"
diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index 040f49346077..882f94010e28 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-proto
 version=1.0.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index 5cbfd18dd990..4fefcd82f0eb 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-ps
 version=1.4.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-purrr/template b/srcpkgs/R-cran-purrr/template
index 06040dc3bf9c..7fbe894bee73 100644
--- a/srcpkgs/R-cran-purrr/template
+++ b/srcpkgs/R-cran-purrr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-purrr
 version=0.3.4
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-magrittr R-cran-rlang"
 depends="R-cran-magrittr>=1.5 R-cran-rlang>=0.3.1"
diff --git a/srcpkgs/R-cran-reshape2/template b/srcpkgs/R-cran-reshape2/template
index 591d84cabe72..b9c82e32aaaf 100644
--- a/srcpkgs/R-cran-reshape2/template
+++ b/srcpkgs/R-cran-reshape2/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-reshape2
 version=1.4.4
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-plyr R-cran-stringr R-cran-Rcpp"
 depends="R-cran-plyr>=1.8.1 R-cran-stringr R-cran-Rcpp"
diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index 98bd130186b0..4e7c2970a028 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-rlang
 version=0.4.10
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 9510e2b8d1d9..7283fb6beee5 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-rprojroot
 version=2.0.2
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Finding Files in Project Subdirectories"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-rstudioapi/template b/srcpkgs/R-cran-rstudioapi/template
index bc7811a53d7d..1abed4e608b1 100644
--- a/srcpkgs/R-cran-rstudioapi/template
+++ b/srcpkgs/R-cran-rstudioapi/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-rstudioapi
 version=0.13
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Safely Access the RStudio API"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-scales/template b/srcpkgs/R-cran-scales/template
index 9fdb9c0c5ea9..c5a5676ca200 100644
--- a/srcpkgs/R-cran-scales/template
+++ b/srcpkgs/R-cran-scales/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-scales
 version=1.1.1
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-RColorBrewer R-cran-farver
  R-cran-munsell R-cran-labeling R-cran-R6
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 78fc4e47b0fb..5d53f7e90b77 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-stringi
 version=1.7.3
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"
diff --git a/srcpkgs/R-cran-stringr/template b/srcpkgs/R-cran-stringr/template
index 7b2067cc24fd..86201aef2681 100644
--- a/srcpkgs/R-cran-stringr/template
+++ b/srcpkgs/R-cran-stringr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-stringr
 version=1.4.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-stringi R-cran-magrittr R-cran-glue"
 depends="R-cran-stringi>=1.1.7 R-cran-magrittr R-cran-glue>=1.2.0"
diff --git a/srcpkgs/R-cran-svglite/template b/srcpkgs/R-cran-svglite/template
index 6453141ac869..80124826bbf2 100644
--- a/srcpkgs/R-cran-svglite/template
+++ b/srcpkgs/R-cran-svglite/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-svglite
 version=2.0.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-systemfonts R-cran-cpp11 libpng-devel"
 depends="R-cran-systemfonts"
diff --git a/srcpkgs/R-cran-systemfonts/template b/srcpkgs/R-cran-systemfonts/template
index 868255e4f2c9..877ec6e170ff 100644
--- a/srcpkgs/R-cran-systemfonts/template
+++ b/srcpkgs/R-cran-systemfonts/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-systemfonts
 version=1.0.2
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="pkg-config"
 makedepends="fontconfig-devel freetype-devel R-cran-cpp11"
diff --git a/srcpkgs/R-cran-testthat/template b/srcpkgs/R-cran-testthat/template
index a425977f74b0..b871c339fc87 100644
--- a/srcpkgs/R-cran-testthat/template
+++ b/srcpkgs/R-cran-testthat/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-testthat
 version=2.3.2
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-digest R-cran-ellipsis
  R-cran-evaluate R-cran-magrittr R-cran-pkgload R-cran-praise R-cran-R6
diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 6dec573a88a4..2aba7772e970 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-tibble
 version=3.1.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-ellipsis
  R-cran-fansi R-cran-lifecycle R-cran-magrittr
diff --git a/srcpkgs/R-cran-tidyselect/template b/srcpkgs/R-cran-tidyselect/template
index 0274558a2c84..32483cb7662e 100644
--- a/srcpkgs/R-cran-tidyselect/template
+++ b/srcpkgs/R-cran-tidyselect/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-tidyselect
 version=1.1.0
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-ellipsis R-cran-glue R-cran-purrr R-cran-rlang R-cran-vctrs"
 depends="R-cran-ellipsis R-cran-glue>=1.3.0 R-cran-purrr>=0.3.2
diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index 38493505be2a..a4f4284f88ce 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-utf8
 version=1.1.4
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Unicode Text Processing"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index e1bea6a5b10a..91afe333f368 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-vctrs
 version=0.3.6
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
 depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index 4fd4dce33e8c..a16b3acff2dd 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-viridisLite
 version=0.3.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 446d6471c21c..131fcb86a9d5 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-withr
 version=2.4.1
 revision=1
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index 5dd228153cf4..53df576c0c53 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-zeallot
 version=0.1.0
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index b820d2824302..e4811b948b60 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -2,6 +2,7 @@
 pkgname=R-cran-zoo
 version=1.8r8
 revision=2
+wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"

From 3de6d87b3223b0284d11b0afc1a31594314560b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 11 Sep 2021 11:32:03 +0700
Subject: [PATCH 3/3] build-style: remove environment setting for R-cran

---
 common/environment/build-style/R-cran.sh | 2 --
 srcpkgs/R-cran-R6/template               | 3 +++
 srcpkgs/R-cran-RColorBrewer/template     | 3 +++
 srcpkgs/R-cran-Rcpp/template             | 3 +++
 srcpkgs/R-cran-assertthat/template       | 3 +++
 srcpkgs/R-cran-backports/template        | 3 +++
 srcpkgs/R-cran-callr/template            | 1 +
 srcpkgs/R-cran-cli/template              | 1 +
 srcpkgs/R-cran-colorspace/template       | 3 +++
 srcpkgs/R-cran-cpp11/template            | 3 +++
 srcpkgs/R-cran-crayon/template           | 3 +++
 srcpkgs/R-cran-data.table/template       | 4 +++-
 srcpkgs/R-cran-desc/template             | 1 +
 srcpkgs/R-cran-dichromat/template        | 3 +++
 srcpkgs/R-cran-digest/template           | 3 +++
 srcpkgs/R-cran-dplyr/template            | 1 +
 srcpkgs/R-cran-ellipsis/template         | 1 +
 srcpkgs/R-cran-evaluate/template         | 3 +++
 srcpkgs/R-cran-fansi/template            | 3 +++
 srcpkgs/R-cran-farver/template           | 3 +++
 srcpkgs/R-cran-generics/template         | 3 +++
 srcpkgs/R-cran-ggplot2/template          | 1 +
 srcpkgs/R-cran-glue/template             | 3 +++
 srcpkgs/R-cran-gsubfn/template           | 1 +
 srcpkgs/R-cran-gtable/template           | 3 +++
 srcpkgs/R-cran-isoband/template          | 3 +++
 srcpkgs/R-cran-labeling/template         | 3 +++
 srcpkgs/R-cran-lazyeval/template         | 3 +++
 srcpkgs/R-cran-lifecycle/template        | 1 +
 srcpkgs/R-cran-lubridate/template        | 1 +
 srcpkgs/R-cran-magrittr/template         | 3 +++
 srcpkgs/R-cran-munsell/template          | 1 +
 srcpkgs/R-cran-nloptr/template           | 5 +++--
 srcpkgs/R-cran-pillar/template           | 1 +
 srcpkgs/R-cran-pkgbuild/template         | 1 +
 srcpkgs/R-cran-pkgconfig/template        | 3 +++
 srcpkgs/R-cran-pkgload/template          | 1 +
 srcpkgs/R-cran-plyr/template             | 1 +
 srcpkgs/R-cran-praise/template           | 3 +++
 srcpkgs/R-cran-prettyunits/template      | 3 +++
 srcpkgs/R-cran-processx/template         | 1 +
 srcpkgs/R-cran-proto/template            | 3 +++
 srcpkgs/R-cran-ps/template               | 3 +++
 srcpkgs/R-cran-purrr/template            | 1 +
 srcpkgs/R-cran-reshape2/template         | 1 +
 srcpkgs/R-cran-rlang/template            | 3 +++
 srcpkgs/R-cran-rprojroot/template        | 3 +++
 srcpkgs/R-cran-rstudioapi/template       | 3 +++
 srcpkgs/R-cran-scales/template           | 1 +
 srcpkgs/R-cran-stringi/template          | 4 +++-
 srcpkgs/R-cran-stringr/template          | 1 +
 srcpkgs/R-cran-svglite/template          | 1 +
 srcpkgs/R-cran-systemfonts/template      | 3 ++-
 srcpkgs/R-cran-testthat/template         | 1 +
 srcpkgs/R-cran-tibble/template           | 1 +
 srcpkgs/R-cran-tidyselect/template       | 1 +
 srcpkgs/R-cran-utf8/template             | 3 +++
 srcpkgs/R-cran-vctrs/template            | 1 +
 srcpkgs/R-cran-viridisLite/template      | 3 +++
 srcpkgs/R-cran-withr/template            | 3 +++
 srcpkgs/R-cran-zeallot/template          | 3 +++
 srcpkgs/R-cran-zoo/template              | 3 +++
 62 files changed, 134 insertions(+), 7 deletions(-)
 delete mode 100644 common/environment/build-style/R-cran.sh

diff --git a/common/environment/build-style/R-cran.sh b/common/environment/build-style/R-cran.sh
deleted file mode 100644
index 8dc622fc4d12..000000000000
--- a/common/environment/build-style/R-cran.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-makedepends+=" R"
-depends+=" R"
diff --git a/srcpkgs/R-cran-R6/template b/srcpkgs/R-cran-R6/template
index 0723967fb932..8df63eb87646 100644
--- a/srcpkgs/R-cran-R6/template
+++ b/srcpkgs/R-cran-R6/template
@@ -4,6 +4,9 @@ version=2.5.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Classes with Reference Semantics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
diff --git a/srcpkgs/R-cran-RColorBrewer/template b/srcpkgs/R-cran-RColorBrewer/template
index 24c4f9dcd40c..3260411f5e82 100644
--- a/srcpkgs/R-cran-RColorBrewer/template
+++ b/srcpkgs/R-cran-RColorBrewer/template
@@ -4,6 +4,9 @@ version=1.1r2
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="ColorBrewer Palettes"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
diff --git a/srcpkgs/R-cran-Rcpp/template b/srcpkgs/R-cran-Rcpp/template
index a4d0c1dc9701..981899d3fcd2 100644
--- a/srcpkgs/R-cran-Rcpp/template
+++ b/srcpkgs/R-cran-Rcpp/template
@@ -4,6 +4,9 @@ version=1.0.5
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Seamless R and C++ Integration"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/R-cran-assertthat/template b/srcpkgs/R-cran-assertthat/template
index 93c14aa4e019..b2c401f1a010 100644
--- a/srcpkgs/R-cran-assertthat/template
+++ b/srcpkgs/R-cran-assertthat/template
@@ -4,6 +4,9 @@ version=0.2.1
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Easy Pre and Post Assertions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/R-cran-backports/template b/srcpkgs/R-cran-backports/template
index 31ae88839a34..62a7581a8f65 100644
--- a/srcpkgs/R-cran-backports/template
+++ b/srcpkgs/R-cran-backports/template
@@ -4,6 +4,9 @@ version=1.2.1
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Reimplementations of Functions Introduced Since R-3.0.0"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, GPL-3.0-only"
diff --git a/srcpkgs/R-cran-callr/template b/srcpkgs/R-cran-callr/template
index ee8114ce4810..8daca391e426 100644
--- a/srcpkgs/R-cran-callr/template
+++ b/srcpkgs/R-cran-callr/template
@@ -5,6 +5,7 @@ revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-processx R-cran-R6"
+makedepends="R"
 depends="R-cran-processx R-cran-R6"
 short_desc="Call R from R"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-cli/template b/srcpkgs/R-cran-cli/template
index 5f78a8c6755b..81120c8d29bb 100644
--- a/srcpkgs/R-cran-cli/template
+++ b/srcpkgs/R-cran-cli/template
@@ -4,6 +4,7 @@ version=2.3.1
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-assertthat R-cran-glue"
 depends="R-cran-assertthat R-cran-glue"
 short_desc="Helpers for Developing Command Line Interfaces"
diff --git a/srcpkgs/R-cran-colorspace/template b/srcpkgs/R-cran-colorspace/template
index 556c5e2d2978..3367513eebd5 100644
--- a/srcpkgs/R-cran-colorspace/template
+++ b/srcpkgs/R-cran-colorspace/template
@@ -4,6 +4,9 @@ version=1.4r1
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Color Space Manipulation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
diff --git a/srcpkgs/R-cran-cpp11/template b/srcpkgs/R-cran-cpp11/template
index 956f51e0eeaa..146053a4fcea 100644
--- a/srcpkgs/R-cran-cpp11/template
+++ b/srcpkgs/R-cran-cpp11/template
@@ -4,6 +4,9 @@ version=0.2.7
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Header only, C++11 interface to R's C interface"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-crayon/template b/srcpkgs/R-cran-crayon/template
index 039f6e2ae8e6..8258e68f65db 100644
--- a/srcpkgs/R-cran-crayon/template
+++ b/srcpkgs/R-cran-crayon/template
@@ -4,6 +4,9 @@ version=1.4.1
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Colored Terminal Output"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
diff --git a/srcpkgs/R-cran-data.table/template b/srcpkgs/R-cran-data.table/template
index 0d0eb17fab8a..fa8ade9c70ba 100644
--- a/srcpkgs/R-cran-data.table/template
+++ b/srcpkgs/R-cran-data.table/template
@@ -4,7 +4,9 @@ version=1.14.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
-makedepends="libgomp-devel pkg-config zlib-devel"
+hostmakedepends="R"
+makedepends="R libgomp-devel pkg-config zlib-devel"
+depends="R"
 short_desc="Extension of 'data.frame'"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MPL-2.0"
diff --git a/srcpkgs/R-cran-desc/template b/srcpkgs/R-cran-desc/template
index 3b9386d5aa5a..37085bea8724 100644
--- a/srcpkgs/R-cran-desc/template
+++ b/srcpkgs/R-cran-desc/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
+makedepends="R"
 depends="R-cran-assertthat R-cran-crayon R-cran-R6 R-cran-rprojroot"
 short_desc="Manipulate DESCRIPTION Files"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-dichromat/template b/srcpkgs/R-cran-dichromat/template
index 408c10c2a622..fdb5ab8aadd3 100644
--- a/srcpkgs/R-cran-dichromat/template
+++ b/srcpkgs/R-cran-dichromat/template
@@ -4,6 +4,9 @@ version=2.0r0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Color Schemes for Dichromats"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
diff --git a/srcpkgs/R-cran-digest/template b/srcpkgs/R-cran-digest/template
index 223a74616fe7..d976522e8bbd 100644
--- a/srcpkgs/R-cran-digest/template
+++ b/srcpkgs/R-cran-digest/template
@@ -4,6 +4,9 @@ version=0.6.27
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Create Compact Hash Digests of R Objects"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/R-cran-dplyr/template b/srcpkgs/R-cran-dplyr/template
index 4ed72e1478ab..b0ff6fb3ac9c 100644
--- a/srcpkgs/R-cran-dplyr/template
+++ b/srcpkgs/R-cran-dplyr/template
@@ -4,6 +4,7 @@ version=1.0.5
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-ellipsis R-cran-generics R-cran-glue R-cran-lifecycle
  R-cran-magrittr R-cran-R6 R-cran-rlang R-cran-tibble R-cran-tidyselect
  R-cran-vctrs"
diff --git a/srcpkgs/R-cran-ellipsis/template b/srcpkgs/R-cran-ellipsis/template
index 76f6b988cd77..f4a77aa4b2e9 100644
--- a/srcpkgs/R-cran-ellipsis/template
+++ b/srcpkgs/R-cran-ellipsis/template
@@ -4,6 +4,7 @@ version=0.3.1
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-rlang"
 depends="R-cran-rlang>=0.3.0"
 short_desc="Tools for making ... safer"
diff --git a/srcpkgs/R-cran-evaluate/template b/srcpkgs/R-cran-evaluate/template
index 11891acaa466..475323d377b6 100644
--- a/srcpkgs/R-cran-evaluate/template
+++ b/srcpkgs/R-cran-evaluate/template
@@ -4,6 +4,9 @@ version=0.14
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Parsing and Evaluation Tools that Provide More Details than the Default"
 maintainer="luhann <lukehannan@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-fansi/template b/srcpkgs/R-cran-fansi/template
index 859c63b98efb..28ac903a3327 100644
--- a/srcpkgs/R-cran-fansi/template
+++ b/srcpkgs/R-cran-fansi/template
@@ -4,6 +4,9 @@ version=0.4.2
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="ANSI Control Sequence Aware String Functions"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/R-cran-farver/template b/srcpkgs/R-cran-farver/template
index 2bb52c82b1a8..ffa65df93e20 100644
--- a/srcpkgs/R-cran-farver/template
+++ b/srcpkgs/R-cran-farver/template
@@ -4,6 +4,9 @@ version=2.0.3
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="High Performance Colour Space Manipulation"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
diff --git a/srcpkgs/R-cran-generics/template b/srcpkgs/R-cran-generics/template
index c4c1763a4992..5a7ff8561ab7 100644
--- a/srcpkgs/R-cran-generics/template
+++ b/srcpkgs/R-cran-generics/template
@@ -4,6 +4,9 @@ version=0.1.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Common generic S3 methods "
 maintainer="luhann <lukehannan@gmail.com>"
 license="GPL-2.0-only"
diff --git a/srcpkgs/R-cran-ggplot2/template b/srcpkgs/R-cran-ggplot2/template
index aa78ac6390ae..ef61878040e6 100644
--- a/srcpkgs/R-cran-ggplot2/template
+++ b/srcpkgs/R-cran-ggplot2/template
@@ -4,6 +4,7 @@ version=3.3.5
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
  R-cran-rlang R-cran-scales R-cran-tibble R-cran-withr"
 depends="R-cran-digest R-cran-glue R-cran-gtable R-cran-isoband
diff --git a/srcpkgs/R-cran-glue/template b/srcpkgs/R-cran-glue/template
index aeb0a3c2d638..5e5da43a3964 100644
--- a/srcpkgs/R-cran-glue/template
+++ b/srcpkgs/R-cran-glue/template
@@ -4,6 +4,9 @@ version=1.4.2
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Interpreted String Literals"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
diff --git a/srcpkgs/R-cran-gsubfn/template b/srcpkgs/R-cran-gsubfn/template
index fbbe7fb27ae6..a14695cff50b 100644
--- a/srcpkgs/R-cran-gsubfn/template
+++ b/srcpkgs/R-cran-gsubfn/template
@@ -4,6 +4,7 @@ version=0.7
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-proto"
 depends="R-cran-proto"
 short_desc="Utilities for strings and function arguments"
diff --git a/srcpkgs/R-cran-gtable/template b/srcpkgs/R-cran-gtable/template
index a06d3f0acd9f..5dbb7c8a958b 100644
--- a/srcpkgs/R-cran-gtable/template
+++ b/srcpkgs/R-cran-gtable/template
@@ -4,6 +4,9 @@ version=0.3.0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Arrange 'Grobs' in Tables"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
diff --git a/srcpkgs/R-cran-isoband/template b/srcpkgs/R-cran-isoband/template
index fd98039ff5ae..388cc3eb791e 100644
--- a/srcpkgs/R-cran-isoband/template
+++ b/srcpkgs/R-cran-isoband/template
@@ -4,6 +4,9 @@ version=0.2.4
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Generate Isolines and Isobands from Regularly Spaced Elevation Grids"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-labeling/template b/srcpkgs/R-cran-labeling/template
index a35dff533014..e80e03849b10 100644
--- a/srcpkgs/R-cran-labeling/template
+++ b/srcpkgs/R-cran-labeling/template
@@ -4,6 +4,9 @@ version=0.3
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Axis Labeling"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
diff --git a/srcpkgs/R-cran-lazyeval/template b/srcpkgs/R-cran-lazyeval/template
index 36264e6f9df2..92350d1e5140 100644
--- a/srcpkgs/R-cran-lazyeval/template
+++ b/srcpkgs/R-cran-lazyeval/template
@@ -4,6 +4,9 @@ version=0.2.2
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Lazy (Non-Standard) Evaluation"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/R-cran-lifecycle/template b/srcpkgs/R-cran-lifecycle/template
index 7032fbd2969d..592876cf63b5 100644
--- a/srcpkgs/R-cran-lifecycle/template
+++ b/srcpkgs/R-cran-lifecycle/template
@@ -4,6 +4,7 @@ version=1.0.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-glue R-cran-rlang"
 depends="R-cran-glue R-cran-rlang"
 short_desc="Manage the Life Cycle of your Package Functions"
diff --git a/srcpkgs/R-cran-lubridate/template b/srcpkgs/R-cran-lubridate/template
index 6238c61478db..c096b1e6661b 100644
--- a/srcpkgs/R-cran-lubridate/template
+++ b/srcpkgs/R-cran-lubridate/template
@@ -4,6 +4,7 @@ version=1.7.9
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-generics R-cran-Rcpp"
 depends="R-cran-generics R-cran-Rcpp>=0.12.13"
 short_desc="Make Dealing with Dates a Little Easier"
diff --git a/srcpkgs/R-cran-magrittr/template b/srcpkgs/R-cran-magrittr/template
index 827d536f1c20..5ac526867d1b 100644
--- a/srcpkgs/R-cran-magrittr/template
+++ b/srcpkgs/R-cran-magrittr/template
@@ -4,6 +4,9 @@ version=2.0.1
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Forward-Pipe Operator for R"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
diff --git a/srcpkgs/R-cran-munsell/template b/srcpkgs/R-cran-munsell/template
index 4d1a02c8ed90..29998eb231a3 100644
--- a/srcpkgs/R-cran-munsell/template
+++ b/srcpkgs/R-cran-munsell/template
@@ -4,6 +4,7 @@ version=0.5.0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-colorspace"
 depends="R-cran-colorspace"
 short_desc="Utilities for Using Munsell Colours"
diff --git a/srcpkgs/R-cran-nloptr/template b/srcpkgs/R-cran-nloptr/template
index af5854d967a6..0c642c110149 100644
--- a/srcpkgs/R-cran-nloptr/template
+++ b/srcpkgs/R-cran-nloptr/template
@@ -4,8 +4,9 @@ version=1.2.2.2
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
-hostmakedepends="pkg-config"
-makedepends="nlopt-devel"
+hostmakedepends="R pkg-config"
+makedepends="R nlopt-devel"
+depends="R"
 short_desc="R interface to NLopt"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
diff --git a/srcpkgs/R-cran-pillar/template b/srcpkgs/R-cran-pillar/template
index e4399919f6de..a82bc42a7e62 100644
--- a/srcpkgs/R-cran-pillar/template
+++ b/srcpkgs/R-cran-pillar/template
@@ -4,6 +4,7 @@ version=1.5.1
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
  R-cran-rlang R-cran-utf8 R-cran-fansi R-cran-vctrs"
 depends="R-cran-cli R-cran-crayon R-cran-ellipsis R-cran-lifecycle
diff --git a/srcpkgs/R-cran-pkgbuild/template b/srcpkgs/R-cran-pkgbuild/template
index 3b46f6158c4f..c3025f669602 100644
--- a/srcpkgs/R-cran-pkgbuild/template
+++ b/srcpkgs/R-cran-pkgbuild/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-callr R-cran-cli R-cran-crayon R-cran-desc
+makedepends="R"
  R-cran-prettyunits R-cran-R6 R-cran-rprojroot R-cran-withr"
 depends="R-cran-callr R-cran-cli R-cran-crayon R-cran-desc
  R-cran-prettyunits R-cran-R6 R-cran-rprojroot R-cran-withr"
diff --git a/srcpkgs/R-cran-pkgconfig/template b/srcpkgs/R-cran-pkgconfig/template
index 76a67378cf89..95a1f2dbe1b7 100644
--- a/srcpkgs/R-cran-pkgconfig/template
+++ b/srcpkgs/R-cran-pkgconfig/template
@@ -4,6 +4,9 @@ version=2.0.3
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Private Configuration for 'R' Packages"
 maintainer="q66 <daniel@octaforge.org>"
 license="MIT"
diff --git a/srcpkgs/R-cran-pkgload/template b/srcpkgs/R-cran-pkgload/template
index ea955a5225a7..1fde099f94da 100644
--- a/srcpkgs/R-cran-pkgload/template
+++ b/srcpkgs/R-cran-pkgload/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-desc R-cran-pkgbuild
+makedepends="R"
  R-cran-rlang R-cran-rprojroot R-cran-rstudioapi R-cran-withr"
 depends="R-cran-cli R-cran-crayon R-cran-desc R-cran-pkgbuild
  R-cran-rlang R-cran-rprojroot R-cran-rstudioapi R-cran-withr"
diff --git a/srcpkgs/R-cran-plyr/template b/srcpkgs/R-cran-plyr/template
index d885d0bdf7fe..b4024d5626c4 100644
--- a/srcpkgs/R-cran-plyr/template
+++ b/srcpkgs/R-cran-plyr/template
@@ -4,6 +4,7 @@ version=1.8.6
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-Rcpp"
 depends="R-cran-Rcpp>=0.11.0"
 short_desc="Tools for Splitting, Applying and Combining Data"
diff --git a/srcpkgs/R-cran-praise/template b/srcpkgs/R-cran-praise/template
index f4a22c7e5261..41ea8c9f6e9d 100644
--- a/srcpkgs/R-cran-praise/template
+++ b/srcpkgs/R-cran-praise/template
@@ -4,6 +4,9 @@ version=1.0.0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Praise Users"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-prettyunits/template b/srcpkgs/R-cran-prettyunits/template
index 58880d2f04d3..f048506fbf30 100644
--- a/srcpkgs/R-cran-prettyunits/template
+++ b/srcpkgs/R-cran-prettyunits/template
@@ -4,6 +4,9 @@ version=1.1.1
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Pretty, Human Readable Formatting of Quantities"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-processx/template b/srcpkgs/R-cran-processx/template
index 442ef58f5982..dcc680200159 100644
--- a/srcpkgs/R-cran-processx/template
+++ b/srcpkgs/R-cran-processx/template
@@ -5,6 +5,7 @@ revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-ps R-cran-R6"
+makedepends="R"
 depends="R-cran-ps R-cran-R6"
 short_desc="Execute and Control System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
diff --git a/srcpkgs/R-cran-proto/template b/srcpkgs/R-cran-proto/template
index 882f94010e28..4d8ff38748c4 100644
--- a/srcpkgs/R-cran-proto/template
+++ b/srcpkgs/R-cran-proto/template
@@ -4,6 +4,9 @@ version=1.0.0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Prototype Object-Based Programming"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only"
diff --git a/srcpkgs/R-cran-ps/template b/srcpkgs/R-cran-ps/template
index 4fefcd82f0eb..36677da676a5 100644
--- a/srcpkgs/R-cran-ps/template
+++ b/srcpkgs/R-cran-ps/template
@@ -4,6 +4,9 @@ version=1.4.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="List, Query, Manipulate System Processes"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-purrr/template b/srcpkgs/R-cran-purrr/template
index 7fbe894bee73..0664e5606571 100644
--- a/srcpkgs/R-cran-purrr/template
+++ b/srcpkgs/R-cran-purrr/template
@@ -4,6 +4,7 @@ version=0.3.4
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-magrittr R-cran-rlang"
 depends="R-cran-magrittr>=1.5 R-cran-rlang>=0.3.1"
 short_desc="Backend for selecting functions of the tidyverse"
diff --git a/srcpkgs/R-cran-reshape2/template b/srcpkgs/R-cran-reshape2/template
index b9c82e32aaaf..bc08e121c30e 100644
--- a/srcpkgs/R-cran-reshape2/template
+++ b/srcpkgs/R-cran-reshape2/template
@@ -4,6 +4,7 @@ version=1.4.4
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-plyr R-cran-stringr R-cran-Rcpp"
 depends="R-cran-plyr>=1.8.1 R-cran-stringr R-cran-Rcpp"
 short_desc="Flexibly Reshape Data: A Reboot of the Reshape Package"
diff --git a/srcpkgs/R-cran-rlang/template b/srcpkgs/R-cran-rlang/template
index 4e7c2970a028..90b0a6a2fa82 100644
--- a/srcpkgs/R-cran-rlang/template
+++ b/srcpkgs/R-cran-rlang/template
@@ -4,6 +4,9 @@ version=0.4.10
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Functions for Base Types and Core R and 'Tidyverse' Features"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/R-cran-rprojroot/template b/srcpkgs/R-cran-rprojroot/template
index 7283fb6beee5..0c3b078870be 100644
--- a/srcpkgs/R-cran-rprojroot/template
+++ b/srcpkgs/R-cran-rprojroot/template
@@ -4,6 +4,9 @@ version=2.0.2
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Finding Files in Project Subdirectories"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="GPL-3.0-only"
diff --git a/srcpkgs/R-cran-rstudioapi/template b/srcpkgs/R-cran-rstudioapi/template
index 1abed4e608b1..480cad5e69c6 100644
--- a/srcpkgs/R-cran-rstudioapi/template
+++ b/srcpkgs/R-cran-rstudioapi/template
@@ -4,6 +4,9 @@ version=0.13
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Safely Access the RStudio API"
 maintainer="Luke Hannan <lukehannan@gmail.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-scales/template b/srcpkgs/R-cran-scales/template
index c5a5676ca200..e18265ad806d 100644
--- a/srcpkgs/R-cran-scales/template
+++ b/srcpkgs/R-cran-scales/template
@@ -4,6 +4,7 @@ version=1.1.1
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-RColorBrewer R-cran-farver
  R-cran-munsell R-cran-labeling R-cran-R6
  R-cran-viridisLite R-cran-lifecycle"
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index 5d53f7e90b77..9856fc0fe265 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -4,7 +4,9 @@ version=1.7.3
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
-makedepends="pkg-config icu-devel"
+hostmakedepends="R"
+makedepends="R pkg-config icu-devel"
+depends="R"
 short_desc="Character String Processing Facilities"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="BSD-3-Clause"
diff --git a/srcpkgs/R-cran-stringr/template b/srcpkgs/R-cran-stringr/template
index 86201aef2681..afe2f2e68309 100644
--- a/srcpkgs/R-cran-stringr/template
+++ b/srcpkgs/R-cran-stringr/template
@@ -4,6 +4,7 @@ version=1.4.0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-stringi R-cran-magrittr R-cran-glue"
 depends="R-cran-stringi>=1.1.7 R-cran-magrittr R-cran-glue>=1.2.0"
 short_desc="Simple, Consistent Wrappers for Common String Operations"
diff --git a/srcpkgs/R-cran-svglite/template b/srcpkgs/R-cran-svglite/template
index 80124826bbf2..487dc71e3056 100644
--- a/srcpkgs/R-cran-svglite/template
+++ b/srcpkgs/R-cran-svglite/template
@@ -4,6 +4,7 @@ version=2.0.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-systemfonts R-cran-cpp11 libpng-devel"
 depends="R-cran-systemfonts"
 short_desc="Lightweight svg graphics device for R"
diff --git a/srcpkgs/R-cran-systemfonts/template b/srcpkgs/R-cran-systemfonts/template
index 877ec6e170ff..94bff2f78c4f 100644
--- a/srcpkgs/R-cran-systemfonts/template
+++ b/srcpkgs/R-cran-systemfonts/template
@@ -4,8 +4,9 @@ version=1.0.2
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
-hostmakedepends="pkg-config"
+hostmakedepends="R pkg-config"
 makedepends="fontconfig-devel freetype-devel R-cran-cpp11"
+depends="R"
 short_desc="System Native Font Handling in R"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="MIT"
diff --git a/srcpkgs/R-cran-testthat/template b/srcpkgs/R-cran-testthat/template
index b871c339fc87..4b99f61477ad 100644
--- a/srcpkgs/R-cran-testthat/template
+++ b/srcpkgs/R-cran-testthat/template
@@ -5,6 +5,7 @@ revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
 hostmakedepends="R-cran-cli R-cran-crayon R-cran-digest R-cran-ellipsis
+makedepends="R"
  R-cran-evaluate R-cran-magrittr R-cran-pkgload R-cran-praise R-cran-R6
  R-cran-rlang R-cran-withr"
 depends="R-cran-cli R-cran-crayon R-cran-digest R-cran-ellipsis
diff --git a/srcpkgs/R-cran-tibble/template b/srcpkgs/R-cran-tibble/template
index 2aba7772e970..95c945471d68 100644
--- a/srcpkgs/R-cran-tibble/template
+++ b/srcpkgs/R-cran-tibble/template
@@ -4,6 +4,7 @@ version=3.1.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-ellipsis
  R-cran-fansi R-cran-lifecycle R-cran-magrittr
  R-cran-pillar R-cran-rlang R-cran-pkgconfig R-cran-vctrs"
diff --git a/srcpkgs/R-cran-tidyselect/template b/srcpkgs/R-cran-tidyselect/template
index 32483cb7662e..5bbbcbe8d98a 100644
--- a/srcpkgs/R-cran-tidyselect/template
+++ b/srcpkgs/R-cran-tidyselect/template
@@ -4,6 +4,7 @@ version=1.1.0
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-ellipsis R-cran-glue R-cran-purrr R-cran-rlang R-cran-vctrs"
 depends="R-cran-ellipsis R-cran-glue>=1.3.0 R-cran-purrr>=0.3.2
  R-cran-rlang>=0.4.6 R-cran-vctrs>=0.2.2"
diff --git a/srcpkgs/R-cran-utf8/template b/srcpkgs/R-cran-utf8/template
index a4f4284f88ce..033a6cd5a285 100644
--- a/srcpkgs/R-cran-utf8/template
+++ b/srcpkgs/R-cran-utf8/template
@@ -4,6 +4,9 @@ version=1.1.4
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Unicode Text Processing"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="Apache-2.0"
diff --git a/srcpkgs/R-cran-vctrs/template b/srcpkgs/R-cran-vctrs/template
index 91afe333f368..62f1d28bf31a 100644
--- a/srcpkgs/R-cran-vctrs/template
+++ b/srcpkgs/R-cran-vctrs/template
@@ -4,6 +4,7 @@ version=0.3.6
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
 makedepends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
 depends="R-cran-backports R-cran-ellipsis R-cran-digest R-cran-glue R-cran-rlang R-cran-zeallot"
 short_desc="Vector Helpers"
diff --git a/srcpkgs/R-cran-viridisLite/template b/srcpkgs/R-cran-viridisLite/template
index a16b3acff2dd..9740c6a58e77 100644
--- a/srcpkgs/R-cran-viridisLite/template
+++ b/srcpkgs/R-cran-viridisLite/template
@@ -4,6 +4,9 @@ version=0.3.0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Default Color Maps from 'matplotlib' (Lite Version)"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="MIT"
diff --git a/srcpkgs/R-cran-withr/template b/srcpkgs/R-cran-withr/template
index 131fcb86a9d5..bac6e853bb1c 100644
--- a/srcpkgs/R-cran-withr/template
+++ b/srcpkgs/R-cran-withr/template
@@ -4,6 +4,9 @@ version=2.4.1
 revision=1
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Run Code 'With' Temporarily Modified Global State"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/R-cran-zeallot/template b/srcpkgs/R-cran-zeallot/template
index 53df576c0c53..e96636aea8e6 100644
--- a/srcpkgs/R-cran-zeallot/template
+++ b/srcpkgs/R-cran-zeallot/template
@@ -4,6 +4,9 @@ version=0.1.0
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="Multiple, Unpacking, and Destructuring Assignment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
diff --git a/srcpkgs/R-cran-zoo/template b/srcpkgs/R-cran-zoo/template
index e4811b948b60..55b2f98e5aef 100644
--- a/srcpkgs/R-cran-zoo/template
+++ b/srcpkgs/R-cran-zoo/template
@@ -4,6 +4,9 @@ version=1.8r8
 revision=2
 wrksrc="${pkgname#R-cran-}"
 build_style=R-cran
+hostmakedepends="R"
+makedepends="R"
+depends="R"
 short_desc="S3 Infrastructure for Regular and Irregular Time Series"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-only, GPL-3.0-only"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: build-style: R-cran: refactor
  2021-09-11  5:16 [PR PATCH] build-style: R-cran: refactor sgn
@ 2021-09-11 20:29 ` Chocimier
  2021-09-12  5:39 ` sgn
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2021-09-11 20:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/32910#issuecomment-917475523

Comment:
Distfiles are better to define in template, sure.
But what's wrong with makedepends?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: build-style: R-cran: refactor
  2021-09-11  5:16 [PR PATCH] build-style: R-cran: refactor sgn
  2021-09-11 20:29 ` Chocimier
@ 2021-09-12  5:39 ` sgn
  2021-09-13 15:49 ` Chocimier
  2021-09-18 13:28 ` sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-09-12  5:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 465 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/32910#issuecomment-917561369

Comment:
On 2021-09-11 13:29:22-0700, Piotr ***@***.***> wrote:
> Distfiles are better to define in template, sure.
> But what's wrong with makedepends?

Nothing wrong per se.

However, I would like to drop the whole
common/environment/build-style, so build order can be sorted without
sourcing common/environment/build-style.

-- 
Danh


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: build-style: R-cran: refactor
  2021-09-11  5:16 [PR PATCH] build-style: R-cran: refactor sgn
  2021-09-11 20:29 ` Chocimier
  2021-09-12  5:39 ` sgn
@ 2021-09-13 15:49 ` Chocimier
  2021-09-18 13:28 ` sgn
  3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2021-09-13 15:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/32910#issuecomment-918329002

Comment:
Inlining environment makes maintaining templates harder, while isn't enough to make templates sourcable. Harder part is parsing files like `common/build-helper/gir.sh` or conditional build options. How would you approach that?

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: build-style: R-cran: refactor
  2021-09-11  5:16 [PR PATCH] build-style: R-cran: refactor sgn
                   ` (2 preceding siblings ...)
  2021-09-13 15:49 ` Chocimier
@ 2021-09-18 13:28 ` sgn
  3 siblings, 0 replies; 5+ messages in thread
From: sgn @ 2021-09-18 13:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/32910#issuecomment-922276683

Comment:
> Inlining environment makes maintaining templates harder, while isn't enough to make templates sourcable. Harder part is parsing files like `common/build-helper/gir.sh` or conditional build options. How would you approach that?

Hm, I don't know, let's just keep *depends manipulation there.


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-09-18 13:28 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-11  5:16 [PR PATCH] build-style: R-cran: refactor sgn
2021-09-11 20:29 ` Chocimier
2021-09-12  5:39 ` sgn
2021-09-13 15:49 ` Chocimier
2021-09-18 13:28 ` sgn

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ https://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git