takeover package

2 files changed, 33 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ef66c2fda1a..9a7476af72c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-rex
 	pkgdesc = Friendly Regular Expressions
 	pkgver = 1.2.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=rex
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index e97966023656..177352946712 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,41 @@
-# Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
-# Contributor: Alex Branham <branham@utexas.edu>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=rex
-_cranver=1.2.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="Friendly Regular Expressions"
-arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
-license=(MIT)
-depends=(r r-lazyeval)
-optdepends=(r-covr r-dplyr r-ggplot2 r-hmisc r-knitr r-magrittr r-rmarkdown r-roxygen2 r-rvest r-stringr r-testthat)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+_pkgname=rex
+_pkgver=1.2.1
+pkgname=r-${_pkgname,,}
+pkgver=1.2.1
+pkgrel=4
+pkgdesc='Friendly Regular Expressions'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('MIT')
+depends=(
+  r
+  r-lazyeval
+)
+optdepends=(
+  r-covr
+  r-dplyr
+  r-ggplot2
+  r-hmisc
+  r-knitr
+  r-magrittr
+  r-rmarkdown
+  r-roxygen2
+  r-rvest
+  r-stringr
+  r-testthat
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
 sha256sums=('af42e649c06e4bbdba94d5a1870a7e8347903571c90cd5e5ca40f52307a3bfd6')
 
 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: