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

[Jan de Groot]

    Date: Monday, October 31, 2016 @ 09:37:28
  Author: jgc
Revision: 279523

upgpkg: ttf-dejavu 2.37-1

Modified:
  ttf-dejavu/trunk/PKGBUILD
Deleted:
  ttf-dejavu/trunk/ttf-dejavu.install

--------------------+
 PKGBUILD           |   12 ++++++++--
 ttf-dejavu.install |   57 ---------------------------------------------------
 2 files changed, 9 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-31 09:24:08 UTC (rev 279522)
+++ PKGBUILD	2016-10-31 09:37:28 UTC (rev 279523)
@@ -4,7 +4,7 @@
 # Contributor: Michal Krenek <mikos at sg1.cz>
 
 pkgname=ttf-dejavu
-pkgver=2.35
+pkgver=2.37
 pkgrel=1
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
 arch=('any')
@@ -12,12 +12,12 @@
 license=('custom')
 depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontscale' 'xorg-mkfontdir')
 provides=('ttf-font')
-install=ttf-dejavu.install
 source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2)
-sha256sums=('f6d7965586101ff3a8a5c3ec503e082bb6a9604ff53413e10702e5917c194d88')
+sha256sums=('fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7')
 
 package() {
   install -dm755 "${pkgdir}"/etc/fonts/conf.avail
+  install -dm755 "${pkgdir}"/etc/fonts/conf.d
   install -dm755 "${pkgdir}"/usr/share/fonts/TTF
 
   cd "${srcdir}"/dejavu-fonts-ttf-${pkgver}
@@ -24,5 +24,11 @@
   install -m644 ttf/*.ttf "${pkgdir}"/usr/share/fonts/TTF/
   install -m644 fontconfig/*.conf "${pkgdir}"/etc/fonts/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
 }

Deleted: ttf-dejavu.install
===================================================================
--- ttf-dejavu.install	2016-10-31 09:24:08 UTC (rev 279522)
+++ ttf-dejavu.install	2016-10-31 09:37:28 UTC (rev 279523)
@@ -1,57 +0,0 @@
-configs=(20-unhint-small-dejavu-sans-mono.conf
-         20-unhint-small-dejavu-sans.conf
-         20-unhint-small-dejavu-serif.conf
-         57-dejavu-sans-mono.conf
-         57-dejavu-sans.conf
-         57-dejavu-serif.conf)
-
-post_install() {
-  pushd etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    ln -sf ../conf.avail/${config} .
-  done
-  popd > /dev/null
-  fc-cache -s
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
-}
-
-post_upgrade() {
-  if [ `vercmp 2.30-2 $2` -gt 0 ]; then 
-    pushd etc/fonts/conf.d > /dev/null
-    for config in "${configs[@]}"; do
-      ln -sf ../conf.avail/${config} .
-    done
-    popd > /dev/null
-  fi
-  for config in etc/fonts/conf.d/*; do
-    if [ ! -f ${config} ]; then
-      rm -f ${config}
-    fi
-  done
-  fc-cache -s
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
-}
-
-pre_upgrade() {
-  # Link new config files not present on system yet
-  pushd etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    if [ ! -f ../conf.avail/${config} ]; then
-      ln -sf ../conf.avail/${config} .
-    fi
-  done
-  popd > /dev/null
-}
-
-post_remove() {
-  pushd etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    rm -f ${config}
-  done
-  popd > /dev/null
-  fc-cache -s
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
-}