takeover package

2 files changed, 24 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e970eb08fdb2..9035f85ebcf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = r-pkgconfig
 	pkgdesc = Private Configuration for 'R' Packages
 	pkgver = 2.0.3
-	pkgrel = 1
+	pkgrel = 5
 	url = https://cran.r-project.org/package=pkgconfig
 	arch = any
 	license = MIT
 	depends = r
 	optdepends = r-covr
-	optdepends = r-testthat
 	optdepends = r-disposables
+	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/pkgconfig_2.0.3.tar.gz
 	sha256sums = 330fef440ffeb842a7dcfffc8303743f1feae83e8d6131078b5a44ff11bc3850
 
diff --git a/PKGBUILD b/PKGBUILD
index 65a5474bbf49..b6f86f8949e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,32 @@
-# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: frichtlm <frichtlm@gmail.com>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=pkgconfig
-_cranver=2.0.3
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=pkgconfig
+_pkgver=2.0.3
+pkgname=r-${_pkgname,,}
+pkgver=2.0.3
+pkgrel=5
 pkgdesc="Private Configuration for 'R' Packages"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r)
-optdepends=(r-covr r-testthat r-disposables)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+)
+optdepends=(
+  r-covr
+  r-disposables
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('330fef440ffeb842a7dcfffc8303743f1feae83e8d6131078b5a44ff11bc3850')
 
 build() {
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l "${srcdir}"
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
   install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library"
+  install -Dm644 "${_pkgname}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
+# vim:set ts=2 sw=2 et: