Fixed PKGBUILD

2 files changed, 26 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8aaa65ab091d..de9cd536b7d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,10 +3,14 @@ pkgbase = r-commonmark
 	pkgver = 1.7
 	pkgrel = 1
 	url = https://cran.r-project.org/package=commonmark
+	arch = i686
 	arch = x86_64
-	license = BSD_2_clause + file LICENSE
+	license = BSD2
+	makedepends = gcc
 	depends = r
 	optdepends = r-curl
+	optdepends = r-testthat
+	optdepends = r-xml2
 	source = https://cran.r-project.org/src/contrib/commonmark_1.7.tar.gz
 	md5sums = 48bf2251862a494d8ee3acde02dce385
 
diff --git a/PKGBUILD b/PKGBUILD
index 23212be970ed..0ab467d7169c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,31 @@
+# Maintainer: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 # Contributor: Kibouo <csonka.mihaly@hotmail.com>
 # Contributor: Alex Branham <alex.branham@gmail.com>
-_cranver=1.7
+
 _cranname=commonmark
-_pkgtar=${_cranname}_${_cranver}.tar.gz
-pkgname=r-commonmark
+_cranver=1.7
+pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
 pkgrel=1
-pkgdesc='High Performance CommonMark and Github Markdown Rendering in R'
-arch=('x86_64')
-url='https://cran.r-project.org/package=commonmark'
-license=('BSD_2_clause + file LICENSE')
-depends=('r' )
-optdepends=('r-curl')
-source=("https://cran.r-project.org/src/contrib/${_pkgtar}")
+pkgdesc="High Performance CommonMark and Github Markdown Rendering in R"
+arch=(i686 x86_64)
+url="https://cran.r-project.org/package=${_cranname}"
+license=(BSD2)
+depends=(r)
+makedepends=(gcc)
+optdepends=(r-curl r-testthat r-xml2)
+source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
 md5sums=('48bf2251862a494d8ee3acde02dce385')
 
-build(){
-    R CMD INSTALL commonmark_"$_cranver".tar.gz -l "$srcdir"
+build() {
+  cd "${srcdir}"
+
+  R CMD INSTALL ${_cranname}_${_cranver}.tar.gz -l ${srcdir}
 }
+
 package() {
-    install -dm0755 "$pkgdir"/usr/lib/R/library
-    cp -a --no-preserve=ownership commonmark "$pkgdir"/usr/lib/R/library
-}
+  cd "${srcdir}"
 
+  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  cp -a --no-preserve=ownership "${_cranname}" "${pkgdir}/usr/lib/R/library"
+}