[lilac] updated to 2.3.7-3

2 files changed, 33 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e6b631d4e56..30e75f8c70f7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = r-yaml
 	pkgdesc = Methods to Convert R Data to YAML and Back
 	pkgver = 2.3.7
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=yaml
-	arch = i686
 	arch = x86_64
 	license = BSD
 	checkdepends = r-runit
@@ -11,8 +10,7 @@ pkgbase = r-yaml
 	depends = r
 	optdepends = r-runit
 	source = https://cran.r-project.org/src/contrib/yaml_2.3.7.tar.gz
-	source = CRAN-BSD_3_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_3_clause
+	md5sums = 38607c0b966d0b3b6c4f00419d251c8d
 	sha256sums = d20cb219e0f9c48aba02f132f81cfa9ecda5e22c925e36726840218ed56680ab
-	sha256sums = 07ff367bbf4b36ad86223c722d0798a3cdd0b5b03347fa724d82cc108e324929
 
 pkgname = r-yaml
diff --git a/PKGBUILD b/PKGBUILD
index 4fd0b38593bf..9eb70d62682b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,51 @@
 # 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: Alex Branham <branham@utexas.edu>
 
-_cranname=yaml
-_cranver=2.3.7
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=yaml
+_pkgver=2.3.7
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=3
 pkgdesc="Methods to Convert R Data to YAML and Back"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(BSD)
-depends=(r)
-makedepends=(re2c)
-checkdepends=(r-runit)
-optdepends=(r-runit)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-BSD_3_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_3_clause")
-sha256sums=('d20cb219e0f9c48aba02f132f81cfa9ecda5e22c925e36726840218ed56680ab'
-            '07ff367bbf4b36ad86223c722d0798a3cdd0b5b03347fa724d82cc108e324929')
+depends=(
+  r
+)
+makedepends=(
+  re2c
+)
+checkdepends=(
+  r-runit
+)
+optdepends=(
+  r-runit
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('38607c0b966d0b3b6c4f00419d251c8d')
+sha256sums=('d20cb219e0f9c48aba02f132f81cfa9ecda5e22c925e36726840218ed56680ab')
 
 build() {
   # generate implicit tag discovery code
-  re2c -o "${_cranname}/src/implicit.c" --no-generation-date "${_cranname}/inst/implicit.re"
+  re2c -o "$_pkgname/src/implicit.c" --no-generation-date "$_pkgname/inst/implicit.re"
 
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" Rscript --vanilla RUnit.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" Rscript --vanilla RUnit.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
-
-  install -Dm644 CRAN-BSD_3_clause-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/BSD_3_clause"
-  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"
 }