3 files changed, 28 insertions, 48 deletions

diff --git a/abs/extra/terminus-font/PKGBUILD b/abs/extra/terminus-font/PKGBUILD
index c3be90c..17201d3 100644
--- a/abs/extra/terminus-font/PKGBUILD
+++ b/abs/extra/terminus-font/PKGBUILD
@@ -1,20 +1,32 @@
+# $Id: PKGBUILD 68042 2012-03-17 11:38:36Z giovanni $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Kristoffer Fossgård <kfs1@online.no>
+# Contributor: Kristoffer Fossgård <kfs1@online.no>
+
 pkgname=terminus-font
-pkgver=4.30
-pkgrel=1
+pkgver=4.36
+pkgrel=2
 pkgdesc="A superb, monospace bitmap font (for X11 and console)"
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-replaces=(xserver-terminus-fonts)
-arch=(i686 x86_64)
-source=(http://www.is-vn.bg/hamster/$pkgname-$pkgver.tar.gz)
-url="http://www.is-vn.bg/hamster/jimmy-en.html"
+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
-license=('GPL-2')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('de925a7ee7351581033d4b615dcb1eb1')
 
 build() { 
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --x11dir=/usr/share/fonts/local/ --psfdir=/usr/share/kbd/consolefonts/
-  make DESTDIR=$startdir/pkg install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --x11dir=/usr/share/fonts/local \
+              --psfdir=/usr/share/kbd/consolefonts
+}
+package()
+{
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/OFL.TXT" \
+                 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-md5sums=('6f8bd95b593851f9f5c210a9d33cbbf1')
diff --git a/abs/extra/terminus-font/install.proto b/abs/extra/terminus-font/install.proto
deleted file mode 100644
index 37f0b55..0000000
--- a/abs/extra/terminus-font/install.proto
+++ /dev/null
@@ -1,27 +0,0 @@
-# arg 1: the new package version 
- post_install() {
- echo -n "Updating font cache... " 
- /usr/bin/fc-cache
- cd /usr/share/fonts/local
- /usr/bin/mkfontdir
- /usr/bin/mkfontscale
-# cp ../encodings/encodings.dir ./encodings.dir
- echo "done."
- echo "Note that local fonts are now (with xorg-7.0) in /usr/share/fonts/local/"
- }
-
-# # arg 1: the new package version 
-# # arg 2: the old package version 
- post_upgrade() { 
- post_install $1 
- } 
-#
-# # arg 1: the old package version 
- post_remove() { 
- /usr/bin/fc-cache
- } 
-
-op=$1 
-shift 
-
-$op $*
diff --git a/abs/extra/terminus-font/terminus-font.install b/abs/extra/terminus-font/terminus-font.install
index e17fb4f..6b194dc 100644
--- a/abs/extra/terminus-font/terminus-font.install
+++ b/abs/extra/terminus-font/terminus-font.install
@@ -1,4 +1,3 @@
-# arg 1: the new package version
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
@@ -8,14 +7,10 @@ post_install() {
   echo "Note: terminus-font is in /usr/share/fonts/local/"
 }
 
-# # arg 1: the new package version
-# # arg 2: the old package version
 post_upgrade() {
-  post_install $1
+  post_install
 }
-#
-# # arg 1: the old package version
+
 post_remove() {
-  post_install $1
+  post_install
 }
-