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

[Daniel Micay]

    Date: Monday, April 28, 2014 @ 23:49:48
  Author: thestinger
Revision: 110400

upgpkg: terminus-font 4.38-5

* switch from /usr/share/fonts/local to /usr/share/fonts/misc so that modifying
  the font path is not required
* get rid of the unpackaged configuration symlink (requires user intervention...)

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

-----------------------+
 PKGBUILD              |   10 +++++++---
 terminus-font.install |   23 ++++++-----------------
 2 files changed, 13 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 21:16:53 UTC (rev 110399)
+++ PKGBUILD	2014-04-28 21:49:48 UTC (rev 110400)
@@ -3,10 +3,11 @@
 # Maintainer: Alexander Rødseth <rodseth at gmail.com>
 # Contributor: Kristoffer Fossgård <kfs1 at online.no>
 # Contributor: clonejo <clonejo at shakik.de>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
 
 pkgname=terminus-font
 pkgver=4.38
-pkgrel=4
+pkgrel=5
 pkgdesc='Superb, monospace bitmap font (for X11 and console)'
 arch=('any')
 url='http://sourceforge.net/projects/terminus-font/'
@@ -22,11 +23,11 @@
   chmod +x "$pkgname-$pkgver/configure"
 }
 
-build() { 
+build() {
   cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
-    --x11dir=/usr/share/fonts/local \
+    --x11dir=/usr/share/fonts/misc \
     --psfdir=/usr/share/kbd/consolefonts
   make
 }
@@ -37,6 +38,9 @@
     "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
   install -Dm644 "$srcdir/$pkgname-$pkgver/OFL.TXT" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  mkdir -p "$pkgdir/etc/fonts/conf.d"
+  cd "$pkgdir/etc/fonts/conf.d"
+  ln -s ../conf.avail/75-yes-terminus.conf .
 }
 
 # vim:set ts=2 sw=2 et:

Modified: terminus-font.install
===================================================================
--- terminus-font.install	2014-04-28 21:16:53 UTC (rev 110399)
+++ terminus-font.install	2014-04-28 21:49:48 UTC (rev 110400)
@@ -1,30 +1,19 @@
 post_install() {
-  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/local
-  mkfontdir usr/share/fonts/local
+  mkfontscale usr/share/fonts/misc
+  mkfontdir usr/share/fonts/misc
 }
 
 post_upgrade() {
-  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/local
-  mkfontdir usr/share/fonts/local
+  mkfontscale usr/share/fonts/misc
+  mkfontdir usr/share/fonts/misc
 }
 
 post_remove() {
-  pushd etc/fonts/conf.d > /dev/null
-  rm -f 75-yes-terminus.conf
-  popd > /dev/null
   fc-cache -fs
-  mkfontscale usr/share/fonts/local
-  mkfontdir usr/share/fonts/local
+  mkfontscale usr/share/fonts/misc
+  mkfontdir usr/share/fonts/misc
 }
 
 # vim:set ts=2 sw=2 et: