[arch-commits] Commit in terminus-font/repos/community-any (4 files)

[Daniel Wallace]

    Date: Thursday, May 23, 2013 @ 03:18:13
  Author: dwallace
Revision: 91471

archrelease: copy trunk to community-any

Added:
  terminus-font/repos/community-any/PKGBUILD
    (from rev 91470, terminus-font/trunk/PKGBUILD)
  terminus-font/repos/community-any/terminus-font.install
    (from rev 91470, terminus-font/trunk/terminus-font.install)
Deleted:
  terminus-font/repos/community-any/PKGBUILD
  terminus-font/repos/community-any/terminus-font.install

-----------------------+
 PKGBUILD              |   70 ++++++++++++++++++++++++------------------------
 terminus-font.install |   44 +++++++++++++++++++-----------
 2 files changed, 64 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-23 01:17:50 UTC (rev 91470)
+++ PKGBUILD	2013-05-23 01:18:13 UTC (rev 91471)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
-# Contributor: Kristoffer Fossgård <kfs1 at online.no>
-
-pkgname=terminus-font
-pkgver=4.38
-pkgrel=1
-pkgdesc="A superb, monospace bitmap font (for X11 and console)"
-arch=('any')
-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')
-
-build() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sh ./configure --prefix=/usr \
-              --x11dir=/usr/share/fonts/local \
-              --psfdir=/usr/share/kbd/consolefonts
-  make
-}
-package()
-{
-
-  make -C "${pkgname}-${pkgver}" DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/OFL.TXT" \
-                 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-}

Copied: terminus-font/repos/community-any/PKGBUILD (from rev 91470, terminus-font/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-05-23 01:18:13 UTC (rev 91471)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Vesa Kaihlavirta <vegai at iki.fi>
+# Contributor: Kristoffer Fossgård <kfs1 at online.no>
+
+pkgname=terminus-font
+pkgver=4.38
+pkgrel=2
+pkgdesc="A superb, monospace bitmap font (for X11 and console)"
+arch=('any')
+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')
+
+build() { 
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  sh ./configure --prefix=/usr \
+              --x11dir=/usr/share/fonts/local \
+              --psfdir=/usr/share/kbd/consolefonts
+  make
+}
+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"
+
+}

Deleted: terminus-font.install
===================================================================
--- terminus-font.install	2013-05-23 01:17:50 UTC (rev 91470)
+++ terminus-font.install	2013-05-23 01:18:13 UTC (rev 91471)
@@ -1,16 +0,0 @@
-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/"
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: terminus-font/repos/community-any/terminus-font.install (from rev 91470, terminus-font/trunk/terminus-font.install)
===================================================================
--- terminus-font.install	                        (rev 0)
+++ terminus-font.install	2013-05-23 01:18:13 UTC (rev 91471)
@@ -0,0 +1,28 @@
+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/TTF
+  mkfontdir usr/share/fonts/TTF
+}
+
+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/TTF
+  mkfontdir usr/share/fonts/TTF
+}
+
+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/TTF
+  mkfontdir usr/share/fonts/TTF
+}