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

[Alexander Rødseth]

    Date: Tuesday, December 3, 2013 @ 16:26:49
  Author: arodseth
Revision: 101993

upgpkg: terminus-font 4.38-3

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

-----------------------+
 PKGBUILD              |   45 +++++++++++++++++++++++++--------------------
 terminus-font.install |   14 ++++++++------
 2 files changed, 33 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-03 15:19:56 UTC (rev 101992)
+++ PKGBUILD	2013-12-03 15:26:49 UTC (rev 101993)
@@ -1,36 +1,41 @@
 # $Id$
 # Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
 # Contributor: Kristoffer Fossgård <kfs1 at online.no>
+# Contributor: clonejo <clonejo at shakik.de>
 
 pkgname=terminus-font
 pkgver=4.38
-pkgrel=2
-pkgdesc="A superb, monospace bitmap font (for X11 and console)"
+pkgrel=3
+pkgdesc='Superb, monospace bitmap font (for X11 and console)'
 arch=('any')
-url="http://sourceforge.net/projects/terminus-font/"
+url='http://sourceforge.net/projects/terminus-font/'
 license=('GPL2' 'custom:OFL')
-depends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
-replaces=('xserver-terminus-fonts')
-install=terminus-font.install
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a8e792fe6e84c86ed2b6ed3e2a12ba66')
+makedepends=('xorg-bdftopcf' 'fontconfig' 'xorg-mkfontscale' 'xorg-mkfontdir')
+optdepends=('xorg-fonts-encodings' 'xorg-fonts-alias' 'xorg-font-utils' 'fontconfig')
+install='terminus-font.install'
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
+sha256sums=('f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7')
 
+prepare() {
+  chmod +x "$srcdir/$pkgname-$pkgver/configure"
+}
+
 build() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  sh ./configure --prefix=/usr \
-              --x11dir=/usr/share/fonts/local \
-              --psfdir=/usr/share/kbd/consolefonts
+  ./configure --prefix=/usr \
+    --x11dir=/usr/share/fonts/local \
+    --psfdir=/usr/share/kbd/consolefonts
   make
 }
-package()
-{
 
-  make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
-
+package() {
+  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"
+    "$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
+  install -Dm644 "$srcdir/$pkgname-$pkgver/OFL.TXT" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
 
-}
+# vim:set ts=2 sw=2 et:

Modified: terminus-font.install
===================================================================
--- terminus-font.install	2013-12-03 15:19:56 UTC (rev 101992)
+++ terminus-font.install	2013-12-03 15:26:49 UTC (rev 101993)
@@ -3,8 +3,8 @@
   ln -sf ../conf.avail/75-yes-terminus.conf .
   popd > /dev/null
   fc-cache -fs
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
+  mkfontscale usr/share/fonts/local
+  mkfontdir usr/share/fonts/local
 }
 
 post_upgrade() {
@@ -14,8 +14,8 @@
     popd > /dev/null
   fi
   fc-cache -fs
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
+  mkfontscale usr/share/fonts/local
+  mkfontdir usr/share/fonts/local
 }
 
 post_remove() {
@@ -23,6 +23,8 @@
   rm -f 75-yes-terminus.conf
   popd > /dev/null
   fc-cache -fs
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
+  mkfontscale usr/share/fonts/local
+  mkfontdir usr/share/fonts/local
 }
+
+# vim:set ts=2 sw=2 et: