[arch-commits] Commit in terminus-font/trunk (PKGBUILD terminus-font.install)

[Daniel Wallace]

    Date: Thursday, May 23, 2013 @ 03:17:50
  Author: dwallace
Revision: 91470

upgpkg: terminus-font 4.38-2

upgpkg: terminus-font 4.38-2

Modified:
  terminus-font/trunk/PKGBUILD
  terminus-font/trunk/terminus-font.install

-----------------------+
 PKGBUILD              |    4 +++-
 terminus-font.install |   28 ++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-23 00:59:51 UTC (rev 91469)
+++ PKGBUILD	2013-05-23 01:17:50 UTC (rev 91470)
@@ -4,7 +4,7 @@
 
 pkgname=terminus-font
 pkgver=4.38
-pkgrel=1
+pkgrel=2
 pkgdesc="A superb, monospace bitmap font (for X11 and console)"
 arch=('any')
 url="http://sourceforge.net/projects/terminus-font/"
@@ -28,6 +28,8 @@
 
   make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
 
+  install -Dm644 "$srcdir/$pkgname-$pkgver/75-yes-terminus.conf" \
+                 "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/OFL.TXT" \
                  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 

Modified: terminus-font.install
===================================================================
--- terminus-font.install	2013-05-23 00:59:51 UTC (rev 91469)
+++ terminus-font.install	2013-05-23 01:17:50 UTC (rev 91470)
@@ -1,16 +1,28 @@
 post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/local
-  mkfontdir /usr/share/fonts/local
-  echo "done."
-  echo "Note: terminus-font is in /usr/share/fonts/local/"
+  pushd etc/fonts/conf.d > /dev/null
+  ln -sf ../conf.avail/75-yes-terminus.conf .
+  popd > /dev/null
+  fc-cache -fs
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
 }
 
 post_upgrade() {
-  post_install
+  if [ `vercmp 2.30-2 $2` -gt 0 ]; then 
+    pushd etc/fonts/conf.d > /dev/null
+      ln -sf ../conf.avail/75-yes-terminus.conf .
+    popd > /dev/null
+  fi
+  fc-cache -fs
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
 }
 
 post_remove() {
-  post_install
+  pushd etc/fonts/conf.d > /dev/null
+  rm -f 75-yes-terminus.conf
+  popd > /dev/null
+  fc-cache -fs
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
 }