[lilac] updated to 0.1.1-4

2 files changed, 26 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e407f76e7eec..7184193d9c0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = r-fontbitstreamvera
 	pkgdesc = Fonts with 'Bitstream Vera Fonts' License
 	pkgver = 0.1.1
-	pkgrel = 1
+	pkgrel = 4
 	url = https://cran.r-project.org/package=fontBitstreamVera
 	arch = any
 	license = custom
 	depends = r
+	depends = ttf-bitstream-vera
 	source = https://cran.r-project.org/src/contrib/fontBitstreamVera_0.1.1.tar.gz
+	md5sums = c32821c06d909336ace68f2df3d8710e
 	sha256sums = 3298b3dd95605bdda0c5fce5594c9bedde6aa63d89b216d5c83c6c092b6d375a
 
 pkgname = r-fontbitstreamvera
diff --git a/PKGBUILD b/PKGBUILD
index cdc4c7a302ad..6111fad7f424 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,38 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
 
-_cranname=fontBitstreamVera
-_cranver=0.1.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=fontBitstreamVera
+_pkgver=0.1.1
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=4
 pkgdesc="Fonts with 'Bitstream Vera Fonts' License"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(custom)
-depends=(r)
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz")
+depends=(
+  r
+  ttf-bitstream-vera
+)
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('c32821c06d909336ace68f2df3d8710e')
 sha256sums=('3298b3dd95605bdda0c5fce5594c9bedde6aa63d89b216d5c83c6c092b6d375a')
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENCE" "$pkgdir/usr/share/licenses/$pkgname"
 
-  install -Dm644 "${_cranname}/LICENCE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
+  # symlink TTF fonts to ttf-bitstream-vera package
+  cd "$pkgdir/usr/lib/R/library/$_pkgname/fonts/bitstream-vera-fonts"
+  local _font
+  for _font in *.ttf; do
+    ln -sf "/usr/share/fonts/TTF/$_font"
+  done
 }