[lilac] updated to 3.7.3-5

2 files changed, 30 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a9508513f1c1..df6aea5d2a7c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-callr
 	pkgdesc = Call R from R
 	pkgver = 3.7.3
-	pkgrel = 1
+	pkgrel = 5
 	url = https://cran.r-project.org/package=callr
 	arch = any
 	license = MIT
@@ -17,8 +17,7 @@ pkgbase = r-callr
 	optdepends = r-testthat
 	optdepends = r-withr
 	source = https://cran.r-project.org/src/contrib/callr_3.7.3.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = 12151339c31433137a1534c2f5656206
 	sha256sums = 567bfedf073a1d4c5785f0553341608a214938110567b9a6495ff20ebb2fd04e
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-callr
diff --git a/PKGBUILD b/PKGBUILD
index cfc37254cc8c..a2121c46de7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,46 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Robert Greener <me@r0bert.dev>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Alex Branham <branham@utexas.edu>
 
-_cranname=callr
-_cranver=3.7.3
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=callr
+_pkgver=3.7.3
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=5
 pkgdesc="Call R from R"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
-depends=(r-processx r-r6)
+depends=(
+  r-processx
+  r-r6
+)
 optdepends=(
-    r-asciicast
-    r-cli
-    r-covr
-    r-mockery
-    r-ps
-    r-rprojroot
-    r-spelling
-    r-testthat
-    r-withr
+  r-asciicast
+  r-cli
+  r-covr
+  r-mockery
+  r-ps
+  r-rprojroot
+  r-spelling
+  r-testthat
+  r-withr
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('567bfedf073a1d4c5785f0553341608a214938110567b9a6495ff20ebb2fd04e'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('12151339c31433137a1534c2f5656206')
+sha256sums=('567bfedf073a1d4c5785f0553341608a214938110567b9a6495ff20ebb2fd04e')
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 }