[lilac] updated to 5.0.0-4

2 files changed, 36 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8829204454d6..05e89f35d737 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
 pkgbase = r-curl
 	pkgdesc = A Modern and Flexible Web Client for R
 	pkgver = 5.0.0
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=curl
-	arch = i686
 	arch = x86_64
 	license = MIT
-	depends = r
 	depends = curl
-	optdepends = r-spelling
-	optdepends = r-testthat
-	optdepends = r-knitr
+	depends = r
+	optdepends = r-httpuv
 	optdepends = r-jsonlite
-	optdepends = r-rmarkdown
+	optdepends = r-knitr
 	optdepends = r-magrittr
-	optdepends = r-httpuv
+	optdepends = r-rmarkdown
+	optdepends = r-spelling
+	optdepends = r-testthat
 	optdepends = r-webutils
 	source = https://cran.r-project.org/src/contrib/curl_5.0.0.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = cae7a80c8d94d435b39bee5457f78ab6
 	sha256sums = d7f3cac9b513914ffa8f6f64e6fa5dd96c8273378ace6b0c16b71bc6ba59c9b2
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-curl
diff --git a/PKGBUILD b/PKGBUILD
index 0d615402a829..ab14621ac0e8 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: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Kibouo <csonka.mihaly@hotmail.com>
 # Contributor: Ward Segers <w@rdsegers.be>
 # Contributor: Alex Branham <branham@utexas.edu>
 
-_cranname=curl
-_cranver=5.0.0
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=curl
+_pkgver=5.0.0
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=4
 pkgdesc="A Modern and Flexible Web Client for R"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
-depends=(r curl)
+depends=(
+  curl
+  r
+)
 optdepends=(
-    r-spelling
-    r-testthat
-    r-knitr
-    r-jsonlite
-    r-rmarkdown
-    r-magrittr
-    r-httpuv
-    r-webutils
+  r-httpuv
+  r-jsonlite
+  r-knitr
+  r-magrittr
+  r-rmarkdown
+  r-spelling
+  r-testthat
+  r-webutils
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('d7f3cac9b513914ffa8f6f64e6fa5dd96c8273378ace6b0c16b71bc6ba59c9b2'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('cae7a80c8d94d435b39bee5457f78ab6')
+sha256sums=('d7f3cac9b513914ffa8f6f64e6fa5dd96c8273378ace6b0c16b71bc6ba59c9b2')
 
 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"
 }