[lilac] updated to 1.2.11-3

2 files changed, 19 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32f0a80e5af2..19eaada5c631 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = r-mapproj
 	pkgdesc = Map Projections
 	pkgver = 1.2.11
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=mapproj
-	arch = i686
 	arch = x86_64
 	license = custom:LPL
 	depends = r-maps
 	source = https://cran.r-project.org/src/contrib/mapproj_1.2.11.tar.gz
+	md5sums = df2ac0dd6e0cb2331f089c36041580f7
 	sha256sums = db2d201cc939de26717566066bf44225a967ccde6fc34731af845f03c086347d
 
 pkgname = r-mapproj
diff --git a/PKGBUILD b/PKGBUILD
index ce3d3cdf2048..1da9a3f9925c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,30 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=mapproj
-_cranver=1.2.11
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=mapproj
+_pkgver=1.2.11
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//[:-]/.}
+pkgrel=3
 pkgdesc="Map Projections"
-arch=(i686 x86_64)
-url="https://cran.r-project.org/package=${_cranname}"
+arch=(x86_64)
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(custom:LPL)
-depends=(r-maps)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+depends=(
+  r-maps
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('df2ac0dd6e0cb2331f089c36041580f7')
 sha256sums=('db2d201cc939de26717566066bf44225a967ccde6fc34731af845f03c086347d')
 
 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"
+  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 "${_cranname}/LICENSE.note" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.note"
+  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" "$_pkgname/LICENSE.note"
 }