takeover package

2 files changed, 38 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4350c0a44db..0087633a9d24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = r-servr
 	pkgdesc = A Simple HTTP Server to Serve Static Files or Dynamic Documents
 	pkgver = 0.24
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=servr
 	arch = any
 	license = GPL
-	depends = r>=3.0.0
-	depends = r-mime>=0.2
-	depends = r-httpuv>=1.5.2
-	depends = r-xfun
+	depends = r
+	depends = r-httpuv
 	depends = r-jsonlite
+	depends = r-mime
+	depends = r-xfun
+	optdepends = r-knitr
 	optdepends = r-later
-	optdepends = r-rstudioapi
-	optdepends = r-knitr>=1.9
 	optdepends = r-rmarkdown
+	optdepends = r-rstudioapi
+	optdepends = r-tools
 	source = https://cran.r-project.org/src/contrib/servr_0.24.tar.gz
-	sha512sums = 7fdceed86da4c367372fab09ecb20ba7128c009fa09479980de376491be0fd5fcd59169e28166d88740191d461e0a87fb11c32a0172a5607e339be8af4d086e1
+	sha256sums = d94e1d31802ce6bbab7a5838ff94cbca8cd998237d834ff25fedf7514f41a087
 
 pkgname = r-servr
diff --git a/PKGBUILD b/PKGBUILD
index 8d2d378b81c6..09a0cfff6df2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,37 @@
-# Maintainer: Robert Greener <me@r0bert.dev>
-# Contributor: haha662 <haha662 at outlook dot com>
+# Maintainer: Guoyi Zhang <guoyizhang at malacology dot net>
 
-_cranname=servr
-_cranver=0.24
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
-pkgdesc="A Simple HTTP Server to Serve Static Files or Dynamic Documents"
-arch=("any")
-url="https://cran.r-project.org/package=${_cranname}"
-license=("GPL")
-depends=("r>=3.0.0" "r-mime>=0.2" "r-httpuv>=1.5.2" "r-xfun" "r-jsonlite")
-# makedepends=()
-optdepends=("r-later" "r-rstudioapi" "r-knitr>=1.9" "r-rmarkdown")
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
-sha512sums=("7fdceed86da4c367372fab09ecb20ba7128c009fa09479980de376491be0fd5fcd59169e28166d88740191d461e0a87fb11c32a0172a5607e339be8af4d086e1")
+_pkgname=servr
+_pkgver=0.24
+pkgname=r-${_pkgname,,}
+pkgver=0.24
+pkgrel=4
+pkgdesc='A Simple HTTP Server to Serve Static Files or Dynamic Documents'
+arch=('any')
+url="https://cran.r-project.org/package=${_pkgname}"
+license=('GPL')
+depends=(
+  r
+  r-httpuv
+  r-jsonlite
+  r-mime
+  r-xfun
+)
+optdepends=(
+  r-knitr
+  r-later
+  r-rmarkdown
+  r-rstudioapi
+  r-tools
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+sha256sums=('d94e1d31802ce6bbab7a5838ff94cbca8cd998237d834ff25fedf7514f41a087')
 
 build() {
-  cd "${srcdir}"
-
-  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
+  R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}"
 }
 
 package() {
-  cd "${srcdir}"
-
   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"
 }
+# vim:set ts=2 sw=2 et: