Improvements to PKGBUILD

2 files changed, 20 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2c7c2d05e8d6..53edf7405ce5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = r-timedate
-pkgdesc = Rmetrics - Chronological and Calendar Objects
-pkgver = 3043.102
-pkgrel = 2
-url = https://cran.r-project.org/web/packages/timeDate/index.html
-arch = x86_64
-license = GPL3
-depends = r
-replaces = r-cran-timedate
-source = https://cran.r-project.org/src/contrib/timeDate_3043.102.tar.gz
-md5sums = 7808ada851cbf740b1360cabca0706ff
+	pkgdesc = Rmetrics - Chronological and Calendar Objects
+	pkgver = 3043.102
+	pkgrel = 3
+	url = https://cran.r-project.org/web/packages/timeDate/index.html
+	arch = any
+	license = GPL3
+	depends = r
+	replaces = r-cran-timedate
+	source = https://cran.r-project.org/src/contrib/timeDate_3043.102.tar.gz
+	md5sums = 7808ada851cbf740b1360cabca0706ff
 
 pkgname = r-timedate
 
diff --git a/PKGBUILD b/PKGBUILD
index dfdb479944b2..39e1ccfac3e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,25 @@
 # Maintainer: Alex Branham <branham@utexas.edu>
 _cranname=timeDate
 _cranver=3043.102
+_cransrc="${_cranname}"_"${_cranver}".tar.gz
 pkgname=r-timedate
 pkgver=${_cranver}
-pkgrel=2
+pkgrel=3
 pkgdesc="Rmetrics - Chronological and Calendar Objects"
 url="https://cran.r-project.org/web/packages/${_cranname}/index.html"
-arch=('x86_64')
+arch=('any')
 license=('GPL3')
 depends=('r')
 # optdepends on date and RUnit
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+source=("https://cran.r-project.org/src/contrib/${_cransrc}")
 md5sums=('7808ada851cbf740b1360cabca0706ff')
 replaces=("r-cran-timedate")
 
+build(){
+    Rscript -e "install.packages(\"${_cranname}_${_cranver}.tar.gz\", lib=\"$srcdir\", repos=NULL)"
+}
+
 package() {
-    mkdir -p ${pkgdir}/usr/lib/R/library
-    cd "${srcdir}"
-    R CMD INSTALL ${_cranname} -l ${pkgdir}/usr/lib/R/library
+    install -d "$pkgdir/usr/lib/R/library"
+    cp -r "$srcdir/$_cranname" "$pkgdir/usr/lib/R/library"
 }