[arch-commits] Commit in ttf-dejavu/trunk (PKGBUILD)

[Jan Steffens via arch-commits]

    Date: Sunday, March 28, 2021 @ 17:18:41
  Author: heftig
Revision: 411155

2.37+18+g9b5d1b2f-3

Modified:
  ttf-dejavu/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-03-28 16:51:16 UTC (rev 411154)
+++ PKGBUILD    2021-03-28 17:18:41 UTC (rev 411155)
@@ -3,7 +3,7 @@
 
 pkgname=ttf-dejavu
 pkgver=2.37+18+g9b5d1b2f
-pkgrel=2
+pkgrel=3
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of 
characters"
 arch=('any')
 url="https://dejavu-fonts.github.io/";
@@ -20,24 +20,18 @@
 }
 
 build() {
-  cd "${srcdir}"/dejavu-fonts
-  make  full-ttf
+  cd dejavu-fonts
+  make full-ttf
 }
 
 package() {
-  install -dm755 "${pkgdir}"/etc/fonts/conf.avail
-  install -dm755 "${pkgdir}"/etc/fonts/conf.d
-  install -dm755 "${pkgdir}"/usr/share/fonts/TTF
+  cd dejavu-fonts
+  install -Dt "$pkgdir/usr/share/fonts/TTF" -m644 build/*.ttf
+  install -Dt "$pkgdir/usr/share/fontconfig/conf.avail" -m644 fontconfig/*.conf
 
-  cd "${srcdir}"/dejavu-fonts
-  install -m644 build/*.ttf "${pkgdir}"/usr/share/fonts/TTF/
-  install -m644 fontconfig/*.conf "${pkgdir}"/etc/fonts/conf.avail/
+  mkdir "$pkgdir/usr/share/fontconfig/conf.default"
+  ln -srt "$pkgdir/usr/share/fontconfig/conf.default" \
+    "$pkgdir"/usr/share/fontconfig/conf.avail/*
 
-  pushd "${pkgdir}"/etc/fonts/conf.avail
-  for config in *; do
-    ln -sf ../conf.avail/${config} ../conf.d/${config}
-  done
-  popd
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE
 }